Keep values scope from 5.10 Selective Editing - for color & light - shadow/highlight - vibrance #7102 (#7107)
* ppversion 351 and keep valus scope for color and light shadow-highligt vibrance * Change comment in ppversion.h * Change procparams for colorscope pp<351 * Remove not used isset
This commit is contained in:
Desmis
GitHub
parent
0bee94e4aa
commit
819b65af7f
@ -1170,9 +1170,11 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
|
||||
if (params->locallab.spots.at(sp).equilret && params->locallab.spots.at(sp).expreti) {
|
||||
savenormreti.reset(new LabImage(*oprevl, true));
|
||||
}
|
||||
if(params->locallab.spots.at(sp).colorscope != 30) {//compatibility with old method in controlspotpanel to change scope - default value 30
|
||||
scopefp[sp]= params->locallab.spots.at(sp).colorscope;
|
||||
}
|
||||
|
||||
// if(params->locallab.spots.at(sp).colorscope != 30) {//compatibility with old method in controlspotpanel to change scope - default value 30
|
||||
// scopefp[sp]= params->locallab.spots.at(sp).colorscope;
|
||||
// }
|
||||
|
||||
// Set local curves of current spot to LUT
|
||||
locRETgainCurve.Set(params->locallab.spots.at(sp).localTgaincurve);
|
||||
locRETtransCurve.Set(params->locallab.spots.at(sp).localTtranscurve);
|
||||
@ -1587,7 +1589,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
|
||||
bool islog = params->locallab.spots.at(sp).explog;
|
||||
bool ismas = params->locallab.spots.at(sp).expmask;
|
||||
bool iscie = params->locallab.spots.at(sp).expcie;
|
||||
bool isset = iscolor || issh || isvib;
|
||||
// bool isset = iscolor || issh || isvib;
|
||||
|
||||
//set select spot settings
|
||||
LocallabListener::locallabsetLC locsetlc;
|
||||
@ -1615,13 +1617,15 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
|
||||
locallListener->cieChanged(locallcielc,params->locallab.selspot);
|
||||
}
|
||||
locallListener->sigChanged(locallciesig,params->locallab.selspot);
|
||||
if(params->locallab.spots.at(sp).colorscope != 30) {//compatibility with old method in controlspotpanel
|
||||
/*
|
||||
if(params->locallab.spots.at(sp).colorscope != 0) {//compatibility with old method in controlspotpanel
|
||||
locallListener->scopeChangedcol(scopefp[sp], params->locallab.selspot, iscolor);
|
||||
locallListener->scopeChangedsh(scopefp[sp], params->locallab.selspot, issh);
|
||||
locallListener->scopeChangedvib(scopefp[sp], params->locallab.selspot, isvib);
|
||||
locallListener->scopeChangedset(scopefp[sp], params->locallab.selspot, isset);
|
||||
params->locallab.spots.at(sp).colorscope = 30;
|
||||
//params->locallab.spots.at(sp).colorscope = 30;
|
||||
}
|
||||
*/
|
||||
// if (mainfp[sp] >= 0) {//minimize call to idle register
|
||||
//used by Global fullimage.
|
||||
locallListener->maiChanged(locallsetlc,params->locallab.selspot);
|
||||
|
||||
@ -9144,7 +9144,16 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
|
||||
assignFromKeyfile(keyFile, "Locallab", "labgridAHighmerg_" + index_str, spot.labgridAHighmerg, spotEdited.labgridAHighmerg);
|
||||
assignFromKeyfile(keyFile, "Locallab", "labgridBHighmerg_" + index_str, spot.labgridBHighmerg, spotEdited.labgridBHighmerg);
|
||||
assignFromKeyfile(keyFile, "Locallab", "Strengthgrid_" + index_str, spot.strengthgrid, spotEdited.strengthgrid);
|
||||
assignFromKeyfile(keyFile, "Locallab", "Sensi_" + index_str, spot.sensi, spotEdited.sensi);
|
||||
assignFromKeyfile(keyFile, "Locallab", "Colorscope_" + index_str, spot.colorscope, spotEdited.colorscope);
|
||||
|
||||
if (ppVersion <= 350) {
|
||||
if (keyFile.has_key("Locallab", "Colorscope_" + index_str)) {
|
||||
spot.sensi = keyFile.get_integer("Locallab", "Colorscope_" + index_str);
|
||||
spotEdited.sensi = true;
|
||||
}
|
||||
} else {
|
||||
assignFromKeyfile(keyFile, "Locallab", "Sensi_" + index_str, spot.sensi, spotEdited.sensi);
|
||||
}
|
||||
assignFromKeyfile(keyFile, "Locallab", "Structcol_" + index_str, spot.structcol, spotEdited.structcol);
|
||||
assignFromKeyfile(keyFile, "Locallab", "Strcol_" + index_str, spot.strcol, spotEdited.strcol);
|
||||
assignFromKeyfile(keyFile, "Locallab", "Strcolab_" + index_str, spot.strcolab, spotEdited.strcolab);
|
||||
@ -9282,7 +9291,14 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
|
||||
assignFromKeyfile(keyFile, "Locallab", "shadows_" + index_str, spot.shadows, spotEdited.shadows);
|
||||
assignFromKeyfile(keyFile, "Locallab", "s_tonalwidth_" + index_str, spot.s_tonalwidth, spotEdited.s_tonalwidth);
|
||||
assignFromKeyfile(keyFile, "Locallab", "sh_radius_" + index_str, spot.sh_radius, spotEdited.sh_radius);
|
||||
assignFromKeyfile(keyFile, "Locallab", "sensihs_" + index_str, spot.sensihs, spotEdited.sensihs);
|
||||
if (ppVersion <= 350) {
|
||||
if (keyFile.has_key("Locallab", "Colorscope_" + index_str)) {
|
||||
spot.sensihs = keyFile.get_integer("Locallab", "Colorscope_" + index_str);
|
||||
spotEdited.sensihs = true;
|
||||
}
|
||||
} else {
|
||||
assignFromKeyfile(keyFile, "Locallab", "sensihs_" + index_str, spot.sensihs, spotEdited.sensihs);
|
||||
}
|
||||
assignFromKeyfile(keyFile, "Locallab", "EnaSHMask_" + index_str, spot.enaSHMask, spotEdited.enaSHMask);
|
||||
assignFromKeyfile(keyFile, "Locallab", "CCmaskSHCurve_" + index_str, spot.CCmaskSHcurve, spotEdited.CCmaskSHcurve);
|
||||
assignFromKeyfile(keyFile, "Locallab", "LLmaskSHCurve_" + index_str, spot.LLmaskSHcurve, spotEdited.LLmaskSHcurve);
|
||||
@ -9336,7 +9352,14 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
|
||||
assignFromKeyfile(keyFile, "Locallab", "ProtectSkins_" + index_str, spot.protectskins, spotEdited.protectskins);
|
||||
assignFromKeyfile(keyFile, "Locallab", "AvoidColorShift_" + index_str, spot.avoidcolorshift, spotEdited.avoidcolorshift);
|
||||
assignFromKeyfile(keyFile, "Locallab", "PastSatTog_" + index_str, spot.pastsattog, spotEdited.pastsattog);
|
||||
assignFromKeyfile(keyFile, "Locallab", "Sensiv_" + index_str, spot.sensiv, spotEdited.sensiv);
|
||||
if (ppVersion <= 350) {
|
||||
if (keyFile.has_key("Locallab", "Colorscope_" + index_str)) {
|
||||
spot.sensiv = keyFile.get_integer("Locallab", "Colorscope_" + index_str);
|
||||
spotEdited.sensiv = true;
|
||||
}
|
||||
} else {
|
||||
assignFromKeyfile(keyFile, "Locallab", "Sensiv_" + index_str, spot.sensiv, spotEdited.sensiv);
|
||||
}
|
||||
assignFromKeyfile(keyFile, "Locallab", "SkinTonesCurve_" + index_str, spot.skintonescurve, spotEdited.skintonescurve);
|
||||
assignFromKeyfile(keyFile, "Locallab", "CCmaskvibCurve_" + index_str, spot.CCmaskvibcurve, spotEdited.CCmaskvibcurve);
|
||||
assignFromKeyfile(keyFile, "Locallab", "LLmaskvibCurve_" + index_str, spot.LLmaskvibcurve, spotEdited.LLmaskvibcurve);
|
||||
|
||||
@ -1,11 +1,13 @@
|
||||
#pragma once
|
||||
|
||||
// This number has to be incremented whenever the PP3 file format is modified or the behaviour of a tool changes
|
||||
#define PPVERSION 350
|
||||
#define PPVERSION 351
|
||||
#define PPVERSION_AEXP 301 //value of PPVERSION when auto exposure algorithm was modified
|
||||
|
||||
/*
|
||||
Log of version changes
|
||||
351 2024-06-19
|
||||
take into account Global in selective editing
|
||||
350 2023-03-05
|
||||
introduced white balance standard observer
|
||||
349 2020-10-29
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user