Removing volumeRendererManager files for addition in folder lib/GUI/Wx/VolumeRender...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ed5f293da4382736d25615574d1989c0d10f6cf..3259dd4fa51e04666585d72f4102658ede52d025 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,11 @@ SET(USE_WXWIDGETS ON)
 SET(USE_VTK ON)
 SET(USE_ITK ON)
 SET(USE_BOOST ON)
+SET(USE_QT4       ON)
+
+IF(USE_QT4)
+  SET(QT_USE_QTUITOOLS ON)
+ENDIF(USE_QT4)
 
 OPTION (${PROJECT_NAME}_DOC "${PROJECT_NAME}_DOC" OFF)
 
@@ -73,6 +78,24 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/CutModule/inte
 INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/src/CutModule/kernel )
 INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/maracasVisuLib/../../../ )
 
+INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR}/lib/GUI/Qt/Viewers
+                     ${PROJECT_SOURCE_DIR}/lib/GUI/Qt/Viewers
+                     ${PROJECT_SOURCE_DIR}/lib/GUI/Qt/VolumeRenderer
+
+
+                     ${PROJECT_SOURCE_DIR}/lib/GUI/Wx/VolumeRenderer
+
+
+
+                     ${PROJECT_SOURCE_DIR}/lib/Kernel/VTKObjects/ViewerWidgets
+                     ${PROJECT_SOURCE_DIR}/lib/Kernel/VTKObjects/VolumeRenderer
+                     ${PROJECT_SOURCE_DIR}/lib/Kernel/ITKVTK
+                    )
+
+
+#JCP Ubuntu this file not found glibconfig.h, config of wxgtk goes wrong somewhere
+INCLUDE_DIRECTORIES(/usr/lib/x86_64-linux-gnu/glib-2.0/include/)
+#JCP Ubuntu this file not found glibconfig.h, config of wxgtk goes wrong somewhere
 
 ADD_SUBDIRECTORY(install)
 ADD_SUBDIRECTORY(lib)

diff --git a/appli/CMakeLists.txt b/appli/CMakeLists.txt
index a33f94230c44ed8226770fe1d08a014c60723525..5d842dfa8e870c357712daff9db2af02f70151b6 100644 (file)
--- a/appli/CMakeLists.txt
+++ b/appli/CMakeLists.txt
@@ -1,3 +1,5 @@
 
 #ADD_SUBDIRECTORY(ManualPaint)
+ADD_SUBDIRECTORY(QtVTKViewer)
 #ADD_SUBDIRECTORY(BasicViewer)
+

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index a00aa43af4fcfb74d034927f2f7dae719a0a89e4..5246cbb475eed7aee2bdb987c98b229dd4cb8086 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,3 +1,8 @@
 # Add a ADD_SUBDIRECTORY command for each of your libraries
 ADD_SUBDIRECTORY(maracasVisuLib)
 ADD_SUBDIRECTORY(doxygen)
+
+
+#JCP 31-05-11
+ADD_SUBDIRECTORY(GUI)
+ADD_SUBDIRECTORY(Kernel)

diff --git a/lib/maracasVisuLib/src/interface/CMakeLists.txt b/lib/maracasVisuLib/src/interface/CMakeLists.txt
index fe5cdb632a41bfc6d8dd7416e2f8eaa815bdd4a5..59b05e2fd98998c539f20c2bd14e9a1ed92aed44 100644 (file)
--- a/lib/maracasVisuLib/src/interface/CMakeLists.txt
+++ b/lib/maracasVisuLib/src/interface/CMakeLists.txt
@@ -1 +1,2 @@
 ADD_SUBDIRECTORY(wxWindows)
+ADD_SUBDIRECTORY(Qt)

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.cpp
index 4473513c2d9cf7e5d29d75f4b0fc8a7ed59f5dba..f5cfafb7f9fd2f14bdd28dea37c72828a153a417 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.cpp
@@ -6,7 +6,7 @@
 /**
 ** Class constructor
 **/
