Diff of /src/hugin1/hugin/huginApp.cpp [261128] .. [519868]  Maximize  Restore

  Switch to side-by-side view

--- a/src/hugin1/hugin/huginApp.cpp
+++ b/src/hugin1/hugin/huginApp.cpp
@@ -47,7 +47,6 @@
 #include "hugin/ImagesList.h"
 #include "hugin/PreviewPanel.h"
 #include "hugin/GLPreviewFrame.h"
-#include "base_wx/PTWXDlg.h"
 #include "hugin/CommandHistory.h"
 #include "hugin/wxPanoCommand.h"
 
@@ -116,9 +115,6 @@
     wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), 1);
 #endif
 
-    // register our custom pano tools dialog handlers
-    registerPTWXDlgFcn();
-
     // required by wxHtmlHelpController
     wxFileSystem::AddHandler(new wxZipFSHandler);
 
@@ -130,6 +126,7 @@
     wxFileName::SplitPath( huginExeDir, &huginRoot, NULL, NULL );
 
     m_xrcPrefix = huginRoot + wxT("/share/hugin/xrc/");
+	m_DataDir = huginRoot + wxT("/share/hugin/data/");
     m_utilsBinDir = huginRoot + wxT("/bin/");
 
     // locale setup
@@ -144,6 +141,7 @@
             return false;
         }
         m_xrcPrefix = thePath + wxT("/");
+        m_DataDir = thePath + wxT("/");
     }
 
     {
@@ -159,6 +157,7 @@
 #else
     // add the locale directory specified during configure
     m_xrcPrefix = wxT(INSTALL_XRC_DIR);
+    m_DataDir = wxT(INSTALL_DATA_DIR);
     locale.AddCatalogLookupPathPrefix(wxT(INSTALL_LOCALE_DIR));
 #endif
 
@@ -236,6 +235,7 @@
     wxXmlResource::Get()->Load(m_xrcPrefix + wxT("help.xrc"));
     wxXmlResource::Get()->Load(m_xrcPrefix + wxT("keyboard_help.xrc"));
     wxXmlResource::Get()->Load(m_xrcPrefix + wxT("pref_dialog.xrc"));
+    wxXmlResource::Get()->Load(m_xrcPrefix + wxT("cpdetector_dialog.xrc"));
     wxXmlResource::Get()->Load(m_xrcPrefix + wxT("reset_dialog.xrc"));
     wxXmlResource::Get()->Load(m_xrcPrefix + wxT("vig_corr_dlg.xrc"));
     wxXmlResource::Get()->Load(m_xrcPrefix + wxT("optimize_photo_panel.xrc"));
@@ -246,7 +246,6 @@
     wxXmlResource::Get()->Load(m_xrcPrefix + wxT("main_frame.xrc"));
     wxXmlResource::Get()->Load(m_xrcPrefix + wxT("optimize_panel.xrc"));
     wxXmlResource::Get()->Load(m_xrcPrefix + wxT("pano_panel.xrc"));
-    wxXmlResource::Get()->Load(m_xrcPrefix + wxT("masked_main_toolbar.xrc"));
 #endif
 
 #ifdef __WXMAC__
@@ -316,6 +315,9 @@
     opts.blendMode = PanoramaOptions::ENBLEND_BLEND;
     opts.enblendOptions = config->Read(wxT("Enblend/Args"),wxT(HUGIN_ENBLEND_ARGS)).mb_str(wxConvLocal);
     opts.enfuseOptions = config->Read(wxT("Enfuse/Args"),wxT(HUGIN_ENFUSE_ARGS)).mb_str(wxConvLocal);
+	opts.interpolator = (vigra_ext::Interpolator)config->Read(wxT("Nona/Interpolator"),HUGIN_NONA_INTERPOLATOR);
+	opts.remapUsingGPU = (bool)config->Read(wxT("Nona/useGPU"),HUGIN_NONA_USEGPU);
+	opts.tiff_saveROI = (bool)config->Read(wxT("Nona/CroppedImages"),HUGIN_NONA_CROPPEDIMAGES);
     pano.setOptions(opts);
 
     if (argc > 1) {

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks