From 9f75b197eacfd9730657af197e4ed7cf74952cbd Mon Sep 17 00:00:00 2001 From: heckflosse Date: Sat, 16 Sep 2017 18:52:48 +0200 Subject: [PATCH] some cleanups --- rtengine/procparams.cc | 6 +++--- rtengine/procparams.h | 22 +++++++++++----------- rtgui/lensprofile.cc | 28 ++++++++++++++++------------ 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index a18982325..886e99c08 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -52,7 +52,7 @@ const int br = (int) options.rtSettings.bot_right; const int tl = (int) options.rtSettings.top_left; const int bl = (int) options.rtSettings.bot_left; -const char *LensProfParams::methodstring[static_cast(LensProfParams::eLcMode::lcp) + 1u] = {"none", "lfauto", "lfmanual", "lcp"}; +const char *LensProfParams::methodstring[static_cast(LensProfParams::eLcMode::LC_LCP) + 1u] = {"none", "lfauto", "lfmanual", "lcp"}; const char *RAWParams::BayerSensor::methodstring[RAWParams::BayerSensor::numMethods] = {"amaze", "igv", "lmmse", "eahd", "hphd", "vng4", "dcb", "ahd", "fast", "mono", "none", "pixelshift" }; const char *RAWParams::XTransSensor::methodstring[RAWParams::XTransSensor::numMethods] = {"3-pass (best)", "1-pass (medium)", "fast", "mono", "none" }; @@ -920,7 +920,7 @@ void ToneCurveParams::setDefaults() void LensProfParams::setDefaults() { - lcMode = eLcMode::none; + lcMode = eLcMode::LC_NOCORRECTION; lcpFile = ""; useDist = useVign = true; useCA = false; @@ -5836,7 +5836,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited) } if(ppVersion < 327 && !lensProf.lcpFile.empty()) { - lensProf.lcMode = LensProfParams::eLcMode::lcp; + lensProf.lcMode = LensProfParams::eLcMode::LC_LCP; } } diff --git a/rtengine/procparams.h b/rtengine/procparams.h index 9e7b728eb..8c7cb6a1d 100644 --- a/rtengine/procparams.h +++ b/rtengine/procparams.h @@ -830,13 +830,13 @@ class LensProfParams public: enum class eLcMode { - none, // No lens correction - lensfunAutoMatch, // Lens correction using auto matched lensfun database entry - lensfunManual, // Lens correction using manually selected lensfun database entry - lcp // Lens correction using lcp file + LC_NOCORRECTION, // No lens correction + LC_LENSFUNAUTOMATCH, // Lens correction using auto matched lensfun database entry + LC_LENSFUNMANUAL, // Lens correction using manually selected lensfun database entry + LC_LCP // Lens correction using lcp file }; - static const char *methodstring[static_cast(eLcMode::lcp) + 1u]; + static const char *methodstring[static_cast(eLcMode::LC_LCP) + 1u]; eLcMode lcMode; Glib::ustring lcpFile; bool useDist, useVign, useCA; @@ -852,22 +852,22 @@ public: bool useLensfun() const { - return lcMode == eLcMode::lensfunAutoMatch || lcMode == eLcMode::lensfunManual; + return lcMode == eLcMode::LC_LENSFUNAUTOMATCH || lcMode == eLcMode::LC_LENSFUNMANUAL; } bool lfAutoMatch() const { - return lcMode == eLcMode::lensfunAutoMatch; + return lcMode == eLcMode::LC_LENSFUNAUTOMATCH; } bool useLcp() const { - return lcMode == eLcMode::lcp && lcpFile.length() > 0; + return lcMode == eLcMode::LC_LCP && lcpFile.length() > 0; } bool lfManual() const { - return lcMode == eLcMode::lensfunManual; + return lcMode == eLcMode::LC_LENSFUNMANUAL; } Glib::ustring getMethodString(eLcMode mode) const @@ -877,12 +877,12 @@ public: eLcMode getMethodNumber(const Glib::ustring &mode) const { - for(size_t i = 0; i < static_cast(eLcMode::lcp); ++i) { + for(size_t i = 0; i < static_cast(eLcMode::LC_LCP); ++i) { if(methodstring[i] == mode) { return static_cast(i); } } - return eLcMode::none; + return eLcMode::LC_NOCORRECTION; } }; diff --git a/rtgui/lensprofile.cc b/rtgui/lensprofile.cc index b6cef05fc..7ce62b0a5 100644 --- a/rtgui/lensprofile.cc +++ b/rtgui/lensprofile.cc @@ -160,14 +160,18 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa corrLensfunAuto->set_sensitive(true); - if(pp->lensProf.lcMode == procparams::LensProfParams::eLcMode::lcp) { - corrLcpFile->set_active(true); - } else if(pp->lensProf.lcMode == procparams::LensProfParams::eLcMode::lensfunAutoMatch) { - corrLensfunAuto->set_active(true); - } else if(pp->lensProf.lcMode == procparams::LensProfParams::eLcMode::lensfunManual) { - corrLensfunManual->set_active(true); - } else { - corrOff->set_active(true); + switch(pp->lensProf.lcMode) { + case procparams::LensProfParams::eLcMode::LC_LCP : + corrLcpFile->set_active(true); + break; + case procparams::LensProfParams::eLcMode::LC_LENSFUNAUTOMATCH : + corrLensfunAuto->set_active(true); + break; + case procparams::LensProfParams::eLcMode::LC_LENSFUNMANUAL : + corrLensfunManual->set_active(true); + break; + case procparams::LensProfParams::eLcMode::LC_NOCORRECTION : + corrOff->set_active(true); } if (pp->lensProf.lcpFile.empty()) { @@ -270,13 +274,13 @@ void LensProfilePanel::setRawMeta(bool raw, const rtengine::ImageMetaData* pMeta void LensProfilePanel::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited) { if (corrLcpFile->get_active()) { - pp->lensProf.lcMode = procparams::LensProfParams::eLcMode::lcp; + pp->lensProf.lcMode = procparams::LensProfParams::eLcMode::LC_LCP; } else if(corrLensfunManual->get_active()) { - pp->lensProf.lcMode = procparams::LensProfParams::eLcMode::lensfunManual; + pp->lensProf.lcMode = procparams::LensProfParams::eLcMode::LC_LENSFUNMANUAL; } else if(corrLensfunAuto->get_active()) { - pp->lensProf.lcMode = procparams::LensProfParams::eLcMode::lensfunAutoMatch; + pp->lensProf.lcMode = procparams::LensProfParams::eLcMode::LC_LENSFUNAUTOMATCH; } else if(corrOff->get_active()) { - pp->lensProf.lcMode = procparams::LensProfParams::eLcMode::none; + pp->lensProf.lcMode = procparams::LensProfParams::eLcMode::LC_NOCORRECTION; } if (LCPStore::getInstance()->isValidLCPFileName(fcbLCPFile->get_filename())) {