X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualContour%2FmanualViewBaseContour.cpp;h=4a3daf76285f937bec47a54b3999b5184599562f;hb=1e7de89ec5e380426c57ee4e85c6a5ccd5aa44ad;hp=bc2cfd2ad133d8eb24b1f0032ebc7ec4d27cc761;hpb=5b48f9a5462110a1400b510b897b7d6a1758dca6;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
index bc2cfd2..4a3daf7 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "manualViewBaseContour.h"
 
 
@@ -84,8 +109,8 @@ void manualViewBaseContour :: AddCompleteContourActor(  bool ifControlPoints )
 	 /*vtkRenderer * theRenderer = */  _wxvtkbaseview->GetRenderer();  // JPRx ??
 	 //Adding the spline
 	 AddSplineActor();
-
 	 AddTextActor();
+
 	 //Adding each control point
 	 if( ifControlPoints )
 		AddControlPoints();
@@ -186,12 +211,18 @@ void manualViewBaseContour::AddControlPoints()
 // ----------------------------------------------------------------------------
 void manualViewBaseContour::AddTextActor()
 {
-	_wxvtkbaseview->GetRenderer()->AddActor2D( _textActor );
+	if(_show_text)
+	{
+		_wxvtkbaseview->GetRenderer()->AddActor2D( _textActor );
+	}
 }
 // ----------------------------------------------------------------------------
 void manualViewBaseContour::RemoveTextActor()
 {
-	_wxvtkbaseview->GetRenderer()->RemoveActor2D( _textActor );
+	if(_show_text)
+	{
+		_wxvtkbaseview->GetRenderer()->RemoveActor2D( _textActor );
+	}
 }
 // ----------------------------------------------------------------------------
 void manualViewBaseContour::DeleteVtkObjects()
@@ -267,20 +298,16 @@ void manualViewBaseContour::ConstructVTKObjects()
     _bboxMapper			=	vtkPolyDataMapper::New();
     _bboxMapper->ScalarVisibilityOff( );
 
-
 	_bboxMapper->SetInput(_pd);
 	_bboxMapper->ImmediateModeRenderingOn();
 	_contourVtkActor->SetMapper(_bboxMapper);
 	_contourVtkActor->GetProperty()->BackfaceCullingOff();
 
-
 	UpdateColorActor();
 
 	_pd->ComputeBounds();
 
 	InitTextActor();
-	
-	
 }
 
 void manualViewBaseContour::InitTextActor()
@@ -531,7 +558,6 @@ bool manualViewBaseContour::SelectPosibleContour(int x, int y, int z)
 				SetPosibleSelected(result);
 			}
 		}
-
 	}
 	return result;
 }
@@ -893,7 +919,7 @@ void manualViewBaseContour::SetVisible(bool ok)
 void manualViewBaseContour::SetShowText(bool ok)
 {
 	_show_text = ok;
-	if (_show_text==false)
+	if (_show_text==false && _textActor!=NULL)
 	{
 		_textActor->SetInput("00");
 	}