#3323 creaMaracasVisu Feature New Normal - label2 for manal contours

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
index 7f4d128eb4135f35993b2db96c426b0c3eef1de8..9744ed09929f34e83c7f4db8c4ad789d1f6a6822 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
@@ -51,7 +51,6 @@ manualContourModel::manualContourModel()
 //---------------------------------------------------------------------------------------------------------------
 //CMRU 17-08-09 -------------------------------------------------------------------------------------------------
        _realSize                       = 0.0;
-       _label                          = "";
 //---------------------------------------------------------------------------------------------------------------
 }
 
@@ -671,9 +670,11 @@ void manualContourModel::SaveData(FILE *ff)
 {
        std::string etiqueta = GetLabel();
        if(etiqueta.empty())
+       {
                fprintf(ff,"Label: NO_LABEL\n");
-       else
+       } else {
                fprintf(ff,"Label: %s\n",etiqueta.c_str());
+       } // if etiqueta
        fprintf(ff,"Real_Size: %f\n",GetRealSize());
 }
 
@@ -686,8 +687,9 @@ void manualContourModel::OpenData(FILE *ff)
        std::cout<<tmp<<std::endl;
        //if(strcmp(tmp != "NO_LABEL") // JPR
        if(strcmp(tmp,"NO_LABEL") != 0)
+       {
                SetLabel(tmp);
-
+       }
        fscanf(ff,"%s",tmp); // Real_size
        fscanf(ff,"%s",tmp);// #
 
@@ -748,11 +750,6 @@ void manualContourModel::Transform_Ax_Plus_B (double Ax, double Bx, double Ay, d
 
 
 //CMRU 17-08-09----------------------------------------------------------------------------
-void manualContourModel::SetLabel(std::string newLabel)
-{
-       _label = newLabel;
-}
-
 void manualContourModel::SetRealSize(double newRealSize) 
 {
        _realSize = newRealSize;
@@ -763,8 +760,4 @@ double manualContourModel::GetRealSize()
        return _realSize;
 }
 
-std::string manualContourModel::GetLabel()
-{
-       return _label;
-}
 //----------------------------------------------------------------------------