#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 81f843b8c0aa699630f202d305a04bbe91293ee8..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,15 +185,17 @@ bool pGraphicalFunction:: AddNewPoint(int x,int y)
 */
 bool pGraphicalFunction::AddPoint(int aX, int aY,bool order) 
 {      
-       
-       bool added=logicFunction -> AddPoint( aX, aY,order );
-       if(!fromWindow)
-        setUp();
-       else
-       {
-               logicFunction->setEndPoints();
-               logicFunction->setStartPoints();
-       }
+       bool added=false;
+       if (logicFunction!=NULL){
+               added=logicFunction -> AddPoint( aX, aY,order );
+               if(!fromWindow)
+                       setUp();
+               else
+               {
+                       logicFunction->setEndPoints();
+                       logicFunction->setStartPoints();
+               } // if fromWindow
+       } // if logicFunction
        return added;
 }
 
@@ -229,6 +257,7 @@ bool pGraphicalFunction::hasPoint(wxPoint aPoint)
 {
        return logicFunction -> hasPoint( aPoint );     
 }
+*/
 
 /**
 * Returns the real x values of the control points of the function. It dont includes the points calculated by interpolation.
@@ -282,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();
@@ -392,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++ )
                {
@@ -536,8 +566,8 @@ void pGraphicalFunction::zooming(int clickedX,int clickedY,int width)
                wxNode* node=logicFunction->GetPointAt(0);
                pFunctionPoint* p;
 
-               float middleWX=(((float)(screenX-100))/2)/scaleX;
-               float middleWY=(((float)(screenY-50))/2)/scaleY;
+               //float middleWX=(((float)(screenX-100))/2)/scaleX; // JPRx
+               //float middleWY=(((float)(screenY-50))/2)/scaleY; // JPRx
                
                //node=node->GetNext(); 
                while(node)
@@ -821,7 +851,7 @@ void pGraphicalFunction :: setColorPoints(std::vector<pColorPoint *> &colorVecto
 {
        f_colorPoints.clear();
        int i = 0;      
-       while(i<colorVector.size())
+       while(i<(int)(colorVector.size()))
        {
                f_colorPoints.push_back(colorVector[i]);                
                i++;
@@ -835,7 +865,7 @@ void pGraphicalFunction :: setColorPoints(std::vector<pColorPoint *> &colorVecto
 void pGraphicalFunction :: getColorPoints(std::vector<pColorPoint *> &colorVector)
 {
        int i = 0;      
-       while(i<f_colorPoints.size())
+       while(i<(int)(f_colorPoints.size()))
        {
                pColorPoint * originaslPoint = f_colorPoints[i];
                pColorPoint * copyPoint = new pColorPoint(originaslPoint->getRealX(), originaslPoint->getColor(), originaslPoint->isTemporalColor());