X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FInterface%2FWorkspace.h;h=745bd98224c17259d0bb290aee68ef128c0b567a;hb=95c0f25df04b873644ebb440e84c4fe53e11eef9;hp=73db780f9dab7dcb800d5c249d15d268b3f23053;hpb=b41426f0faaee22357b16793efc0f741b039bc41;p=cpPlugins.git

diff --git a/lib/cpPlugins/Interface/Workspace.h b/lib/cpPlugins/Interface/Workspace.h
index 73db780..745bd98 100644
--- a/lib/cpPlugins/Interface/Workspace.h
+++ b/lib/cpPlugins/Interface/Workspace.h
@@ -1,10 +1,10 @@
 #ifndef __cpPlugins__Interface__Workspace__h__
 #define __cpPlugins__Interface__Workspace__h__
 
-#include <cpPlugins/Interface/Plugins.h>
-#include <cpPlugins/BaseObjects/DataObject.h>
-#include <cpPlugins/BaseObjects/ProcessObject.h>
-#include <cpPlugins/BaseObjects/Widget.h>
+#include <cpPlugins/Interface/Loader.h>
+#include <cpPlugins/Pipeline/DataObject.h>
+#include <cpPlugins/Pipeline/ProcessObject.h>
+#include <cpPlugins/Pipeline/Widget.h>
 #include <itkObject.h>
 
 class vtkRenderWindowInteractor;
@@ -24,10 +24,10 @@ namespace cpPlugins
       typedef itk::SmartPointer< Self >       Pointer;
       typedef itk::SmartPointer< const Self > ConstPointer;
 
-      typedef cpPlugins::BaseObjects::DataObject    TDataObject;
-      typedef cpPlugins::BaseObjects::ProcessObject TFilter;
-      typedef cpPlugins::BaseObjects::Widget        TWidget;
-      typedef cpPlugins::Interface::Plugins         TPlugins;
+      typedef cpPlugins::Pipeline::DataObject    TDataObject;
+      typedef cpPlugins::Pipeline::ProcessObject TFilter;
+      typedef cpPlugins::Pipeline::Widget        TWidget;
+      typedef cpPlugins::Interface::Loader          TLoader;
 
       typedef std::map< std::string, TFilter::Pointer > TFilters;
 
@@ -72,36 +72,6 @@ namespace cpPlugins
       // Interactors
       void AddInteractor( vtkRenderWindowInteractor* iren );
 
-      // Exposed ports
-      /* TODO
-         const TExposedPorts& GetExposedInputs( ) const;
-         const TExposedPorts& GetExposedOutputs( ) const;
-         cpPlugins::BaseObjects::DataObject* GetExposedOutput(
-         const std::string& name
-         );
-         const cpPlugins::BaseObjects::DataObject* GetExposedOutput(
-         const std::string& name
-         ) const;
-         bool ExposeInput(
-         const std::string& name,
-         const std::string& filter, const std::string& filter_input
-         );
-         bool ExposeOutput(
-         const std::string& name,
-         const std::string& filter, const std::string& filter_output
-         );
-         void HideInput( const std::string& name );
-         void HideOutput( const std::string& name );
-         bool RenameExposedInput(
-         const std::string& old_name,
-         const std::string& new_name
-         );
-         bool RenameExposedOutput(
-         const std::string& old_name,
-         const std::string& new_name
-         );
-      */
-
       // Connection management
       bool Connect(
         const std::string& origin_filter,
@@ -130,11 +100,11 @@ namespace cpPlugins
          const std::string& output_name, const std::string& input_name
          );
          void Connect(
-         cpPlugins::BaseObjects::DataObject* output,
+         cpPlugins::Pipeline::DataObject* output,
          const std::string& dest_filter, const std::string& input_name
          );
          void Connect(
-         cpPlugins::BaseObjects::DataObject* output,
+         cpPlugins::Pipeline::DataObject* output,
          const std::string& exposed_input_name
          );
          void Disconnect(
@@ -161,7 +131,7 @@ namespace cpPlugins
       Self& operator=( const Self& other );
 
     protected:
-      TPlugins::Pointer m_Plugins;
+      TLoader  m_Loader;
       TFilters m_Filters;
       bool     m_PrintExecution;