Program: bbtk
Module: $RCSfile: bbwxvtkViewer2D.cxx,v $
Language: C++
- Date: $Date: 2008/12/09 12:54:07 $
- Version: $Revision: 1.29 $
+ Date: $Date: 2009/05/28 08:55:45 $
+ Version: $Revision: 1.37 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
-#ifdef _USE_WXWIDGETS_
-
+#ifdef USE_WXWIDGETS
+#ifdef USE_VTK
#include "bbwxvtkViewer2D.h"
#include "bbwxvtkPackage.h"
#include <vtkInteractorStyleImage.h>
#include <vtkCommand.h>
-
-
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;
mDefaultImage = vtkImageData::New();
int dim[3];
- dim[0] = dim[1] = 32 ;
+ dim[0] = dim[1] = 256 ;
dim[2] = 2;
mDefaultImage->SetDimensions ( dim );
mDefaultImage->SetSpacing(1,1,1);
for (int i=0;i<dim[0];i++)
for (int j=0;j<dim[1];j++)
for (int k=0;k<dim[2];k++)
- mDefaultImage->SetScalarComponentFromFloat(i,j,k,0,0);
+ mDefaultImage->SetScalarComponentFromFloat(i,j,k,0,0);
for (int i=0;i<dim[0];i++)
- {
- mDefaultImage->SetScalarComponentFromFloat(dim[0]-i-1,i,0,0,255);
- mDefaultImage->SetScalarComponentFromFloat(i,i,1,0,255);
- }
+ {
+ /*
+ mDefaultImage->SetScalarComponentFromFloat(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();
+ sizer->Add( wxvtkrenderwindowinteractor, 1, wxEXPAND, 0);
+ panel->SetSizer(sizer);
+ panel->SetAutoLayout(true);
+ panel->Layout();
// wxvtkrenderwindowinteractor->Refresh();
delete wxvtkrenderwindowinteractor;
// std::cout << "Viewer2DWidget::~Viewer2DWidget() OK" << std::endl;
}
-
- //-------------------------------------------------------------------------
-
+ //-------------------------------------------------------------------------
void Viewer2DWidget::UpdateView()
{
- // std::cout << "Viewer2DWidget::UpdateView() "<<mBox->bbGetFullName() << std::endl;
- // std::cout << "slice="<<mBox->bbGetInputSlice()<<std::endl;
-
-
+ // std::cout << "Viewer2DWidget::UpdateView() " << std::endl;
+ // std::cout << "slice="<<mBox->bbGetInputSlice()<<std::endl;
+ mUpdateCamera = false; //JPR
if ( ( mBox->bbGetInputIn() == NULL ) &&
( backImageData != mDefaultImage ) )
{
//
- // std::cout << "** Viewer2DWidget::UpdateView() : NULL Input (reset)"
- // <<std::endl;
+ // std::cout << "** Viewer2DWidget::UpdateView() : NULL Input (reset)" <<std::endl;
backImageData = mDefaultImage;
mUpdateCamera = true;
-
}
else if ( ( mBox->bbGetInputIn() != NULL ) &&
- ( mBox->bbGetInputStatus("In") != bbtk::UPTODATE )
+ (( mBox->bbGetInputStatus("In") != bbtk::UPTODATE ) ||
+ ( mFirstTime))
)
//(backImageData != mBox->bbGetInputIn()) )
- {
- // std::cout << "** Viewer2DWidget::UpdateView() : Input changed"
- // <<std::endl;
- backImageData = mBox->bbGetInputIn();
- backImageData->Update();
- imageViewer->SetInput( backImageData );
- mUpdateCamera = true;
+ {
+ // std::cout << "** Viewer2DWidget::UpdateView() : Input changed" <<std::endl;
+ mFirstTime = false;
+ if (backImageData != mBox->bbGetInputIn()) // Don't update if just Slice changed
+ {
+ backImageData = mBox->bbGetInputIn();
+ backImageData->Update();
+ imageViewer->SetInput( backImageData );
+ mUpdateCamera = true;
+ }
}
if (mUpdateCamera)
int orientation = mBox->bbGetInputOrientation();
if (orientation<0 || orientation>2) {
- bbtkMessage("Output", 2, "Viewer2D : Orientation was not 0< <2 "<<std::endl);
+ 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
(mBox->bbIsShown()))
{
int z = mBox->bbGetInputSlice();
- // std::cout << "slice = "<<z<<std::endl;
int ext[6];
backImageData->GetWholeExtent(ext);
/*
imageViewer->SetSliceOrientation (orientation);
imageViewer->SetSlice( z );
- }
-
-
+ }
}
//--------------------------------------------------------------------------
-
-
+ BBTK_ADD_BLACK_BOX_TO_PACKAGE(wxvtk,Viewer2D);
BBTK_BLACK_BOX_IMPLEMENTATION(Viewer2D,bbtk::WxBlackBox);
-
+
+ //-----------------------------------------------------------------
+ void Viewer2D::bbUserSetDefaultValues()
+ {
+ bbSetInputIn(NULL);
+ bbSetInputSlice(0);
+ bbSetOutputWidget(0);
+ bbSetOutputRenderer(0);
+ bbSetInputOrientation(2);
+ }
+
+ //-----------------------------------------------------------------
+ void Viewer2D::bbUserInitializeProcessing()
+ {
+ }
+
+ //-----------------------------------------------------------------
+ void Viewer2D::bbUserFinalizeProcessing()
+ {
+ }
+
+ //--------------------------------------------------------------------------
void Viewer2D::Process()
{
+ // 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();
- bbSetOutputRenderer( ((Viewer2DWidget*)bbGetOutputWidget())->GetRenderer() );
}
- bbSetOutputOut( bbGetInputSlice() );
-
+ bbSetOutputOut( bbGetInputSlice() );
}
- void Viewer2D::bbUserConstructor()
- {
- bbSetInputIn(NULL);
- bbSetInputSlice(0);
- bbSetOutputWidget(0);
- bbSetInputOrientation(2);
- }
- /**
- * \brief Create wxWidget .
- *
- *
- */
+
+ //--------------------------------------------------------------------------
void Viewer2D::CreateWidget(wxWindow* parent)
{
- Viewer2DWidget* w = new Viewer2DWidget(this,parent);//bbGetWxParent());
+ Viewer2DWidget* w = new Viewer2DWidget(this,parent);
+ w->UpdateView();
bbSetOutputWidget(w);
+ bbSetOutputRenderer( ((Viewer2DWidget*)bbGetOutputWidget())->GetRenderer() );
}
- // This callback is *no more*
- // necessary to get actual processing of the view
- // when window is shown
- void Viewer2D::OnShowWidget()
- {
- // ((Viewer2DWidget*)bbGetOutputWidget())->Update();
- // ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
- }
-
}//namespace bbtk
#endif
+#endif
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff