diff --git a/LICENSE.txt b/LICENSE.txt index 1e9ad695f..44a4cfcc8 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,6 @@ RawTherapee - A powerful, cross-platform raw image processing program. Copyright (C) 2004-2012 Gabor Horvath + Copyright (C) 2010-2017 RawTherapee development team. RawTherapee is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/README.md b/README.md index 93dbfec59..bd30ae4df 100644 --- a/README.md +++ b/README.md @@ -41,4 +41,4 @@ Windows: http://rawpedia.rawtherapee.com/Windows OS X: -http://rawpedia.rawtherapee.com/OS_X +http://rawpedia.rawtherapee.com/macOS diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index 1c78bcd39..bfb32545d 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,21 +1,58 @@ -RAWTHERAPEE DEVELOPMENT RELEASE NOTES -------------------------------------- +RAWTHERAPEE 5 RELEASE NOTES +--------------------------- +RawTherapee provides you with a selection of powerful tools with which you can practice the art of developing raw photos. Be sure to read RawPedia to understand how each tool works so that you may make the most of it. +http://rawpedia.rawtherapee.com/ +A great place to start is the "Getting Started" article. Click on "Main page" in the top-left corner when you have finished reading that article to see all other articles. -This is a development version of RawTherapee. We update the code every day, which means the smallest number in the version changes every day, and every few months when new features are finalized and known bugs are fixed we release a stable version. Every minor version in-between those stable versions is known as a "development" version, and this build is one of them. - -While we only commit tested and relatively stable code and so the development versions should be fairly stable, you should be aware that: -- They only had limited testing, so there may be bugs unknown to us. -- You should report these bugs so they get fixed for the stable release. See www.rawpedia.rawtherapee.com/How_to_write_useful_bug_reports The way new tools work in the development versions is likely to change as we tweak and tune them, so your processing profiles may produce different results when used in a future stable versions. -- Bugs present in the stable versions get fixed, and until a new stable version is released these fixes are present in these development versions, thereby making the development version "more stable" than the previous stable version. At the same time, new features may introduce new bugs :) This is a trade-off you should be aware of. +News Relevant to Photographers +------------------------------ +- RawTherapee 5 supports most raw formats, including some unusual ones like those from cameras using Foveon and X-Trans sensors. If you're wondering whether it supports your camera's raw format, first download RawTherapee 5 and try for yourself. If a raw format is not supported it will either not open, or the preview in the Editor tab will appear black, white, or have a strong color cast - usually magenta. In that case, read the "Adding Support for New Raw Formats" RawPedia article. In order to use RawTherapee efficiently you should know that: - You can scroll all panels using the mouse scroll-wheel. - You can right-click on a tool's name to automatically expand it while collapsing all others. - To change slider values or drop-down list items with the mouse scroll-wheel, hold the Shift key. This is so that you can safely scroll the panels without accidentally changing a slider or other tool setting. - All curves support the Shift and Ctrl keys while dragging a point. Shift+drag makes the point snap to meaningful axes (top, bottom, diagonal, other), while Ctrl+drag makes your mouse movement super-fine for precise point positioning. -- There are many keyboard shortcuts which make working with RawTherapee much faster and give you greater control, make sure you familiarize yourself with them on RawPedia's Keyboard Shortcuts page! +- There are many keyboard shortcuts which make working with RawTherapee much faster and give you greater control. Make sure you familiarize yourself with them on RawPedia's "Keyboard Shortcuts" page! -Refer to RawPedia for information about RawTherapee's tools and how to use them. +New Features: +- Wavelets tool. +- Retinex tool. +- Monitor profile and rendering intent support. +- Print soft-proofing support. +- Automatic chroma noise reduction, manual luminance noise reduction using sliders and curves. +- The "Inspect" tab in the File Browser lets you see a 100% preview of the image whose thumbnail your mouse cursor hovers over, which is either the largest JPEG image embedded in the raw file or the image itself when hovering over non-raw images. +- The curve pipette allows you to pick the right point of a curve by clicking in the preview, and input/output values so that you can set the desired output value for a given input value. +- Post-resize sharpening, to give your photos that subtle crispness after resizing them. +- Dual-illuminant DCP support with curves, base tables, look tables and baseline exposure. +- New exposure tone curve modes "Luminance" and "Perceptual". +- Queue processing will stop if an error is encountered while saving, e.g. if you run out of disk space. +- The Contrast by Detail Levels tool received the "Process Locate Before/After Black-and-White" option. +- Rec. 2020 ICC profile added. +- The Navigator can show RGB, HSV and L*a*b* values in a range of 0-255, 0-1 or %. +- The Lockable Color Picker allows you to place multiple sample points over the preview to measure colors and see them change in real time as you manipulate the image. They support the same ranges as the Navigator. +- Grayscale JPEG and TIFF images are now supported. +- 32-bit TIFF files are supported. +- In addition to these new features, RawTherapee received over two years worth of amazing speedups, code cleanups and bug fixes, making it faster and more stable than ever before! + +News Relevant to Package Maintainers +------------------------------------ +- Branch "master" uses GTK2, branch "gtk3" requires GTK+ >=3.16. +- There are known bugs using GTK+ versions 3.20-3.22 where scrollbars may appear stuck (issue #3545) and where the Retinex tool's "Gain and Offset" panel may appear under the "Transmission" panel (issue #3525) until the user hovers the mouse cursor over a curve button. For this reason we recommend using GTK+ 3.16-3.18 if possible. +- RawTherapee 5 requires GCC-4.9 or higher, or Clang. +- Use -DCMAKE_CXX_FLAGS="-std=c++11" +- For stable builds (RT5) use -DCACHE_NAME_SUFFIX="" +- For development builds use -DCACHE_NAME_SUFFIX="5-dev" +- Windows builders should compile on a drive letter which users are most unlikely to have, such as Y:, due to the "There is no disk in the drive" error (issue #3544). + +News Relevant to Developers +--------------------------- +- Use C++11 +- Code must be run through astyle. +- Commits automatically trigger a compilation using Travis CI. + +Complete revision history available on GitHub: +https://github.com/Beep6581/RawTherapee/commits/ DOCUMENTATION ------------- @@ -24,7 +61,7 @@ http://rawpedia.rawtherapee.com/ REPORTING BUGS -------------- -Find out how to write good bug reports and get stack-backtraces here: +If you found a problem, don't keep it to yourself. Read the "How to write useful bug reports" article to get the problem fixed: http://rawpedia.rawtherapee.com/How_to_write_useful_bug_reports LIVE CHAT WITH USERS AND DEVELOPERS @@ -46,4 +83,3 @@ REVISION HISTORY ---------------- The complete changelog is available at: https://github.com/Beep6581/RawTherapee/commits/ - diff --git a/rawtherapee.appdata.xml b/rawtherapee.appdata.xml index 1e3af1747..3bcab8918 100644 --- a/rawtherapee.appdata.xml +++ b/rawtherapee.appdata.xml @@ -1,5 +1,5 @@ - + rawtherapee.desktop CC-BY-SA-4.0 @@ -15,7 +15,9 @@

