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

Adding PixelShift to PartialPaste window + small bugfixs (issue #3489)

Browse Source
This commit is contained in:
Hombre
2017-03-28 00:02:10 +02:00
parent 76f16eb3a7
commit 209ea3533b
11 changed files with 104 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rtengine/procparams.cc
View File

@@ -945,8 +945,8 @@ void RAWParams::setDefaults()
deadPixelFilter = false;
hotdeadpix_thresh = 100;
bayersensor.setPixelShiftDefaults();
bayersensor.pixelshiftShowMotion = false;
bayersensor.pixelshiftShowMotionMaskOnly = false;
bayersensor.pixelShiftShowMotion = false;
bayersensor.pixelShiftShowMotionMaskOnly = false;
}
@@ -3451,12 +3451,12 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
keyFile.set_double ("RAW Bayer", "PixelShiftRedBlueWeight", raw.bayersensor.pixelShiftRedBlueWeight );
}
if (!pedited || pedited->raw.bayersensor.pixelshiftShowMotion) {
keyFile.set_boolean ("RAW Bayer", "PixelShiftShowMotion", raw.bayersensor.pixelshiftShowMotion );
if (!pedited || pedited->raw.bayersensor.pixelShiftShowMotion) {
keyFile.set_boolean ("RAW Bayer", "PixelShiftShowMotion", raw.bayersensor.pixelShiftShowMotion );
}
if (!pedited || pedited->raw.bayersensor.pixelshiftShowMotionMaskOnly) {
keyFile.set_boolean ("RAW Bayer", "PixelShiftShowMotionMaskOnly", raw.bayersensor.pixelshiftShowMotionMaskOnly );
if (!pedited || pedited->raw.bayersensor.pixelShiftShowMotionMaskOnly) {
keyFile.set_boolean ("RAW Bayer", "PixelShiftShowMotionMaskOnly", raw.bayersensor.pixelShiftShowMotionMaskOnly );
}
if (!pedited || pedited->raw.bayersensor.pixelShiftAutomatic) {
@@ -7680,18 +7680,18 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "PixelShiftShowMotion")) {
raw.bayersensor.pixelshiftShowMotion = keyFile.get_boolean("RAW Bayer", "PixelShiftShowMotion");
raw.bayersensor.pixelShiftShowMotion = keyFile.get_boolean("RAW Bayer", "PixelShiftShowMotion");
if (pedited) {
pedited->raw.bayersensor.pixelshiftShowMotion = true;
pedited->raw.bayersensor.pixelShiftShowMotion = true;
}
}
if (keyFile.has_key ("RAW Bayer", "PixelShiftShowMotionMaskOnly")) {
raw.bayersensor.pixelshiftShowMotionMaskOnly = keyFile.get_boolean("RAW Bayer", "PixelShiftShowMotionMaskOnly");
raw.bayersensor.pixelShiftShowMotionMaskOnly = keyFile.get_boolean("RAW Bayer", "PixelShiftShowMotionMaskOnly");
if (pedited) {
pedited->raw.bayersensor.pixelshiftShowMotionMaskOnly = true;
pedited->raw.bayersensor.pixelShiftShowMotionMaskOnly = true;
}
}
@@ -8264,8 +8264,8 @@ bool ProcParams::operator== (const ProcParams& other)
&& raw.bayersensor.pixelShiftSigma == other.raw.bayersensor.pixelShiftSigma
&& raw.bayersensor.pixelShiftSum == other.raw.bayersensor.pixelShiftSum
&& raw.bayersensor.pixelShiftRedBlueWeight == other.raw.bayersensor.pixelShiftRedBlueWeight
&& raw.bayersensor.pixelshiftShowMotion == other.raw.bayersensor.pixelshiftShowMotion
&& raw.bayersensor.pixelshiftShowMotionMaskOnly == other.raw.bayersensor.pixelshiftShowMotionMaskOnly
&& raw.bayersensor.pixelShiftShowMotion == other.raw.bayersensor.pixelShiftShowMotion
&& raw.bayersensor.pixelShiftShowMotionMaskOnly == other.raw.bayersensor.pixelShiftShowMotionMaskOnly
&& raw.bayersensor.pixelShiftAutomatic == other.raw.bayersensor.pixelShiftAutomatic
&& raw.bayersensor.pixelShiftNonGreenHorizontal == other.raw.bayersensor.pixelShiftNonGreenHorizontal
&& raw.bayersensor.pixelShiftNonGreenVertical == other.raw.bayersensor.pixelShiftNonGreenVertical