From aa8fbbbb438c300e7593d3d70ca84cd4c24d6645 Mon Sep 17 00:00:00 2001 From: Juan Prieto Date: Tue, 31 May 2011 18:38:47 +0000 Subject: [PATCH] Removing volumeRendererManager files for addition in folder lib/GUI/Wx/VolumeRender, modification of some methods to make it generic to use with Qt --- CMakeLists.txt | 23 +++++++++++++++++++ appli/CMakeLists.txt | 2 ++ lib/CMakeLists.txt | 5 ++++ .../src/interface/CMakeLists.txt | 1 + .../wxMaracasRenderImageManagementPanel.cpp | 4 ++-- .../wxMaracasRenderImageManagementPanel.h | 2 +- .../wxMaracasRenderImageTransformation.cpp | 2 +- .../wxMaracasRenderImageTransformation.h | 6 ++--- .../widgets/wxMaracasRenderTabbedPanel.cpp | 4 ++-- .../widgets/wxMaracasRenderTabbedPanel.h | 4 ++-- .../wxWindows/widgets/wxMaracasRendererView.h | 2 +- 11 files changed, 43 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ed5f29..3259dd4 100644 --- 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 a33f942..5d842df 100644 --- 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 a00aa43..5246cbb 100644 --- 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 fe5cdb6..59b05e2 100644 --- 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 4473513..f5cfafb 100644 --- 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 b970b3a..7d2167e 100644 --- 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 d14ce35..42e0619 100644 --- 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 314c59e..1cff0bb 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.h @@ -3,7 +3,7 @@ #include -#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 fd6463b..830269a 100644 --- 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 3dd2a33..a9d1039 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h @@ -5,7 +5,7 @@ #include #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 766bf7e..08e209f 100644 --- 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 -- 2.45.2