- http://rawtherapee.com/images/screenshots/rt-42_07-hdr-landscape.jpg + http://rawpedia.rawtherapee.com/images/9/99/Rt-5-misty1.jpg + http://rawpedia.rawtherapee.com/images/2/2f/Rt-5-cc24-lcp.jpg + http://rawtherapee.com/images/screenshots/rt-42_07-hdr-landscape.jpg http://rawtherapee.com/images/screenshots/rt-42_03-macro-detail-toning.jpg http://rawtherapee.com/images/screenshots/rt-42_05-cow-bw-toning.jpg http://rawtherapee.com/images/screenshots/rt-42_08-fb-metadata.jpg diff --git a/rtdata/dcpprofiles/Canon EOS 20D.dcp b/rtdata/dcpprofiles/Canon EOS 20D.dcp index 0dfc1c80b..1ce4c5d0b 100644 Binary files a/rtdata/dcpprofiles/Canon EOS 20D.dcp and b/rtdata/dcpprofiles/Canon EOS 20D.dcp differ diff --git a/rtdata/dcpprofiles/Canon EOS 40D.dcp b/rtdata/dcpprofiles/Canon EOS 40D.dcp index 98cf8ce09..a6117dfa5 100644 Binary files a/rtdata/dcpprofiles/Canon EOS 40D.dcp and b/rtdata/dcpprofiles/Canon EOS 40D.dcp differ diff --git a/rtdata/dcpprofiles/Canon EOS 50D.dcp b/rtdata/dcpprofiles/Canon EOS 50D.dcp new file mode 100644 index 000000000..a99da9e61 Binary files /dev/null and b/rtdata/dcpprofiles/Canon EOS 50D.dcp differ diff --git a/rtdata/dcpprofiles/Canon EOS 7D Mark II.dcp b/rtdata/dcpprofiles/Canon EOS 7D Mark II.dcp new file mode 100644 index 000000000..1c153e82a Binary files /dev/null and b/rtdata/dcpprofiles/Canon EOS 7D Mark II.dcp differ diff --git a/rtdata/dcpprofiles/Canon EOS 7D.dcp b/rtdata/dcpprofiles/Canon EOS 7D.dcp index f6425f3c5..dd31e64f5 100644 Binary files a/rtdata/dcpprofiles/Canon EOS 7D.dcp and b/rtdata/dcpprofiles/Canon EOS 7D.dcp differ diff --git a/rtdata/dcpprofiles/FUJIFILM X-Pro2.dcp b/rtdata/dcpprofiles/FUJIFILM X-Pro2.dcp index 5b448b7b1..1172b17bb 100644 Binary files a/rtdata/dcpprofiles/FUJIFILM X-Pro2.dcp and b/rtdata/dcpprofiles/FUJIFILM X-Pro2.dcp differ diff --git a/rtdata/dcpprofiles/NIKON D600.dcp b/rtdata/dcpprofiles/NIKON D600.dcp new file mode 100644 index 000000000..039989c2c Binary files /dev/null and b/rtdata/dcpprofiles/NIKON D600.dcp differ diff --git a/rtdata/dcpprofiles/NIKON D810.dcp b/rtdata/dcpprofiles/NIKON D810.dcp new file mode 100644 index 000000000..58f90c983 Binary files /dev/null and b/rtdata/dcpprofiles/NIKON D810.dcp differ diff --git a/rtdata/dcpprofiles/SONY SLT-A99V.dcp b/rtdata/dcpprofiles/SONY SLT-A99V.dcp new file mode 100644 index 000000000..94a0767ed Binary files /dev/null and b/rtdata/dcpprofiles/SONY SLT-A99V.dcp differ diff --git a/rtdata/rt_splash_5.svg b/rtdata/images/rt_splash_5.svg similarity index 100% rename from rtdata/rt_splash_5.svg rename to rtdata/images/rt_splash_5.svg diff --git a/rtdata/images/splash.png b/rtdata/images/splash.png index 2dbec173e..71486b132 100644 Binary files a/rtdata/images/splash.png and b/rtdata/images/splash.png differ diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech index 2b54e53d8..6fa1fa8f7 100644 --- a/rtdata/languages/Czech +++ b/rtdata/languages/Czech @@ -36,6 +36,7 @@ #35 2015-11-24 updated by mkyral #36 2016-10-18 updated by mkyral #37 2017-01-10 updated by mkyral + ABOUT_TAB_BUILD;Verze ABOUT_TAB_CREDITS;Zásluhy ABOUT_TAB_LICENSE;Licence @@ -2068,3 +2069,4 @@ ZOOMPANEL_ZOOMFITCROPSCREEN;Přizpůsobit obrazovce\nZkratka: Alt-ff ZOOMPANEL_ZOOMIN;Přiblížit\nZkratka: + ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: - + diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index cbddbe4aa..e45cee225 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -37,8 +37,6 @@ DIRBROWSER_FOLDERS;Répertoires EDITWINDOW_TITLE;Édition d'image EDIT_OBJECT_TOOLTIP;Affiche des éléments dans la fenêtre de prévisualisation qui vous permettront d'ajuster cet outil. EDIT_PIPETTE_TOOLTIP;Pour ajouter un point d'ajustement de la courbe, maintenez la touche Ctrl préssée et cliquez dans l'image avec le bouton gauche.\nPour ajuster le point, pressez la touche Ctrl lors du clic-gauche sur la zone correspondande dans l'apperçu, puis relachez Ctrl (sauf si vous désirez un control plus fin) et tout en gardant le bouton gauche appuyé, déplacez le curseur vers le haut ou le bas pour ajuster la position du point. -ENERAL_APPLY;Appliquer -ENERAL_OPEN;Ouvrir EXIFFILTER_APERTURE;Ouverture EXIFFILTER_CAMERA;Appareil photo EXIFFILTER_EXPOSURECOMPENSATION;Compensation d'exposition (EV) @@ -624,7 +622,7 @@ HISTORY_MSG_389;O - Résiduel - BC bleu moyen HISTORY_MSG_390;O - Résiduel - BC vert bas HISTORY_MSG_391;O - Résiduel - BC bleu bas HISTORY_MSG_392;O - Résiduel - BC Réinitialiser -HISTORY_MSG_393;DCP - Table de recherche (LUT) +HISTORY_MSG_393;DCP - Table de corresp. (LUT) HISTORY_MSG_394;DCP - Exposition de base HISTORY_MSG_395;DCP - Table de base HISTORY_MSG_396;O - Contrast @@ -1526,8 +1524,8 @@ TP_ICM_APPLYBASELINEEXPOSUREOFFSET;Exposition de base TP_ICM_APPLYBASELINEEXPOSUREOFFSET_TOOLTIP;Utilise l'offset d'exposition de base contenu dans le profil DCP. Ce réglage n'est possible que si le profil DCP sélectionné en contient un. TP_ICM_APPLYHUESATMAP;Table de base TP_ICM_APPLYHUESATMAP_TOOLTIP;Utilise la table de base (HueSatMap) contenu dans le profil DCP. Ce réglage n'est possible que si le profil DCP sélectionné en contient une. -TP_ICM_APPLYLOOKTABLE;Table de recherche -TP_ICM_APPLYLOOKTABLE_TOOLTIP;Utilise la table de recherche (LUT) contenu dans le profil DCP. Ce réglage n'est possible que si le profil DCP sélectionné en contient une. +TP_ICM_APPLYLOOKTABLE;Table de correspondance +TP_ICM_APPLYLOOKTABLE_TOOLTIP;Utilise la table de correspondance (LUT) contenu dans le profil DCP. Ce réglage n'est possible que si le profil DCP sélectionné en contient une. TP_ICM_BLENDCMSMATRIX;Mélange des hautes lumières\ndu profil ICC avec la matrice TP_ICM_BLENDCMSMATRIX_TOOLTIP;Activer la récupération des zones brûlées lorsque les profils ICC basés sur la LUT sont utilisés TP_ICM_BPC;Compensation du Point Noir diff --git a/rtdata/rt_splash_5.png b/rtdata/rt_splash_5.png deleted file mode 100644 index 71486b132..000000000 Binary files a/rtdata/rt_splash_5.png and /dev/null differ diff --git a/rtengine/imageio.cc b/rtengine/imageio.cc index 59f7cf541..1f170de9a 100644 --- a/rtengine/imageio.cc +++ b/rtengine/imageio.cc @@ -909,8 +909,11 @@ int ImageIO::loadPPMFromMemory(const char* buffer, int width, int height, bool s int ImageIO::savePNG (Glib::ustring fname, int compression, volatile int bps) { + if (getW() < 1 || getH() < 1) { + return IMIO_HEADERERROR; + } - FILE *file = g_fopen_withBinaryAndLock (fname); + FILE* const file = g_fopen_withBinaryAndLock (fname); if (!file) { return IMIO_CANNOTWRITEFILE; @@ -1003,8 +1006,11 @@ int ImageIO::savePNG (Glib::ustring fname, int compression, volatile int bps) // Quality 0..100, subsampling: 1=low quality, 2=medium, 3=high int ImageIO::saveJPEG (Glib::ustring fname, int quality, int subSamp) { + if (getW() < 1 || getH() < 1) { + return IMIO_HEADERERROR; + } - FILE *file = g_fopen_withBinaryAndLock (fname); + FILE* const file = g_fopen_withBinaryAndLock (fname); if (!file) { return IMIO_CANNOTWRITEFILE; @@ -1190,6 +1196,9 @@ int ImageIO::saveJPEG (Glib::ustring fname, int quality, int subSamp) int ImageIO::saveTIFF (Glib::ustring fname, int bps, bool uncompressed) { + if (getW() < 1 || getH() < 1) { + return IMIO_HEADERERROR; + } //TODO: Handling 32 bits floating point output images! bool writeOk = true; diff --git a/rtengine/iplab2rgb.cc b/rtengine/iplab2rgb.cc index 218dbf6fe..f970e3a54 100644 --- a/rtengine/iplab2rgb.cc +++ b/rtengine/iplab2rgb.cc @@ -144,7 +144,6 @@ Image8* ImProcFunctions::lab2rgb (LabImage* lab, int cx, int cy, int cw, int ch, Image8* image = new Image8 (cw, ch); Glib::ustring profile; - cmsHPROFILE oprof = iccStore->getProfile (profile); bool standard_gamma; @@ -159,6 +158,8 @@ Image8* ImProcFunctions::lab2rgb (LabImage* lab, int cx, int cy, int cw, int ch, standard_gamma = false; } + cmsHPROFILE oprof = iccStore->getProfile (profile); + if (oprof) { cmsHPROFILE oprofG = oprof; diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index d0a79e6a8..18437431d 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -5475,7 +5475,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited) } if (keyFile.has_key ("Crop", "W")) { - crop.w = keyFile.get_integer ("Crop", "W"); + crop.w = std::max(keyFile.get_integer("Crop", "W"), 1); if (pedited) { pedited->crop.w = true; @@ -5483,7 +5483,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited) } if (keyFile.has_key ("Crop", "H")) { - crop.h = keyFile.get_integer ("Crop", "H"); + crop.h = std::max(keyFile.get_integer("Crop", "H"), 1); if (pedited) { pedited->crop.h = true; diff --git a/rtengine/stdimagesource.cc b/rtengine/stdimagesource.cc index ac911aaa7..f2d4af6c5 100644 --- a/rtengine/stdimagesource.cc +++ b/rtengine/stdimagesource.cc @@ -117,22 +117,19 @@ int StdImageSource::load (const Glib::ustring &fname, int imageNum, bool batch) switch (sFormat) { case (IIOSF_UNSIGNED_CHAR): { - Image8 *img_8 = new Image8 (); - img = img_8; + img = new Image8; break; } case (IIOSF_UNSIGNED_SHORT): { - Image16 *img_16 = new Image16 (); - img = img_16; + img = new Image16; break; } case (IIOSF_LOGLUV24): case (IIOSF_LOGLUV32): case (IIOSF_FLOAT): { - Imagefloat *img_float = new Imagefloat (); - img = img_float; + img = new Imagefloat; break; } diff --git a/rtgui/crop.cc b/rtgui/crop.cc index ab8a7a8cc..5e7dca68a 100644 --- a/rtgui/crop.cc +++ b/rtgui/crop.cc @@ -210,10 +210,10 @@ Crop::Crop (): FoldableToolPanel(this, "crop", M("TP_CROP_LABEL"), false, true) guide->append_text (M("TP_CROP_GTEPASSPORT")); guide->set_active (0); - w->set_range (0, maxw); - h->set_range (0, maxh); - x->set_range (0, maxw); - y->set_range (0, maxh); + w->set_range (1, maxw); + h->set_range (1, maxh); + x->set_range (0, maxw - 1); + y->set_range (0, maxh - 1); x->set_digits (0); x->set_increments (1, 100); @@ -326,10 +326,10 @@ void Crop::read (const ProcParams* pp, const ParamsEdited* pedited) guide->set_active (8); } - x->set_value (pp->crop.x); - y->set_value (pp->crop.y); - w->set_value (pp->crop.w); - h->set_value (pp->crop.h); + x->set_value(pp->crop.x); + y->set_value(pp->crop.y); + w->set_value(std::max(pp->crop.w, 1)); + h->set_value(std::max(pp->crop.h, 1)); nx = pp->crop.x; ny = pp->crop.y; @@ -706,10 +706,10 @@ void Crop::setDimensions (int mw, int mh) bool wconnWasBlocked = wconn.block (true); bool hconnWasBlocked = hconn.block (true); - w->set_range (0, maxw); - h->set_range (0, maxh); - x->set_range (0, maxw); - y->set_range (0, maxh); + w->set_range (1, maxw); + h->set_range (1, maxh); + x->set_range (0, maxw - 1); + y->set_range (0, maxh - 1); if (!xconnWasBlocked) { xconn.block (false); diff --git a/rtgui/crop.h b/rtgui/crop.h index 61eff4bd7..077903836 100644 --- a/rtgui/crop.h +++ b/rtgui/crop.h @@ -27,9 +27,10 @@ class CropPanelListener { - public: - virtual void cropSelectRequested () {} + virtual ~CropPanelListener() = default; + + virtual void cropSelectRequested() = 0; }; class CropRatio @@ -42,7 +43,6 @@ public: class Crop : public ToolParamBlock, public CropGUIListener, public FoldableToolPanel, public rtengine::SizeListener { - protected: Gtk::CheckButton* fixr; MyComboBoxText* ratio; @@ -70,7 +70,6 @@ protected: std::vector cropratio; public: - Crop (); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); diff --git a/rtgui/profilestore.cc b/rtgui/profilestore.cc index ddb6782d4..083b45686 100644 --- a/rtgui/profilestore.cc +++ b/rtgui/profilestore.cc @@ -284,8 +284,8 @@ const ProfileStoreEntry* ProfileStore::findEntryFromFullPathU(Glib::ustring path if ( lastdot_pos != Glib::ustring::npos && lastdot_pos <= casefolded_path.size() - 4 - && !casefolded_path.compare(lastdot_pos, 4, paramFileExtension)) - { + && !casefolded_path.compare(lastdot_pos, 4, paramFileExtension) + ) { // removing the extension // now use dot position without casefold() path = path.substr(0, path.find_last_of('.')); diff --git a/rtgui/retinex.cc b/rtgui/retinex.cc index b4fff15bf..44cbcc0c7 100644 --- a/rtgui/retinex.cc +++ b/rtgui/retinex.cc @@ -998,10 +998,12 @@ void Retinex::write (ProcParams* pp, ParamsEdited* pedited) void Retinex::retinexMethodChanged() { - if(retinexMethod->get_active_row_number() == 3) { - highl->show(); - } else { - highl->hide(); + if (!batchMode) { + if(retinexMethod->get_active_row_number() == 3) { + highl->show(); + } else { + highl->hide(); + } } if (listener) { @@ -1014,28 +1016,29 @@ void Retinex::retinexMethodChanged() void Retinex::mapMethodChanged() { - if(mapMethod->get_active_row_number() == 1 /*|| mapMethod->get_active_row_number() == 2*/) { - curveEditormap->show(); - highlights->show(); - h_tonalwidth->show(); - shadows->show(); - s_tonalwidth->show(); - radius->show(); - } else if(mapMethod->get_active_row_number() == 2 || mapMethod->get_active_row_number() == 3) { - curveEditormap->show(); - highlights->show(); - h_tonalwidth->show(); - shadows->show(); - s_tonalwidth->show(); - radius->hide(); - } else { - curveEditormap->hide(); - highlights->hide(); - h_tonalwidth->hide(); - shadows->hide(); - s_tonalwidth->hide(); - radius->hide(); - + if (!batchMode) { + if(mapMethod->get_active_row_number() == 1 /*|| mapMethod->get_active_row_number() == 2*/) { + curveEditormap->show(); + highlights->show(); + h_tonalwidth->show(); + shadows->show(); + s_tonalwidth->show(); + radius->show(); + } else if(mapMethod->get_active_row_number() == 2 || mapMethod->get_active_row_number() == 3) { + curveEditormap->show(); + highlights->show(); + h_tonalwidth->show(); + shadows->show(); + s_tonalwidth->show(); + radius->hide(); + } else { + curveEditormap->hide(); + highlights->hide(); + h_tonalwidth->hide(); + shadows->hide(); + s_tonalwidth->hide(); + radius->hide(); + } } if (listener) {