Skip to content
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

Refactor setting key strings and fix spinbox steps #4

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Refactor setting key strings and fix spinbox steps #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
497fcdf
refactor setting keys into constexprs
Depersonalizc Sep 29, 2023
4aff49c
fix spinbox steps to be 1
Depersonalizc Sep 29, 2023
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
6 changes: 3 additions & 3 deletions mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ MainWindow::MainWindow()
addSpinBox(filterLayout, "radius", 1, 100, 1, settings.medianRadius, [this](int value){ setIntVal(settings.medianRadius, value); });

addRadioButton(filterLayout, "Chromatic aberration", settings.filterType == FILTER_CHROMATIC, [this]{ setFilterType(FILTER_CHROMATIC); });
addSpinBox(filterLayout, "red shift", -100, 100, 0, settings.rShift, [this](int value){ setIntVal(settings.rShift, value); });
addSpinBox(filterLayout, "green shift", -100, 100, 0, settings.gShift, [this](int value){ setIntVal(settings.gShift, value); });
addSpinBox(filterLayout, "blue shift", -100, 100, 0, settings.bShift, [this](int value){ setIntVal(settings.bShift, value); });
addSpinBox(filterLayout, "red shift", -100, 100, 1, settings.rShift, [this](int value){ setIntVal(settings.rShift, value); });
addSpinBox(filterLayout, "green shift", -100, 100, 1, settings.gShift, [this](int value){ setIntVal(settings.gShift, value); });
addSpinBox(filterLayout, "blue shift", -100, 100, 1, settings.bShift, [this](int value){ setIntVal(settings.bShift, value); });

addRadioButton(filterLayout, "Tone mapping", settings.filterType == FILTER_MAPPING, [this]{ setFilterType(FILTER_MAPPING); });
addCheckBox(filterLayout, "Non linear function", settings.nonLinearMap, [this](bool value){ setBoolVal(settings.nonLinearMap, value); });
Expand Down
131 changes: 84 additions & 47 deletions settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,68 +17,105 @@

Settings settings;

// Constant key expressions for querying QSettings
namespace QSettingsKeys {
namespace Brush {
constexpr QAnyStringView
BRUSH_TYPE = "brushType",
BRUSH_RADIUS = "brushRadius",
BRUSH_RED = "brushRed",
BRUSH_GREEN = "brushGreen",
BRUSH_BLUE = "brushBlue",
BRUSH_ALPHA = "brushAlpha",
BRUSH_DENSITY = "brushDensity",
FIX_ALPHA_BLENDING = "fixAlphaBlending";
}
namespace Filter {
constexpr QAnyStringView
FILTER_TYPE = "filterType",
EDGE_DETECT_SENSITIVITY = "edgeDetectSensitivity",
BLUR_RADIUS = "blurRadius",
SCALE_X = "scaleX",
SCALE_Y = "scaleY",
MEDIAN_RADIUS = "medianRadius",
ROTATION_ANGLE = "rotationAngle",
BILATERAL_RADIUS = "bilateralRadius",
R_SHIFT = "rShift",
G_SHIFT = "gShift",
B_SHIFT = "bShift",
NON_LINEAR_MAP = "nonLinearMap",
GAMMA = "gamma",
IMAGE_PATH = "imagePath";
}
}

