liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed history and preview refreshing

Browse Source
This commit is contained in:
Morgan Hardwood
2015-09-16 18:13:01 +02:00
parent 7d78c05603
commit 718b10084f
3 changed files with 110 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/procevents.h
View File

@@ -22,6 +22,10 @@
namespace rtengine namespace rtengine
{ {
// Aligned so the first entry starts on line 30
enum ProcEvent { enum ProcEvent {
EvPhotoLoaded = 0, EvPhotoLoaded = 0,
EvProfileLoaded = 1, EvProfileLoaded = 1,
@@ -226,7 +230,6 @@ enum ProcEvent {
EvDPDNredchro = 200, EvDPDNredchro = 200,
EvDPDNbluechro = 201, EvDPDNbluechro = 201,
EvDPDNmet = 202, EvDPDNmet = 202,
// EvDPDNperform=201,
EvDemosaicLMMSEIter = 203, EvDemosaicLMMSEIter = 203,
EvCATbadpix = 204, EvCATbadpix = 204,
EvCATAutoAdap = 205, EvCATAutoAdap = 205,
@@ -278,15 +281,13 @@ enum ProcEvent {
EvDirPyrEqualizerSkin = 251, EvDirPyrEqualizerSkin = 251,
EvDirPyrEqlgamutlab = 252, EvDirPyrEqlgamutlab = 252,
EvDirPyrEqualizerHueskin = 253, EvDirPyrEqualizerHueskin = 253,
// EvDirPyrEqualizeralg=254, EvDPDNmedian = 254, // EvDirPyrEqualizeralg=254,
EvDPDNmedian = 254,
EvDPDNmedmet = 255, EvDPDNmedmet = 255,
EvColorToningEnabled = 256, EvColorToningEnabled = 256,
EvColorToningColor = 257, EvColorToningColor = 257,
EvColorToningOpacity = 258, EvColorToningOpacity = 258,
EvColorToningCLCurve = 259, EvColorToningCLCurve = 259, // EvColorToningTwocolor=259,
EvColorToningMethod = 260, EvColorToningMethod = 260,
// EvColorToningTwocolor=259,
EvColorToningLLCurve = 261, EvColorToningLLCurve = 261,
EvColorToningredlow = 262, EvColorToningredlow = 262,
EvColorToninggreenlow = 263, EvColorToninggreenlow = 263,
@@ -444,7 +445,7 @@ enum ProcEvent {
EvRetinexEnabled = 415, EvRetinexEnabled = 415,
EvRetinexmedianmap = 416, EvRetinexmedianmap = 416,
EvLlimd = 417, 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, EvLCDHCurve = 419,
NUMOFEVENTS NUMOFEVENTS
}; };

204
rtengine/refreshmap.cc
View File

@@ -19,6 +19,13 @@
#include "refreshmap.h" #include "refreshmap.h"
#include "procevents.h" #include "procevents.h"
// Aligned so the first entry starts on line 30
int refreshmap[rtengine::NUMOFEVENTS] = { int refreshmap[rtengine::NUMOFEVENTS] = {
ALL, // EvPhotoLoaded, ALL, // EvPhotoLoaded,
ALL, // EvProfileLoaded, ALL, // EvProfileLoaded,
@@ -102,7 +109,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
RESIZE, // EvResizeHeight RESIZE, // EvResizeHeight
RESIZE, // EvResizeEnabled RESIZE, // EvResizeEnabled
ALL, // EvProfileChangeNotification ALL, // EvProfileChangeNotification
// RETINEX, // EvShrHighQuality RETINEX, // EvShrHighQuality
TRANSFORM, // EvPerspCorr TRANSFORM, // EvPerspCorr
DARKFRAME, // EvLCPFile DARKFRAME, // EvLCPFile
RGBCURVE, // EvRGBrCurveLumamode RGBCURVE, // EvRGBrCurveLumamode
@@ -169,7 +176,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
SHARPENING, // EvSharpenEdgeThreechannels SHARPENING, // EvSharpenEdgeThreechannels
SHARPENING, // EvSharpenMicroEnabled SHARPENING, // EvSharpenMicroEnabled
SHARPENING, // EvSharpenMicroMatrix 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, // EvVibranceEnabled
RGBCURVE, // EvVibrancePastels RGBCURVE, // EvVibrancePastels
RGBCURVE, // EvVibranceSaturated RGBCURVE, // EvVibranceSaturated
@@ -255,7 +262,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
RGBCURVE, // EvBWAfterCurve RGBCURVE, // EvBWAfterCurve
RGBCURVE, // EvBWAfterCurveMode RGBCURVE, // EvBWAfterCurveMode
RGBCURVE, // EvAutoch RGBCURVE, // EvAutoch
NONE, // --unused-- 0, // --unused--
RGBCURVE, // EvNeutralBW RGBCURVE, // EvNeutralBW
TRANSFORM, // EvGradientFeather TRANSFORM, // EvGradientFeather
TRANSFORM, // EvGradientStrength TRANSFORM, // EvGradientStrength
@@ -275,14 +282,12 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
DIRPYREQUALIZER, // EvDirPyrEqlgamutlab DIRPYREQUALIZER, // EvDirPyrEqlgamutlab
DIRPYREQUALIZER, // EvDirPyrEqualizerHueskin DIRPYREQUALIZER, // EvDirPyrEqualizerHueskin
ALLNORAW, // EvDPDNmedian ALLNORAW, // EvDPDNmedian
ALLNORAW, //EvDPDNmedmet ALLNORAW, // EvDPDNmedmet
//DIRPYREQUALIZER // EvDirPyrEqualizeralg
RGBCURVE, // EvColorToningEnabled RGBCURVE, // EvColorToningEnabled
RGBCURVE, // EvColorToningColor RGBCURVE, // EvColorToningColor
RGBCURVE, // EvColorToningOpacity RGBCURVE, // EvColorToningOpacity
RGBCURVE, // EvColorToningCLCurve RGBCURVE, // EvColorToningCLCurve
RGBCURVE, // EvColorToningMethod RGBCURVE, // EvColorToningMethod
//RGBCURVE, // EvColorToningTwocolor
RGBCURVE, // EvColorToningLLCurve RGBCURVE, // EvColorToningLLCurve
RGBCURVE, // EvColorToningredlow RGBCURVE, // EvColorToningredlow
RGBCURVE, // EvColorToninggreenlow RGBCURVE, // EvColorToninggreenlow
@@ -304,27 +309,27 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
RGBCURVE, // EvColorToningHighights RGBCURVE, // EvColorToningHighights
RGBCURVE, // EvColorToningSatProtection RGBCURVE, // EvColorToningSatProtection
RGBCURVE, // EvColorToningSatThreshold RGBCURVE, // EvColorToningSatThreshold
RGBCURVE, //EvColorToningStrength RGBCURVE, // EvColorToningStrength
RGBCURVE, //EvColorToningautosat RGBCURVE, // EvColorToningautosat
ALLNORAW, //EvDPDNmetmed ALLNORAW, // EvDPDNmetmed
ALLNORAW, //EvDPDNrgbmet ALLNORAW, // EvDPDNrgbmet
ALLNORAW, //EvDPDNpasses ALLNORAW, // EvDPDNpasses
FLATFIELD, // EvFlatFieldClipControl FLATFIELD, // EvFlatFieldClipControl
FLATFIELD, // EvFlatFieldAutoClipControl FLATFIELD, // EvFlatFieldAutoClipControl
DARKFRAME, // EvPreProcessExpBlackRed DARKFRAME, // EvPreProcessExpBlackRed
DARKFRAME, // EvPreProcessExpBlackGreen DARKFRAME, // EvPreProcessExpBlackGreen
DARKFRAME, // EvPreProcessExpBlackBlue DARKFRAME, // EvPreProcessExpBlackBlue
RGBCURVE, //EvFilmSimulationEnabled RGBCURVE, // EvFilmSimulationEnabled
RGBCURVE, //EvFilmSimulationStrength RGBCURVE, // EvFilmSimulationStrength
RGBCURVE, //EvFilmSimulationFilename RGBCURVE, // EvFilmSimulationFilename
ALLNORAW, // EvDPDNLCurve ALLNORAW, // EvDPDNLCurve
ALLNORAW, // EvDPDNsmet ALLNORAW, // EvDPDNsmet
DARKFRAME, // EvPreProcessDeadPixel DARKFRAME, // EvPreProcessDeadPixel
ALLNORAW, //EvDPDNCCCurve ALLNORAW, // EvDPDNCCCurve
ALLNORAW, //EvDPDNautochroma ALLNORAW, // EvDPDNautochroma
ALLNORAW, // EvDPDNLmet ALLNORAW, // EvDPDNLmet
ALLNORAW, // EvDPDNCmet ALLNORAW, // EvDPDNCmet
ALLNORAW, // EvDPDNC2met ALLNORAW, // EvDPDNC2met
DIRPYREQUALIZER, // EvWavelet DIRPYREQUALIZER, // EvWavelet
DIRPYREQUALIZER, // EvEnabled DIRPYREQUALIZER, // EvEnabled
DIRPYREQUALIZER, // EvWavLmethod DIRPYREQUALIZER, // EvWavLmethod
@@ -365,85 +370,82 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
DIRPYREQUALIZER, // EvWavdaubcoeffmet DIRPYREQUALIZER, // EvWavdaubcoeffmet
DIRPYREQUALIZER, // EvWavedgreinf DIRPYREQUALIZER, // EvWavedgreinf
DIRPYREQUALIZER, // EvWaveletch DIRPYREQUALIZER, // EvWaveletch
DIRPYREQUALIZER, //EvWavCHSLmet DIRPYREQUALIZER, // EvWavCHSLmet
DIRPYREQUALIZER, //EvWavedgcont DIRPYREQUALIZER, // EvWavedgcont
DIRPYREQUALIZER, //EvWavEDmet DIRPYREQUALIZER, // EvWavEDmet
DIRPYREQUALIZER, //EvWavlev0nois DIRPYREQUALIZER, // EvWavlev0nois
DIRPYREQUALIZER, //EvWavlev1nois DIRPYREQUALIZER, // EvWavlev1nois
DIRPYREQUALIZER, //EvWavlev2nois DIRPYREQUALIZER, // EvWavlev2nois
DIRPYREQUALIZER, //EvWavmedianlev DIRPYREQUALIZER, // EvWavmedianlev
DIRPYREQUALIZER, //EvWavHHCurve DIRPYREQUALIZER, // EvWavHHCurve
DIRPYREQUALIZER, //EvWavBackmet DIRPYREQUALIZER, // EvWavBackmet
DIRPYREQUALIZER, //EvWavedgedetect DIRPYREQUALIZER, // EvWavedgedetect
DIRPYREQUALIZER, //EvWavlipst DIRPYREQUALIZER, // EvWavlipst
DIRPYREQUALIZER, //EvWavedgedetectthr DIRPYREQUALIZER, // EvWavedgedetectthr
DIRPYREQUALIZER, //EvWavedgedetectthr2 DIRPYREQUALIZER, // EvWavedgedetectthr2
DIRPYREQUALIZER, //EvWavlinkedg DIRPYREQUALIZER, // EvWavlinkedg
DIRPYREQUALIZER, //EvWavCHCurve DIRPYREQUALIZER, // EvWavCHCurve
DARKFRAME, //EvPreProcessHotDeadThresh DARKFRAME, // EvPreProcessHotDeadThresh
SHARPENING, //EvEPDgamma SHARPENING, // EvEPDgamma
DIRPYREQUALIZER, //EvWavtmr DIRPYREQUALIZER, // EvWavtmr
DIRPYREQUALIZER, //EvWavTMmet DIRPYREQUALIZER, // EvWavTMmet
DIRPYREQUALIZER, //EvWavtmrs DIRPYREQUALIZER, // EvWavtmrs
DIRPYREQUALIZER, //EvWavbalance DIRPYREQUALIZER, // EvWavbalance
DIRPYREQUALIZER, //EvWaviter DIRPYREQUALIZER, // EvWaviter
DIRPYREQUALIZER, //EvWavgamma DIRPYREQUALIZER, // EvWavgamma
DIRPYREQUALIZER, //EvWavCLCurve DIRPYREQUALIZER, // EvWavCLCurve
DIRPYREQUALIZER, //EvWavopacity DIRPYREQUALIZER, // EvWavopacity
DIRPYREQUALIZER, //EvWavBAmet DIRPYREQUALIZER, // EvWavBAmet
DIRPYREQUALIZER, //EvWavopacityWL DIRPYREQUALIZER, // EvWavopacityWL
RESIZE, // EvPrShrEnabled RESIZE, // EvPrShrEnabled
RESIZE, // EvPrShrRadius RESIZE, // EvPrShrRadius
RESIZE, // EvPrShrAmount RESIZE, // EvPrShrAmount
RESIZE, // EvPrShrThresh RESIZE, // EvPrShrThresh
RESIZE, // EvPrShrEdgeOnly RESIZE, // EvPrShrEdgeOnly
RESIZE, // EvPrShrEdgeRadius=375, RESIZE, // EvPrShrEdgeRadius=375,
RESIZE, // EvPrShrEdgeTolerance=376, RESIZE, // EvPrShrEdgeTolerance=376,
RESIZE, // EvPrShrHaloControl=377, RESIZE, // EvPrShrHaloControl=377,
RESIZE, // EvPrShrHaloAmount=378, RESIZE, // EvPrShrHaloAmount=378,
RESIZE, // EvPrShrMethod=379, RESIZE, // EvPrShrMethod=379,
RESIZE, // EvPrShrDRadius=380, RESIZE, // EvPrShrDRadius=380,
RESIZE, // EvPrShrDAmount=381, RESIZE, // EvPrShrDAmount=381,
RESIZE, // EvPrShrDDamping=382, RESIZE, // EvPrShrDDamping=382,
RESIZE, // EvPrShrDIterations=383, RESIZE, // EvPrShrDIterations=383,
DIRPYREQUALIZER, // EvWavcbenab DIRPYREQUALIZER, // EvWavcbenab
DIRPYREQUALIZER, // EvWavgreenhigh DIRPYREQUALIZER, // EvWavgreenhigh
DIRPYREQUALIZER, // EvWavbluehigh DIRPYREQUALIZER, // EvWavbluehigh
DIRPYREQUALIZER, // EvWavgreenmed DIRPYREQUALIZER, // EvWavgreenmed
DIRPYREQUALIZER, // EvWavbluemed DIRPYREQUALIZER, // EvWavbluemed
DIRPYREQUALIZER, // EvWavgreenlow DIRPYREQUALIZER, // EvWavgreenlow
DIRPYREQUALIZER, // EvWavbluelow DIRPYREQUALIZER, // EvWavbluelow
DIRPYREQUALIZER, // EvWavNeutral DIRPYREQUALIZER, // EvWavNeutral
RGBCURVE, // EvDCPApplyLookTable, RGBCURVE, // EvDCPApplyLookTable,
RGBCURVE, // EvDCPApplyBaselineExposureOffset, RGBCURVE, // EvDCPApplyBaselineExposureOffset,
INPUTPROFILE, // EvDCPApplyHueSatMap INPUTPROFILE, // EvDCPApplyHueSatMap
DIRPYREQUALIZER, // EvWavenacont DIRPYREQUALIZER, // EvWavenacont
DIRPYREQUALIZER, // EvWavenachrom DIRPYREQUALIZER, // EvWavenachrom
DIRPYREQUALIZER, // EvWavenaedge DIRPYREQUALIZER, // EvWavenaedge
DIRPYREQUALIZER, // EvWavenares DIRPYREQUALIZER, // EvWavenares
DIRPYREQUALIZER, // EvWavenafin DIRPYREQUALIZER, // EvWavenafin
DIRPYREQUALIZER, // EvWavenatoning DIRPYREQUALIZER, // EvWavenatoning
DIRPYREQUALIZER, // EvWavenanoise DIRPYREQUALIZER, // EvWavenanoise
DIRPYREQUALIZER, // EvWavedgesensi DIRPYREQUALIZER, // EvWavedgesensi
DIRPYREQUALIZER, // EvWavedgeampli DIRPYREQUALIZER, // EvWavedgeampli
DIRPYREQUALIZER, //EvWavlev3nois DIRPYREQUALIZER, // EvWavlev3nois
DIRPYREQUALIZER, //EvWavNPmet DIRPYREQUALIZER, // EvWavNPmet
DEMOSAIC, // Unused? ALLNORAW, // EvretinexMethod
ALLNORAW, // EvretinexMethod ALLNORAW, // EvLneigh
ALLNORAW, // EvLneigh ALLNORAW, // EvLgain
ALLNORAW, // EvLgain ALLNORAW, // EvLoffs
ALLNORAW, // EvLoffs was EvLstr ALLNORAW, // EvLstr
ALLNORAW, // EvLstr was EvLscal ALLNORAW, // EvLscal
ALLNORAW, // EvLscal was EvLvart ALLNORAW, // EvLvart
ALLNORAW, // EvLvart was EvLCDCurve ALLNORAW, // EvLCDCurve
ALLNORAW, // EvRetinexOpacity // not used ALLNORAW, // EvRetinextransmission
ALLNORAW, // EvRetinextransmission DEMOSAIC, // EvRetinexEnabled
DEMOSAIC, // EvRetinexEnabled was EvRetinexretinex <-- TODO we can probably delete this ALLNORAW, // EvRetinexmedianmap
ALLNORAW, // EvRetinexmedianmap ALLNORAW, // EvLlimd
ALLNORAW, // EvLlimd DEMOSAIC, // Evretinexcolorspace
DEMOSAIC, // Evretinexcolorspace ALLNORAW // EvLCDHCurve
ALLNORAW // EvLCDHCurve
}; };

1
rtengine/refreshmap.h
View File

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