#2989 creaMaracasVisu Bug New Normal - ManualContourModel duplicate last point...

[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 0e4becc52e749e048b89ce62bdf4ed104c9a6f99..7e3e8b83387a4e228c2ecf9e601482633c0a7941 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 "manualContourModel.h"
 
 // ----------------------------------------------------------------------------
@@ -31,6 +56,12 @@ manualContourModel::manualContourModel()
 
        _delta_JSTG                     = 0.0;
 //---------------------------------------------------------------------------------------------------------------
+
+//CMRU 17-08-09 -------------------------------------------------------------------------------------------------
+       _realSize                       = 0.0;
+       _label                          = "";
+//---------------------------------------------------------------------------------------------------------------
+
 }
 
 // ----------------------------------------------------------------------------
@@ -45,7 +76,7 @@ manualContourModel::~manualContourModel()
        _cntSplineX->RemoveAllPoints();
        _cntSplineY->RemoveAllPoints();
        _cntSplineZ->RemoveAllPoints();
-       
+
        _cntSplineX->Delete();
        _cntSplineY->Delete();
        _cntSplineZ->Delete();
@@ -260,7 +291,6 @@ void manualContourModel::SetNumberOfPointsSpline(int size)
        _sizePointsContour = size;
 }
 
-
 // ----------------------------------------------------------------------------
 
 void manualContourModel::SetCloseContour(bool closeContour)
@@ -307,7 +337,8 @@ void manualContourModel::UpdateSpline() // virtual
                _delta_JSTG = (double) (np) / double (_sizePointsContour - 1);  //Without the -1 the curve is not close
        } else {
 //             _delta_JSTG = (double) (np-1) / double (_sizePointsContour );  //Without the -1 the curve is not close
-               _delta_JSTG = (double) (np) / double (_sizePointsContour-1 );  //Without the -1 the curve is not close
+//EED 9/7/2016                 _delta_JSTG = (double) (np) / double (_sizePointsContour-1 );  //Without the -1 the curve is not close
+               _delta_JSTG = (double) (np-1) / double (_sizePointsContour-1 );  //Without the -1 the curve is not close
        }
 //-----------------------------------------------------------------------------------------------------------
 }
@@ -327,14 +358,14 @@ void manualContourModel::UpdateSpline() // virtual
 void manualContourModel::GetSpline_i_Point(int i, double *x, double *y, double *z) // virtal
 {
        GetSpline_t_Point(i*_delta_JSTG,x,y,z);
-}
+
 
 // ----------------------------------------------------------------------------
 
 //JSTG 25-02-08 ---------------------------------------------------------------
 void manualContourModel::GetSpline_t_Point(double t, double *x, double *y, double *z)
 {
-               if (_lstPoints.size()==0)
+       if (_lstPoints.size()==0)
        {
                *x      = 0;
                *y      = 0;
@@ -620,7 +651,6 @@ void manualContourModel::Open(FILE *ff) // virtual
        }
 }
 
-
 // ----------------------------------------------------------------------------
 int manualContourModel::GetTypeModel() //virtual
 {
@@ -646,7 +676,36 @@ void manualContourModel::Save(FILE *ff) // virtual
                fprintf(ff,"%f %f %f\n", mp->GetX(), mp->GetY(), mp->GetZ() );
        }
 }
+//CMRU 03-09-09-----------------------------------------------------------------------------------------------
+void manualContourModel::SaveData(FILE *ff)
+{
+       std::string etiqueta = GetLabel();
+       if(etiqueta.empty())
+               fprintf(ff,"Label: NO_LABEL\n");
+       else
+               fprintf(ff,"Label: %s\n",etiqueta.c_str());
+       fprintf(ff,"Real_Size: %f\n",GetRealSize());
+}
+
+void manualContourModel::OpenData(FILE *ff)
+{
+       char tmp[255];
+
+       fscanf(ff,"%s",tmp); // Label:
+       fscanf(ff,"%s",tmp); // value
+       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);// #
+
+       //tmp.ToDouble(&tmp);
+       SetRealSize(atof(tmp));
+}
+
+//------------------------------------------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 
@@ -673,9 +732,49 @@ void manualContourModel::AddManualPoint( manualPoint* theManualPoint )//private
        _lstPoints.push_back( theManualPoint );
 }
 
-std::vector<manualContourModel*> manualContourModel::ExploseModel(  )
+std::vector<manualBaseModel*> manualContourModel::ExploseModel(  )
 {
-       std::vector<manualContourModel*> lstTmp;
+       std::vector<manualBaseModel*> lstTmp;
        lstTmp.push_back(this);
        return lstTmp;
 }
+
+
+// ----------------------------------------------------------------------------
+void manualContourModel::Transform_Ax_Plus_B (double Ax, double Bx, double Ay, double By)
+{
+       manualPoint * mp;
+
+       int i, size = GetSizeLstPoints();
+
+       for( i=0; i<size; i++ )
+       {
+               mp = GetManualPoint( i );
+
+               mp->SetPointX( mp->GetX()*Ax + Bx );
+               mp->SetPointY( mp->GetY()*Ay + By );
+       }
+}
+
+
+//CMRU 17-08-09----------------------------------------------------------------------------
+void manualContourModel::SetLabel(std::string newLabel)
+{
+       _label = newLabel;
+}
+
+void manualContourModel::SetRealSize(double newRealSize) 
+{
+       _realSize = newRealSize;
+}
+
+double manualContourModel::GetRealSize()
+{
+       return _realSize;
+}
+
+std::string manualContourModel::GetLabel()
+{
+       return _label;
+}
+//----------------------------------------------------------------------------