Merge with branch newlocallab...
This commit is contained in:
@@ -108,7 +108,7 @@ void BatchToolPanelCoordinator::initSession ()
|
||||
// compare all the ProcParams and describe which parameters has different (i.e. inconsistent) values in pparamsEdited
|
||||
pparamsEdited.initFrom (initialPP);
|
||||
|
||||
crop->setDimensions (100000, 100000);
|
||||
//crop->setDimensions (100000, 100000);
|
||||
|
||||
/* if (!selected.empty()) {
|
||||
pparams = selected[0]->getProcParams ();
|
||||
@@ -128,6 +128,10 @@ void BatchToolPanelCoordinator::initSession ()
|
||||
|
||||
coarse->initBatchBehavior ();
|
||||
|
||||
int w,h;
|
||||
selected[0]->getOriginalSize(w,h);
|
||||
crop->setDimensions (w, h);
|
||||
|
||||
if (selected.size() == 1) {
|
||||
|
||||
for (size_t i = 0; i < toolPanels.size(); i++) {
|
||||
@@ -205,6 +209,7 @@ void BatchToolPanelCoordinator::initSession ()
|
||||
colortoning->setAdjusterBehavior (options.baBehav[ADDSET_COLORTONING_SPLIT], options.baBehav[ADDSET_COLORTONING_SATTHRESHOLD], options.baBehav[ADDSET_COLORTONING_SATOPACITY], options.baBehav[ADDSET_COLORTONING_STRENGTH], options.baBehav[ADDSET_COLORTONING_BALANCE]);
|
||||
filmSimulation->setAdjusterBehavior(options.baBehav[ADDSET_FILMSIMULATION_STRENGTH]);
|
||||
softlight->setAdjusterBehavior(options.baBehav[ADDSET_SOFTLIGHT_STRENGTH]);
|
||||
dehaze->setAdjusterBehavior(options.baBehav[ADDSET_DEHAZE_STRENGTH]);
|
||||
retinex->setAdjusterBehavior (options.baBehav[ADDSET_RETI_STR], options.baBehav[ADDSET_RETI_NEIGH], options.baBehav[ADDSET_RETI_LIMD], options.baBehav[ADDSET_RETI_OFFS], options.baBehav[ADDSET_RETI_VART], options.baBehav[ADDSET_RETI_GAM], options.baBehav[ADDSET_RETI_SLO]);
|
||||
|
||||
chmixer->setAdjusterBehavior (options.baBehav[ADDSET_CHMIXER] );
|
||||
@@ -295,6 +300,7 @@ void BatchToolPanelCoordinator::initSession ()
|
||||
if (options.baBehav[ADDSET_COLORTONING_STRENGTH]) { pparams.colorToning.strength = 0; }
|
||||
if (options.baBehav[ADDSET_FILMSIMULATION_STRENGTH]) { pparams.filmSimulation.strength = 0; }
|
||||
if (options.baBehav[ADDSET_SOFTLIGHT_STRENGTH]) { pparams.softlight.strength = 0; }
|
||||
if (options.baBehav[ADDSET_DEHAZE_STRENGTH]) { pparams.dehaze.strength = 0; }
|
||||
if (options.baBehav[ADDSET_ROTATE_DEGREE]) { pparams.rotate.degree = 0; }
|
||||
if (options.baBehav[ADDSET_RESIZE_SCALE]) { pparams.resize.scale = 0; }
|
||||
if (options.baBehav[ADDSET_DIST_AMOUNT]) { pparams.distortion.amount = 0; }
|
||||
@@ -389,9 +395,8 @@ void BatchToolPanelCoordinator::initSession ()
|
||||
pparamsEdited.set(false);
|
||||
}
|
||||
|
||||
void BatchToolPanelCoordinator::panelChanged (rtengine::ProcEvent event, const Glib::ustring& descr)
|
||||
void BatchToolPanelCoordinator::panelChanged(const rtengine::ProcEvent& event, const Glib::ustring& descr)
|
||||
{
|
||||
|
||||
if (selected.empty()) {
|
||||
return;
|
||||
}
|
||||
@@ -618,9 +623,14 @@ void BatchToolPanelCoordinator::endBatchPParamsChange()
|
||||
* Using a Profile panel in the batch tool panel editor is actually
|
||||
* not supported by BatchToolPanelCoordinator::profileChange!
|
||||
*/
|
||||
void BatchToolPanelCoordinator::profileChange (const rtengine::procparams::PartialProfile* nparams, rtengine::ProcEvent event, const Glib::ustring& descr, const ParamsEdited* paramsEdited)
|
||||
void BatchToolPanelCoordinator::profileChange(
|
||||
const PartialProfile* nparams,
|
||||
const rtengine::ProcEvent& event,
|
||||
const Glib::ustring& descr,
|
||||
const ParamsEdited* paramsEdited,
|
||||
bool fromLastSave
|
||||
)
|
||||
{
|
||||
|
||||
if (event == rtengine::EvProfileChanged) {
|
||||
// a profile has been selected in a hypothetical Profile panel
|
||||
// -> ACTUALLY NOT SUPPORTED
|
||||
@@ -704,11 +714,11 @@ void BatchToolPanelCoordinator::spotWBselected (int x, int y, Thumbnail* thm)
|
||||
double otemp = initialPP[i].wb.temperature;
|
||||
double ogreen = initialPP[i].wb.green;
|
||||
|
||||
if (options.baBehav[12]) {
|
||||
if (options.baBehav[ADDSET_ROTATE_DEGREE]) {
|
||||
temp = temp - otemp;
|
||||
}
|
||||
|
||||
if (options.baBehav[13]) {
|
||||
if (options.baBehav[ADDSET_DIST_AMOUNT]) {
|
||||
green = green - ogreen;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user