From fdeb869b26beead8df60d96a64a20384139d5030 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Wed, 25 Jun 2008 08:21:31 +0000 Subject: [PATCH] Add Input : WindowLevel --- packages/vtk/src/bbvtkImagePlanes.cxx | 22 +++++++++++----------- packages/vtk/src/bbvtkImagePlanes.h | 8 +++++--- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/packages/vtk/src/bbvtkImagePlanes.cxx b/packages/vtk/src/bbvtkImagePlanes.cxx index 4241c69..a3b858d 100644 --- a/packages/vtk/src/bbvtkImagePlanes.cxx +++ b/packages/vtk/src/bbvtkImagePlanes.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbvtkImagePlanes.cxx,v $ Language: C++ - Date: $Date: 2008/05/09 10:39:46 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/06/25 08:21:31 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -20,8 +20,6 @@ * \brief */ - - #ifdef _USE_VTK_ #include "bbvtkImagePlanes.h" #include "bbvtkPackage.h" @@ -49,8 +47,6 @@ namespace bbvtk } - - namespace bbvtk { @@ -58,15 +54,16 @@ namespace bbvtk BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,ImagePlanes) BBTK_BLACK_BOX_IMPLEMENTATION(ImagePlanes,bbtk::AtomicBlackBox); - - - - void ImagePlanes::bbUserConstructor() { Init(); bbSetInputIn(0); + std::vector vect; + vect.push_back(512); + vect.push_back(256); + bbSetInputWindowLevel (vect); } + void ImagePlanes::bbUserCopyConstructor() { Init(); @@ -122,6 +119,7 @@ namespace bbvtk planeWidgetZ->Delete(); } +//--------------------------------------------------------------------- void ImagePlanes::Process() { if (bbGetInputIn()!=0) @@ -141,7 +139,9 @@ namespace bbvtk planeWidgetZ->SetPlaneOrientationToZAxes(); planeWidgetZ->SetSlicePosition((zMax+zMin)/2.); - planeWidgetZ->SetWindowLevel(512,256); + // planeWidgetZ->SetWindowLevel(512,256); + + planeWidgetZ->SetWindowLevel(bbGetInputWindowLevel()[0],bbGetInputWindowLevel()[1]); } } }//namespace bbtk diff --git a/packages/vtk/src/bbvtkImagePlanes.h b/packages/vtk/src/bbvtkImagePlanes.h index d0b0f9b..5ef36f7 100644 --- a/packages/vtk/src/bbvtkImagePlanes.h +++ b/packages/vtk/src/bbvtkImagePlanes.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbvtkImagePlanes.h,v $ Language: C++ - Date: $Date: 2008/05/09 10:39:47 $ - Version: $Revision: 1.4 $ + Date: $Date: 2008/06/25 08:21:31 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -53,7 +53,7 @@ namespace bbvtk { - + typedef std::vector winLevel; class /*BBTK_EXPORT*/ ImagePlanes : public bbtk::AtomicBlackBox { @@ -61,6 +61,7 @@ namespace bbvtk BBTK_BLACK_BOX_INTERFACE(ImagePlanes,bbtk::AtomicBlackBox); // BBTK_DECLARE_INPUT(Contour,int); BBTK_DECLARE_INPUT(In,vtkImageData *); + BBTK_DECLARE_INPUT(WindowLevel,winLevel); BBTK_DECLARE_OUTPUT(PlaneX,vtkImagePlaneWidget*); BBTK_DECLARE_OUTPUT(PlaneY,vtkImagePlaneWidget*); BBTK_DECLARE_OUTPUT(PlaneZ,vtkImagePlaneWidget*); @@ -86,6 +87,7 @@ namespace bbvtk BBTK_DESCRIPTION("Creates three 3D planes with the input image mapped onto with which the user can interact. The output vtkImagePlaneWidget objects are to be inserted into a 3D scene (e.g. a Viewer3D)"); BBTK_CATEGORY("3D object creator"); BBTK_INPUT(ImagePlanes,In,"Input Image",vtkImageData *,""); + BBTK_INPUT(ImagePlanes,WindowLevel,"Widdow Level",winLevel,""); BBTK_OUTPUT(ImagePlanes,PlaneX,"The image plane in X direction",vtkImagePlaneWidget*,""); BBTK_OUTPUT(ImagePlanes,PlaneY,"The image plane in Y direction",vtkImagePlaneWidget*,""); BBTK_OUTPUT(ImagePlanes,PlaneZ,"The image plane in Z direction",vtkImagePlaneWidget*,""); -- 2.45.1