From a482d6c829d2f69749d36de05bbd7c3ed0b81f35 Mon Sep 17 00:00:00 2001 From: Juan Prieto Date: Mon, 16 Nov 2009 10:50:32 +0000 Subject: [PATCH] *** empty log message *** --- .../widgets/wxMaracasRenderImageManagementPanel.h | 4 ++-- .../widgets/wxMaracasRenderImageTransformation.h | 3 ++- .../wxMaracasSurfaceRenderingManagerDataMhd.cxx | 10 ++++++++-- .../widgets/wxMaracasSurfaceRenderingProp3D.h | 4 ++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.h index 9a3c545..a2f28a8 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.h @@ -4,9 +4,9 @@ #include "wxMaracasRenderImageTransformation.h" #include +#include "creaMaracasVisu_EXPORT.h" - -class wxMaracasRenderImageManagementPanel : public wxDialog +class creaMaracasVisu_EXPORT wxMaracasRenderImageManagementPanel : public wxDialog { public: diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.h index 66210c0..3a6db86 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.h @@ -5,8 +5,9 @@ #include "wxMaracasMultipleVolumeRendererManager.h" #include "wxMaracasSurfaceRenderingManager.h" +#include "creaMaracasVisu_EXPORT.h" -class wxMaracasRenderImageTransformation +class creaMaracasVisu_EXPORT wxMaracasRenderImageTransformation { public: diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.cxx index 031c975..55d46a9 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.cxx @@ -1,5 +1,6 @@ #include "wxMaracasSurfaceRenderingManagerDataMhd.h" +#include "vtkStripper.h" wxMaracasSurfaceRenderingManagerDataMhd::wxMaracasSurfaceRenderingManagerDataMhd(vtkImageData* imagedata, std::string dataname, vtkRenderWindowInteractor* interactor) : wxMaracasSurfaceRenderingManagerData(NULL, dataname, interactor) @@ -26,11 +27,16 @@ wxMaracasSurfaceRenderingManagerDataMhd::wxMaracasSurfaceRenderingManagerDataMhd _dataMapper->ImmediateModeRenderingOn(); dataActor->SetMapper(_dataMapper); + this->_prop3D = dataActor; + if(_boxWidgetS1){ - _boxWidgetS1->SetInput(imagedata); + vtkStripper* striper = vtkStripper::New(); + striper->SetInput( _cleanFilter->GetOutput() ); + _boxWidgetS1->SetInput(striper->GetOutput()); + _boxWidgetS1->PlaceWidget(); } - this->_prop3D = dataActor; + this->changeIsoValue(this->_maxgreylevel); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.h index c232413..1ebdeea 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.h @@ -2,7 +2,7 @@ #define WXMARACASSURFACERENDERINGPROP3D_H_ #include "wxMaracasSurfaceRenderingPanel.h" -#include "wxMaracasRenderImageManagementPanel.h" +//#include "wxMaracasRenderImageManagementPanel.h" class wxMaracasSurfaceRenderingProp3D : public wxMaracasSurfaceRenderingPanel{ public: @@ -22,7 +22,7 @@ private: wxSlider* opacity; wxBitmapButton* _colorchoose; wxBitmapButton* _viewimage; - wxMaracasRenderImageManagementPanel* dialog; + //wxMaracasRenderImageManagementPanel* dialog; }; #endif /*WXMARACASSURFACERENDERINGPROP3D_H_*/ -- 2.45.1