From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Fri, 24 Apr 2009 12:25:29 +0000 (+0000)
Subject: BUG interaction click right
X-Git-Tag: EED.02Oct2009~99
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=5966a6fc8f1b45882a5f2ab391c92d3c80f8c137;p=creaMaracasVisu.git

BUG interaction click right
---

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.cpp
index 7b424d2..9dc5f2b 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.cpp
@@ -1553,7 +1553,7 @@ void manualViewContour::RefreshText()  // virtual
 			}
 		}
 
-		_textActor -> SetInput(resultText);
+		_textActor->SetInput(resultText);
 
 		if (size>=1){
 
@@ -5052,6 +5052,7 @@ bool manualContourBaseControler::OnChar()
 // ----------------------------------------------------------------------------
 bool manualContourBaseControler::OnMouseMove()
 {
+	
 	if ( _vtkInteractorStyleBaseView!=NULL)
 	{
 		int X,Y;
@@ -5173,14 +5174,15 @@ void manualContourBaseControler::MouseClickLeft(int x, int y) // virtual
 // ----------------------------------------------------------------------------
 void manualContourBaseControler::MouseClickRight(int x, int y)
 {
-	if (_state==1)
-	{
-		_state=0;
-	}
+//	if (_state==1)
+//	{
+//		_state=0;
+//	}
 	SetEditable( false );
 	SetPosibleToMove( false );
-	//_state = 0;
-	_state=7;
+	_state = 0;
+
+//EED 24Avril2009	_state=7;
 }
 // ----------------------------------------------------------------------------
 void manualContourBaseControler::MouseReleaseLeft(int x, int y)
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
index 35d68fb..ac5f3eb 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracas_ViewerWidget.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/04/23 16:03:30 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2009/04/24 12:25:31 $
+  Version:   $Revision: 1.8 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -182,27 +182,19 @@
 	  
 	wxMaracas_ViewerWidget::~wxMaracas_ViewerWidget()
 	{
+		if (mvtkmprbasedata) { delete mvtkmprbasedata;  }
+		if (mvtk2Dbaseview) { delete mvtk2Dbaseview; }
+		if (mvtkmpr2Dview_X) { delete mvtkmpr2Dview_X; }
+		if (mvtkmpr2Dview_Y) { delete mvtkmpr2Dview_Y; }
+		if (mvtkmpr2Dview_Z) { delete mvtkmpr2Dview_Z; }
+		if (mwidgetMesure) { delete mwidgetMesure; }
+		if (mvtkplane2Dview) { delete mvtkplane2Dview; }
+		if (mwxsphereview) { delete mwxsphereview; }
+		if (mwxvtkclipping3Dview) { delete mwxvtkclipping3Dview; }
+		if (mwxvtk3Dbaseview_Clipping3D) { delete mwxvtk3Dbaseview_Clipping3D; }
+		if (mwxvtkmpr3Dview) { delete mwxvtkmpr3Dview; }
 
-		testDelete(mvtkmprbasedata);
-		testDelete(mvtk2Dbaseview);
-		testDelete(mvtkmpr2Dview_X); 
-		testDelete(mvtkmpr2Dview_Y); 
-		testDelete(mvtkmpr2Dview_Z); 
-		testDelete(mwidgetMesure);
-		testDelete(mvtkplane2Dview);
-		testDelete(mwxsphereview); 
-		testDelete(mwxvtkclipping3Dview);
-		testDelete(mwxvtk3Dbaseview_Clipping3D);
-		testDelete(mwxvtkmpr3Dview);
-
-	}
-
-	void wxMaracas_ViewerWidget::testDelete(void* point){
-		if(point!=NULL){
-			delete point;  ///EED ??????
-		}
 	}
-	    
 	//------------------------------------------------------------------------------------------------------------
 	// Methods
 	//------------------------------------------------------------------------------------------------------------
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.h
index ccba0ba..1d584ad 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracas_ViewerWidget.h,v $
   Language:  C++
-  Date:      $Date: 2009/03/24 10:49:21 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2009/04/24 12:25:31 $
+  Version:   $Revision: 1.3 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -93,8 +93,6 @@
 		wxVtk3DBaseView					*mwxvtk3Dbaseview_Clipping3D;
 		wxVtkMPR3DView					*mwxvtkmpr3Dview;
 
-
-		void testDelete(void* point);
   };
 
 #endif // __WX__MARACAS__VIEWERWIDGET__H__