Merge branch 'refac_masks_update' of https://github.com/dterrahe/dark…

…table

src/develop/develop.c

@@ -1124,6 +1124,9 @@ void dt_dev_add_masks_history_item(
   }
 
   // invalidate buffers and force redraw of darkroom
+  dev->full.pipe->changed |= DT_DEV_PIPE_SYNCH;
+  dev->preview_pipe->changed |= DT_DEV_PIPE_SYNCH;
+  dev->preview2.pipe->changed |= DT_DEV_PIPE_SYNCH;
   dt_dev_invalidate_all(dev);
   dt_pthread_mutex_unlock(&dev->history_mutex);
 

src/develop/masks.h

@@ -514,7 +514,6 @@ void dt_masks_write_masks_history_item(const dt_imgid_t imgid,
                                        const int num,
                                        dt_masks_form_t *form);
 void dt_masks_free_form(dt_masks_form_t *form);
-void dt_masks_update_image(dt_develop_t *dev);
 void dt_masks_cleanup_unused(dt_develop_t *dev);
 
 /** function used to manipulate forms for masks */

src/develop/masks/brush.c

@@ -1464,9 +1464,6 @@ static int _brush_events_mouse_scrolled(struct dt_iop_module_t *module,
 
       // we recreate the form points
       dt_masks_gui_form_create(form, gui, index, module);
-
-      // we save the move
-      dt_masks_update_image(darktable.develop);
     }
     return 1;
   }
@@ -1610,8 +1607,6 @@ static int _brush_events_button_pressed(struct dt_iop_module_t *module,
 
         // we recreate the form points
         dt_masks_gui_form_create(form, gui, index, module);
-        // we save the move
-        dt_masks_update_image(darktable.develop);
         return 1;
       }
       // we register the current position to avoid accidental move
@@ -1757,8 +1752,6 @@ static int _brush_events_button_pressed(struct dt_iop_module_t *module,
 
     // we recreate the form points
     dt_masks_gui_form_create(form, gui, index, module);
-    // we save the move
-    dt_masks_update_image(darktable.develop);
 
     return 1;
   }
@@ -1775,8 +1768,6 @@ static int _brush_events_button_pressed(struct dt_iop_module_t *module,
 
       // we recreate the form points
       dt_masks_gui_form_create(form, gui, index, module);
-      // we save the move
-      dt_masks_update_image(darktable.develop);
     }
     return 1;
   }
@@ -2061,9 +2052,6 @@ static int _brush_events_button_released(struct dt_iop_module_t *module,
     // we recreate the form points
     dt_masks_gui_form_create(form, gui, index, module);
 
-    // we save the move
-    dt_masks_update_image(darktable.develop);
-
     return 1;
   }
   else if(gui->source_dragging)
@@ -2081,16 +2069,12 @@ static int _brush_events_button_released(struct dt_iop_module_t *module,
     // we recreate the form points
     dt_masks_gui_form_create(form, gui, index, module);
 
-    // we save the move
-    dt_masks_update_image(darktable.develop);
-
     return 1;
   }
   else if(gui->seg_dragging >= 0)
   {
     gui->seg_dragging = -1;
     dt_dev_add_masks_history_item(darktable.develop, module, TRUE);
-    dt_masks_update_image(darktable.develop);
     return 1;
   }
   else if(gui->point_dragging >= 0)
@@ -2122,8 +2106,6 @@ static int _brush_events_button_released(struct dt_iop_module_t *module,
 
     // we recreate the form points
     dt_masks_gui_form_create(form, gui, index, module);
-    // we save the move
-    dt_masks_update_image(darktable.develop);
 
     return 1;
   }
@@ -2153,8 +2135,6 @@ static int _brush_events_button_released(struct dt_iop_module_t *module,
 
     // we recreate the form points
     dt_masks_gui_form_create(form, gui, index, module);
-    // we save the move
-    dt_masks_update_image(darktable.develop);
 
     return 1;
   }
@@ -2164,8 +2144,6 @@ static int _brush_events_button_released(struct dt_iop_module_t *module,
 
     // we save the move
     dt_dev_add_masks_history_item(darktable.develop, module, TRUE);
-    dt_masks_update_image(darktable.develop);
-    dt_control_queue_redraw_center();
     return 1;
   }
 

