X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxSTLWidget_03.cxx;h=0086b270c85615599405758faccd49caad32f3cf;hb=65c158dc171f8d3114ee3544b2a94a1f41880df0;hp=1afdbfb21c71739b3d04cfa34d040339fe354eb0;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxSTLWidget_03.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxSTLWidget_03.cxx index 1afdbfb..0086b27 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxSTLWidget_03.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxSTLWidget_03.cxx @@ -62,17 +62,52 @@ //------------------------------------------------------------------- //------------------------------------------------------------------- //------------------------------------------------------------------- -wxSTLWidget_03::wxSTLWidget_03(wxWindow *parent, marInterface* mar) +wxSTLWidget_03::wxSTLWidget_03(wxWindow *parent)//, marInterface* mar) : wxPanel( parent, -1) { - _wxMaracasMPR = NULL; + _imagedata=NULL; + cast2=NULL; + cast3=NULL; + cast4=NULL; // binary segmentation result + _thresh=NULL; + _thresh2=NULL; + _cast=NULL; + _connect=NULL; + _connect2=NULL; + _2_mapfinal=NULL; + _2_stripfinal=NULL; + _2_isoMapperMC6=NULL; + _2_isoActorMC6=NULL; + _2_isoMC6=NULL; + _loadSTLMapper=NULL; + _loadActorSTL=NULL; + sl_barrange_segmentation=NULL; + _imageviewer3D=NULL; + _wxMaracasMPR=NULL; + stlInterna=NULL; + stlExterna=NULL; + stlSliderDeltaGauss=NULL; + stlSliderMarchingCubes=NULL; + dsm1=NULL; + actorInternal=NULL; + stlSliderOpacityInternal=NULL; + dsm2=NULL; + actorExternal=NULL; + stlSliderOpacityExternal=NULL; + stlExtractor=NULL; + _sl_opacity_STL_file=NULL; + arteryImageData=NULL; + joiner=NULL; + joinMarchingCubes=NULL; + joinMapper=NULL; + joinActor=NULL; _maxSize = 2000; _minSize = 300; - + _stlMarchingCubesLevel = 128; _stlDeltaGaussLevel = 100; - _mar=new marInterface(); + /*_mar=new marInterface(); _mar->_parameters->setRescaleSlope( mar->_parameters->getRescaleSlope() ); _mar->_parameters->setRescaleIntercept( mar->_parameters->getRescaleIntercept() ); _mar->_parameters->setIntParam( marParameters::e_voxel_type, marParameters::VOX_TYPE_MINIMUM ); @@ -83,15 +118,13 @@ wxSTLWidget_03::wxSTLWidget_03(wxWindow *parent, marInterface* mar) mar->_experiment->getVOI( voi ); _mar->_experiment->setVOI( voi ); _mar->SetDicom(mar->_dicom); - _mar->initExperiment( ); + _mar->initExperiment( );*/ wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL ); wxSplitterWindow *pnlSplitter = new wxSplitterWindow( this , -1); wxPanel *viewPanel = CreateViewPanel(pnlSplitter); -printf("EED wxSTLWidget_03::wxSTLWidget_03 01\n"); wxPanel *controlPanel = CreateControlPanel(pnlSplitter); -printf("EED wxSTLWidget_03::wxSTLWidget_03 02\n"); sizer -> Add( pnlSplitter ,1,wxGROW ,0); pnlSplitter -> SetMinimumPaneSize( 150 ); @@ -101,36 +134,49 @@ printf("EED wxSTLWidget_03::wxSTLWidget_03 02\n"); // pnlSplitter -> SplitVertically( viewPanel, new wxPanel(pnlSplitter,-1) , 600 ); this -> SetSizer(sizer); - - // Result 2: Volume + Axis -// _2_prgov = NULL; - _2_mapfinal = NULL; - _2_stripfinal = NULL; - _2_isoMapperMC6 = NULL; - _2_isoActorMC6 = NULL; - _2_isoMC6 = NULL; - - //DHC STL SURFACES - stlInterna = NULL; - stlExterna = NULL; - - _loadSTLMapper = NULL; - _loadActorSTL = NULL; - - //JOIN REGIONS - arteryImageData = NULL; - joinMarchingCubes = NULL; - joinMapper = NULL; - joinActor = NULL; -printf("EED wxSTLWidget_03::wxSTLWidget_03 03\n"); } //------------------------------------------------------------------- wxSTLWidget_03::~wxSTLWidget_03(){ - ResetTree2_JF(); - Reset_vtk_STLFile(); + //ResetTree2_JF(); + //Reset_vtk_STLFile(); + + if(_imagedata!=NULL){ + _imagedata->Delete(); + } + if(cast2){cast2->Delete();} + if(cast3){cast3->Delete();} + if(cast4){cast4->Delete();} + if(_thresh){_thresh->Delete();} + if(_thresh2){_thresh2->Delete();} + if(_cast){_cast->Delete();} + if(_connect){_connect->Delete();} + if(_connect2){_connect2->Delete();} + if(_2_mapfinal){_2_mapfinal->Delete();} + if(_2_stripfinal){_2_stripfinal->Delete();} + if(_2_isoMapperMC6){_2_isoMapperMC6->Delete();} + if(_2_isoActorMC6){_2_isoActorMC6->Delete();} + if(_2_isoMC6){_2_isoMC6->Delete();} + // Load STL file + if(_loadSTLMapper){_loadSTLMapper->Delete();} + if(_loadActorSTL){_loadActorSTL->Delete();} + if(sl_barrange_segmentation){delete sl_barrange_segmentation;} + if(_imageviewer3D){delete _imageviewer3D;} + if(_wxMaracasMPR){delete _wxMaracasMPR;} + if(stlInterna){stlInterna->Delete();} + if(stlExterna){stlExterna->Delete();} + if(dsm1){dsm1->Delete();} + if(actorInternal){actorInternal->Delete();} + if(dsm2){dsm2->Delete();} + if(actorExternal){actorExternal->Delete();} + //if(stlExtractor){stlExtractor->Delete();} + if(arteryImageData){arteryImageData->Delete();} + if(joiner){delete joiner;} + if(joinMarchingCubes){joinMarchingCubes->Delete();} + if(joinMapper){joinMapper->Delete(); } + if(joinActor){joinActor->Delete();} } //------------------------------------------------------------------- wxPanel* wxSTLWidget_03::CreateViewPanel(wxWindow *parent) @@ -140,51 +186,54 @@ wxPanel* wxSTLWidget_03::CreateViewPanel(wxWindow *parent) // MPR - vtkImageData *imagedata; - imagedata = _mar->_experiment->getDynData( )->getVolume( )->castVtk(); - imagedata->Update(); -printf("EED wxSTLWidget_03::CreateViewPanel 01 \n"); - _wxMaracasMPR = new wxMaracasMPR( panel, new marImageData(imagedata), _mar->_parameters->getVoxelSize() ); -printf("EED wxSTLWidget_03::CreateViewPanel 02 \n"); + //vtkImageData *imagedata; + //imagedata = _mar->_experiment->getDynData( )->getVolume( )->castVtk(); + //imagedata->Update(); + _wxMaracasMPR = new wxMaracasMPR( panel);//JCP 10-03-2009, new marImageData(imagedata), 1 ); _wxMaracasMPR->ConfigureVTK(); -printf("EED wxSTLWidget_03::CreateViewPanel 03 \n"); sizer->Add( _wxMaracasMPR , 1, wxEXPAND, 0); panel->SetSizer(sizer); panel->SetAutoLayout(true); panel->SetSize(400,400); panel->Layout(); -printf("EED wxSTLWidget_03::CreateViewPanel 04 \n"); return panel; } + +void wxSTLWidget_03::setImage(vtkImageData* img){ + + _wxMaracasMPR->setImageData(img, 1); + _wxMaracasMPR->ConfigureVTK(); + + + this->ConfigureProcessing(img,0,0,0); + this->ConfigureSTL(); + + _wxMaracasMPR->Refresh(); + + //this->Refresh(); +} //------------------------------------------------------------------- wxWindow* wxSTLWidget_03::CreateSelectAPointPanel(wxWindow *parent) { -printf("EED wxSTLWidget_03::CreateSelectAPointPanel 01\n"); wxPanel *panel = new wxPanel(parent,-1); -printf("EED wxSTLWidget_03::CreateSelectAPointPanel 02\n"); wxFlexGridSizer *sizer = new wxFlexGridSizer(2); -printf("EED wxSTLWidget_03::CreateSelectAPointPanel 03\n"); sizer->Add(new wxStaticText(panel,-1,_T(" "))); sizer->Add(new wxStaticText(panel,-1,_T(" "))); -printf("EED wxSTLWidget_03::CreateSelectAPointPanel 04\n"); sizer->Add(new wxStaticText(panel,-1,_T(" "))); sizer->Add(new wxStaticText(panel,-1,_T(" "))); -printf("EED wxSTLWidget_03::CreateSelectAPointPanel 05\n"); sizer->Add(new wxStaticText(panel,-1,_T(" Select a 3D Point..."))); sizer->Add(new wxStaticText(panel,-1,_T(" "))); -printf("EED wxSTLWidget_03::CreateSelectAPointPanel 06\n"); panel->SetSizer(sizer); panel->SetAutoLayout(true); panel->SetSize(400,600); panel->Layout(); -printf("EED wxSTLWidget_03::CreateSelectAPointPanel 07\n"); return panel; @@ -388,19 +437,13 @@ wxWindow* wxSTLWidget_03::CreateReadSTLFilePanel(wxWindow *parent) //------------------------------------------------------------------- wxPanel* wxSTLWidget_03::CreateControlPanel(wxWindow *parent) { -printf("EED wxSTLWidget_03::CreateControlPanel 01\n"); wxPanel *panel = new wxPanel(parent,-1); wxNotebook *noteBook = new wxNotebook(panel, -1); -printf("EED wxSTLWidget_03::CreateControlPanel 02\n"); noteBook->AddPage(CreateSelectAPointPanel(noteBook),_T("0 ->") ); -printf("EED wxSTLWidget_03::CreateControlPanel 03\n"); noteBook->AddPage(CreateSegmentationPanel(noteBook),_T("1 ->") ); -printf("EED wxSTLWidget_03::CreateControlPanel 04\n"); noteBook->AddPage(CreateSmoothingPanel(noteBook) ,_T("2 ->") ); -printf("EED wxSTLWidget_03::CreateControlPanel 05\n"); noteBook->AddPage(CreateReadSTLFilePanel(noteBook) ,_T("3 " ) ); -printf("EED wxSTLWidget_03::CreateControlPanel 06\n"); noteBook->SetSelection(0); noteBook->SetSize(350,250); wxFlexGridSizer *sizer = new wxFlexGridSizer(2); @@ -410,7 +453,6 @@ printf("EED wxSTLWidget_03::CreateControlPanel 06\n"); panel->SetSize(400,600); panel->Layout(); -printf("EED wxSTLWidget_03::CreateControlPanel 07\n"); return panel; } //------------------------------------------------------------------------ @@ -424,14 +466,11 @@ void wxSTLWidget_03::Refresh() //------------------------------------------------------------------------ -void wxSTLWidget_03::ConfigureProcessing(marImageData *marimagedata, int x, int y, int z) +void wxSTLWidget_03::ConfigureProcessing(vtkImageData *img, int x, int y, int z) { wxBusyCursor wait; - _imagedata=marimagedata->GetImageData(); // image t=0 - _imagedata->UpdateInformation(); - _imagedata->SetUpdateExtent(_imagedata->GetWholeExtent()); - _imagedata->Update(); + _imagedata=img; double puntoactualprov[3]; @@ -477,63 +516,71 @@ void wxSTLWidget_03::ConfigureProcessing(marImageData *marimagedata, int x, int // _zslice->SetRange(extprin[4], extprin[5]); // _zslice->SetValue(extprin[5]/2); - - _thresh = vtkImageThreshold::New(); - _thresh->SetInput(_imagedata); - //_thresh->ReleaseDataFlagOff(); - _thresh->SetInValue(255); - _thresh->SetOutputScalarTypeToUnsignedShort(); - _thresh->SetOutValue(0); - //_thresh->ThresholdBetween(_sl_minSize->GetValue(), _range[1]); - //SIL// - _thresh->ThresholdBetween(sl_barrange_segmentation->GetStart(), sl_barrange_segmentation->GetEnd()); - - vtkImageCast *cast = vtkImageCast::New(); - cast->SetInput(_thresh->GetOutput()); - cast->SetOutputScalarTypeToUnsignedChar(); - cast->Update(); - - - _connect = vtkImageSeedConnectivity::New(); - _connect->SetInput(cast->GetOutput()); - _connect->SetInputConnectValue(255); - _connect->SetOutputConnectedValue(255); - _connect->SetOutputUnconnectedValue(0); - _connect->AddSeed((int)(puntoactualprov[0]), (int)(puntoactualprov[1]), (int)(puntoactualprov[2])); -// _connect->Update(); - - cast3 = vtkImageCast::New(); - cast3->SetInput(_connect->GetOutput()); - cast3->SetOutputScalarTypeToUnsignedShort(); - cast3->Update(); -//SIL// + + if(_thresh==NULL){ + _thresh = vtkImageThreshold::New(); + //_thresh->ReleaseDataFlagOff(); + _thresh->SetInValue(255); + _thresh->SetOutputScalarTypeToUnsignedShort(); + _thresh->SetOutValue(0); + //_thresh->ThresholdBetween(_sl_minSize->GetValue(), _range[1]); + //SIL// + _cast = vtkImageCast::New(); + _cast->SetInput(_thresh->GetOutput()); + _cast->SetOutputScalarTypeToUnsignedChar(); + + _connect = vtkImageSeedConnectivity::New(); + _connect->SetInput(_cast->GetOutput()); + _connect->SetInputConnectValue(255); + _connect->SetOutputConnectedValue(255); + _connect->SetOutputUnconnectedValue(0); + + cast3 = vtkImageCast::New(); + cast3->SetInput(_connect->GetOutput()); + cast3->SetOutputScalarTypeToUnsignedShort(); + + _thresh2 = vtkImageThreshold::New(); + //_thresh2->ReleaseDataFlagOff(); + _thresh2->SetInValue(255); + _thresh2->SetOutputScalarTypeToUnsignedShort(); + _thresh2->SetOutValue(0); + //SIL//_thresh2->ThresholdBetween(_sl_minSize->GetValue(), _sl_maxSize->GetValue()); + + cast2 = vtkImageCast::New(); + cast2->SetInput(_thresh2->GetOutput()); + cast2->SetOutputScalarTypeToUnsignedChar(); + _connect2 = vtkImageSeedConnectivity::New(); + _connect2->SetInput(cast2->GetOutput()); + _connect2->SetInputConnectValue(255); + _connect2->SetOutputConnectedValue(255); + _connect2->SetOutputUnconnectedValue(0); + + cast4 = vtkImageCast::New(); + cast4->SetInput(_connect2->GetOutput()); + cast4->SetOutputScalarTypeToUnsignedShort(); + } + _thresh->RemoveAllInputs(); + _thresh->SetInput(_imagedata); + _thresh->ThresholdBetween(sl_barrange_segmentation->GetStart(), sl_barrange_segmentation->GetEnd()); + _thresh->Update(); - _thresh2 = vtkImageThreshold::New(); - _thresh2->SetInput(_imagedata); - //_thresh2->ReleaseDataFlagOff(); - _thresh2->SetInValue(255); - _thresh2->SetOutputScalarTypeToUnsignedShort(); - _thresh2->SetOutValue(0); - //SIL//_thresh2->ThresholdBetween(_sl_minSize->GetValue(), _sl_maxSize->GetValue()); - _thresh2->ThresholdBetween(sl_barrange_segmentation->GetStart(), sl_barrange_segmentation->GetEnd()); + _cast->Update(); - cast2 = vtkImageCast::New(); - cast2->SetInput(_thresh2->GetOutput()); - cast2->SetOutputScalarTypeToUnsignedChar(); - cast2->Update(); - _connect2 = vtkImageSeedConnectivity::New(); - _connect2->SetInput(cast2->GetOutput()); - _connect2->SetInputConnectValue(255); - _connect2->SetOutputConnectedValue(255); - _connect2->SetOutputUnconnectedValue(0); + _connect->RemoveAllSeeds(); + _connect->AddSeed((int)(puntoactualprov[0]), (int)(puntoactualprov[1]), (int)(puntoactualprov[2])); + //_connect->Update(); + //cast3->Update(); +//SIL// + _thresh2->RemoveAllInputs(); + _thresh2->SetInput(_imagedata); + _thresh2->ThresholdBetween(sl_barrange_segmentation->GetStart(), sl_barrange_segmentation->GetEnd()); + _thresh2->Update(); + cast2->Update(); + _connect2->RemoveAllSeeds(); _connect2->AddSeed( (int)(puntoactualprov[0]), (int)(puntoactualprov[1]), (int)(puntoactualprov[2])); - _connect2->Update(); - - cast4 = vtkImageCast::New(); - cast4->SetInput(_connect2->GetOutput()); - cast4->SetOutputScalarTypeToUnsignedShort(); - cast4->Update(); + //_connect2->Update(); + //cast4->Update(); } //------------------------------------------------------------------------ @@ -544,11 +591,11 @@ void wxSTLWidget_03::ConfigureVTK() { wxBusyCursor wait; // vtkImageData *imagedata = _mar->_experiment->getDynData( )->getVolume( )->castVtk(); - marImageData *marimagedata = _mar->_experiment->getDynData( )->GetMarImageData(); + //marImageData *marimagedata;// = _mar->_experiment->getDynData( )->GetMarImageData(); //CONFIGURACION ADICIONAL this->ConfigureSTL(); - this->ConfigureProcessing(marimagedata,0,0,0); + //this->ConfigureProcessing(marimagedata,0,0,0); } @@ -557,30 +604,41 @@ void wxSTLWidget_03::ConfigureVTK() void wxSTLWidget_03::ResetTree2_JF() { // Remove - vtkRenderer *ren = _wxMaracasMPR->GetWxvtkmpr3Dview_BB()->GetWxvtk3Dbaseview()->GetRenderer(); - if (_2_isoActorMC6){ - ren->RemoveActor(_2_isoActorMC6); - } - if (_2_stripfinal){ - ren->RemoveActor(_2_stripfinal); + try{ + + + + // Delete + // if (_2_prgov ) { _2_prgov -> Delete(); } + if (_2_mapfinal ) { _2_mapfinal -> Delete(); } + if (_2_stripfinal ) { _2_stripfinal -> Delete(); } + if (_2_isoMapperMC6 ) { _2_isoMapperMC6 -> Delete(); } + if (_2_isoActorMC6 ) { _2_isoActorMC6 -> Delete(); } + if (_2_isoMC6 ) { _2_isoMC6 -> Delete(); } + + // Init + // _2_prgov = NULL; + _2_mapfinal = NULL; + _2_stripfinal = NULL; + _2_isoMapperMC6 = NULL; + _2_isoActorMC6 = NULL; + _2_isoMC6 = NULL; + + + //vtkRenderer *ren = _wxMaracasMPR->GetWxvtkmpr3Dview_BB()->GetWxvtk3Dbaseview()->GetRenderer(); + + /*if (_2_isoActorMC6){ + ren->RemoveActor(_2_isoActorMC6); + } + if (_2_stripfinal){ + ren->RemoveActor(_2_stripfinal); + }*/ + + + }catch(char* e){ + std::cout< Delete(); } - if (_2_mapfinal ) { _2_mapfinal -> Delete(); } - if (_2_stripfinal ) { _2_stripfinal -> Delete(); } - if (_2_isoMapperMC6 ) { _2_isoMapperMC6 -> Delete(); } - if (_2_isoActorMC6 ) { _2_isoActorMC6 -> Delete(); } - if (_2_isoMC6 ) { _2_isoMC6 -> Delete(); } - - // Init -// _2_prgov = NULL; - _2_mapfinal = NULL; - _2_stripfinal = NULL; - _2_isoMapperMC6 = NULL; - _2_isoActorMC6 = NULL; - _2_isoMC6 = NULL; } @@ -728,7 +786,7 @@ void wxSTLWidget_03::OnRangeSpin ( wxScrollEvent & event ) wxSlider *sl_B=_sl_RangeSizeSpin; int value = lastResizeRef_Value; - int delta = (int)pow( 4 , sl_B->GetValue() ); + int delta = (int)pow((double) 4 , (double)sl_B->GetValue() ); int startResized = value - delta/2; int endResized = value + delta/2; @@ -761,8 +819,8 @@ void wxSTLWidget_03:: OnBarMoved_range(wxCommandEvent& event) void wxSTLWidget_03::OnBtnSaveBinaryFile(wxCommandEvent& event) { - wxString dirSTL = _mar->_parameters->getStringParam( - marParameters::e_installation_directory ); + wxString dirSTL;// = _mar->_parameters->getStringParam( + //marParameters::e_installation_directory ); dirSTL = ( dirSTL == _T("NO_DIRECTORY") ) ? wxGetHomeDir( ) : dirSTL; wxFileDialog dialog( this, _T("Choose a directory..."), ( !dirSTL.IsEmpty( ) )? dirSTL: wxGetHomeDir( ) ); @@ -820,19 +878,23 @@ void wxSTLWidget_03::OnOpacitySTLFile(wxScrollEvent& event) void wxSTLWidget_03::Reset_vtk_STLFile() { // Remove - vtkRenderer *ren = _wxMaracasMPR->GetWxvtkmpr3Dview_BB()->GetWxvtk3Dbaseview()->GetRenderer(); - if (_loadActorSTL){ - ren->RemoveActor(_loadActorSTL); + try{ + vtkRenderer *ren = _wxMaracasMPR->GetWxvtkmpr3Dview_BB()->GetWxvtk3Dbaseview()->GetRenderer(); + if (_loadActorSTL){ + ren->RemoveActor(_loadActorSTL); + } + + // Delete + if (_loadSTLMapper ) { _loadSTLMapper -> Delete(); } + if (_loadActorSTL ) { _loadActorSTL -> Delete(); } + + // Init + _loadSTLMapper = NULL; + _loadActorSTL = NULL; + }catch(char * e){ + std::cout< Delete(); } - if (_loadActorSTL ) { _loadActorSTL -> Delete(); } - - // Init - _loadSTLMapper = NULL; - _loadActorSTL = NULL; - } //------------------------------------------------------------------------ void wxSTLWidget_03::OnBtnSTLFileErase(wxCommandEvent& event) @@ -843,8 +905,8 @@ void wxSTLWidget_03::OnBtnSTLFileErase(wxCommandEvent& event) //------------------------------------------------------------------------ void wxSTLWidget_03::OnBtnSTLFileLoad(wxCommandEvent& event) { - wxString dirSTL = _mar->_parameters->getStringParam( - marParameters::e_installation_directory ); + wxString dirSTL;// = _mar->_parameters->getStringParam( + //marParameters::e_installation_directory ); dirSTL = ( dirSTL == _T("NO_DIRECTORY") ) ? wxGetHomeDir( ) : dirSTL; wxFileDialog dialog( this, _T("Choose a directory..."), ( !dirSTL.IsEmpty( ) )? dirSTL: wxGetHomeDir( ) ); @@ -865,8 +927,8 @@ void wxSTLWidget_03::OnBtnSTLFileLoad(wxCommandEvent& event) imgReader->Delete(); } //By default *always* update e_installation_directory: - _mar->_parameters->setStringParam( marParameters::e_installation_directory, dialog.GetPath( ) ); - _mar->saveParameters( ); + //_mar->_parameters->setStringParam( marParameters::e_installation_directory, dialog.GetPath( ) ); + //_mar->saveParameters( ); } @@ -881,31 +943,37 @@ void wxSTLWidget_03::OnBtnSTLFileLoad(wxCommandEvent& event) void wxSTLWidget_03::ConfigureSTL() { - stlExterna = vtkPolyData::New(); - stlInterna = vtkPolyData::New(); - dsm1 = vtkPolyDataMapper ::New(); - dsm1->SetInput (stlInterna); - dsm1->ScalarVisibilityOff(); + if(stlExterna == NULL){ + stlExterna = vtkPolyData::New(); + stlInterna = vtkPolyData::New(); - actorInternal = vtkActor::New(); - actorInternal->SetMapper (dsm1); - actorInternal->GetProperty()->SetColor (0,1,0); + dsm1 = vtkPolyDataMapper ::New(); + dsm1->SetInput (stlInterna); + dsm1->ScalarVisibilityOff(); - dsm2 = vtkPolyDataMapper ::New(); - dsm2->SetInput (stlExterna); - dsm2->ScalarVisibilityOff(); + actorInternal = vtkActor::New(); + actorInternal->SetMapper (dsm1); + actorInternal->GetProperty()->SetColor (0,1,0); - actorExternal= vtkActor::New(); - actorExternal->SetMapper (dsm2); - actorExternal->GetProperty()->SetRepresentationToWireframe(); + dsm2 = vtkPolyDataMapper ::New(); + dsm2->SetInput (stlExterna); + dsm2->ScalarVisibilityOff(); -// vtkRenderer *ren = _maracasSurfaceWidget->GetVtk3DSurfaceWidget()->GetRenderer(); - vtkRenderer *ren = _wxMaracasMPR->GetWxvtkmpr3Dview_BB()->GetWxvtk3Dbaseview()->GetRenderer(); - ren->AddActor(actorInternal); - ren->AddActor(actorExternal); + actorExternal= vtkActor::New(); + actorExternal->SetMapper (dsm2); + actorExternal->GetProperty()->SetRepresentationToWireframe(); - stlExtractor = new vtkSTLExtractor(); + // vtkRenderer *ren = _maracasSurfaceWidget->GetVtk3DSurfaceWidget()->GetRenderer(); + vtkRenderer *ren = _wxMaracasMPR->GetWxvtkmpr3Dview_BB()->GetWxvtk3Dbaseview()->GetRenderer(); + ren->AddActor(actorInternal); + ren->AddActor(actorExternal); + + stlExtractor = new vtkSTLExtractor(); + + } + + } void wxSTLWidget_03::generateSTLSurfaces() @@ -939,8 +1007,8 @@ void wxSTLWidget_03::OnOpacitySTLInternal(wxScrollEvent& event){ void wxSTLWidget_03::OnBtnCreateFileSTL(wxCommandEvent& event) { - wxString dirSTL = _mar->_parameters->getStringParam( - marParameters::e_installation_directory ); + wxString dirSTL;// = _mar->_parameters->getStringParam( + //marParameters::e_installation_directory ); dirSTL = ( dirSTL == _T("NO_DIRECTORY") ) ? wxGetHomeDir( ) : dirSTL; @@ -997,8 +1065,8 @@ void wxSTLWidget_03::OnBtnCreateFileSTL(wxCommandEvent& event) } //By default *always* update e_installation_directory: - _mar->_parameters->setStringParam( marParameters::e_installation_directory, dialog.GetPath( ) ); - _mar->saveParameters( ); + //_mar->_parameters->setStringParam( marParameters::e_installation_directory, dialog.GetPath( ) ); + //_mar->saveParameters( ); }