merged dev into locallab_dev

2017-03-20 15:22:01 +01:00
parent 0464babf36 2228159ff8
commit 04bdea0b84
85 changed files with 5889 additions and 1899 deletions
--- a/rtengine/refreshmap.cc
+++ b/rtengine/refreshmap.cc
@@ -468,80 +468,109 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
    DEMOSAIC,         // EvviewMethod
    ALLNORAW,         // EvcbdlMethod
    RETINEX,          // EvRetinexgaintransmission
-    RETINEX,         //EvLskal
-    OUTPUTPROFILE,     // EvOBPCompens
-    LUMINANCECURVE, //EvlocallabEnabled
-    LUMINANCECURVE, //EvlocallablocY
-    LUMINANCECURVE, //EvlocallablocX
-    LUMINANCECURVE,//   EvlocallabCenter
-    LUMINANCECURVE, //EvlocallabDegree
-    LUMINANCECURVE, //Evlocallablightness
-    LUMINANCECURVE, //Evlocallabcontrast
-    LUMINANCECURVE, //Evlocallabchroma
-    LUMINANCECURVE, //Evlocallabtransit
-    LUMINANCECURVE, //Evlocallabavoid
-    LUMINANCECURVE, //EvlocallablocYT
-    LUMINANCECURVE, //EvlocallablocXL
-    LUMINANCECURVE, //EvlocallabSmet
-    LUMINANCECURVE, //Evlocallabinvers
-    LUMINANCECURVE, //Evlocallabradius
-    LUMINANCECURVE, //Evlocallabinversrad
-    LUMINANCECURVE, //Evlocallabstrength
-    LUMINANCECURVE,  //Evlocallabsensi
-    LUMINANCECURVE,  //EvlocallabretinexMethod
-    LUMINANCECURVE,  //Evlocallabstr
-    LUMINANCECURVE,  //Evlocallabneigh
-    LUMINANCECURVE,  //Evlocallabvart
-    LUMINANCECURVE,  //EvlocallabCTgainCurve
-    LUMINANCECURVE,  //Evlocallabchrrt
-    LUMINANCECURVE,  //Evlocallabinversret
-    LUMINANCECURVE,  //Evlocallabsensih
-    LUMINANCECURVE,  //Evlocallabnbspot
-    LUMINANCECURVE,  //Evlocallabactivlum
-    LUMINANCECURVE,  //Evlocallabanbspot
-    LUMINANCECURVE,  //Evlocallabsharradius
-    LUMINANCECURVE,  //Evlocallabsharamount
-    LUMINANCECURVE,  //Evlocallabshardamping
-    LUMINANCECURVE,  //Evlocallabshariter
-    LUMINANCECURVE,  //Evlocallabsensis
-    LUMINANCECURVE,  //Evlocallabinverssha
-    LUMINANCECURVE,  //Evlocallabcircrad
-    LUMINANCECURVE,  //Evlocallabthres
-    LUMINANCECURVE,  //Evlocallabproxi
-    LUMINANCECURVE,  //EvlocallabqualityMethod
-    LUMINANCECURVE,  //Evlocallabnoiselumf
-    LUMINANCECURVE,  //Evlocallabnoiselumc
-    LUMINANCECURVE,  //Evlocallabnoisechrof
-    LUMINANCECURVE,  //Evlocallabnoisechroc
-    LUMINANCECURVE,  //EvlocallabThresho
-    LUMINANCECURVE,  //EvlocallabEqualizer
-    LUMINANCECURVE,  //Evlocallabsensicb
-    LUMINANCECURVE,  //Evlocallabsensibn
-    LUMINANCECURVE,  //Evlocallabstren
-    LUMINANCECURVE,  //Evlocallabgamma
-    LUMINANCECURVE,  //Evlocallabestop
-    LUMINANCECURVE,  //Evlocallabscaltm
-    LUMINANCECURVE,  //Evlocallabrewei
-    LUMINANCECURVE,  //Evlocallabsensitm
-    LUMINANCECURVE,  //EvlocallabCTgainCurverab
-    LUMINANCECURVE,  //Evlocallabretrab
-    LUMINANCECURVE,  //Evlocallabllshape
-    LUMINANCECURVE,  //Evlocenacolor
-    LUMINANCECURVE,  //Evlocenablur
-    LUMINANCECURVE,  //Evlocenatonemap
-    LUMINANCECURVE,  //Evlocenareti
-    LUMINANCECURVE,  //Evlocenasharp
-    LUMINANCECURVE,  //Evlocenacbdl
-    LUMINANCECURVE,  //Evlocenadenoi
-    LUMINANCECURVE,  //EvlocallabLHshape
-    LUMINANCECURVE,  //Evlocallabcurvactiv
-    LUMINANCECURVE,  //Evlocallabccshape
-    LUMINANCECURVE,  //EvlocallabqualitycurveMethod
-    ALLNORAW,          // EvWBtempBias
-    LUMINANCECURVE,  //Evlocallabhueref
-    LUMINANCECURVE,  //Evlocallabchromaref
-    LUMINANCECURVE  //Evlocallablumaref
-
+    RETINEX,          // EvLskal
+    OUTPUTPROFILE,    // EvOBPCompens
+    LUMINANCECURVE,   // EvlocallabEnabled
+    LUMINANCECURVE,   // EvlocallablocY
+    LUMINANCECURVE,   // EvlocallablocX
+    LUMINANCECURVE,   // EvlocallabCenter
+    LUMINANCECURVE,   // EvlocallabDegree
+    LUMINANCECURVE,   // Evlocallablightness
+    LUMINANCECURVE,   // Evlocallabcontrast
+    LUMINANCECURVE,   // Evlocallabchroma
+    LUMINANCECURVE,   // Evlocallabtransit
+    LUMINANCECURVE,   // Evlocallabavoid
+    LUMINANCECURVE,   // EvlocallablocYT
+    LUMINANCECURVE,   // EvlocallablocXL
+    LUMINANCECURVE,   // EvlocallabSmet
+    LUMINANCECURVE,   // Evlocallabinvers
+    LUMINANCECURVE,   // Evlocallabradius
+    LUMINANCECURVE,   // Evlocallabinversrad
+    LUMINANCECURVE,   // Evlocallabstrength
+    LUMINANCECURVE,   // Evlocallabsensi
+    LUMINANCECURVE,   // EvlocallabretinexMethod
+    LUMINANCECURVE,   // Evlocallabstr
+    LUMINANCECURVE,   // Evlocallabneigh
+    LUMINANCECURVE,   // Evlocallabvart
+    LUMINANCECURVE,   // EvlocallabCTgainCurve
+    LUMINANCECURVE,   // Evlocallabchrrt
+    LUMINANCECURVE,   // Evlocallabinversret
+    LUMINANCECURVE,   // Evlocallabsensih
+    LUMINANCECURVE,   // Evlocallabnbspot
+    LUMINANCECURVE,   // Evlocallabactivlum
+    LUMINANCECURVE,   // Evlocallabanbspot
+    LUMINANCECURVE,   // Evlocallabsharradius
+    LUMINANCECURVE,   // Evlocallabsharamount
+    LUMINANCECURVE,   // Evlocallabshardamping
+    LUMINANCECURVE,   // Evlocallabshariter
+    LUMINANCECURVE,   // Evlocallabsensis
+    LUMINANCECURVE,   // Evlocallabinverssha
+    LUMINANCECURVE,   // Evlocallabcircrad
+    LUMINANCECURVE,   // Evlocallabthres
+    LUMINANCECURVE,   // Evlocallabproxi
+    LUMINANCECURVE,   // EvlocallabqualityMethod
+    LUMINANCECURVE,   // Evlocallabnoiselumf
+    LUMINANCECURVE,   // Evlocallabnoiselumc
+    LUMINANCECURVE,   // Evlocallabnoisechrof
+    LUMINANCECURVE,   // Evlocallabnoisechroc
+    LUMINANCECURVE,   // EvlocallabThresho
+    LUMINANCECURVE,   // EvlocallabEqualizer
+    LUMINANCECURVE,   // Evlocallabsensicb
+    LUMINANCECURVE,   // Evlocallabsensibn
+    LUMINANCECURVE,   // Evlocallabstren
+    LUMINANCECURVE,   // Evlocallabgamma
+    LUMINANCECURVE,   // Evlocallabestop
+    LUMINANCECURVE,   // Evlocallabscaltm
+    LUMINANCECURVE,   // Evlocallabrewei
+    LUMINANCECURVE,   // Evlocallabsensitm
+    LUMINANCECURVE,   // EvlocallabCTgainCurverab
+    LUMINANCECURVE,   // Evlocallabretrab
+    LUMINANCECURVE,   // Evlocallabllshape
+    LUMINANCECURVE,   // Evlocenacolor
+    LUMINANCECURVE,   // Evlocenablur
+    LUMINANCECURVE,   // Evlocenatonemap
+    LUMINANCECURVE,   // Evlocenareti
+    LUMINANCECURVE,   // Evlocenasharp
+    LUMINANCECURVE,   // Evlocenacbdl
+    LUMINANCECURVE,   // Evlocenadenoi
+    LUMINANCECURVE,   // EvlocallabLHshape
+    LUMINANCECURVE,   // Evlocallabcurvactiv
+    LUMINANCECURVE,   // Evlocallabccshape
+    LUMINANCECURVE,   // EvlocallabqualitycurveMethod
+    LUMINANCECURVE,   // Evlocallabhueref
+    LUMINANCECURVE,   // Evlocallabchromaref
+    LUMINANCECURVE,   // Evlocallablumaref
+    ALLNORAW,         // EvWBtempBias
+    DARKFRAME,        // EvRawImageNum
+    DEMOSAIC,         // EvPixelShiftMotion
+    DEMOSAIC,         // EvPixelShiftMotionCorrection
+    DEMOSAIC,         // EvPixelShiftStddevFactorGreen
+    DEMOSAIC,         // EvPixelShiftEperIso
+    DEMOSAIC,         // EvPixelShiftNreadIso
+    DEMOSAIC,         // EvPixelShiftPrnu
+    DEMOSAIC,         // EvPixelshiftShowMotion
+    DEMOSAIC,         // EvPixelshiftShowMotionMaskOnly
+    DEMOSAIC,         // EvPixelShiftAutomatic
+    DEMOSAIC,         // EvPixelShiftNonGreenHorizontal
+    DEMOSAIC,         // EvPixelShiftNonGreenVertical
+    DEMOSAIC,         // EvPixelShiftNonGreenCross
+    DEMOSAIC,         // EvPixelShiftStddevFactorRed
+    DEMOSAIC,         // EvPixelShiftStddevFactorBlue
+    DEMOSAIC,         // EvPixelShiftNonGreenCross2
+    DEMOSAIC,         // EvPixelShiftNonGreenAmaze
+    DEMOSAIC,         // EvPixelShiftGreen
+    DEMOSAIC,         // EvPixelShiftRedBlueWeight
+    DEMOSAIC,         // EvPixelShiftBlur
+    DEMOSAIC,         // EvPixelShiftSigma
+    DEMOSAIC,         // EvPixelShiftSum
+    DEMOSAIC,         // EvPixelShiftExp0
+    DEMOSAIC,         // EvPixelShiftHoleFill
+    DEMOSAIC,         // EvPixelShiftMedian
+    DEMOSAIC,         // EvPixelShiftMedian3
+    DEMOSAIC,         // EvPixelShiftMotionMethod
+    DEMOSAIC,         // EvPixelShiftSmooth
+    DEMOSAIC,         // EvPixelShiftLmmse
+    DEMOSAIC          // EvPixelShiftEqualBright

 };