X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMPRWidget.cxx;h=99fad9d0c4426b44050d5452c4c7294b7389dd8c;hb=307866a8f06b14018ea832926bdf3d887bfffea8;hp=218e4240f18ea96af58c714ae036269456e88e3a;hpb=a51951cc5a3aad3ff13e9b009dd680b6f833960a;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx index 218e424..99fad9d 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx @@ -118,7 +118,7 @@ END_EVENT_TABLE( ); wxMPRWidget::wxMPRWidget( wxWindow* parent, - marImageData *marimageData , double voxelSize) + marImageData *marimageData ) : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL) { @@ -159,7 +159,6 @@ wxMPRWidget::wxMPRWidget( wxWindow* parent, if(marimageData!=NULL){ _marImageData = marimageData; - _voxelSize = voxelSize; _vtkmprbasedata = new vtkMPRBaseData(); _vtkmprbasedata->SetMarImageData(_marImageData); @@ -193,7 +192,7 @@ wxMPRWidget::wxMPRWidget( wxWindow* parent, } //---------------------------------------------------------------------------- -void wxMPRWidget::setImageData(vtkImageData * img, double voxelsize) +void wxMPRWidget::setImageData(vtkImageData * img) { if(_marImageData!=NULL){ @@ -203,8 +202,6 @@ void wxMPRWidget::setImageData(vtkImageData * img, double voxelsize) _marImageData = new marImageData(img); } - _voxelSize = voxelsize; - if(_vtkmprbasedata==NULL){ _vtkmprbasedata = new vtkMPRBaseData(); _vtkmprbasedata->SetMarImageData(_marImageData); @@ -682,7 +679,6 @@ void wxMPRWidget::ConfigureVTK(){ if (_vtkplane2Dview!=NULL){_vtkplane2Dview -> Configure();} if (_widgetMesure!=NULL){_widgetMesure -> ConfigureA(_vtkplane2Dview);} if (_widgetMesure!=NULL){_widgetMesure -> SetActiveLink(true);} - if (_widgetMesure!=NULL){_widgetMesure -> SetMesureScale( _voxelSize );} if (_wxsphereview!=NULL){_wxsphereview -> Configure();} if (_wxvtk3Dbaseview_MPRClipping3D!=NULL){_wxvtk3Dbaseview_MPRClipping3D -> Configure();} @@ -702,8 +698,6 @@ void wxMPRWidget::ConfigureVTK(){ // imageData->GetSpacing(spc); // _widgetMesure_B->SetMesureScale(spc[0]); - if (_widgetMesure_B!=NULL) {_widgetMesure_B->SetMesureScale( _voxelSize );} - if (_wxsphereview_B!=NULL) {_wxsphereview_B -> Configure();}