#3144 creaMaracasVisu Bug New Normal - changeWx28to30

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / pPlotter / pGraphicalFunction.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.cxx
index 5e3ce6310b642ff57065b254ad69d7258ed89761..1a8cd58d65d4b66a55b8ec4d7037a49ae5263cec 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.cxx
@@ -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.
+# ------------------------------------------------------------------------ */
+
 
 //----------------------------------------------------------------------------
 // Class definition include
@@ -27,27 +52,27 @@ IMPLEMENT_CLASS(pGraphicalFunction, pPlotterLayer)
 pGraphicalFunction:: pGraphicalFunction(wxString name, int flags)
 {
        SetName(name);
-       showPointsF = false;
-       validPointRange = 5;
-       logicFunction = new pLogicalFunction ();
-       fromWindow=false;
-       factorZoom=1;
-       drawing=false;
-       editable=true;
-       ifActual=false;
-       zoomIn=false;
-       setOffsetX(0);
+       showPointsF             = false;
+       validPointRange         = 5;
+       logicFunction           = new pLogicalFunction ();
+       fromWindow                      = false;
+       factorZoom                      = 1;
+       drawing                         = false;
+       editable                        = true;
+       ifActual                        = false;
+       zoomIn                          = false;
+       setOffsetX(0) ;
        setOffsetY(0);
-       initialDrawingPoint=NULL;
-       finalDrawingPoint=NULL;
+       initialDrawingPoint     = NULL;
+       finalDrawingPoint       = NULL;
        //type=1 means that is going to be a piecewise function
-       _type=1;
-       xKSpline=NULL;
-       yKSpline=NULL;
-       offsetPixelX=0;
-       offsetPixelY=0;
-       xTraslation=0;
-       mType=DEFAULT;
+       _type                           = 1;
+       xKSpline                        = NULL;
+       yKSpline                        = NULL;
+       offsetPixelX            = 0;
+       offsetPixelY            = 0;
+       xTraslation                     = 0;
+       mType                           = DEFAULT;
        
 }
 
@@ -199,9 +224,9 @@ bool pGraphicalFunction::deletePointAt(int index)
 {
        bool added=logicFunction -> deletePointAt( index );
        if(!fromWindow)
-        setUp();
-       else
        {
+               setUp();
+       } else {
                logicFunction->setEndPoints();
                logicFunction->setStartPoints();
        }