Menu
▾
▴
[Hugin-cvs] SF.net SVN: hugin: [2661] hugin/trunk/src/hugin_base/algorithms/external
|
From: <da...@us...> - 2008-01-17 12:43:27
|
Revision: 2661
http://hugin.svn.sourceforge.net/hugin/?rev=2661&view=rev
Author: dangelo
Date: 2008-01-17 04:43:12 -0800 (Thu, 17 Jan 2008)
Log Message:
-----------
Removed unused files
Removed Paths:
-------------
hugin/trunk/src/hugin_base/algorithms/external/PTStitcherStitcher.cpp
hugin/trunk/src/hugin_base/algorithms/external/PTStitcherStitcher.h
hugin/trunk/src/hugin_base/algorithms/external/PTmenderStitcher.cpp
hugin/trunk/src/hugin_base/algorithms/external/PTmenderStitcher.h
hugin/trunk/src/hugin_base/algorithms/external/to-be-added/
Deleted: hugin/trunk/src/hugin_base/algorithms/external/PTStitcherStitcher.cpp
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/external/PTStitcherStitcher.cpp 2008-01-17 08:39:06 UTC (rev 2660)
+++ hugin/trunk/src/hugin_base/algorithms/external/PTStitcherStitcher.cpp 2008-01-17 12:43:12 UTC (rev 2661)
@@ -1,161 +0,0 @@
-// -*- c-basic-offset: 4 -*-
-/** @file
-*
-* @author Ippei UKAI <ipp...@ma...>
-*
-* $Id: $
-*
-* This 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
-*
-* Hereby the author, Ippei UKAI, grant the license of this particular file to
-* be relaxed to the GNU Lesser General Public License as published by the Free
-* Software Foundation; either version 2 of the License, or (at your option)
-* any later version. Please note however that when the file is linked to or
-* compiled with other files in this library, the GNU General Public License as
-* mentioned above is likely to restrict the terms of use further.
-*
-*/
-
-#include "PTStitcherStitcher.h"
-
-#include <fstream>
-
-
-using namespace AppBase;
-
-namespace HuginBase {
-
-
-bool ExternalFileOutputStitcherBase::runStitcher()
-{
- if(!isCompatible())
- {
- // [TODO] DEBUG_WARNING()
- return false;
- }
-
- if(!writeScriptFile(o_scriptFile))
- {
- // [TODO] DEBUG_WARNING()
- return false;
- }
-
- if(!prepareExternalProgram(o_program))
- {
- // [TODO] DEBUG_WARNING()
- return false;
- }
-
- if(o_programExecutor == NULL)
- {
- // [TODO] DEBUG_WARNING("executor is NULL");
- return false;
- }
-
- int result = o_programExecutor->executeProgram(&o_program);
- if(result == ExternalProgramExecutor::INTERRUPTED)
- cancelAlgorithm();
- return (result == ExternalProgramExecutor::NORMAL);
-}
-
-
-bool ExternalFileOutputStitcherBase::writeScriptFile(const ExternalFileOutputStitcherBase::String& filepath)
-{
- std::ofstream scriptfile(filepath.c_str());
- if (!scriptfile.good())
- {
- DEBUG_FATAL("could not open/create PTScript file");
- return false;
- }
- o_panorama.printStitcherScript(scriptfile, o_panoramaOptions, o_usedImages);
- scriptfile.close();
- return true;
-}
-
-
-
-PTStitcherProgramSetup::String PTStitcherProgramSetup::defaultCommand() const
-{
- #ifdef WIN32
- return "PTStitcher.exe";
- #else
- return "PTStitcher";
- #endif
-}
-
-
-PTStitcherProgramSetup::String PTStitcherProgramSetup::defaultArgumentTemplate() const
- { return "-o {OUTPUT} {SCRIPT} {INPUT}"; }
-
-
-PTStitcherProgramSetup::StringSet PTStitcherProgramSetup::getAvailableStringKeywords() const
-{
- StringSet keywords;
- keywords.insert("OUTPUT");
- keywords.insert("SCRIPT");
- keywords.insert("INPUT");
- return keywords;
-}
-
-PTStitcherProgramSetup::String PTStitcherProgramSetup::getStringForKeyword(const String& keyword)
-{
- if(keyword == "OUTPUT")
- return getStringForKeyword_OUTPUT();
-
- if(keyword == "SCRIPT")
- return getStringForKeyword_SCRIPT();
-
- if(keyword == "INPUT")
- return getStringForKeyword_INPUT();
-
- // [TODO] DEBUG_WARNING("unsupported keyword");
- return "";
-}
-
-
-
-
-bool PTStitcherFileOutputStitcher::isCompatible()
-{
- if(hugin_utils::stripExtension(o_panoramaOptions.outfile).find('.') != String::npos)
- {
- //[TODO] debug
- return false;
- }
-
- if ( o_panoramaOptions.outputFormat == PanoramaOptions::QTVR ) {
- //[TODO] debug
- return false;
- }
-
- return true;
-}
-
-PTStitcherFileOutputStitcher::String PTStitcherFileOutputStitcher::getStringForKeyword_OUTPUT()
-{
- return quoteFilename(hugin_utils::stripExtension(o_panoramaOptions.outfile));
-}
-
-PTStitcherFileOutputStitcher::String PTStitcherFileOutputStitcher::getStringForKeyword_SCRIPT()
-{
- return quoteFilename(o_scriptFile);
-}
-
-PTStitcherFileOutputStitcher::String PTStitcherFileOutputStitcher::getStringForKeyword_INPUT()
-{
- return "";
-}
-
-}//namespace
Deleted: hugin/trunk/src/hugin_base/algorithms/external/PTStitcherStitcher.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/external/PTStitcherStitcher.h 2008-01-17 08:39:06 UTC (rev 2660)
+++ hugin/trunk/src/hugin_base/algorithms/external/PTStitcherStitcher.h 2008-01-17 12:43:12 UTC (rev 2661)
@@ -1,173 +0,0 @@
-// -*- c-basic-offset: 4 -*-
-/** @file
-*
-* @author Ippei UKAI <ipp...@ma...>
-*
-* $Id: $
-*
-* This 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
-*
-* Hereby the author, Ippei UKAI, grant the license of this particular file to
-* be relaxed to the GNU Lesser General Public License as published by the Free
-* Software Foundation; either version 2 of the License, or (at your option)
-* any later version. Please note however that when the file is linked to or
-* compiled with other files in this library, the GNU General Public License as
-* mentioned above is likely to restrict the terms of use further.
-*
-*/
-#ifndef _PTSTITCHERSTITCHER_H
-#define _PTSTITCHERSTITCHER_H
-
-#include <algorithm/StitcherAlgorithm.h>
-#include <appbase/ExternalProgramSetup.h>
-
-
-namespace HuginBase {
-
-
- ///
- class ExternalFileOutputStitcherBase : public FileOutputStitcherAlgorithm
- {
- public:
- ///
- ExternalFileOutputStitcherBase(PanoramaData& panoramaData,
- AppBase::ExternalProgramExecutor* executor,
- const PanoramaOptions& options,
- const UIntSet& usedImages,
- const String& scriptFilePath,
- const String& filename, const bool& addExtension = true)
- : FileOutputStitcherAlgorithm(panoramaData, NULL, options, usedImages, filename, addExtension),
- o_programExecutor(executor), o_scriptFile(scriptFilePath)
- {};
-
- ///
- virtual ~ExternalFileOutputStitcherBase() {};
-
-
- public:
- ///
- virtual bool runStitcher();
-
- protected:
- /// preliminary checking; interface that can handle error message would be more desireable.
- virtual bool isCompatible() =0;
-
- ///
- virtual bool prepareExternalProgram(AppBase::ExternalProgram& program) =0;
-
- ///
- virtual bool writeScriptFile(const String& filepath);
-
-
- public:
- ///
- const AppBase::ExternalProgram& getExternalProgram() const
- { return o_program; }
-
-
- protected:
- AppBase::ExternalProgramExecutor* o_programExecutor;
- String o_scriptFile;
- AppBase::ExternalProgram o_program;
- };
-
-
-
- ///
- class PTStitcherProgramSetup : public AppBase::ExternalProgramSetup
- {
- public:
- PTStitcherProgramSetup()
- : ExternalProgramSetup()
- {};
-
- virtual ~PTStitcherProgramSetup() {};
-
- public:
- ///
- virtual String defaultCommand() const;
-
- ///
- virtual String defaultArgumentTemplate() const;
-
- ///
- virtual StringSet getAvailableStringKeywords() const;
-
- protected:
- ///
- virtual String getStringForKeyword(const String& keyword);
-
- ///
- virtual String getStringForKeyword_OUTPUT() =0;
-
- ///
- virtual String getStringForKeyword_SCRIPT() =0;
-
- ///
- virtual String getStringForKeyword_INPUT() =0;
-
- };
-
-
- ///
- class PTStitcherFileOutputStitcher : public ExternalFileOutputStitcherBase,
- public PTStitcherProgramSetup
- {
- public:
-
- typedef ExternalFileOutputStitcherBase::String String;
-
- ///
- PTStitcherFileOutputStitcher(PanoramaData& panoramaData,
- AppBase::ExternalProgramExecutor* executor,
- const PanoramaOptions& options,
- const UIntSet& usedImages,
- const String& scriptFilePath,
- const String& filename, const bool& addExtension = true)
- : ExternalFileOutputStitcherBase(panoramaData,
- executor,
- options,
- usedImages,
- scriptFilePath,
- filename, addExtension),
- PTStitcherProgramSetup()
- {};
-
- ///
- virtual ~PTStitcherFileOutputStitcher() {};
-
-
- protected:
- ///
- virtual bool isCompatible();
-
- ///
- virtual bool prepareExternalProgram(AppBase::ExternalProgram& program)
- { return setupExternalProgram(&program); }
-
-
- protected:
- ///
- virtual String getStringForKeyword_OUTPUT();
-
- ///
- virtual String getStringForKeyword_SCRIPT();
-
- ///
- virtual String getStringForKeyword_INPUT();
- };
-
-} //namespace
-#endif //_H
Deleted: hugin/trunk/src/hugin_base/algorithms/external/PTmenderStitcher.cpp
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/external/PTmenderStitcher.cpp 2008-01-17 08:39:06 UTC (rev 2660)
+++ hugin/trunk/src/hugin_base/algorithms/external/PTmenderStitcher.cpp 2008-01-17 12:43:12 UTC (rev 2661)
@@ -1,77 +0,0 @@
-// -*- c-basic-offset: 4 -*-
-/** @file
-*
-* @author Ippei UKAI <ipp...@ma...>
-*
-* $Id: $
-*
-* This 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
-*
-* Hereby the author, Ippei UKAI, grant the license of this particular file to
-* be relaxed to the GNU Lesser General Public License as published by the Free
-* Software Foundation; either version 2 of the License, or (at your option)
-* any later version. Please note however that when the file is linked to or
-* compiled with other files in this library, the GNU General Public License as
-* mentioned above is likely to restrict the terms of use further.
-*
-*/
-
-#include "PTmenderStitcher.h"
-
-
-using namespace AppBase;
-
-namespace HuginBase {
-
-
-
-PTmenderProgramSetup::String PTmenderProgramSetup::defaultCommand() const
-{
- #ifdef WIN32
- return "PTmender.exe";
- #else
- return "PTmender";
- #endif
-}
-
-
-bool PTmenderFileOutputStitcher::isCompatible()
-{
- if ( o_panoramaOptions.outputFormat == PanoramaOptions::QTVR ) {
- //[TODO] debug
- return false;
- }
-
- return true;
-}
-
-
-PTmenderFileOutputStitcher::String PTmenderFileOutputStitcher::getStringForKeyword_OUTPUT()
-{
- return quoteFilename(hugin_utils::stripExtension(o_panoramaOptions.outfile));
-}
-
-PTmenderFileOutputStitcher::String PTmenderFileOutputStitcher::getStringForKeyword_SCRIPT()
-{
- return quoteFilename(o_scriptFile);
-}
-
-PTmenderFileOutputStitcher::String PTmenderFileOutputStitcher::getStringForKeyword_INPUT()
-{
- return "";
-}
-
-
-}//namespace
Deleted: hugin/trunk/src/hugin_base/algorithms/external/PTmenderStitcher.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/external/PTmenderStitcher.h 2008-01-17 08:39:06 UTC (rev 2660)
+++ hugin/trunk/src/hugin_base/algorithms/external/PTmenderStitcher.h 2008-01-17 12:43:12 UTC (rev 2661)
@@ -1,105 +0,0 @@
-// -*- c-basic-offset: 4 -*-
-/** @file
-*
-* @author Ippei UKAI <ipp...@ma...>
-*
-* $Id: $
-*
-* This 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
-*
-* Hereby the author, Ippei UKAI, grant the license of this particular file to
-* be relaxed to the GNU Lesser General Public License as published by the Free
-* Software Foundation; either version 2 of the License, or (at your option)
-* any later version. Please note however that when the file is linked to or
-* compiled with other files in this library, the GNU General Public License as
-* mentioned above is likely to restrict the terms of use further.
-*
-*/
-#ifndef _PTMENDERSTITCHER_H
-#define _PTMENDERSTITCHER_H
-
-#include <algorithms/external/PTStitcherStitcher.h>
-
-namespace HuginBase {
-
-
- ///
- class PTmenderProgramSetup : public PTStitcherProgramSetup
- {
- public:
- PTmenderProgramSetup()
- : PTStitcherProgramSetup()
- {};
-
- virtual ~PTmenderProgramSetup() {};
-
- public:
- ///
- virtual String defaultCommand() const;
-
- };
-
-
- ///
- class PTmenderFileOutputStitcher : public ExternalFileOutputStitcherBase,
- public PTmenderProgramSetup
- {
- public:
-
- typedef ExternalFileOutputStitcherBase::String String;
-
- ///
- PTmenderFileOutputStitcher(PanoramaData& panoramaData,
- AppBase::ExternalProgramExecutor* executor,
- const PanoramaOptions& options,
- const UIntSet& usedImages,
- const String& scriptFilePath,
- const String& filename, const bool& addExtension = true)
- : ExternalFileOutputStitcherBase(panoramaData,
- executor,
- options,
- usedImages,
- scriptFilePath,
- filename, addExtension),
- PTmenderProgramSetup()
- {};
-
- ///
- virtual ~PTmenderFileOutputStitcher() {};
-
-
- protected:
- ///
- virtual bool isCompatible();
-
- ///
- virtual bool prepareExternalProgram(AppBase::ExternalProgram& program)
- { return setupExternalProgram(&program); }
-
-
- protected:
- ///
- virtual String getStringForKeyword_OUTPUT();
-
- ///
- virtual String getStringForKeyword_SCRIPT();
-
- ///
- virtual String getStringForKeyword_INPUT();
- };
-
-
-} //namespace
-#endif //_H
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|