#2971 creaMaracasVisu Feature New Normal ColorLayerImage - ColorBar position

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.cxx
index 3c8d9250a88bfbf1fb76ad1e801a37032131cf3f..d60b5fb73937ab48e18beef901a8c57584d46cf5 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.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
@@ -118,7 +143,11 @@ bool pLogicalFunction:: AddNewPoint(int x,int y)
        bool includedPoint = realPoints.Append(newPoint)!=NULL;
        if(includedPoint)
        {
-           bool order=orderPoints();
+               bool order=true;
+               if(realPoints.size()>1){
+                       order=orderPoints();
+               }
+           
                return order; 
        }
        return includedPoint;
@@ -141,8 +170,14 @@ bool pLogicalFunction::orderPoints()
        int nextX;
 
        // Used for validating 'leftToRigthDef'
-       pFunctionPoint* ordFirstPoint = (pFunctionPoint*)realPoints.GetFirst()-> GetData();
-       pFunctionPoint* ordLastPoint = (pFunctionPoint*)(lastNodeIncluded->GetPrevious())-> GetData();
+       pFunctionPoint* ordFirstPoint = NULL;
+       pFunctionPoint* ordLastPoint =  NULL;
+       if(node!=NULL){
+               ordFirstPoint = (pFunctionPoint*)realPoints.GetFirst()-> GetData();
+       }
+       if(lastNodeIncluded->GetPrevious()!=NULL){
+               ordLastPoint = (pFunctionPoint*)(lastNodeIncluded->GetPrevious())-> GetData();
+       }
 
 
        // Normal drawing