Menu
▾
▴
[Hugin-cvs] SF.net SVN: hugin: [2117] hugin/branches/ippei/src/hugin_base/algorithms
|
From: <ip...@us...> - 2007-06-19 18:03:49
|
Revision: 2117
http://hugin.svn.sourceforge.net/hugin/?rev=2117&view=rev
Author: ippei
Date: 2007-06-19 11:03:12 -0700 (Tue, 19 Jun 2007)
Log Message:
-----------
algorithms overview
Modified Paths:
--------------
hugin/branches/ippei/src/hugin_base/algorithms/algorithms.txt
Added Paths:
-----------
hugin/branches/ippei/src/hugin_base/algorithms/to-be-added/NonaStitcherPanel.cpp
Removed Paths:
-------------
hugin/branches/ippei/src/hugin_base/algorithms/NonaStitcherPanel.cpp
Deleted: hugin/branches/ippei/src/hugin_base/algorithms/NonaStitcherPanel.cpp
===================================================================
--- hugin/branches/ippei/src/hugin_base/algorithms/NonaStitcherPanel.cpp 2007-06-19 17:59:31 UTC (rev 2116)
+++ hugin/branches/ippei/src/hugin_base/algorithms/NonaStitcherPanel.cpp 2007-06-19 18:03:12 UTC (rev 2117)
@@ -1,528 +0,0 @@
-// -*- c-basic-offset: 4 -*-
-
-/** @file NonaStitcherPanel.cpp
- *
- * @brief implementation of NonaStitcherPanel Class
- *
- * @author Kai-Uwe Behrmann <we...@ti...> and
- * Pablo d'Angelo <pab...@we...>
- *
- * $Id: NonaStitcherPanel.cpp 1950 2007-04-15 20:51:03Z dangelo $
- *
- * This program 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 2 of the License, or (at your option) any later version.
- *
- * This software 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 this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include <config.h>
-#include <errno.h>
-#include "panoinc_WX.h"
-
-#include "panoinc.h"
-
-#include "PT/Stitcher.h"
-
-#include "common/wxPlatform.h"
-#include "hugin/config_defaults.h"
-#include "hugin/RunStitcherFrame.h"
-#include "hugin/CommandHistory.h"
-#include "hugin/CPImageCtrl.h"
-#include "hugin/TextKillFocusHandler.h"
-#include "hugin/NonaStitcherPanel.h"
-#include "hugin/MainFrame.h"
-#include "hugin/huginApp.h"
-#include "hugin/MyProgressDialog.h"
-
-#include "hugin/MyExternalCmdExecDialog.h"
-
-using namespace PT;
-using namespace std;
-using namespace utils;
-
-//-----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(NonaStitcherPanel, wxWindow)
- EVT_CHOICE ( XRCID("nona_choice_interpolator"),NonaStitcherPanel::InterpolatorChanged)
- EVT_TEXT_ENTER ( XRCID("nona_text_gamma"),NonaStitcherPanel::GammaChanged )
- EVT_SPINCTRL(XRCID("nona_jpeg_quality"), NonaStitcherPanel::OnSetQuality)
- EVT_CHECKBOX( XRCID("nona_check_enblend"), NonaStitcherPanel::OnEnblendChanged)
- EVT_CHECKBOX( XRCID("nona_save_cropped"), NonaStitcherPanel::OnSaveCropped)
- EVT_CHOICE ( XRCID("nona_choice_format_final"),NonaStitcherPanel::FileFormatChanged)
- EVT_CHOICE ( XRCID("nona_comp_type"),NonaStitcherPanel::OnCompTypeChanged)
-END_EVENT_TABLE()
-
-
-// Define a constructor for the Pano Panel
-NonaStitcherPanel::NonaStitcherPanel(wxWindow *parent, Panorama & pano)
- : StitcherPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxEXPAND|wxGROW),
- pano(pano),
- updatesDisabled(false)
-{
-
- // loading xrc resources in selfcreated this panel
- wxXmlResource::Get()->LoadPanel ( this, wxT("nona_panel"));
-
- // converts KILL_FOCUS events to usable TEXT_ENTER events
- // get gui controls
- m_InterpolatorChoice = XRCCTRL(*this, "nona_choice_interpolator",
- wxChoice);
- DEBUG_ASSERT(m_InterpolatorChoice);
- m_gammaTxt = XRCCTRL(*this, "nona_text_gamma", wxTextCtrl);
- DEBUG_ASSERT(m_gammaTxt);
- m_gammaTxt->PushEventHandler(new TextKillFocusHandler(this));
- m_FormatChoice = XRCCTRL(*this, "nona_choice_format_final", wxChoice);
- DEBUG_ASSERT(m_FormatChoice);
- m_JPEGQualitySpin = XRCCTRL(*this, "nona_jpeg_quality", wxSpinCtrl);
- DEBUG_ASSERT(m_JPEGQualitySpin);
- m_JPEGQualitySpin->PushEventHandler(new TextKillFocusHandler(this));
-
- m_EnblendCheckBox = XRCCTRL(*this, "nona_check_enblend", wxCheckBox);
- DEBUG_ASSERT(m_EnblendCheckBox);
-
- m_SaveCroppedCB = XRCCTRL(*this, "nona_save_cropped", wxCheckBox);
- DEBUG_ASSERT(m_SaveCroppedCB);
-
- m_CompTypeChoice = XRCCTRL(*this, "nona_comp_type", wxChoice);
- DEBUG_ASSERT(m_CompTypeChoice);
-
- UpdateDisplay(pano.getOptions());
-
- // observe the panorama
- pano.addObserver (this);
-
- Fit();
- wxSize sz = GetSize();
- SetSizeHints(sz.GetWidth(), sz.GetHeight());
-
- DEBUG_DEBUG("setting minsize to:" << sz.GetWidth() << "x" << sz.GetHeight());
-}
-
-
-NonaStitcherPanel::~NonaStitcherPanel(void)
-{
- DEBUG_TRACE("dtor");
- m_gammaTxt->PopEventHandler(true);
- m_JPEGQualitySpin->PopEventHandler(true);
- pano.removeObserver(this);
- DEBUG_TRACE("dtor end");
-}
-
-
-void NonaStitcherPanel::panoramaChanged (PT::Panorama &pano)
-{
- DEBUG_TRACE("");
- PanoramaOptions opt = pano.getOptions();
- // update all options for dialog and notebook tab
- UpdateDisplay(opt);
- m_oldOpt = opt;
-}
-
-void NonaStitcherPanel::UpdateDisplay(const PanoramaOptions & opt)
-{
-// DGSW FIXME - Unreferenced
-// unsigned int nImages = pano.getNrOfImages();
-
- // if (nImages == 0) {
- // disable controls
- //m_InterpolatorChoice->Disable();
- //m_FormatChoice->Disable();
- //m_JPEGQualitySpin->Disable();
- //m_EnblendCheckBox->Disable();
- //
- //} else {
- // enable controls
- //if (m_InterpolatorChoice->Enable())
- //{
- //m_FormatChoice->Enable();
- //m_JPEGQualitySpin->Enable();
- //m_EnblendCheckBox->Enable();
- //}
- //
-
- m_InterpolatorChoice->SetSelection(opt.interpolator);
- m_gammaTxt->SetValue(wxString::Format (wxT("%.2f"), opt.gamma));
-
- // translate format
- int format;
- switch (opt.outputFormat) {
- case PanoramaOptions::JPEG:
- format = 0;
- break;
- case PanoramaOptions::PNG:
- format = 1;
- break;
- case PanoramaOptions::TIFF:
- format = 2;
- break;
- case PanoramaOptions::TIFF_m:
- format = 3;
- break;
- case PanoramaOptions::TIFF_multilayer:
- format = 4;
- break;
- case PanoramaOptions::HDR:
- format = 5;
- break;
- default:
- {
- PanoramaOptions opts = pano.getOptions();
- opts.outputFormat = PanoramaOptions::JPEG;
- GlobalCmdHist::getInstance().addCommand(
- new PT::SetPanoOptionsCmd( pano, opts )
- );
- format = 0;
- }
- }
- m_FormatChoice->SetSelection(format);
-
- if (opt.outputFormat == PanoramaOptions::JPEG) {
- m_JPEGQualitySpin->Enable();
- } else {
- m_JPEGQualitySpin->Disable();
- }
- m_JPEGQualitySpin->SetValue(opt.quality);
-
- if (opt.outputFormat == PanoramaOptions::TIFF ||
- opt.outputFormat == PanoramaOptions::TIFF_m ||
- opt.outputFormat == PanoramaOptions::TIFF_multilayer)
- {
- m_CompTypeChoice->Enable();
- if (opt.tiffCompression == "NONE") {
- m_CompTypeChoice->SetSelection(0);
- } else if (opt.tiffCompression == "LZW") {
- m_CompTypeChoice->SetSelection(1);
- } else if (opt.tiffCompression == "DEFLATE") {
- m_CompTypeChoice->SetSelection(2);
- } else {
- DEBUG_ERROR("Unknown compression type");
- }
- } else {
- m_CompTypeChoice->Disable();
- }
-
- if (opt.outputFormat == PanoramaOptions::TIFF_m) {
- m_SaveCroppedCB->Enable();
- } else {
- m_SaveCroppedCB->Disable();
- }
-
- m_SaveCroppedCB->SetValue(opt.tiff_saveROI);
-
- if (opt.outputFormat == PanoramaOptions::TIFF) {
- // enable enblend
- m_EnblendCheckBox->Enable();
- m_EnblendCheckBox->SetValue(opt.blendMode == PanoramaOptions::ENBLEND_BLEND);
- } else {
- m_EnblendCheckBox->SetValue(false);
- m_EnblendCheckBox->Disable();
- }
- //}
-}
-
-
-void NonaStitcherPanel::InterpolatorChanged ( wxCommandEvent & e )
-{
- if (updatesDisabled) return;
- PanoramaOptions opt = pano.getOptions();
- //Interpolator from PanoramaMemento.h
- int lt = m_InterpolatorChoice->GetSelection();
-
- opt.interpolator = (vigra_ext::Interpolator) lt;
- GlobalCmdHist::getInstance().addCommand(
- new PT::SetPanoOptionsCmd( pano, opt )
- );
- DEBUG_DEBUG ("Interpolator changed to: " << lt )
-}
-
-void NonaStitcherPanel::OnEnblendChanged( wxCommandEvent & e )
-{
- if (updatesDisabled) return;
- PanoramaOptions opt = pano.getOptions();
-
-
- if (m_EnblendCheckBox->IsChecked()) {
- opt.blendMode = PanoramaOptions::ENBLEND_BLEND;
- } else {
- opt.blendMode = PanoramaOptions::NO_BLEND;
- }
-
- GlobalCmdHist::getInstance().addCommand(
- new PT::SetPanoOptionsCmd( pano, opt )
- );
-}
-
-void NonaStitcherPanel::FileFormatChanged ( wxCommandEvent & e )
-{
- if (updatesDisabled) return;
- PanoramaOptions opt = pano.getOptions();
- int format = m_FormatChoice->GetSelection();
-
- // map to output format
- switch(format) {
- case 0:
- opt.outputFormat = PanoramaOptions::JPEG;
- break;
- case 1:
- opt.outputFormat = PanoramaOptions::PNG;
- break;
- case 2:
- opt.outputFormat = PanoramaOptions::TIFF;
- break;
- case 3:
- opt.outputFormat = PanoramaOptions::TIFF_m;
- break;
- case 4:
- opt.outputFormat = PanoramaOptions::TIFF_multilayer;
- break;
- case 5:
- opt.outputFormat = PanoramaOptions::HDR;
- break;
- default:
- DEBUG_ERROR("Unknown output format " << format);
- opt.outputFormat = PanoramaOptions::JPEG;
- }
-
- GlobalCmdHist::getInstance().addCommand(
- new PT::SetPanoOptionsCmd( pano, opt )
- );
- DEBUG_INFO ( PanoramaOptions::getFormatName(opt.outputFormat));
-}
-
-bool NonaStitcherPanel::Stitch( const Panorama & pano,
- PanoramaOptions options)
-{
- // work around a flaw in wxProgresDialog that results in incorrect layout
- // by pre-allocting sufficient horizontal and vertical space
- MyProgressDialog pdisp(_("Stitching Panorama"), (wxString((wxChar)' ', 60) + wxT("\n \n ") ), NULL,
- wxPD_ELAPSED_TIME | wxPD_AUTO_HIDE | wxPD_APP_MODAL );
-
- PanoramaOptions opts = options;
- DEBUG_DEBUG("Stitching to " << opts.outfile);
-
- // set number of threads.
- long nthreads = wxConfigBase::Get()->Read(wxT("/Nona/NumberOfThreads"), wxThread::GetCPUCount());
- if (nthreads < 1) nthreads = 1;
- vigra_ext::ThreadManager::get().setNThreads(nthreads);
-
- UIntSet imgs;
- if (wxConfigBase::Get()->Read(wxT("/General/UseOnlySelectedImages"),
- HUGIN_USE_SELECTED_IMAGES))
- {
- // use only selected images.
- imgs = pano.getActiveImages();
- } else {
- fill_set(imgs, 0, pano.getNrOfImages()-1);
- }
-
- bool enblend = m_EnblendCheckBox->IsChecked();
- try {
- if (enblend) {
- // output must be set to TIFF
- DEBUG_ASSERT(opts.outputFormat == PanoramaOptions::TIFF);
- // set output to multiple tiff.
- // hope the next enblend will also contain multilayer support
- opts.outputFormat = PanoramaOptions::TIFF_m;
-
- opts.tiff_saveROI = (wxConfigBase::Get()->Read(wxT("/Enblend/UseCroppedFiles"),
- HUGIN_ENBLEND_USE_CROPPED_FILES)) != 0;
- }
- // stitch panorama
- PT::stitchPanorama(pano, opts,
- pdisp, opts.outfile, imgs);
- } catch (std::bad_alloc &) {
- wxMessageBox(_("Out of memory.\nTry again with a smaller panorama image size\n"),
- _("Error during stitching"),
- wxICON_ERROR | wxOK);
- return false;
- } catch (std::exception & e) {
- wxMessageBox(wxString(e.what(), *wxConvCurrent),
- _("Error during stitching"),
- wxICON_ERROR | wxOK);
- return false;
- }
-
- wxString outpath;
- wxString outname;
- wxString output;
- wxFileName::SplitPath(wxString(opts.outfile.c_str(), *wxConvCurrent), &outpath, &outname, NULL);
- output = outpath + wxFileName::GetPathSeparator() + outname;
- if (enblend) {
- wxConfigBase* config = wxConfigBase::Get();
-#ifdef __WXMSW__
- wxString enblendExe = config->Read(wxT("/Enblend/EnblendExe"),wxT(HUGIN_ENBLEND_EXE));
- if (!wxFile::Exists(enblendExe)){
- wxFileDialog dlg(this,_("Select enblend.exe"),
- wxT(""), wxT("enblend.exe"),
- wxT("Executables (*.exe)|*.exe"),
- wxOPEN, wxDefaultPosition);
- if (dlg.ShowModal() == wxID_OK) {
- enblendExe = dlg.GetPath();
- config->Write(wxT("/Enblend/EnblendExe"),enblendExe);
- } else {
- wxLogError(_("No enblend.exe selected"));
- return false;
- }
- }
-#elif defined __WXMAC__
- wxString enblendExe = config->Read(wxT("/Enblend/EnblendExe"), wxT(HUGIN_ENBLEND_EXE));
-
- // TODO: for now, default path triggers non-custom path but to be fixed
- if(enblendExe == wxT(HUGIN_ENBLEND_EXE))
- enblendExe = MacGetPathTOBundledExecutableFile(CFSTR("enblend"));
- else if (!wxFile::Exists(enblendExe)) {
- wxFileDialog dlg(this,_("Select enblend commandline tool"),
- wxT(""), wxT(""),
- wxT("Any Files |*"),
- wxOPEN, wxDefaultPosition);
- if (dlg.ShowModal() == wxID_OK) {
- enblendExe = dlg.GetPath();
- config->Write(wxT("/Enblend/EnblendExe"),enblendExe);
- } else {
- wxLogError(_("No enblend commandline tool selected"));
- return false;
- }
- }
-#else
- wxString enblendExe = config->Read(wxT("/Enblend/EnblendExe"), wxT(HUGIN_ENBLEND_EXE));
-#endif
- // call enblend, and create the right output file
- // I hope this works correctly with filenames that contain
- // spaces
-
- wxString args = config->Read(wxT("/Enblend/EnblendArgs"));
- if (opts.getHFOV() == 360.0) {
- // blend over the border
- args.append(wxT(" -w"));
- }
-
- if (opts.tiff_saveROI) {
- args.append(wxString::Format(wxT(" -f %dx%d"), opts.getWidth(), opts.getHeight()));
- }
-
- args.append(wxT(" -o "));
- wxString quoted = output + wxT(".tif");
- quoted = utils::wxQuoteFilename(quoted);
- args.append(quoted);
-
-// DGSW FIXME - Unreferenced
-// unsigned int nImg = imgs.size();
- for (UIntSet::const_iterator it = imgs.begin(); it != imgs.end(); ++it)
- {
- quoted = output + wxString::Format(wxT("%04d.tif"), *it);
- quoted = utils::wxQuoteFilename(quoted);
- args.append(wxT(" "));
- args.append(quoted);
- }
-
- int ret = -1;
-
- wxString cmdline = utils::wxQuoteFilename(enblendExe) + wxT(" ") + args;
-#ifdef __WXMSW__
- if (cmdline.size() > 32766) {
- wxMessageBox(_("Can not call enblend with a command line > 32766 characters.\nThis is a Windows limitation\nPlease use less images, or place the images in a folder with\na shorter pathname"),
- _("Too many images selected"));
- return false;
- }
-#endif
-
- {
- // use MyExternalCmdExecDialog
- ret = MyExecuteCommandOnDialog(enblendExe, args, this);
- }
- DEBUG_NOTICE("enblend returned with: " << ret);
-
- if (ret == -1) {
- wxLogError( _("Could not execute command: ") + cmdline, _("wxExecute Error"));
- return false;
- } else if (ret > 0) {
- wxLogError(_("command: ") + cmdline +
- _("\nfailed with error code: ") + wxString::Format(wxT("%d"),ret),
- _("enblend error"));
- return false;
- }
- if (wxConfigBase::Get()->Read(wxT("/Enblend/DeleteRemappedFiles"), HUGIN_ENBLEND_DELETE_REMAPPED_FILES) != 0) {
- // delete remapped tiff files
- for (UIntSet::const_iterator it = imgs.begin(); it != imgs.end(); ++it)
- {
- wxString f = output + wxString::Format(wxT("%04d.tif"), *it);
- wxRemoveFile(f);
- }
- }
- }
- return true;
-}
-
-void NonaStitcherPanel::OnSetQuality(wxSpinEvent & e)
-{
- PanoramaOptions opt = pano.getOptions();
-
- opt.quality = m_JPEGQualitySpin->GetValue();
-
- GlobalCmdHist::getInstance().addCommand(
- new PT::SetPanoOptionsCmd( pano, opt )
- );
-}
-
-
-void NonaStitcherPanel::OnSaveCropped(wxCommandEvent & e)
-{
- PanoramaOptions opt = pano.getOptions();
-
- opt.tiff_saveROI= m_SaveCroppedCB->GetValue();
-
- GlobalCmdHist::getInstance().addCommand(
- new PT::SetPanoOptionsCmd( pano, opt )
- );
-}
-
-void NonaStitcherPanel::OnCompTypeChanged( wxCommandEvent & e )
-{
- PanoramaOptions opt = pano.getOptions();
-
- switch (e.GetSelection()) {
- case 0:
- opt.tiffCompression = "NONE";
- break;
- case 1:
- opt.tiffCompression = "LZW";
- break;
- case 2:
- opt.tiffCompression = "DEFLATE";
- break;
- default:
- DEBUG_ERROR("Unknown compression type");
- }
-
- GlobalCmdHist::getInstance().addCommand(
- new PT::SetPanoOptionsCmd( pano, opt )
- );
-}
-
-void NonaStitcherPanel::GammaChanged ( wxCommandEvent & e )
-{
- if (updatesDisabled) return;
- PanoramaOptions opt = pano.getOptions();
- double val;
- wxString text = m_gammaTxt->GetValue();
- if (str2double(text, val)) {
- opt.gamma = val;
- GlobalCmdHist::getInstance().addCommand(
- new PT::SetPanoOptionsCmd( pano, opt )
- );
- DEBUG_DEBUG( val );
- } else {
- wxLogError(_("gamma must be a number"));
- }
-}
-
Modified: hugin/branches/ippei/src/hugin_base/algorithms/algorithms.txt
===================================================================
--- hugin/branches/ippei/src/hugin_base/algorithms/algorithms.txt 2007-06-19 17:59:31 UTC (rev 2116)
+++ hugin/branches/ippei/src/hugin_base/algorithms/algorithms.txt 2007-06-19 18:03:12 UTC (rev 2117)
@@ -53,3 +53,7 @@
> wxPanoCommand
wxAddCtrlPointGridCmd // into several algorithms?
+
+
+>
+enblend; file2file
Copied: hugin/branches/ippei/src/hugin_base/algorithms/to-be-added/NonaStitcherPanel.cpp (from rev 2108, hugin/branches/ippei/src/hugin_base/algorithms/NonaStitcherPanel.cpp)
===================================================================
--- hugin/branches/ippei/src/hugin_base/algorithms/to-be-added/NonaStitcherPanel.cpp (rev 0)
+++ hugin/branches/ippei/src/hugin_base/algorithms/to-be-added/NonaStitcherPanel.cpp 2007-06-19 18:03:12 UTC (rev 2117)
@@ -0,0 +1,528 @@
+// -*- c-basic-offset: 4 -*-
+
+/** @file NonaStitcherPanel.cpp
+ *
+ * @brief implementation of NonaStitcherPanel Class
+ *
+ * @author Kai-Uwe Behrmann <we...@ti...> and
+ * Pablo d'Angelo <pab...@we...>
+ *
+ * $Id: NonaStitcherPanel.cpp 1950 2007-04-15 20:51:03Z dangelo $
+ *
+ * This program 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 2 of the License, or (at your option) any later version.
+ *
+ * This software 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 this software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <config.h>
+#include <errno.h>
+#include "panoinc_WX.h"
+
+#include "panoinc.h"
+
+#include "PT/Stitcher.h"
+
+#include "common/wxPlatform.h"
+#include "hugin/config_defaults.h"
+#include "hugin/RunStitcherFrame.h"
+#include "hugin/CommandHistory.h"
+#include "hugin/CPImageCtrl.h"
+#include "hugin/TextKillFocusHandler.h"
+#include "hugin/NonaStitcherPanel.h"
+#include "hugin/MainFrame.h"
+#include "hugin/huginApp.h"
+#include "hugin/MyProgressDialog.h"
+
+#include "hugin/MyExternalCmdExecDialog.h"
+
+using namespace PT;
+using namespace std;
+using namespace utils;
+
+//-----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(NonaStitcherPanel, wxWindow)
+ EVT_CHOICE ( XRCID("nona_choice_interpolator"),NonaStitcherPanel::InterpolatorChanged)
+ EVT_TEXT_ENTER ( XRCID("nona_text_gamma"),NonaStitcherPanel::GammaChanged )
+ EVT_SPINCTRL(XRCID("nona_jpeg_quality"), NonaStitcherPanel::OnSetQuality)
+ EVT_CHECKBOX( XRCID("nona_check_enblend"), NonaStitcherPanel::OnEnblendChanged)
+ EVT_CHECKBOX( XRCID("nona_save_cropped"), NonaStitcherPanel::OnSaveCropped)
+ EVT_CHOICE ( XRCID("nona_choice_format_final"),NonaStitcherPanel::FileFormatChanged)
+ EVT_CHOICE ( XRCID("nona_comp_type"),NonaStitcherPanel::OnCompTypeChanged)
+END_EVENT_TABLE()
+
+
+// Define a constructor for the Pano Panel
+NonaStitcherPanel::NonaStitcherPanel(wxWindow *parent, Panorama & pano)
+ : StitcherPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxEXPAND|wxGROW),
+ pano(pano),
+ updatesDisabled(false)
+{
+
+ // loading xrc resources in selfcreated this panel
+ wxXmlResource::Get()->LoadPanel ( this, wxT("nona_panel"));
+
+ // converts KILL_FOCUS events to usable TEXT_ENTER events
+ // get gui controls
+ m_InterpolatorChoice = XRCCTRL(*this, "nona_choice_interpolator",
+ wxChoice);
+ DEBUG_ASSERT(m_InterpolatorChoice);
+ m_gammaTxt = XRCCTRL(*this, "nona_text_gamma", wxTextCtrl);
+ DEBUG_ASSERT(m_gammaTxt);
+ m_gammaTxt->PushEventHandler(new TextKillFocusHandler(this));
+ m_FormatChoice = XRCCTRL(*this, "nona_choice_format_final", wxChoice);
+ DEBUG_ASSERT(m_FormatChoice);
+ m_JPEGQualitySpin = XRCCTRL(*this, "nona_jpeg_quality", wxSpinCtrl);
+ DEBUG_ASSERT(m_JPEGQualitySpin);
+ m_JPEGQualitySpin->PushEventHandler(new TextKillFocusHandler(this));
+
+ m_EnblendCheckBox = XRCCTRL(*this, "nona_check_enblend", wxCheckBox);
+ DEBUG_ASSERT(m_EnblendCheckBox);
+
+ m_SaveCroppedCB = XRCCTRL(*this, "nona_save_cropped", wxCheckBox);
+ DEBUG_ASSERT(m_SaveCroppedCB);
+
+ m_CompTypeChoice = XRCCTRL(*this, "nona_comp_type", wxChoice);
+ DEBUG_ASSERT(m_CompTypeChoice);
+
+ UpdateDisplay(pano.getOptions());
+
+ // observe the panorama
+ pano.addObserver (this);
+
+ Fit();
+ wxSize sz = GetSize();
+ SetSizeHints(sz.GetWidth(), sz.GetHeight());
+
+ DEBUG_DEBUG("setting minsize to:" << sz.GetWidth() << "x" << sz.GetHeight());
+}
+
+
+NonaStitcherPanel::~NonaStitcherPanel(void)
+{
+ DEBUG_TRACE("dtor");
+ m_gammaTxt->PopEventHandler(true);
+ m_JPEGQualitySpin->PopEventHandler(true);
+ pano.removeObserver(this);
+ DEBUG_TRACE("dtor end");
+}
+
+
+void NonaStitcherPanel::panoramaChanged (PT::Panorama &pano)
+{
+ DEBUG_TRACE("");
+ PanoramaOptions opt = pano.getOptions();
+ // update all options for dialog and notebook tab
+ UpdateDisplay(opt);
+ m_oldOpt = opt;
+}
+
+void NonaStitcherPanel::UpdateDisplay(const PanoramaOptions & opt)
+{
+// DGSW FIXME - Unreferenced
+// unsigned int nImages = pano.getNrOfImages();
+
+ // if (nImages == 0) {
+ // disable controls
+ //m_InterpolatorChoice->Disable();
+ //m_FormatChoice->Disable();
+ //m_JPEGQualitySpin->Disable();
+ //m_EnblendCheckBox->Disable();
+ //
+ //} else {
+ // enable controls
+ //if (m_InterpolatorChoice->Enable())
+ //{
+ //m_FormatChoice->Enable();
+ //m_JPEGQualitySpin->Enable();
+ //m_EnblendCheckBox->Enable();
+ //}
+ //
+
+ m_InterpolatorChoice->SetSelection(opt.interpolator);
+ m_gammaTxt->SetValue(wxString::Format (wxT("%.2f"), opt.gamma));
+
+ // translate format
+ int format;
+ switch (opt.outputFormat) {
+ case PanoramaOptions::JPEG:
+ format = 0;
+ break;
+ case PanoramaOptions::PNG:
+ format = 1;
+ break;
+ case PanoramaOptions::TIFF:
+ format = 2;
+ break;
+ case PanoramaOptions::TIFF_m:
+ format = 3;
+ break;
+ case PanoramaOptions::TIFF_multilayer:
+ format = 4;
+ break;
+ case PanoramaOptions::HDR:
+ format = 5;
+ break;
+ default:
+ {
+ PanoramaOptions opts = pano.getOptions();
+ opts.outputFormat = PanoramaOptions::JPEG;
+ GlobalCmdHist::getInstance().addCommand(
+ new PT::SetPanoOptionsCmd( pano, opts )
+ );
+ format = 0;
+ }
+ }
+ m_FormatChoice->SetSelection(format);
+
+ if (opt.outputFormat == PanoramaOptions::JPEG) {
+ m_JPEGQualitySpin->Enable();
+ } else {
+ m_JPEGQualitySpin->Disable();
+ }
+ m_JPEGQualitySpin->SetValue(opt.quality);
+
+ if (opt.outputFormat == PanoramaOptions::TIFF ||
+ opt.outputFormat == PanoramaOptions::TIFF_m ||
+ opt.outputFormat == PanoramaOptions::TIFF_multilayer)
+ {
+ m_CompTypeChoice->Enable();
+ if (opt.tiffCompression == "NONE") {
+ m_CompTypeChoice->SetSelection(0);
+ } else if (opt.tiffCompression == "LZW") {
+ m_CompTypeChoice->SetSelection(1);
+ } else if (opt.tiffCompression == "DEFLATE") {
+ m_CompTypeChoice->SetSelection(2);
+ } else {
+ DEBUG_ERROR("Unknown compression type");
+ }
+ } else {
+ m_CompTypeChoice->Disable();
+ }
+
+ if (opt.outputFormat == PanoramaOptions::TIFF_m) {
+ m_SaveCroppedCB->Enable();
+ } else {
+ m_SaveCroppedCB->Disable();
+ }
+
+ m_SaveCroppedCB->SetValue(opt.tiff_saveROI);
+
+ if (opt.outputFormat == PanoramaOptions::TIFF) {
+ // enable enblend
+ m_EnblendCheckBox->Enable();
+ m_EnblendCheckBox->SetValue(opt.blendMode == PanoramaOptions::ENBLEND_BLEND);
+ } else {
+ m_EnblendCheckBox->SetValue(false);
+ m_EnblendCheckBox->Disable();
+ }
+ //}
+}
+
+
+void NonaStitcherPanel::InterpolatorChanged ( wxCommandEvent & e )
+{
+ if (updatesDisabled) return;
+ PanoramaOptions opt = pano.getOptions();
+ //Interpolator from PanoramaMemento.h
+ int lt = m_InterpolatorChoice->GetSelection();
+
+ opt.interpolator = (vigra_ext::Interpolator) lt;
+ GlobalCmdHist::getInstance().addCommand(
+ new PT::SetPanoOptionsCmd( pano, opt )
+ );
+ DEBUG_DEBUG ("Interpolator changed to: " << lt )
+}
+
+void NonaStitcherPanel::OnEnblendChanged( wxCommandEvent & e )
+{
+ if (updatesDisabled) return;
+ PanoramaOptions opt = pano.getOptions();
+
+
+ if (m_EnblendCheckBox->IsChecked()) {
+ opt.blendMode = PanoramaOptions::ENBLEND_BLEND;
+ } else {
+ opt.blendMode = PanoramaOptions::NO_BLEND;
+ }
+
+ GlobalCmdHist::getInstance().addCommand(
+ new PT::SetPanoOptionsCmd( pano, opt )
+ );
+}
+
+void NonaStitcherPanel::FileFormatChanged ( wxCommandEvent & e )
+{
+ if (updatesDisabled) return;
+ PanoramaOptions opt = pano.getOptions();
+ int format = m_FormatChoice->GetSelection();
+
+ // map to output format
+ switch(format) {
+ case 0:
+ opt.outputFormat = PanoramaOptions::JPEG;
+ break;
+ case 1:
+ opt.outputFormat = PanoramaOptions::PNG;
+ break;
+ case 2:
+ opt.outputFormat = PanoramaOptions::TIFF;
+ break;
+ case 3:
+ opt.outputFormat = PanoramaOptions::TIFF_m;
+ break;
+ case 4:
+ opt.outputFormat = PanoramaOptions::TIFF_multilayer;
+ break;
+ case 5:
+ opt.outputFormat = PanoramaOptions::HDR;
+ break;
+ default:
+ DEBUG_ERROR("Unknown output format " << format);
+ opt.outputFormat = PanoramaOptions::JPEG;
+ }
+
+ GlobalCmdHist::getInstance().addCommand(
+ new PT::SetPanoOptionsCmd( pano, opt )
+ );
+ DEBUG_INFO ( PanoramaOptions::getFormatName(opt.outputFormat));
+}
+
+bool NonaStitcherPanel::Stitch( const Panorama & pano,
+ PanoramaOptions options)
+{
+ // work around a flaw in wxProgresDialog that results in incorrect layout
+ // by pre-allocting sufficient horizontal and vertical space
+ MyProgressDialog pdisp(_("Stitching Panorama"), (wxString((wxChar)' ', 60) + wxT("\n \n ") ), NULL,
+ wxPD_ELAPSED_TIME | wxPD_AUTO_HIDE | wxPD_APP_MODAL );
+
+ PanoramaOptions opts = options;
+ DEBUG_DEBUG("Stitching to " << opts.outfile);
+
+ // set number of threads.
+ long nthreads = wxConfigBase::Get()->Read(wxT("/Nona/NumberOfThreads"), wxThread::GetCPUCount());
+ if (nthreads < 1) nthreads = 1;
+ vigra_ext::ThreadManager::get().setNThreads(nthreads);
+
+ UIntSet imgs;
+ if (wxConfigBase::Get()->Read(wxT("/General/UseOnlySelectedImages"),
+ HUGIN_USE_SELECTED_IMAGES))
+ {
+ // use only selected images.
+ imgs = pano.getActiveImages();
+ } else {
+ fill_set(imgs, 0, pano.getNrOfImages()-1);
+ }
+
+ bool enblend = m_EnblendCheckBox->IsChecked();
+ try {
+ if (enblend) {
+ // output must be set to TIFF
+ DEBUG_ASSERT(opts.outputFormat == PanoramaOptions::TIFF);
+ // set output to multiple tiff.
+ // hope the next enblend will also contain multilayer support
+ opts.outputFormat = PanoramaOptions::TIFF_m;
+
+ opts.tiff_saveROI = (wxConfigBase::Get()->Read(wxT("/Enblend/UseCroppedFiles"),
+ HUGIN_ENBLEND_USE_CROPPED_FILES)) != 0;
+ }
+ // stitch panorama
+ PT::stitchPanorama(pano, opts,
+ pdisp, opts.outfile, imgs);
+ } catch (std::bad_alloc &) {
+ wxMessageBox(_("Out of memory.\nTry again with a smaller panorama image size\n"),
+ _("Error during stitching"),
+ wxICON_ERROR | wxOK);
+ return false;
+ } catch (std::exception & e) {
+ wxMessageBox(wxString(e.what(), *wxConvCurrent),
+ _("Error during stitching"),
+ wxICON_ERROR | wxOK);
+ return false;
+ }
+
+ wxString outpath;
+ wxString outname;
+ wxString output;
+ wxFileName::SplitPath(wxString(opts.outfile.c_str(), *wxConvCurrent), &outpath, &outname, NULL);
+ output = outpath + wxFileName::GetPathSeparator() + outname;
+ if (enblend) {
+ wxConfigBase* config = wxConfigBase::Get();
+#ifdef __WXMSW__
+ wxString enblendExe = config->Read(wxT("/Enblend/EnblendExe"),wxT(HUGIN_ENBLEND_EXE));
+ if (!wxFile::Exists(enblendExe)){
+ wxFileDialog dlg(this,_("Select enblend.exe"),
+ wxT(""), wxT("enblend.exe"),
+ wxT("Executables (*.exe)|*.exe"),
+ wxOPEN, wxDefaultPosition);
+ if (dlg.ShowModal() == wxID_OK) {
+ enblendExe = dlg.GetPath();
+ config->Write(wxT("/Enblend/EnblendExe"),enblendExe);
+ } else {
+ wxLogError(_("No enblend.exe selected"));
+ return false;
+ }
+ }
+#elif defined __WXMAC__
+ wxString enblendExe = config->Read(wxT("/Enblend/EnblendExe"), wxT(HUGIN_ENBLEND_EXE));
+
+ // TODO: for now, default path triggers non-custom path but to be fixed
+ if(enblendExe == wxT(HUGIN_ENBLEND_EXE))
+ enblendExe = MacGetPathTOBundledExecutableFile(CFSTR("enblend"));
+ else if (!wxFile::Exists(enblendExe)) {
+ wxFileDialog dlg(this,_("Select enblend commandline tool"),
+ wxT(""), wxT(""),
+ wxT("Any Files |*"),
+ wxOPEN, wxDefaultPosition);
+ if (dlg.ShowModal() == wxID_OK) {
+ enblendExe = dlg.GetPath();
+ config->Write(wxT("/Enblend/EnblendExe"),enblendExe);
+ } else {
+ wxLogError(_("No enblend commandline tool selected"));
+ return false;
+ }
+ }
+#else
+ wxString enblendExe = config->Read(wxT("/Enblend/EnblendExe"), wxT(HUGIN_ENBLEND_EXE));
+#endif
+ // call enblend, and create the right output file
+ // I hope this works correctly with filenames that contain
+ // spaces
+
+ wxString args = config->Read(wxT("/Enblend/EnblendArgs"));
+ if (opts.getHFOV() == 360.0) {
+ // blend over the border
+ args.append(wxT(" -w"));
+ }
+
+ if (opts.tiff_saveROI) {
+ args.append(wxString::Format(wxT(" -f %dx%d"), opts.getWidth(), opts.getHeight()));
+ }
+
+ args.append(wxT(" -o "));
+ wxString quoted = output + wxT(".tif");
+ quoted = utils::wxQuoteFilename(quoted);
+ args.append(quoted);
+
+// DGSW FIXME - Unreferenced
+// unsigned int nImg = imgs.size();
+ for (UIntSet::const_iterator it = imgs.begin(); it != imgs.end(); ++it)
+ {
+ quoted = output + wxString::Format(wxT("%04d.tif"), *it);
+ quoted = utils::wxQuoteFilename(quoted);
+ args.append(wxT(" "));
+ args.append(quoted);
+ }
+
+ int ret = -1;
+
+ wxString cmdline = utils::wxQuoteFilename(enblendExe) + wxT(" ") + args;
+#ifdef __WXMSW__
+ if (cmdline.size() > 32766) {
+ wxMessageBox(_("Can not call enblend with a command line > 32766 characters.\nThis is a Windows limitation\nPlease use less images, or place the images in a folder with\na shorter pathname"),
+ _("Too many images selected"));
+ return false;
+ }
+#endif
+
+ {
+ // use MyExternalCmdExecDialog
+ ret = MyExecuteCommandOnDialog(enblendExe, args, this);
+ }
+ DEBUG_NOTICE("enblend returned with: " << ret);
+
+ if (ret == -1) {
+ wxLogError( _("Could not execute command: ") + cmdline, _("wxExecute Error"));
+ return false;
+ } else if (ret > 0) {
+ wxLogError(_("command: ") + cmdline +
+ _("\nfailed with error code: ") + wxString::Format(wxT("%d"),ret),
+ _("enblend error"));
+ return false;
+ }
+ if (wxConfigBase::Get()->Read(wxT("/Enblend/DeleteRemappedFiles"), HUGIN_ENBLEND_DELETE_REMAPPED_FILES) != 0) {
+ // delete remapped tiff files
+ for (UIntSet::const_iterator it = imgs.begin(); it != imgs.end(); ++it)
+ {
+ wxString f = output + wxString::Format(wxT("%04d.tif"), *it);
+ wxRemoveFile(f);
+ }
+ }
+ }
+ return true;
+}
+
+void NonaStitcherPanel::OnSetQuality(wxSpinEvent & e)
+{
+ PanoramaOptions opt = pano.getOptions();
+
+ opt.quality = m_JPEGQualitySpin->GetValue();
+
+ GlobalCmdHist::getInstance().addCommand(
+ new PT::SetPanoOptionsCmd( pano, opt )
+ );
+}
+
+
+void NonaStitcherPanel::OnSaveCropped(wxCommandEvent & e)
+{
+ PanoramaOptions opt = pano.getOptions();
+
+ opt.tiff_saveROI= m_SaveCroppedCB->GetValue();
+
+ GlobalCmdHist::getInstance().addCommand(
+ new PT::SetPanoOptionsCmd( pano, opt )
+ );
+}
+
+void NonaStitcherPanel::OnCompTypeChanged( wxCommandEvent & e )
+{
+ PanoramaOptions opt = pano.getOptions();
+
+ switch (e.GetSelection()) {
+ case 0:
+ opt.tiffCompression = "NONE";
+ break;
+ case 1:
+ opt.tiffCompression = "LZW";
+ break;
+ case 2:
+ opt.tiffCompression = "DEFLATE";
+ break;
+ default:
+ DEBUG_ERROR("Unknown compression type");
+ }
+
+ GlobalCmdHist::getInstance().addCommand(
+ new PT::SetPanoOptionsCmd( pano, opt )
+ );
+}
+
+void NonaStitcherPanel::GammaChanged ( wxCommandEvent & e )
+{
+ if (updatesDisabled) return;
+ PanoramaOptions opt = pano.getOptions();
+ double val;
+ wxString text = m_gammaTxt->GetValue();
+ if (str2double(text, val)) {
+ opt.gamma = val;
+ GlobalCmdHist::getInstance().addCommand(
+ new PT::SetPanoOptionsCmd( pano, opt )
+ );
+ DEBUG_DEBUG( val );
+ } else {
+ wxLogError(_("gamma must be a number"));
+ }
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|