src/develop/masks/circle.c

@@ -196,7 +196,6 @@ static int _circle_events_mouse_scrolled(struct dt_iop_module_t *module,
       {
         return 0;
       }
-      dt_masks_update_image(darktable.develop);
     }
     return 1;
   }
@@ -452,9 +451,6 @@ static int _circle_events_button_released(struct dt_iop_module_t *module,
     // we recreate the form points
     dt_masks_gui_form_create(form, gui, index, module);
 
-    // we save the move
-    dt_masks_update_image(darktable.develop);
-
     if(gui->creation_continuous)
     {
       dt_masks_form_t *form_new = dt_masks_create(form->type);
@@ -488,9 +484,6 @@ static int _circle_events_button_released(struct dt_iop_module_t *module,
     // we recreate the form points
     dt_masks_gui_form_create(form, gui, index, module);
 
-    // we save the move
-    dt_masks_update_image(darktable.develop);
-
     if(gui->creation_continuous)
     {
       dt_masks_form_t *form_new = dt_masks_create(form->type);
@@ -512,8 +505,6 @@ static int _circle_events_button_released(struct dt_iop_module_t *module,
     gui->point_dragging = gui->point_border_dragging = -1;
 
     dt_dev_add_masks_history_item(darktable.develop, module, TRUE);
-    // we save the updated shape
-    dt_masks_update_image(darktable.develop);
   }
 
   return 0;

src/develop/masks/ellipse.c

@@ -556,7 +556,6 @@ static int _ellipse_events_mouse_scrolled(struct dt_iop_module_t *module,
       {
         return 0;
       }
-      dt_masks_update_image(darktable.develop);
     }
     return 1;
   }
@@ -826,9 +825,6 @@ static int _ellipse_events_button_released(struct dt_iop_module_t *module,
     // we recreate the form points
     dt_masks_gui_form_create(form, gui, index, module);
 
-    // we save the move
-    dt_masks_update_image(darktable.develop);
-
     if(gui->creation_continuous)
     {
       dt_masks_form_t *form_new = dt_masks_create(form->type);
@@ -871,9 +867,6 @@ static int _ellipse_events_button_released(struct dt_iop_module_t *module,
     // we recreate the form points
     dt_masks_gui_form_create(form, gui, index, module);
 
-    // we save the new parameters
-    dt_masks_update_image(darktable.develop);
-
     return 1;
   }
   else if(gui->form_rotating && gui->edit_mode == DT_MASKS_EDIT_FULL)
@@ -922,9 +915,6 @@ static int _ellipse_events_button_released(struct dt_iop_module_t *module,
     // we recreate the form points
     dt_masks_gui_form_create(form, gui, index, module);
 
-    // we save the rotation
-    dt_masks_update_image(darktable.develop);
-
     return 1;
   }
   else if(gui->point_dragging >= 1
@@ -935,9 +925,6 @@ static int _ellipse_events_button_released(struct dt_iop_module_t *module,
 
     dt_dev_add_masks_history_item(darktable.develop, module, TRUE);
 
-    // we save the updated shape
-    dt_masks_update_image(darktable.develop);
-
     return 1;
   }
   else if(gui->point_border_dragging >= 1
@@ -948,9 +935,6 @@ static int _ellipse_events_button_released(struct dt_iop_module_t *module,
 
     dt_dev_add_masks_history_item(darktable.develop, module, TRUE);
 
-    // we save the updated shape
-    dt_masks_update_image(darktable.develop);
-
     return 1;
   }
   else if(gui->source_dragging)
@@ -979,9 +963,6 @@ static int _ellipse_events_button_released(struct dt_iop_module_t *module,
     // we recreate the form points
     dt_masks_gui_form_create(form, gui, index, module);
 
-    // we save the move
-    dt_masks_update_image(darktable.develop);
-
     if(gui->creation_continuous)
     {
       dt_masks_form_t *form_new = dt_masks_create(form->type);

src/develop/masks/gradient.c

@@ -173,7 +173,6 @@ static int _gradient_events_mouse_scrolled(struct dt_iop_module_t *module,
       dt_conf_set_float(DT_MASKS_CONF(form->type, gradient, compression),
                         gradient->compression);
       dt_toast_log(_("compression: %3.2f%%"), gradient->compression*100.0f);
-      dt_masks_update_image(darktable.develop);
     }
     else if(gui->edit_mode == DT_MASKS_EDIT_FULL)
     {
@@ -186,7 +185,6 @@ static int _gradient_events_mouse_scrolled(struct dt_iop_module_t *module,
       dt_toast_log(_("curvature: %3.2f%%"), gradient->curvature*50.0f);
       dt_dev_add_masks_history_item(darktable.develop, module, TRUE);
       dt_masks_gui_form_create(form, gui, index, module);
-      dt_masks_update_image(darktable.develop);
     }
     return 1;
   }
@@ -219,8 +217,6 @@ static int _gradient_events_button_pressed(struct dt_iop_module_t *module,
 
     dt_masks_gui_form_create(form, gui, index, module);
 
-    dt_masks_update_image(darktable.develop);
-
     return 1;
   }
   else if(!gui->creation
@@ -405,9 +401,6 @@ static int _gradient_events_button_released(struct dt_iop_module_t *module,
     // we recreate the form points
     dt_masks_gui_form_create(form, gui, index, module);
 
-    // we save the move
-    dt_masks_update_image(darktable.develop);
-
     return 1;
   }
   else if(gui->form_rotating
@@ -456,9 +449,6 @@ static int _gradient_events_button_released(struct dt_iop_module_t *module,
     // we recreate the form points
     dt_masks_gui_form_create(form, gui, index, module);
 
-    // we save the rotation
-    dt_masks_update_image(darktable.develop);
-
     return 1;
   }
   else if(gui->gradient_toggling)
@@ -481,9 +471,6 @@ static int _gradient_events_button_released(struct dt_iop_module_t *module,
     // we recreate the form points
     dt_masks_gui_form_create(form, gui, index, module);
 
-    // we save the new parameters
-    dt_masks_update_image(darktable.develop);
-
     return 1;
   }
   else if(gui->creation)

src/develop/masks/masks.c

@@ -1770,11 +1770,10 @@ void dt_masks_form_remove(struct dt_iop_module_t *module,
         break;
       }
     }
-    if(ok) dt_dev_add_masks_history_item(darktable.develop, module, TRUE);
-    if(ok && module)
+    if(ok)
     {
+      dt_dev_add_masks_history_item(darktable.develop, module, TRUE);
       dt_masks_iop_update(module);
-      dt_masks_update_image(darktable.develop);
     }
     if(ok && grp->points == NULL) dt_masks_form_remove(module, NULL, grp);
     return;
@@ -1835,7 +1834,6 @@ void dt_masks_form_remove(struct dt_iop_module_t *module,
           {
             form_removed = TRUE;
             dt_masks_iop_update(m);
-            dt_masks_update_image(darktable.develop);
             if(iopgrp->points == NULL) dt_masks_form_remove(m, NULL, iopgrp);
           }
         }
@@ -1880,7 +1878,6 @@ float dt_masks_form_change_opacity(dt_masks_form_t *form,
         fpt->opacity = opacity;
         dt_toast_log(_("opacity: %.0f%%"), opacity * 100);
         dt_dev_add_masks_history_item(darktable.develop, NULL, TRUE);
-        dt_masks_update_image(darktable.develop);
       }
       return opacity;
     }
@@ -2073,18 +2070,6 @@ char *dt_masks_group_get_hash_buffer(dt_masks_form_t *form, char *str)
   return str + pos;
 }
 
-void dt_masks_update_image(dt_develop_t *dev)
-{
-  /* invalidate image data*/
-  // dt_similarity_image_dirty(dev->image_storage.id);
-
-  // invalidate buffers and force redraw of darkroom
-  dev->full.pipe->changed |= DT_DEV_PIPE_SYNCH;
-  dev->preview_pipe->changed |= DT_DEV_PIPE_SYNCH;
-  dev->preview2.pipe->changed |= DT_DEV_PIPE_SYNCH;
-  dt_dev_invalidate_all(dev);
-}
-
 // adds formid to used array
 // if formid is a group it adds all the forms that belongs to that group
 static void _cleanup_unused_recurs(GList *forms,