BUG 1439 and 1438

[creaContours.git] / lib / Interface_ManagerContour_NDimensions / wxVtkBaseView_SceneManager.cxx

diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
index 0189493190fe812c3197d0f74bf5d57d8a5a7de5..be3aa7622c2262b1f40a2810dead5df3c48a3a3d 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
@@ -40,7 +40,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 
        wxVtkBaseView_SceneManager :: wxVtkBaseView_SceneManager( wxVtkBaseView * theWxBaseViewToManage, wxEvtHandler * theEventHandler, double * spc )
        {
-               SetWidthContour(1.0);
+               
                _lastInteraction                                = NULL;
                _lastInteractionName                            = "";
                _eventHandler                                   = theEventHandler;
@@ -57,7 +57,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                _waiting                                        = false;
                _creatingROI                                    = false;
                _drawingSelectionROI                            = false;
-
+               SetWidthContour(1.0);
                
                _wxVtk_BaseView = theWxBaseViewToManage;
                if( _wxVtk_BaseView!=NULL )
@@ -196,7 +196,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                manViewerContour->SetModel( manModelContour );
                manViewerContour->SetWxVtkBaseView( _wxVtk_BaseView );
                manViewerContour->SetRange( _widthOfControlPoint );
-               manViewerContour->SetZ( 1000 );
+               manViewerContour->SetZ( -900 ); 
 
                manViewerContour->SetSpacing(spc);
 
@@ -227,7 +227,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 +241,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;
        } 
@@ -1187,13 +1191,14 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                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