/**
* @brief Loads the application settings
*/
void Settings::loadSettingsOrDefaults() {
// Load image settings
QSettings s("CS123", "CS123");
using namespace QSettingsKeys;

brushType = s.value("brushType", BRUSH_LINEAR).toInt();
brushRadius = s.value("brushRadius", 10).toInt();
brushColor.r = s.value("brushRed", 0).toInt();
brushColor.g = s.value("brushGreen", 0).toInt();
brushColor.b = s.value("brushBlue", 0).toInt();
brushColor.a = s.value("brushAlpha", 255).toInt();
brushDensity = s.value("brushDensity", 5).toInt();
fixAlphaBlending = s.value("fixAlphaBlending", false).toBool();
QSettings s("CS123", "CS123");

filterType = s.value("filterType", FILTER_EDGE_DETECT).toInt();
edgeDetectSensitivity = s.value("edgeDetectSensitivity", 0.5f).toDouble();
blurRadius = s.value("blurRadius", 10).toInt();
scaleX = s.value("scaleX", 2).toDouble();
scaleY = s.value("scaleY", 2).toDouble();
medianRadius = s.value("medianRadius", 1).toInt();
rotationAngle = s.value("rotationAngle", 90.0).toFloat();
bilateralRadius = s.value("bilateral radius", 1).toInt();
rShift = s.value("rShift", 1).toInt();
gShift = s.value("gShift", 1).toInt();
bShift = s.value("bShift", 1).toInt();
nonLinearMap = s.value("nonLinearMap", false).toBool();
gamma = s.value("gamma", 0.1).toFloat();
// Load settings for Brush
brushType = s.value(Brush::BRUSH_TYPE, BRUSH_LINEAR).toInt();
brushRadius = s.value(Brush::BRUSH_RADIUS, 10).toInt();
brushColor.r = s.value(Brush::BRUSH_RED, 0).toInt();
brushColor.g = s.value(Brush::BRUSH_GREEN, 0).toInt();
brushColor.b = s.value(Brush::BRUSH_BLUE, 0).toInt();
brushColor.a = s.value(Brush::BRUSH_ALPHA, 255).toInt();
brushDensity = s.value(Brush::BRUSH_DENSITY, 5).toInt();
fixAlphaBlending = s.value(Brush::FIX_ALPHA_BLENDING, false).toBool();

imagePath = s.value("imagePath", "").toString();
// Load settings for Filter
filterType = s.value(Filter::FILTER_TYPE, FILTER_EDGE_DETECT).toInt();
edgeDetectSensitivity = s.value(Filter::EDGE_DETECT_SENSITIVITY, 0.5f).toDouble();
blurRadius = s.value(Filter::BLUR_RADIUS, 10).toInt();
scaleX = s.value(Filter::SCALE_X, 2).toDouble();
scaleY = s.value(Filter::SCALE_Y, 2).toDouble();
medianRadius = s.value(Filter::MEDIAN_RADIUS, 1).toInt();
rotationAngle = s.value(Filter::ROTATION_ANGLE, 90.0).toFloat();
bilateralRadius = s.value(Filter::BILATERAL_RADIUS, 1).toInt();
rShift = s.value(Filter::R_SHIFT, 1).toInt();
gShift = s.value(Filter::G_SHIFT, 1).toInt();
bShift = s.value(Filter::B_SHIFT, 1).toInt();
nonLinearMap = s.value(Filter::NON_LINEAR_MAP, false).toBool();
gamma = s.value(Filter::GAMMA, 0.1).toFloat();
imagePath = s.value(Filter::IMAGE_PATH, "").toString();
}

/**
* @brief Saves settings from this session to be loaded
* in for next session.
*/
void Settings::saveSettings() {
QSettings s("CS123", "CS123");
using namespace QSettingsKeys;

s.setValue("brushType", brushType);
s.setValue("brushRadius", brushRadius);
s.setValue("brushRed", brushColor.r);
s.setValue("brushGreen", brushColor.g);
s.setValue("brushBlue", brushColor.b);
s.setValue("brushAlpha", brushColor.a);
s.setValue("brushDensity", brushDensity);
s.setValue("fixAlphaBlending", fixAlphaBlending);
QSettings s("CS123", "CS123");

s.setValue("filterType", filterType);
s.setValue("edgeDetectSensitivity", edgeDetectSensitivity);
s.setValue("blurRadius", blurRadius);
s.setValue("scaleX", scaleX);
s.setValue("scaleY", scaleY);
s.setValue("medianRadius", medianRadius);
s.setValue("rotationAngle", rotationAngle);
s.setValue("bilateralRadius", bilateralRadius);
s.setValue("rShift", rShift);
s.setValue("gShift", gShift);
s.setValue("bShift", bShift);
s.setValue("nonLinearMap", nonLinearMap);
s.setValue("gamma", gamma);
// Save settings for Brush
s.setValue(Brush::BRUSH_TYPE, brushType);
s.setValue(Brush::BRUSH_RADIUS, brushRadius);
s.setValue(Brush::BRUSH_RED, brushColor.r);
s.setValue(Brush::BRUSH_GREEN, brushColor.g);
s.setValue(Brush::BRUSH_BLUE, brushColor.b);
s.setValue(Brush::BRUSH_ALPHA, brushColor.a);
s.setValue(Brush::BRUSH_DENSITY, brushDensity);
s.setValue(Brush::FIX_ALPHA_BLENDING, fixAlphaBlending);

s.setValue("imagePath", imagePath);
// Save settings for Filter
s.setValue(Filter::FILTER_TYPE, filterType);
s.setValue(Filter::EDGE_DETECT_SENSITIVITY, edgeDetectSensitivity);
s.setValue(Filter::BLUR_RADIUS, blurRadius);
s.setValue(Filter::SCALE_X, scaleX);
s.setValue(Filter::SCALE_Y, scaleY);
s.setValue(Filter::MEDIAN_RADIUS, medianRadius);
s.setValue(Filter::ROTATION_ANGLE, rotationAngle);
s.setValue(Filter::BILATERAL_RADIUS, bilateralRadius);
s.setValue(Filter::R_SHIFT, rShift);
s.setValue(Filter::G_SHIFT, gShift);
s.setValue(Filter::B_SHIFT, bShift);
s.setValue(Filter::NON_LINEAR_MAP, nonLinearMap);
s.setValue(Filter::GAMMA, gamma);
s.setValue(Filter::IMAGE_PATH, imagePath);
}