#3058 creaMaracasVisu Feature New Normal - optimizing of manualContourView of a...

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / manualContour / manualBaseModel.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.cpp
index 5819d6c7dcbc391fd814086d77b1eb80dd8d4595..06d7f330374a88f974fd0cad4e22e5c5a591e04f 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.cpp
@@ -1,9 +1,34 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "manualBaseModel.h"
 
 // ----------------------------------------------------------------------------
 manualBaseModel::manualBaseModel()
 {
-
+//EED2017
        _sizePointsContour      = 100;                  //JSTG 25-02-08 The change in the inisialization of these variable is critical.
 
 }
@@ -12,7 +37,8 @@ manualBaseModel::manualBaseModel()
 manualBaseModel::~manualBaseModel()
 {
        int i,size=_lstPoints.size();
-       for (i=0;i<size; i++){
+       for (i=0;i<size; i++)
+       {
                delete _lstPoints[i];
        }
        _lstPoints.clear();
@@ -67,7 +93,6 @@ int manualBaseModel::InsertPoint(double x,double y,double z)
                }
        }
 
-
        InsertPoint_id(ibak,x,y,z);
 
        return ibak;
@@ -119,7 +144,6 @@ void manualBaseModel::MoveAllPoints(double dx,double dy,double dz)
        }
 }
 
-
 // ----------------------------------------------------------------------------
 // type=-1  x,y,z
 // type=0      y,z
@@ -184,7 +208,7 @@ int  manualBaseModel::GetIdPoint(double x, double y, double z, int i_range,int t
 // ----------------------------------------------------------------------------
 int     manualBaseModel::IsPoint(double x, double y)
 {
-       double xx,yy,zz;
+       double xx,yy/*,zz*/;
        bool exists=false;
        int i,size=_lstPoints.size();
        for (i=0;i<size;i++){
@@ -199,7 +223,6 @@ int  manualBaseModel::IsPoint(double x, double y)
                }
        }
        return exists;
-
 }
 // ----------------------------------------------------------------------------
 manualPoint* manualBaseModel::GetManualPoint(int id)
@@ -245,20 +268,20 @@ void manualBaseModel::CopyAttributesTo( manualBaseModel * cloneObject)
        }
 }
 
-
 // ---------------------------------------------------------------------------
 void manualBaseModel::AddManualPoint( manualPoint* theManualPoint )
 {
        _lstPoints.push_back( theManualPoint );
 }
-
+// ---------------------------------------------------------------------------
 void manualBaseModel::Open(FILE *ff)   // virtual
 {
 }
+// ---------------------------------------------------------------------------
 void manualBaseModel::Save(FILE *ff)   // virtual
 {
 }
-
+// ---------------------------------------------------------------------------
 void manualBaseModel::SaveData(FILE *ff)// virtual
 {
 }
@@ -269,16 +292,16 @@ void manualBaseModel::SetNumberOfPointsSpline(int size)
 {
        _sizePointsContour = size;
 }
-
+// ---------------------------------------------------------------------------
 double manualBaseModel::GetPathSize()
 {
        return 0.0;
 }
-
+// ---------------------------------------------------------------------------
 void manualBaseModel::Transform_Ax_Plus_B (double Ax, double Bx, double Ay, double By)
 {
 }
-
+// ---------------------------------------------------------------------------
 void manualBaseModel::GetSpline_i_Point(int i, double *x, double *y, double *z)
 {
        //RaC 20-09-09 IF it's a points contour
@@ -297,9 +320,7 @@ void manualBaseModel::GetSpline_i_Point(int i, double *x, double *y, double *z)
                        *y      = mp->GetY();
                        *z      = mp->GetZ();
                }
-
        }
-
 }
 
 void manualBaseModel::GetSpline_t_Point(double t, double *x, double *y, double *z)
@@ -331,17 +352,17 @@ std::vector<manualBaseModel*> manualBaseModel::ExploseModel(  )
 }
 
 // ---------------------------------------------------------------------------
-double                 manualBaseModel::GetPathArea()
+double manualBaseModel::GetPathArea()
 {
        return 0.0;
 }
-void                   manualBaseModel::GetNearestPointAndNormal(double *p, double *rp,  double *rn)
+void manualBaseModel::GetNearestPointAndNormal(double *p, double *rp,  double *rn)
 {
 }
-void                   manualBaseModel::SetCloseContour(bool closeContour)
+void manualBaseModel::SetCloseContour(bool closeContour)
 {
 }
-bool                   manualBaseModel::IfCloseContour()
+bool manualBaseModel::IfCloseContour()
 {
        return false;
 }