#3347 creaMaracasVisu Bug New Normal - ViewerMPR2D Reset back position when set...

[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 073cba028b26d183b6e798efa327b901140e5589..7a640dd33c468da91398b299af363e6904ba9731 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.cpp
@@ -1,18 +1,45 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
-
+       _label                          = "";
+       _label2                         = "--";
 }
 
 // ----------------------------------------------------------------------------
 manualBaseModel::~manualBaseModel()
 {
        int i,size=_lstPoints.size();
-       for (i=0;i<size; i++){
+       for (i=0;i<size; i++)
+       {
                delete _lstPoints[i];
        }
        _lstPoints.clear();
@@ -267,7 +294,7 @@ void manualBaseModel::SetNumberOfPointsSpline(int size)
        _sizePointsContour = size;
 }
 // ---------------------------------------------------------------------------
-double manualBaseModel::GetPathSize()
+double manualBaseModel::GetPathSize(double *spc)
 {
        return 0.0;
 }
@@ -326,7 +353,7 @@ std::vector<manualBaseModel*> manualBaseModel::ExploseModel(  )
 }
 
 // ---------------------------------------------------------------------------
-double manualBaseModel::GetPathArea()
+double manualBaseModel::GetPathArea( double *spc )
 {
        return 0.0;
 }
@@ -341,9 +368,6 @@ bool manualBaseModel::IfCloseContour()
        return false;
 }
 //CMRU 17-08-09----------------------------------------------------------------------------
-void manualBaseModel::SetLabel(std::string newLabel)
-{
-}
 
 void manualBaseModel::SetRealSize(double newRealSize) 
 {
@@ -354,11 +378,30 @@ double manualBaseModel::GetRealSize()
        return -1;
 }
 
+void manualBaseModel::OpenData(FILE *ff)
+{
+}
+
+void manualBaseModel::SetLabel(std::string newLabel)
+{
+       _label = newLabel;
+}
+
 std::string manualBaseModel::GetLabel()
 {
-       return "";
+       return _label;
 }
-void manualBaseModel::OpenData(FILE *ff)
+
+void manualBaseModel::SetLabel2(std::string newLabel)
 {
+       _label2 = newLabel;
 }
+
+std::string manualBaseModel::GetLabel2()
+{
+       return _label2;
+}
+
+
+
 //----------------------------------------------------------------------------