]> Creatis software - creaMaracasVisu.git/commitdiff
*** empty log message ***
authorJuan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Mon, 16 Nov 2009 10:50:32 +0000 (10:50 +0000)
committerJuan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Mon, 16 Nov 2009 10:50:32 +0000 (10:50 +0000)
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.h

index 9a3c545b65f47fddcb3290513df9c9e4d5998d82..a2f28a8f19f874a836c86de58046d94da653a027 100644 (file)
@@ -4,9 +4,9 @@
 #include "wxMaracasRenderImageTransformation.h"
 
 #include <wx/wx.h>
+#include "creaMaracasVisu_EXPORT.h"
 
-
-class wxMaracasRenderImageManagementPanel : public wxDialog
+class creaMaracasVisu_EXPORT wxMaracasRenderImageManagementPanel : public wxDialog
 {
 public:
 
index 66210c0ff427ed7deb678d4842e989fdd46d628b..3a6db86e4a27162d61ce7b50e7ceb5460cd37c5d 100644 (file)
@@ -5,8 +5,9 @@
 
 #include "wxMaracasMultipleVolumeRendererManager.h"
 #include "wxMaracasSurfaceRenderingManager.h"
+#include "creaMaracasVisu_EXPORT.h"
 
-class wxMaracasRenderImageTransformation
+class creaMaracasVisu_EXPORT wxMaracasRenderImageTransformation
 {
 public:
 
index 031c9752febea3e79689837e2f69f7c6c285b9d9..55d46a9d425e3af24403a7e98a3777f1f262a7fe 100644 (file)
@@ -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);      
 
index c232413baa414851379aaf3693f98cd7374121f1..1ebdeead5f4001b75d89a8332856c95ce8a2d1fc 100644 (file)
@@ -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_*/