X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualContour%2FmanualContourBaseControler.cpp;h=7ed909728ec9f4f950dc1ad61876926a787f487f;hb=01623c2f1bfd464bb9a8e8c86d36f7bfc6314427;hp=24c974bf7d91a7027627295cad099b41627d9559;hpb=885faee171b5cdcbcbbcb6cc83e6d196544e005c;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp
index 24c974b..7ed9097 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp
@@ -226,6 +226,8 @@ bool manualContourBaseControler::OnRightButtonDown()
 
 		SetCompleteCreation( true );
 		SetKeyBoardMoving( false );
+		cout<<"RaC manualContourBaseControler::OnRightButtonDown"<<endl;
+		this->GetManualContourModel()->SetCloseContour(true);
 		MouseClickRight(X,Y);
 	}
 	return true;
@@ -236,13 +238,13 @@ bool manualContourBaseControler::OnRightButtonUp()
 	return true;
 }
 // ----------------------------------------------------------------------------
-void manualContourBaseControler::SetModelView(manualContourModel *manContModel, manualViewBaseContour *manViewBaseCont){
+void manualContourBaseControler::SetModelView(manualBaseModel *manContModel, manualViewBaseContour *manViewBaseCont){
 	_manContModel		=	manContModel;
 	_manViewBaseCont	=	manViewBaseCont;
 	_manViewBaseCont->SetEditable( &_editable );
 }
 // ----------------------------------------------------------------------------
-manualContourModel* manualContourBaseControler::GetManualContourModel()
+manualBaseModel* manualContourBaseControler::GetManualContourModel()
 {
 	return _manContModel;
 }
@@ -288,10 +290,13 @@ void manualContourBaseControler::MouseDLeft(int x, int y )
 {
 	if (_state==0)
 	{
+		
 		int z=GetZ();
-		GetManualViewBaseContour()->SelectPosibleContour(x,y,z);
-		GetManualViewBaseContour()->SelectPosiblePoint(x,y,z);
-		if ( GetManualViewBaseContour()->GetPosibleSelected() )
+		bool temp = _manViewBaseCont->SelectPosibleContour(x,y,z);
+
+		_manViewBaseCont->SelectPosiblePoint(x,y,z);
+
+		if ( _manViewBaseCont->GetPosibleSelected() )
 		{
 			_editable = true;
 		}