X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourViewPanel.cxx;h=85952db7722110586daf1ed22d76099a95e6f558;hb=0ac5c532df0c8e1506a58b22ccb4369426f56c4f;hp=de7b90660a8eb27c230f8b4a4736f2bcbef7fbeb;hpb=d8ae77db08ab2e951c0e984c20fc47b615744abb;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
index de7b906..85952db 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
@@ -58,8 +58,8 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 	{
 		theShowingImage->GetSpacing(last_spacing);
 		showingVID 				= theShowingImage;
-		_before					= false;
-		_after					= false;
+		_showBeforeContour		= false;
+		_showAfterContour		= false;
 		int gapH 				= 20;
 		int gapV 				= 10;
 		_verticalConceptName 	= "";
@@ -719,11 +719,14 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 			_sceneManager->addToScene(name, true, true, true, false, false );
 		} // for i
 
+		_sceneManager->SetLabelNumberOfContours( "contours:"+std::to_string(size) );
+
 		std::vector<int> tempVector;
 		wxContourMainFrame::getInstance()->getInstantVector( tempVector );
 
-		if (_before==true)
+		if (_showBeforeContour==true)
 		{
+			size=0;
 			std::vector<std::string> lstNameBefor;
 			// Contours Befor
 			for (i=tempVector[1]-1; i>=0; i--)
@@ -742,8 +745,9 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 			} // for i
 		} // if _before Contour
 	
-		if (_after==true)
+		if (_showAfterContour==true)
 		{
+			size=0;
 			std::vector<std::string> lstNameAfter;
 			// Contours After
 			int ext[6];
@@ -766,15 +770,18 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 		} // if _after Contour
 	}
 
-	std::vector<std::string> wxContourViewPanel::getSelectedObjects(){
+	std::vector<std::string> wxContourViewPanel::getSelectedObjects()
+	{
 		return _sceneManager->getSelectedObjects();
 	}
 
-	void wxContourViewPanel::RefreshInterface(){
+	void wxContourViewPanel::RefreshInterface()
+	{
 		getWxVtkBaseView()->Refresh();
 	}
 
-	vtkImageData* wxContourViewPanel::getImageData(){
+	vtkImageData* wxContourViewPanel::getImageData()
+	{
 		return _sceneManager->GetImageData();
 	}
 
@@ -829,8 +836,13 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 
 	void wxContourViewPanel::onBeforeAfterContour(bool before, bool after)
 	{
-		_before = before;
-		_after 	= after;
+		_showBeforeContour 	= before;
+		_showAfterContour 	= after;
+	}
+
+	void wxContourViewPanel::onShowTextContour(bool show)
+	{
+		_sceneManager->SetShowTextContour( show );
 	}
 
 	void wxContourViewPanel::GetPointsOfActualContour( std::vector<double> *vecX, std::vector<double> *vecY, std::vector<double> *vecZ )
@@ -838,7 +850,8 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 		_sceneManager->GetPointsOfActualContour(vecX, vecY, vecZ);
 	}
 
-	void wxContourViewPanel::setImageSlice(int z){
+	void wxContourViewPanel::setImageSlice(int z)
+	{
 		vtkInteractorStyleBaseView* stylebaseview = (vtkInteractorStyleBaseView*) _sceneManager->getWxVtkViewBase()->GetInteractorStyleBaseView();
 		wxVtk2DBaseView* baseview = (wxVtk2DBaseView*)stylebaseview->GetWxVtk2DBaseView();
 		baseview->SetActualSlice(z);