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

Merge branch 'dev' into spot-removal-tool (see #2239)

Browse Source
This commit is contained in:
Hombre
2017-11-25 23:30:52 +01:00
parent 81932ba2d6 3b7a382f1d
commit 20a0fb7af9
320 changed files with 17146 additions and 8522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

326
rtgui/toolpanelcoord.cc
View File

@@ -28,7 +28,7 @@
using namespace rtengine::procparams;
ToolPanelCoordinator::ToolPanelCoordinator () : ipc(nullptr), hasChanged(false), editDataProvider(nullptr)
ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChanged (false), editDataProvider (nullptr)
{
exposurePanel = Gtk::manage (new ToolVBox ());
@@ -54,14 +54,13 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(nullptr), hasChanged(false),
colortoning = Gtk::manage (new ColorToning ());
lensgeom = Gtk::manage (new LensGeometry ());
lensProf = Gtk::manage (new LensProfilePanel ());
lensProf->setLensGeomRef(lensgeom);
distortion = Gtk::manage (new Distortion ());
rotate = Gtk::manage (new Rotate ());
vibrance = Gtk::manage (new Vibrance ());
colorappearance = Gtk::manage (new ColorAppearance ());
whitebalance = Gtk::manage (new WhiteBalance ());
vignetting = Gtk::manage (new Vignetting ());
retinex = Gtk::manage (new Retinex ());
retinex = Gtk::manage (new Retinex ());
gradient = Gtk::manage (new Gradient ());
pcvignette = Gtk::manage (new PCVignette ());
perspective = Gtk::manage (new PerspCorrection ());
@@ -72,8 +71,10 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(nullptr), hasChanged(false),
prsharpening = Gtk::manage (new PrSharpening());
crop = Gtk::manage (new Crop ());
icm = Gtk::manage (new ICMPanel ());
exifpanel = Gtk::manage (new ExifPanel ());
iptcpanel = Gtk::manage (new IPTCPanel ());
if(!batch) {
exifpanel = Gtk::manage (new ExifPanel ());
iptcpanel = Gtk::manage (new IPTCPanel ());
}
wavelet = Gtk::manage (new Wavelet ());
dirpyrequalizer = Gtk::manage (new DirPyrEqualizer ());
hsvequalizer = Gtk::manage (new HSVEqualizer ());
@@ -90,6 +91,7 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(nullptr), hasChanged(false),
rawexposure = Gtk::manage (new RAWExposure ());
bayerrawexposure = Gtk::manage (new BayerRAWExposure ());
xtransrawexposure = Gtk::manage (new XTransRAWExposure ());
fattal = Gtk::manage (new FattalToneMapping ());
// So Demosaic, Line noise filter, Green Equilibration, Ca-Correction (garder le nom de section identique!) and Black-Level will be moved in a "Bayer sensor" tool,
// and a separate Demosaic and Black Level tool will be created in an "X-Trans sensor" tool
@@ -101,113 +103,70 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(nullptr), hasChanged(false),
// Medium -> High ISO
addPanel (colorPanel, whitebalance);
toolPanels.push_back (whitebalance);
addPanel (exposurePanel, toneCurve);
toolPanels.push_back (toneCurve);
addPanel (colorPanel, vibrance);
toolPanels.push_back (vibrance);
addPanel (colorPanel, chmixer);
toolPanels.push_back (chmixer); // << TODO: Add "Enabled"
addPanel (colorPanel, blackwhite);
toolPanels.push_back (blackwhite);
addPanel (exposurePanel, shadowshighlights);
toolPanels.push_back (shadowshighlights);
addPanel (detailsPanel, spot);
toolPanels.push_back (spot);
addPanel (detailsPanel, sharpening);
toolPanels.push_back (sharpening);
addPanel (detailsPanel, sharpenEdge);
toolPanels.push_back (sharpenEdge);
addPanel (detailsPanel, sharpenMicro);
toolPanels.push_back (sharpenMicro);
addPanel (colorPanel, hsvequalizer);
toolPanels.push_back (hsvequalizer); // << TODO: Add "Enabled"
addPanel (colorPanel, filmSimulation);
toolPanels.push_back (filmSimulation);
addPanel (colorPanel, rgbcurves);
toolPanels.push_back (rgbcurves); // << TODO: Add "Enabled"
addPanel (colorPanel, colortoning);
toolPanels.push_back (colortoning);
addPanel (exposurePanel, epd);
toolPanels.push_back (epd);
addPanel (exposurePanel, fattal);
addPanel (exposurePanel, retinex);
toolPanels.push_back (retinex);
addPanel (exposurePanel, pcvignette);
toolPanels.push_back (pcvignette);
addPanel (exposurePanel, gradient);
toolPanels.push_back (gradient);
addPanel (exposurePanel, lcurve);
toolPanels.push_back (lcurve); // << TODO: Add "Enabled" ???
addPanel (exposurePanel, colorappearance);
toolPanels.push_back (colorappearance);
addPanel (detailsPanel, impulsedenoise);
toolPanels.push_back (impulsedenoise);
addPanel (detailsPanel, dirpyrdenoise);
toolPanels.push_back (dirpyrdenoise);
addPanel (detailsPanel, defringe);
toolPanels.push_back (defringe);
addPanel (detailsPanel, dirpyrequalizer);
toolPanels.push_back (dirpyrequalizer);
addPanel (waveletPanel, wavelet);
toolPanels.push_back (wavelet);
addPanel (transformPanel, crop);
toolPanels.push_back (crop);
addPanel (transformPanel, resize);
toolPanels.push_back (resize);
addPanel (resize->getPackBox(), prsharpening, 2);
toolPanels.push_back (prsharpening);
addPanel (transformPanel, lensgeom);
toolPanels.push_back (lensgeom);
addPanel (lensgeom->getPackBox(), rotate, 2);
toolPanels.push_back (rotate);
addPanel (lensgeom->getPackBox(), perspective, 2);
toolPanels.push_back (perspective);
addPanel (lensgeom->getPackBox(), lensProf, 2);
toolPanels.push_back (lensProf);
addPanel (lensgeom->getPackBox(), distortion, 2);
toolPanels.push_back (distortion);
addPanel (lensgeom->getPackBox(), cacorrection, 2);
toolPanels.push_back (cacorrection);
addPanel (lensgeom->getPackBox(), vignetting, 2);
toolPanels.push_back (vignetting);
addPanel (colorPanel, icm);
toolPanels.push_back (icm);
addPanel (rawPanel, sensorbayer);
toolPanels.push_back (sensorbayer);
addPanel (sensorbayer->getPackBox(), bayerprocess, 2);
toolPanels.push_back (bayerprocess);
addPanel (sensorbayer->getPackBox(), bayerrawexposure, 2);
toolPanels.push_back (bayerrawexposure);
addPanel (sensorbayer->getPackBox(), bayerpreprocess, 2);
toolPanels.push_back (bayerpreprocess);
addPanel (sensorbayer->getPackBox(), rawcacorrection, 2);
toolPanels.push_back (rawcacorrection);
addPanel (rawPanel, sensorxtrans);
toolPanels.push_back (sensorxtrans);
addPanel (sensorxtrans->getPackBox(), xtransprocess, 2);
toolPanels.push_back (xtransprocess);
addPanel (sensorxtrans->getPackBox(), xtransrawexposure, 2);
toolPanels.push_back (xtransrawexposure);
addPanel (rawPanel, rawexposure);
toolPanels.push_back (rawexposure);
addPanel (rawPanel, preprocess);
toolPanels.push_back (preprocess);
addPanel (rawPanel, darkframe);
toolPanels.push_back (darkframe);
addPanel (rawPanel, flatfield);
toolPanels.push_back (flatfield);
toolPanels.push_back (coarse);
toolPanels.push_back (exifpanel);
toolPanels.push_back (iptcpanel);
metadataPanel = Gtk::manage (new Gtk::Notebook ());
metadataPanel->set_name ("MetaPanelNotebook");
if(!batch) {
toolPanels.push_back (exifpanel);
toolPanels.push_back (iptcpanel);
metadataPanel = Gtk::manage (new Gtk::Notebook ());
metadataPanel->set_name ("MetaPanelNotebook");
metadataPanel->append_page (*exifpanel, M ("MAIN_TAB_EXIF"));
metadataPanel->append_page (*iptcpanel, M ("MAIN_TAB_IPTC"));
} else {
metadataPanel = nullptr;
}
toolPanelNotebook = new Gtk::Notebook ();
toolPanelNotebook->set_name ("ToolPanelNotebook");
metadataPanel->append_page (*exifpanel, M("MAIN_TAB_EXIF"));
metadataPanel->append_page (*iptcpanel, M("MAIN_TAB_IPTC"));
exposurePanelSW = Gtk::manage (new MyScrolledWindow ());
detailsPanelSW = Gtk::manage (new MyScrolledWindow ());
@@ -220,47 +179,51 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(nullptr), hasChanged(false),
// load panel endings
for (int i = 0; i < 6; i++) {
vbPanelEnd[i] = Gtk::manage (new Gtk::VBox ());
imgPanelEnd[i] = Gtk::manage (new RTImage("PanelEnding.png"));
imgPanelEnd[i] = Gtk::manage (new RTImage ("PanelEnding.png"));
imgPanelEnd[i]->show ();
vbPanelEnd[i]->pack_start (*imgPanelEnd[i], Gtk::PACK_SHRINK);
vbPanelEnd[i]->show_all();
}
exposurePanelSW->add (*exposurePanel);
exposurePanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
exposurePanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
exposurePanel->pack_start (*vbPanelEnd[0], Gtk::PACK_SHRINK, 4);
detailsPanelSW->add (*detailsPanel);
detailsPanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
detailsPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
detailsPanel->pack_start (*vbPanelEnd[1], Gtk::PACK_SHRINK, 4);
colorPanelSW->add (*colorPanel);
colorPanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
colorPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
colorPanel->pack_start (*vbPanelEnd[2], Gtk::PACK_SHRINK, 4);
waveletPanelSW->add (*waveletPanel);
waveletPanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
waveletPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
waveletPanel->pack_start (*vbPanelEnd[5], Gtk::PACK_SHRINK, 0);
transformPanelSW->add (*transformPanel);
transformPanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
transformPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
transformPanel->pack_start (*vbPanelEnd[3], Gtk::PACK_SHRINK, 4);
rawPanelSW->add (*rawPanel);
rawPanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
rawPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
rawPanel->pack_start (*vbPanelEnd[4], Gtk::PACK_SHRINK, 0);
TOITypes type = options.UseIconNoText ? TOI_ICON : TOI_TEXT;
toiE = Gtk::manage (new TextOrIcon ("exposure.png" , M("MAIN_TAB_EXPOSURE") , M("MAIN_TAB_EXPOSURE_TOOLTIP") , type));
toiD = Gtk::manage (new TextOrIcon ("detail.png" , M("MAIN_TAB_DETAIL") , M("MAIN_TAB_DETAIL_TOOLTIP") , type));
toiC = Gtk::manage (new TextOrIcon ("colour.png" , M("MAIN_TAB_COLOR") , M("MAIN_TAB_COLOR_TOOLTIP") , type));
toiW = Gtk::manage (new TextOrIcon ("wavelet.png" , M("MAIN_TAB_WAVELET") , M("MAIN_TAB_WAVELET_TOOLTIP") , type));
toiT = Gtk::manage (new TextOrIcon ("transform.png", M("MAIN_TAB_TRANSFORM"), M("MAIN_TAB_TRANSFORM_TOOLTIP"), type));
toiR = Gtk::manage (new TextOrIcon ("raw.png" , M("MAIN_TAB_RAW") , M("MAIN_TAB_RAW_TOOLTIP") , type));
toiM = Gtk::manage (new TextOrIcon ("meta.png" , M("MAIN_TAB_METADATA") , M("MAIN_TAB_METADATA_TOOLTIP") , type));
toiE = Gtk::manage (new TextOrIcon ("exposure.png", M ("MAIN_TAB_EXPOSURE"), M ("MAIN_TAB_EXPOSURE_TOOLTIP"), type));
toiD = Gtk::manage (new TextOrIcon ("detail.png", M ("MAIN_TAB_DETAIL"), M ("MAIN_TAB_DETAIL_TOOLTIP"), type));
toiC = Gtk::manage (new TextOrIcon ("colour.png", M ("MAIN_TAB_COLOR"), M ("MAIN_TAB_COLOR_TOOLTIP"), type));
toiW = Gtk::manage (new TextOrIcon ("wavelet.png", M ("MAIN_TAB_WAVELET"), M ("MAIN_TAB_WAVELET_TOOLTIP"), type));
toiT = Gtk::manage (new TextOrIcon ("transform.png", M ("MAIN_TAB_TRANSFORM"), M ("MAIN_TAB_TRANSFORM_TOOLTIP"), type));
toiR = Gtk::manage (new TextOrIcon ("raw.png", M ("MAIN_TAB_RAW"), M ("MAIN_TAB_RAW_TOOLTIP"), type));
if(!batch) {
toiM = Gtk::manage (new TextOrIcon ("meta.png", M ("MAIN_TAB_METADATA"), M ("MAIN_TAB_METADATA_TOOLTIP"), type));
} else {
toiM = nullptr;
}
toolPanelNotebook->append_page (*exposurePanelSW, *toiE);
toolPanelNotebook->append_page (*detailsPanelSW, *toiD);
@@ -268,7 +231,9 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(nullptr), hasChanged(false),
toolPanelNotebook->append_page (*waveletPanelSW, *toiW);
toolPanelNotebook->append_page (*transformPanelSW, *toiT);
toolPanelNotebook->append_page (*rawPanelSW, *toiR);
toolPanelNotebook->append_page (*metadataPanel, *toiM);
if(!batch) {
toolPanelNotebook->append_page (*metadataPanel, *toiM);
}
toolPanelNotebook->set_current_page (0);
@@ -290,17 +255,18 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(nullptr), hasChanged(false),
icm->setICMPanelListener (this);
toolBar = new ToolBar ();
toolBar->setToolBarListener(this);
toolBar->setToolBarListener (this);
}
void ToolPanelCoordinator::addPanel (Gtk::Box* where, FoldableToolPanel* panel, int level)
{
panel->setParent(where);
panel->setLevel(level);
panel->setParent (where);
panel->setLevel (level);
expList.push_back (panel->getExpander());
where->pack_start(*panel->getExpander(), false, false);
where->pack_start (*panel->getExpander(), false, false);
toolPanels.push_back (panel);
}
ToolPanelCoordinator::~ToolPanelCoordinator ()
@@ -312,12 +278,13 @@ ToolPanelCoordinator::~ToolPanelCoordinator ()
delete toolBar;
}
void ToolPanelCoordinator::imageTypeChanged(bool isRaw, bool isBayer, bool isXtrans)
void ToolPanelCoordinator::imageTypeChanged (bool isRaw, bool isBayer, bool isXtrans)
{
GThreadLock lock;
if(isRaw) {
rawPanelSW->set_sensitive(true);
if (isRaw) {
rawPanelSW->set_sensitive (true);
if (isBayer) {
sensorxtrans->FoldableToolPanel::hide();
sensorbayer->FoldableToolPanel::show();
@@ -335,7 +302,7 @@ void ToolPanelCoordinator::imageTypeChanged(bool isRaw, bool isBayer, bool isXtr
flatfield->FoldableToolPanel::hide();
}
} else {
rawPanelSW->set_sensitive(false);
rawPanelSW->set_sensitive (false);
}
}
@@ -348,7 +315,7 @@ void ToolPanelCoordinator::panelChanged (rtengine::ProcEvent event, const Glib::
return;
}
int changeFlags = refreshmap[(int)event];
int changeFlags = refreshmap[ (int)event];
ProcParams* params = ipc->beginUpdateParams ();
@@ -358,14 +325,15 @@ void ToolPanelCoordinator::panelChanged (rtengine::ProcEvent event, const Glib::
// Compensate rotation on flip
if (event == rtengine::EvCTHFlip || event == rtengine::EvCTVFlip) {
if (fabs(params->rotate.degree) > 0.001) {
if (fabs (params->rotate.degree) > 0.001) {
params->rotate.degree *= -1;
changeFlags |= refreshmap[(int)rtengine::EvROTDegree];
changeFlags |= refreshmap[ (int)rtengine::EvROTDegree];
rotate->read (params);
}
}
int tr = TR_NONE;
if (params->coarse.rotate == 90) {
tr = TR_R90;
} else if (params->coarse.rotate == 180) {
@@ -430,14 +398,14 @@ void ToolPanelCoordinator::profileChange (const PartialProfile *nparams, rtengi
}
// And apply the partial profile nparams to mergedParams
nparams->applyTo(mergedParams);
nparams->applyTo (mergedParams);
// Derive the effective changes, if it's a profile change, to prevent slow RAW rerendering if not necessary
bool filterRawRefresh = false;
if (event != rtengine::EvPhotoLoaded) {
ParamsEdited pe(true);
std::vector<rtengine::procparams::ProcParams> lParams(2);
ParamsEdited pe (true);
std::vector<rtengine::procparams::ProcParams> lParams (2);
lParams[0] = *params;
lParams[1] = *mergedParams;
pe.initFrom (lParams);
@@ -449,6 +417,7 @@ void ToolPanelCoordinator::profileChange (const PartialProfile *nparams, rtengi
delete mergedParams;
tr = TR_NONE;
if (params->coarse.rotate == 90) {
tr = TR_R90;
} else if (params->coarse.rotate == 180) {
@@ -459,7 +428,7 @@ void ToolPanelCoordinator::profileChange (const PartialProfile *nparams, rtengi
// trimming overflowing cropped area
ipc->getInitialImage()->getImageSource()->getFullSize (fw, fh, tr);
crop->trim(params, fw, fh);
crop->trim (params, fw, fh);
// updating the GUI with updated values
for (auto toolPanel : toolPanels) {
@@ -477,7 +446,7 @@ void ToolPanelCoordinator::profileChange (const PartialProfile *nparams, rtengi
// start the IPC processing
if (filterRawRefresh) {
ipc->endUpdateParams ( refreshmap[(int)event] & ALLNORAW );
ipc->endUpdateParams ( refreshmap[ (int)event] & ALLNORAW );
} else {
ipc->endUpdateParams (event);
}
@@ -513,7 +482,7 @@ void ToolPanelCoordinator::initImage (rtengine::StagedImageProcessor* ipc_, bool
toneCurve->enableListener ();
if (ipc) {
const rtengine::ImageMetaData* pMetaData = ipc->getInitialImage()->getMetaData();
const rtengine::FramesMetaData* pMetaData = ipc->getInitialImage()->getMetaData();
exifpanel->setImageData (pMetaData);
iptcpanel->setImageData (pMetaData);
@@ -529,9 +498,9 @@ void ToolPanelCoordinator::initImage (rtengine::StagedImageProcessor* ipc_, bool
ipc->setSizeListener (crop);
ipc->setSizeListener (resize);
ipc->setImageTypeListener (this);
flatfield->setShortcutPath(Glib::path_get_dirname(ipc->getInitialImage()->getFileName()));
flatfield->setShortcutPath (Glib::path_get_dirname (ipc->getInitialImage()->getFileName()));
icm->setRawMeta (raw, (const rtengine::ImageData*)pMetaData);
icm->setRawMeta (raw, (const rtengine::FramesData*)pMetaData);
lensProf->setRawMeta (raw, pMetaData);
}
@@ -555,7 +524,7 @@ void ToolPanelCoordinator::closeAllTools()
for (size_t i = 0; i < options.tpOpen.size(); i++)
if (i < expList.size()) {
expList.at(i)->set_expanded (false);
expList.at (i)->set_expanded (false);
}
}
@@ -564,7 +533,7 @@ void ToolPanelCoordinator::openAllTools()
for (size_t i = 0; i < options.tpOpen.size(); i++)
if (i < expList.size()) {
expList.at(i)->set_expanded (true);
expList.at (i)->set_expanded (true);
}
}
@@ -573,20 +542,20 @@ void ToolPanelCoordinator::updateToolState()
for (size_t i = 0; i < options.tpOpen.size(); i++)
if (i < expList.size()) {
expList.at(i)->set_expanded (options.tpOpen.at(i));
expList.at (i)->set_expanded (options.tpOpen.at (i));
}
if(options.tpOpen.size() > expList.size()) {
if (options.tpOpen.size() > expList.size()) {
size_t sizeWavelet = options.tpOpen.size() - expList.size();
std::vector<int> temp;
for (size_t i = 0; i < sizeWavelet; i++) {
temp.push_back(options.tpOpen.at(i + expList.size()));
temp.push_back (options.tpOpen.at (i + expList.size()));
}
wavelet->updateToolState(temp);
wavelet->setExpanded(true);
retinex->updateToolState(temp);
wavelet->updateToolState (temp);
wavelet->setExpanded (true);
retinex->updateToolState (temp);
}
}
@@ -600,14 +569,23 @@ void ToolPanelCoordinator::writeOptions ()
{
crop->writeOptions ();
options.tpOpen.clear ();
if (options.autoSaveTpOpen) {
writeToolExpandedStatus (options.tpOpen);
}
}
void ToolPanelCoordinator::writeToolExpandedStatus (std::vector<int> &tpOpen)
{
tpOpen.clear ();
for (size_t i = 0; i < expList.size(); i++) {
options.tpOpen.push_back (expList.at(i)->get_expanded ());
tpOpen.push_back (expList.at (i)->get_expanded ());
}
wavelet->writeOptions(options.tpOpen);
retinex->writeOptions(options.tpOpen);
wavelet->writeOptions (tpOpen);
retinex->writeOptions (tpOpen);
}
@@ -680,16 +658,16 @@ rtengine::RawImage* ToolPanelCoordinator::getDF()
return nullptr;
}
const rtengine::ImageMetaData *imd = ipc->getInitialImage()->getMetaData();
const rtengine::FramesMetaData *imd = ipc->getInitialImage()->getMetaData();
if(imd) {
if (imd) {
int iso = imd->getISOSpeed();
double shutter = imd->getShutterSpeed();
std::string maker( imd->getMake() );
std::string model( imd->getModel() );
std::string maker ( imd->getMake() );
std::string model ( imd->getModel() );
time_t timestamp = imd->getDateTimeAsTS();
return rtengine::dfm.searchDarkFrame( maker, model, iso, shutter, timestamp);
return rtengine::dfm.searchDarkFrame ( maker, model, iso, shutter, timestamp);
}
return nullptr;
@@ -701,19 +679,19 @@ rtengine::RawImage* ToolPanelCoordinator::getFF()
return nullptr;
}
const rtengine::ImageMetaData *imd = ipc->getInitialImage()->getMetaData();
const rtengine::FramesMetaData *imd = ipc->getInitialImage()->getMetaData();
if(imd) {
if (imd) {
// int iso = imd->getISOSpeed(); temporarilly removed because unused
// double shutter = imd->getShutterSpeed(); temporarilly removed because unused
double aperture = imd->getFNumber();
double focallength = imd->getFocalLen();
std::string maker( imd->getMake() );
std::string model( imd->getModel() );
std::string lens( imd->getLens() );
std::string maker ( imd->getMake() );
std::string model ( imd->getModel() );
std::string lens ( imd->getLens() );
time_t timestamp = imd->getDateTimeAsTS();
return rtengine::ffm.searchFlatField( maker, model, lens, focallength, aperture, timestamp);
return rtengine::ffm.searchFlatField ( maker, model, lens, focallength, aperture, timestamp);
}
return nullptr;
@@ -786,8 +764,8 @@ void ToolPanelCoordinator::updateCurveBackgroundHistogram (LUTu & histToneCurve,
colorappearance->updateCurveBackgroundHistogram (histToneCurve, histLCurve, histCCurve, /*histCLurve, histLLCurve,*/ histLCAM, histCCAM, histRed, histGreen, histBlue, histLuma, histLRETI);
toneCurve->updateCurveBackgroundHistogram (histToneCurve, histLCurve, histCCurve,/* histCLurve, histLLCurve,*/ histLCAM, histCCAM, histRed, histGreen, histBlue, histLuma, histLRETI);
lcurve->updateCurveBackgroundHistogram (histToneCurve, histLCurve, histCCurve, /*histCLurve, histLLCurve,*/ histLCAM, histCCAM, histRed, histGreen, histBlue, histLuma, histLRETI);
rgbcurves->updateCurveBackgroundHistogram(histToneCurve, histLCurve, histCCurve,/* histCLurve, histLLCurve, */histLCAM, histCCAM, histRed, histGreen, histBlue, histLuma, histLRETI);
retinex->updateCurveBackgroundHistogram(histToneCurve, histLCurve, histCCurve,/* histCLurve, histLLCurve, */histLCAM, histCCAM, histRed, histGreen, histBlue, histLuma, histLRETI);
rgbcurves->updateCurveBackgroundHistogram (histToneCurve, histLCurve, histCCurve,/* histCLurve, histLLCurve, */histLCAM, histCCAM, histRed, histGreen, histBlue, histLuma, histLRETI);
retinex->updateCurveBackgroundHistogram (histToneCurve, histLCurve, histCCurve,/* histCLurve, histLLCurve, */histLCAM, histCCAM, histRed, histGreen, histBlue, histLuma, histLRETI);
}
@@ -801,10 +779,10 @@ void ToolPanelCoordinator::foldAllButOne (Gtk::Box* parent, FoldableToolPanel* o
if (currentTP->getParent() == parent) {
// Section in the same tab, we unfold it if it's not the one that has been clicked
if (currentTP != openedSection) {
currentTP->setExpanded(false);
currentTP->setExpanded (false);
} else {
if (!currentTP->getExpanded()) {
currentTP->setExpanded(true);
currentTP->setExpanded (true);
}
}
}
@@ -820,36 +798,36 @@ bool ToolPanelCoordinator::handleShortcutKey (GdkEventKey* event)
bool alt = event->state & GDK_MOD1_MASK;
if (alt) {
switch(event->keyval) {
case GDK_KEY_e:
toolPanelNotebook->set_current_page (toolPanelNotebook->page_num(*exposurePanelSW));
return true;
case GDK_KEY_d:
toolPanelNotebook->set_current_page (toolPanelNotebook->page_num(*detailsPanelSW));
return true;
case GDK_KEY_c:
toolPanelNotebook->set_current_page (toolPanelNotebook->page_num(*colorPanelSW));
return true;
case GDK_KEY_t:
toolPanelNotebook->set_current_page (toolPanelNotebook->page_num(*transformPanelSW));
return true;
case GDK_KEY_r:
toolPanelNotebook->set_current_page (toolPanelNotebook->page_num(*rawPanelSW));
return true;
case GDK_KEY_w:
toolPanelNotebook->set_current_page (toolPanelNotebook->page_num(*waveletPanelSW));
return true;
case GDK_KEY_m:
if (metadataPanel) {
toolPanelNotebook->set_current_page (toolPanelNotebook->page_num(*metadataPanel));
switch (event->keyval) {
case GDK_KEY_e:
toolPanelNotebook->set_current_page (toolPanelNotebook->page_num (*exposurePanelSW));
return true;
}
case GDK_KEY_d:
toolPanelNotebook->set_current_page (toolPanelNotebook->page_num (*detailsPanelSW));
return true;
case GDK_KEY_c:
toolPanelNotebook->set_current_page (toolPanelNotebook->page_num (*colorPanelSW));
return true;
case GDK_KEY_t:
toolPanelNotebook->set_current_page (toolPanelNotebook->page_num (*transformPanelSW));
return true;
case GDK_KEY_r:
toolPanelNotebook->set_current_page (toolPanelNotebook->page_num (*rawPanelSW));
return true;
case GDK_KEY_w:
toolPanelNotebook->set_current_page (toolPanelNotebook->page_num (*waveletPanelSW));
return true;
case GDK_KEY_m:
if (metadataPanel) {
toolPanelNotebook->set_current_page (toolPanelNotebook->page_num (*metadataPanel));
return true;
}
}
}
@@ -868,7 +846,7 @@ void ToolPanelCoordinator::updateVScrollbars (bool hide)
waveletPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy);
for (auto currExp : expList) {
currExp->updateVScrollbars(hide);
currExp->updateVScrollbars (hide);
}
}
@@ -877,14 +855,14 @@ void ToolPanelCoordinator::updateTabsHeader (bool useIcons)
GThreadLock lock; // All GUI acces from idle_add callbacks or separate thread HAVE to be protected
TOITypes type = useIcons ? TOI_ICON : TOI_TEXT;
toiE->switchTo(type);
toiD->switchTo(type);
toiC->switchTo(type);
toiT->switchTo(type);
toiR->switchTo(type);
toiE->switchTo (type);
toiD->switchTo (type);
toiC->switchTo (type);
toiT->switchTo (type);
toiR->switchTo (type);
if (toiM) {
toiM->switchTo(type);
toiM->switchTo (type);
}
}
@@ -903,24 +881,24 @@ void ToolPanelCoordinator::toolSelected (ToolMode tool)
GThreadLock lock; // All GUI acces from idle_add callbacks or separate thread HAVE to be protected
switch (tool) {
case TMCropSelect:
crop->setExpanded(true);
toolPanelNotebook->set_current_page(toolPanelNotebook->page_num(*transformPanelSW));
break;
case TMCropSelect:
crop->setExpanded (true);
toolPanelNotebook->set_current_page (toolPanelNotebook->page_num (*transformPanelSW));
break;
case TMSpotWB:
whitebalance->setExpanded(true);
toolPanelNotebook->set_current_page(toolPanelNotebook->page_num(*colorPanelSW));
break;
case TMSpotWB:
whitebalance->setExpanded (true);
toolPanelNotebook->set_current_page (toolPanelNotebook->page_num (*colorPanelSW));
break;
case TMStraighten:
lensgeom->setExpanded(true);
rotate->setExpanded(true);
toolPanelNotebook->set_current_page(toolPanelNotebook->page_num(*transformPanelSW));
break;
case TMStraighten:
lensgeom->setExpanded (true);
rotate->setExpanded (true);
toolPanelNotebook->set_current_page (toolPanelNotebook->page_num (*transformPanelSW));
break;
default:
break;
default:
break;
}
}
@@ -934,14 +912,14 @@ void ToolPanelCoordinator::editModeSwitchedOff ()
void ToolPanelCoordinator::dirSelected (const Glib::ustring& dirname, const Glib::ustring& openfile)
{
flatfield->setShortcutPath(dirname);
flatfield->setShortcutPath (dirname);
}
void ToolPanelCoordinator::setEditProvider(EditDataProvider *provider)
void ToolPanelCoordinator::setEditProvider (EditDataProvider *provider)
{
editDataProvider = provider;
for (size_t i = 0; i < toolPanels.size(); i++) {
toolPanels.at(i)->setEditProvider(provider);
toolPanels.at (i)->setEditProvider (provider);
}
}