3517 ShowNPoints actual Point

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.cxx
index 6deb8aea327a8625eed070b6c9c97eb59a89fa9f..5bbc22337e12eb8b2ef9b1d919827aaa0f46cd32 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.cxx
@@ -8,7 +8,7 @@
 ModelShowNPoints::ModelShowNPoints()
 {
        firsttime=true;
-       currentPoint = -1;
+       idCurrentPoint = -1;
 }
 //----------------------------------------------------------------------
 
@@ -71,11 +71,11 @@ void ModelShowNPoints::SetReferencePoint(std::vector<double> ppoint)
        mReferencePoint = ppoint;
        if(lstPointsX.size() > 0){
                int idPoint = IdInsidePoint();
-               if(idPoint == -1 && currentPoint >= 0 && currentPoint < lstPointsX.size()){     
-                       currentPoint = currentPoint;
+               if(idPoint == -1 && idCurrentPoint >= 0 && idCurrentPoint < lstPointsX.size()){
+            idCurrentPoint = idCurrentPoint;
                }
                else{
-                       currentPoint = idPoint;
+            idCurrentPoint = idPoint;
                }
        }
 }
@@ -439,7 +439,20 @@ void ModelShowNPoints::InversLstPoints()
 }
 
 //----------------------------------------------------------------------
-int ModelShowNPoints::GetCurrentPoint()
+int ModelShowNPoints::GetIdCurrentPoint()
 {
-       return currentPoint;
+       return idCurrentPoint;
+}
+
+//----------------------------------------------------------------------
+void ModelShowNPoints::SetIdCurrentPoint(int idPoint)
+{
+    if (GetLstPointsSize()==0)
+    {
+        idCurrentPoint=-1;
+    } else {
+        idCurrentPoint=idPoint;
+        if (idCurrentPoint<0) {idCurrentPoint=0;}
+        if (idCurrentPoint>=GetLstPointsSize() ) {idCurrentPoint=GetLstPointsSize()-1; }
+    } // if Size==0
 }