From: donadio <donadio>
Date: Tue, 19 May 2009 11:17:24 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~77
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=33ba9bd712e630aa093bb6e3990e119c47cc2e90;p=creaMaracasVisu.git

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h
index a5a9539..688e416 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h
@@ -3,7 +3,7 @@
 #define __ContourExtractData_h_INCLUDED_H__
 
 
-#include <manualContourModel.h>
+#include "manualContourModel.h"
 #include "marTypes.h"
 
 
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx
index f13867d..997814a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx
@@ -1,13 +1,6 @@
 
 #include "ContourVOIWidget.h"
 
-#include "manualContourModelRoi.h"
-#include <vtkImageMapToColors.h>
-#include <vtkImageActor.h>
-
-#include "wxVtk2DBaseView.h"
-
-
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.h
index 2cf1153..2c5229a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.h
@@ -3,13 +3,18 @@
 #define __ContourVOIWidget_h_INCLUDED_H__
 
 
-
-#include <manualRoiControler.h>
-#include <manualViewRoi.h>
+#include "manualContourModelRoi.h"
+#include "manualRoiControler.h"
+#include "manualViewRoi.h"
 #include "wxVtkBaseView.h"
+#include "wxVtk2DBaseView.h"
 #include "mBarRange.h"
 #include "marTypes.h"
   
+#include "vtkImageMapToColors.h"
+#include "vtkImageActor.h"
+
+
 
 
   class ContourVOIWidget;
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/include/manualContourContainer.h b/lib/maracasVisuLib/src/interface/wxWindows/include/manualContourContainer.h
index 70b5940..53dca3c 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/include/manualContourContainer.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/include/manualContourContainer.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: manualContourContainer.h,v $
   Language:  C++
-  Date:      $Date: 2009/05/15 12:59:23 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2009/05/19 11:17:26 $
+  Version:   $Revision: 1.3 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -20,7 +20,6 @@
 
 
 #include <vector>
-//#include "manualContour.h"
 #include "manualContourControler.h"
 #include "manualContourModel.h"
 #include "manualViewContour.h"
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/include/wxMaracasImageBrowser02.cxx b/lib/maracasVisuLib/src/interface/wxWindows/include/wxMaracasImageBrowser02.cxx
index eef3c87..8f1bc7b 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/include/wxMaracasImageBrowser02.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/include/wxMaracasImageBrowser02.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasImageBrowser02.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 13:54:54 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/05/19 11:17:26 $
+  Version:   $Revision: 1.2 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -17,9 +17,7 @@
 
 #include <wx/image.h>
 #include <wx/filedlg.h>
-
 #include "wxMaracasImageBrowser02.h"
-//#include "kernel/marDicomBase.h" // JPRx
 
 DEFINE_EVENT_TYPE(wxEVT_MARACASIMAGEBROWSERCUTIMAGE)
 
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/include/wxMaracasImageBrowser02.h b/lib/maracasVisuLib/src/interface/wxWindows/include/wxMaracasImageBrowser02.h
index 0638726..112082b 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/include/wxMaracasImageBrowser02.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/include/wxMaracasImageBrowser02.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasImageBrowser02.h,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 13:54:54 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/05/19 11:17:26 $
+  Version:   $Revision: 1.2 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -39,7 +39,9 @@
 //#include "widgets/wxImageViewerWidget.h"
 #include "widgets/wxReadingPriorityPanel.h"
 
-#include "manualContour.h"
+#include "manualContourModelRoi.h"
+#include "manualRoiControler.h"
+#include "manualViewRoi.h"
 
 
 BEGIN_DECLARE_EVENT_TYPES()
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/include/wxMaracas_ManualTree_MPRDlg.h b/lib/maracasVisuLib/src/interface/wxWindows/include/wxMaracas_ManualTree_MPRDlg.h
index b87e1d5..2d1abe1 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/include/wxMaracas_ManualTree_MPRDlg.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/include/wxMaracas_ManualTree_MPRDlg.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracas_ManualTree_MPRDlg.h,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 13:54:54 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/05/19 11:17:26 $
+  Version:   $Revision: 1.2 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -25,6 +25,7 @@
 #include "vtkImageData.h"
 
 #include "wxMaracas_ManualTree_MPR.h"
+#include "manualContourModel.h"
 #include "kernel/marAxis.h"
 
 
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h
index 35418a2..f56e272 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMPRWidget.h,v $
   Language:  C++
-  Date:      $Date: 2009/05/15 12:59:25 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2009/05/19 11:17:28 $
+  Version:   $Revision: 1.12 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -44,10 +44,6 @@
 #include <vtkTextProperty.h>
 #include <vtkXYPlotActor.h>
 
-
-//#include "kernel/marInterface.h"
-//#include "manualContour.h"
-
 #include "wxMPRBaseData.h"
 #include "wxVtkBaseView.h"
 
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/wxMaracas_ManualTree_MPR.h b/lib/maracasVisuLib/src/interface/wxWindows/wxMaracas_ManualTree_MPR.h
index c831ea4..46e0826 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/wxMaracas_ManualTree_MPR.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/wxMaracas_ManualTree_MPR.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracas_ManualTree_MPR.h,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 13:54:31 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2009/05/19 11:17:31 $
+  Version:   $Revision: 1.3 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -23,7 +23,7 @@
 #include <wx/panel.h>
 
 #include "vtkImageData.h"
-
+#include "manualContourModel.h"
 #include "widgets/wxManualTree_MPRWidget.h"
 
 class wxMaracas_ManualTree_MPR : public wxPanel