X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxVtkBaseView_SceneManager.cxx;h=1f6a2cfe61e802f42bd13e1e2b2a00eb00463fac;hb=469e6994cecb1763109864df0be7067fe5c344f3;hp=70fd6293e70d0924a5d4bcadadb73116dc8b625f;hpb=7ef64acb00d37e665e0bf019b9a7ede2495bf155;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
index 70fd629..1f6a2cf 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
@@ -45,6 +45,7 @@
 // Generated events declaration and definition
 //------------------------------------------------------------------------------------------------------------
 
+/* EED 2022-09-30 
 DEFINE_EVENT_TYPE( wxEVT_START_CREATE_MULT_ROI )	
 DEFINE_EVENT_TYPE( wxEVT_STOP_CREATE_MULT_ROI )	
 DEFINE_EVENT_TYPE( wxEVT_START_CREATE_ROI )
@@ -61,6 +62,23 @@ DEFINE_EVENT_TYPE( wxEVT_MOVING_ROI_POINT )
 DEFINE_EVENT_TYPE( wxEVT_SELECTED_ROI_POINT )	
 DEFINE_EVENT_TYPE( wxEVT_UNSELECTED_ROI_POINT )	
 DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )	
+*/
+wxDEFINE_EVENT(wxEVT_START_CREATE_MULT_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_STOP_CREATE_MULT_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_START_CREATE_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_STOP_CREATE_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_DELETE_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_SELECTED_MULT_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_SELECTED_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_UNSLECTED_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_MANUAL_HIDED_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_MANUAL_SHOWED_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_EDITING_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_MOVING_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_MOVING_ROI_POINT, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_SELECTED_ROI_POINT, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_UNSELECTED_ROI_POINT, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_CHANGED_DEEP, wxCommandEvent);
 
 
 	wxVtkBaseView_SceneManager :: wxVtkBaseView_SceneManager( wxVtkBaseView * theWxBaseViewToManage, wxEvtHandler * theEventHandler, double * spc )
@@ -79,7 +97,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		_waiting						= false;
 		_creatingROI					= false;
 		_drawingSelectionROI			= false;
-		SetWidthContour(1.0);	
+		_showTextContour				= false;
+		SetWidthContour( 3.0/2 );
 		_wxVtk_BaseView = theWxBaseViewToManage;
 		if( _wxVtk_BaseView!=NULL )
 		{
@@ -88,6 +107,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 			SetVtkInteractorStyleBaseView( theInteractorStyleBaseView );			
 		}
 		configureSelectionROI( spc );
+		configureTextNumberOfContour();
 	}
 
 	//------------------------------------------------------------------------------------------------------------
@@ -237,9 +257,9 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		manViewerContour->RefreshContour();			
 		addToScene( theKeyName );
 	}
-	//------------------------------------------------------------------------------------------------------------
-	void wxVtkBaseView_SceneManager :: configureSelectionROI( double * spc )
-	{
+//------------------------------------------------------------------------------------------------------------
+void wxVtkBaseView_SceneManager :: configureSelectionROI( double * spc )
+{
 		_controlerSelectionROI = new manualRoiControler();
 		_viewerSelectionROI = new manualViewRoi();
 		_modelSelectionROI = new manualContourModel();
@@ -255,10 +275,34 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		_controlerSelectionROI->SetModelView( _modelSelectionROI , _viewerSelectionROI );
 		((vtkInteractorStyleBaseView*)_wxVtk_BaseView->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _controlerSelectionROI );
 		_controlerSelectionROI->SetActive(false);
-	}
+}
 
-	//------------------------------------------------------------------------------------------------------------
-	ContourWrap_ViewControl * wxVtkBaseView_SceneManager :: insertWrap( std::string theKeyName, manualContourBaseControler * manContourControl, manualViewBaseContour  * manViewerContour )
+//------------------------------------------------------------------------------------------------------------
+void wxVtkBaseView_SceneManager::configureTextNumberOfContour()
+{
+	// Text Window Level
+	vtkTextActor *textActor = vtkTextActor::New();
+	textActor->SetDisplayPosition(10, 85);
+	textActor->SetInput("contours:--");
+	// Set coordinates to match the old vtkScaledTextActor default value
+	textActor->GetPosition2Coordinate()->SetCoordinateSystemToNormalizedViewport();
+	textActor->GetPosition2Coordinate()->SetValue( 0.2 , 0.2 );
+	vtkTextProperty *tprop = textActor->GetTextProperty();
+	tprop->SetFontSize(14);
+	tprop->SetFontFamilyToArial();
+	tprop->SetColor(1, 1, 0);
+	_wxVtk_BaseView->GetRenderer()->AddActor2D(textActor);
+	_numberOfContoursTextActor=textActor;
+}
+
+//------------------------------------------------------------------------------------------------------------
+void wxVtkBaseView_SceneManager::SetLabelNumberOfContours( std::string label )
+{
+	_numberOfContoursTextActor->SetInput( label.c_str() );
+}
+
+//------------------------------------------------------------------------------------------------------------
+ContourWrap_ViewControl * wxVtkBaseView_SceneManager :: insertWrap( std::string theKeyName, manualContourBaseControler * manContourControl, manualViewBaseContour  * manViewerContour )
 	{	
 		ContourWrap_ViewControl * newContourWrap = new ContourWrap_ViewControl(manContourControl, manViewerContour);
 		if(_contours_ViewControl == NULL)
@@ -522,22 +566,34 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		if( !append )
 		{
 			removeSceneContours();			
-		}		
+		} // if !append
+
 		_sceneContours_ViewControl->insert(std::pair <std::string, ContourWrap_ViewControl *> ( theKeyName, contourWRP ) );		
-		if ( visualization )
+
+		if ( visualization==true )
 		{
 			contourWRP->getViewer()->AddCompleteContourActor( ifShowCtrlPoints );
-		}
+		} // if visualization
 
-		if( control )
+		if( control==true )
 		{
 			((vtkInteractorStyleBaseView*)_wxVtk_BaseView->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( contourWRP->getControler() );
-		}
-		if( ifActive )
+		} // if contour
+
+		if( !control )
+		{
+			contourWRP->getViewer()->SetColorNormalContour(1,0,0);
+		} else {
+			contourWRP->getViewer()->SetColorNormalContour(0,0,1);
+		} // if !contour
+
+		if( ifActive==true )
 		{
 			contourWRP->getControler()->SetActive( true );	
 			contourWRP->getViewer()->RemoveTextActor();
-		}
+		} // if ifActive
+
+		contourWRP->getViewer()->SetShowText(_showTextContour);
 	}
 
 	//------------------------------------------------------------------------------------------------------------
@@ -1233,6 +1289,11 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		} // if 
 	}
 
+	void wxVtkBaseView_SceneManager::SetShowTextContour(bool show)
+	{
+		_showTextContour = show;
+	}
+
 	bool wxVtkBaseView_SceneManager::isEditableCControler(std::string theKeyName){
 		
 		ContourWrap_ViewControl* ccon = getContourWrap_ViewControlOf(theKeyName);