#include <vtkInteractorStyleImage.h>
#include <vtkCommand.h>
#include <vtkImageActor.h>
+#include <wx/gdicmn.h>
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+ #include "wxvtkImageViewer2.h"
+#else
+ #include <vtkImageViewer2.h>
+#endif
+
+
+#include "wxVTKRenderWindowInteractor.h"
+
namespace bbwxvtk
{
//--------------------------------------------------------------------------
Viewer2DWidget(Viewer2D* box, wxWindow *parent);
~Viewer2DWidget();
void UpdateView();
- vtkRenderer *GetRenderer();
- vtkImageActor *GetImageActor();
+ vtkRenderer *GetRenderer();
+ vtkImageActor *GetImageActor();
private:
- bool mFirstTime;
- Viewer2D *mBox;
- wxvtkImageViewer2 *imageViewer;
- vtkImageData *backImageData;
- vtkImageData *mDefaultImage;
+ bool mFirstTime;
+ Viewer2D *mBox;
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+ wxvtkImageViewer2 *imageViewer;
+#else
+ vtkImageViewer2 *imageViewer;
+#endif
+
+ vtkImageData *backImageData;
+ vtkImageData *mDefaultImage;
wxVTKRenderWindowInteractor *wxvtkrenderwindowinteractor;
bool mUpdateCamera;
vtkImplicitPlaneWidget * maPlane1, * maPlane2, * mbPlane1, * mbPlane2;
};
- Viewer2DWidget::Viewer2DWidget(Viewer2D* box,
- wxWindow *parent)
+ Viewer2DWidget::Viewer2DWidget(Viewer2D* box, wxWindow *parent)
:
wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
mFirstTime(true),
wxvtkrenderwindowinteractor = new wxVTKRenderWindowInteractor(panel,-1);
wxvtkrenderwindowinteractor->UseCaptureMouseOn();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
imageViewer = wxvtkImageViewer2::New();
+#else
+ imageViewer = vtkImageViewer2::New();
+#endif
+
imageViewer->SetSlice( 1 );
imageViewer->SetupInteractor ( wxvtkrenderwindowinteractor );
mDefaultImage->AllocateScalars(VTK_UNSIGNED_CHAR,1);
#endif
- 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);
-
- for (int i=0;i<dim[0];i++)
- {
- /*
- 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);
- }
+ int i,j,k;
+ for (i=0;i<dim[0];i++)
+ {
+ for (j=0;j<dim[1];j++)
+ {
+ for (k=0;k<dim[2];k++)
+ {
+ mDefaultImage->SetScalarComponentFromFloat(i,j,k,0,0);
+ } // for k
+ }// for j
+ } // for i
+
+ for (i=0;i<dim[0];i++)
+ {
+ /*
+ 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);
+ } // for i
mDefaultImage->Modified();
-
backImageData = mDefaultImage;
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
imageViewer->SetInput( backImageData );
- mUpdateCamera = true;
+#else
+ imageViewer->SetInputData( backImageData );
+#endif
+ 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);
-
}
//-------------------------------------------------------------------------
mDefaultImage->Delete();
if (backImageData)
- {
- // backImageData->UnRegister(NULL);
- }
+ {
+// backImageData->UnRegister(NULL);
+ }
if (imageViewer)
- {
- imageViewer->Delete();
- }
+ {
+ imageViewer->Delete();
+ }
delete wxvtkrenderwindowinteractor;
// std::cout << "Viewer2DWidget::~Viewer2DWidget() OK" << std::endl;
}
//-------------------------------------------------------------------------
-
-
void Viewer2DWidget::UpdateView()
{
// 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;
- backImageData = mDefaultImage;
- mUpdateCamera = true;
- }
- else if ( ( mBox->bbGetInputIn() != NULL ) &&
+ if ( ( mBox->bbGetInputIn() == NULL ) && ( backImageData != mDefaultImage ) )
+ {
+ //
+ // std::cout << "** Viewer2DWidget::UpdateView() : NULL Input (reset)" <<std::endl;
+ backImageData = mDefaultImage;
+ mUpdateCamera = true;
+ } else if ( ( mBox->bbGetInputIn() != NULL ) &&
(( mBox->bbGetInputStatus("In") != bbtk::UPTODATE ) ||
( mFirstTime))
)
//(backImageData != mBox->bbGetInputIn()) )
- {
- // std::cout << "** Viewer2DWidget::UpdateView() : Input changed" <<std::endl;
- mFirstTime = false;
- if (backImageData != mBox->bbGetInputIn()) // Don't update if just Slice changed
- {
- backImageData = mBox->bbGetInputIn();
-//EED 2017-01-01 Migration VTK7
-#if VTK_MAJOR_VERSION <= 5
- backImageData->Update();
-#else
- // ..
-#endif
- 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();
+ //EED 2017-01-01 Migration VTK7
+ #if VTK_MAJOR_VERSION <= 5
+ backImageData->Update();
+ imageViewer->SetInput( backImageData );
+ #else
+ imageViewer->SetInputData( backImageData );
+ #endif
+ mUpdateCamera = true;
+ } // if BackImageData
+ } // if BoxInputIn
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);
+ {
+ // 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);
+ 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->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;
- */
+ // 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->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;
bool interp = mBox->bbGetInputInterpolate();
if ( interp )
+ {
imageViewer->GetImageActor()->InterpolateOn();
- else
+ } else {
imageViewer->GetImageActor()->InterpolateOff();
-
+ }
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
- if (
- (backImageData!=NULL)&&
- (mBox->bbIsShown()))
+ if ( (backImageData!=NULL) && (mBox->bbIsShown()) )
{
int z = mBox->bbGetInputSlice();
int ext[6];
bbtkMessage("Output", 2, "Viewer2D : Orientation was not 0< <2 (shouldn't arrive here!"<<std::endl);
z = ext[5]; // Why not?
}
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
wxvtkrenderwindowinteractor->Refresh();
+#else
+ //wxRect *rect=new wxRect(0, 0, 50, 50);
+ //wxvtkrenderwindowinteractor->Refresh(true, rect);
+ // ..
+#endif
+
wxvtkrenderwindowinteractor->Render();
bbtkDebugMessage("Output",3,"Viewer2D : slice = "<<z<<std::endl);
imageViewer->SetSliceOrientation (orientation);
imageViewer->SetSlice( z );
- }
- }
+ } // if backImageData
- vtkRenderer * Viewer2DWidget::GetRenderer()
- {
- return imageViewer->GetRenderer();
- }
-
+}
+ //--------------------------------------------------------------------------
+vtkRenderer * Viewer2DWidget::GetRenderer()
+{
+ return imageViewer->GetRenderer();
+}
//--------------------------------------------------------------------------
//-------------------------------------------------------------------------
// std::cout << "Slice="<<bbtk::GetIOStatusString(bbGetInputStatus("Slice")) << std::endl;
Viewer2DWidget* w = (Viewer2DWidget*)bbGetOutputWidget();
if (w)
- {
- w->UpdateView();
- }
+ {
+ w->UpdateView();
+ }
bbSetOutputOut( bbGetInputSlice() );
}
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff