+/*# ---------------------------------------------------------------------
+#
+# 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
wxVtkBaseView_SceneManager :: wxVtkBaseView_SceneManager( wxVtkBaseView * theWxBaseViewToManage, wxEvtHandler * theEventHandler, double * spc )
{
- SetWidthContour(1.0);
+
_lastInteraction = NULL;
_lastInteractionName = "";
_eventHandler = theEventHandler;
_waiting = false;
_creatingROI = false;
_drawingSelectionROI = false;
-
+ SetWidthContour(1.0);
_wxVtk_BaseView = theWxBaseViewToManage;
if( _wxVtk_BaseView!=NULL )
manViewerContour->SetModel( manModelContour );
manViewerContour->SetWxVtkBaseView( _wxVtk_BaseView );
manViewerContour->SetRange( _widthOfControlPoint );
- manViewerContour->SetZ( 1000 );
+ manViewerContour->SetZ( -900 );
manViewerContour->SetSpacing(spc);
_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 );
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;
}
manualViewBaseContour *cViewer;
ContourWrap_ViewControl *conwraviwcont;
std::map <std::string, ContourWrap_ViewControl *>::iterator iter;
-
+
if (_contours_ViewControl!=NULL)
{
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