diff --git a/rtdata/languages/default b/rtdata/languages/default
index a9359b839..23a7d5d68 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -676,6 +676,17 @@ HISTORY_MSG_441;Retinex - Gain transmission
HISTORY_MSG_442;Retinex - Scale
HISTORY_MSG_443;Output Black Point Compensation
HISTORY_MSG_444;Raw Sub-Image
+HISTORY_MSG_445;EvPixelShiftMotion
+HISTORY_MSG_446;EvPixelShiftMotionCorrection
+HISTORY_MSG_447;EvPixelShiftStddevFactor
+HISTORY_MSG_448;EvPixelShiftEperIso
+HISTORY_MSG_449;EvPixelShiftNreadIso
+HISTORY_MSG_450;EvPixelShiftPrnu
+HISTORY_MSG_451;EvPixelshiftShowMotion
+HISTORY_MSG_452;EvPixelshiftShowMotionMaskOnly
+HISTORY_MSG_453;EvPixelShiftAutomatic
+HISTORY_MSG_454;EvPixelShiftNonGreenHorizontal
+HISTORY_MSG_455;EvPixelShiftNonGreenVertical
HISTORY_NEWSNAPSHOT;Add
HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
HISTORY_SNAPSHOT;Snapshot
diff --git a/rtengine/pixelshift.cc b/rtengine/pixelshift.cc
index c5254a5dc..63b670ebc 100644
--- a/rtengine/pixelshift.cc
+++ b/rtengine/pixelshift.cc
@@ -96,7 +96,7 @@ float nonGreenDiff(float a, float b, bool adaptive, float stddevFactor, float ep
using namespace std;
using namespace rtengine;
-void RawImageSource::pixelshift(int winx, int winy, int winw, int winh, bool detectMotion, int motion, bool showMotion, bool showOnlyMask, unsigned int frame, unsigned int gridSize, bool adaptive, float stddevFactor, float eperIso, float nreadIso, float prnu, const std::string &model, float rawWpCorrection, bool checkNonGreenHorizontal, bool checkNonGreenVertical)
+void RawImageSource::pixelshift(int winx, int winy, int winw, int winh, bool detectMotion, int motion, bool showMotion, bool showOnlyMask, unsigned int frame, RAWParams::BayerSensor::ePSMotionCorrection gridSize_, bool adaptive, float stddevFactor, float eperIso, float nreadIso, float prnu, const std::string &model, float rawWpCorrection, bool checkNonGreenHorizontal, bool checkNonGreenVertical)
{
BENCHFUN
@@ -207,6 +207,8 @@ void RawImageSource::pixelshift(int winx, int winy, int winw, int winh, bool det
}
+ int gridSize = (int)gridSize_;
+
const bool skip = (gridSize != 1 ? false : true);
gridSize += ((gridSize & 1) == 0 ? 1 : 0);
// Lookup table for non adaptive (slider) mode
diff --git a/rtengine/procevents.h b/rtengine/procevents.h
index 72cbf781f..a82a2d028 100644
--- a/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -471,8 +471,17 @@ enum ProcEvent {
EvLskal = 441,
EvOBPCompens = 442,
EvRawImageNum = 443,
- EvDemosaicPixelshiftMotion = 444,
- EvDemosaicPixelshiftMotionMaskOnly = 445,
+ EvPixelShiftMotion = 444,
+ EvPixelShiftMotionCorrection = 445,
+ EvPixelShiftStddevFactor = 446,
+ EvPixelShiftEperIso = 447,
+ EvPixelShiftNreadIso = 448,
+ EvPixelShiftPrnu = 449,
+ EvPixelshiftShowMotion = 450,
+ EvPixelshiftShowMotionMaskOnly = 451,
+ EvPixelShiftAutomatic = 452,
+ EvPixelShiftNonGreenHorizontal = 453,
+ EvPixelShiftNonGreenVertical = 454,
NUMOFEVENTS
};
diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc
index 8ca050cec..57958a6f5 100644
--- a/rtengine/procparams.cc
+++ b/rtengine/procparams.cc
@@ -885,8 +885,8 @@ void RAWParams::setDefaults()
bayersensor.dcb_enhance = true;
//bayersensor.all_enhance = false;
bayersensor.lmmse_iterations = 2;
- bayersensor.pixelshiftMotion = 0;
- bayersensor.pixelshiftMotionCorrection = 3;
+ bayersensor.pixelShiftMotion = 0;
+ bayersensor.pixelShiftMotionCorrection = RAWParams::BayerSensor::Grid5x5;
bayersensor.pixelShiftStddevFactor = 5.0;
bayersensor.pixelShiftEperIso = 0.0;
bayersensor.pixelShiftNreadIso = 0.0;
@@ -3375,12 +3375,12 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
keyFile.set_integer ("RAW Bayer", "LMMSEIterations", raw.bayersensor.lmmse_iterations );
}
- if (!pedited || pedited->raw.bayersensor.pixelshiftMotion) {
- keyFile.set_integer ("RAW Bayer", "PixelShiftMotion", raw.bayersensor.pixelshiftMotion );
+ if (!pedited || pedited->raw.bayersensor.pixelShiftMotion) {
+ keyFile.set_integer ("RAW Bayer", "PixelShiftMotion", raw.bayersensor.pixelShiftMotion );
}
- if (!pedited || pedited->raw.bayersensor.pixelshiftMotionCorrection) {
- keyFile.set_integer ("RAW Bayer", "PixelShiftMotionCorrection", raw.bayersensor.pixelshiftMotionCorrection );
+ if (!pedited || pedited->raw.bayersensor.pixelShiftMotionCorrection) {
+ keyFile.set_integer ("RAW Bayer", "PixelShiftMotionCorrection", raw.bayersensor.pixelShiftMotionCorrection );
}
if (!pedited || pedited->raw.bayersensor.pixelShiftStddevFactor) {
@@ -7478,18 +7478,18 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "PixelShiftMotion")) {
- raw.bayersensor.pixelshiftMotion = keyFile.get_integer("RAW Bayer", "PixelShiftMotion");
+ raw.bayersensor.pixelShiftMotion = keyFile.get_integer("RAW Bayer", "PixelShiftMotion");
if (pedited) {
- pedited->raw.bayersensor.pixelshiftMotion = true;
+ pedited->raw.bayersensor.pixelShiftMotion = true;
}
}
if (keyFile.has_key ("RAW Bayer", "PixelShiftMotionCorrection")) {
- raw.bayersensor.pixelshiftMotionCorrection = keyFile.get_integer("RAW Bayer", "PixelShiftMotionCorrection");
+ raw.bayersensor.pixelShiftMotionCorrection = (RAWParams::BayerSensor::ePSMotionCorrection)keyFile.get_integer("RAW Bayer", "PixelShiftMotionCorrection");
if (pedited) {
- pedited->raw.bayersensor.pixelshiftMotionCorrection = true;
+ pedited->raw.bayersensor.pixelShiftMotionCorrection = true;
}
}
@@ -8002,8 +8002,21 @@ bool ProcParams::operator== (const ProcParams& other)
&& raw.bayersensor.twogreen == other.raw.bayersensor.twogreen
&& raw.bayersensor.greenthresh == other.raw.bayersensor.greenthresh
&& raw.bayersensor.linenoise == other.raw.bayersensor.linenoise
- && raw.bayersensor.dcb_enhance == other.raw.bayersensor.dcb_enhance
&& raw.bayersensor.dcb_iterations == other.raw.bayersensor.dcb_iterations
+ && raw.bayersensor.lmmse_iterations == other.raw.bayersensor.lmmse_iterations
+ && raw.bayersensor.pixelShiftMotion == other.raw.bayersensor.pixelShiftMotion
+ && raw.bayersensor.pixelShiftMotionCorrection == other.raw.bayersensor.pixelShiftMotionCorrection
+ && raw.bayersensor.pixelShiftStddevFactor == other.raw.bayersensor.pixelShiftStddevFactor
+ && raw.bayersensor.pixelShiftEperIso == other.raw.bayersensor.pixelShiftEperIso
+ && raw.bayersensor.pixelShiftNreadIso == other.raw.bayersensor.pixelShiftNreadIso
+ && raw.bayersensor.pixelShiftPrnu == other.raw.bayersensor.pixelShiftPrnu
+ && 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
+ && raw.bayersensor.dcb_enhance == other.raw.bayersensor.dcb_enhance
+ //&& raw.bayersensor.all_enhance == other.raw.bayersensor.all_enhance
&& raw.xtranssensor.method == other.raw.xtranssensor.method
&& raw.xtranssensor.ccSteps == other.raw.xtranssensor.ccSteps
&& raw.xtranssensor.blackred == other.raw.xtranssensor.blackred
diff --git a/rtengine/procparams.h b/rtengine/procparams.h
index 747afc250..8d3dfc541 100644
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1168,6 +1168,9 @@ public:
enum eMethod { amaze, igv, lmmse, eahd, hphd, vng4, dcb, ahd, fast, mono, none, pixelshift_simple,
numMethods
}; // This MUST be the last enum
+ enum ePSMotionCorrection {
+ Grid1x1, Grid1x2, Grid3x3, Grid5x5
+ };
static const char *methodstring[numMethods];
Glib::ustring method;
@@ -1182,8 +1185,8 @@ public:
int greenthresh;
int dcb_iterations;
int lmmse_iterations;
- int pixelshiftMotion;
- int pixelshiftMotionCorrection;
+ int pixelShiftMotion;
+ ePSMotionCorrection pixelShiftMotionCorrection;
double pixelShiftStddevFactor;
double pixelShiftEperIso;
double pixelShiftNreadIso;
diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc
index 4199a3023..6b97eb0b6 100644
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -2023,11 +2023,11 @@ void RawImageSource::demosaic(const RAWParams &raw)
} else if (raw.bayersensor.method == RAWParams::BayerSensor::methodstring[RAWParams::BayerSensor::amaze] ) {
amaze_demosaic_RT (0, 0, W, H);
} else if (raw.bayersensor.method == RAWParams::BayerSensor::methodstring[RAWParams::BayerSensor::pixelshift_simple] ) {
- if(raw.bayersensor.pixelshiftMotion > 0 || raw.bayersensor.pixelShiftAutomatic) {
+ if(raw.bayersensor.pixelShiftMotion > 0 || raw.bayersensor.pixelShiftAutomatic) {
amaze_demosaic_RT (0, 0, W, H); // for non pixelshift files use amaze if pixelshift is selected. We need it also for motion correction
}
if(numFrames == 4) {
- pixelshift(0, 0, W, H, raw.bayersensor.pixelshiftMotion > 0, raw.bayersensor.pixelshiftMotion, raw.bayersensor.pixelshiftShowMotion, raw.bayersensor.pixelshiftShowMotionMaskOnly, currFrame, raw.bayersensor.pixelshiftMotionCorrection, raw.bayersensor.pixelShiftAutomatic, raw.bayersensor.pixelShiftStddevFactor, raw.bayersensor.pixelShiftEperIso, raw.bayersensor.pixelShiftNreadIso, raw.bayersensor.pixelShiftPrnu, ri->get_model(), raw.expos, raw.bayersensor.pixelShiftNonGreenHorizontal, raw.bayersensor.pixelShiftNonGreenVertical);
+ pixelshift(0, 0, W, H, raw.bayersensor.pixelShiftMotion > 0, raw.bayersensor.pixelShiftMotion, raw.bayersensor.pixelshiftShowMotion, raw.bayersensor.pixelshiftShowMotionMaskOnly, currFrame, raw.bayersensor.pixelShiftMotionCorrection, raw.bayersensor.pixelShiftAutomatic, raw.bayersensor.pixelShiftStddevFactor, raw.bayersensor.pixelShiftEperIso, raw.bayersensor.pixelShiftNreadIso, raw.bayersensor.pixelShiftPrnu, ri->get_model(), raw.expos, raw.bayersensor.pixelShiftNonGreenHorizontal, raw.bayersensor.pixelShiftNonGreenVertical);
}
} else if (raw.bayersensor.method == RAWParams::BayerSensor::methodstring[RAWParams::BayerSensor::dcb] ) {
dcb_demosaic(raw.bayersensor.dcb_iterations, raw.bayersensor.dcb_enhance);
diff --git a/rtengine/rawimagesource.h b/rtengine/rawimagesource.h
index 5cb98cd64..a6877f6fd 100644
--- a/rtengine/rawimagesource.h
+++ b/rtengine/rawimagesource.h
@@ -261,7 +261,7 @@ protected:
void xtransborder_interpolate (int border);
void xtrans_interpolate (const int passes, const bool useCieLab);
void fast_xtrans_interpolate ();
- void pixelshift(int winx, int winy, int winw, int winh, bool detectMotion, int motion, bool showMotion, bool showOnlyMask, unsigned int frame, unsigned int gridSize, bool adaptive, float stddevFactor, float eperIso, float nreadIso, float prnu, const std::string &model, float rawWpCorrection, bool checkNonGreenHorizontal, bool checkNonGreenVertical);
+ void pixelshift(int winx, int winy, int winw, int winh, bool detectMotion, int motion, bool showMotion, bool showOnlyMask, unsigned int frame, RAWParams::BayerSensor::ePSMotionCorrection gridSize, bool adaptive, float stddevFactor, float eperIso, float nreadIso, float prnu, const std::string &model, float rawWpCorrection, bool checkNonGreenHorizontal, bool checkNonGreenVertical);
void hflip (Imagefloat* im);
void vflip (Imagefloat* im);
diff --git a/rtgui/bayerprocess.cc b/rtgui/bayerprocess.cc
index 0781b9b4b..2d2f2902b 100644
--- a/rtgui/bayerprocess.cc
+++ b/rtgui/bayerprocess.cc
@@ -108,16 +108,18 @@ BayerProcess::BayerProcess () : FoldableToolPanel(this, "bayerprocess", M("TP_RA
pixelShiftMotion->show();
pixelShiftOptions->pack_start(*pixelShiftMotion);
- pixelShiftMotionCorrection = Gtk::manage (new Adjuster (M("TP_RAW_PIXELSHIFTMOTIONCORRECTION"), 0, 5, 1, 3));
- pixelShiftMotionCorrection->setAdjusterListener (this);
+ Gtk::HBox* hb2 = Gtk::manage (new Gtk::HBox ());
+ hb2->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_RAW_PIXELSHIFTMOTIONCORRECTION") + ": ")), Gtk::PACK_SHRINK, 4);
+ pixelShiftMotionCorrection = Gtk::manage (new MyComboBoxText ());
+ pixelShiftMotionCorrection->append_text("1x1");
+ pixelShiftMotionCorrection->append_text("1x2");
+ pixelShiftMotionCorrection->append_text("3x3");
+ pixelShiftMotionCorrection->append_text("5x5");
+ pixelShiftMotionCorrection->set_active(0);
pixelShiftMotionCorrection->set_tooltip_markup (M("TP_RAW_PIXELSHIFTMOTIONCORRECTION_TOOLTIP"));
-
- if (pixelShiftMotionCorrection->delay < options.adjusterMaxDelay) {
- pixelShiftMotionCorrection->delay = options.adjusterMaxDelay;
- }
-
pixelShiftMotionCorrection->show();
- pixelShiftOptions->pack_start(*pixelShiftMotionCorrection);
+ hb2->pack_start(*pixelShiftMotionCorrection);
+ pixelShiftOptions->pack_start(*hb2);
pixelShiftStddevFactor = Gtk::manage (new Adjuster (M("TP_RAW_PIXELSHIFTSTDDEVFACTOR"), 2, 8, 0.1, 5));
pixelShiftStddevFactor->setAdjusterListener (this);
@@ -186,6 +188,7 @@ BayerProcess::BayerProcess () : FoldableToolPanel(this, "bayerprocess", M("TP_RA
//pack_start( *allOptions, Gtk::PACK_SHRINK, 4);
methodconn = method->signal_changed().connect( sigc::mem_fun(*this, &BayerProcess::methodChanged) );
+ psmcconn = pixelShiftMotionCorrection->signal_changed().connect( sigc::mem_fun(*this, &BayerProcess::psMotionCorrectionChanged) );
imagenumberconn = imageNumber->signal_changed().connect( sigc::mem_fun(*this, &BayerProcess::imageNumberChanged) );
dcbEnhconn = dcbEnhance->signal_toggled().connect ( sigc::mem_fun(*this, &BayerProcess::dcbEnhanceChanged), true);
pixelShiftShowMotionconn = pixelShiftShowMotion->signal_toggled().connect ( sigc::mem_fun(*this, &BayerProcess::pixelShiftShowMotionChanged), true);
@@ -203,6 +206,7 @@ void BayerProcess::read(const rtengine::procparams::ProcParams* pp, const Params
methodconn.block (true);
dcbEnhconn.block (true);
imagenumberconn.block (true);
+ psmcconn.block (true);
//allEnhconn.block (true);
method->set_active(procparams::RAWParams::BayerSensor::numMethods);
@@ -227,8 +231,7 @@ void BayerProcess::read(const rtengine::procparams::ProcParams* pp, const Params
pixelShiftNonGreenVertical->set_inconsistent(!pedited->raw.bayersensor.pixelShiftNonGreenVertical);
//allEnhance->set_inconsistent(!pedited->raw.bayersensor.allEnhance);
lmmseIterations->setEditedState ( pedited->raw.bayersensor.lmmseIterations ? Edited : UnEdited);
- pixelShiftMotion->setEditedState ( pedited->raw.bayersensor.pixelshiftMotion ? Edited : UnEdited);
- pixelShiftMotionCorrection->setEditedState ( pedited->raw.bayersensor.pixelshiftMotionCorrection ? Edited : UnEdited);
+ pixelShiftMotion->setEditedState ( pedited->raw.bayersensor.pixelShiftMotion ? Edited : UnEdited);
pixelShiftStddevFactor->setEditedState ( pedited->raw.bayersensor.pixelShiftStddevFactor ? Edited : UnEdited);
pixelShiftEperIso->setEditedState ( pedited->raw.bayersensor.pixelShiftEperIso ? Edited : UnEdited);
pixelShiftNreadIso->setEditedState ( pedited->raw.bayersensor.pixelShiftNreadIso ? Edited : UnEdited);
@@ -238,7 +241,10 @@ void BayerProcess::read(const rtengine::procparams::ProcParams* pp, const Params
method->set_active(procparams::RAWParams::BayerSensor::numMethods); // No name
}
if(!pedited->raw.bayersensor.imageNum) {
- imageNumber->set_active(4);
+ imageNumber->set_active_text(M("GENERAL_UNCHANGED"));
+ }
+ if(!pedited->raw.bayersensor.pixelShiftMotionCorrection) {
+ pixelShiftMotionCorrection->set_active_text(M("GENERAL_UNCHANGED"));
}
}
@@ -253,8 +259,8 @@ void BayerProcess::read(const rtengine::procparams::ProcParams* pp, const Params
pixelShiftNonGreenVertical->set_active(pp->raw.bayersensor.pixelShiftNonGreenVertical);
ccSteps->setValue (pp->raw.bayersensor.ccSteps);
lmmseIterations->setValue (pp->raw.bayersensor.lmmse_iterations);
- pixelShiftMotion->setValue (pp->raw.bayersensor.pixelshiftMotion);
- pixelShiftMotionCorrection->setValue (pp->raw.bayersensor.pixelshiftMotionCorrection);
+ pixelShiftMotion->setValue (pp->raw.bayersensor.pixelShiftMotion);
+ pixelShiftMotionCorrection->set_active ((int)pp->raw.bayersensor.pixelShiftMotionCorrection);
pixelShiftStddevFactor->setValue (pp->raw.bayersensor.pixelShiftStddevFactor);
pixelShiftEperIso->setValue (pp->raw.bayersensor.pixelShiftEperIso);
pixelShiftNreadIso->setValue (pp->raw.bayersensor.pixelShiftNreadIso);
@@ -293,6 +299,7 @@ void BayerProcess::read(const rtengine::procparams::ProcParams* pp, const Params
//lastALLen = pp->raw.bayersensor.all_enhance;
methodconn.block (false);
+ psmcconn.block (false);
imagenumberconn.block (false);
dcbEnhconn.block (false);
//allEnhconn.block (false);
@@ -307,8 +314,8 @@ void BayerProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pe
pp->raw.bayersensor.dcb_enhance = dcbEnhance->get_active();
//pp->raw.bayersensor.all_enhance = allEnhance->get_active();
pp->raw.bayersensor.lmmse_iterations = lmmseIterations->getIntValue();
- pp->raw.bayersensor.pixelshiftMotion = pixelShiftMotion->getIntValue();
- pp->raw.bayersensor.pixelshiftMotionCorrection = pixelShiftMotionCorrection->getIntValue();
+ pp->raw.bayersensor.pixelShiftMotion = pixelShiftMotion->getIntValue();
+ pp->raw.bayersensor.pixelShiftMotionCorrection = (RAWParams::BayerSensor::ePSMotionCorrection)pixelShiftMotionCorrection->get_active_row_number();
pp->raw.bayersensor.pixelShiftStddevFactor = pixelShiftStddevFactor->getValue();
pp->raw.bayersensor.pixelShiftEperIso = pixelShiftEperIso->getValue();
pp->raw.bayersensor.pixelShiftNreadIso = pixelShiftNreadIso->getValue();
@@ -333,13 +340,13 @@ void BayerProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pe
if (pedited) {
pedited->raw.bayersensor.ccSteps = ccSteps->getEditedState ();
pedited->raw.bayersensor.method = method->get_active_row_number() != procparams::RAWParams::BayerSensor::numMethods;
- pedited->raw.bayersensor.imageNum = imageNumber->get_active_row_number() < 4;
+ pedited->raw.bayersensor.imageNum = imageNumber->get_active_text() != M("GENERAL_UNCHANGED");
pedited->raw.bayersensor.dcbIterations = dcbIterations->getEditedState ();
pedited->raw.bayersensor.dcbEnhance = !dcbEnhance->get_inconsistent();
//pedited->raw.bayersensor.allEnhance = !allEnhance->get_inconsistent();
pedited->raw.bayersensor.lmmseIterations = lmmseIterations->getEditedState ();
- pedited->raw.bayersensor.pixelshiftMotion = pixelShiftMotion->getEditedState ();
- pedited->raw.bayersensor.pixelshiftMotionCorrection = pixelShiftMotionCorrection->getEditedState ();
+ pedited->raw.bayersensor.pixelShiftMotion = pixelShiftMotion->getEditedState ();
+ pedited->raw.bayersensor.pixelShiftMotionCorrection = pixelShiftMotionCorrection->get_active_text() != M("GENERAL_UNCHANGED");
pedited->raw.bayersensor.pixelShiftStddevFactor = pixelShiftStddevFactor->getEditedState ();
pedited->raw.bayersensor.pixelShiftEperIso = pixelShiftEperIso->getEditedState ();
pedited->raw.bayersensor.pixelShiftNreadIso = pixelShiftNreadIso->getEditedState ();
@@ -356,6 +363,8 @@ void BayerProcess::setBatchMode(bool batchMode)
{
method->append_text (M("GENERAL_UNCHANGED"));
method->set_active(procparams::RAWParams::BayerSensor::numMethods); // No name
+ pixelShiftMotionCorrection->append_text (M("GENERAL_UNCHANGED"));
+ pixelShiftMotionCorrection->set_active (4);
imageNumber->append_text (M("GENERAL_UNCHANGED"));
imageNumber->set_active(4);
dcbOptions->hide();
@@ -366,7 +375,6 @@ void BayerProcess::setBatchMode(bool batchMode)
dcbIterations->showEditedCB ();
lmmseIterations->showEditedCB ();
pixelShiftMotion->showEditedCB ();
- pixelShiftMotionCorrection->showEditedCB ();
pixelShiftStddevFactor->showEditedCB ();
pixelShiftEperIso->showEditedCB ();
pixelShiftNreadIso->showEditedCB ();
@@ -377,8 +385,7 @@ void BayerProcess::setDefaults(const rtengine::procparams::ProcParams* defParams
{
dcbIterations->setDefault( defParams->raw.bayersensor.dcb_iterations);
lmmseIterations->setDefault( defParams->raw.bayersensor.lmmse_iterations);
- pixelShiftMotion->setDefault( defParams->raw.bayersensor.pixelshiftMotion);
- pixelShiftMotionCorrection->setDefault( defParams->raw.bayersensor.pixelshiftMotionCorrection);
+ pixelShiftMotion->setDefault( defParams->raw.bayersensor.pixelShiftMotion);
pixelShiftStddevFactor->setDefault( defParams->raw.bayersensor.pixelShiftStddevFactor);
pixelShiftEperIso->setDefault( defParams->raw.bayersensor.pixelShiftEperIso);
pixelShiftNreadIso->setDefault( defParams->raw.bayersensor.pixelShiftNreadIso);
@@ -388,8 +395,7 @@ void BayerProcess::setDefaults(const rtengine::procparams::ProcParams* defParams
if (pedited) {
dcbIterations->setDefaultEditedState( pedited->raw.bayersensor.dcbIterations ? Edited : UnEdited);
lmmseIterations->setDefaultEditedState( pedited->raw.bayersensor.lmmseIterations ? Edited : UnEdited);
- pixelShiftMotion->setDefaultEditedState( pedited->raw.bayersensor.pixelshiftMotion ? Edited : UnEdited);
- pixelShiftMotionCorrection->setDefaultEditedState( pedited->raw.bayersensor.pixelshiftMotionCorrection ? Edited : UnEdited);
+ pixelShiftMotion->setDefaultEditedState( pedited->raw.bayersensor.pixelShiftMotion ? Edited : UnEdited);
pixelShiftStddevFactor->setDefaultEditedState( pedited->raw.bayersensor.pixelShiftStddevFactor ? Edited : UnEdited);
pixelShiftEperIso->setDefaultEditedState( pedited->raw.bayersensor.pixelShiftEperIso ? Edited : UnEdited);
pixelShiftNreadIso->setDefaultEditedState( pedited->raw.bayersensor.pixelShiftNreadIso ? Edited : UnEdited);
@@ -399,7 +405,6 @@ void BayerProcess::setDefaults(const rtengine::procparams::ProcParams* defParams
dcbIterations->setDefaultEditedState( Irrelevant );
lmmseIterations->setDefaultEditedState( Irrelevant );
pixelShiftMotion->setDefaultEditedState( Irrelevant );
- pixelShiftMotionCorrection->setDefaultEditedState( Irrelevant );
pixelShiftStddevFactor->setDefaultEditedState( Irrelevant );
pixelShiftEperIso->setDefaultEditedState( Irrelevant );
pixelShiftNreadIso->setDefaultEditedState( Irrelevant );
@@ -418,21 +423,44 @@ void BayerProcess::adjusterChanged (Adjuster* a, double newval)
} else if (a == lmmseIterations) {
listener->panelChanged (EvDemosaicLMMSEIter, a->getTextValue() );
} else if (a == pixelShiftMotion) {
- listener->panelChanged (EvDemosaicPixelshiftMotion, a->getTextValue() );
- } else if (a == pixelShiftMotionCorrection) {
- listener->panelChanged (EvDemosaicPixelshiftMotion, a->getTextValue() );
+ listener->panelChanged (EvPixelShiftMotion, a->getTextValue() );
} else if (a == pixelShiftStddevFactor) {
- listener->panelChanged (EvDemosaicPixelshiftMotion, a->getTextValue() );
+ listener->panelChanged (EvPixelShiftStddevFactor, a->getTextValue() );
} else if (a == pixelShiftEperIso) {
- listener->panelChanged (EvDemosaicPixelshiftMotion, a->getTextValue() );
+ listener->panelChanged (EvPixelShiftEperIso, a->getTextValue() );
} else if (a == pixelShiftNreadIso) {
- listener->panelChanged (EvDemosaicPixelshiftMotion, a->getTextValue() );
+ listener->panelChanged (EvPixelShiftNreadIso, a->getTextValue() );
} else if (a == pixelShiftPrnu) {
- listener->panelChanged (EvDemosaicPixelshiftMotion, a->getTextValue() );
+ listener->panelChanged (EvPixelShiftPrnu, a->getTextValue() );
}
}
}
+void BayerProcess::psMotionCorrectionChanged ()
+{
+ int curSelection = pixelShiftMotionCorrection->get_active_row_number();
+ Glib::ustring sGrid;
+ switch (curSelection) {
+ case 0:
+ sGrid = "1x1";
+ break;
+ case 1:
+ sGrid = "1x2";
+ break;
+ case 2:
+ sGrid = "3x3";
+ break;
+ case 3:
+ default:
+ sGrid = "5x5";
+ break;
+ }
+
+ if (listener) {
+ listener->panelChanged (EvPixelShiftMotionCorrection, sGrid);
+ }
+}
+
void BayerProcess::methodChanged ()
{
int curSelection = method->get_active_row_number();
@@ -516,7 +544,7 @@ void BayerProcess::pixelShiftShowMotionChanged ()
}
pixelShiftShowMotionMaskOnly->set_sensitive(pixelShiftShowMotion->get_active ());
if (listener) {
- listener->panelChanged (EvDemosaicPixelshiftMotion, pixelShiftShowMotion->get_active() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
+ listener->panelChanged (EvPixelshiftShowMotion, pixelShiftShowMotion->get_active() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
}
}
@@ -536,7 +564,7 @@ void BayerProcess::pixelShiftShowMotionMaskOnlyChanged ()
}
if (listener) {
- listener->panelChanged (EvDemosaicPixelshiftMotionMaskOnly, pixelShiftShowMotionMaskOnly->get_active() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
+ listener->panelChanged (EvPixelshiftShowMotionMaskOnly, pixelShiftShowMotionMaskOnly->get_active() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
}
}
@@ -563,7 +591,7 @@ void BayerProcess::pixelShiftAutomaticChanged ()
pixelShiftNonGreenVertical->set_sensitive(pixelShiftAutomatic->get_active ());
if (listener) {
- listener->panelChanged (EvDemosaicPixelshiftMotion, pixelShiftAutomatic->get_active() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
+ listener->panelChanged (EvPixelShiftAutomatic, pixelShiftAutomatic->get_active() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
}
}
@@ -584,7 +612,7 @@ void BayerProcess::pixelShiftNonGreenHorizontalChanged ()
}
if (listener) {
- listener->panelChanged (EvDemosaicPixelshiftMotion, pixelShiftNonGreenHorizontal->get_active() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
+ listener->panelChanged (EvPixelShiftNonGreenHorizontal, pixelShiftNonGreenHorizontal->get_active() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
}
}
@@ -604,7 +632,7 @@ void BayerProcess::pixelShiftNonGreenVerticalChanged ()
}
if (listener) {
- listener->panelChanged (EvDemosaicPixelshiftMotion, pixelShiftNonGreenVertical->get_active() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
+ listener->panelChanged (EvPixelShiftNonGreenVertical, pixelShiftNonGreenVertical->get_active() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
}
}
diff --git a/rtgui/bayerprocess.h b/rtgui/bayerprocess.h
index 68dab3f95..a54637f13 100644
--- a/rtgui/bayerprocess.h
+++ b/rtgui/bayerprocess.h
@@ -43,7 +43,7 @@ protected:
Adjuster* lmmseIterations;
Gtk::VBox *pixelShiftOptions;
Adjuster* pixelShiftMotion;
- Adjuster* pixelShiftMotionCorrection;
+ MyComboBoxText* pixelShiftMotionCorrection;
Gtk::CheckButton* pixelShiftShowMotion;
Gtk::CheckButton* pixelShiftShowMotionMaskOnly;
Gtk::CheckButton* pixelShiftAutomatic;
@@ -56,7 +56,7 @@ protected:
bool lastDCBen;
int oldMethod;
//bool lastALLen;
- sigc::connection methodconn, imagenumberconn, dcbEnhconn, pixelShiftShowMotionconn, pixelShiftShowMotionMaskOnlyconn, pixelShiftAutomaticconn, pixelShiftNonGreenHorizontalconn, pixelShiftNonGreenVerticalconn; //,allEnhconn;
+ sigc::connection methodconn, imagenumberconn, psmcconn, dcbEnhconn, pixelShiftShowMotionconn, pixelShiftShowMotionMaskOnlyconn, pixelShiftAutomaticconn, pixelShiftNonGreenHorizontalconn, pixelShiftNonGreenVerticalconn; //,allEnhconn;
public:
BayerProcess ();
@@ -67,6 +67,7 @@ public:
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
void methodChanged ();
+ void psMotionCorrectionChanged ();
void imageNumberChanged ();
void adjusterChanged (Adjuster* a, double newval);
void dcbEnhanceChanged();
diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc
index d7d101f0a..ac0257fa1 100644
--- a/rtgui/paramsedited.cc
+++ b/rtgui/paramsedited.cc
@@ -370,8 +370,8 @@ void ParamsEdited::set (bool v)
raw.bayersensor.dcbEnhance = v;
//raw.bayersensor.allEnhance = v;
raw.bayersensor.lmmseIterations = v;
- raw.bayersensor.pixelshiftMotion = v;
- raw.bayersensor.pixelshiftMotionCorrection = v;
+ raw.bayersensor.pixelShiftMotion = v;
+ raw.bayersensor.pixelShiftMotionCorrection = v;
raw.bayersensor.pixelShiftStddevFactor = v;
raw.bayersensor.pixelShiftEperIso = v;
raw.bayersensor.pixelShiftNreadIso = v;
@@ -877,8 +877,8 @@ void ParamsEdited::initFrom (const std::vector
raw.bayersensor.dcbEnhance = raw.bayersensor.dcbEnhance && p.raw.bayersensor.dcb_enhance == other.raw.bayersensor.dcb_enhance;
//raw.bayersensor.allEnhance = raw.bayersensor.allEnhance && p.raw.bayersensor.all_enhance == other.raw.bayersensor.all_enhance;
raw.bayersensor.lmmseIterations = raw.bayersensor.lmmseIterations && p.raw.bayersensor.lmmse_iterations == other.raw.bayersensor.lmmse_iterations;
- raw.bayersensor.pixelshiftMotion = raw.bayersensor.pixelshiftMotion && p.raw.bayersensor.pixelshiftMotion == other.raw.bayersensor.pixelshiftMotion;
- raw.bayersensor.pixelshiftMotionCorrection = raw.bayersensor.pixelshiftMotionCorrection && p.raw.bayersensor.pixelshiftMotionCorrection == other.raw.bayersensor.pixelshiftMotionCorrection;
+ raw.bayersensor.pixelShiftMotion = raw.bayersensor.pixelShiftMotion && p.raw.bayersensor.pixelShiftMotion == other.raw.bayersensor.pixelShiftMotion;
+ raw.bayersensor.pixelShiftMotionCorrection = raw.bayersensor.pixelShiftMotionCorrection && p.raw.bayersensor.pixelShiftMotionCorrection == other.raw.bayersensor.pixelShiftMotionCorrection;
raw.bayersensor.pixelShiftStddevFactor = raw.bayersensor.pixelShiftStddevFactor && p.raw.bayersensor.pixelShiftStddevFactor == other.raw.bayersensor.pixelShiftStddevFactor;
raw.bayersensor.pixelShiftEperIso = raw.bayersensor.pixelShiftEperIso && p.raw.bayersensor.pixelShiftEperIso == other.raw.bayersensor.pixelShiftEperIso;
raw.bayersensor.pixelShiftNreadIso = raw.bayersensor.pixelShiftNreadIso && p.raw.bayersensor.pixelShiftNreadIso == other.raw.bayersensor.pixelShiftNreadIso;
@@ -2300,12 +2300,12 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.raw.bayersensor.lmmse_iterations = mods.raw.bayersensor.lmmse_iterations;
}
- if (raw.bayersensor.pixelshiftMotion) {
- toEdit.raw.bayersensor.pixelshiftMotion = mods.raw.bayersensor.pixelshiftMotion;
+ if (raw.bayersensor.pixelShiftMotion) {
+ toEdit.raw.bayersensor.pixelShiftMotion = mods.raw.bayersensor.pixelShiftMotion;
}
- if (raw.bayersensor.pixelshiftMotionCorrection) {
- toEdit.raw.bayersensor.pixelshiftMotionCorrection = mods.raw.bayersensor.pixelshiftMotionCorrection;
+ if (raw.bayersensor.pixelShiftMotionCorrection) {
+ toEdit.raw.bayersensor.pixelShiftMotionCorrection = mods.raw.bayersensor.pixelShiftMotionCorrection;
}
if (raw.bayersensor.pixelShiftStddevFactor) {
@@ -2855,6 +2855,9 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
bool RAWParamsEdited::BayerSensor::isUnchanged() const
{
return method && imageNum && dcbIterations && dcbEnhance && lmmseIterations/*&& allEnhance*/ && greenEq
+ && pixelShiftMotion && pixelShiftMotionCorrection && pixelShiftStddevFactor && pixelShiftEperIso
+ && pixelShiftNreadIso && pixelShiftPrnu && pixelshiftShowMotion && pixelshiftShowMotionMaskOnly
+ && pixelShiftAutomatic && pixelShiftNonGreenHorizontal && pixelShiftNonGreenVertical
&& linenoise && exBlack0 && exBlack1 && exBlack2 && exBlack3 && exTwoGreen;
}
diff --git a/rtgui/paramsedited.h b/rtgui/paramsedited.h
index 9fe0d6b9b..4f9979d1f 100644
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -692,8 +692,8 @@ public:
bool dcbIterations;
bool dcbEnhance;
bool lmmseIterations;
- bool pixelshiftMotion;
- bool pixelshiftMotionCorrection;
+ bool pixelShiftMotion;
+ bool pixelShiftMotionCorrection;
bool pixelShiftStddevFactor;
bool pixelShiftEperIso;
bool pixelShiftNreadIso;