Fixed history and preview refreshing

rtengine/procevents.h

@@ -22,6 +22,10 @@
 namespace rtengine
 {
 
+
+
+
+// Aligned so the first entry starts on line 30
 enum ProcEvent {
     EvPhotoLoaded = 0,
     EvProfileLoaded = 1,
@@ -226,7 +230,6 @@ enum ProcEvent {
     EvDPDNredchro = 200,
     EvDPDNbluechro = 201,
     EvDPDNmet = 202,
-//  EvDPDNperform=201,
     EvDemosaicLMMSEIter = 203,
     EvCATbadpix = 204,
     EvCATAutoAdap = 205,
@@ -278,15 +281,13 @@ enum ProcEvent {
     EvDirPyrEqualizerSkin = 251,
     EvDirPyrEqlgamutlab = 252,
     EvDirPyrEqualizerHueskin = 253,
-//  EvDirPyrEqualizeralg=254,
+    EvDPDNmedian = 254, //  EvDirPyrEqualizeralg=254,
-    EvDPDNmedian = 254,
     EvDPDNmedmet = 255,
     EvColorToningEnabled = 256,
     EvColorToningColor = 257,
     EvColorToningOpacity = 258,
-    EvColorToningCLCurve = 259,
+    EvColorToningCLCurve = 259, //  EvColorToningTwocolor=259,
     EvColorToningMethod = 260,
-//  EvColorToningTwocolor=259,
     EvColorToningLLCurve = 261,
     EvColorToningredlow = 262,
     EvColorToninggreenlow = 263,
@@ -444,7 +445,7 @@ enum ProcEvent {
     EvRetinexEnabled = 415,
     EvRetinexmedianmap = 416,
     EvLlimd = 417,
-    EvretinexColorSpace = 418, //change to 418 if we want a separate history entry "Retinex - Color space"
+    EvretinexColorSpace = 418, // 418 if we want a separate history entry "Retinex - Color space", 406 if we don't
     EvLCDHCurve = 419,
     NUMOFEVENTS
 };

rtengine/refreshmap.cc

@@ -19,6 +19,13 @@
 #include "refreshmap.h"
 #include "procevents.h"
 
+
+
+
+
+
+
+// Aligned so the first entry starts on line 30
 int refreshmap[rtengine::NUMOFEVENTS] = {
     ALL,              // EvPhotoLoaded,
     ALL,              // EvProfileLoaded,
@@ -102,7 +109,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
     RESIZE,           // EvResizeHeight
     RESIZE,           // EvResizeEnabled
     ALL,              // EvProfileChangeNotification
-//    RETINEX,          // EvShrHighQuality
+    RETINEX,          // EvShrHighQuality
     TRANSFORM,        // EvPerspCorr
     DARKFRAME,        // EvLCPFile
     RGBCURVE,         // EvRGBrCurveLumamode
@@ -169,7 +176,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
     SHARPENING,       // EvSharpenEdgeThreechannels
     SHARPENING,       // EvSharpenMicroEnabled
     SHARPENING,       // EvSharpenMicroMatrix
-    DEMOSAIC,         // EvDemosaicALLEnhanced  // Disabled but not removed for now, may be reintroduced some day
+    DEMOSAIC,         // EvDemosaicALLEnhanced Disabled but not removed for now, may be reintroduced some day
     RGBCURVE,         // EvVibranceEnabled
     RGBCURVE,         // EvVibrancePastels
     RGBCURVE,         // EvVibranceSaturated
@@ -255,7 +262,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
     RGBCURVE,         // EvBWAfterCurve
     RGBCURVE,         // EvBWAfterCurveMode
     RGBCURVE,         // EvAutoch
-    NONE,             // --unused--
+    0,                // --unused--
     RGBCURVE,         // EvNeutralBW
     TRANSFORM,        // EvGradientFeather
     TRANSFORM,        // EvGradientStrength
@@ -276,13 +283,11 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
     DIRPYREQUALIZER,  // EvDirPyrEqualizerHueskin
     ALLNORAW,         // EvDPDNmedian
     ALLNORAW,         // EvDPDNmedmet
-//DIRPYREQUALIZER   // EvDirPyrEqualizeralg
     RGBCURVE,         // EvColorToningEnabled
     RGBCURVE,         // EvColorToningColor
     RGBCURVE,         // EvColorToningOpacity
     RGBCURVE,         // EvColorToningCLCurve
     RGBCURVE,         // EvColorToningMethod
-//RGBCURVE,       // EvColorToningTwocolor
     RGBCURVE,         // EvColorToningLLCurve
     RGBCURVE,         // EvColorToningredlow
     RGBCURVE,         // EvColorToninggreenlow
@@ -428,22 +433,19 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
     DIRPYREQUALIZER,  // EvWavedgeampli
     DIRPYREQUALIZER,  // EvWavlev3nois
     DIRPYREQUALIZER,  // EvWavNPmet
-    DEMOSAIC,  // Unused?
     ALLNORAW,         // EvretinexMethod
     ALLNORAW,         // EvLneigh
     ALLNORAW,         // EvLgain
-    ALLNORAW,   // EvLoffs was EvLstr
+    ALLNORAW,         // EvLoffs
-    ALLNORAW,   // EvLstr was EvLscal
+    ALLNORAW,         // EvLstr
-    ALLNORAW,   // EvLscal was EvLvart
+    ALLNORAW,         // EvLscal
-    ALLNORAW,   // EvLvart was EvLCDCurve
+    ALLNORAW,         // EvLvart
-    ALLNORAW,   // EvRetinexOpacity // not used
+    ALLNORAW,         // EvLCDCurve
     ALLNORAW,         // EvRetinextransmission
-    DEMOSAIC,   // EvRetinexEnabled was EvRetinexretinex <-- TODO we can probably delete this
+    DEMOSAIC,         // EvRetinexEnabled
     ALLNORAW,         // EvRetinexmedianmap
     ALLNORAW,         // EvLlimd
     DEMOSAIC,         // Evretinexcolorspace
     ALLNORAW          // EvLCDHCurve
-
-
 };
 

rtengine/refreshmap.h

@@ -68,7 +68,6 @@
 #define INPUTPROFILE     WHITEBALANCE
 #define GAMMA           (M_COLOR|M_LUMINANCE)
 #define MINUPDATE        M_MINUPDATE
-#define NONE             0
 #define ALLNORAW        (M_INIT|M_LINDENOISE|M_TRANSFORM|M_BLURMAP|M_AUTOEXP|M_RGBCURVE|M_LUMACURVE|M_LUMINANCE|M_COLOR)
 
 extern int refreshmap[];