-wxMaracasRenderImageManagementPanel::wxMaracasRenderImageManagementPanel(wxWindow* parent, wxMaracasMultipleVolumeRendererManager* _vol, wxMaracasSurfaceRenderingManager* _surface1, 
+wxMaracasRenderImageManagementPanel::wxMaracasRenderImageManagementPanel(wxWindow* parent, VolumeRendererManager* _vol, wxMaracasSurfaceRenderingManager* _surface1,
                                                                                                                                                 wxMaracasSurfaceRenderingManager* _surface2, wxMaracasSurfaceRenderingManager* _surface3, wxString title, int id)
 : wxDialog(parent, -1, title, wxDefaultPosition, wxDefaultSize, wxRESIZE_BORDER|wxDEFAULT_DIALOG_STYLE)
 {
@@ -144,4 +144,4 @@ void wxMaracasRenderImageManagementPanel::Transform(wxCommandEvent& event)
                wxMessageDialog* diag = new wxMessageDialog(this, wxString(str,wxConvUTF8 ), wxString(str,wxConvUTF8 ), wxICON_ERROR);
                diag->ShowModal();
        }
-}
\ No newline at end of file
+}

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.h
index b970b3a73bc84bb74c594c5e3d08b7ec48e8e90b..7d2167ee9a3b480bb11f6a5862cd73d6c2915601 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.h
@@ -10,7 +10,7 @@ class creaMaracasVisu_EXPORT wxMaracasRenderImageManagementPanel : public wxDial
 {
 public:
 
-       wxMaracasRenderImageManagementPanel(wxWindow* parent, wxMaracasMultipleVolumeRendererManager* vol, wxMaracasSurfaceRenderingManager* surface1, 
+        wxMaracasRenderImageManagementPanel(wxWindow* parent, VolumeRendererManager* vol, wxMaracasSurfaceRenderingManager* surface1,
                wxMaracasSurfaceRenderingManager* surface2, wxMaracasSurfaceRenderingManager* surface3, wxString title, int id);
        ~wxMaracasRenderImageManagementPanel();
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp
index d14ce3518358187cd269ed4c983e22e0f417287a..42e0619af26e84b24f6b7b21223a13d52bd240d4 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp
@@ -4,7 +4,7 @@
 /**
 ** Class constructor
 **/
-wxMaracasRenderImageTransformation::wxMaracasRenderImageTransformation(wxMaracasMultipleVolumeRendererManager* _vol, wxMaracasSurfaceRenderingManager* _surface1, 
+wxMaracasRenderImageTransformation::wxMaracasRenderImageTransformation(VolumeRendererManager* _vol, wxMaracasSurfaceRenderingManager* _surface1,
                                                                        wxMaracasSurfaceRenderingManager* _surface2, wxMaracasSurfaceRenderingManager* _surface3, int id)
 {
        vol = _vol;

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.h
index 314c59eaac785f4d0dc7175ce5e21997d7a54b42..1cff0bb5cadda93e97d2f9e39e4a423e37584316 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.h
@@ -3,7 +3,7 @@
 
 #include <vtkTransform.h>
 
-#include "wxMaracasMultipleVolumeRendererManager.h"
+#include "volumerenderermanager.h"
 #include "wxMaracasSurfaceRenderingManager.h"
 #include "creaMaracasVisu_EXPORT.h"
 
@@ -11,7 +11,7 @@ class creaMaracasVisu_EXPORT wxMaracasRenderImageTransformation
 {
 public:
 
-       wxMaracasRenderImageTransformation(wxMaracasMultipleVolumeRendererManager* vol, wxMaracasSurfaceRenderingManager* surface1, 
+        wxMaracasRenderImageTransformation(VolumeRendererManager* vol, wxMaracasSurfaceRenderingManager* surface1,
                wxMaracasSurfaceRenderingManager* surface2, wxMaracasSurfaceRenderingManager* surface3, int id);
        ~wxMaracasRenderImageTransformation();
 
@@ -19,7 +19,7 @@ public:
        void Refresh()throw(char*);
 
 private:
-       wxMaracasMultipleVolumeRendererManager* vol;
+        VolumeRendererManager* vol;
        wxMaracasSurfaceRenderingManager* surface1;
        wxMaracasSurfaceRenderingManager* surface2;
        wxMaracasSurfaceRenderingManager* surface3;

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
index fd6463b8b8b17a90615aac22737a93ad95912d55..830269a3bcc9154fcd7cb42fdc77038a371fd4a6 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
@@ -4,7 +4,7 @@
 #include "wxMaracasMultipleVolumeRendererPanel.h"
 #include "wxMaracasSurfaceRenderingPanel.h"
 #include "wxMaracasSurfaceRenderingProp3DMHD.h"
-#include "wxMaracasMultipleVolumeRendererManagerData.h"
+#include "volumerenderermanagerdata.h"
 #include "wxMaracasDialog_NViewers.h"
 #include "wxVtkMPR3DViewCntrlPanel.h"
 
@@ -33,7 +33,7 @@ wxMaracasRenderTabbedPanel::wxMaracasRenderTabbedPanel(wxWindow* parent, int id,
        baseView = _baseView;
        dialog = NULL;
 
-       volmanager =      new wxMaracasMultipleVolumeRendererManager();
+        volmanager =      new VolumeRendererManager();
        surrendmanager1 = new wxMaracasSurfaceRenderingManager();
        surrendmanager2 = new wxMaracasSurfaceRenderingManager();
        surrendmanager3 = new wxMaracasSurfaceRenderingManager();

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
index 3dd2a336f045e9805068e2a0f239c9a8f4db22d6..a9d10391125f7efccc49f26912c562fdecd709b8 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
@@ -5,7 +5,7 @@
 #include <wx/notebook.h> 
 
 #include "wxMaracasRenderImageManagementPanel.h"
-#include "wxMaracasMultipleVolumeRendererManager.h"
+#include "volumerenderermanager.h"
 #include "wxMaracasSurfaceRenderingManager.h"
 #include "wxVtkBaseView.h"
 #include "wxMPRWidget.h"
@@ -86,7 +86,7 @@ private:
        int _id;
 
        wxMaracasRenderImageManagementPanel*    dialog;
-       wxMaracasMultipleVolumeRendererManager* volmanager;
+        VolumeRendererManager* volmanager;
        wxMaracasSurfaceRenderingManager*               surrendmanager1;
        wxMaracasSurfaceRenderingManager*               surrendmanager2;
        wxMaracasSurfaceRenderingManager*               surrendmanager3;

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
index 766bf7ee4d522b3b2d809b9177c1559421bdec40..08e209fe520b56a6fc1f5eae9bb3ce98e7ab2de6 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
@@ -19,7 +19,7 @@
 
 #include "wxMaracasRendererView.h"
 #include "wxMaracasRenderTabbedPanel.h"
-#include "wxMaracasMultipleVolumeRendererManager.h"
+#include "volumerenderermanager.h".h"
 #include "wxMaracasSurfaceRenderingManager.h"
 
 class  creaMaracasVisu_EXPORT  wxMaracasRendererView : public wxPanel