*** empty log message ***

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb802493560b06267655f5e63c319d78342f247c..8e4eec37db26ab1e9ea1e6d409927ae448b4081c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,25 +15,21 @@ SET(PROJECT_BUILD_VERSION 1)
 
 SET(CREA_VERBOSE_CMAKE TRUE)
 
-
 FIND_PACKAGE(crea REQUIRED)
 IF (crea_FOUND)
   INCLUDE(${crea_USE_FILE})
 ENDIF(crea_FOUND)
 
-
 FIND_PACKAGE(creaEnvironment REQUIRED)
 IF (creaEnvironment_FOUND)
   INCLUDE(${creaEnvironment_USE_FILE})
 ENDIF(creaEnvironment_FOUND)
 
-
 FIND_PACKAGE(creaMaracasVisu REQUIRED)
 IF (creaMaracasVisu_FOUND)
   INCLUDE(${creaMaracasVisu_USE_FILE})
 ENDIF(creaMaracasVisu_FOUND)
 
-
 #FIND_PACKAGE(creaImageIO REQUIRED)
 #IF (creaImageIO_FOUND)
 #  INCLUDE(${creaImageIO_USE_FILE})
@@ -45,8 +41,8 @@ IF (creaImageIO2_FOUND)
 ENDIF(creaImageIO2_FOUND)
 
 
-SET(USE_GDCM ON)
-SET(USE_GDCM_VTK ON)
+SET(USE_GDCM OFF)
+SET(USE_GDCM_VTK OFF)
 SET(USE_WXWIDGETS ON)
 SET(USE_VTK ON)
 SET(USE_ITK ON)

diff --git a/lib/Interface_ManagerContour_NDimensions/ContourWrap_ViewControl.h b/lib/Interface_ManagerContour_NDimensions/ContourWrap_ViewControl.h
index 4b7ec0ca00d24b77c23ddfecc1e5f8ec8b78ea64..109d9488587bf3f5686ab17b8ba57898cbff1152 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/ContourWrap_ViewControl.h
+++ b/lib/Interface_ManagerContour_NDimensions/ContourWrap_ViewControl.h
@@ -19,7 +19,8 @@
 //------------------------------------------------------------------------------------------------------------
 // Includes
 //------------------------------------------------------------------------------------------------------------
-#include <manualContour.h>
+#include "manualContourBaseControler.h"
+#include "manualViewBaseContour.h"
 
 //------------------------------------------------------------------------------------------------------------
 // Events declaration

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index 9109393fda5083f8f11e50dfdfe86d835bcec45b..80caa583baf24919e62ffee61709d9b9a1f01d11 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -13,12 +13,6 @@
 #include "NameWrapper.h"
 #include "wx/artprov.h"
 #include "ConceptDataWrap.h"
-
-#include <manualContour.h>
-//#include "ImageSourceThing.h"
-//#include "wxContour_ActionCommandsID.h"
-//#include "OutlineModelBuilder.h"
-//#include "wxContourEventHandler.h"
 #include <creaWx.h>
 
 //----------------------------------------------------------------------------------------------------------------

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index b86de8da0dbb17cc77b83a3994a9d6368110f307..4f34fdbd8662f247b362b2a76625f40334e8bbc0 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -32,7 +32,9 @@
 #include "ContourExtractData.h"
 #include "PerformingOperation.h"
 
-
+#include "manualLineControler.h"
+#include "manualContourModelLine.h"
+#include "manualViewLine.h"
 
 //#include "ContourThing.h"
 //#include "AxeThing.h"

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.h b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.h
index d639d53a3a65853bf515135cdd700ccb0400b60b..660df4fdc86b88a00fdc6b6bfaff9a34ba1d2f59 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.h
@@ -24,12 +24,11 @@
 #include "mBarRange.h"
 #include "wxMaracas_N_ViewersWidget.h"
 #include "vtkImageData.h"
-#include <manualContour.h>
 #include "wxVtkBaseView.h"
 #include <iostream>
 #include <wx/event.h>
 #include "wxVtkBaseView_SceneManager.h"
-#include "manualContour.h"
+#include "manualContourModel.h"
 
 #include <vtkImageMapToWindowLevelColors.h>
 
@@ -43,7 +42,9 @@ BEGIN_DECLARE_EVENT_TYPES()
 END_DECLARE_EVENT_TYPES()
 
 
-/** file wxContourViewPanel.h */
+/** file wx
+
+ViewPanel.h */
 
 //------------------------------------------------------------------------------------------------------------
 // Class definition

diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.h b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.h
index 32362276d2ff19f94e4bce6686bc5793af6ccd22..d4f5bc26ddb0c5aa30d78e70484363fd5ce4df65 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.h
@@ -24,7 +24,16 @@
 #include "wxVtkBaseView.h"
 #include <iostream>
 #include <map>
-#include <manualContour.h>
+#include "manualContourModel.h"
+#include "manualRoiControler.h"
+#include "manualContourBaseControler.h"
+#include "manualCircleControler.h"
+#include "manualLineControler.h"
+#include "manualViewBaseContour.h"
+#include "manualViewBullEye.h"
+#include "manualViewCircle.h"
+#include "manualViewLine.h"
+#include "manualViewRoi.h"
 #include <wx/event.h>
 
 //------------------------------------------------------------------------------------------------------------

diff --git a/lib/kernel_ManagerContour_NDimensions/ContourThing.h b/lib/kernel_ManagerContour_NDimensions/ContourThing.h
index 8fc88b1eb37d9ef77f4615761c0d76e6eb0552a0..80e3e8a06529f98f7d9e9d7f9654381c18a528fe 100644 (file)
--- a/lib/kernel_ManagerContour_NDimensions/ContourThing.h
+++ b/lib/kernel_ManagerContour_NDimensions/ContourThing.h
@@ -10,7 +10,7 @@
 #include "CommandObject.h"
 #include "ExecutableCommand.h"
 #include "ComposedCommand.h"
-#include "manualContour.h"
+#include "manualContourModel.h"
 
 class ContourThing{
 

diff --git a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h
index a2661344bb796b2e941c7310bc4fc921b92987a6..023846c7164fbce76065d74f40b6253f6e440976 100644 (file)
--- a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h
+++ b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h
@@ -16,6 +16,11 @@
 
 #include "ContourPropagation.h"
 
+#include "manualContourModel.h"
+#include "manualContourModelCircle.h"
+#include "manualContourModelLine.h"
+#include "manualContourModelRoi.h"
+
 #include <vtkImageChangeInformation.h>
 
 class KernelManagerContour{