Merge branch 'dev' into favorites-gui

rtgui/locallab.h

@@ -116,6 +116,7 @@ private:
     LocallabCBDL expcbdl;
     LocallabLog explog;
     LocallabMask expmask;
+    Locallabcie expcie;
 
     std::vector<LocallabTool*> locallabTools;
 
@@ -126,7 +127,7 @@ private:
     std::vector<locallabRef> maskBackRef;
 
     // Other widgets
-    Gtk::Button* const resetshowButton;
+    //Gtk::Button* const resetshowButton;
 
     Glib::ustring spotName;
 
@@ -145,10 +146,11 @@ public:
     void minmaxChanged(const std::vector<locallabRetiMinMax> &minmax, int selspot) override;
 
     // Locallab Log Encoding autocompute function
-    void logencodChanged(const float blackev, const float whiteev, const float sourceg, const float sourceab, const float targetg) override;
+    void logencodChanged(const float blackev, const float whiteev, const float sourceg, const float sourceab, const float targetg, const bool autocomput, const bool autocie, const float jz1) override;
 
     // Locallab tools mask background management function
-    void refChanged(const std::vector<locallabRef> &ref, int selspot) override;
+//    void refChanged(const std::vector<locallabRef> &ref, int selspot) override;
+    void refChanged2(float *huerefp, float *chromarefp, float *lumarefp, float *fabrefp, int selspot)override;
 
     // Mask visibility management functions
     struct llMaskVisibility {
@@ -169,13 +171,14 @@ public:
         int cbMask;
         int logMask;
         int maskMask;
+        int cieMask;
     };
 
     void resetMaskVisibility();
     llMaskVisibility getMaskVisibility() const;
 
     // Other widgets event functions
-    void resetshowPressed();
+    //void resetshowPressed();
 
     // EditProvider management function
     void setEditProvider(EditDataProvider* provider) override;