Skip to content

qtgui: expose Reset for ordinary Color sliders #386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janhubicka merged 1 commit into from
Sep 24, 2026
Merged

qtgui: expose Reset for ordinary Color sliders #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/qtgui/ColorPanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,37 +76,37 @@ void ColorPanel::setupUi() {
[](const ParameterState &s) { return s.rparams.dark_point; },
[](ParameterState &s, double v) { s.rparams.dark_point = v; }, 3.0,
nullptr, false, "Scanner or camera dark point. This value is subtracted from the scan before processing.",
QStringLiteral("color.process.black"));
QStringLiteral("color.process.black"), true);

// Presaturation
addSliderParameter(
"Presaturation", 0, 100, 1, 2, "", "",
[](const ParameterState &s) { return s.rparams.presaturation; },
[](ParameterState &s, double v) { s.rparams.presaturation = v; }, 3.0,
nullptr, false, "Increase saturation of the scan before applying the color model. Useful for quick preview of colors before sharpness is configured correctly.",
QStringLiteral("color.process.presaturation"));
QStringLiteral("color.process.presaturation"), true);

// White Balance
addSliderParameter(
"White balance red", 0, 10, 100, 2, "", "",
[](const ParameterState &s) { return s.rparams.white_balance.red; },
[](ParameterState &s, double v) { s.rparams.white_balance.red = v; }, 3.0,
nullptr, false, "Adjust the white balance by scaling the individual process red channel.",
QStringLiteral("color.process.white_balance.red"));
QStringLiteral("color.process.white_balance.red"), true);

addSliderParameter(
"White balance green", 0, 10, 100, 2, "", "",
[](const ParameterState &s) { return s.rparams.white_balance.green; },
[](ParameterState &s, double v) { s.rparams.white_balance.green = v; }, 3.0,
nullptr, false, "Adjust the white balance by scaling the individual process green channel.",
QStringLiteral("color.process.white_balance.green"));
QStringLiteral("color.process.white_balance.green"), true);

addSliderParameter(
"White balance blue", 0, 10, 100, 2, "", "",
[](const ParameterState &s) { return s.rparams.white_balance.blue; },
[](ParameterState &s, double v) { s.rparams.white_balance.blue = v; }, 3.0,
nullptr, false, "Adjust the white balance by scaling the individual process blue channel.",
QStringLiteral("color.process.white_balance.blue"));
QStringLiteral("color.process.white_balance.blue"), true);

// Neutral Area Button
m_setNeutralAreaBtn = addToggleButtonParameter(
Expand All @@ -127,7 +127,7 @@ void ColorPanel::setupUi() {
[](const ParameterState &s) { return s.rparams.brightness; },
[](ParameterState &s, double v) { s.rparams.brightness = v; }, 3.0,
nullptr, true, "Overall brightness of the backlight. Affects the intensity of the viewing light source.",
QStringLiteral("color.backlight.intensity"));
QStringLiteral("color.backlight.intensity"), true);

// Auto Levels Button
m_setAutoLevelsBtn = addToggleButtonParameter(
Expand All @@ -143,7 +143,7 @@ void ColorPanel::setupUi() {
[](const ParameterState &s) { return s.rparams.backlight_temperature; },
[](ParameterState &s, double v) { s.rparams.backlight_temperature = v; },
3.0, nullptr, false, "Color temperature of the backlight in Kelvin. Higher values are bluer (daylight), lower values are yellower (tungsten).",
QStringLiteral("color.backlight.temperature"));
QStringLiteral("color.backlight.temperature"), true);

m_currentGroupForm = nullptr; // End Backlight section
auto historicalCaptureApplicable = [this](const ParameterState &state) {
Expand Down
17 changes: 17 additions & 0 deletions src/qtgui/WorkspaceChurnSmoke.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,6 +1031,23 @@ if (!workflowSummary || !workflowToggle || !workflowStages ||
return;
}

const QStringList colorDefaultKeys = {
QStringLiteral("color.process.black"),
QStringLiteral("color.process.presaturation"),
QStringLiteral("color.process.white_balance.red"),
QStringLiteral("color.process.white_balance.green"),
QStringLiteral("color.process.white_balance.blue"),
QStringLiteral("color.backlight.intensity"),
QStringLiteral("color.backlight.temperature")};
for (const QString &key : colorDefaultKeys) {
QToolButton *button = findParameterResetButton(key);
if (!button || !button->property("parameterDefaultValue").isValid()) {
fail(QStringLiteral(
"Workspace churn lost Color default/reset metadata for %1")
.arg(key));
return;
}
}

// Sharpness is the eighth complete stable-key migration. Saved
// deconvolution/MTF controls carry sharpness.* identities, while chart
Expand Down
Loading