From 6abab61a6740b92976eb50842bdb8f00517ca69d Mon Sep 17 00:00:00 2001 From: Desmis Date: Mon, 4 Jan 2016 12:32:31 +0100 Subject: [PATCH] Init newretinex --- rtdata/languages/default | 7 ++--- rtgui/retinex.cc | 57 +++++++++++++++++++++++++--------------- 2 files changed, 40 insertions(+), 24 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index 8a43155c9..7cc23d133 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1686,10 +1686,11 @@ TP_RETINEX_GRAD_TOOLTIP;If slider at 0, all iterations are identical.\nIf > 0 Va TP_RETINEX_GRADS;Strength gradient TP_RETINEX_GRADS_TOOLTIP;If slider at 0, all iterations are identical.\nIf > 0 Strength is reduced when iterations increase, and conversely. TP_RETINEX_LABEL;Retinex +TP_RETINEX_LABEL_MASK;Mask TP_RETINEX_LABSPACE;L*a*b* TP_RETINEX_LOW;Low TP_RETINEX_MAP;Mask method -TP_RETINEX_MAP_METHOD_TOOLTIP;Use the mask generated by the Gaussian function above to reduce halos and artifacts.\n\nCurve only: apply a diagonal contrast curve on the mask.\nBeware of artifacts!\n\nGaussian mask: generate and use a Gaussian blur of the original mask.\nQuick.\n\nSharp mask: generate and use a wavelet on the original mask.\nSlow. +TP_RETINEX_MAP_METHOD_TOOLTIP;Use the mask generated by the Gaussian function (Radius, Method) to reduce halos and artifacts.\n\nCurve only: apply a diagonal contrast curve on the mask.\nBeware of artifacts!\n\nGaussian mask: generate and use a Gaussian blur of the original mask.\nQuick.\n\nSharp mask: generate and use a wavelet on the original mask.\nSlow. TP_RETINEX_MAP_NONE;None TP_RETINEX_MAP_CURV;Curve only TP_RETINEX_MAP_GAUS;Gaussian mask @@ -1697,7 +1698,7 @@ TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) TP_RETINEX_MAP_MAPT;Sharp mask (wavelet total) TP_RETINEX_MEDIAN;Transmission median filter TP_RETINEX_METHOD;Method -TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights. +TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light.\nUniform = Equalize action.\nHigh = Reinforce high light.\nHighlights = Remove magenta in highlights. TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2 TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture. TP_RETINEX_NEIGHBOR;Radius @@ -1713,7 +1714,7 @@ TP_RETINEX_THRESHOLD;Threshold TP_RETINEX_THRESHOLD_TOOLTIP;Limits in/out.\nIn = image source,\nOut = image gauss. TP_RETINEX_TLABEL;TM Min=%1 Max=%2 Mean=%3 Sigma=%4 TP_RETINEX_TLABEL2;TM Tm=%1 TM=%2 -TP_RETINEX_TLABEL_TOOLTIP;Transmission map result.\nMin and Max are used by Variance.\nMean and Sigma\nTm=Min TM=Max of transmission map. +TP_RETINEX_TLABEL_TOOLTIP;Transmission map result.\nMin and Max are used by Variance.\nMean and Sigma.\nTm=Min TM=Max of transmission map. TP_RETINEX_TRANSMISSION;Transmission map TP_RETINEX_TRANSMISSION_TOOLTIP;Transmission according to transmission.\nAbscissa: transmission from negative values (min), mean, and positives values (max).\nOrdinate: amplification or reduction. TP_RETINEX_UNIFORM;Uniform diff --git a/rtgui/retinex.cc b/rtgui/retinex.cc index fb69de3e3..e604d866f 100644 --- a/rtgui/retinex.cc +++ b/rtgui/retinex.cc @@ -175,7 +175,16 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), limd->set_tooltip_markup (M("TP_RETINEX_THRESHOLD_TOOLTIP")); baselog->set_tooltip_markup (M("TP_RETINEX_BASELOG_TOOLTIP")); + Gtk::Frame *p1Frame; + p1Frame = Gtk::manage (new Gtk::Frame(M("TP_RETINEX_LABEL_MASK")) ); + p1Frame->set_border_width(0); + p1Frame->set_label_align(0.025, 0.5); + Gtk::VBox *p1VBox; + p1VBox = Gtk::manage ( new Gtk::VBox()); + p1VBox->set_border_width(4); + p1VBox->set_spacing(2); + mapbox = Gtk::manage (new Gtk::HBox ()); labmap = Gtk::manage (new Gtk::Label (M("TP_RETINEX_MAP") + ":")); mapbox->pack_start (*labmap, Gtk::PACK_SHRINK, 1); @@ -288,29 +297,32 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), settingsVBox->pack_start (*limd); limd->show (); - settingsVBox->pack_start (*Gtk::manage (new Gtk::HSeparator())); - - mapbox->pack_start(*mapMethod); - settingsVBox->pack_start(*mapbox); - - settingsVBox->pack_start (*curveEditormap, Gtk::PACK_SHRINK, 4); - curveEditormap->show(); - - settingsVBox->pack_start (*highlights); - highlights->show(); - settingsVBox->pack_start (*h_tonalwidth); - h_tonalwidth->show(); - settingsVBox->pack_start (*shadows); - shadows->show(); - settingsVBox->pack_start (*s_tonalwidth); - s_tonalwidth->show(); - settingsVBox->pack_start (*radius); - radius->show(); + // settingsVBox->pack_start (*Gtk::manage (new Gtk::HSeparator())); viewbox->pack_start(*viewMethod); - settingsVBox->pack_start(*viewbox); - + // settingsVBox->pack_start(*viewbox); + retinexVBox->pack_start(*viewbox); //settingsVBox->pack_start (*viewMethod); + + mapbox->pack_start(*mapMethod); + // settingsVBox->pack_start(*mapbox); + p1VBox->pack_start(*mapbox); + + p1VBox->pack_start (*curveEditormap, Gtk::PACK_SHRINK, 4); + curveEditormap->show(); + + p1VBox->pack_start (*highlights); + highlights->show(); + p1VBox->pack_start (*h_tonalwidth); + h_tonalwidth->show(); + p1VBox->pack_start (*shadows); + shadows->show(); + p1VBox->pack_start (*s_tonalwidth); + s_tonalwidth->show(); + p1VBox->pack_start (*radius); + radius->show(); + + // settingsVBox->pack_start (*highl); // highl->show (); @@ -320,7 +332,7 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), // settingsVBox->pack_start (*grbl); // grbl->show (); - settingsVBox->pack_start (*Gtk::manage (new Gtk::HSeparator())); + // settingsVBox->pack_start (*Gtk::manage (new Gtk::HSeparator())); settingsVBox->pack_start( *transmissionCurveEditorG, Gtk::PACK_SHRINK, 2); transmissionCurveEditorG->show(); @@ -459,6 +471,9 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), } */ pack_start (*retinexVBox); + p1Frame->add(*p1VBox); + pack_start (*p1Frame, Gtk::PACK_EXPAND_WIDGET, 4); + pack_start (*expsettings); pack_start (*neutrHBox);