...

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

diff --git a/lib/cpPlugins/ActorPropertiesQtDialog.h b/lib/cpPlugins/ActorPropertiesQtDialog.h
index ca45b57f396941775404cd995b42c128db84ab57..394fc6e2b94b12296f875fc90cf3001980a58a01 100644 (file)
--- a/lib/cpPlugins/ActorPropertiesQtDialog.h
+++ b/lib/cpPlugins/ActorPropertiesQtDialog.h
@@ -1,23 +1,25 @@
 #ifndef __CPPLUGINS__ACTORPROPERTIESQTDIALOG__H__
 #define __CPPLUGINS__ACTORPROPERTIESQTDIALOG__H__
 
-#include <cpPlugins/Config.h>
+#include <cpPlugins/ActorProperties.h>
 
 #ifdef cpPlugins_QT4
 
-#include <set>
-#include <vtkProp.h>
-#include <vtkRenderWindow.h>
-#include <vtkSmartPointer.h>
-
-#include <QApplication>
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QLabel>
 #include <QVBoxLayout>
+/*
+  #include <set>
+  #include <vtkProp.h>
+  #include <vtkRenderWindow.h>
+  #include <vtkSmartPointer.h>
+
+  #include <QApplication>
 
-class vtkProp;
+  class vtkProp;
+*/
 
 namespace cpPlugins
 {
@@ -28,20 +30,6 @@ namespace cpPlugins
   {
     Q_OBJECT;
 
-  public:
-    template< class _TObj >
-    struct TCmp
-    {
-      bool operator()(
-        const vtkSmartPointer< _TObj >& a,
-        const vtkSmartPointer< _TObj >& b ) const
-        { return( a.GetPointer( ) < b.GetPointer( ) ); }
-    };
-    typedef vtkSmartPointer< vtkProp >                         TActor;
-    typedef vtkSmartPointer< vtkRenderWindow >                 TRenderWindow;
-    typedef std::set< TActor, TCmp< vtkProp > >                TActors;
-    typedef std::set< TRenderWindow, TCmp< vtkRenderWindow > > TWindows;
-
   public:
     ActorPropertiesQtDialog(
       QWidget* parent = 0, Qt::WindowFlags f = 0
@@ -53,30 +41,32 @@ namespace cpPlugins
     virtual int exec( );
 
   protected:
-    virtual void _addButtons( );
-    virtual void _updateWidgets( );
-
-    virtual bool _configureForAxes( );
-    virtual bool _configureForImage( );
-    virtual bool _configureForMesh( );
-
-    void _setWindow( double w );
-    void _setLevel( double l );
-    void _render( );
-
-    template< class _TActor >
-      inline bool _addActor( vtkProp* obj );
-
-  protected slots:
-    void _boxWindow( double v );
-    void _sldWindow( int v );
-    void _boxLevel( double v );
-    void _sldLevel( int v );
-    void _sldOpacity( int v );
-    void _boxPointSize( int v );
-    void _boxLineWidth( int v );
-    void _scalarVisibility( int v );
-    void _color( );
+    /* TODO
+       virtual void _addButtons( );
+       virtual void _updateWidgets( );
+
+       virtual bool _configureForAxes( );
+       virtual bool _configureForImage( );
+       virtual bool _configureForMesh( );
+
+       void _setWindow( double w );
+       void _setLevel( double l );
+       void _render( );
+
+       template< class _TActor >
+       inline bool _addActor( vtkProp* obj );
+
+       protected slots:
+       void _boxWindow( double v );
+       void _sldWindow( int v );
+       void _boxLevel( double v );
+       void _sldLevel( int v );
+       void _sldOpacity( int v );
+       void _boxPointSize( int v );
+       void _boxLineWidth( int v );
+       void _scalarVisibility( int v );
+       void _color( );
+    */
 
     /* TODO
        virtual void updateParameters( );
@@ -97,9 +87,7 @@ namespace cpPlugins
     */
 
   protected:
-    TActors  m_Actors;
-    TWindows m_Windows;
-    bool m_WidgetsUpdated;
+    cpPlugins::ActorProperties* m_MainWidget;
     QLabel* m_Title;
     QGridLayout* m_MainLayout;
     QVBoxLayout* m_ToolsLayout;