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

Added Post-Resize Sharpening tool with some code cleanups, optimizations and language file consistency improvements. Issue 2825

Browse Source
This commit is contained in:
DrSlony
2015-07-02 15:39:53 +02:00
parent 607ecc82a5
commit af3bb68bf9
25 changed files with 1181 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
rtgui/paramsedited.cc
View File

@@ -107,6 +107,20 @@ void ParamsEdited::set (bool v) {
sharpening.deconvradius = v;
sharpening.deconviter = v;
sharpening.deconvdamping = v;
prsharpening.enabled = v;
prsharpening.radius = v;
prsharpening.amount = v;
prsharpening.threshold = v;
prsharpening.edgesonly = v;
prsharpening.edges_radius = v;
prsharpening.edges_tolerance = v;
prsharpening.halocontrol = v;
prsharpening.halocontrol_amount = v;
prsharpening.method = v;
prsharpening.deconvamount = v;
prsharpening.deconvradius = v;
prsharpening.deconviter = v;
prsharpening.deconvdamping = v;
sharpenEdge.enabled = v;
sharpenEdge.passes = v;
sharpenEdge.amount = v;
@@ -523,6 +537,20 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
sharpening.deconvradius = sharpening.deconvradius && p.sharpening.deconvradius == other.sharpening.deconvradius;
sharpening.deconviter = sharpening.deconviter && p.sharpening.deconviter == other.sharpening.deconviter;
sharpening.deconvdamping = sharpening.deconvdamping && p.sharpening.deconvdamping == other.sharpening.deconvdamping;
prsharpening.enabled = prsharpening.enabled && p.prsharpening.enabled == other.prsharpening.enabled;
prsharpening.radius = prsharpening.radius && p.prsharpening.radius == other.prsharpening.radius;
prsharpening.amount = prsharpening.amount && p.prsharpening.amount == other.prsharpening.amount;
prsharpening.threshold = prsharpening.threshold && p.prsharpening.threshold == other.prsharpening.threshold;
prsharpening.edgesonly = prsharpening.edgesonly && p.prsharpening.edgesonly == other.prsharpening.edgesonly;
prsharpening.edges_radius = prsharpening.edges_radius && p.prsharpening.edges_radius == other.prsharpening.edges_radius;
prsharpening.edges_tolerance = prsharpening.edges_tolerance && p.prsharpening.edges_tolerance == other.prsharpening.edges_tolerance;
prsharpening.halocontrol = prsharpening.halocontrol && p.prsharpening.halocontrol == other.prsharpening.halocontrol;
prsharpening.halocontrol_amount = prsharpening.halocontrol_amount && p.prsharpening.halocontrol_amount == other.prsharpening.halocontrol_amount;
prsharpening.method = prsharpening.method && p.prsharpening.method == other.prsharpening.method;
prsharpening.deconvamount = prsharpening.deconvamount && p.prsharpening.deconvamount == other.prsharpening.deconvamount;
prsharpening.deconvradius = prsharpening.deconvradius && p.prsharpening.deconvradius == other.prsharpening.deconvradius;
prsharpening.deconviter = prsharpening.deconviter && p.prsharpening.deconviter == other.prsharpening.deconviter;
prsharpening.deconvdamping = prsharpening.deconvdamping && p.prsharpening.deconvdamping == other.prsharpening.deconvdamping;
vibrance.enabled = vibrance.enabled && p.vibrance.enabled == other.vibrance.enabled;
vibrance.pastels = vibrance.pastels && p.vibrance.pastels == other.vibrance.pastels;
vibrance.saturated = vibrance.saturated && p.vibrance.saturated == other.vibrance.saturated;
@@ -931,6 +959,20 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
if (sharpening.deconvradius) toEdit.sharpening.deconvradius = mods.sharpening.deconvradius;
if (sharpening.deconviter) toEdit.sharpening.deconviter = mods.sharpening.deconviter;
if (sharpening.deconvdamping) toEdit.sharpening.deconvdamping = mods.sharpening.deconvdamping;
if (prsharpening.enabled) toEdit.prsharpening.enabled = mods.prsharpening.enabled;
if (prsharpening.radius) toEdit.prsharpening.radius = mods.prsharpening.radius;
if (prsharpening.amount) toEdit.prsharpening.amount = dontforceSet && options.baBehav[ADDSET_SHARP_AMOUNT] ? toEdit.prsharpening.amount + mods.prsharpening.amount : mods.prsharpening.amount;
if (prsharpening.threshold) toEdit.prsharpening.threshold = mods.prsharpening.threshold;
if (prsharpening.edgesonly) toEdit.prsharpening.edgesonly = mods.prsharpening.edgesonly;
if (prsharpening.edges_radius) toEdit.prsharpening.edges_radius = mods.prsharpening.edges_radius;
if (prsharpening.edges_tolerance) toEdit.prsharpening.edges_tolerance = mods.prsharpening.edges_tolerance;
if (prsharpening.halocontrol) toEdit.prsharpening.halocontrol = mods.prsharpening.halocontrol;
if (prsharpening.halocontrol_amount) toEdit.prsharpening.halocontrol_amount = mods.prsharpening.halocontrol_amount;
if (prsharpening.method) toEdit.prsharpening.method = mods.prsharpening.method;
if (prsharpening.deconvamount) toEdit.prsharpening.deconvamount = dontforceSet && options.baBehav[ADDSET_SHARP_AMOUNT] ? toEdit.prsharpening.deconvamount + mods.prsharpening.deconvamount : mods.prsharpening.deconvamount;
if (prsharpening.deconvradius) toEdit.prsharpening.deconvradius = mods.prsharpening.deconvradius;
if (prsharpening.deconviter) toEdit.prsharpening.deconviter = mods.prsharpening.deconviter;
if (prsharpening.deconvdamping) toEdit.prsharpening.deconvdamping = mods.prsharpening.deconvdamping;
if (vibrance.enabled) toEdit.vibrance.enabled = mods.vibrance.enabled;
if (vibrance.pastels) toEdit.vibrance.pastels = dontforceSet && options.baBehav[ADDSET_VIBRANCE_PASTELS] ? toEdit.vibrance.pastels + mods.vibrance.pastels : mods.vibrance.pastels;
if (vibrance.saturated) toEdit.vibrance.saturated = dontforceSet && options.baBehav[ADDSET_VIBRANCE_SATURATED] ? toEdit.vibrance.saturated + mods.vibrance.saturated : mods.vibrance.saturated;