X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpBaseQtApplication%2FEditor.h;h=4e7fb7758f252474fcecc598006cfffd09025718;hb=c26e1b67af96bd1b11e8da2ab9145dbaf0140deb;hp=5e17673bbaf677e0ba6ec65d72ad12924b10aa0b;hpb=201c5026430f9bcc33f9db6a39f5d03db096c860;p=cpPlugins.git

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