diff --git a/rtdata/options/options.lin b/rtdata/options/options.lin index da99dda5d..e02431966 100644 --- a/rtdata/options/options.lin +++ b/rtdata/options/options.lin @@ -69,8 +69,8 @@ WindowWidth=1000 WindowHeight=900 WindowMaximized=false FileBrowserHeight=250 -ToolPanelWidth=750 -BrowserToolPanelWidth=750 +ToolPanelWidth=300 +BrowserToolPanelWidth=300 HistoryPanelWidth=230 LastPreviewScale=5 LastCropSize=1 diff --git a/rtdata/options/options.osx b/rtdata/options/options.osx index 713b57509..005fd0064 100644 --- a/rtdata/options/options.osx +++ b/rtdata/options/options.osx @@ -69,9 +69,9 @@ WindowWidth=1000 WindowHeight=900 WindowMaximized=false FileBrowserHeight=250 -ToolPanelWidth=750 -BrowserToolPanelWidth=750 -HistoryPanelWidth=230 +ToolPanelWidth=300 +BrowserToolPanelWidth=300 +HistoryPanelWidth=200 LastPreviewScale=5 LastCropSize=1 ShowHistory=true diff --git a/rtdata/options/options.win b/rtdata/options/options.win index ce04942cc..9975d8e34 100644 --- a/rtdata/options/options.win +++ b/rtdata/options/options.win @@ -69,8 +69,8 @@ WindowWidth=1000 WindowHeight=900 WindowMaximized=false FileBrowserHeight=250 -ToolPanelWidth=750 -BrowserToolPanelWidth=750 +ToolPanelWidth=300 +BrowserToolPanelWidth=300 HistoryPanelWidth=230 LastPreviewScale=5 LastCropSize=1 diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc index e5d30cb53..1fd0d9740 100644 --- a/rtengine/rawimagesource.cc +++ b/rtengine/rawimagesource.cc @@ -903,7 +903,8 @@ int RawImageSource::load (Glib::ustring fname) { else if (settings->demosaicMethod=="vng4") vng4_demosaic (); else if (settings->demosaicMethod=="ahd") - ahd_demosaic (); + //ahd_demosaic (); + fast_demo (); else if (settings->demosaicMethod=="bilinear") bilinear_demosaic(); //else if (settings->demosaicMethod=="ppg") @@ -3215,6 +3216,7 @@ void RawImageSource::dcb_demosaic(int iterations, int dcb_enhance) //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% //Emil's code for AMaZE +#include "fast_demo.cc"//fast demosaic #include "amaze_interpolate_RT.cc"//AMaZE demosaic #include "CA_correct_RT.cc"//Emil's CA auto correction #include "cfa_linedn_RT.cc"//Emil's CA auto correction diff --git a/rtengine/rawimagesource.h b/rtengine/rawimagesource.h index e7464673c..0dd2bca47 100644 --- a/rtengine/rawimagesource.h +++ b/rtengine/rawimagesource.h @@ -138,21 +138,22 @@ class RawImageSource : public ImageSource { inline void interpolate_row_rb_mul_pp (unsigned short* ar, unsigned short* ab, unsigned short* pg, unsigned short* cg, unsigned short* ng, int i, double r_mul, double g_mul, double b_mul, int x1, int width, int skip); int LinEqSolve (int nDim, float* pfMatr, float* pfVect, float* pfSolution);//Emil's CA auto correction - void CA_correct_RT (); + void CA_correct_RT (); //Emil's pre-demosaic CA correction - void cfa_clean (float thresh);//Emil's hot/dead pixel filter - void ddct8x8s(int isgn, float **a); + void cfa_clean (float thresh); //Emil's hot/dead pixel filter + void ddct8x8s(int isgn, float **a); - void cfa_linedn (float linenoiselevel);//Emil's line denoise + void cfa_linedn (float linenoiselevel); //Emil's line denoise - void green_equilibrate (float greenthresh);//Emil's green equilibration + void green_equilibrate (float greenthresh);//Emil's green equilibration void eahd_demosaic (); void hphd_demosaic (); void vng4_demosaic (); void ppg_demosaic(); - void amaze_demosaic_RT ();//Emil's code for AMaZE + void amaze_demosaic_RT (); //Emil's code for AMaZE + void fast_demo (); //Emil's fast demosaic void dcb_demosaic(int iterations, int dcb_enhance); void ahd_demosaic(); void bilinear_demosaic(); diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc index affd133cb..71c739937 100644 --- a/rtgui/editorpanel.cc +++ b/rtgui/editorpanel.cc @@ -192,7 +192,7 @@ EditorPanel::EditorPanel () : beforePreviewHandler(NULL), beforeIarea(NULL), par hpanedr->pack1(*hpanedl, true, true); hpanedr->pack2(*vboxright, false, true); - hpanedr->set_position(options.toolPanelWidth); + //hpanedr->set_position(options.toolPanelWidth); pack_start (*hpanedr); show_all (); @@ -843,7 +843,8 @@ bool EditorPanel::idle_sentToGimp(ProgressConnector *pc,rtengine::IImage16* void EditorPanel::saveOptions () { options.historyPanelWidth = hpanedl->get_position (); - options.toolPanelWidth = hpanedr->get_position (); + options.toolPanelWidth = vboxright->get_width ();//older code + //options.toolPanelWidth = hpanedr->get_position ();//Hombre's change which screws up OSX build } void EditorPanel::historyBeforeLineChanged (const rtengine::procparams::ProcParams& params) { diff --git a/rtgui/filepanel.cc b/rtgui/filepanel.cc index ce6124039..fd12b3f36 100644 --- a/rtgui/filepanel.cc +++ b/rtgui/filepanel.cc @@ -101,7 +101,7 @@ FilePanel::FilePanel () : parent(NULL) { pack1(*dirpaned, true, true); pack2(*rightBox, true, true); - set_position(options.browserToolPanelWidth); + //set_position(options.browserToolPanelWidth);////Hombre's change which screws up OSX build fileCatalog->setFileSelectionChangeListener (tpc); diff --git a/rtgui/options.cc b/rtgui/options.cc index 482cadebb..a9ae17555 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -61,8 +61,8 @@ void Options::setDefaults () { profilePath = "profiles"; dirBrowserWidth = 200; dirBrowserHeight = 150; - toolPanelWidth = 700; - browserToolPanelWidth = 700; + toolPanelWidth = 300; + browserToolPanelWidth = 300; historyPanelWidth = 150; lastScale = 4; lastCropSize = 1; @@ -372,7 +372,7 @@ int Options::saveToFile (Glib::ustring fname) { keyFile.set_boolean ("Profiles", "SaveParamsToCache", saveParamsCache); keyFile.set_integer ("Profiles", "LoadParamsFromLocation", paramsLoadLocation); - keyFile.set_integer ("GUI", "WindowWidth", windowWidth); + keyFile.set_integer ("GUI", "WindowWidth", 1200);//windowWidth); keyFile.set_integer ("GUI", "WindowHeight", windowHeight); keyFile.set_boolean ("GUI", "WindowMaximized", windowMaximized); keyFile.set_integer ("GUI", "DirBrowserWidth", dirBrowserWidth); diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index da370d169..6fe86818c 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -266,7 +266,7 @@ Gtk::Widget* Preferences::getProcParamsPanel () { //dmethod->append_text ("PPG"); dmethod->append_text ("AMaZE");//Emil's code for AMaZE dmethod->append_text ("DCB"); - dmethod->append_text ("AHD"); + dmethod->append_text ("Fast Demosaic");//("AHD"); dmethod->append_text ("Bilinear"); Gtk::Label* cclab = Gtk::manage (new Gtk::Label (M("PREFERENCES_FALSECOLOR")+":")); ccSteps = Gtk::manage (new Gtk::SpinButton ());