Program: bbtk
Module: $RCSfile: bbwxvtkViewer2D.cxx,v $
Language: C++
- Date: $Date: 2008/06/25 15:36:19 $
- Version: $Revision: 1.11 $
+ Date: $Date: 2008/12/03 13:35:35 $
+ Version: $Revision: 1.27 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
wxvtkrenderwindowinteractor->UseCaptureMouseOn();
imageViewer = vtkImageViewer2::New();
- imageViewer->SetSlice( 1 );
+ imageViewer->SetSlice( 1 );
imageViewer->SetupInteractor ( wxvtkrenderwindowinteractor );
mDefaultImage = vtkImageData::New();
int dim[3];
dim[0] = dim[1] = 32 ;
- dim[2] = 2;
+ 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);
mUpdateCamera = true;
wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
- sizer -> Add( wxvtkrenderwindowinteractor , 1, wxEXPAND, 0);
- panel -> SetSizer(sizer);
- panel -> SetAutoLayout(true);
- panel -> Layout();
-
+ 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);
+
}
//-------------------------------------------------------------------------
mUpdateCamera = true;
}
else if ( ( mBox->bbGetInputIn() != NULL ) &&
+ // (true) ) //
(backImageData != mBox->bbGetInputIn()) )
{
backImageData = mBox->bbGetInputIn();
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 );
- 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);
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;
+ // std::cout << "CW = "<< mBox->bbGetContainingWindow() << std::endl;
+ // std::cout << "Sh = "<< mBox->bbIsShown() << std::endl;
-
-
+ int orientation = mBox->bbGetInputOrientation();
+ 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
(backImageData!=NULL)&&
(mBox->bbIsShown()))
{
- int z = mBox->bbGetInputSlice();
- // std::cout << "slice = "<<z<<std::endl;
- int ext[6];
- backImageData->GetWholeExtent(ext);
-
- // std::cout << "ext = "<<ext[4]<<" - "<<ext[5]<<std::endl;
-
- if (z<ext[4]) { z=ext[4]; }
- if (z>ext[5]) { z=ext[5]; }
-
-
-#if (VTK_MAJOR_VERSION >= 5)
- imageViewer->SetSlice( z );
-#else
- imageViewer->SetZSlice( z );
-#endif
-
- //imageViewer->UpdateDisplayExtent();
- wxvtkrenderwindowinteractor->Render();
- imageViewer->GetRenderer()->ResetCameraClippingRange();
+ int z = mBox->bbGetInputSlice();
+ // std::cout << "slice = "<<z<<std::endl;
+ int ext[6];
+ backImageData->GetWholeExtent(ext);
+ /*
+ 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]; }
+ if (z>ext[1]) { z=ext[1]; }
+
+ break;
+
+ case 1:
+ if (z<ext[2]) { z=ext[2]; }
+ if (z>ext[3]) { z=ext[3]; }
+ break;
+
+ case 2:
+ if (z<ext[4]) { z=ext[4]; }
+ if (z>ext[5]) { z=ext[5]; }
+ break;
+
+ default:
+ bbtkMessage("Output", 2, "Viewer2D : Orientation was not 0< <2 (shouldn't arrive here!"<<std::endl);
+ z = ext[5]; // Why not?
+ }
+
+ bbtkDebugMessage("Output",3,"Viewer2D : slice = "<<z<<std::endl);
+ imageViewer->SetSliceOrientation (orientation);
+ wxvtkrenderwindowinteractor->Render();
+ imageViewer->SetSlice( z );
+
+ }
+
+
}
-
-}
-
-
vtkRenderer * Viewer2DWidget::GetRenderer()
{
return imageViewer->GetRenderer();
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();
- bbSetOutputOut( bbGetInputSlice() );
+ Viewer2DWidget* w = (Viewer2DWidget*)bbGetOutputWidget();
+ if (w)
+ {
+ w->UpdateView();
bbSetOutputRenderer( ((Viewer2DWidget*)bbGetOutputWidget())->GetRenderer() );
-
+ }
+ bbSetOutputOut( bbGetInputSlice() );
+
}
{
bbSetInputIn(NULL);
bbSetInputSlice(0);
+ bbSetOutputWidget(0);
+ bbSetInputOrientation(2);
}
/**
*
*
*/
- void Viewer2D::CreateWidget()
+ void Viewer2D::CreateWidget(wxWindow* parent)
{
- bbtkDebugMessageInc("Core",9,"Viewer2D::CreateWidget()"<<std::endl);
-
- Viewer2DWidget* w = new Viewer2DWidget(this,bbGetWxParent());
+ Viewer2DWidget* w = new Viewer2DWidget(this,parent);//bbGetWxParent());
bbSetOutputWidget(w);
-
- 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()
{
- ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
+ // ((Viewer2DWidget*)bbGetOutputWidget())->Update();
+ // ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
}
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff