[Hugin-cvs] SF.net SVN: hugin: [2084] hugin/branches/ippei/src/hugin_base

[<ip...@us...>]

Revision: 2084
          http://hugin.svn.sourceforge.net/hugin/?rev=2084&view=rev
Author:   ippei
Date:     2007-06-11 05:58:07 -0700 (Mon, 11 Jun 2007)

Log Message:
-----------


Modified Paths:
--------------
    hugin/branches/ippei/src/hugin_base/algorithms/VigraProgressDisplayAdaptor.h

Removed Paths:
-------------
    hugin/branches/ippei/src/hugin_base/common/

Modified: hugin/branches/ippei/src/hugin_base/algorithms/VigraProgressDisplayAdaptor.h
===================================================================
--- hugin/branches/ippei/src/hugin_base/algorithms/VigraProgressDisplayAdaptor.h	2007-06-11 11:28:00 UTC (rev 2083)
+++ hugin/branches/ippei/src/hugin_base/algorithms/VigraProgressDisplayAdaptor.h	2007-06-11 12:58:07 UTC (rev 2084)
@@ -30,9 +30,69 @@
 *
 */
 
-namespace hugin_base {
+#include <vigra_ext/ProgressDisplay.h>
 
- // [TODO] Adaptor class that wraps AppBase::ProgressDisplay into vigra_ext::MultiProgressDisplay interface.
+using namespace AppBase;
+
+namespace HuginBase {
+
     
+    /**
+     *
+     */
+    template <class StringType>
+    class ProgressDisplayAdaptor : vigra_ext::MultiProgressDisplay
+    {
+    public:
+        
+        ProgressDisplayAdaptor(ProgressDisplay<StringType>& myProgressDisplay)
+        : vigra_ext::MultiProgressDisplay(0.0), m_progressDisplay(myProgressDisplay)
+        {};
+            
+        virtual ~ProgressDisplayAdaptor() {};
+    
+        ///
+        void taskAdded()
+        {
+            m_progressDisplay.startSubtask(StringType(tasks.back().subStepProgress), 1.0, tasks.back().subStepProgress, true);
+        };
+        
+        ///
+        void taskRemove()
+        {
+            m_progressDisplay.finishSubtask();
+        };
+        
+        ///
+        void updateProgressDisplay()
+        {
+            m_progressDisplay.updateSubtaskProgress(tasks.back().getProgress());
+        };
+                
+        
+    protected:
+            
+        ProgressDisplay<StringType>& m_progressDisplay;
+        
+    };
+    
+    
+    /**
+     *
+     */
+    class DummyMultiProgressDispaly : vigra_ext::MultiProgressDisplay
+    {
+        void pushTask(const vigra_ext::ProgressTask & task) {};
+        void popTask() {};
+        void setShortMessage(const std::string & msg) {};
+        void setMessage(const std::string & msg) {};
+        void setProgress(double progress) {};
+        void increase() {};
+        
+        virtual void updateProgressDisplay() {};
+        virtual void taskAdded() {};
+        virtual void taskRemove() {};
+    };
+    
 }; //namespace
     
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.