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
{
// 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,
EvDPDNmedian = 254, // EvDirPyrEqualizeralg=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
};

204
rtengine/refreshmap.cc
View File

@@ -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
@@ -275,14 +282,12 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
DIRPYREQUALIZER, // EvDirPyrEqlgamutlab
DIRPYREQUALIZER, // EvDirPyrEqualizerHueskin
ALLNORAW, // EvDPDNmedian
ALLNORAW, //EvDPDNmedmet
//DIRPYREQUALIZER // EvDirPyrEqualizeralg
ALLNORAW, // EvDPDNmedmet
RGBCURVE, // EvColorToningEnabled
RGBCURVE, // EvColorToningColor
RGBCURVE, // EvColorToningOpacity
RGBCURVE, // EvColorToningCLCurve
RGBCURVE, // EvColorToningMethod
//RGBCURVE, // EvColorToningTwocolor
RGBCURVE, // EvColorToningLLCurve
RGBCURVE, // EvColorToningredlow
RGBCURVE, // EvColorToninggreenlow
@@ -304,27 +309,27 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
RGBCURVE, // EvColorToningHighights
RGBCURVE, // EvColorToningSatProtection
RGBCURVE, // EvColorToningSatThreshold
RGBCURVE, //EvColorToningStrength
RGBCURVE, //EvColorToningautosat
ALLNORAW, //EvDPDNmetmed
ALLNORAW, //EvDPDNrgbmet
ALLNORAW, //EvDPDNpasses
RGBCURVE, // EvColorToningStrength
RGBCURVE, // EvColorToningautosat
ALLNORAW, // EvDPDNmetmed
ALLNORAW, // EvDPDNrgbmet
ALLNORAW, // EvDPDNpasses
FLATFIELD, // EvFlatFieldClipControl
FLATFIELD, // EvFlatFieldAutoClipControl
DARKFRAME, // EvPreProcessExpBlackRed
DARKFRAME, // EvPreProcessExpBlackGreen
DARKFRAME, // EvPreProcessExpBlackBlue
RGBCURVE, //EvFilmSimulationEnabled
RGBCURVE, //EvFilmSimulationStrength
RGBCURVE, //EvFilmSimulationFilename
ALLNORAW, // EvDPDNLCurve
ALLNORAW, // EvDPDNsmet
RGBCURVE, // EvFilmSimulationEnabled
RGBCURVE, // EvFilmSimulationStrength
RGBCURVE, // EvFilmSimulationFilename
ALLNORAW, // EvDPDNLCurve
ALLNORAW, // EvDPDNsmet
DARKFRAME, // EvPreProcessDeadPixel
ALLNORAW, //EvDPDNCCCurve
ALLNORAW, //EvDPDNautochroma
ALLNORAW, // EvDPDNLmet
ALLNORAW, // EvDPDNCmet
ALLNORAW, // EvDPDNC2met
ALLNORAW, // EvDPDNCCCurve
ALLNORAW, // EvDPDNautochroma
ALLNORAW, // EvDPDNLmet
ALLNORAW, // EvDPDNCmet
ALLNORAW, // EvDPDNC2met
DIRPYREQUALIZER, // EvWavelet
DIRPYREQUALIZER, // EvEnabled
DIRPYREQUALIZER, // EvWavLmethod
@@ -365,85 +370,82 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
DIRPYREQUALIZER, // EvWavdaubcoeffmet
DIRPYREQUALIZER, // EvWavedgreinf
DIRPYREQUALIZER, // EvWaveletch
DIRPYREQUALIZER, //EvWavCHSLmet
DIRPYREQUALIZER, //EvWavedgcont
DIRPYREQUALIZER, //EvWavEDmet
DIRPYREQUALIZER, //EvWavlev0nois
DIRPYREQUALIZER, //EvWavlev1nois
DIRPYREQUALIZER, //EvWavlev2nois
DIRPYREQUALIZER, //EvWavmedianlev
DIRPYREQUALIZER, //EvWavHHCurve
DIRPYREQUALIZER, //EvWavBackmet
DIRPYREQUALIZER, //EvWavedgedetect
DIRPYREQUALIZER, //EvWavlipst
DIRPYREQUALIZER, //EvWavedgedetectthr
DIRPYREQUALIZER, //EvWavedgedetectthr2
DIRPYREQUALIZER, //EvWavlinkedg
DIRPYREQUALIZER, //EvWavCHCurve
DARKFRAME, //EvPreProcessHotDeadThresh
SHARPENING, //EvEPDgamma
DIRPYREQUALIZER, //EvWavtmr
DIRPYREQUALIZER, //EvWavTMmet
DIRPYREQUALIZER, //EvWavtmrs
DIRPYREQUALIZER, //EvWavbalance
DIRPYREQUALIZER, //EvWaviter
DIRPYREQUALIZER, //EvWavgamma
DIRPYREQUALIZER, //EvWavCLCurve
DIRPYREQUALIZER, //EvWavopacity
DIRPYREQUALIZER, //EvWavBAmet
DIRPYREQUALIZER, //EvWavopacityWL
RESIZE, // EvPrShrEnabled
RESIZE, // EvPrShrRadius
RESIZE, // EvPrShrAmount
RESIZE, // EvPrShrThresh
RESIZE, // EvPrShrEdgeOnly
RESIZE, // EvPrShrEdgeRadius=375,
RESIZE, // EvPrShrEdgeTolerance=376,
RESIZE, // EvPrShrHaloControl=377,
RESIZE, // EvPrShrHaloAmount=378,
RESIZE, // EvPrShrMethod=379,
RESIZE, // EvPrShrDRadius=380,
RESIZE, // EvPrShrDAmount=381,
RESIZE, // EvPrShrDDamping=382,
RESIZE, // EvPrShrDIterations=383,
DIRPYREQUALIZER, // EvWavcbenab
DIRPYREQUALIZER, // EvWavgreenhigh
DIRPYREQUALIZER, // EvWavbluehigh
DIRPYREQUALIZER, // EvWavgreenmed
DIRPYREQUALIZER, // EvWavbluemed
DIRPYREQUALIZER, // EvWavgreenlow
DIRPYREQUALIZER, // EvWavbluelow
DIRPYREQUALIZER, // EvWavNeutral
RGBCURVE, // EvDCPApplyLookTable,
RGBCURVE, // EvDCPApplyBaselineExposureOffset,
INPUTPROFILE, // EvDCPApplyHueSatMap
DIRPYREQUALIZER, // EvWavenacont
DIRPYREQUALIZER, // EvWavenachrom
DIRPYREQUALIZER, // EvWavenaedge
DIRPYREQUALIZER, // EvWavenares
DIRPYREQUALIZER, // EvWavenafin
DIRPYREQUALIZER, // EvWavenatoning
DIRPYREQUALIZER, // EvWavenanoise
DIRPYREQUALIZER, // EvWavedgesensi
DIRPYREQUALIZER, // EvWavedgeampli
DIRPYREQUALIZER, //EvWavlev3nois
DIRPYREQUALIZER, //EvWavNPmet
DEMOSAIC, // Unused?
ALLNORAW, // EvretinexMethod
ALLNORAW, // EvLneigh
ALLNORAW, // EvLgain
ALLNORAW, // EvLoffs was EvLstr
ALLNORAW, // EvLstr was EvLscal
ALLNORAW, // EvLscal was EvLvart
ALLNORAW, // EvLvart was EvLCDCurve
ALLNORAW, // EvRetinexOpacity // not used
ALLNORAW, // EvRetinextransmission
DEMOSAIC, // EvRetinexEnabled was EvRetinexretinex <-- TODO we can probably delete this
ALLNORAW, // EvRetinexmedianmap
ALLNORAW, // EvLlimd
DEMOSAIC, // Evretinexcolorspace
ALLNORAW // EvLCDHCurve
DIRPYREQUALIZER, // EvWavCHSLmet
DIRPYREQUALIZER, // EvWavedgcont
DIRPYREQUALIZER, // EvWavEDmet
DIRPYREQUALIZER, // EvWavlev0nois
DIRPYREQUALIZER, // EvWavlev1nois
DIRPYREQUALIZER, // EvWavlev2nois
DIRPYREQUALIZER, // EvWavmedianlev
DIRPYREQUALIZER, // EvWavHHCurve
DIRPYREQUALIZER, // EvWavBackmet
DIRPYREQUALIZER, // EvWavedgedetect
DIRPYREQUALIZER, // EvWavlipst
DIRPYREQUALIZER, // EvWavedgedetectthr
DIRPYREQUALIZER, // EvWavedgedetectthr2
DIRPYREQUALIZER, // EvWavlinkedg
DIRPYREQUALIZER, // EvWavCHCurve
DARKFRAME, // EvPreProcessHotDeadThresh
SHARPENING, // EvEPDgamma
DIRPYREQUALIZER, // EvWavtmr
DIRPYREQUALIZER, // EvWavTMmet
DIRPYREQUALIZER, // EvWavtmrs
DIRPYREQUALIZER, // EvWavbalance
DIRPYREQUALIZER, // EvWaviter
DIRPYREQUALIZER, // EvWavgamma
DIRPYREQUALIZER, // EvWavCLCurve
DIRPYREQUALIZER, // EvWavopacity
DIRPYREQUALIZER, // EvWavBAmet
DIRPYREQUALIZER, // EvWavopacityWL
RESIZE, // EvPrShrEnabled
RESIZE, // EvPrShrRadius
RESIZE, // EvPrShrAmount
RESIZE, // EvPrShrThresh
RESIZE, // EvPrShrEdgeOnly
RESIZE, // EvPrShrEdgeRadius=375,
RESIZE, // EvPrShrEdgeTolerance=376,
RESIZE, // EvPrShrHaloControl=377,
RESIZE, // EvPrShrHaloAmount=378,
RESIZE, // EvPrShrMethod=379,
RESIZE, // EvPrShrDRadius=380,
RESIZE, // EvPrShrDAmount=381,
RESIZE, // EvPrShrDDamping=382,
RESIZE, // EvPrShrDIterations=383,
DIRPYREQUALIZER, // EvWavcbenab
DIRPYREQUALIZER, // EvWavgreenhigh
DIRPYREQUALIZER, // EvWavbluehigh
DIRPYREQUALIZER, // EvWavgreenmed
DIRPYREQUALIZER, // EvWavbluemed
DIRPYREQUALIZER, // EvWavgreenlow
DIRPYREQUALIZER, // EvWavbluelow
DIRPYREQUALIZER, // EvWavNeutral
RGBCURVE, // EvDCPApplyLookTable,
RGBCURVE, // EvDCPApplyBaselineExposureOffset,
INPUTPROFILE, // EvDCPApplyHueSatMap
DIRPYREQUALIZER, // EvWavenacont
DIRPYREQUALIZER, // EvWavenachrom
DIRPYREQUALIZER, // EvWavenaedge
DIRPYREQUALIZER, // EvWavenares
DIRPYREQUALIZER, // EvWavenafin
DIRPYREQUALIZER, // EvWavenatoning
DIRPYREQUALIZER, // EvWavenanoise
DIRPYREQUALIZER, // EvWavedgesensi
DIRPYREQUALIZER, // EvWavedgeampli
DIRPYREQUALIZER, // EvWavlev3nois
DIRPYREQUALIZER, // EvWavNPmet
ALLNORAW, // EvretinexMethod
ALLNORAW, // EvLneigh
ALLNORAW, // EvLgain
ALLNORAW, // EvLoffs
ALLNORAW, // EvLstr
ALLNORAW, // EvLscal
ALLNORAW, // EvLvart
ALLNORAW, // EvLCDCurve
ALLNORAW, // EvRetinextransmission
DEMOSAIC, // EvRetinexEnabled
ALLNORAW, // EvRetinexmedianmap
ALLNORAW, // EvLlimd
DEMOSAIC, // Evretinexcolorspace
ALLNORAW // EvLCDHCurve
};

1
rtengine/refreshmap.h
View File

@@ -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[];