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

Hide/show sensiexclu adjuster according to control spot method

Browse Source 
(normal/excluding)
This commit is contained in:
Pandagrapher 2018-12-28 17:28:38 +01:00
parent 34ea953c23
commit 079f0aa3da
2 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
rtgui/controlspotpanel.cc
View File

@ -60,8 +60,8 @@ ControlSpotPanel::ControlSpotPanel():
nbSpotChanged_(false), nbSpotChanged_(false),
selSpotChanged_(false), selSpotChanged_(false),
nameChanged_(false), nameChanged_(false),
eventType(0),
eventType(0) excluFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_EXCLUF"))))
{ {
treeview_.set_grid_lines(Gtk::TREE_VIEW_GRID_LINES_VERTICAL); treeview_.set_grid_lines(Gtk::TREE_VIEW_GRID_LINES_VERTICAL);
@ -146,7 +146,6 @@ ControlSpotPanel::ControlSpotPanel():
ctboxspotmethod->pack_start(*spotMethod_); ctboxspotmethod->pack_start(*spotMethod_);
pack_start(*ctboxspotmethod); pack_start(*ctboxspotmethod);
Gtk::Frame* const excluFrame = Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_EXCLUF")));
excluFrame->set_label_align(0.025, 0.5); excluFrame->set_label_align(0.025, 0.5);
excluFrame->set_tooltip_text(M("TP_LOCALLAB_EXCLUF_TOOLTIP")); excluFrame->set_tooltip_text(M("TP_LOCALLAB_EXCLUF_TOOLTIP"));
ToolParamBlock* const excluBox = Gtk::manage(new ToolParamBlock()); ToolParamBlock* const excluBox = Gtk::manage(new ToolParamBlock());
@ -416,6 +415,13 @@ void ControlSpotPanel::spotMethodChanged()
row[spots_.spotMethod] = spotMethod_->get_active_row_number(); row[spots_.spotMethod] = spotMethod_->get_active_row_number();
// Update Control Spot GUI according to spotMethod_ combobox state (to be compliant with updateParamVisibility function)
if (spotMethod_->get_active_row_number() == 0) { // Normal case
excluFrame->hide();
} else { // Excluding case
excluFrame->show();
}
// Raise event // Raise event
if (listener) { if (listener) {
listener->panelChanged(EvLocallabSpotSpotMethod, spotMethod_->get_active_text()); listener->panelChanged(EvLocallabSpotSpotMethod, spotMethod_->get_active_text());
@ -452,7 +458,39 @@ void ControlSpotPanel::shapeMethodChanged()
row[spots_.shapeMethod] = shapeMethod_->get_active_row_number(); row[spots_.shapeMethod] = shapeMethod_->get_active_row_number();
} }
updateParamVisibility(); // Update Control Spot GUI according to shapeMethod_ combobox state (to be compliant with updateParamVisibility function)
if (method == 1 || method == 3) { // Symmetrical cases
locXL_->hide();
locYT_->hide();
if (method == 1) { // 1 = Symmetrical (mouse)
locX_->hide();
locY_->hide();
centerX_->hide();
centerY_->hide();
} else { // 3 = Symmetrical (mouse + sliders)
locX_->show();
locY_->show();
centerX_->show();
centerY_->show();
}
} else { // Independent cases
if (method == 0) { // 0 = Independent (mouse)
locX_->hide();
locXL_->hide();
locY_->hide();
locYT_->hide();
centerX_->hide();
centerY_->hide();
} else { // 2 = Independent (mouse + sliders)
locX_->show();
locXL_->show();
locY_->show();
locYT_->show();
centerX_->show();
centerY_->show();
}
}
// Raise event // Raise event
if (listener) { if (listener) {
@ -485,8 +523,9 @@ void ControlSpotPanel::qualityMethodChanged()
void ControlSpotPanel::updateParamVisibility() void ControlSpotPanel::updateParamVisibility()
{ {
printf("updateParamVisibility\n"); printf("updateParamVisibility\n");
const int method = shapeMethod_->get_active_row_number();
// Update Control Spot GUI according to shapeMethod_ combobox state (to be compliant with shapeMethodChanged function)
const int method = shapeMethod_->get_active_row_number();
if (method == 1 || method == 3) { // Symmetrical cases if (method == 1 || method == 3) { // Symmetrical cases
locXL_->hide(); locXL_->hide();
locYT_->hide(); locYT_->hide();
@ -519,6 +558,13 @@ void ControlSpotPanel::updateParamVisibility()
centerY_->show(); centerY_->show();
} }
} }
// Update Control Spot GUI according to spotMethod_ combobox state (to be compliant with spotMethodChanged function)
if (spotMethod_->get_active_row_number() == 0) { // Normal case
excluFrame->hide();
} else { // Excluding case
excluFrame->show();
}
} }
void ControlSpotPanel::adjusterChanged(Adjuster* a, double newval) void ControlSpotPanel::adjusterChanged(Adjuster* a, double newval)

2
rtgui/controlspotpanel.h
View File

@ -327,8 +327,8 @@ private:
bool nbSpotChanged_; bool nbSpotChanged_;
bool selSpotChanged_; bool selSpotChanged_;
bool nameChanged_; bool nameChanged_;
int eventType; // 0 = No event, 1 = Spot creation event, 2 = Spot deletion event, 3 = Spot selection event int eventType; // 0 = No event, 1 = Spot creation event, 2 = Spot deletion event, 3 = Spot selection event
Gtk::Frame* const excluFrame;
// Treeview mutex // Treeview mutex
MyMutex mTreeview; MyMutex mTreeview;