Added better handling of failures loading icons, as Cairo generated exception were crashing app under windows. Minor fix to handling missing processing params to not alter the global defaults.

rtgui/toolpanelcoord.h

@@ -0,0 +1,162 @@
+/*
+ *  This file is part of RawTherapee.
+ *
+ *  Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
+ *
+ *  RawTherapee is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  RawTherapee is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef __TOOLPANELCCORD__
+#define __TOOLPANELCCORD__
+
+#include <rtengine.h>
+#include <toolpanel.h>
+#include <vector>
+#include <pparamschangelistener.h>
+#include <profilechangelistener.h>
+#include <imageareatoollistener.h>
+#include <gtkmm.h>
+#include <whitebalance.h>
+#include <colorboost.h>
+#include <coarsepanel.h>
+#include <tonecurve.h>
+#include <shadowshighlights.h>
+#include <lumadenoise.h>
+#include <colordenoise.h>
+#include <sharpening.h>
+#include <lcurve.h>
+#include <exifpanel.h>
+#include <iptcpanel.h>
+#include <crop.h>
+#include <icmpanel.h>
+#include <resize.h>
+#include <chmixer.h>
+#include <hlrec.h>
+#include <colorshift.h>
+#include <cacorrection.h>
+#include <distortion.h>
+#include <rotate.h>
+#include <vignetting.h>
+#include <toolbar.h>
+
+class ImageEditorCoordinator;
+
+class ToolPanelCoordinator :    public ToolPanelListener, 
+                                public ProfileChangeListener, 
+                                public WBProvider,
+                                public RotateListener,
+                                public SpotWBListener,
+                                public CropPanelListener,
+                                public ICMPanelListener,
+                                public ImageAreaToolListener {
+
+    protected:
+        
+        WhiteBalance* whitebalance;
+        Vignetting* vignetting;
+        Rotate* rotate;
+        Distortion* distortion;
+        CACorrection* cacorrection;
+        ColorShift* colorshift;
+        HLRecovery* hlrecovery;
+        ChMixer* chmixer;
+        ColorBoost* colorboost;
+        Resize* resize;
+        ICMPanel* icm;
+        Crop* crop;
+        ToneCurve* curve;
+        ShadowsHighlights* shadowshighlights;
+        LumaDenoise* lumadenoise;
+        ColorDenoise* colordenoise;
+        Sharpening* sharpening;
+        LCurve* lcurve;
+
+        std::vector<PParamsChangeListener*> paramcListeners;
+
+        rtengine::StagedImageProcessor* ipc;
+
+        std::vector<ToolPanel*> toolPanels;
+        Gtk::VBox* exposurePanel;
+        Gtk::VBox* detailsPanel;
+        Gtk::VBox* colorPanel;
+        Gtk::VBox* transformPanel;
+        Gtk::Notebook* metadataPanel;
+        ExifPanel* exifpanel;
+        IPTCPanel* iptcpanel;
+        ToolBar* toolBar;
+
+        std::vector<Gtk::Expander*> expList;
+        
+        bool hasChanged;
+
+        void addPanel (Gtk::Box* where, Gtk::Container* panel, Glib::ustring label);
+
+    public:
+    
+        CoarsePanel* coarse;
+        Gtk::Notebook* toolPanelNotebook;
+
+        ToolPanelCoordinator ();
+        ~ToolPanelCoordinator ();
+
+        bool getChangedState                ()                                      { return hasChanged; }
+        void updateCurveBackgroundHistogram (unsigned* histrgb, unsigned* histl);
+
+        // multiple listeners can be added that are notified on changes (typical: profile panel and the history)
+        void addPParamsChangeListener   (PParamsChangeListener* pp) { paramcListeners.push_back (pp); }
+        
+        // toolpanellistener interface
+        void panelChanged   (rtengine::ProcEvent event, const Glib::ustring& descr);
+
+        // profilechangelistener interface
+        void profileChange  (const rtengine::procparams::ProcParams* nparams, rtengine::ProcEvent event, const Glib::ustring& descr, const ParamsEdited* paramsEdited=NULL);    
+        void setDefaults    (rtengine::procparams::ProcParams* defparams);
+
+        // to support the GUI:
+        CropGUIListener* getCropGUIListener (); // through the CropGUIListener the editor area can notify the "crop" ToolPanel when the crop selection changes
+        
+        // init the toolpanelcoordinator with an image & close it        
+        void initImage          (rtengine::StagedImageProcessor* ipc_, bool israw);
+        void closeImage         ();
+
+        // read/write the "expanded" state of the expanders & read/write the crop panel settings (ratio, guide type, etc.)
+        void readOptions        ();
+        void writeOptions       ();       
+
+        // wbprovider interface
+        void getAutoWB (double& temp, double& green) { if (ipc) ipc->getAutoWB (temp, green); }
+        void getCamWB (double& temp, double& green)  { if (ipc) ipc->getCamWB (temp, green); }
+
+        // rotatelistener interface
+        void straightenRequested ();
+        void autoCropRequested ();
+
+        // spotwblistener interface
+        void spotWBRequested (int size);
+
+        // croppanellistener interface
+        void cropSelectRequested ();
+        
+        // icmpanellistener interface
+        void saveInputICCReference (Glib::ustring fname);
+    
+        // imageareatoollistener interface
+        void spotWBselected (int x, int y, Thumbnail* thm=NULL);
+        void cropSelectionReady ();
+        void rotateSelectionReady (double rotate_deg, Thumbnail* thm=NULL);
+        ToolBar* getToolBar () { return toolBar; }
+        int  getSpotWBRectSize ();
+        CropGUIListener* startCropEditing (Thumbnail* thm=NULL) { return crop; }
+};
+
+#endif