liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Naming cleanups. (No functional changes, prep for patch)

Browse Source
This commit is contained in:
Oliver Duis
2011-04-21 20:22:08 +02:00
parent d3261ed527
commit 3077b2492e
9 changed files with 45 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtgui/batchtoolpanelcoord.cc
View File

@@ -120,7 +120,7 @@ void BatchToolPanelCoordinator::initSession () {
pparams = selected[0]->getProcParams ();
coarse->initBatchBehavior ();
curve->setAdjusterBehavior (options.baBehav[ADDSET_TC_EXPCOMP], options.baBehav[ADDSET_TC_HLCOMPAMOUNT],options.baBehav[ADDSET_TC_HLCOMPTHRESH], options.baBehav[ADDSET_TC_BRIGHTNESS], options.baBehav[ADDSET_TC_BLACKLEVEL],options.baBehav[ADDSET_TC_SHCOMP], options.baBehav[ADDSET_TC_CONTRAST], options.baBehav[ADDSET_TC_SATURATION]);
toneCurve->setAdjusterBehavior (options.baBehav[ADDSET_TC_EXPCOMP], options.baBehav[ADDSET_TC_HLCOMPAMOUNT],options.baBehav[ADDSET_TC_HLCOMPTHRESH], options.baBehav[ADDSET_TC_BRIGHTNESS], options.baBehav[ADDSET_TC_BLACKLEVEL],options.baBehav[ADDSET_TC_SHCOMP], options.baBehav[ADDSET_TC_CONTRAST], options.baBehav[ADDSET_TC_SATURATION]);
lcurve->setAdjusterBehavior (options.baBehav[ADDSET_LC_BRIGHTNESS], options.baBehav[ADDSET_LC_CONTRAST], options.baBehav[ADDSET_LC_SATURATION]);
whitebalance->setAdjusterBehavior (options.baBehav[ADDSET_WB_TEMPERATURE], options.baBehav[ADDSET_WB_GREEN]);
vignetting->setAdjusterBehavior (options.baBehav[ADDSET_VIGN_AMOUNT]);

6
rtgui/editorpanel.cc
View File

@@ -1287,10 +1287,10 @@ void EditorPanel::beforeAfterToggled () {
}
}
void EditorPanel::histogramChanged (LUTu & rh, LUTu & gh, LUTu & bh, LUTu & lh, LUTu & bcrgb, LUTu & bcl) {
void EditorPanel::histogramChanged (LUTu & histRed, LUTu & histGreen, LUTu & histBlue, LUTu & histLuma, LUTu & histToneCurve, LUTu & histLCurve) {
histogramPanel->histogramChanged (rh, gh, bh, lh);
tpc->updateCurveBackgroundHistogram (bcrgb, bcl);
histogramPanel->histogramChanged (histRed, histGreen, histBlue, histLuma);
tpc->updateCurveBackgroundHistogram (histToneCurve, histLCurve);
}
bool EditorPanel::CheckSidePanelsVisibility(){

2
rtgui/editorpanel.h
View File

@@ -149,7 +149,7 @@ class EditorPanel : public Gtk::VBox,
void historyBeforeLineChanged (const rtengine::procparams::ProcParams& params);
// HistogramListener
void histogramChanged (LUTu & rh, LUTu & gh, LUTu & bh, LUTu & lh, LUTu & bcrgb, LUTu & bcl);
void histogramChanged (LUTu & histRed, LUTu & histGreen, LUTu & histBlue, LUTu & histLuma, LUTu & histToneCurve, LUTu & histLCurve);
// event handlers
void info_toggled ();

2
rtgui/histogrampanel.h
View File

@@ -95,7 +95,7 @@ class HistogramPanel : public Gtk::HBox {
HistogramPanel ();
void histogramChanged (LUTu &rh, LUTu &gh, LUTu &bh, LUTu &lh) { histogramArea->update (rh, gh, bh, lh); }
void histogramChanged (LUTu &histRed, LUTu &histGreen, LUTu &histBlue, LUTu &histLuma) { histogramArea->update (histRed, histGreen, histBlue, histLuma); }
void rgbv_toggled ();
void resized (Gtk::Allocation& req);
};

25
rtgui/toolpanelcoord.cc
View File

@@ -36,7 +36,7 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) {
rawPanel = Gtk::manage (new Gtk::VBox ());
coarse = Gtk::manage (new CoarsePanel ());
curve = Gtk::manage (new ToneCurve ());
toneCurve = Gtk::manage (new ToneCurve ());
shadowshighlights = Gtk::manage (new ShadowsHighlights ());
lumadenoise = Gtk::manage (new LumaDenoise ());
colordenoise = Gtk::manage (new ColorDenoise ());
@@ -72,7 +72,7 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) {
rawexposure = Gtk::manage (new RAWExposure ());
addPanel (colorPanel, whitebalance, M("TP_WBALANCE_LABEL")); toolPanels.push_back (whitebalance);
addPanel (exposurePanel, curve, M("TP_EXPOSURE_LABEL")); toolPanels.push_back (curve);
addPanel (exposurePanel, toneCurve, M("TP_EXPOSURE_LABEL")); toolPanels.push_back (toneCurve);
addPanel (exposurePanel, hlrecovery, M("TP_HLREC_LABEL")); toolPanels.push_back (hlrecovery);
addPanel (colorPanel, chmixer, M("TP_CHMIXER_LABEL")); toolPanels.push_back (chmixer);
addPanel (exposurePanel, shadowshighlights, M("TP_SHADOWSHLIGHTS_LABEL")); toolPanels.push_back (shadowshighlights);
@@ -295,16 +295,15 @@ CropGUIListener* ToolPanelCoordinator::getCropGUIListener () {
void ToolPanelCoordinator::initImage (rtengine::StagedImageProcessor* ipc_, bool raw) {
ipc = ipc_;
curve->disableListener ();
curve->enableAll ();
curve->enableListener ();
toneCurve->disableListener ();
toneCurve->enableAll ();
toneCurve->enableListener ();
exifpanel->setImageData (ipc->getInitialImage()->getMetaData());
iptcpanel->setImageData (ipc->getInitialImage()->getMetaData());
if (ipc) {
ipc->setAutoExpListener (curve);
ipc->setAutoExpListener (toneCurve);
ipc->setSizeListener (crop);
ipc->setSizeListener (resize);
}
@@ -329,9 +328,6 @@ void ToolPanelCoordinator::readOptions () {
for (int i=0; i<options.tpOpen.size(); i++)
if (i<expList.size())
expList[i]->set_expanded (options.tpOpen[i]);
//if (options.crvOpen.size()>1)
// curve->expandCurve (options.crvOpen[0]);
}
void ToolPanelCoordinator::writeOptions () {
@@ -340,9 +336,6 @@ void ToolPanelCoordinator::writeOptions () {
options.tpOpen.clear ();
for (int i=0; i<expList.size(); i++)
options.tpOpen.push_back (expList[i]->get_expanded ());
//options.crvOpen.clear ();
//options.crvOpen.push_back (curve->isCurveExpanded());
}
@@ -470,10 +463,10 @@ int ToolPanelCoordinator::getSpotWBRectSize () {
return whitebalance->getSize ();
}
void ToolPanelCoordinator::updateCurveBackgroundHistogram (LUTu &histrgb, LUTu &histl) {
void ToolPanelCoordinator::updateCurveBackgroundHistogram (LUTu &histToneCurve, LUTu &histLCurve) {
curve->updateCurveBackgroundHistogram (histrgb);
lcurve->updateCurveBackgroundHistogram (histl);
toneCurve->updateCurveBackgroundHistogram (histToneCurve);
lcurve->updateCurveBackgroundHistogram (histLCurve);
}
void ToolPanelCoordinator::foldAllButOne (Gtk::Box* parent, FoldableToolPanel* openedSection) {

4
rtgui/toolpanelcoord.h
View File

@@ -93,7 +93,7 @@ class ToolPanelCoordinator : public ToolPanelListener,
Resize* resize;
ICMPanel* icm;
Crop* crop;
ToneCurve* curve;
ToneCurve* toneCurve;
ShadowsHighlights* shadowshighlights;
LumaDenoise* lumadenoise;
ColorDenoise* colordenoise;
@@ -149,7 +149,7 @@ class ToolPanelCoordinator : public ToolPanelListener,
~ToolPanelCoordinator ();
bool getChangedState () { return hasChanged; }
void updateCurveBackgroundHistogram (LUTu & histrgb, LUTu & histl);
void updateCurveBackgroundHistogram (LUTu & histToneCurve, LUTu & histLCurves);
void foldAllButOne (Gtk::Box* parent, FoldableToolPanel* openedSection);
// multiple listeners can be added that are notified on changes (typical: profile panel and the history)