merge with dev..

This commit is contained in:
Desmis
2018-06-14 09:06:29 +02:00
87 changed files with 1674 additions and 790 deletions

View File

@@ -388,6 +388,19 @@ Gtk::Widget* Preferences::getBatchProcPanel()
appendBehavList(mi, M("TP_WAVELET_EDGEDETECTTHR2"), ADDSET_WA_EDGEDETECTTHR2, true);
mi = behModel->append();
mi->set_value (behavColumns.label, M ("TP_RAW_SENSOR_BAYER_LABEL"));
appendBehavList (mi, M ("TP_RAW_FALSECOLOR"), ADDSET_BAYER_FALSE_COLOR_SUPPRESSION, false);
appendBehavList (mi, M ("TP_RAW_DCBITERATIONS") + ", " + M("TP_RAW_LMMSEITERATIONS"), ADDSET_BAYER_ITER, false);
appendBehavList (mi, M ("TP_RAW_DUALDEMOSAICCONTRAST"), ADDSET_BAYER_DUALDEMOZCONTRAST, false);
appendBehavList (mi, M ("TP_RAW_PIXELSHIFTSIGMA"), ADDSET_BAYER_PS_SIGMA, false);
appendBehavList (mi, M ("TP_RAW_PIXELSHIFTSMOOTH"), ADDSET_BAYER_PS_SMOOTH, false);
appendBehavList (mi, M ("TP_RAW_PIXELSHIFTEPERISO"), ADDSET_BAYER_PS_EPERISO, false);
mi = behModel->append ();
mi->set_value (behavColumns.label, M ("TP_RAW_SENSOR_XTRANS_LABEL"));
appendBehavList (mi, M ("TP_RAW_FALSECOLOR"), ADDSET_XTRANS_FALSE_COLOR_SUPPRESSION, false);
mi = behModel->append ();
mi->set_value(behavColumns.label, M("TP_PREPROCESS_LABEL"));
appendBehavList(mi, M("TP_PREPROCESS_GREENEQUIL"), ADDSET_PREPROCESS_GREENEQUIL, false);
appendBehavList(mi, M("TP_PREPROCESS_LINEDENOISE"), ADDSET_PREPROCESS_LINEDENOISE, true);