Improve batch mode with Locallab
Batch mode is now correctly managed by Locallab. It works only if the pictures have the same control spot number with coherent id Other improvements: - If there is no control spot, all Locallab tools are now disabled
This commit is contained in:
@@ -422,6 +422,7 @@ void Thumbnail::setProcParams (const ProcParams& pp, ParamsEdited* pe, int whoCh
|
||||
{
|
||||
const bool needsReprocessing =
|
||||
pparams.toneCurve != pp.toneCurve
|
||||
|| pparams.locallab != pp.locallab
|
||||
|| pparams.labCurve != pp.labCurve
|
||||
|| pparams.localContrast != pp.localContrast
|
||||
|| pparams.rgbCurves != pp.rgbCurves
|
||||
@@ -451,9 +452,12 @@ void Thumbnail::setProcParams (const ProcParams& pp, ParamsEdited* pe, int whoCh
|
||||
|| pparams.softlight != pp.softlight;
|
||||
|
||||
{
|
||||
printf("setProcParams: %d\n", needsReprocessing);
|
||||
|
||||
MyMutex::MyLock lock(mutex);
|
||||
|
||||
if (pparams != pp) {
|
||||
printf("recentlySaved\n");
|
||||
cfs.recentlySaved = false;
|
||||
} else if (pparamsValid && !updateCacheNow) {
|
||||
// nothing to do
|
||||
@@ -466,8 +470,10 @@ void Thumbnail::setProcParams (const ProcParams& pp, ParamsEdited* pe, int whoCh
|
||||
const int inTrash = getStage();
|
||||
|
||||
if (pe) {
|
||||
printf("size: %d %d %d\n", (int)pe->locallab.spots.size(), pe->locallab.nbspot, pe->locallab.selspot);
|
||||
pe->combine(pparams, pp, true);
|
||||
} else {
|
||||
printf("size: %d\n", (int)pp.locallab.spots.size());
|
||||
pparams = pp;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user