X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxVtkBaseView_SceneManager.cxx;h=1d8f1e51659104368b0f3234d3f609dade2ee545;hb=28671ae02163f2b674da599a98a128f58dfead88;hp=f8b9c9f440f216ea25a8d9959f0436417d64cc15;hpb=fc258c8e3f71aff8b57a8299d540b292405b7fe6;p=creaContours.git diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx index f8b9c9f..1d8f1e5 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx @@ -1,8 +1,34 @@ +/*# --------------------------------------------------------------------- +# +# 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 //---------------------------------------------------------------------------------------------------------------- #include "wxVtkBaseView_SceneManager.h" +#include "wxVtk2DBaseView.h" //---------------------------------------------------------------------------------------------------------------- // Class implementation @@ -39,33 +65,31 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) wxVtkBaseView_SceneManager :: wxVtkBaseView_SceneManager( wxVtkBaseView * theWxBaseViewToManage, wxEvtHandler * theEventHandler, double * spc ) { - _widthOfContour = 1.0; _lastInteraction = NULL; _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 * >(); _workingGroup = new std::map< std::string, ContourWrap_ViewControl * >(); - _creatingMULT_ROI = false; _editingROI = false; _toIncludeAtInteractionGroup = false; _waiting = false; _creatingROI = false; _drawingSelectionROI = false; - + SetWidthContour(1.0); _wxVtk_BaseView = theWxBaseViewToManage; if( _wxVtk_BaseView!=NULL ) { - vtkInteractorStyleBaseView* theInteractorStyleBaseView = _wxVtk_BaseView->GetInteractorStyleBaseView(); + vtkInteractorStyleBaseView* theInteractorStyleBaseView = (vtkInteractorStyleBaseView*)_wxVtk_BaseView->GetInteractorStyleBaseView(); theInteractorStyleBaseView->AddInteractorStyleMaracas( this ); SetVtkInteractorStyleBaseView( theInteractorStyleBaseView ); } configureSelectionROI( spc ); } + //------------------------------------------------------------------------------------------------------------ wxVtkBaseView_SceneManager :: ~wxVtkBaseView_SceneManager() { @@ -75,13 +99,13 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) { _contours_ViewControl->erase( iter ); i++; - } - delete _contours_ViewControl; + } // for _contours_ViewControl->clear(); + delete _contours_ViewControl; _workingGroup->clear(); delete _lastInteraction; delete _workingGroup; - delete _contours_ViewControl; + //delete _contours_ViewControl; } //------------------------------------------------------------------------------------------------------------ @@ -99,10 +123,9 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) wxCommandEvent cevent( theEventType ); cevent.SetString( wxString( text.c_str(), wxConvUTF8) ); _eventHandler->ProcessEvent( cevent ); - } + } // if } - //------------------------------------------------------------------------------------------------------------ // Attributes getters and setters //------------------------------------------------------------------------------------------------------------ @@ -110,6 +133,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) { _eventHandler = theEventHandler; } + //------------------------------------------------------------------------------------------------------------ void wxVtkBaseView_SceneManager :: setWxVtkViewBase( wxVtkBaseView * theBaseView ) { @@ -122,7 +146,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) return _wxVtk_BaseView; } //------------------------------------------------------------------------------------------------------------ - void wxVtkBaseView_SceneManager :: configureViewControlTo( std::string theKeyName, manualContourModel * manModelContour, double * spc,int typeContour) + void wxVtkBaseView_SceneManager :: configureViewControlTo( std::string theKeyName, manualBaseModel * manModelContour, double * spc,int typeContour) { //setControlActiveStateOfALL( false ); _creatingROI = true; @@ -140,6 +164,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) manualViewBaseContour *manViewerContour; // Creating the view manualViewContour and the manualContourControler + // NOTE: The model is created in the KernelManagerContour class, factoryManualContourModel method if (typeContour==1) { manContourControl = new manualContourControler(); @@ -164,12 +189,26 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) manViewerContour = new manualViewBullEye(); } + if (typeContour==6) + { + manContourControl = new manualLineControler(); + manViewerContour = new manualViewLine(); + } + + //Points + if (typeContour==7) + { + manContourControl = new manualContourControler(); + manViewerContour = new manualViewPoints(); + } + + //Polygon + if (typeContour==10) + { + manContourControl = new manualContourControler(); + manViewerContour = new manualViewContour(); + } -//EED Borrame -//FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+"); -//fprintf(ff,"EED wxVtkBaseView_SceneManager :: configureViewControlTo \n" ); -//fprintf(ff," %s %p \n",theKeyName.c_str() , manContourControl ); -//fclose(ff); _lastInteraction = insertWrap( theKeyName, manContourControl, manViewerContour ); @@ -178,8 +217,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) //Configuring the relations between the contour members representation manViewerContour->SetModel( manModelContour ); manViewerContour->SetWxVtkBaseView( _wxVtk_BaseView ); - manViewerContour->SetRange( 2 ); - manViewerContour->SetZ( 1000 ); + manViewerContour->SetRange( _widthOfControlPoint ); + manViewerContour->SetZ( -900 ); manViewerContour->SetSpacing(spc); @@ -210,13 +249,13 @@ 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 ); _controlerSelectionROI->SetModelView( _modelSelectionROI , _viewerSelectionROI ); - _wxVtk_BaseView->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _controlerSelectionROI ); + ((vtkInteractorStyleBaseView*)_wxVtk_BaseView->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _controlerSelectionROI ); _controlerSelectionROI->SetActive(false); } @@ -224,6 +263,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 ( theKeyName, newContourWrap )); return newContourWrap; } @@ -250,6 +293,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) std::map :: iterator iter; iter = _contours_ViewControl->find( theName ); return iter->second; + //return iter->first; } //------------------------------------------------------------------------------------------------------------ ContourWrap_ViewControl * wxVtkBaseView_SceneManager :: getContourWrap_ViewControlOf ( std::string theName, std::map * theMap ) @@ -325,7 +369,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) // Other functional methods //------------------------------------------------------------------------------------------------------------ - void wxVtkBaseView_SceneManager :: createCopyContourOf( std::string anExistingKName, std::string cloneName, manualContourModel * manualModel, bool append ) + void wxVtkBaseView_SceneManager :: createCopyContourOf( std::string anExistingKName, std::string cloneName, manualBaseModel * manualModel, bool append ) { if ( !append ) { @@ -334,21 +378,10 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) } std::map ::iterator iter; -//EED Borrame -// FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+"); -// fprintf(ff,"EED wxVtkBaseView_SceneManager::createCopyContourOf() \n" ); -// int ii,size = _contours_ViewControl->size(); -// iter = _contours_ViewControl->begin(); -// for (ii=0;iifirst.c_str() ); -// iter++; -// } -//fclose(ff); iter = _contours_ViewControl->find( anExistingKName ); - manualContourModel *cModule = manualModel; + manualBaseModel *cModule = manualModel; manualViewBaseContour *cViewer = iter->second->getViewer()->Clone(); manualContourBaseControler *cControl = iter->second->getControler()->Clone( ); @@ -378,13 +411,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) _lastInteractionName = ""; } -//EED Borrame -//FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+"); -//fprintf(ff,"EED wxVtkBaseView_SceneManager :: removeFromScene \n" ); -//fprintf(ff," %p \n", contourWRP->getControler() ); -//fclose(ff); - _wxVtk_BaseView->GetInteractorStyleBaseView()->RemoveInteractorStyleMaracas( contourWRP->getControler() ); + ((vtkInteractorStyleBaseView*)_wxVtk_BaseView->GetInteractorStyleBaseView())->RemoveInteractorStyleMaracas( contourWRP->getControler() ); contourWRP->getControler()->SetActive( control ); contourWRP->getControler()->SetEditable( false ); @@ -406,18 +434,12 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) std::map :: iterator iter; iter = _sceneContours_ViewControl->find( theKeyName ); - if (iter != _sceneContours_ViewControl->end()){ + if (iter != _sceneContours_ViewControl->end()) + { ContourWrap_ViewControl * contourWRP = iter->second; removeFromScene( contourWRP ); -//EED Borrame -//FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+"); -//fprintf(ff,"EED wxVtkBaseView_SceneManager :: removeFromScene Bbbbb \n" ); -//fprintf(ff," %d \n", _sceneContours_ViewControl->size() ); _sceneContours_ViewControl->erase(iter); - } -//EED Borrame -//fprintf(ff," %d \n", _sceneContours_ViewControl->size() ); -//fclose(ff); + } } @@ -436,12 +458,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) } //------------------------------------------------------------------------------------------------------------ - void wxVtkBaseView_SceneManager :: removeSceneContours( ) + void wxVtkBaseView_SceneManager::removeSceneContours() { -//EED Borrame -//FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+"); -//fprintf(ff,"EED wxVtkBaseView_SceneManager :: removeSceneContours \n" ); -//fprintf(ff," %d \n", _sceneContours_ViewControl->size() ); std::map ::iterator iter = _sceneContours_ViewControl->begin(); int size = _sceneContours_ViewControl->size(); for ( int i = 0; iclear(); - -//EED Borrame -//fprintf(ff," %d \n", _sceneContours_ViewControl->size() ); -//fclose(ff); - //Removing the selection rectangle to avoid showing when it's innecesary _controlerSelectionROI->SetActive( false ); _viewerSelectionROI->RemoveCompleteContourActor(); @@ -508,7 +521,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) if( control ) { - _wxVtk_BaseView->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( contourWRP->getControler() ); + ((vtkInteractorStyleBaseView*)_wxVtk_BaseView->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( contourWRP->getControler() ); } if( ifActive ) { @@ -574,7 +587,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) int size = _workingGroup->size(); for ( int i = 0; isecond->getViewer(); +//EED??? manualViewBaseContour * viewer = iter->second->getViewer(); selectedObjects.push_back( iter->first); iter++; @@ -585,8 +598,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) void wxVtkBaseView_SceneManager :: selectObjects( std::vector< std::string > theExistingObjectsToSelect ) { std::map ::iterator iter = _contours_ViewControl->begin(); - int size = _contours_ViewControl->size(); - bool selected; +//EED??? int size = _contours_ViewControl->size(); +//EED??? bool selected; /*for ( int i = 0; iGetInteractor()->GetControlKey() == 1; - bool shiftKey = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey() == 1; + _ctrlKey = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey() == 1; + _shiftKey = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey() == 1; _lastKeyCode = _vtkInteractorStyleBaseView->GetInteractor()-> GetKeyCode(); + + wxCommandEvent cevent( wxEVT_COMMAND_BUTTON_CLICKED ); + _eventHandler->ProcessEvent( cevent ); - - if( _eventHandler!=NULL ) + + /*if( _eventHandler!=NULL ) { - const char * toolCommand = NULL; + char * toolCommand = NULL; if ( _lastKeyCode == 3 && ctrlKey ) //'C' || 'c' { - toolCommand = &(wxContour_ActionCommandsID::COPY_TOOL); + toolCommand = &(COPY_TOOL); } else if( _lastKeyCode == 22 && ctrlKey ) //'V' || 'v' { - toolCommand = &(wxContour_ActionCommandsID::PASTE_TOOL); + toolCommand = &(PASTE_TOOL); } else if( _lastKeyCode == 8 || (_lastKeyCode==127) ) // Delete { - toolCommand = &(wxContour_ActionCommandsID::DELETE_KEY); + toolCommand = &(DELETE_KEY); } else if( _lastKeyCode == 14 && ctrlKey ) //'N' || 'n' { - toolCommand = &(wxContour_ActionCommandsID::CREATE_CONTOUR_KEY); + toolCommand = &(CREATE_CONTOUR_KEY); } else if( _lastKeyCode == 15 && ctrlKey ) //'O' || 'o' { - toolCommand = &(wxContour_ActionCommandsID::OPEN_TOOL); + toolCommand = &(OPEN_TOOL); } else if( _lastKeyCode == 19 && ctrlKey ) //'S' || 's' { - toolCommand = &(wxContour_ActionCommandsID::SAVE_KEY); + toolCommand = &(SAVE_KEY); } if ( toolCommand!=NULL ) { + currentkey = toolCommand; wxCommandEvent cevent( wxEVT_COMMAND_BUTTON_CLICKED ); cevent.SetClientData( (void *) toolCommand); _eventHandler->ProcessEvent( cevent ); } - } + }*/ // long int endtime = clock(); @@ -714,18 +743,14 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) bool wxVtkBaseView_SceneManager :: OnMouseMove() { -//EED Borrame -// FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+"); -// fprintf(ff,"EED wxVtkBaseView_SceneManager::OnMouseMove() \n" ); -// fclose(ff); bool condition = true; int X,Y; - wxVTKRenderWindowInteractor *_wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor(); + crea::wxVTKRenderWindowInteractor *_wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor(); _wxVTKiren->GetEventPosition( X , Y ); bool ctrlKey = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey() == 1; - bool shiftKey = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey() == 1; +//??? bool shiftKey = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey() == 1; if( _waiting && !ctrlKey ) { @@ -762,7 +787,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) { //Multiple moving - bool ckecking = false; +//EED??? bool ckecking = false; for( i =0; isecond->getControler(); @@ -779,20 +804,15 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) size = selectionSize; iter = _workingGroup->begin(); } - } - else - { + } else { _toIncludeAtInteractionGroup = false; } if( ((_lastInteraction != NULL && !control->IsEditable() && !control->IsMoving() ) || _lastInteraction==NULL )) { -//EED Borrame -// FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+"); -// fprintf(ff,"EED wxVtkBaseView_SceneManager::OnMouseMove() 00222\n" ); -// fclose(ff); - _lastInteraction=NULL; + + _lastInteraction=NULL; for( i =0; isecond->getControler(); @@ -820,7 +840,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) _lastInteractionName = iter->first; viewer->UpdateColorActor(); - control->SetPosibleToMove( true ); + control->SetPosibleToMove( true ); // viewer->AddCompleteContourActor(); } iter++; @@ -840,20 +860,14 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) bool wxVtkBaseView_SceneManager :: OnLeftButtonDown() { - /*FILE *ff; - ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+"); - long int endtime = clock(); -// double sg = (double)(endtime-startTimeAE) / (double)CLK_TCK; - fprintf(ff,"wxVtkBaseView_SceneManager :: OnLeftButtonDown() tLBDown = %i \n \n",endtime); - fclose(ff);*/ - char aa = _vtkInteractorStyleBaseView->GetInteractor()->GetKeyCode(); +//EED??? char aa = _vtkInteractorStyleBaseView->GetInteractor()->GetKeyCode(); bool condition = false; //vtkCommand * theComand = _wxVtk_BaseView ->GetInteractorStyleBaseView()->GetCommand( - vtkRenderWindowInteractor * vtkRWInteractor1 = _wxVtk_BaseView ->GetWxVTKRenderWindowInteractor(); - wxVTKRenderWindowInteractor * vtkRWInteractor2 = _wxVtk_BaseView ->GetWxVTKRenderWindowInteractor();//GetInteractorStyleBaseView()->GetInteractor(); - wxVTKRenderWindowInteractorPlus * vtkRWInteractor3 = (wxVTKRenderWindowInteractorPlus*)_wxVtk_BaseView ->GetWxVTKRenderWindowInteractor();//GetInteractorStyleBaseView()->GetInteractor(); +//EED??? vtkRenderWindowInteractor * vtkRWInteractor1 = _wxVtk_BaseView ->GetWxVTKRenderWindowInteractor(); +//EED??? wxVTKRenderWindowInteractor * vtkRWInteractor2 = _wxVtk_BaseView ->GetWxVTKRenderWindowInteractor();//GetInteractorStyleBaseView()->GetInteractor(); +//EED?? wxVTKRenderWindowInteractorPlus * vtkRWInteractor3 = (wxVTKRenderWindowInteractorPlus*)_wxVtk_BaseView ->GetWxVTKRenderWindowInteractor();//GetInteractorStyleBaseView()->GetInteractor(); vtkRenderWindowInteractor * vtkRWInteractor = _vtkInteractorStyleBaseView->GetInteractor(); bool ctrlKey = vtkRWInteractor->GetControlKey() == 1; @@ -940,8 +954,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) bool wxVtkBaseView_SceneManager :: OnRightButtonDown() { bool condition = false; - vtkRenderWindowInteractor * vtkRWInteractor = _vtkInteractorStyleBaseView->GetInteractor(); - bool ctrlKey = vtkRWInteractor->GetControlKey() == 1; +//EED??? vtkRenderWindowInteractor * vtkRWInteractor = _vtkInteractorStyleBaseView->GetInteractor(); +//EED??? bool ctrlKey = vtkRWInteractor->GetControlKey() == 1; _waiting = true; condition = true; @@ -971,7 +985,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) //_lastInteraction->getControler()->SetPosibleToMove( false ); control->SetActive( false ); control->SetEditable( false ); - _wxVtk_BaseView->GetInteractorStyleBaseView()->RemoveInteractorStyleMaracas( control ); + control->SetPosibleToMove( false ); +// _wxVtk_BaseView->GetInteractorStyleBaseView()->RemoveInteractorStyleMaracas( control ); _lastInteraction->getViewer()->Refresh(); this->_vtkInteractorStyleBaseView->SetRefresh_waiting(); } @@ -992,9 +1007,9 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) bool wxVtkBaseView_SceneManager :: OnRightDClick() { bool condition = false; condition = true; - vtkRenderWindowInteractor * vtkRWInteractor = _vtkInteractorStyleBaseView->GetInteractor(); +//EED??? vtkRenderWindowInteractor * vtkRWInteractor = _vtkInteractorStyleBaseView->GetInteractor(); /*vtkRenderWindowInteractor * vtkRWInteractor1 =*/ _vtkInteractorStyleBaseView->OnChar(); - wxVTKRenderWindowInteractor * wxVtkRWInterator = _wxVtk_BaseView ->GetWxVTKRenderWindowInteractor(); +//EED??? wxVTKRenderWindowInteractor * wxVtkRWInterator = _wxVtk_BaseView ->GetWxVTKRenderWindowInteractor(); /*if( _waiting ) { @@ -1098,9 +1113,9 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) double sg = (double)(start) / CLOCKS_PER_SEC; #endif int tmpPx,tmpPy; - wxVTKRenderWindowInteractor *wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor(); + crea::wxVTKRenderWindowInteractor *wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor(); wxVTKiren->GetEventPosition( tmpPx , tmpPy ); - fprintf(ff,"::%s (x,y) = (%i, %i) t(sg): \n \n",method, tmpPx, tmpPy, sg); + fprintf(ff,"::%s (x,y) = (%i, %i) t(sg): %f\n \n",method.c_str(), tmpPx, tmpPy, sg); fclose(ff); } @@ -1131,7 +1146,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) if (currentSelection.size()>=1){ manualContourBaseControler *cControler = this->getControlerOf( currentSelection[0] ); - manualContourModel *cModel = cControler->GetManualContourModel(); + manualBaseModel *cModel = cControler->GetManualContourModel(); int i,size = cModel->GetNumberOfPointsSpline(); double x,y,z; for (i=0; i::iterator iter;; - - for (iter=_contours_ViewControl->begin(); iter!=_contours_ViewControl->end(); iter++ ) + std::map ::iterator 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){ + + ContourWrap_ViewControl* ccon = getContourWrap_ViewControlOf(theKeyName); + if(ccon != NULL ){ + manualContourBaseControler* cControler = ccon->getControler(); + if(cControler != NULL && cControler->IsEditable() == false){ + return true; + } } + return false; + } + + void wxVtkBaseView_SceneManager::deleteCViewerCControler(std::string theKeyName){ + + + ContourWrap_ViewControl* ccon = getContourWrap_ViewControlOf(theKeyName); + + manualViewBaseContour * cViewer = ccon->getViewer(); + manualContourBaseControler * cControler = ccon->getControler(); + + removeFromScene(theKeyName); + removeWrap(theKeyName); + + delete cViewer; + delete cControler; } + + +