Program: bbtk
Module: $RCSfile: bbwxvtkViewer2D.cxx,v $
Language: C++
- Date: $Date: 2008/10/10 13:57:42 $
- Version: $Revision: 1.16 $
+ Date: $Date: 2008/12/09 15:25:08 $
+ Version: $Revision: 1.30 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
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();
- imageViewer = vtkImageViewer2::New();
+ imageViewer = wxvtkImageViewer2::New();
imageViewer->SetSlice( 1 );
imageViewer->SetupInteractor ( wxvtkrenderwindowinteractor );
panel-> Layout();
- wxvtkrenderwindowinteractor->Refresh();
- wxvtkrenderwindowinteractor->Render();
- imageViewer->GetRenderer()->ResetCameraClippingRange();
+ // wxvtkrenderwindowinteractor->Refresh();
+ // wxvtkrenderwindowinteractor->Render();
+ // imageViewer->GetRenderer()->ResetCameraClippingRange();
+
+ imageViewer->GetRenderer()->SetBackground(0.1,0.1,0.2);
-
}
//-------------------------------------------------------------------------
void Viewer2DWidget::UpdateView()
{
- // std::cout << "Viewer2DWidget::UpdateView() "<<mBox->bbGetFullName() << std::endl;
+ // std::cout << "Viewer2DWidget::UpdateView() " << std::endl;
// std::cout << "slice="<<mBox->bbGetInputSlice()<<std::endl;
-
-
+
+
if ( ( mBox->bbGetInputIn() == NULL ) &&
( backImageData != mDefaultImage ) )
{
+ //
+ // std::cout << "** Viewer2DWidget::UpdateView() : NULL Input (reset)" <<std::endl;
backImageData = mDefaultImage;
mUpdateCamera = true;
+
}
else if ( ( mBox->bbGetInputIn() != NULL ) &&
- (backImageData != mBox->bbGetInputIn()) )
+ (( mBox->bbGetInputStatus("In") != bbtk::UPTODATE ) ||
+ ( mFirstTime))
+ )
+ //(backImageData != mBox->bbGetInputIn()) )
{
+
+ // std::cout << "** Viewer2DWidget::UpdateView() : Input changed" <<std::endl;
+ mFirstTime = false;
backImageData = mBox->bbGetInputIn();
backImageData->Update();
imageViewer->SetInput( backImageData );
if (mUpdateCamera)
{
+ // std::cout << "** Viewer2DWidget::UpdateView() : Update Camera"
+ // <<std::endl;
int x1,x2,y1,y2,z1,z2;
double spx,spy,spz;
backImageData->GetSpacing(spx,spy,spz);
backImageData->GetExtent (x1,x2,y1,y2,z1,z2);
+ double *range = backImageData->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 '"<<mBox->bbGetName()<<"' - Image :"<<std::endl);
// std::cout << " extent = "<< x1<<"-"<<x2<<" x "<<y1<<"-"<<y2<<" x "<<z1<<"-"<<z2<<std::endl;
// std::cout << " spacing = "<<spx << " - "<< spy << " - "<<spz<<std::endl;
-
+ /*
vtkCamera *camera = imageViewer->GetRenderer()->GetActiveCamera();
camera->SetViewUp ( spx*0, -spy*1, spz*0 );
//
// 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 << "OW = "<< mBox->bbGetWindow() << std::endl;
// std::cout << "CW = "<< mBox->bbGetContainingWindow() << std::endl;
// std::cout << "Sh = "<< mBox->bbIsShown() << std::endl;
int orientation = mBox->bbGetInputOrientation();
- if (orientation<0 || orientation>2)
+ if (orientation<0 || orientation>2) {
+ bbtkMessage("Output", 2, "Viewer2D : Orientation was not 0< <2 "<<std::endl);
orientation=2; // Why not?
-
+ }
// mBox->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
// std::cout << "slice = "<<z<<std::endl;
int ext[6];
backImageData->GetWholeExtent(ext);
-
- // std::cout << "ext = "<<ext[4]<<" - "<<ext[5]<<std::endl;
-
+ /*
+ std::cout << "ext = "<<ext[0]<<" - "<<ext[1]<<" ; "
+ <<ext[2]<<" - "<<ext[3]<<" ; "
+ <<ext[4]<<" - "<<ext[5]
+ <<std::endl;
+ */
switch(orientation){
case 0:
if (z<ext[0]) { z=ext[0]; }
break;
default:
+ bbtkMessage("Output", 2, "Viewer2D : Orientation was not 0< <2 (shouldn't arrive here!"<<std::endl);
z = ext[5]; // Why not?
}
+ wxvtkrenderwindowinteractor->Refresh();
+ wxvtkrenderwindowinteractor->Render();
+ bbtkDebugMessage("Output",3,"Viewer2D : slice = "<<z<<std::endl);
+ imageViewer->SetSliceOrientation (orientation);
+ imageViewer->SetSlice( z );
- wxvtkrenderwindowinteractor->Update();
- wxvtkrenderwindowinteractor->Render();
- imageViewer->GetRenderer()->ResetCameraClippingRange();
-
-/*
- #if (VTK_MAJOR_VERSION >= 5)
- imageViewer->SetSlice( z );
- #else
- imageViewer->SetZSlice( z );
- #endif
-*/
- imageViewer->SetSliceOrientation (orientation);
- imageViewer->SetSlice( z );
-
- //imageViewer->UpdateDisplayExtent();
- }
-
-
-}
+ }
+
+
+ }
vtkRenderer * Viewer2DWidget::GetRenderer()
//--------------------------------------------------------------------------
-
-
+ BBTK_ADD_BLACK_BOX_TO_PACKAGE(wxvtk,Viewer2D);
BBTK_BLACK_BOX_IMPLEMENTATION(Viewer2D,bbtk::WxBlackBox);
void Viewer2D::Process()
{
- // LG : Bug on Linux (wxGTK) when initial slice != 0 on first time
- // (see wxvtk/bbs/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="<<bbtk::GetIOStatusString(bbGetInputStatus("In")) << std::endl;
+ // std::cout << "Slice="<<bbtk::GetIOStatusString(bbGetInputStatus("Slice")) << std::endl;
+ Viewer2DWidget* w = (Viewer2DWidget*)bbGetOutputWidget();
+ if (w)
+ {
+ w->UpdateView();
+ }
bbSetOutputOut( bbGetInputSlice() );
- bbSetOutputRenderer( ((Viewer2DWidget*)bbGetOutputWidget())->GetRenderer() );
-
+
}
{
bbSetInputIn(NULL);
bbSetInputSlice(0);
+ bbSetOutputWidget(0);
+ bbSetOutputRenderer(0);
+ bbSetInputOrientation(2);
}
- /**
- * \brief Create wxWidget .
- *
- *
- */
- void Viewer2D::CreateWidget()
- {
- bbtkDebugMessageInc("Core",9,"Viewer2D::CreateWidget()"<<std::endl);
- Viewer2DWidget* w = new Viewer2DWidget(this,bbGetWxParent());
+ void Viewer2D::CreateWidget(wxWindow* parent)
+ {
+ Viewer2DWidget* w = new Viewer2DWidget(this,parent);
+ w->UpdateView();
bbSetOutputWidget(w);
+ bbSetOutputRenderer( ((Viewer2DWidget*)bbGetOutputWidget())->GetRenderer() );
- bbtkDebugDecTab("Core",9);
}
- // This callback is necessary to get actual processing of the view
+ // This callback is *no more*
+ // necessary to get actual processing of the view
// when window is shown
- void Viewer2D::bbUserOnShow()
+ void Viewer2D::OnShowWidget()
{
-
-#if defined(_WIN32)
-// ((Viewer2DWidget*)bbGetOutputWidget())->Refresh();
- ((Viewer2DWidget*)bbGetOutputWidget())->Update();
- ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
-#endif
- /*
- ((Viewer2DWidget*)bbGetOutputWidget())->Update();
- ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
- */
}
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff