Windows compilation (1/3)

[cpPlugins.git] / lib / cpBaseQtApplication / Editor.h

diff --git a/lib/cpBaseQtApplication/Editor.h b/lib/cpBaseQtApplication/Editor.h
index 5e17673bbaf677e0ba6ec65d72ad12924b10aa0b..4e7fb7758f252474fcecc598006cfffd09025718 100644 (file)
--- a/lib/cpBaseQtApplication/Editor.h
+++ b/lib/cpBaseQtApplication/Editor.h
@@ -1,9 +1,8 @@
 #ifndef __CPBASEQTAPPLICATION__EDITOR__H__\r
 #define __CPBASEQTAPPLICATION__EDITOR__H__\r
 \r
-#include <cpBaseQtApplication/cpBaseQtApplication_Export.h>\r
-#include <cpExtensions/DataStructures/Graph.h>\r
-#include <cpPlugins/Workspace.h>\r
+#include <cpBaseQtApplication_Export.h>\r
+#include <cpPlugins/Interface/Workspace.h>\r
 #include <QObject>\r
 #include <QPointF>\r
 \r
@@ -27,6 +26,7 @@ namespace cpBaseQtApplication
 {\r
   class Connection;\r
   class Block;\r
+  class MainWindow;\r
 \r
   /**\r
    */\r
@@ -36,14 +36,11 @@ namespace cpBaseQtApplication
     Q_OBJECT;\r
 \r
   public:\r
-    typedef Editor Self;\r
-    typedef QObject      Superclass;\r
+    typedef Editor  Self;\r
+    typedef QObject Superclass;\r
 \r
-    typedef cpPlugins::Workspace     TWorkspace;\r
-    typedef cpPlugins::ProcessObject TFilter;\r
-    typedef\r
-      cpExtensions::DataStructures::\r
-      Graph< Block*, Connection*, std::string > TGraph;\r
+    typedef cpPlugins::Interface::Workspace       TWorkspace;\r
+    typedef cpPlugins::BaseObjects::ProcessObject TFilter;\r
 \r
   public:\r
     explicit Editor( QObject* parent = 0 );\r
@@ -52,6 +49,7 @@ namespace cpBaseQtApplication
     TWorkspace* workspace( );\r
     const TWorkspace* workspace( ) const;\r
     void setWorkspace( TWorkspace* ws );\r
+    void redrawWorkspace( );\r
 \r
     std::string createFilter(\r
       const std::string& category, const std::string& filter,\r
@@ -67,34 +65,40 @@ namespace cpBaseQtApplication
     void install( QGraphicsScene* s );\r
     bool eventFilter( QObject* o, QEvent* e );\r
 \r
-    void updateFilter( const std::string& filter_name );\r
-    void showOutputData(\r
-      const std::string& filter_name,\r
-      const std::string& output_name\r
-      );\r
-    void hideOutputData(\r
-      const std::string& filter_name,\r
-      const std::string& output_name\r
-      );\r
-    void visualPropertiesOutputData(\r
-      const std::string& filter_name,\r
-      const std::string& output_name\r
-      );\r
-\r
-  signals:\r
-    void execFilter( const std::string& filter_name );\r
-    void showFilterOutput(\r
-      const std::string& filter_name,\r
-      const std::string& output_name\r
-      );\r
-    void hideFilterOutput(\r
-      const std::string& filter_name,\r
-      const std::string& output_name\r
-      );\r
-    void visualPropertiesFilterOutput(\r
-      const std::string& filter_name,\r
-      const std::string& output_name\r
-      );\r
+    void updateFilter( const std::string& name );\r
+    void showData( const std::string& name, const std::string& port );\r
+    void hideData( const std::string& name, const std::string& port );\r
+    void dataProperties( const std::string& name, const std::string& port );\r
+\r
+    /* TODO\r
+       void showOutputData(\r
+       const std::string& filter_name,\r
+       const std::string& output_name\r
+       );\r
+       void hideOutputData(\r
+       const std::string& filter_name,\r
+       const std::string& output_name\r
+       );\r
+       void visualPropertiesOutputData(\r
+       const std::string& filter_name,\r
+       const std::string& output_name\r
+       );\r
+\r
+       signals:\r
+       void execFilter( const std::string& filter_name );\r
+       void showFilterOutput(\r
+       const std::string& filter_name,\r
+       const std::string& output_name\r
+       );\r
+       void hideFilterOutput(\r
+       const std::string& filter_name,\r
+       const std::string& output_name\r
+       );\r
+       void visualPropertiesFilterOutput(\r
+       const std::string& filter_name,\r
+       const std::string& output_name\r
+       );\r
+    */\r
 \r
   private:\r
     QGraphicsItem* itemAt( const QPointF& pos );\r
@@ -137,8 +141,8 @@ namespace cpBaseQtApplication
     QGraphicsScene* m_Scene;\r
     Connection* m_ActualConnection;\r
 \r
-    TWorkspace* m_Workspace;\r
-    TGraph::Pointer m_Graph;\r
+    TWorkspace::Pointer m_Workspace;\r
+    MainWindow* m_MainWindow;\r
   };\r
 \r
 } // ecapseman\r