X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer2D.cxx;h=26a1f9fbd222d4c7b4b43e48b29399229aadf092;hb=98e18224b83c6955a804d79d4e7083626ea8afcd;hp=d36fc6dbeba96923f1997163a009599649238426;hpb=f993478d7df1d9688c4ab93c617688c84cf2d424;p=bbtk.git diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx index d36fc6d..26a1f9f 100644 --- a/packages/wxvtk/src/bbwxvtkViewer2D.cxx +++ b/packages/wxvtk/src/bbwxvtkViewer2D.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxvtkViewer2D.cxx,v $ Language: C++ - Date: $Date: 2008/05/14 12:32:26 $ - Version: $Revision: 1.6 $ + Date: $Date: 2008/12/15 13:13:49 $ + Version: $Revision: 1.33 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,7 +21,8 @@ */ -#ifdef _USE_WXWIDGETS_ +#ifdef USE_WXWIDGETS +#ifdef USE_VTK #include "bbwxvtkViewer2D.h" @@ -31,36 +32,104 @@ #include "vtkInteractorStyleImage.h" #include "vtkCamera.h" #include "vtkRenderer.h" - +#include +#include namespace bbwxvtk { - BBTK_ADD_BLACK_BOX_TO_PACKAGE(wxvtk,Viewer2D); + + //-------------------------------------------------------------------------- + class Viewer2DWidget : public wxPanel + { + public: + Viewer2DWidget(Viewer2D* box, wxWindow *parent); + ~Viewer2DWidget(); + void UpdateView(); + vtkRenderer *GetRenderer(); + private: + bool mFirstTime; + Viewer2D *mBox; + wxvtkImageViewer2 *imageViewer; + vtkImageData *backImageData; + vtkImageData *mDefaultImage; + wxVTKRenderWindowInteractor *wxvtkrenderwindowinteractor; + bool mUpdateCamera; + + vtkImplicitPlaneWidget * maPlane1, * maPlane2, * mbPlane1, * mbPlane2; + }; + Viewer2DWidget::Viewer2DWidget(Viewer2D* box, wxWindow *parent) : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL), + mFirstTime(true), mBox(box) { wxPanel *panel = this; wxvtkrenderwindowinteractor = new wxVTKRenderWindowInteractor(panel,-1); wxvtkrenderwindowinteractor->UseCaptureMouseOn(); - wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); - sizer -> Add( wxvtkrenderwindowinteractor , 1, wxEXPAND, 0); - panel -> SetSizer(sizer); - panel -> SetAutoLayout(true); - panel -> Layout(); - - backImageData = NULL; - imageViewer = NULL; + imageViewer = wxvtkImageViewer2::New(); + imageViewer->SetSlice( 1 ); + imageViewer->SetupInteractor ( wxvtkrenderwindowinteractor ); + mDefaultImage = vtkImageData::New(); + int dim[3]; + dim[0] = dim[1] = 256 ; + dim[2] = 2; + mDefaultImage->SetDimensions ( dim ); + mDefaultImage->SetSpacing(1,1,1); + mDefaultImage->SetExtent(0,dim[0]-1,0,dim[1]-1,0,dim[2]-1); + mDefaultImage->SetWholeExtent(0,dim[0]-1,0,dim[1]-1,0,dim[2]-1); + + mDefaultImage->SetScalarTypeToUnsignedChar(); + mDefaultImage->AllocateScalars(); + for (int i=0;iSetScalarComponentFromFloat(i,j,k,0,0); + + for (int i=0;iSetScalarComponentFromFloat(i,0,0,0,255); + mDefaultImage->SetScalarComponentFromFloat(i,dim[1]-1,0,0,255); + mDefaultImage->SetScalarComponentFromFloat(0,i,0,0,255); + mDefaultImage->SetScalarComponentFromFloat(dim[0]-1,i,0,0,255); + mDefaultImage->SetScalarComponentFromFloat(i,0,1,0,255); + mDefaultImage->SetScalarComponentFromFloat(i,dim[1]-1,1,0,255); + mDefaultImage->SetScalarComponentFromFloat(0,i,1,0,255); + mDefaultImage->SetScalarComponentFromFloat(dim[0]-1,i,1,0,255); + */ + mDefaultImage->SetScalarComponentFromFloat(i,i,0,0,255); + mDefaultImage->SetScalarComponentFromFloat(i,dim[1]-i-1,0,0,255); + mDefaultImage->SetScalarComponentFromFloat(i,i,1,0,255); + mDefaultImage->SetScalarComponentFromFloat(i,dim[1]-i-1,1,0,255); + } + + backImageData = mDefaultImage; + imageViewer->SetInput( backImageData ); + mUpdateCamera = true; + + wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); + sizer-> Add( wxvtkrenderwindowinteractor , 1, wxEXPAND, 0); + panel-> SetSizer(sizer); + panel-> SetAutoLayout(true); + panel-> Layout(); + + + // wxvtkrenderwindowinteractor->Refresh(); + // wxvtkrenderwindowinteractor->Render(); + // imageViewer->GetRenderer()->ResetCameraClippingRange(); + + imageViewer->GetRenderer()->SetBackground(0.1,0.1,0.2); + } //------------------------------------------------------------------------- @@ -72,6 +141,8 @@ namespace bbwxvtk // we want to force its destruction without taking care of vtk ref counting // on the contrary the following vtk objects are deleted with vtk Delete // std::cout << "Viewer2DWidget::~Viewer2DWidget()" << std::endl; + mDefaultImage->Delete(); + if (backImageData) { // backImageData->UnRegister(NULL); @@ -91,108 +162,143 @@ namespace bbwxvtk void Viewer2DWidget::UpdateView() { - // std::cout << "Viewer2DWidget::UpdateView() "<bbGetFullName() << std::endl; + // std::cout << "Viewer2DWidget::UpdateView() " << std::endl; // std::cout << "slice="<bbGetInputSlice()<bbGetInputIn() == NULL ) && + ( backImageData != mDefaultImage ) ) + { + // + // std::cout << "** Viewer2DWidget::UpdateView() : NULL Input (reset)" <bbGetInputIn()!=NULL) && - (backImageData != mBox->bbGetInputIn()) ) + } + else if ( ( mBox->bbGetInputIn() != NULL ) && + (( mBox->bbGetInputStatus("In") != bbtk::UPTODATE ) || + ( mFirstTime)) + ) + //(backImageData != mBox->bbGetInputIn()) ) { - if (imageViewer==NULL) - { - imageViewer = vtkImageViewer2::New(); - imageViewer->SetupInteractor ( wxvtkrenderwindowinteractor ); - } - // std::cout << "V2D b="<bbGetInputIn(); - - - // std::cout << "V2D r2="<GetReferenceCount()<DebugOn(); - // backImageData->PrintSelf(std::cout,0); - - // backImageData->Register(NULL); - imageViewer->SetInput( backImageData ); backImageData->Update(); + imageViewer->SetInput( backImageData ); + mUpdateCamera = true; + } + if (mUpdateCamera) + { + // std::cout << "** Viewer2DWidget::UpdateView() : Update Camera" + // <GetSpacing(spx,spy,spz); backImageData->GetExtent (x1,x2,y1,y2,z1,z2); - bbtkMessage("Output",2,"Viewer2D '"<bbGetName()<<"' - Image :"<GetScalarRange(); + imageViewer->SetColorWindow(range[1] - range[0]); + imageViewer->SetColorLevel(0.5 * (range[1] + range[0])); + + imageViewer->GetRenderer()->ResetCamera(); + double bounds[6]; + imageViewer->GetRenderer()->ComputeVisiblePropBounds(bounds); + imageViewer->GetRenderer()->ResetCameraClippingRange(bounds); + + // bbtkMessage("Output",2,"Viewer2D '"<bbGetName()<<"' - Image :"<GetRenderer()->GetActiveCamera(); - camera->SetViewUp ( spx*0, -spy*1, spz*0); - camera->SetPosition( spx*(x1+x2)/2, spy*(y1+y2)/2, -spz*10000000); - camera->SetFocalPoint ( spx*(x1+x2)/2 , spy*(y1+y2)/2 , spz*0); - + camera->SetViewUp ( spx*0, -spy*1, spz*0 ); + camera->SetPosition ( spx*(x1+x2)/2, spy*(y1+y2)/2, -spz*10000000 ); + camera->SetFocalPoint( spx*(x1+x2)/2, spy*(y1+y2)/2, spz*0 ); camera->ComputeViewPlaneNormal(); camera->SetParallelScale( spx*(x2-x1)/2.0 ); - // imageViewer->GetRenderer()->ResetCamera(x1,x2,y1,y2,z1,z2); - } + // + // imageViewer->GetRenderer()->ResetCamera(x1,x2,y1,y2,z1,z2); + mUpdateCamera = false; + // std::cout << "Viewer2DWidget::UpdateView() passe par 3" << std::endl; + imageViewer->SetColorWindow(512); + imageViewer->SetColorLevel(256); + */ + /* + for (int i=0;i<10;i++) + for (int j=0;j<10;j++) + std::cout << mBox->bbGetInputIn()->GetScalarComponentAsFloat(i,j,0,0) + << std::endl; + */ + } - // std::cout << "update"<bbIsShown() is necessary to be sure that the wxWindow is already // created and displayed. // Else when slice != 0 we get an X Window System error with wxGTK - if ((imageViewer!=NULL)&& + if ( (backImageData!=NULL)&& (mBox->bbIsShown())) - { - int z = mBox->bbGetInputSlice(); - // std::cout << "slice = "<GetWholeExtent(ext); - - // std::cout << "ext = "<=ext[5]) { z=ext[5]-1; } - // LG : SetZSlice does not exist anymore in vtk 5 ! - /* -#if (VTK_MAJOR_VERSION >= 5) - imageViewer->SetSlice( 0 ); -#else - imageViewer->SetZSlice( 0 ); -#endif - - - - wxvtkrenderwindowinteractor->Render(); - */ - -#if (VTK_MAJOR_VERSION >= 5) - imageViewer->SetSlice( z ); -#else - imageViewer->SetZSlice( z ); -#endif - wxvtkrenderwindowinteractor->Render(); - - } - + { + int z = mBox->bbGetInputSlice(); + // std::cout << "slice = "<GetWholeExtent(ext); + /* + std::cout << "ext = "<ext[1]) { z=ext[1]; } + + break; + + case 1: + if (zext[3]) { z=ext[3]; } + break; + + case 2: + if (zext[5]) { z=ext[5]; } + break; + + default: + bbtkMessage("Output", 2, "Viewer2D : Orientation was not 0< <2 (shouldn't arrive here!"<Refresh(); + wxvtkrenderwindowinteractor->Render(); + bbtkDebugMessage("Output",3,"Viewer2D : slice = "<SetSliceOrientation (orientation); + imageViewer->SetSlice( z ); + + } + - - //Refresh(); } + vtkRenderer * Viewer2DWidget::GetRenderer() + { + return imageViewer->GetRenderer(); + } + //-------------------------------------------------------------------------- @@ -201,46 +307,48 @@ namespace bbwxvtk //-------------------------------------------------------------------------- + BBTK_ADD_BLACK_BOX_TO_PACKAGE(wxvtk,Viewer2D); BBTK_BLACK_BOX_IMPLEMENTATION(Viewer2D,bbtk::WxBlackBox); void Viewer2D::Process() { - // LG : Bug when initial slice != 0 on first time - // (see wxvtk/appli/ExampleSimpleSlicer) - // I think there is a problem with rendering before window - // has been reparented ... we have to check this - - // ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView(); + // std::cout << "Viewer2D::Process" << std::endl; + // std::cout << "In="<UpdateView(); + } bbSetOutputOut( bbGetInputSlice() ); + } - /** - * \brief Create wxWidget . - * - * - */ - void Viewer2D::CreateWidget() + void Viewer2D::bbUserConstructor() { - bbtkDebugMessageInc("Core",9,"Viewer2D::CreateWidget()"<UpdateView(); bbSetOutputWidget(w); + bbSetOutputRenderer( ((Viewer2DWidget*)bbGetOutputWidget())->GetRenderer() ); - bbtkDebugDecTab("Core",9); } - // This callback is necessary to get actual processing of the view - // when window is shown - void Viewer2D::bbUserOnShow() - { - ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView(); - } - }//namespace bbtk #endif +#endif