MVC integration at 50%

[cpPlugins.git] / lib / cpPlugins / DataObject.h

diff --git a/lib/cpPlugins/DataObject.h b/lib/cpPlugins/DataObject.h
index 9ff55d8a0cee67db4090c5694e67ea88de329ad4..0abc4a4defe3ab9c909453e56026654cff1455c1 100644 (file)
--- a/lib/cpPlugins/DataObject.h
+++ b/lib/cpPlugins/DataObject.h
@@ -2,9 +2,9 @@
 #define __CPPLUGINS__DATAOBJECT__H__
 
 #include <cpPlugins/Object.h>
-#include <set>
-#include <vtkProp.h>
-#include <vtkRenderer.h>
+
+// Some forward declarations
+class vtkProp;
 
 namespace cpPlugins
 {
@@ -28,15 +28,6 @@ namespace cpPlugins
     itkTypeMacro( DataObject, Object );
     cpPlugins_Id_Macro( DataObject, Object );
 
-    struct TDataView
-    {
-      vtkSmartPointer< vtkProp >     Actor;
-      vtkSmartPointer< vtkRenderer > Renderer;
-      bool operator<( const TDataView& b ) const
-        { return( this->Actor.GetPointer( ) < b.Actor.GetPointer( ) ); }
-    };
-    typedef std::set< TDataView > TDataViews;
-
   public:
     ProcessObject* GetSource( );
     const ProcessObject* GetSource( ) const;
@@ -48,13 +39,7 @@ namespace cpPlugins
     virtual DataObjectVisualizationQtDialog* CreateQtDialog( );
 
     // VTK actors
-    virtual void AddVTKActor( vtkProp* actor, vtkRenderer* renderer );
-    virtual void ClearVTKActors( );
-    virtual void RenderVTKActors( );
-    TDataViews::iterator BeginVTKActors( );
-    TDataViews::iterator EndVTKActors( );
-    TDataViews::const_iterator BeginVTKActors( ) const;
-    TDataViews::const_iterator EndVTKActors( ) const;
+    virtual vtkProp* CreateVTKActor( );
 
   protected:
     DataObject( );
@@ -67,7 +52,6 @@ namespace cpPlugins
 
   protected:
     ProcessObject* m_Source;
-    TDataViews     m_Actors;
   };
 
 } // ecapseman