...

diff --git a/appli/PipelineEditor/PipelineEditor.h b/appli/PipelineEditor/PipelineEditor.h
index fa6f48ed537ae0e4b2a3eb5fc8cb1029837897c2..3a753d15588be73c55a3fb8d19fe15bb28eca058 100644 (file)
--- a/appli/PipelineEditor/PipelineEditor.h
+++ b/appli/PipelineEditor/PipelineEditor.h
@@ -1,7 +1,7 @@
 #ifndef __PIPELINEEDITOR__H__
 #define __PIPELINEEDITOR__H__
 
-#include <cpPlugins/BaseQtMainWindow.h>
+#include <cpPipelineEditor/BaseQtMainWindow.h>
 
 // -------------------------------------------------------------------------
 namespace Ui
@@ -12,13 +12,13 @@ namespace Ui
 /**
  */
 class PipelineEditor
-  : public cpPlugins::BaseQtMainWindow
+  : public cpPipelineEditor::BaseQtMainWindow
 {
   Q_OBJECT;
 
 public:
-  typedef PipelineEditor              Self;
-  typedef cpPlugins::BaseQtMainWindow Superclass;
+  typedef PipelineEditor                     Self;
+  typedef cpPipelineEditor::BaseQtMainWindow Superclass;
 
 public:
   explicit PipelineEditor(

diff --git a/appli/examples/plugins/CMakeLists.txt b/appli/examples/plugins/CMakeLists.txt
index 24842051fc2ff5fc4a5b57326604145392930b0c..752c62b7acf74a4284788acca52f5d803731a0de 100644 (file)
--- a/appli/examples/plugins/CMakeLists.txt
+++ b/appli/examples/plugins/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(
 
 FOREACH(example ${examples_SOURCES})
   ADD_EXECUTABLE(${example} ${example}.cxx)
-  TARGET_LINK_LIBRARIES(${example} cpPlugins cpPipelineEditor)
+  TARGET_LINK_LIBRARIES(${example} cpPlugins)
 ENDFOREACH(example)
 
 ## eof - $RCSfile$

diff --git a/lib/cpPipelineEditor/BaseQtMainWindow.cxx b/lib/cpPipelineEditor/BaseQtMainWindow.cxx
index 24953f02e7270e92ebb0445859b2f49626719209..cf5e41f32b07c686436283ff11e302be651892a2 100644 (file)
--- a/lib/cpPipelineEditor/BaseQtMainWindow.cxx
+++ b/lib/cpPipelineEditor/BaseQtMainWindow.cxx
@@ -1,6 +1,4 @@
-#include <cpPlugins/BaseQtMainWindow.h>
-
-#ifdef cpPlugins_QT4
+#include <cpPipelineEditor/BaseQtMainWindow.h>
 
 #include <cpExtensions/QT/SimpleMPRWidget.h>
 #include <cpPipelineEditor/Editor.h>
@@ -12,7 +10,7 @@
 #include <QTreeWidget>
 
 // -------------------------------------------------------------------------
-bool cpPlugins::BaseQtMainWindow::_TBlocker::
+bool cpPipelineEditor::BaseQtMainWindow::_TBlocker::
 eventFilter( QObject* obj, QEvent* event )
 {
   return( true ); // -> Block all events
@@ -33,7 +31,7 @@ eventFilter( QObject* obj, QEvent* event )
 }
 
 // -------------------------------------------------------------------------
-cpPlugins::BaseQtMainWindow::
+cpPipelineEditor::BaseQtMainWindow::
 BaseQtMainWindow(
   int argc, char* argv[],
   QApplication* app,
@@ -67,14 +65,14 @@ BaseQtMainWindow(
 }
 
 // -------------------------------------------------------------------------
-cpPlugins::BaseQtMainWindow::
+cpPipelineEditor::BaseQtMainWindow::
 ~BaseQtMainWindow( )
 {
   this->m_Interface.UnloadAll( );
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::BaseQtMainWindow::
+void cpPipelineEditor::BaseQtMainWindow::
 _Configure(
   QTreeWidget* tree,
   cpExtensions::QT::SimpleMPRWidget* mpr,
@@ -92,7 +90,7 @@ _Configure(
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::BaseQtMainWindow::
+void cpPipelineEditor::BaseQtMainWindow::
 _LoadPlugins( const std::string& filename )
 {
   try
@@ -112,7 +110,7 @@ _LoadPlugins( const std::string& filename )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::BaseQtMainWindow::
+void cpPipelineEditor::BaseQtMainWindow::
 _LoadPluginsFromPath( const std::string& path )
 {
   try
@@ -132,7 +130,7 @@ _LoadPluginsFromPath( const std::string& path )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::BaseQtMainWindow::
+void cpPipelineEditor::BaseQtMainWindow::
 _UpdateLoadedPlugins( )
 {
   this->_Block( );
@@ -199,7 +197,7 @@ _UpdateLoadedPlugins( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::BaseQtMainWindow::
+void cpPipelineEditor::BaseQtMainWindow::
 _Block( )
 {
   this->m_Application->setOverrideCursor( Qt::WaitCursor );
@@ -207,7 +205,7 @@ _Block( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::BaseQtMainWindow::
+void cpPipelineEditor::BaseQtMainWindow::
 _UnBlock( )
 {
   while( this->m_Application->overrideCursor( ) )
@@ -216,7 +214,7 @@ _UnBlock( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::BaseQtMainWindow::
+void cpPipelineEditor::BaseQtMainWindow::
 _LoadWorkspace( const std::string& filename )
 {
   std::string err = this->m_Workspace.LoadWorkspace( filename );
@@ -237,7 +235,7 @@ _LoadWorkspace( const std::string& filename )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::BaseQtMainWindow::
+void cpPipelineEditor::BaseQtMainWindow::
 _SaveWorkspace( const std::string& filename )
 {
   std::string err = this->m_Workspace.SaveWorkspace( filename );
@@ -250,7 +248,7 @@ _SaveWorkspace( const std::string& filename )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::BaseQtMainWindow::
+void cpPipelineEditor::BaseQtMainWindow::
 _InteractiveLoadPlugins( )
 {
   QFileDialog dlg( this );
@@ -272,7 +270,7 @@ _InteractiveLoadPlugins( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::BaseQtMainWindow::
+void cpPipelineEditor::BaseQtMainWindow::
 _InteractiveLoadPluginsFromPath( )
 {
   QFileDialog dlg( this );
@@ -284,7 +282,7 @@ _InteractiveLoadPluginsFromPath( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::BaseQtMainWindow::
+void cpPipelineEditor::BaseQtMainWindow::
 _InteractiveLoadWorkspace( )
 {
   QFileDialog dlg( this );
@@ -300,7 +298,7 @@ _InteractiveLoadWorkspace( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::BaseQtMainWindow::
+void cpPipelineEditor::BaseQtMainWindow::
 _InteractiveSaveWorkspace( )
 {
   QFileDialog dlg( this );
@@ -317,7 +315,7 @@ _InteractiveSaveWorkspace( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::BaseQtMainWindow::
+void cpPipelineEditor::BaseQtMainWindow::
 _ExecFilter( const std::string& filter_name )
 {
   this->_Block( );
@@ -331,6 +329,4 @@ _ExecFilter( const std::string& filter_name )
       );
 }
 
-#endif // cpPlugins_QT4
-
 // eof - $RCSfile$

diff --git a/lib/cpPipelineEditor/BaseQtMainWindow.h b/lib/cpPipelineEditor/BaseQtMainWindow.h
index 430de43f924a3a684c924b1711d2fa5bec2e771c..fbcde2873e80ca3ac673c0ecbaa845dc4a54745a 100644 (file)
--- a/lib/cpPipelineEditor/BaseQtMainWindow.h
+++ b/lib/cpPipelineEditor/BaseQtMainWindow.h
@@ -1,10 +1,7 @@
-#ifndef __CPPLUGINS__BASEQTMAINWINDOW__H__
-#define __CPPLUGINS__BASEQTMAINWINDOW__H__
-
-#include <cpPlugins/Config.h>
-
-#ifdef cpPlugins_QT4
+#ifndef __CPPIPELINEEDITOR__BASEQTMAINWINDOW__H__
+#define __CPPIPELINEEDITOR__BASEQTMAINWINDOW__H__
 
+#include <cpPipelineEditor/cpPipelineEditor_Export.h>
 #include <QMainWindow>
 #include <cpPlugins/Interface.h>
 #include <cpPlugins/Workspace.h>
@@ -16,17 +13,15 @@ namespace cpExtensions
     class SimpleMPRWidget;
   }
 }
+class QTreeWidget;
+
 namespace cpPipelineEditor
 {
   class Editor;
-}
-class QTreeWidget;
 
-namespace cpPlugins
-{
   /**
    */
-  class cpPlugins_EXPORT BaseQtMainWindow
+  class cpPipelineEditor_EXPORT BaseQtMainWindow
     : public QMainWindow
   {
     Q_OBJECT;
@@ -76,20 +71,18 @@ namespace cpPlugins
     void _ExecFilter( const std::string& filter_name );
 
   protected:
-    QApplication* m_Application;
-    _TBlocker     m_Blocker;
-    Workspace     m_Workspace;
-    Interface     m_Interface;
-    std::string   m_PluginsPath;
+    QApplication*        m_Application;
+    _TBlocker            m_Blocker;
+    cpPlugins::Workspace m_Workspace;
+    cpPlugins::Interface m_Interface;
+    std::string          m_PluginsPath;
 
     QTreeWidget* m_TreeWidget;
-    cpPipelineEditor::Editor* m_Editor;
+    Editor*      m_Editor;
   };
 
 } // ecapseman
 
-#endif // cpPlugins_QT4
-
-#endif // __CPPLUGINS__BASEQTMAINWINDOW__H__
+#endif // __CPPIPELINEEDITOR__BASEQTMAINWINDOW__H__
 
 // eof - $RCSfile$

diff --git a/lib/cpPipelineEditor/CMakeLists.txt b/lib/cpPipelineEditor/CMakeLists.txt
index 7943a91333dc96cbd82c257b2cbaf3d451ae4206..5820042381fa1e72f966426b160db417ad0f2a72 100644 (file)
--- a/lib/cpPipelineEditor/CMakeLists.txt
+++ b/lib/cpPipelineEditor/CMakeLists.txt
@@ -14,6 +14,7 @@ SET(
   lib_QT_Headers
   Canvas.h
   Editor.h
+  BaseQtMainWindow.h
   )
 
 ## =====================

diff --git a/lib/cpPlugins_ITKInstances/Mesh_explicit_description.txt b/lib/cpPlugins_ITKInstances/Mesh_explicit_description.txt
index bbad0456a66c4aa139328f1de8f69795e4c5223a..dba8916275fcf35e2bfb73624c974cc59e63c947 100644 (file)
--- a/lib/cpPlugins_ITKInstances/Mesh_explicit_description.txt
+++ b/lib/cpPlugins_ITKInstances/Mesh_explicit_description.txt
@@ -5,12 +5,12 @@ i itkMesh.h
 i itkLineCell.h
 i itkPolygonCell.h
 i itkTriangleCell.h
+c itk::VectorContainer < unsigned long , itk::CellInterface< #1 , itk::CellTraitsInfo< #2 , float , float , unsigned long , unsigned long , unsigned long , itk::Point< float , #2 > , itk::VectorContainer< unsigned long , itk::Point< float , #2 > > , std::set< unsigned long , std::less< unsigned long > , std::allocator< unsigned long > > > >* >
 c itk::VectorContainer< unsigned long, itk::Point< #1 , #2 > >
 c itk::BoundingBox< unsigned long , #2 , float, itk::VectorContainer< unsigned long , itk::Point< float , #2 > > >
 c itk::PointSet< #1 , #2 >
 c #4 < #1 , #2 >
 c #3 < itk::CellInterface< #1 , itk::CellTraitsInfo< #2 , float , float , unsigned long , unsigned long , unsigned long , itk::Point< float , #2 > , itk::VectorContainer< unsigned long , itk::Point< float , #2 > > , std::set< unsigned long , std::less< unsigned long > , std::allocator< unsigned long > > > > >
-c itk::VectorContainer < unsigned long , itk::CellInterface< #1 , itk::CellTraitsInfo< #2 , float , float , unsigned long , unsigned long , unsigned long , itk::Point< float , #2 > , itk::VectorContainer< unsigned long , itk::Point< float , #2 > > , std::set< unsigned long , std::less< unsigned long > , std::allocator< unsigned long > > > >* >
 a #1 = #floats
 a #2 = #all_visual_dims
 a #3 = itk::LineCell;itk::PolygonCell;itk::TriangleCell

diff --git a/plugins/cpPluginsIO/CMakeLists.txt b/plugins/cpPluginsIO/CMakeLists.txt
index 1ee81a983d9d70b0b1fb0ec280c4bb611be240d1..1a8c84d682a5e05135f5a924d7e3eb3446ea53e5 100644 (file)
--- a/plugins/cpPluginsIO/CMakeLists.txt
+++ b/plugins/cpPluginsIO/CMakeLists.txt
@@ -57,7 +57,7 @@ GENERATE_EXPORT_HEADER(
   EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/plugins/${lib_DIR}/${lib_NAME}_Export.h
   STATIC_DEFINE ${lib_NAME}_BUILT_AS_STATIC
   )
-TARGET_LINK_LIBRARIES(${lib_NAME} cpPipelineEditor ${target_LIBRARIES})
+TARGET_LINK_LIBRARIES(${lib_NAME} ${target_LIBRARIES})
 
 ## ========================
 ## -- Installation rules --

diff --git a/plugins/cpPluginsImageFilters/CMakeLists.txt b/plugins/cpPluginsImageFilters/CMakeLists.txt
index 262bca9e97f227649c52e693d664202b3ddd7452..94af7c5b516fe4a23fcd6275f2a7ccb0be897ba2 100644 (file)
--- a/plugins/cpPluginsImageFilters/CMakeLists.txt
+++ b/plugins/cpPluginsImageFilters/CMakeLists.txt
@@ -58,7 +58,7 @@ GENERATE_EXPORT_HEADER(
   EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/plugins/${lib_DIR}/${lib_NAME}_Export.h
   STATIC_DEFINE ${lib_NAME}_BUILT_AS_STATIC
   )
-TARGET_LINK_LIBRARIES(${lib_NAME} cpPipelineEditor ${target_LIBRARIES})
+TARGET_LINK_LIBRARIES(${lib_NAME} ${target_LIBRARIES})
 
 ## ========================
 ## -- Installation rules --

diff --git a/plugins/cpPluginsImageMeshFilters/CMakeLists.txt b/plugins/cpPluginsImageMeshFilters/CMakeLists.txt
index 4f3c562da8b46760cc186c2c074a1ff1a802f8a8..bda2804f8c08369395f12a2efd15ed3b0092b811 100644 (file)
--- a/plugins/cpPluginsImageMeshFilters/CMakeLists.txt
+++ b/plugins/cpPluginsImageMeshFilters/CMakeLists.txt
@@ -58,7 +58,7 @@ GENERATE_EXPORT_HEADER(
   EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/plugins/${lib_DIR}/${lib_NAME}_Export.h
   STATIC_DEFINE ${lib_NAME}_BUILT_AS_STATIC
   )
-TARGET_LINK_LIBRARIES(${lib_NAME} cpPipelineEditor ${target_LIBRARIES})
+TARGET_LINK_LIBRARIES(${lib_NAME} ${target_LIBRARIES})
 
 ## ========================
 ## -- Installation rules --

diff --git a/plugins/cpPluginsMeshFilters/CMakeLists.txt b/plugins/cpPluginsMeshFilters/CMakeLists.txt
index f707ff998f1ab22c39b9ac285ac1b71ec8e07e55..25b63c64d156e220bd5e81e8c11f4741fb290903 100644 (file)
--- a/plugins/cpPluginsMeshFilters/CMakeLists.txt
+++ b/plugins/cpPluginsMeshFilters/CMakeLists.txt
@@ -58,7 +58,7 @@ GENERATE_EXPORT_HEADER(
   EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/plugins/${lib_DIR}/${lib_NAME}_Export.h
   STATIC_DEFINE ${lib_NAME}_BUILT_AS_STATIC
   )
-TARGET_LINK_LIBRARIES(${lib_NAME} cpPipelineEditor ${target_LIBRARIES})
+TARGET_LINK_LIBRARIES(${lib_NAME} ${target_LIBRARIES})
 
 ## ========================
 ## -- Installation rules --

diff --git a/plugins/cpPluginsVisualization/CMakeLists.txt b/plugins/cpPluginsVisualization/CMakeLists.txt
index c74f31493d5c3232d2b20650238155f647456b89..14ab44665c9f6acc68fb602cc30b4e0cadb39103 100644 (file)
--- a/plugins/cpPluginsVisualization/CMakeLists.txt
+++ b/plugins/cpPluginsVisualization/CMakeLists.txt
@@ -58,7 +58,7 @@ GENERATE_EXPORT_HEADER(
   EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/plugins/${lib_DIR}/${lib_NAME}_Export.h
   STATIC_DEFINE ${lib_NAME}_BUILT_AS_STATIC
   )
-TARGET_LINK_LIBRARIES(${lib_NAME} cpPipelineEditor ${target_LIBRARIES})
+TARGET_LINK_LIBRARIES(${lib_NAME} ${target_LIBRARIES})
 
 ## ========================
 ## -- Installation rules --

diff --git a/plugins/cpPluginsWidgets/CMakeLists.txt b/plugins/cpPluginsWidgets/CMakeLists.txt
index a8fb9971633ffe4e3fadadf7fcfc3fbeeb1d835a..a01eca9cf489a7409bcc5f8a8c9b0ee27b4c039f 100644 (file)
--- a/plugins/cpPluginsWidgets/CMakeLists.txt
+++ b/plugins/cpPluginsWidgets/CMakeLists.txt
@@ -58,7 +58,7 @@ GENERATE_EXPORT_HEADER(
   EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/plugins/${lib_DIR}/${lib_NAME}_Export.h
   STATIC_DEFINE ${lib_NAME}_BUILT_AS_STATIC
   )
-TARGET_LINK_LIBRARIES(${lib_NAME} cpPipelineEditor ${target_LIBRARIES})
+TARGET_LINK_LIBRARIES(${lib_NAME} ${target_LIBRARIES})
 
 ## ========================
 ## -- Installation rules --