From: donadio <donadio>
Date: Wed, 20 May 2009 12:46:11 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~26
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e12b7f2166c9aeae510907210c450d7044a6a352;p=creaContours.git

*** empty log message ***
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb80249..8e4eec3 100644
--- 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 4b7ec0c..109d948 100644
--- 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 9109393..80caa58 100644
--- 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 b86de8d..4f34fdb 100644
--- 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 d639d53..660df4f 100644
--- 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 3236227..d4f5bc2 100644
--- 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 8fc88b1..80e3e8a 100644
--- 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 a266134..023846c 100644
--- 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{