*** 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 0f5a183b945aa4e135528bd1ecbe96d96a8b5340..551f76e79065b9bcb2109951b5f85d407283ac70 100644 (file)
--- 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 5a15477042f1fa22160ce0b957d17968c2def5dd..18546b4079ec6078d5b60867633a0c0f6b141d15 100644 (file)
--- 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 17747734ade15cbf25e11b7dffd259d882f59c66..43a626013110c9209c8a1f01f7946e22c4541bce 100644 (file)
--- 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 0d8d177413b877a6aca37e03af8e396d0f9680c2..f7a1a7955909522c179281abcfc5697a6f815adc 100644 (file)
--- 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 bc2cfd2ad133d8eb24b1f0032ebc7ec4d27cc761..f448458d1dcccfce36e0d4e3faecb4bde3916ef7 100644 (file)
--- 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 4fee4987fa2750e887e9c64ec022169e0a53f931..7b4e18f57b64c0a2f11c9c64254bacb93062d365 100644 (file)
--- 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 --------------------