From 0a554282054c061fb06422ebae1f218fec8003e2 Mon Sep 17 00:00:00 2001 From: Lawrence37 <45837045+Lawrence37@users.noreply.github.com> Date: Wed, 24 Aug 2022 11:23:09 -0700 Subject: [PATCH] Clean up missing language keys (#6556) * Clean up some unused code * Use grid for abstract profile primaries * Remove blank line from default --- rtdata/languages/default | 57 +++++-------- rtengine/ipwavelet.cc | 23 +++--- rtengine/procevents.h | 15 +--- rtengine/procparams.cc | 86 +++++++++---------- rtengine/procparams.h | 4 +- rtgui/blackwhite.cc | 1 - rtgui/controlspotpanel.cc | 168 +++++++++++++++++++------------------- rtgui/controlspotpanel.h | 16 ++-- rtgui/icmpanel.cc | 108 ++++++++---------------- rtgui/icmpanel.h | 22 +++-- rtgui/locallab.cc | 28 +++---- rtgui/locallab.h | 4 +- rtgui/locallabtools.h | 6 +- rtgui/locallabtools2.cc | 64 +++++++-------- rtgui/paramsedited.cc | 20 ++--- rtgui/paramsedited.h | 4 +- rtgui/perspective.cc | 2 +- rtgui/toolpanelcoord.cc | 2 +- rtgui/wavelet.cc | 148 ++++++++++++++++----------------- rtgui/wavelet.h | 12 +-- 20 files changed, 361 insertions(+), 429 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index d7d9c5a55..53911e1c3 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -662,7 +662,7 @@ HISTORY_MSG_421;Retinex - Gamma HISTORY_MSG_422;Retinex - Gamma HISTORY_MSG_423;Retinex - Gamma slope HISTORY_MSG_424;Retinex - HL threshold -HISTORY_MSG_425;Retinex - Log base +HISTORY_MSG_425;--unused-- HISTORY_MSG_426;Retinex - Hue equalizer HISTORY_MSG_427;Output rendering intent HISTORY_MSG_428;Monitor rendering intent @@ -683,31 +683,31 @@ HISTORY_MSG_442;Retinex - Scale HISTORY_MSG_443;Output black point compensation HISTORY_MSG_444;WB - Temp bias HISTORY_MSG_445;Raw Sub-Image -HISTORY_MSG_446;EvPixelShiftMotion -HISTORY_MSG_447;EvPixelShiftMotionCorrection -HISTORY_MSG_448;EvPixelShiftStddevFactorGreen +HISTORY_MSG_446;--unused-- +HISTORY_MSG_447;--unused-- +HISTORY_MSG_448;--unused-- HISTORY_MSG_449;PS ISO adaption -HISTORY_MSG_450;EvPixelShiftNreadIso -HISTORY_MSG_451;EvPixelShiftPrnu +HISTORY_MSG_450;--unused-- +HISTORY_MSG_451;--unused-- HISTORY_MSG_452;PS Show motion HISTORY_MSG_453;PS Show mask only -HISTORY_MSG_454;EvPixelShiftAutomatic -HISTORY_MSG_455;EvPixelShiftNonGreenHorizontal -HISTORY_MSG_456;EvPixelShiftNonGreenVertical +HISTORY_MSG_454;--unused-- +HISTORY_MSG_455;--unused-- +HISTORY_MSG_456;--unused-- HISTORY_MSG_457;PS Check red/blue -HISTORY_MSG_458;EvPixelShiftStddevFactorRed -HISTORY_MSG_459;EvPixelShiftStddevFactorBlue -HISTORY_MSG_460;EvPixelShiftGreenAmaze -HISTORY_MSG_461;EvPixelShiftNonGreenAmaze +HISTORY_MSG_458;--unused-- +HISTORY_MSG_459;--unused-- +HISTORY_MSG_460;--unused-- +HISTORY_MSG_461;--unused-- HISTORY_MSG_462;PS Check green -HISTORY_MSG_463;EvPixelShiftRedBlueWeight +HISTORY_MSG_463;--unused-- HISTORY_MSG_464;PS Blur motion mask HISTORY_MSG_465;PS Blur radius -HISTORY_MSG_466;EvPixelShiftSum -HISTORY_MSG_467;EvPixelShiftExp0 +HISTORY_MSG_466;--unused-- +HISTORY_MSG_467;--unused-- HISTORY_MSG_468;PS Fill holes HISTORY_MSG_469;PS Median -HISTORY_MSG_470;EvPixelShiftMedian3 +HISTORY_MSG_470;--unused-- HISTORY_MSG_471;PS Motion correction HISTORY_MSG_472;PS Smooth transitions HISTORY_MSG_474;PS Equalize @@ -815,7 +815,7 @@ HISTORY_MSG_576;Local - cbdl mult HISTORY_MSG_577;Local - cbdl chroma HISTORY_MSG_578;Local - cbdl threshold HISTORY_MSG_579;Local - cbdl scope -HISTORY_MSG_580;Local - Denoise +HISTORY_MSG_580;--unused-- HISTORY_MSG_581;Local - deNoise lum f 1 HISTORY_MSG_582;Local - deNoise lum c HISTORY_MSG_583;Local - deNoise lum detail @@ -898,7 +898,7 @@ HISTORY_MSG_660;Local - cbdl clarity HISTORY_MSG_661;Local - cbdl contrast residual HISTORY_MSG_662;Local - deNoise lum f 0 HISTORY_MSG_663;Local - deNoise lum f 2 -HISTORY_MSG_664;Local - cbdl Blur +HISTORY_MSG_664;--unused-- HISTORY_MSG_665;Local - cbdl mask Blend HISTORY_MSG_666;Local - cbdl mask radius HISTORY_MSG_667;Local - cbdl mask chroma @@ -1146,7 +1146,7 @@ HISTORY_MSG_920;Local - Wavelet sigma LC HISTORY_MSG_921;Local - Wavelet Graduated sigma LC2 HISTORY_MSG_922;Local - changes In Black and White HISTORY_MSG_923;Local - Tool complexity mode -HISTORY_MSG_924;Local - Tool complexity mode +HISTORY_MSG_924;--unused-- HISTORY_MSG_925;Local - Scope color tools HISTORY_MSG_926;Local - Show mask type HISTORY_MSG_927;Local - Shadow @@ -1323,7 +1323,6 @@ HISTORY_MSG_1095;Local - Jz highligths thr HISTORY_MSG_1096;Local - Jz shadows HISTORY_MSG_1097;Local - Jz shadows thr HISTORY_MSG_1098;Local - Jz radius SH -//HISTORY_MSG_1099;Local - Hz(Hz) Curve HISTORY_MSG_1099;Local - Cz(Hz) Curve HISTORY_MSG_1100;Local - Jz reference 100 HISTORY_MSG_1101;Local - Jz PQ remap @@ -1494,7 +1493,6 @@ HISTORY_MSG_WAVCHROMFI;Chroma fine HISTORY_MSG_WAVCHR;Blur levels - blur chroma HISTORY_MSG_WAVCLARI;Clarity HISTORY_MSG_WAVDENLH;Level 5 -HISTORY_MSG_WAVDENMET;Local equalizer HISTORY_MSG_WAVDENOISE;Local contrast HISTORY_MSG_WAVDENOISEH;High levels Local contrast HISTORY_MSG_WAVDETEND;Details soft @@ -2651,7 +2649,6 @@ TP_LOCALCONTRAST_RADIUS;Radius TP_LOCALLAB_ACTIV;Luminance only TP_LOCALLAB_ACTIVSPOT;Enable Spot TP_LOCALLAB_ADJ;Equalizer Color -TP_LOCALLAB_ALL;All rubrics TP_LOCALLAB_AMOUNT;Amount TP_LOCALLAB_ARTIF;Shape detection TP_LOCALLAB_ARTIF_TOOLTIP;ΔE scope threshold increases the range of deltaE scope. High values are for very wide gamut images.\nIncreasing deltaE decay can improve shape detection, but can also reduce the scope. @@ -2769,8 +2766,6 @@ TP_LOCALLAB_COLOR_TOOLNAME;Color & Light TP_LOCALLAB_COL_NAME;Name TP_LOCALLAB_COL_VIS;Status TP_LOCALLAB_COMPFRA;Directional contrast -TP_LOCALLAB_COMPLEX_METHOD;Software Complexity -TP_LOCALLAB_COMPLEX_TOOLTIP; Allow user to select Local adjustments complexity. TP_LOCALLAB_COMPREFRA;Wavelet level tone mapping TP_LOCALLAB_CONTCOL;Contrast threshold TP_LOCALLAB_CONTFRA;Contrast by level @@ -2877,7 +2872,6 @@ TP_LOCALLAB_FATDETAIL;Detail TP_LOCALLAB_FATFRA;Dynamic Range Compression ƒ TP_LOCALLAB_FATFRAME_TOOLTIP;PDE Fattal – uses the Fattal Tone-mapping algorithm. TP_LOCALLAB_FATLEVEL;Sigma -TP_LOCALLAB_FATRES;Amount Residual Image TP_LOCALLAB_FATSHFRA;Dynamic Range Compression Mask ƒ TP_LOCALLAB_FEATH_TOOLTIP;Gradient width as a percentage of the Spot diagonal\nUsed by all graduated filters in all tools.\nNo action if a graduated filter hasn’t been activated. TP_LOCALLAB_FEATVALUE;Feather gradient (Grad. Filters) @@ -3107,7 +3101,6 @@ TP_LOCALLAB_MASKUSABLE;Mask enabled (Mask & modifications) TP_LOCALLAB_MASKUNUSABLE;Mask disabled (Mask & modifications) TP_LOCALLAB_MASKRECOTHRES;Recovery threshold TP_LOCALLAB_MASK_TOOLTIP;You can enable multiple masks for a tool by activating another tool and using only the mask (set the tool sliders to 0 ).\n\nYou can also duplicate the RT-spot and place it close to the first spot. The small variations in the spot references allow you to make fine adjustments. -TP_LOCALLAB_MED;Medium TP_LOCALLAB_MEDIAN;Median Low TP_LOCALLAB_MEDIANITER_TOOLTIP;The number of successive iterations carried out by the median filter. TP_LOCALLAB_MEDIAN_TOOLTIP;You can choose a median value in the range 3x3 to 9x9 pixels. Higher values increase noise reduction and blur. @@ -3244,7 +3237,6 @@ TP_LOCALLAB_ROW_VIS;Visible TP_LOCALLAB_RSTPROTECT_TOOLTIP;Red and skin-tone protection affects the Saturation, Chroma and Colorfulness sliders. TP_LOCALLAB_SATUR;Saturation TP_LOCALLAB_SATURV;Saturation (s) -TP_LOCALLAB_SAVREST;Save - Restore Current Image TP_LOCALLAB_SCALEGR;Scale TP_LOCALLAB_SCALERETI;Scale TP_LOCALLAB_SCALTM;Scale @@ -3318,7 +3310,6 @@ TP_LOCALLAB_SIGMOIDTH;Threshold (Gray point) TP_LOCALLAB_SIGMOIDBL;Blend TP_LOCALLAB_SIGMOIDQJ;Uses Black Ev & White Ev TP_LOCALLAB_SIGMOID_TOOLTIP;Allows you to simulate a Tone-mapping appearance using both the'Ciecam' (or 'Jz') and 'Sigmoid' function.\nThree sliders: a) Contrast acts on the shape of the sigmoid curve and consequently on the strength; b) Threshold (Gray point) distributes the action according to the luminance; c)Blend acts on the final aspect of the image, contrast and luminance. -TP_LOCALLAB_SIM;Simple TP_LOCALLAB_SLOMASKCOL;Slope TP_LOCALLAB_SLOMASK_TOOLTIP;Adjusting Gamma and Slope can provide a soft and artifact-free transformation of the mask by progressively modifying ‘L’ to avoid any discontinuities. TP_LOCALLAB_SLOSH;Slope @@ -3846,7 +3837,6 @@ TP_WAVELET_CONTEDIT;'After' contrast curve TP_WAVELET_CONTFRAME;Contrast - Compression TP_WAVELET_CONTR;Gamut TP_WAVELET_CONTRA;Contrast -TP_WAVELET_CONTRASTEDIT;Finer - Coarser levels TP_WAVELET_CONTRAST_MINUS;Contrast - TP_WAVELET_CONTRAST_PLUS;Contrast + TP_WAVELET_CONTRA_TOOLTIP;Changes the residual image contrast. @@ -3869,13 +3859,7 @@ TP_WAVELET_DAUB14;D14 - high TP_WAVELET_DAUBLOCAL;Wavelet Edge performance TP_WAVELET_DAUB_TOOLTIP;Changes Daubechies coefficients:\nD4 = Standard,\nD14 = Often best performance, 10% more time-intensive.\n\nAffects edge detection as well as the general quality of the first levels. However the quality is not strictly related to this coefficient and can vary depending on image and use. TP_WAVELET_DEN5THR;Guided threshold -TP_WAVELET_DEN12LOW;1 2 Low -TP_WAVELET_DEN12PLUS;1 2 High -TP_WAVELET_DEN14LOW;1 4 Low -TP_WAVELET_DEN14PLUS;1 4 High -TP_WAVELET_DENCONTRAST;Local contrast Equalizer TP_WAVELET_DENCURV;Curve -TP_WAVELET_DENEQUAL;1 2 3 4 Equal TP_WAVELET_DENL;Correction structure TP_WAVELET_DENLH;Guided threshold levels 1-4 TP_WAVELET_DENLOCAL_TOOLTIP;Use a curve in order to guide the denoising according to the local contrast.\nThe areas are denoised, the structures are maintained @@ -3918,7 +3902,6 @@ TP_WAVELET_EDTYPE;Local contrast method TP_WAVELET_EDVAL;Strength TP_WAVELET_FINAL;Final Touchup TP_WAVELET_FINCFRAME;Final local contrast -TP_WAVELET_FINCOAR_TOOLTIP;The left (positive) part of the curve acts on the finer levels (increase).\nThe 2 points on the abscissa represent the respective action limits of finer and coarser levels 5 and 6 (default).\nThe right (negative) part of the curve acts on the coarser levels (increase).\nAvoid moving the left part of the curve with negative values. Avoid moving the right part of the curve with positives values TP_WAVELET_FINEST;Finest TP_WAVELET_FINTHR_TOOLTIP;Uses local contrast to reduce or increase the action of the guided filter TP_WAVELET_GUIDFRAME;Final smoothing (guided filter) diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc index a545c719a..5ced9dbdd 100644 --- a/rtengine/ipwavelet.cc +++ b/rtengine/ipwavelet.cc @@ -301,17 +301,18 @@ void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int kall, const } - if (params->wavelet.denmethod == "equ") { - cp.denmet = 0; - } else if (params->wavelet.denmethod == "high") { - cp.denmet = 1; - } else if (params->wavelet.denmethod == "low") { - cp.denmet = 2; - } else if (params->wavelet.denmethod == "12high") { - cp.denmet = 3; - } else if (params->wavelet.denmethod == "12low") { - cp.denmet = 4; - } + cp.denmet = 4; + //if (params->wavelet.denmethod == "equ") { + // cp.denmet = 0; + //} else if (params->wavelet.denmethod == "high") { + // cp.denmet = 1; + //} else if (params->wavelet.denmethod == "low") { + // cp.denmet = 2; + //} else if (params->wavelet.denmethod == "12high") { + // cp.denmet = 3; + //} else if (params->wavelet.denmethod == "12low") { + // cp.denmet = 4; + //} if (params->wavelet.mixmethod == "nois") { cp.mixmet = 0; diff --git a/rtengine/procevents.h b/rtengine/procevents.h index 4c9f4f8ec..a83419559 100644 --- a/rtengine/procevents.h +++ b/rtengine/procevents.h @@ -893,7 +893,7 @@ enum ProcEventCode { Evlocallabsigmadc = 863, Evlocallabdeltad = 864, EvlocallabwavCurvecomp = 865, - Evlocallabfatres = 866, + //Evlocallabfatres = 866, EvLocallabSpotbalanh = 867, EvlocallabwavCurveden = 868, EvlocallabHHmasklcshape = 869, @@ -922,7 +922,7 @@ enum ProcEventCode { Evlocallabanglog = 892, EvLocallabSpotcolorde = 893, // EvlocallabshowmasksharMethod = 894, - Evlocallabshowreset = 895, + //Evlocallabshowreset = 895, Evlocallabstrengthw = 896, Evlocallabradiusw = 897, Evlocallabdetailw = 898, @@ -1002,7 +1002,7 @@ enum ProcEventCode { EvLocallabchromaskL = 972, EvlocallabLmaskshapeL = 973, Evlocallablightl = 974, - EvlocallabLshapeL = 975, + //EvlocallabLshapeL = 975, Evlocallabcontq = 976, Evlocallabsursour = 977, Evlocallablightq = 978, @@ -1125,7 +1125,6 @@ enum ProcEventCode { Evlocallabshjzcie = 1095, Evlocallabshthjzcie = 1096, Evlocallabradjzcie = 1097, -// EvlocallabHHshapejz = 1098, EvlocallabCHshapejz = 1098, Evlocallabjz100 = 1099, Evlocallabpqremap = 1100, @@ -1140,14 +1139,6 @@ enum ProcEventCode { Evlocallabshapecz = 1109, Evlocallabshapeczjz = 1110, Evlocallabforcejz = 1111, - //Evlocallablightlzcam = 1113, - //Evlocallablightqzcam = 1114, - //Evlocallabcontlzcam = 1115, - //Evlocallabcontqzcam = 1116, - //Evlocallabcontthreszcam = 1117, - //Evlocallabcolorflzcam = 1118, - //Evlocallabsaturzcam = 1119, - //Evlocallabchromzcam = 1120, Evlocallabpqremapcam16 = 1112, EvLocallabEnacieMask = 1113, EvlocallabCCmaskcieshape = 1114, diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 9a9e4fef1..04ece8bc3 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -2420,41 +2420,41 @@ WaveletParams::WaveletParams() : 0.35, 0.35 }, - opacityCurveSH{ - static_cast(FCT_MinMaxCPoints), - 0., - 1., - 0.35, - 0.35, - 0.15, - 0.9, - 0.35, - 0.35, - 0.4, - 0.8, - 0.35, - 0.35, - 0.4, - 0.5, - 0.35, - 0.35, - 0.5, - 0.5, - 0.35, - 0.35, - 0.5, - 0.2, - 0.35, - 0.35, - 0.8, - 0.1, - 0.35, - 0.35, - 1.0, - 0., - 0.35, - 0.35 - }, + //opacityCurveSH{ + // static_cast(FCT_MinMaxCPoints), + // 0., + // 1., + // 0.35, + // 0.35, + // 0.15, + // 0.9, + // 0.35, + // 0.35, + // 0.4, + // 0.8, + // 0.35, + // 0.35, + // 0.4, + // 0.5, + // 0.35, + // 0.35, + // 0.5, + // 0.5, + // 0.35, + // 0.35, + // 0.5, + // 0.2, + // 0.35, + // 0.35, + // 0.8, + // 0.1, + // 0.35, + // 0.35, + // 1.0, + // 0., + // 0.35, + // 0.35 + //}, /* opacityCurveSH{ static_cast(FCT_MinMaxCPoints), @@ -2592,7 +2592,7 @@ WaveletParams::WaveletParams() : Backmethod("grey"), Tilesmethod("full"), complexmethod("normal"), - denmethod("12low"), + //denmethod("12low"), mixmethod("mix"), slimethod("sli"), quamethod("cons"), @@ -2666,7 +2666,7 @@ bool WaveletParams::operator ==(const WaveletParams& other) const && wavdenoiseh == other.wavdenoiseh && blcurve == other.blcurve && opacityCurveRG == other.opacityCurveRG - && opacityCurveSH == other.opacityCurveSH + //&& opacityCurveSH == other.opacityCurveSH && opacityCurveBY == other.opacityCurveBY && opacityCurveW == other.opacityCurveW && opacityCurveWL == other.opacityCurveWL @@ -2742,7 +2742,7 @@ bool WaveletParams::operator ==(const WaveletParams& other) const && Backmethod == other.Backmethod && Tilesmethod == other.Tilesmethod && complexmethod == other.complexmethod - && denmethod == other.denmethod + //&& denmethod == other.denmethod && mixmethod == other.mixmethod && slimethod == other.slimethod && quamethod == other.quamethod @@ -2829,7 +2829,7 @@ void WaveletParams::getCurves( wavdenoiseh.Set(this->wavdenoiseh); tCurve.Set(this->blcurve); opacityCurveLUTRG.Set(this->opacityCurveRG); - opacityCurveLUTSH.Set(this->opacityCurveSH); + //opacityCurveLUTSH.Set(this->opacityCurveSH); opacityCurveLUTBY.Set(this->opacityCurveBY); opacityCurveLUTW.Set(this->opacityCurveW); opacityCurveLUTWL.Set(this->opacityCurveWL); @@ -7235,7 +7235,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo saveToKeyfile(!pedited || pedited->wavelet.thres, "Wavelet", "MaxLev", wavelet.thres, keyFile); saveToKeyfile(!pedited || pedited->wavelet.Tilesmethod, "Wavelet", "TilesMethod", wavelet.Tilesmethod, keyFile); saveToKeyfile(!pedited || pedited->wavelet.complexmethod, "Wavelet", "complexMethod", wavelet.complexmethod, keyFile); - saveToKeyfile(!pedited || pedited->wavelet.denmethod, "Wavelet", "denMethod", wavelet.denmethod, keyFile); + //saveToKeyfile(!pedited || pedited->wavelet.denmethod, "Wavelet", "denMethod", wavelet.denmethod, keyFile); saveToKeyfile(!pedited || pedited->wavelet.mixmethod, "Wavelet", "mixMethod", wavelet.mixmethod, keyFile); saveToKeyfile(!pedited || pedited->wavelet.slimethod, "Wavelet", "sliMethod", wavelet.slimethod, keyFile); saveToKeyfile(!pedited || pedited->wavelet.quamethod, "Wavelet", "quaMethod", wavelet.quamethod, keyFile); @@ -7326,7 +7326,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo saveToKeyfile(!pedited || pedited->wavelet.pastlev, "Wavelet", "Pastlev", wavelet.pastlev.toVector(), keyFile); saveToKeyfile(!pedited || pedited->wavelet.satlev, "Wavelet", "Satlev", wavelet.satlev.toVector(), keyFile); saveToKeyfile(!pedited || pedited->wavelet.opacityCurveRG, "Wavelet", "OpacityCurveRG", wavelet.opacityCurveRG, keyFile); - saveToKeyfile(!pedited || pedited->wavelet.opacityCurveSH, "Wavelet", "Levalshc", wavelet.opacityCurveSH, keyFile); + //saveToKeyfile(!pedited || pedited->wavelet.opacityCurveSH, "Wavelet", "Levalshc", wavelet.opacityCurveSH, keyFile); saveToKeyfile(!pedited || pedited->wavelet.opacityCurveBY, "Wavelet", "OpacityCurveBY", wavelet.opacityCurveBY, keyFile); saveToKeyfile(!pedited || pedited->wavelet.wavdenoise, "Wavelet", "wavdenoise", wavelet.wavdenoise, keyFile); saveToKeyfile(!pedited || pedited->wavelet.wavdenoiseh, "Wavelet", "wavdenoiseh", wavelet.wavdenoiseh, keyFile); @@ -9595,7 +9595,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited) } } - assignFromKeyfile(keyFile, "Wavelet", "denMethod", pedited, wavelet.denmethod, pedited->wavelet.denmethod); + //assignFromKeyfile(keyFile, "Wavelet", "denMethod", pedited, wavelet.denmethod, pedited->wavelet.denmethod); assignFromKeyfile(keyFile, "Wavelet", "mixMethod", pedited, wavelet.mixmethod, pedited->wavelet.mixmethod); assignFromKeyfile(keyFile, "Wavelet", "sliMethod", pedited, wavelet.slimethod, pedited->wavelet.slimethod); assignFromKeyfile(keyFile, "Wavelet", "quaMethod", pedited, wavelet.quamethod, pedited->wavelet.quamethod); @@ -9645,7 +9645,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited) assignFromKeyfile(keyFile, "Wavelet", "ContrastCurve", pedited, wavelet.ccwcurve, pedited->wavelet.ccwcurve); assignFromKeyfile(keyFile, "Wavelet", "blcurve", pedited, wavelet.blcurve, pedited->wavelet.blcurve); assignFromKeyfile(keyFile, "Wavelet", "OpacityCurveRG", pedited, wavelet.opacityCurveRG, pedited->wavelet.opacityCurveRG); - assignFromKeyfile(keyFile, "Wavelet", "Levalshc", pedited, wavelet.opacityCurveSH, pedited->wavelet.opacityCurveSH); + //assignFromKeyfile(keyFile, "Wavelet", "Levalshc", pedited, wavelet.opacityCurveSH, pedited->wavelet.opacityCurveSH); assignFromKeyfile(keyFile, "Wavelet", "OpacityCurveBY", pedited, wavelet.opacityCurveBY, pedited->wavelet.opacityCurveBY); assignFromKeyfile(keyFile, "Wavelet", "wavdenoise", pedited, wavelet.wavdenoise, pedited->wavelet.wavdenoise); assignFromKeyfile(keyFile, "Wavelet", "wavdenoiseh", pedited, wavelet.wavdenoiseh, pedited->wavelet.wavdenoiseh); diff --git a/rtengine/procparams.h b/rtengine/procparams.h index 04229867b..d730316e2 100644 --- a/rtengine/procparams.h +++ b/rtengine/procparams.h @@ -2070,7 +2070,7 @@ struct WaveletParams { std::vector blcurve; std::vector levelshc; std::vector opacityCurveRG; - std::vector opacityCurveSH; + //std::vector opacityCurveSH; std::vector opacityCurveBY; std::vector opacityCurveW; std::vector opacityCurveWL; @@ -2143,7 +2143,7 @@ struct WaveletParams { Glib::ustring Backmethod; Glib::ustring Tilesmethod; Glib::ustring complexmethod; - Glib::ustring denmethod; + //Glib::ustring denmethod; Glib::ustring mixmethod; Glib::ustring slimethod; Glib::ustring quamethod; diff --git a/rtgui/blackwhite.cc b/rtgui/blackwhite.cc index 7b54f09d2..7fcc45312 100644 --- a/rtgui/blackwhite.cc +++ b/rtgui/blackwhite.cc @@ -1205,7 +1205,6 @@ void BlackWhite::setBatchMode (bool batchMode) { removeIfThere (autoHBox, autoch, false); autoch = Gtk::manage (new Gtk::CheckButton (M("TP_BWMIX_AUTOCH"))); - autoch->set_tooltip_markup (M("TP_BWMIX_AUTOCH_TIP")); autoconn = autoch->signal_toggled().connect( sigc::mem_fun(*this, &BlackWhite::autoch_toggled) ); autoHBox->pack_start (*autoch); diff --git a/rtgui/controlspotpanel.cc b/rtgui/controlspotpanel.cc index 400309512..0d57d98bb 100644 --- a/rtgui/controlspotpanel.cc +++ b/rtgui/controlspotpanel.cc @@ -53,7 +53,7 @@ ControlSpotPanel::ControlSpotPanel(): spotMethod_(Gtk::manage(new MyComboBoxText())), shapeMethod_(Gtk::manage(new MyComboBoxText())), qualityMethod_(Gtk::manage(new MyComboBoxText())), - complexMethod_(Gtk::manage(new MyComboBoxText())), + //complexMethod_(Gtk::manage(new MyComboBoxText())), wavMethod_(Gtk::manage(new MyComboBoxText())), sensiexclu_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSIEXCLU"), 0, 100, 1, 12))), @@ -90,7 +90,7 @@ ControlSpotPanel::ControlSpotPanel(): laplac_(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_LAPLACC")))), deltae_(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_DELTAEC")))), shortc_(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_SHORTC")))), - savrest_(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_SAVREST")))), + //savrest_(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_SAVREST")))), expTransGrad_(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_TRANSIT")))), expShapeDetect_(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_ARTIF")))), @@ -476,11 +476,11 @@ ControlSpotPanel::ControlSpotPanel(): } lumask_->setAdjusterListener(this); - savrestConn_ = savrest_->signal_toggled().connect( - sigc::mem_fun(*this, &ControlSpotPanel::savrestChanged)); + //savrestConn_ = savrest_->signal_toggled().connect( + // sigc::mem_fun(*this, &ControlSpotPanel::savrestChanged)); if (showtooltip) { - savrest_->set_tooltip_text(M("TP_LOCALLAB_SAVREST_TOOLTIP")); + //savrest_->set_tooltip_text(M("TP_LOCALLAB_SAVREST_TOOLTIP")); lumask_->set_tooltip_text(M("TP_LOCALLAB_LUMASK_TOOLTIP")); laplac_->set_tooltip_text(M("TP_LOCALLAB_LAP_MASK_TOOLTIP")); } @@ -498,27 +498,27 @@ ControlSpotPanel::ControlSpotPanel(): Gtk::Separator *separatormet = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)); pack_start(*separatormet, Gtk::PACK_SHRINK, 2); - Gtk::Box* const ctboxcomplexmethod = Gtk::manage(new Gtk::Box()); + //Gtk::Box* const ctboxcomplexmethod = Gtk::manage(new Gtk::Box()); - if (showtooltip) { - ctboxcomplexmethod->set_tooltip_markup(M("TP_LOCALLAB_COMPLEXMETHOD_TOOLTIP")); - } + //if (showtooltip) { + // ctboxcomplexmethod->set_tooltip_markup(M("TP_LOCALLAB_COMPLEXMETHOD_TOOLTIP")); + //} - Gtk::Label* const labelcomplexmethod = Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_COMPLEX_METHOD") + ":")); - ctboxcomplexmethod->pack_start(*labelcomplexmethod, Gtk::PACK_SHRINK, 4); + //Gtk::Label* const labelcomplexmethod = Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_COMPLEX_METHOD") + ":")); + //ctboxcomplexmethod->pack_start(*labelcomplexmethod, Gtk::PACK_SHRINK, 4); - if (showtooltip) { - complexMethod_->set_tooltip_markup(M("TP_LOCALLAB_COMPLEX_TOOLTIP")); - } + //if (showtooltip) { + // complexMethod_->set_tooltip_markup(M("TP_LOCALLAB_COMPLEX_TOOLTIP")); + //} - complexMethod_->append(M("TP_LOCALLAB_SIM")); - complexMethod_->append(M("TP_LOCALLAB_MED")); - complexMethod_->append(M("TP_LOCALLAB_ALL")); - complexMethod_->set_active(1); - complexMethodconn_ = complexMethod_->signal_changed().connect( - sigc::mem_fun( - *this, &ControlSpotPanel::complexMethodChanged)); - ctboxcomplexmethod->pack_start(*complexMethod_); + //complexMethod_->append(M("TP_LOCALLAB_SIM")); + //complexMethod_->append(M("TP_LOCALLAB_MED")); + //complexMethod_->append(M("TP_LOCALLAB_ALL")); + //complexMethod_->set_active(1); + //complexMethodconn_ = complexMethod_->signal_changed().connect( + // sigc::mem_fun( + // *this, &ControlSpotPanel::complexMethodChanged)); + //ctboxcomplexmethod->pack_start(*complexMethod_); // pack_start(*ctboxcomplexmethod); /* Gtk::Box* const ctboxwavmethod = Gtk::manage(new Gtk::Box()); @@ -865,8 +865,8 @@ void ControlSpotPanel::load_ControlSpot_param() denoichmask_->setValue(row[spots_.denoichmask]); shortc_->set_active(row[spots_.shortc]); lumask_->setValue((double)row[spots_.lumask]); - savrest_->set_active(row[spots_.savrest]); - complexMethod_->set_active(row[spots_.complexMethod]); + //savrest_->set_active(row[spots_.savrest]); + //complexMethod_->set_active(row[spots_.complexMethod]); wavMethod_->set_active(row[spots_.wavMethod]); } @@ -1157,37 +1157,37 @@ void ControlSpotPanel::qualityMethodChanged() } } -void ControlSpotPanel::complexMethodChanged() -{ - // printf("qualityMethodChanged\n"); - - // Get selected control spot - const auto s = treeview_->get_selection(); - - if (!s->count_selected_rows()) { - return; - } - - const auto iter = s->get_selected(); - Gtk::TreeModel::Row row = *iter; - - row[spots_.complexMethod] = complexMethod_->get_active_row_number(); - - if (multiImage && complexMethod_->get_active_text() == M("GENERAL_UNCHANGED")) { - // excluFrame->show(); - } else if (complexMethod_->get_active_row_number() == 0) { //sim - // excluFrame->hide(); - } else if (complexMethod_->get_active_row_number() == 1) { // mod - // excluFrame->show(); - } else if (complexMethod_->get_active_row_number() == 2) { // all - // excluFrame->show(); - } - - // Raise event - if (listener) { - listener->panelChanged(EvLocallabSpotcomplexMethod, complexMethod_->get_active_text()); - } -} +//void ControlSpotPanel::complexMethodChanged() +//{ +// // printf("qualityMethodChanged\n"); +// +// // Get selected control spot +// const auto s = treeview_->get_selection(); +// +// if (!s->count_selected_rows()) { +// return; +// } +// +// const auto iter = s->get_selected(); +// Gtk::TreeModel::Row row = *iter; +// +// row[spots_.complexMethod] = complexMethod_->get_active_row_number(); +// +// if (multiImage && complexMethod_->get_active_text() == M("GENERAL_UNCHANGED")) { +// // excluFrame->show(); +// } else if (complexMethod_->get_active_row_number() == 0) { //sim +// // excluFrame->hide(); +// } else if (complexMethod_->get_active_row_number() == 1) { // mod +// // excluFrame->show(); +// } else if (complexMethod_->get_active_row_number() == 2) { // all +// // excluFrame->show(); +// } +// +// // Raise event +// if (listener) { +// listener->panelChanged(EvLocallabSpotcomplexMethod, complexMethod_->get_active_text()); +// } +//} void ControlSpotPanel::wavMethodChanged() { @@ -1786,28 +1786,28 @@ void ControlSpotPanel::shortcChanged() } } -void ControlSpotPanel::savrestChanged() -{ - // Get selected control spot - const auto s = treeview_->get_selection(); - - if (!s->count_selected_rows()) { - return; - } - - const auto iter = s->get_selected(); - Gtk::TreeModel::Row row = *iter; - row[spots_.savrest] = savrest_->get_active(); - - // Raise event - if (listener) { - if (savrest_->get_active()) { - listener->panelChanged(Evlocallabsavrest, M("GENERAL_ENABLED")); - } else { - listener->panelChanged(Evlocallabsavrest, M("GENERAL_DISABLED")); - } - } -} +//void ControlSpotPanel::savrestChanged() +//{ +// // Get selected control spot +// const auto s = treeview_->get_selection(); +// +// if (!s->count_selected_rows()) { +// return; +// } +// +// const auto iter = s->get_selected(); +// Gtk::TreeModel::Row row = *iter; +// row[spots_.savrest] = savrest_->get_active(); +// +// // Raise event +// if (listener) { +// if (savrest_->get_active()) { +// listener->panelChanged(Evlocallabsavrest, M("GENERAL_ENABLED")); +// } else { +// listener->panelChanged(Evlocallabsavrest, M("GENERAL_DISABLED")); +// } +// } +//} void ControlSpotPanel::previewChanged() { @@ -1869,8 +1869,8 @@ void ControlSpotPanel::disableParamlistener(bool cond) denoichmask_->block(cond); shortcConn_.block(cond); lumask_->block(cond); - savrestConn_.block(cond); - complexMethodconn_.block(cond); + //savrestConn_.block(cond); + //complexMethodconn_.block(cond); wavMethodconn_.block(cond); } @@ -1916,8 +1916,8 @@ void ControlSpotPanel::setParamEditable(bool cond) denoichmask_->set_sensitive(cond); shortc_->set_sensitive(cond); lumask_->set_sensitive(cond); - savrest_->set_sensitive(cond); - complexMethod_->set_sensitive(cond); + //savrest_->set_sensitive(cond); + //complexMethod_->set_sensitive(cond); wavMethod_->set_sensitive(cond); preview_->set_sensitive(cond); @@ -2599,7 +2599,7 @@ ControlSpotPanel::SpotRow* ControlSpotPanel::getSpot(const int index) r->laplac = row[spots_.laplac]; r->deltae = row[spots_.deltae]; r->shortc = row[spots_.shortc]; - r->savrest = row[spots_.savrest]; + //r->savrest = row[spots_.savrest]; r->wavMethod = row[spots_.wavMethod]; return r; @@ -2735,7 +2735,7 @@ void ControlSpotPanel::addControlSpot(SpotRow* newSpot) row[spots_.denoichmask] = newSpot->denoichmask; row[spots_.shortc] = newSpot->shortc; row[spots_.lumask] = newSpot->lumask; - row[spots_.savrest] = newSpot->savrest; + //row[spots_.savrest] = newSpot->savrest; row[spots_.complexMethod] = newSpot->complexMethod; row[spots_.wavMethod] = newSpot->wavMethod; updateParamVisibility(); @@ -2855,7 +2855,7 @@ ControlSpotPanel::ControlSpots::ControlSpots() add(denoichmask); add(shortc); add(lumask); - add(savrest); + //add(savrest); add(complexMethod); add(wavMethod); } diff --git a/rtgui/controlspotpanel.h b/rtgui/controlspotpanel.h index 0c7d061dd..92406c690 100644 --- a/rtgui/controlspotpanel.h +++ b/rtgui/controlspotpanel.h @@ -89,7 +89,7 @@ public: double denoichmask; bool shortc; int lumask; - bool savrest; + //bool savrest; int complexMethod; // 0 = Simple, 1 = Moderate, 2 = all int wavMethod; // 0 = D2, 1 = D4, 2 = D6, 3 = D10, 4 = D14 }; @@ -243,7 +243,7 @@ private: void spotMethodChanged(); void shapeMethodChanged(); void qualityMethodChanged(); - void complexMethodChanged(); + //void complexMethodChanged(); void wavMethodChanged(); void updateParamVisibility(); @@ -259,7 +259,7 @@ private: void laplacChanged(); void deltaeChanged(); void shortcChanged(); - void savrestChanged(); + //void savrestChanged(); void previewChanged(); @@ -325,7 +325,7 @@ private: Gtk::TreeModelColumn denoichmask; Gtk::TreeModelColumn shortc; Gtk::TreeModelColumn lumask; - Gtk::TreeModelColumn savrest; + //Gtk::TreeModelColumn savrest; Gtk::TreeModelColumn complexMethod; // 0 = Simple, 1 = mod, 2 = all Gtk::TreeModelColumn wavMethod; // 0 = D2, 1 = D4, 2 = D6, 3 = D10, 4 = D14 }; @@ -377,8 +377,8 @@ private: sigc::connection shapeMethodconn_; MyComboBoxText* const qualityMethod_; sigc::connection qualityMethodconn_; - MyComboBoxText* const complexMethod_; - sigc::connection complexMethodconn_; + //MyComboBoxText* const complexMethod_; + //sigc::connection complexMethodconn_; MyComboBoxText* const wavMethod_; sigc::connection wavMethodconn_; @@ -425,8 +425,8 @@ private: sigc::connection deltaeConn_; Gtk::CheckButton* const shortc_; sigc::connection shortcConn_; - Gtk::CheckButton* const savrest_; - sigc::connection savrestConn_; + //Gtk::CheckButton* const savrest_; + //sigc::connection savrestConn_; MyExpander* const expTransGrad_; MyExpander* const expShapeDetect_; diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc index 4f9a2f3ea..95a890443 100644 --- a/rtgui/icmpanel.cc +++ b/rtgui/icmpanel.cc @@ -41,12 +41,12 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha EvICMprimariMethod = m->newEvent(GAMMA, "HISTORY_MSG_ICM_OUTPUT_PRIMARIES"); EvICMprofileMethod = m->newEvent(GAMMA, "HISTORY_MSG_ICM_OUTPUT_TYPE"); EvICMtempMethod = m->newEvent(GAMMA, "HISTORY_MSG_ICM_OUTPUT_TEMP"); - EvICMpredx = m->newEvent(GAMMA, "HISTORY_MSG_ICMPREDX"); - EvICMpredy = m->newEvent(GAMMA, "HISTORY_MSG_ICMPREDY"); - EvICMpgrex = m->newEvent(GAMMA, "HISTORY_MSG_ICMPGREX"); - EvICMpgrey = m->newEvent(GAMMA, "HISTORY_MSG_ICMPGREY"); - EvICMpblux = m->newEvent(GAMMA, "HISTORY_MSG_ICMPBLUX"); - EvICMpbluy = m->newEvent(GAMMA, "HISTORY_MSG_ICMPBLUY"); + //EvICMpredx = m->newEvent(GAMMA, "HISTORY_MSG_ICMPREDX"); + //EvICMpredy = m->newEvent(GAMMA, "HISTORY_MSG_ICMPREDY"); + //EvICMpgrex = m->newEvent(GAMMA, "HISTORY_MSG_ICMPGREX"); + //EvICMpgrey = m->newEvent(GAMMA, "HISTORY_MSG_ICMPGREY"); + //EvICMpblux = m->newEvent(GAMMA, "HISTORY_MSG_ICMPBLUX"); + //EvICMpbluy = m->newEvent(GAMMA, "HISTORY_MSG_ICMPBLUY"); EvICMgamm = m->newEvent(LUMINANCECURVE, "HISTORY_MSG_ICM_WORKING_GAMMA"); EvICMslop = m->newEvent(LUMINANCECURVE, "HISTORY_MSG_ICM_WORKING_SLOPE"); EvICMtrcinMethod = m->newEvent(LUMINANCECURVE, "HISTORY_MSG_ICM_WORKING_TRC_METHOD"); @@ -311,38 +311,30 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha redx->set_tooltip_text(M("TP_ICM_PRIMRED_TOOLTIP")); grex->set_tooltip_text(M("TP_ICM_PRIMGRE_TOOLTIP")); blux->set_tooltip_text(M("TP_ICM_PRIMBLU_TOOLTIP")); - blr = Gtk::manage(new Gtk::Label(M(" "))); - blg = Gtk::manage(new Gtk::Label(M(" "))); - blb = Gtk::manage(new Gtk::Label(M(" "))); - redBox = Gtk::manage(new Gtk::Box()); - redBox->pack_start(*redx);//, Gtk::PACK_SHRINK); - redBox->pack_start(*blr, Gtk::PACK_SHRINK); - redBox->pack_start(*redy);//, Gtk::PACK_SHRINK); redFrame = Gtk::manage(new Gtk::Frame(M("TP_ICM_REDFRAME"))); redFrame->set_label_align(0.025, 0.5); - Gtk::Box *redVBox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL)); - redVBox->pack_start(*redBox, Gtk::PACK_EXPAND_WIDGET); redFrame->set_tooltip_text(M("TP_ICM_WORKING_PRIMFRAME_TOOLTIP")); - greBox = Gtk::manage(new Gtk::Box()); - greBox->pack_start(*grex);//, Gtk::PACK_SHRINK, 2); - greBox->pack_start(*blg, Gtk::PACK_SHRINK); - greBox->pack_start(*grey);//, Gtk::PACK_SHRINK, 2); - redVBox->pack_start(*greBox, Gtk::PACK_EXPAND_WIDGET); + Gtk::Box *redVBox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL)); + primCoordGrid = Gtk::manage(new Gtk::Grid()); + primCoordGrid->set_column_homogeneous(true); + primCoordGrid->attach(*redx, 0, 0, 1, 1); + primCoordGrid->attach_next_to(*redy, *redx, Gtk::PositionType::POS_RIGHT, 1, 1); + primCoordGrid->attach_next_to(*grex, *redx, Gtk::PositionType::POS_BOTTOM, 1, 1); + primCoordGrid->attach_next_to(*grey, *grex, Gtk::PositionType::POS_RIGHT, 1, 1); + primCoordGrid->attach_next_to(*blux, *grex, Gtk::PositionType::POS_BOTTOM, 1, 1); + primCoordGrid->attach_next_to(*bluy, *blux, Gtk::PositionType::POS_RIGHT, 1, 1); + redVBox->pack_start(*primCoordGrid, Gtk::PACK_EXPAND_WIDGET); + Gtk::Separator* const separator1 = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)); Gtk::Separator* const separator2 = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)); - bluBox = Gtk::manage(new Gtk::Box()); - bluBox->pack_start(*blux);//, Gtk::PACK_SHRINK); - bluBox->pack_start(*blb, Gtk::PACK_SHRINK); - bluBox->pack_start(*bluy);//, Gtk::PACK_SHRINK); - redVBox->pack_start(*bluBox, Gtk::PACK_EXPAND_WIDGET); preser = Gtk::manage(new Adjuster(M("TP_ICM_WORKING_PRESER"), 0., 100., 0.5, 0.)); preser->setAdjusterListener(this); preBox = Gtk::manage(new Gtk::Box()); - preBox->pack_start(*preser, Gtk::PACK_SHRINK); + preBox->pack_start(*preser, Gtk::PACK_EXPAND_WIDGET); redVBox->pack_start(*separator1, Gtk::PACK_SHRINK); redVBox->pack_start(*preBox, Gtk::PACK_EXPAND_WIDGET); redVBox->pack_start(*separator2, Gtk::PACK_SHRINK); @@ -949,9 +941,7 @@ void ICMPanel::read(const ProcParams* pp, const ParamsEdited* pedited) && ColorManagementParams::Primaries(wprim->get_active_row_number()) != ColorManagementParams::Primaries::CUSTOM_GRID ) { will->set_sensitive(false); - redBox->set_sensitive(false); - greBox->set_sensitive(false); - bluBox->set_sensitive(false); + primCoordGrid->set_sensitive(false); labgridcie->set_sensitive(false); } else { @@ -959,9 +949,7 @@ void ICMPanel::read(const ProcParams* pp, const ParamsEdited* pedited) if (ColorManagementParams::Primaries(wprim->get_active_row_number()) == ColorManagementParams::Primaries::CUSTOM) { will->set_sensitive(true); } - redBox->set_sensitive(true); - greBox->set_sensitive(true); - bluBox->set_sensitive(true); + primCoordGrid->set_sensitive(true); labgridcie->set_sensitive(true); } @@ -1091,9 +1079,7 @@ void ICMPanel::read(const ProcParams* pp, const ParamsEdited* pedited) case ColorManagementParams::Primaries::CUSTOM_GRID: { labgridcie->set_sensitive(true); - redBox->set_sensitive(false); - greBox->set_sensitive(false); - bluBox->set_sensitive(false); + primCoordGrid->set_sensitive(false); will->set_sensitive(false); break; } @@ -1302,13 +1288,9 @@ void ICMPanel::wtrcinChanged() ColorManagementParams::Primaries(wprim->get_active_row_number()) != ColorManagementParams::Primaries::CUSTOM && ColorManagementParams::Primaries(wprim->get_active_row_number()) != ColorManagementParams::Primaries::CUSTOM_GRID ) { - redBox->set_sensitive(false); - greBox->set_sensitive(false); - bluBox->set_sensitive(false); + primCoordGrid->set_sensitive(false); } else { - redBox->set_sensitive(true); - greBox->set_sensitive(true); - bluBox->set_sensitive(true); + primCoordGrid->set_sensitive(true); } } riaHBox->set_sensitive(true); @@ -1340,9 +1322,7 @@ void ICMPanel::wtrcinChanged() ColorManagementParams::Primaries(wprim->get_active_row_number()) != ColorManagementParams::Primaries::CUSTOM && ColorManagementParams::Primaries(wprim->get_active_row_number()) != ColorManagementParams::Primaries::CUSTOM_GRID ) { - redBox->set_sensitive(false); - greBox->set_sensitive(false); - bluBox->set_sensitive(false); + primCoordGrid->set_sensitive(false); } } riaHBox->set_sensitive(true); @@ -1367,13 +1347,9 @@ void ICMPanel::wtrcinChanged() ColorManagementParams::Primaries(wprim->get_active_row_number()) != ColorManagementParams::Primaries::CUSTOM && ColorManagementParams::Primaries(wprim->get_active_row_number()) != ColorManagementParams::Primaries::CUSTOM_GRID ) { - redBox->set_sensitive(false); - greBox->set_sensitive(false); - bluBox->set_sensitive(false); + primCoordGrid->set_sensitive(false); } else { - redBox->set_sensitive(true); - greBox->set_sensitive(true); - bluBox->set_sensitive(true); + primCoordGrid->set_sensitive(true); } } break; @@ -1398,13 +1374,9 @@ void ICMPanel::wtrcinChanged() ColorManagementParams::Primaries(wprim->get_active_row_number()) != ColorManagementParams::Primaries::CUSTOM && ColorManagementParams::Primaries(wprim->get_active_row_number()) != ColorManagementParams::Primaries::CUSTOM_GRID ) { - redBox->set_sensitive(false); - greBox->set_sensitive(false); - bluBox->set_sensitive(false); + primCoordGrid->set_sensitive(false); } else { - redBox->set_sensitive(true); - greBox->set_sensitive(true); - bluBox->set_sensitive(true); + primCoordGrid->set_sensitive(true); } } break; @@ -1429,13 +1401,9 @@ void ICMPanel::wtrcinChanged() ColorManagementParams::Primaries(wprim->get_active_row_number()) != ColorManagementParams::Primaries::CUSTOM && ColorManagementParams::Primaries(wprim->get_active_row_number()) != ColorManagementParams::Primaries::CUSTOM_GRID ) { - redBox->set_sensitive(false); - greBox->set_sensitive(false); - bluBox->set_sensitive(false); + primCoordGrid->set_sensitive(false); } else { - redBox->set_sensitive(true); - greBox->set_sensitive(true); - bluBox->set_sensitive(true); + primCoordGrid->set_sensitive(true); } } break; @@ -1460,13 +1428,9 @@ void ICMPanel::wtrcinChanged() ColorManagementParams::Primaries(wprim->get_active_row_number()) != ColorManagementParams::Primaries::CUSTOM && ColorManagementParams::Primaries(wprim->get_active_row_number()) != ColorManagementParams::Primaries::CUSTOM_GRID ) { - redBox->set_sensitive(false); - greBox->set_sensitive(false); - bluBox->set_sensitive(false); + primCoordGrid->set_sensitive(false); } else { - redBox->set_sensitive(true); - greBox->set_sensitive(true); - bluBox->set_sensitive(true); + primCoordGrid->set_sensitive(true); } } break; @@ -1761,18 +1725,14 @@ void ICMPanel::wprimChanged() redFrame->show(); if (ColorManagementParams::Primaries(wprim->get_active_row_number()) != ColorManagementParams::Primaries::CUSTOM) { - redBox->set_sensitive(false); - greBox->set_sensitive(false); - bluBox->set_sensitive(false); + primCoordGrid->set_sensitive(false); labgridcie->set_sensitive(false); will->set_sensitive(false); if (ColorManagementParams::Primaries(wprim->get_active_row_number()) == ColorManagementParams::Primaries::CUSTOM_GRID) { labgridcie->set_sensitive(true); } } else { - redBox->set_sensitive(true); - greBox->set_sensitive(true); - bluBox->set_sensitive(true); + primCoordGrid->set_sensitive(true); labgridcie->set_sensitive(false); will->set_sensitive(true); } diff --git a/rtgui/icmpanel.h b/rtgui/icmpanel.h index 063da28d1..8d52fb25f 100644 --- a/rtgui/icmpanel.h +++ b/rtgui/icmpanel.h @@ -62,9 +62,9 @@ protected: Gtk::Label* labmga; Gtk::Box* gabox; - Gtk::Label* blr; - Gtk::Label* blg; - Gtk::Label* blb; + //Gtk::Label* blr; + //Gtk::Label* blg; + //Gtk::Label* blb; Gtk::Button* neutral; sigc::connection neutralconn; @@ -86,12 +86,12 @@ private: rtengine::ProcEvent EvICMprimariMethod; rtengine::ProcEvent EvICMprofileMethod; rtengine::ProcEvent EvICMtempMethod; - rtengine::ProcEvent EvICMpredx; - rtengine::ProcEvent EvICMpredy; - rtengine::ProcEvent EvICMpgrex; - rtengine::ProcEvent EvICMpgrey; - rtengine::ProcEvent EvICMpblux; - rtengine::ProcEvent EvICMpbluy; + //rtengine::ProcEvent EvICMpredx; + //rtengine::ProcEvent EvICMpredy; + //rtengine::ProcEvent EvICMpgrex; + //rtengine::ProcEvent EvICMpgrey; + //rtengine::ProcEvent EvICMpblux; + //rtengine::ProcEvent EvICMpbluy; rtengine::ProcEvent EvICMgamm; rtengine::ProcEvent EvICMslop; rtengine::ProcEvent EvICMtrcinMethod; @@ -115,9 +115,7 @@ private: Gtk::Box* wprimBox; Gtk::Label* wprimlab; Gtk::Label* cielab; - Gtk::Box* redBox; - Gtk::Box* greBox; - Gtk::Box* bluBox; + Gtk::Grid* primCoordGrid; Gtk::Box* riaHBox; Gtk::Box* preBox; Gtk::Box* iVBox; diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index 1837d19c8..4fb61c1c6 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -148,11 +148,11 @@ Locallab::Locallab(): expsettings(Gtk::manage(new ControlSpotPanel())), // Tool list widget - toollist(Gtk::manage(new LocallabToolList())), + toollist(Gtk::manage(new LocallabToolList())) // expcie(Gtk::manage(new Locallabcie())), // Other widgets - resetshowButton(Gtk::manage(new Gtk::Button(M("TP_LOCALLAB_RESETSHOW")))) + //resetshowButton(Gtk::manage(new Gtk::Button(M("TP_LOCALLAB_RESETSHOW")))) { set_orientation(Gtk::ORIENTATION_VERTICAL); @@ -197,7 +197,7 @@ Locallab::Locallab(): // panel->pack_start(*separator2, false, false); // Add mask reset button to panel widget - resetshowButton->signal_pressed().connect(sigc::mem_fun(*this, &Locallab::resetshowPressed)); + //resetshowButton->signal_pressed().connect(sigc::mem_fun(*this, &Locallab::resetshowPressed)); // panel->pack_start(*resetshowButton); // Add panel widget to Locallab GUI @@ -316,7 +316,7 @@ void Locallab::read(const rtengine::procparams::ProcParams* pp, const ParamsEdit r->denoichmask = pp->locallab.spots.at(i).denoichmask; r->shortc = pp->locallab.spots.at(i).shortc; r->lumask = pp->locallab.spots.at(i).lumask; - r->savrest = pp->locallab.spots.at(i).savrest; + //r->savrest = pp->locallab.spots.at(i).savrest; if (pp->locallab.spots.at(i).complexMethod == "sim") { r->complexMethod = 0; @@ -498,7 +498,7 @@ void Locallab::write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited r->denoichmask = newSpot->denoichmask; r->shortc = newSpot->shortc; r->lumask = newSpot->lumask; - r->savrest = newSpot->savrest; + //r->savrest = newSpot->savrest; if (newSpot->complexMethod == "sim") { r->complexMethod = 0; @@ -809,7 +809,7 @@ void Locallab::write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited r->denoichmask = newSpot->denoichmask; r->shortc = newSpot->shortc; r->lumask = newSpot->lumask; - r->savrest = newSpot->savrest; + //r->savrest = newSpot->savrest; if (newSpot->complexMethod == "sim") { r->complexMethod = 0; @@ -965,7 +965,7 @@ void Locallab::write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited pp->locallab.spots.at(pp->locallab.selspot).denoichmask = r->denoichmask; pp->locallab.spots.at(pp->locallab.selspot).shortc = r->shortc; pp->locallab.spots.at(pp->locallab.selspot).lumask = r->lumask; - pp->locallab.spots.at(pp->locallab.selspot).savrest = r->savrest; + //pp->locallab.spots.at(pp->locallab.selspot).savrest = r->savrest; if (r->complexMethod == 0) { pp->locallab.spots.at(pp->locallab.selspot).complexMethod = "sim"; @@ -1128,13 +1128,13 @@ Locallab::llMaskVisibility Locallab::getMaskVisibility() const return {prevDeltaE, colorMask, colorMaskinv, expMask, expMaskinv, shMask, shMaskinv, vibMask, softMask, blMask, tmMask, retiMask, sharMask, lcMask, cbMask, logMask, maskMask, cieMask}; } -void Locallab::resetshowPressed() -{ - // Raise event to reset mask - if (listener) { - listener->panelChanged(Evlocallabshowreset, ""); - } -} +//void Locallab::resetshowPressed() +//{ +// // Raise event to reset mask +// if (listener) { +// listener->panelChanged(Evlocallabshowreset, ""); +// } +//} void Locallab::setEditProvider(EditDataProvider * provider) { diff --git a/rtgui/locallab.h b/rtgui/locallab.h index cf5ca4ff5..60c186c55 100644 --- a/rtgui/locallab.h +++ b/rtgui/locallab.h @@ -127,7 +127,7 @@ private: std::vector maskBackRef; // Other widgets - Gtk::Button* const resetshowButton; + //Gtk::Button* const resetshowButton; Glib::ustring spotName; @@ -176,7 +176,7 @@ public: llMaskVisibility getMaskVisibility() const; // Other widgets event functions - void resetshowPressed(); + //void resetshowPressed(); // EditProvider management function void setEditProvider(EditDataProvider* provider) override; diff --git a/rtgui/locallabtools.h b/rtgui/locallabtools.h index e7fcfc1d0..c4e54ca61 100644 --- a/rtgui/locallabtools.h +++ b/rtgui/locallabtools.h @@ -1151,7 +1151,7 @@ private: Adjuster* const deltad; CurveEditorGroup* const LocalcurveEditorwavcomp; FlatCurveEditor* const wavshapecomp; - Adjuster* const fatres; + //Adjuster* const fatres; Gtk::CheckButton* const fftwlc; MyExpander* const exprecovw; Gtk::Label* const maskusablew; @@ -1342,8 +1342,8 @@ private: Adjuster* const saturl; Adjuster* const chroml; MyExpander* const expL; - CurveEditorGroup* const CurveEditorL; - DiagonalCurveEditor* const LshapeL; + //CurveEditorGroup* const CurveEditorL; + //DiagonalCurveEditor* const LshapeL; Adjuster* const targabs; MyComboBoxText* const surround; Gtk::Box* const surrHBox; diff --git a/rtgui/locallabtools2.cc b/rtgui/locallabtools2.cc index 3358a61ef..80f779d09 100644 --- a/rtgui/locallabtools2.cc +++ b/rtgui/locallabtools2.cc @@ -2427,7 +2427,7 @@ LocallabContrast::LocallabContrast(): deltad(Gtk::manage(new Adjuster(M("TP_LOCALLAB_DELTAD"), -3., 3., 0.1, 0.))),//, Gtk::manage(new RTImage("circle-black-small.png")), Gtk::manage(new RTImage("circle-white-small.png"))))), LocalcurveEditorwavcomp(new CurveEditorGroup(options.lastlocalCurvesDir, M("TP_LOCALLAB_WAVCOMP"))), wavshapecomp(static_cast(LocalcurveEditorwavcomp->addCurve(CT_Flat, "", nullptr, false, false))), - fatres(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FATRES"), 0., 100., 1., 0.))), + //fatres(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FATRES"), 0., 100., 1., 0.))), fftwlc(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_FFTW")))), exprecovw(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_DENOI2_EXP")))), maskusablew(Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_MASKUSABLE")))), @@ -2684,7 +2684,7 @@ LocallabContrast::LocallabContrast(): LocalcurveEditorwavcomp->curveListComplete(); - fatres->setAdjusterListener(this); + //fatres->setAdjusterListener(this); fftwlcConn = fftwlc->signal_toggled().connect(sigc::mem_fun(*this, &LocallabContrast::fftwlcChanged)); @@ -2784,7 +2784,7 @@ LocallabContrast::LocallabContrast(): clariFrame->add(*clariBox); pack_start(*clariFrame); ToolParamBlock* const blurcontBox = Gtk::manage(new ToolParamBlock()); - Gtk::Frame* const gradwavFrame = Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_GRADWAVFRA"))); + Gtk::Frame* const gradwavFrame = Gtk::manage(new Gtk::Frame()); gradwavFrame->set_label_align(0.025, 0.5); gradwavFrame->set_label_widget(*wavgradl); ToolParamBlock* const gradwavBox = Gtk::manage(new ToolParamBlock()); @@ -2793,7 +2793,7 @@ LocallabContrast::LocallabContrast(): gradwavBox->pack_start(*angwav); gradwavFrame->add(*gradwavBox); blurcontBox->pack_start(*gradwavFrame); - Gtk::Frame* const edgFrame = Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_EDGSHARPFRA"))); + Gtk::Frame* const edgFrame = Gtk::manage(new Gtk::Frame()); edgFrame->set_label_align(0.025, 0.5); edgFrame->set_label_widget(*wavedg); ToolParamBlock* const edgsBox = Gtk::manage(new ToolParamBlock()); @@ -3237,7 +3237,7 @@ void LocallabContrast::read(const rtengine::procparams::ProcParams* pp, const Pa sigmadc->setValue(spot.sigmadc); deltad->setValue(spot.deltad); wavshapecomp->setCurve(spot.loccompwavcurve); - fatres->setValue(spot.fatres); + //fatres->setValue(spot.fatres); enalcMask->set_active(spot.enalcMask); CCmasklcshape->setCurve(spot.CCmasklccurve); LLmasklcshape->setCurve(spot.LLmasklccurve); @@ -3362,7 +3362,7 @@ void LocallabContrast::write(rtengine::procparams::ProcParams* pp, ParamsEdited* spot.sigmadc = sigmadc->getValue(); spot.deltad = deltad->getValue(); spot.loccompwavcurve = wavshapecomp->getCurve(); - spot.fatres = fatres->getValue(); + //spot.fatres = fatres->getValue(); spot.fftwlc = fftwlc->get_active(); spot.enalcMask = enalcMask->get_active(); spot.CCmasklccurve = CCmasklcshape->getCurve(); @@ -3434,7 +3434,7 @@ void LocallabContrast::setDefaults(const rtengine::procparams::ProcParams* defPa residcomp->setDefault(defSpot.residcomp); sigmadc->setDefault(defSpot.sigmadc); deltad->setDefault(defSpot.deltad); - fatres->setDefault(defSpot.fatres); + //fatres->setDefault(defSpot.fatres); blendmasklc->setDefault((double)defSpot.blendmasklc); radmasklc->setDefault(defSpot.radmasklc); chromasklc->setDefault(defSpot.chromasklc); @@ -3759,12 +3759,12 @@ void LocallabContrast::adjusterChanged(Adjuster* a, double newval) } } - if (a == fatres) { - if (listener) { - listener->panelChanged(Evlocallabfatres, - fatres->getTextValue() + " (" + escapeHtmlChars(getSpotName()) + ")"); - } - } + //if (a == fatres) { + // if (listener) { + // listener->panelChanged(Evlocallabfatres, + // fatres->getTextValue() + " (" + escapeHtmlChars(getSpotName()) + ")"); + // } + //} if (a == recothresw) { @@ -3983,7 +3983,7 @@ void LocallabContrast::convertParamToNormal() sigmadc->setValue(defSpot.sigmadc); deltad->setValue(defSpot.deltad); wavshapecomp->setCurve(defSpot.loccompwavcurve); - fatres->setValue(defSpot.fatres); + //fatres->setValue(defSpot.fatres); fftwlc->set_active(defSpot.fftwlc); decayw->setValue(defSpot.decayw); @@ -5244,8 +5244,8 @@ LocallabLog::LocallabLog(): saturl(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SATURV"), -100., 100., 0.5, 0.))), chroml(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CHROML"), -100., 100., 0.5, 0.))), expL(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_LOGEXP")))), - CurveEditorL(new CurveEditorGroup(options.lastlocalCurvesDir, M("TP_LOCALLAB_LOGCONTQ"))), - LshapeL(static_cast(CurveEditorL->addCurve(CT_Diagonal, "Q(Q)"))), + //CurveEditorL(new CurveEditorGroup(options.lastlocalCurvesDir, M("TP_LOCALLAB_LOGCONTQ"))), + //LshapeL(static_cast(CurveEditorL->addCurve(CT_Diagonal, "Q(Q)"))), targabs(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SOURCE_ABS"), 0.01, 16384.0, 0.01, 16.0))), surround(Gtk::manage (new MyComboBoxText ())), surrHBox(Gtk::manage(new Gtk::Box())), @@ -5325,13 +5325,13 @@ LocallabLog::LocallabLog(): contq->setAdjusterListener(this); colorfl->setAdjusterListener(this); - CurveEditorL->setCurveListener(this); + //CurveEditorL->setCurveListener(this); - LshapeL->setResetCurve(DiagonalCurveType(defSpot.LcurveL.at(0)), defSpot.LcurveL); - LshapeL->setBottomBarBgGradient({{0., 0., 0., 0.}, {1., 1., 1., 1.}}); - LshapeL->setLeftBarBgGradient({{0., 0., 0., 0.}, {1., 1., 1., 1.}}); + //LshapeL->setResetCurve(DiagonalCurveType(defSpot.LcurveL.at(0)), defSpot.LcurveL); + //LshapeL->setBottomBarBgGradient({{0., 0., 0., 0.}, {1., 1., 1., 1.}}); + //LshapeL->setLeftBarBgGradient({{0., 0., 0., 0.}, {1., 1., 1., 1.}}); - CurveEditorL->curveListComplete(); + //CurveEditorL->curveListComplete(); targabs->setLogScale(500, 0); @@ -5509,7 +5509,7 @@ LocallabLog::~LocallabLog() { delete maskCurveEditorL; delete mask2CurveEditorL; - delete CurveEditorL; + //delete CurveEditorL; } @@ -5730,7 +5730,7 @@ void LocallabLog::read(const rtengine::procparams::ProcParams* pp, const ParamsE contthres->setValue(spot.contthres); contq->setValue(spot.contq); colorfl->setValue(spot.colorfl); - LshapeL->setCurve(spot.LcurveL); + //LshapeL->setCurve(spot.LcurveL); targabs->setValue(spot.targabs); targetGray->setValue(spot.targetGray); detail->setValue(spot.detail); @@ -5794,7 +5794,7 @@ void LocallabLog::write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedi spot.contthres = contthres->getValue(); spot.contq = contq->getValue(); spot.colorfl = colorfl->getValue(); - spot.LcurveL = LshapeL->getCurve(); + //spot.LcurveL = LshapeL->getCurve(); spot.detail = detail->getValue(); spot.baselog = baselog->getValue(); spot.sensilog = sensilog->getIntValue(); @@ -6057,12 +6057,12 @@ void LocallabLog::curveChanged(CurveEditor* ce) } } - if (ce == LshapeL) { - if (listener) { - listener->panelChanged(EvlocallabLshapeL, - M("HISTORY_CUSTOMCURVE") + " (" + escapeHtmlChars(getSpotName()) + ")"); - } - } + //if (ce == LshapeL) { + // if (listener) { + // listener->panelChanged(EvlocallabLshapeL, + // M("HISTORY_CUSTOMCURVE") + " (" + escapeHtmlChars(getSpotName()) + ")"); + // } + //} } } @@ -7435,12 +7435,12 @@ Locallabcie::Locallabcie(): contqcie(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LOGCONQL"), -100., 100., 0.5, 0.))), contthrescie(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LOGCONTHRES"), -1., 1., 0.01, 0.))), - logjzFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_LOGJZFRA")))), + logjzFrame(Gtk::manage(new Gtk::Frame())), logjz(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_JZLOG")))), blackEvjz(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BLACK_EV"), -16.0, 0.0, 0.1, -5.0))), whiteEvjz(Gtk::manage(new Adjuster(M("TP_LOCALLAB_WHITE_EV"), 0., 32.0, 0.1, 10.0))), targetjz(Gtk::manage(new Adjuster(M("TP_LOCALLAB_JZTARGET_EV"), 4., 80.0, 0.1, 18.0))), - bevwevFrame(Gtk::manage(new Gtk::Frame(M("")))), + bevwevFrame(Gtk::manage(new Gtk::Frame())), forcebw(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_BWFORCE")))), sigmoidFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_SIGFRA")))), diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc index d5512e60f..a7963b7dc 100644 --- a/rtgui/paramsedited.cc +++ b/rtgui/paramsedited.cc @@ -571,7 +571,7 @@ void ParamsEdited::set(bool v) wavelet.Backmethod = v; wavelet.Tilesmethod = v; wavelet.complexmethod = v; - wavelet.denmethod = v; + //wavelet.denmethod = v; wavelet.mixmethod = v; wavelet.slimethod = v; wavelet.quamethod = v; @@ -632,7 +632,7 @@ void ParamsEdited::set(bool v) wavelet.levelsigm = v; wavelet.ccwcurve = v; wavelet.blcurve = v; - wavelet.opacityCurveSH = v; + //wavelet.opacityCurveSH = v; wavelet.opacityCurveRG = v; wavelet.opacityCurveBY = v; wavelet.wavdenoise = v; @@ -1982,7 +1982,7 @@ void ParamsEdited::initFrom(const std::vector& wavelet.Backmethod = wavelet.Backmethod && p.wavelet.Backmethod == other.wavelet.Backmethod; wavelet.Tilesmethod = wavelet.Tilesmethod && p.wavelet.Tilesmethod == other.wavelet.Tilesmethod; wavelet.complexmethod = wavelet.complexmethod && p.wavelet.complexmethod == other.wavelet.complexmethod; - wavelet.denmethod = wavelet.denmethod && p.wavelet.denmethod == other.wavelet.denmethod; + //wavelet.denmethod = wavelet.denmethod && p.wavelet.denmethod == other.wavelet.denmethod; wavelet.mixmethod = wavelet.mixmethod && p.wavelet.mixmethod == other.wavelet.mixmethod; wavelet.slimethod = wavelet.slimethod && p.wavelet.slimethod == other.wavelet.slimethod; wavelet.quamethod = wavelet.quamethod && p.wavelet.quamethod == other.wavelet.quamethod; @@ -2044,7 +2044,7 @@ void ParamsEdited::initFrom(const std::vector& wavelet.satlev = wavelet.satlev && p.wavelet.satlev == other.wavelet.satlev; wavelet.ccwcurve = wavelet.ccwcurve && p.wavelet.ccwcurve == other.wavelet.ccwcurve; wavelet.blcurve = wavelet.blcurve && p.wavelet.blcurve == other.wavelet.blcurve; - wavelet.opacityCurveSH = wavelet.opacityCurveSH && p.wavelet.opacityCurveSH == other.wavelet.opacityCurveSH; + //wavelet.opacityCurveSH = wavelet.opacityCurveSH && p.wavelet.opacityCurveSH == other.wavelet.opacityCurveSH; wavelet.opacityCurveRG = wavelet.opacityCurveRG && p.wavelet.opacityCurveRG == other.wavelet.opacityCurveRG; wavelet.opacityCurveBY = wavelet.opacityCurveBY && p.wavelet.opacityCurveBY == other.wavelet.opacityCurveBY; wavelet.wavdenoise = wavelet.wavdenoise && p.wavelet.wavdenoise == other.wavelet.wavdenoise; @@ -6864,9 +6864,9 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng toEdit.wavelet.complexmethod = mods.wavelet.complexmethod; } - if (wavelet.denmethod) { - toEdit.wavelet.denmethod = mods.wavelet.denmethod; - } + //if (wavelet.denmethod) { + // toEdit.wavelet.denmethod = mods.wavelet.denmethod; + //} if (wavelet.mixmethod) { toEdit.wavelet.mixmethod = mods.wavelet.mixmethod; @@ -7000,9 +7000,9 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng toEdit.wavelet.blcurve = mods.wavelet.blcurve; } - if (wavelet.opacityCurveSH) { - toEdit.wavelet.opacityCurveSH = mods.wavelet.opacityCurveSH; - } + //if (wavelet.opacityCurveSH) { + // toEdit.wavelet.opacityCurveSH = mods.wavelet.opacityCurveSH; + //} if (wavelet.opacityCurveRG) { toEdit.wavelet.opacityCurveRG = mods.wavelet.opacityCurveRG; diff --git a/rtgui/paramsedited.h b/rtgui/paramsedited.h index 94abed470..0c0c79f7c 100644 --- a/rtgui/paramsedited.h +++ b/rtgui/paramsedited.h @@ -1281,7 +1281,7 @@ struct WaveletParamsEdited { bool Backmethod; bool Tilesmethod; bool complexmethod; - bool denmethod; + //bool denmethod; bool mixmethod; bool slimethod; bool quamethod; @@ -1335,7 +1335,7 @@ struct WaveletParamsEdited { bool levelsigm; bool ccwcurve; bool blcurve; - bool opacityCurveSH; + //bool opacityCurveSH; bool opacityCurveBY; bool wavdenoise; bool wavdenoiseh; diff --git a/rtgui/perspective.cc b/rtgui/perspective.cc index 317732bd2..fa0b24247 100644 --- a/rtgui/perspective.cc +++ b/rtgui/perspective.cc @@ -96,7 +96,7 @@ PerspCorrection::PerspCorrection () : FoldableToolPanel(this, "perspective", M(" EvPerspProjAngle = mapper->newEvent(TRANSFORM, "HISTORY_MSG_PERSP_PROJ_ANGLE"); EvPerspProjRotate = mapper->newEvent(TRANSFORM, "HISTORY_MSG_PERSP_PROJ_ROTATE"); EvPerspProjShift = mapper->newEvent(TRANSFORM, "HISTORY_MSG_PERSP_PROJ_SHIFT"); - EvPerspRender = mapper->newEvent(TRANSFORM); + EvPerspRender = mapper->newEvent(TRANSFORM, "GENERAL_NA"); // Void events. EvPerspCamAngleVoid = mapper->newEvent(M_VOID, "HISTORY_MSG_PERSP_CAM_ANGLE"); EvPerspCamFocalLengthVoid = mapper->newEvent(M_VOID, "HISTORY_MSG_PERSP_CAM_FL"); diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc index 54102a2e1..9c14aeb6e 100644 --- a/rtgui/toolpanelcoord.cc +++ b/rtgui/toolpanelcoord.cc @@ -557,7 +557,7 @@ void ToolPanelCoordinator::panelChanged(const rtengine::ProcEvent& event, const maskStruc.blMask, maskStruc.tmMask, maskStruc.retiMask, maskStruc.sharMask, maskStruc.lcMask, maskStruc.cbMask, maskStruc.logMask, maskStruc.maskMask, maskStruc.cieMask); } else if (event == rtengine::EvLocallabSpotCreated || event == rtengine::EvLocallabSpotSelectedWithMask || - event == rtengine::EvLocallabSpotDeleted || event == rtengine::Evlocallabshowreset || + event == rtengine::EvLocallabSpotDeleted /*|| event == rtengine::Evlocallabshowreset*/ || event == rtengine::EvlocallabToolRemovedWithRefresh) { locallab->resetMaskVisibility(); ipc->setLocallabMaskVisibility(false, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc index f14dd8c8c..7fa79f881 100644 --- a/rtgui/wavelet.cc +++ b/rtgui/wavelet.cc @@ -64,7 +64,7 @@ std::vector makeWholeHueRange() Wavelet::Wavelet() : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"), true, true), curveEditorG(new CurveEditorGroup(options.lastWaveletCurvesDir, M("TP_WAVELET_CONTEDIT"))), - curveEditorC(new CurveEditorGroup(options.lastWaveletCurvesDir, M("TP_WAVELET_CONTRASTEDIT"))), + //curveEditorC(new CurveEditorGroup(options.lastWaveletCurvesDir, M("TP_WAVELET_CONTRASTEDIT"))), CCWcurveEditorG(new CurveEditorGroup(options.lastWaveletCurvesDir, M("TP_WAVELET_CCURVE"))), curveEditorbl(new CurveEditorGroup(options.lastWaveletCurvesDir, M("TP_WAVELET_BLCURVE"))), curveEditorRES(new CurveEditorGroup(options.lastWaveletCurvesDir)), @@ -178,7 +178,7 @@ Wavelet::Wavelet() : Dirmethod(Gtk::manage(new MyComboBoxText())), Medgreinf(Gtk::manage(new MyComboBoxText())), ushamethod(Gtk::manage(new MyComboBoxText())), - denmethod(Gtk::manage(new MyComboBoxText())), + //denmethod(Gtk::manage(new MyComboBoxText())), mixmethod(Gtk::manage(new MyComboBoxText())), quamethod(Gtk::manage(new MyComboBoxText())), slimethod(Gtk::manage(new MyComboBoxText())), @@ -214,7 +214,7 @@ Wavelet::Wavelet() : ctboxch(Gtk::manage(new Gtk::Box())), quaHBox(Gtk::manage(new Gtk::Box())), sliHBox(Gtk::manage(new Gtk::Box())), - denHBox(Gtk::manage(new Gtk::Box())), + //denHBox(Gtk::manage(new Gtk::Box())), mixHBox(Gtk::manage(new Gtk::Box())), ctboxBA(Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL))) @@ -253,11 +253,11 @@ Wavelet::Wavelet() : EvWavLabGridValue = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_WAVLABGRID_VALUE"); EvWavrangeab = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_RANGEAB"); EvWavprotab = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_PROTAB"); - EvWavlevelshc = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_LEVELSHC"); + //EvWavlevelshc = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_LEVELSHC"); EvWavcomplexmet = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_COMPLEX"); EvWavsigm = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_WAVSIGM"); EvWavdenoise = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_WAVDENOISE"); - EvWavdenmethod = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_WAVDENMET"); + //EvWavdenmethod = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_WAVDENMET"); EvWavmixmethod = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_WAVMIXMET"); EvWavquamethod = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_WAVQUAMET"); EvWavlevden = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_WAVLEVDEN"); @@ -486,16 +486,16 @@ Wavelet::Wavelet() : const WaveletParams default_params; - curveEditorC->setCurveListener(this); - curveEditorC->set_tooltip_text(M("TP_WAVELET_FINCOAR_TOOLTIP")); + //curveEditorC->setCurveListener(this); + //curveEditorC->set_tooltip_text(M("TP_WAVELET_FINCOAR_TOOLTIP")); - opacityShapeSH = static_cast(curveEditorC->addCurve(CT_Flat, "", nullptr, false, false)); - opacityShapeSH->setIdentityValue(0.); - opacityShapeSH->setResetCurve(FlatCurveType(default_params.opacityCurveSH.at(0)), default_params.opacityCurveSH); + //opacityShapeSH = static_cast(curveEditorC->addCurve(CT_Flat, "", nullptr, false, false)); + //opacityShapeSH->setIdentityValue(0.); + //opacityShapeSH->setResetCurve(FlatCurveType(default_params.opacityCurveSH.at(0)), default_params.opacityCurveSH); - curveEditorC->curveListComplete(); - curveEditorC->show(); + //curveEditorC->curveListComplete(); + //curveEditorC->show(); contrastSHVBox->pack_start(*HSmethod); contrastSHVBox->pack_start(*hllev); @@ -684,17 +684,17 @@ Wavelet::Wavelet() : sliHBox->pack_start(*slimethod); - denmethod->append(M("TP_WAVELET_DENEQUAL")); - denmethod->append(M("TP_WAVELET_DEN14PLUS")); - denmethod->append(M("TP_WAVELET_DEN14LOW")); - denmethod->append(M("TP_WAVELET_DEN12PLUS")); - denmethod->append(M("TP_WAVELET_DEN12LOW")); - denmethodconn = denmethod->signal_changed().connect(sigc::mem_fun(*this, &Wavelet::denmethodChanged)); - denmethod->set_tooltip_text(M("TP_WAVELET_DENEQUAL_TOOLTIP")); + //denmethod->append(M("TP_WAVELET_DENEQUAL")); + //denmethod->append(M("TP_WAVELET_DEN14PLUS")); + //denmethod->append(M("TP_WAVELET_DEN14LOW")); + //denmethod->append(M("TP_WAVELET_DEN12PLUS")); + //denmethod->append(M("TP_WAVELET_DEN12LOW")); + //denmethodconn = denmethod->signal_changed().connect(sigc::mem_fun(*this, &Wavelet::denmethodChanged)); + //denmethod->set_tooltip_text(M("TP_WAVELET_DENEQUAL_TOOLTIP")); // Gtk::Box* const denHBox = Gtk::manage(new Gtk::Box()); - Gtk::Label* const denLabel = Gtk::manage(new Gtk::Label(M("TP_WAVELET_DENCONTRAST") + ":")); - denHBox->pack_start(*denLabel, Gtk::PACK_SHRINK, 4); - denHBox->pack_start(*denmethod); + //Gtk::Label* const denLabel = Gtk::manage(new Gtk::Label(M("TP_WAVELET_DENCONTRAST") + ":")); + //denHBox->pack_start(*denLabel, Gtk::PACK_SHRINK, 4); + //denHBox->pack_start(*denmethod); mixmethod->append(M("TP_WAVELET_MIXNOISE")); mixmethod->append(M("TP_WAVELET_MIXMIX")); @@ -757,7 +757,7 @@ Wavelet::Wavelet() : noiseBox->pack_start(*thrden); noiseBox->pack_start(*quaHBox); noiseBox->pack_start(*sliHBox); - noiseBox->pack_start(*denHBox); + //noiseBox->pack_start(*denHBox); noiseBox->pack_start(*mixHBox); noiseBox->pack_start(*levelsigm, Gtk::PACK_SHRINK, 0); noiseBox->pack_start(*limden); @@ -1332,7 +1332,7 @@ Wavelet::~Wavelet() idle_register.destroy(); delete opaCurveEditorG; - delete curveEditorC; + //delete curveEditorC; delete opacityCurveEditorG; delete CurveEditorwavnoise; delete CurveEditorwavnoiseh; @@ -1424,7 +1424,7 @@ void Wavelet::read(const ProcParams* pp, const ParamsEdited* pedited) Backmethodconn.block(true); Tilesmethodconn.block(true); complexmethodconn.block(true); - denmethodconn.block(true); + //denmethodconn.block(true); mixmethodconn.block(true); slimethodconn.block(true); quamethodconn.block(true); @@ -1555,17 +1555,17 @@ void Wavelet::read(const ProcParams* pp, const ParamsEdited* pedited) complexmethod->set_active(1); } - if (pp->wavelet.denmethod == "equ") { - denmethod->set_active(0); - } else if (pp->wavelet.denmethod == "high") { - denmethod->set_active(1); - } else if (pp->wavelet.denmethod == "low") { - denmethod->set_active(2); - } else if (pp->wavelet.denmethod == "12high") { - denmethod->set_active(3); - } else if (pp->wavelet.denmethod == "12low") { - denmethod->set_active(4); - } + //if (pp->wavelet.denmethod == "equ") { + // denmethod->set_active(0); + //} else if (pp->wavelet.denmethod == "high") { + // denmethod->set_active(1); + //} else if (pp->wavelet.denmethod == "low") { + // denmethod->set_active(2); + //} else if (pp->wavelet.denmethod == "12high") { + // denmethod->set_active(3); + //} else if (pp->wavelet.denmethod == "12low") { + // denmethod->set_active(4); + //} if (pp->wavelet.mixmethod == "nois") { mixmethod->set_active(0); @@ -1630,7 +1630,7 @@ void Wavelet::read(const ProcParams* pp, const ParamsEdited* pedited) opacityShapeRG->setCurve(pp->wavelet.opacityCurveRG); wavdenoise->setCurve(pp->wavelet.wavdenoise); wavdenoiseh->setCurve(pp->wavelet.wavdenoiseh); - opacityShapeSH->setCurve(pp->wavelet.opacityCurveSH); + //opacityShapeSH->setCurve(pp->wavelet.opacityCurveSH); opacityShapeBY->setCurve(pp->wavelet.opacityCurveBY); opacityShape->setCurve(pp->wavelet.opacityCurveW); opacityShapeWL->setCurve(pp->wavelet.opacityCurveWL); @@ -1806,9 +1806,9 @@ void Wavelet::read(const ProcParams* pp, const ParamsEdited* pedited) complexmethod->set_active_text(M("GENERAL_UNCHANGED")); } - if (!pedited->wavelet.denmethod) { - denmethod->set_active_text(M("GENERAL_UNCHANGED")); - } + //if (!pedited->wavelet.denmethod) { + // denmethod->set_active_text(M("GENERAL_UNCHANGED")); + //} if (!pedited->wavelet.mixmethod) { mixmethod->set_active_text(M("GENERAL_UNCHANGED")); @@ -1884,7 +1884,7 @@ void Wavelet::read(const ProcParams* pp, const ParamsEdited* pedited) exptoning->set_inconsistent(!pedited->wavelet.exptoning); expnoise->set_inconsistent(!pedited->wavelet.expnoise); opacityShapeRG->setCurve(pp->wavelet.opacityCurveRG); - opacityShapeSH->setCurve(pp->wavelet.opacityCurveSH); + //opacityShapeSH->setCurve(pp->wavelet.opacityCurveSH); opacityShapeBY->setCurve(pp->wavelet.opacityCurveBY); wavdenoise->setCurve(pp->wavelet.wavdenoise); wavdenoiseh->setCurve(pp->wavelet.wavdenoiseh); @@ -2073,7 +2073,7 @@ void Wavelet::read(const ProcParams* pp, const ParamsEdited* pedited) Backmethodconn.block(false); Tilesmethodconn.block(false); complexmethodconn.block(false); - denmethodconn.block(false); + //denmethodconn.block(false); mixmethodconn.block(false); slimethodconn.block(false); quamethodconn.block(false); @@ -2104,7 +2104,7 @@ void Wavelet::setEditProvider(EditDataProvider *provider) ccshape->setEditProvider(provider); blshape->setEditProvider(provider); opacityShapeRG->setEditProvider(provider); - opacityShapeSH->setEditProvider(provider); + //opacityShapeSH->setEditProvider(provider); opacityShapeBY->setEditProvider(provider); wavdenoise->setEditProvider(provider); wavdenoiseh->setEditProvider(provider); @@ -2188,7 +2188,7 @@ void Wavelet::write(ProcParams* pp, ParamsEdited* pedited) pp->wavelet.ccwcurve = ccshape->getCurve(); pp->wavelet.blcurve = blshape->getCurve(); pp->wavelet.opacityCurveRG = opacityShapeRG->getCurve(); - pp->wavelet.opacityCurveSH = opacityShapeSH->getCurve(); + //pp->wavelet.opacityCurveSH = opacityShapeSH->getCurve(); pp->wavelet.opacityCurveBY = opacityShapeBY->getCurve(); pp->wavelet.wavdenoise = wavdenoise->getCurve(); pp->wavelet.wavdenoiseh = wavdenoiseh->getCurve(); @@ -2276,7 +2276,7 @@ void Wavelet::write(ProcParams* pp, ParamsEdited* pedited) pedited->wavelet.Backmethod = Backmethod->get_active_text() != M("GENERAL_UNCHANGED"); pedited->wavelet.Tilesmethod = Tilesmethod->get_active_text() != M("GENERAL_UNCHANGED"); pedited->wavelet.complexmethod = complexmethod->get_active_text() != M("GENERAL_UNCHANGED"); - pedited->wavelet.denmethod = denmethod->get_active_text() != M("GENERAL_UNCHANGED"); + //pedited->wavelet.denmethod = denmethod->get_active_text() != M("GENERAL_UNCHANGED"); pedited->wavelet.mixmethod = mixmethod->get_active_text() != M("GENERAL_UNCHANGED"); pedited->wavelet.slimethod = slimethod->get_active_text() != M("GENERAL_UNCHANGED"); pedited->wavelet.quamethod = quamethod->get_active_text() != M("GENERAL_UNCHANGED"); @@ -2337,7 +2337,7 @@ void Wavelet::write(ProcParams* pp, ParamsEdited* pedited) pedited->wavelet.leveldenoise = leveldenoise->getEditedState(); pedited->wavelet.levelsigm = levelsigm->getEditedState(); pedited->wavelet.opacityCurveRG = !opacityShapeRG->isUnChanged(); - pedited->wavelet.opacityCurveSH = !opacityShapeSH->isUnChanged(); + //pedited->wavelet.opacityCurveSH = !opacityShapeSH->isUnChanged(); pedited->wavelet.opacityCurveBY = !opacityShapeBY->isUnChanged(); pedited->wavelet.wavdenoise = !wavdenoise->isUnChanged(); pedited->wavelet.wavdenoiseh = !wavdenoiseh->isUnChanged(); @@ -2502,17 +2502,17 @@ void Wavelet::write(ProcParams* pp, ParamsEdited* pedited) pp->wavelet.complexmethod = "expert"; } - if (denmethod->get_active_row_number() == 0) { - pp->wavelet.denmethod = "equ"; - } else if (denmethod->get_active_row_number() == 1) { - pp->wavelet.denmethod = "high"; - } else if (denmethod->get_active_row_number() == 2) { - pp->wavelet.denmethod = "low"; - } else if (denmethod->get_active_row_number() == 3) { - pp->wavelet.denmethod = "12high"; - } else if (denmethod->get_active_row_number() == 4) { - pp->wavelet.denmethod = "12low"; - } + //if (denmethod->get_active_row_number() == 0) { + // pp->wavelet.denmethod = "equ"; + //} else if (denmethod->get_active_row_number() == 1) { + // pp->wavelet.denmethod = "high"; + //} else if (denmethod->get_active_row_number() == 2) { + // pp->wavelet.denmethod = "low"; + //} else if (denmethod->get_active_row_number() == 3) { + // pp->wavelet.denmethod = "12high"; + //} else if (denmethod->get_active_row_number() == 4) { + // pp->wavelet.denmethod = "12low"; + //} if (mixmethod->get_active_row_number() == 0) { pp->wavelet.mixmethod = "nois"; @@ -2571,8 +2571,8 @@ void Wavelet::curveChanged(CurveEditor* ce) listener->panelChanged(EvWavblshape, M("HISTORY_CUSTOMCURVE")); } else if (ce == opacityShapeRG) { listener->panelChanged(EvWavColor, M("HISTORY_CUSTOMCURVE")); - } else if (ce == opacityShapeSH) { - listener->panelChanged(EvWavlevelshc, M("HISTORY_CUSTOMCURVE")); + //} else if (ce == opacityShapeSH) { + // listener->panelChanged(EvWavlevelshc, M("HISTORY_CUSTOMCURVE")); } else if (ce == opacityShapeBY) { listener->panelChanged(EvWavOpac, M("HISTORY_CUSTOMCURVE")); } else if (ce == wavdenoise) { @@ -2915,13 +2915,13 @@ void Wavelet::HSmethodUpdateUI() bllev->hide(); threshold->hide(); threshold2->hide(); - curveEditorC->hide(); + //curveEditorC->hide(); } else { //with hllev->show(); bllev->show(); threshold->show(); threshold2->show(); - curveEditorC->show(); + //curveEditorC->show(); } } } @@ -3254,7 +3254,7 @@ void Wavelet::convertParamToNormal() //denoise chromfi->setValue(def_params.chromfi); chromco->setValue(def_params.chromco); - denmethod->set_active(4); + //denmethod->set_active(4); mixmethod->set_active(2); slimethod->set_active(0); levelsigm->setValue(def_params.levelsigm); @@ -3312,7 +3312,7 @@ void Wavelet::updateGUIToMode(int mode) blurFrame->hide(); cbenab->hide(); sigmafin->hide(); - denHBox->hide(); + //denHBox->hide(); mixHBox->hide(); sliHBox->hide(); sigm->hide(); @@ -3340,7 +3340,7 @@ void Wavelet::updateGUIToMode(int mode) blurFrame->show(); cbenab->show(); sigmafin->show(); - denHBox->hide(); + //denHBox->hide(); mixHBox->show(); sigm->hide(); levelsigm->show(); @@ -3359,7 +3359,7 @@ void Wavelet::updateGUIToMode(int mode) CurveEditorwavnoise->show(); } disableListener(); - denmethod->set_active(4); + //denmethod->set_active(4); enableListener(); } @@ -3382,13 +3382,13 @@ void Wavelet::complexmethodChanged() } } -void Wavelet::denmethodChanged() -{ - - if (listener && (multiImage || getEnabled())) { - listener->panelChanged(EvWavdenmethod, denmethod->get_active_text()); - } -} +//void Wavelet::denmethodChanged() +//{ +// +// if (listener && (multiImage || getEnabled())) { +// listener->panelChanged(EvWavdenmethod, denmethod->get_active_text()); +// } +//} void Wavelet::mixmethodChanged() { @@ -3513,7 +3513,7 @@ void Wavelet::setBatchMode(bool batchMode) Backmethod->append(M("GENERAL_UNCHANGED")); Tilesmethod->append(M("GENERAL_UNCHANGED")); complexmethod->append(M("GENERAL_UNCHANGED")); - denmethod->append(M("GENERAL_UNCHANGED")); + //denmethod->append(M("GENERAL_UNCHANGED")); mixmethod->append(M("GENERAL_UNCHANGED")); slimethod->append(M("GENERAL_UNCHANGED")); quamethod->append(M("GENERAL_UNCHANGED")); @@ -3530,7 +3530,7 @@ void Wavelet::setBatchMode(bool batchMode) Dirmethod->append(M("GENERAL_UNCHANGED")); CCWcurveEditorG->setBatchMode(batchMode); opaCurveEditorG->setBatchMode(batchMode); - curveEditorC->setBatchMode(batchMode); + //curveEditorC->setBatchMode(batchMode); opacityCurveEditorG->setBatchMode(batchMode); CurveEditorwavnoise->setBatchMode(batchMode); CurveEditorwavnoiseh->setBatchMode(batchMode); diff --git a/rtgui/wavelet.h b/rtgui/wavelet.h index bdbf7bbc3..0060520f6 100644 --- a/rtgui/wavelet.h +++ b/rtgui/wavelet.h @@ -139,7 +139,7 @@ private: void MedgreinfChanged(); void TMmethodChanged(); void complexmethodChanged(); - void denmethodChanged(); + //void denmethodChanged(); void mixmethodChanged(); void quamethodChanged(); void slimethodChanged(); @@ -190,8 +190,8 @@ private: void enableToggled(MyExpander* expander); CurveEditorGroup* const curveEditorG; - CurveEditorGroup* const curveEditorC; - FlatCurveEditor* opacityShapeSH; + //CurveEditorGroup* const curveEditorC; + //FlatCurveEditor* opacityShapeSH; CurveEditorGroup* const CCWcurveEditorG; CurveEditorGroup* const curveEditorbl; @@ -349,8 +349,8 @@ private: sigc::connection MedgreinfConn; MyComboBoxText* const ushamethod; sigc::connection ushamethodconn; - MyComboBoxText* const denmethod; - sigc::connection denmethodconn; + //MyComboBoxText* const denmethod; + //sigc::connection denmethodconn; MyComboBoxText* const mixmethod; sigc::connection mixmethodconn; MyComboBoxText* const quamethod; @@ -392,7 +392,7 @@ private: Gtk::Box* const ctboxch; Gtk::Box* const quaHBox; Gtk::Box* const sliHBox; - Gtk::Box* const denHBox; + //Gtk::Box* const denHBox; Gtk::Box* const mixHBox; Gtk::Box* const ctboxBA;// = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));