From 0b83bddf132ca34f0e22ee89583ec73524142f71 Mon Sep 17 00:00:00 2001
From: "eduardo.davila@creatis.insa-lyon.fr"
 <eduardo.davila@creatis.insa-lyon.fr>
Date: Fri, 7 Feb 2025 16:32:47 +0100
Subject: [PATCH] #3576 Clean keyPoints selection in ManualContour module

---
 .../manualContourBaseControler.cpp             |  4 ++++
 .../manualContour/manualContourControler.cpp   | 18 ++++++++++++------
 .../manualContour/manualViewBaseContour.cpp    |  3 ++-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp
index 834f59f..969d1fa 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp
@@ -177,10 +177,14 @@ bool manualContourBaseControler::OnMouseMove()
 		_wxVTKiren= _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor();
 		_wxVTKiren->GetEventPosition( X , Y );
 
+        /*
 		if ( (_vtkInteractorStyleBaseView->GetInteractor()->GetControlKey()==0) &&
 	 		(_vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey()==0) ) {
 			MouseMove(X,Y);
 		}
+         */
+        MouseMove(X,Y);
+
 	}
 	return true;
 }
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourControler.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourControler.cpp
index 97ce37f..f00f0cc 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourControler.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourControler.cpp
@@ -77,9 +77,11 @@ void manualContourControler::MouseClickLeft(int x, int y)
 	// Insert a Control Point with shift+ClickLeft
 	vtkRenderWindowInteractor *vtkrenderwindowinteractor = _vtkInteractorStyleBaseView->GetInteractor();
 
+    int ps = GetManualViewBaseContour()->GetPosibleSelected();
+    
 	if( IsEditable() )
 	{
-		if ( (_vtkInteractorStyleBaseView!=NULL) && (GetState()==0) && ( (vtkrenderwindowinteractor!=NULL) && (vtkrenderwindowinteractor->GetShiftKey()==1) ) )
+		if ( (_vtkInteractorStyleBaseView!=NULL) && (GetState()==0) && ( (vtkrenderwindowinteractor!=NULL) && (vtkrenderwindowinteractor->GetShiftKey()==1) )   &&  (GetManualViewBaseContour()->GetPosibleSelected()==false) &&  (GetManualViewBaseContour()->GetIdPoint(x,y,z)==-1) )
 		{
 			ok=true;
 			InsertPoint(x,y,z);
@@ -93,15 +95,16 @@ void manualContourControler::MouseClickLeft(int x, int y)
 			GetManualContourModel()->SetCloseContour(false);
 			AddPoint(x,y,z);
 		}
-		// Continuie to Insert Control Points with ClickLeft (After being empty the contour)
+		// Continue to Insert Control Points with ClickLeft (After being empty the contour)
 		if ((GetState()==1) && (_easyCreation==true) )
 		{
 			ok=true;
 			AddPoint(x,y,z);
 			_bakIdPoint=GetNumberOfPointsManualContour() - 1;
 		}
+        
 		// Insert Control Points IF Contour is Selected
-		if ((GetState()==0) && GetManualViewBaseContour()->GetPosibleSelected() )
+		if ((GetState()==0) && GetManualViewBaseContour()->GetPosibleSelected()  && (vtkrenderwindowinteractor->GetShiftKey()==0) )
 		{
 			ok=true;
 			InsertPoint(x,y,z);
@@ -109,7 +112,7 @@ void manualContourControler::MouseClickLeft(int x, int y)
 			SetState(6);
 		}
 		// Chose id of Control Point to be move
-		if ( (GetState()==0 || GetState()==6) && (GetManualViewBaseContour()->GetIdPoint(x,y,z)!=-1 ) )
+		if ( (GetState()==0 || GetState()==6) && (GetManualViewBaseContour()->GetIdPoint(x,y,z)!=-1 )   && (vtkrenderwindowinteractor->GetShiftKey()==0)   )
 		{
 			ok=true;
 			_bakIdPoint = GetManualViewBaseContour()->GetIdPoint(x,y,z);
@@ -158,7 +161,11 @@ void manualContourControler::MouseClickLeft(int x, int y)
 void manualContourControler::MouseMove(int x, int y) // virtual
 {
 	int z = GetZ();
-	GetManualViewBaseContour()->SelectPosiblePoint(x,y,z);
+    int shiftKey = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey();
+    if (shiftKey==0)
+    {
+        GetManualViewBaseContour()->SelectPosiblePoint(x,y,z);
+    }
 	GetManualViewBaseContour()->SelectPosibleContour(x,y,z);
 	if (GetState()==1){	SetPoint( _bakIdPoint , x , y ,z); }
 	if (GetState()==5){	SetPoint( _bakIdPoint , x , y ,z); }
@@ -167,7 +174,6 @@ void manualContourControler::MouseMove(int x, int y) // virtual
 	{
 		GetManualViewBaseContour()->MoveContour(x,y,z);
 	} // if State 6
-    
 	if (GetState()!=7 || GetManualViewBaseContour()->GetPosibleSelected() )
     {
 		GetManualViewBaseContour()->Refresh();
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
index d78cc62..3dc3ebc 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
@@ -652,7 +652,8 @@ bool manualViewBaseContour::SelectPosibleContour(int x, int y, int z)
 	} // if !GetEditable() && !_selected && id!= -1
 */
 
-       if ( (GetEditable()==true) && (id==-1 ) && (this->_lstViewPoints.size()>=2) )
+
+       if (  (GetEditable()==true) && (id==-1 ) && (this->_lstViewPoints.size()>=2)  )
             {
                 if (ifTouchContour(x,y,z)==true)
                 {
-- 
2.49.0