liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev and fixed illumant if different DEF

Browse Source
This commit is contained in:
U-PC-BUREAU\jacques
2018-11-13 13:37:56 +01:00
parent 3ba386d0ca 53a99837e5
commit d080b9ffcd
11 changed files with 297 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rtgui/iccprofilecreator.cc
View File

@@ -909,7 +909,7 @@ void ICCProfileCreator::savePressed()
sGamma = Glib::ustring::format(std::setw(3), std::fixed, std::setprecision(2), presetGamma);
sSlope = Glib::ustring::format(std::setw(6), std::fixed, std::setprecision(5), presetSlope);
fName = Glib::ustring::compose("RT%1_%2_%3.icc", profileVersion, sPrimariesAndIlluminant, sGammaPreset);
profileDesc == sPrimariesPreset + sGammaPreset;
profileDesc = sPrimariesPreset + sGammaPreset;
}
sGammaSlopeParam = Glib::ustring::compose("g%1s%2!", sGamma, sSlope);
@@ -1025,6 +1025,11 @@ void ICCProfileCreator::savePressed()
if (illuminant == "D50") {
xyD = {0.3457, 0.3585, 1.0};//white D50 near LCMS values but not perfect...it's a compromise!!
}
if (illuminant == "stdA") {
xyD = {0.447573, 0.407440, 1.0};
}
} else {
if (v2except) {
@@ -1175,19 +1180,16 @@ void ICCProfileCreator::savePressed()
}
}
if (illuminant == "stdA") {
xyD = {0.447573, 0.407440, 1.0};
}
if (isD65) {
if (isD65 && illuminant == "DEF") {
xyD = {0.312700492, 0.329000939, 1.0};
}
if (isD60) {
if (isD60 && illuminant == "DEF") {
xyD = {0.32168, 0.33767, 1.0};
}
if (isD50) {
if (isD50 && illuminant == "DEF") {
xyD = {0.3457, 0.3585, 1.0};
}

9
rtgui/preferences.cc
View File

@@ -609,7 +609,12 @@ Gtk::Widget* Preferences::getImageProcessingPanel ()
crophb->pack_start(*Gtk::manage(new Gtk::Label(M("PREFERENCES_CROP_GUIDES") + ": ")), Gtk::PACK_SHRINK, 4);
crophb->pack_start(*cropGuides);
cropvb->pack_start(*crophb);
cropAutoFit = Gtk::manage(new Gtk::CheckButton(M("PREFERENCES_CROP_AUTO_FIT")));
Gtk::Label *cropAutoFitLabel = Gtk::manage(new Gtk::Label(M("PREFERENCES_CROP_AUTO_FIT")));
cropAutoFitLabel->set_line_wrap(true);
setExpandAlignProperties(cropAutoFitLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_START);
cropAutoFit = Gtk::manage(new Gtk::CheckButton());
setExpandAlignProperties(cropAutoFit, false, true, Gtk::ALIGN_START, Gtk::ALIGN_START);
cropAutoFit->add(*cropAutoFitLabel);
cropvb->pack_start(*cropAutoFit);
cropframe->add(*cropvb);
vbImageProcessing->pack_start(*cropframe, Gtk::PACK_SHRINK, 4);
@@ -1403,7 +1408,7 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
vbc->pack_start (*cacheGrid, Gtk::PACK_SHRINK, 4);
Gtk::Label* clearSafetyLbl = Gtk::manage (new Gtk::Label(M("PREFERENCES_CACHECLEAR_SAFETY")));
setExpandAlignProperties(clearSafetyLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
setExpandAlignProperties(clearSafetyLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_START);
clearSafetyLbl->set_line_wrap(true);
vbc->pack_start(*clearSafetyLbl, Gtk::PACK_SHRINK, 4);

1
rtgui/rawcacorrection.cc
View File

@@ -41,6 +41,7 @@ RAWCACorr::RAWCACorr () : FoldableToolPanel(this, "rawcacorrection", M("TP_CHROM
caAutoiterations = Gtk::manage(new Adjuster (M("TP_RAWCACORR_AUTOIT"), 1, 5, 1, 2));
caAutoiterations->setAdjusterListener (this);
caAutoiterations->set_tooltip_markup(M("TP_RAWCACORR_AUTOIT_TOOLTIP"));
if (caAutoiterations->delay < options.adjusterMaxDelay) {
caAutoiterations->delay = options.adjusterMaxDelay;