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

Make scope trace brightness persistent

Browse Source
This commit is contained in:
Lawrence Lee 2020-10-15 21:09:13 -07:00
parent e93c4f6ed4
commit 01ad249718
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/histogrampanel.cc
View File

@ -362,6 +362,8 @@ HistogramPanel::HistogramPanel () :
brightness_changed_connection = histogramArea->getBrighnessChangedSignal().connect(sigc::mem_fun(*this, &HistogramPanel::brightnessUpdated)); brightness_changed_connection = histogramArea->getBrighnessChangedSignal().connect(sigc::mem_fun(*this, &HistogramPanel::brightnessUpdated));
rconn = signal_size_allocate().connect( sigc::mem_fun(*this, &HistogramPanel::resized) ); rconn = signal_size_allocate().connect( sigc::mem_fun(*this, &HistogramPanel::resized) );
histogramArea->setBrightness(options.histogramTraceBrightness);
} }
HistogramPanel::~HistogramPanel () HistogramPanel::~HistogramPanel ()
@ -476,11 +478,13 @@ void HistogramPanel::brightnessWidgetValueChanged(void)
{ {
ConnectionBlocker blocker(brightness_changed_connection); ConnectionBlocker blocker(brightness_changed_connection);
histogramArea->setBrightness(exp(brightnessWidget->get_value())); histogramArea->setBrightness(exp(brightnessWidget->get_value()));
options.histogramTraceBrightness = histogramArea->getBrightness();
} }
void HistogramPanel::brightnessUpdated(float brightness) void HistogramPanel::brightnessUpdated(float brightness)
{ {
brightnessWidget->set_value(log(brightness)); brightnessWidget->set_value(log(brightness));
options.histogramTraceBrightness = histogramArea->getBrightness();
} }
void HistogramPanel::scopeOptionsToggled() void HistogramPanel::scopeOptionsToggled()

6
rtgui/options.cc
View File

@ -451,6 +451,7 @@ void Options::setDefaults()
histogramDrawMode = 0; histogramDrawMode = 0;
histogramScopeType = ScopeType::HISTOGRAM; histogramScopeType = ScopeType::HISTOGRAM;
histogramShowOptionButtons = false; histogramShowOptionButtons = false;
histogramTraceBrightness = 1;
curvebboxpos = 1; curvebboxpos = 1;
complexity = 2; complexity = 2;
prevdemo = PD_Sidecar; prevdemo = PD_Sidecar;
@ -1444,6 +1445,10 @@ void Options::readFromFile(Glib::ustring fname)
histogramShowOptionButtons = keyFile.get_boolean("GUI", "HistogramShowOptionButtons"); histogramShowOptionButtons = keyFile.get_boolean("GUI", "HistogramShowOptionButtons");
} }
if (keyFile.has_key("GUI", "HistogramTraceBrightness")) {
histogramTraceBrightness = keyFile.get_double("GUI", "HistogramTraceBrightness");
}
if (keyFile.has_key("GUI", "NavigatorRGBUnit")) { if (keyFile.has_key("GUI", "NavigatorRGBUnit")) {
navRGBUnit = (NavigatorUnit)keyFile.get_integer("GUI", "NavigatorRGBUnit"); navRGBUnit = (NavigatorUnit)keyFile.get_integer("GUI", "NavigatorRGBUnit");
} }
@ -2268,6 +2273,7 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_integer("GUI", "HistogramDrawMode", histogramDrawMode); keyFile.set_integer("GUI", "HistogramDrawMode", histogramDrawMode);
keyFile.set_integer("GUI", "HistogramScopeType", rtengine::toUnderlying(histogramScopeType)); keyFile.set_integer("GUI", "HistogramScopeType", rtengine::toUnderlying(histogramScopeType));
keyFile.set_boolean("GUI", "HistogramShowOptionButtons", histogramShowOptionButtons); keyFile.set_boolean("GUI", "HistogramShowOptionButtons", histogramShowOptionButtons);
keyFile.set_double("GUI", "HistogramTraceBrightness", histogramTraceBrightness);
keyFile.set_integer("GUI", "NavigatorRGBUnit", (int)navRGBUnit); keyFile.set_integer("GUI", "NavigatorRGBUnit", (int)navRGBUnit);
keyFile.set_integer("GUI", "NavigatorHSVUnit", (int)navHSVUnit); keyFile.set_integer("GUI", "NavigatorHSVUnit", (int)navHSVUnit);
keyFile.set_boolean("GUI", "ShowFilmStripToolBar", showFilmStripToolBar); keyFile.set_boolean("GUI", "ShowFilmStripToolBar", showFilmStripToolBar);

1
rtgui/options.h
View File

@ -324,6 +324,7 @@ public:
int histogramDrawMode; int histogramDrawMode;
ScopeType histogramScopeType; ScopeType histogramScopeType;
bool histogramShowOptionButtons; bool histogramShowOptionButtons;
float histogramTraceBrightness;
bool FileBrowserToolbarSingleRow; bool FileBrowserToolbarSingleRow;
bool hideTPVScrollbar; bool hideTPVScrollbar;
int whiteBalanceSpotSize; int whiteBalanceSpotSize;