+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ # pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ # This software is governed by the CeCILL-B license under French law and
+ # abiding by the rules of distribution of free software. You can use,
+ # modify and/ or redistribute the software under the terms of the CeCILL-B
+ # license as circulated by CEA, CNRS and INRIA at the following URL
+ # http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ # or in the file LICENSE.txt.
+ #
+ # As a counterpart to the access to the source code and rights to copy,
+ # modify and redistribute granted by the license, users are provided only
+ # with a limited warranty and the software's author, the holder of the
+ # economic rights, and the successive licensors have only limited
+ # liability.
+ #
+ # The fact that you are presently reading this means that you have had
+ # knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
/*=========================================================================
Program: bbtk
Module: $RCSfile: bbwxvtkViewer2D.cxx,v $
Language: C++
- 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
- http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
+ Date: $Date: 2012/11/16 08:52:36 $
+ Version: $Revision: 1.39 $
=========================================================================*/
/**
*/
-#ifdef _USE_WXWIDGETS_
-
+#ifdef USE_WXWIDGETS
+#ifdef USE_VTK
#include "bbwxvtkViewer2D.h"
#include "bbwxvtkPackage.h"
#include "vtkRenderer.h"
#include <vtkInteractorStyleImage.h>
#include <vtkCommand.h>
-
-
-
+#include <vtkImageActor.h>
namespace bbwxvtk
{
-
-
-
-
//--------------------------------------------------------------------------
class Viewer2DWidget : public wxPanel
{
~Viewer2DWidget();
void UpdateView();
vtkRenderer *GetRenderer();
+ vtkImageActor *GetImageActor();
private:
bool mFirstTime;
Viewer2D *mBox;
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);
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);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+ mDefaultImage->SetWholeExtent(0,dim[0]-1,0,dim[1]-1,0,dim[2]-1);
mDefaultImage->SetScalarTypeToUnsignedChar();
- mDefaultImage->AllocateScalars();
+ mDefaultImage->AllocateScalars();
+#else
+ 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);
+ 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() " << std::endl;
- // std::cout << "slice="<<mBox->bbGetInputSlice()<<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 ) ||
( mFirstTime))
)
//(backImageData != mBox->bbGetInputIn()) )
- {
-
- // std::cout << "** Viewer2DWidget::UpdateView() : Input changed" <<std::endl;
+ {
+ // std::cout << "** Viewer2DWidget::UpdateView() : Input changed" <<std::endl;
mFirstTime = false;
- backImageData = mBox->bbGetInputIn();
- backImageData->Update();
- imageViewer->SetInput( backImageData );
- mUpdateCamera = true;
+ 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;
+ }
}
if (mUpdateCamera)
<< std::endl;
*/
}
-
+
// std::cout << "OW = "<< mBox->bbGetWindow() << std::endl;
// std::cout << "CW = "<< mBox->bbGetContainingWindow() << std::endl;
// std::cout << "Sh = "<< mBox->bbIsShown() << std::endl;
+
+ bool interp = mBox->bbGetInputInterpolate();
+ if ( interp )
+ imageViewer->GetImageActor()->InterpolateOn();
+ else
+ imageViewer->GetImageActor()->InterpolateOff();
+
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];
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
backImageData->GetWholeExtent(ext);
+#else
+ backImageData->GetExtent(ext);
+#endif
+
/*
std::cout << "ext = "<<ext[0]<<" - "<<ext[1]<<" ; "
<<ext[2]<<" - "<<ext[3]<<" ; "
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);
+ bbSetInputInterpolate(true); // JP
+ bbSetInputSlice(0);
+ bbSetOutputWidget(0);
+ bbSetOutputRenderer(0);
+ bbSetInputOrientation(2);
+ }
+
+ //-----------------------------------------------------------------
+ void Viewer2D::bbUserInitializeProcessing()
+ {
+ }
+
+ //-----------------------------------------------------------------
+ void Viewer2D::bbUserFinalizeProcessing()
+ {
+ }
+
+ //--------------------------------------------------------------------------
void Viewer2D::Process()
{
// std::cout << "Viewer2D::Process" << std::endl;
{
w->UpdateView();
}
- bbSetOutputOut( bbGetInputSlice() );
-
+ bbSetOutputOut( bbGetInputSlice() );
}
- void Viewer2D::bbUserConstructor()
- {
- bbSetInputIn(NULL);
- bbSetInputSlice(0);
- bbSetOutputWidget(0);
- bbSetOutputRenderer(0);
- bbSetInputOrientation(2);
- }
+ //--------------------------------------------------------------------------
void Viewer2D::CreateWidget(wxWindow* parent)
{
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()
- {
- }
-
}//namespace bbtk
#endif
+#endif
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff