#2971 creaMaracasVisu Feature New Normal ColorLayerImage - ColorBar position

[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 0eed1ed66fa2c6317cfc4e3f626cac72e757a2fe..7de96c458c2fe9bcb3224ccbb9bfa372c264a2f0 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
@@ -48,6 +73,7 @@ pGraphicalFunction:: pGraphicalFunction(wxString name, int flags)
        offsetPixelY=0;
        xTraslation=0;
        mType=DEFAULT;
+       
 }
 
 /**
@@ -159,7 +185,6 @@ bool pGraphicalFunction:: AddNewPoint(int x,int y)
 */
 bool pGraphicalFunction::AddPoint(int aX, int aY,bool order) 
 {      
-       printf("EED %p pGraphicalFunction::AddPoint %p (%d %d) \n", this, logicFunction, aX, aY);       
        bool added=false;
        if (logicFunction!=NULL){
                added=logicFunction -> AddPoint( aX, aY,order );
@@ -286,6 +311,7 @@ wxNode* pGraphicalFunction:: getBefore(pFunctionPoint* point)
        int minDiference=10000000;
        wxNode* node=logicFunction->GetPointAt(0);
        wxNode* before=NULL;
+
        while(node)
        {
                pFunctionPoint* before1=(pFunctionPoint*)node->GetData();
@@ -396,7 +422,7 @@ double pGraphicalFunction::interpolateY(double m, int x1,int y1,int x)
                //realPoints.DeleteC  
 
                np = logicFunction->getSizePoints();
-               nps = 100;
+               nps = 200;
                delta=( double ) ( np ) / ( double ) ( nps );
                for( i = 0; i < nps; i++ )
                {