From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Fri, 23 Apr 2010 14:54:42 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~24
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=45a6da15a19d765f1365859c2e92a4d968b71b7e;p=creaMaracasVisu.git

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.cpp
index 0f5a183..551f76e 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.cpp
@@ -1,5 +1,27 @@
 #include "creaContoursFactory.h"
 
+#include "manualContourControler.h"
+#include "manualCircleControler.h"
+#include "manualContourModelCircle.h"
+#include "manualViewCircle.h"
+#include "manualLineControler.h"
+#include "manualContourModelLine.h"
+#include "manualViewLine.h"
+#include "manualRoiControler.h"
+#include "manualViewRoi.h"
+#include "manualContourModelRoi.h"
+#include "manualViewBullEye.h"
+#include "manualContourModelBullEye.h"
+#include "manualViewPoints.h"
+#include "manualRotationToolControler.h"
+#include "manualContourModelRotationTool.h"
+#include "manualViewRotationTool.h"
+#include "manualContourModelPolygon.h"
+#include "manualView3DContour.h"
+#include "manualContour3DControler.h"
+#include "manualContour3V3DControler.h"
+
+
 creaContoursFactory::creaContoursFactory()
 {
 
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.h
index 5a15477..18546b4 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.h
@@ -1,27 +1,10 @@
 #ifndef creaContoursFactory_h
 #define creaContoursFactory_h
 
-#include "manualContourControler.h"
 #include "manualBaseModel.h"
 #include "manualViewBaseContour.h"
-#include "manualCircleControler.h"
-#include "manualContourModelCircle.h"
-#include "manualViewCircle.h"
-#include "manualLineControler.h"
-#include "manualContourModelLine.h"
-#include "manualViewLine.h"
-#include "manualRoiControler.h"
-#include "manualViewRoi.h"
-#include "manualContourModelRoi.h"
-#include "manualViewBullEye.h"
-#include "manualContourModelBullEye.h"
-#include "manualViewPoints.h"
-#include "manualRotationToolControler.h"
-#include "manualContourModelRotationTool.h"
-#include "manualViewRotationTool.h"
-#include "manualContourModelPolygon.h"
-#include "manualView3DContour.h"
-#include "manualContour3V3DControler.h"
+#include "manualContourBaseControler.h"
+
 
 class creaMaracasVisu_EXPORT creaContoursFactory
 {
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp
index 1774773..43a6260 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp
@@ -466,7 +466,8 @@ void manualContourBaseControler::AddPoint(int x, int y, int z) // virtual
 		
 
 		GetManualViewBaseContour()->TransfromCoordViewWorld(xx,yy,zz);
-		/*int	id		=*/  GetManualContourModel()->AddPoint(xx,yy,zz);  // JPRx
+printf("EED %p manualContourBaseControler::AddPoint \n", this);
+		GetManualContourModel()->AddPoint(xx,yy,zz);  
 		GetManualViewBaseContour()->AddPoint();
 //		GetManualViewBaseContour()->UpdateViewPoint(id);
 	}
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
index 0d8d177..f7a1a79 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
@@ -670,7 +670,7 @@ void manualContourModel::OpenData(FILE *ff)
 	fscanf(ff,"%s",tmp); // value
 	std::cout<<tmp<<std::endl;
 	//if(strcmp(tmp != "NO_LABEL") // JPR
-	if(strcmp(tmp,"NO_LABEL" != 0)
+	if(strcmp(tmp,"NO_LABEL") != 0)
 		SetLabel(tmp);
 
 	fscanf(ff,"%s",tmp); // Real_size
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
index bc2cfd2..f448458 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
@@ -529,7 +529,7 @@ bool manualViewBaseContour::SelectPosibleContour(int x, int y, int z)
 			{
 				result=true;
 				SetPosibleSelected(result);
-			}
+			} 
 		}
 
 	}
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
index 4fee498..7b4e18f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
@@ -58,6 +58,7 @@ void manualViewContour::Open(FILE *pFile)
 // ----------------------------------------------------------------------------
 void manualViewContour::RefreshContour() // virtual
 {
+printf("EED %p manualViewContour::RefreshContour \n", this );
 	int i,np,nps;
 
 //JSTG 25-02-08 --------------------