X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxVtkBaseView_SceneManager.cxx;h=aac92df99d4bdd62a7cdccd40469018230601430;hb=2995826ee50f882a609e7350780ffc7bea0e7db2;hp=128f1bca280b567bb6e3659a5756a728f0205189;hpb=40033c782c0c68ecc676bb59de5c7fe9eb3cac44;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
index 128f1bc..aac92df 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
@@ -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.
+# ------------------------------------------------------------------------ */
+
 
 //----------------------------------------------------------------------------------------------------------------
 // Class definition include
@@ -40,24 +65,24 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 
 	wxVtkBaseView_SceneManager :: wxVtkBaseView_SceneManager( wxVtkBaseView * theWxBaseViewToManage, wxEvtHandler * theEventHandler, double * spc )
 	{
-		_widthOfContour					= 1.0;
+		
 		_lastInteraction				= NULL;
-		_lastInteractionName			= "";
+		_lastInteractionName				= "";
 		_eventHandler					= theEventHandler;
 		_leftClickCount					= 0;
 		_rigthClickCount				= 0;
 		
-		_contours_ViewControl			= new std::map< std::string, ContourWrap_ViewControl * >();
-		_sceneContours_ViewControl		= new std::map< std::string, ContourWrap_ViewControl * >();
+		_contours_ViewControl				= new std::map< std::string, ContourWrap_ViewControl * >();
+		_sceneContours_ViewControl			= new std::map< std::string, ContourWrap_ViewControl * >();
 		_workingGroup					= new std::map< std::string, ContourWrap_ViewControl * >();
 
 		_creatingMULT_ROI				= false;
-		_editingROI						= false;
-		_toIncludeAtInteractionGroup	= false;
-		_waiting						= false;
+		_editingROI					= false;
+		_toIncludeAtInteractionGroup			= false;
+		_waiting					= false;
 		_creatingROI					= false;
-		_drawingSelectionROI			= false;
-
+		_drawingSelectionROI				= false;
+		SetWidthContour(1.0);
 		
 		_wxVtk_BaseView = theWxBaseViewToManage;
 		if( _wxVtk_BaseView!=NULL )
@@ -195,8 +220,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		//Configuring the relations between the contour members representation			
 		manViewerContour->SetModel( manModelContour );
 		manViewerContour->SetWxVtkBaseView( _wxVtk_BaseView );
-		manViewerContour->SetRange( 0.5 );
-		manViewerContour->SetZ( 1000 );
+		manViewerContour->SetRange( _widthOfControlPoint );
+		manViewerContour->SetZ( -900 );	
 
 		manViewerContour->SetSpacing(spc);
 
@@ -227,7 +252,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		_viewerSelectionROI->SetModel( _modelSelectionROI );
 		_viewerSelectionROI->SetWxVtkBaseView( _wxVtk_BaseView );
 		_viewerSelectionROI->SetRange( 2 );
-		_viewerSelectionROI->SetZ( 1000 );
+		_viewerSelectionROI->SetZ( -900 );
 		_viewerSelectionROI->SetColorNormalContour(0.6, 0.8, 0);
 
 		_viewerSelectionROI->SetSpacing( spc );
@@ -241,6 +266,10 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 	ContourWrap_ViewControl * wxVtkBaseView_SceneManager :: insertWrap( std::string theKeyName, manualContourBaseControler * manContourControl, manualViewBaseContour  * manViewerContour )
 	{	
 		ContourWrap_ViewControl * newContourWrap = new ContourWrap_ViewControl(manContourControl, manViewerContour);
+		if(_contours_ViewControl == NULL)
+		{
+			_contours_ViewControl = new std::map< std::string, ContourWrap_ViewControl * >();
+		}
 		_contours_ViewControl->insert(std::pair <std::string, ContourWrap_ViewControl *> ( theKeyName, newContourWrap ));
 		return newContourWrap;
 	} 
@@ -1182,17 +1211,23 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 	//------------------------------------------------------------------------------------------------------------
 	void wxVtkBaseView_SceneManager::SetWidthContour(double width)
 	{
-		_widthOfContour = width;
+		_widthOfContour 	= width;
+		_widthOfControlPoint 	= _widthOfContour*_widthOfContour/2;
 		manualViewBaseContour		*cViewer;
 		ContourWrap_ViewControl		*conwraviwcont;
 		std::map <std::string, ContourWrap_ViewControl *>::iterator iter; 
-
-		for (iter=_contours_ViewControl->begin(); iter!=_contours_ViewControl->end(); iter++ )
+	
+		if (_contours_ViewControl!=NULL)
 		{
-			conwraviwcont	= iter->second;
-			cViewer			= conwraviwcont->getViewer();
-			cViewer->SetWidthLine(_widthOfContour);
-		}
+			for (iter=_contours_ViewControl->begin(); iter!=_contours_ViewControl->end(); iter++ )
+			{
+				conwraviwcont		= iter->second;
+				cViewer			= conwraviwcont->getViewer();
+				cViewer->SetShowText( false );					// EED 28Mars2011
+				cViewer->SetWidthLine( _widthOfContour );
+				cViewer->SetRange( _widthOfControlPoint );
+			} // for
+		} // if 
 	}
 
 	bool wxVtkBaseView_SceneManager::isEditableCControler(std::string theKeyName){