From 91f214593c6a8eebd5badb68e772b383c38435d4 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Thu, 26 Jun 2008 09:09:46 +0000 Subject: [PATCH] FileReader : input 'Filename' is now 'In' --- packages/BoxCategories.txt | 2 +- packages/itk/bbs/appli/ImageCrop.bbs | 4 ++-- packages/itk/bbs/appli/ImageInfo.bbs | 6 +++--- packages/itk/src/bbitkImageReader.cxx | 8 ++++---- packages/itk/src/bbitkImageReader.h | 8 ++++---- packages/vtk/bbs/appli/ExampleGaussianSmooth_02.bbs | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/BoxCategories.txt b/packages/BoxCategories.txt index e46e607..e792e0d 100644 --- a/packages/BoxCategories.txt +++ b/packages/BoxCategories.txt @@ -7,7 +7,7 @@ atomic box : System category. Automatically assigned to Atomic Black Boxes (c++ defined) complex box : System category. Automatically assigned to Complex Black Boxes (script defined) -? command line : Script which defines a command line application. +command line : Script which defines a command line application (no embedded GUI, but command line imput parameters) demo : Demonstration ? devel : Developer tool (bbCreatePackage.bbs, ...) example : Example script showing a box use-case diff --git a/packages/itk/bbs/appli/ImageCrop.bbs b/packages/itk/bbs/appli/ImageCrop.bbs index 12262d8..ef71b4d 100644 --- a/packages/itk/bbs/appli/ImageCrop.bbs +++ b/packages/itk/bbs/appli/ImageCrop.bbs @@ -6,7 +6,7 @@ load std load itk new ImageReader reader -input I reader.Filename "Input file name" +input I reader.In "Input file name" new ExtractImageFilter filter connect reader.Out filter.In @@ -20,6 +20,6 @@ connect region.Out filter.Region new ImageWriter writer connect filter.Out writer.In -input O writer.Filename "Output file name" +input O writer.In "Output file name" exec writer diff --git a/packages/itk/bbs/appli/ImageInfo.bbs b/packages/itk/bbs/appli/ImageInfo.bbs index 335178d..da1f3e8 100644 --- a/packages/itk/bbs/appli/ImageInfo.bbs +++ b/packages/itk/bbs/appli/ImageInfo.bbs @@ -13,12 +13,12 @@ new ImageReader reader include std/boxes/bbPrependDataPath new PrependDataPath pdp set pdp.In "thorax.hdr" -#connect pdp.Out reader.Filename +#connect pdp.Out reader.In # Allow user to specify his own image, in GUI mode (-g option) #--------------------------------------------------------------- -set reader.Filename "hola.mhd" -input I reader.Filename "Input image file" +set reader.In "hola.mhd" +input I reader.In "Input image file" new ImageProperties P connect reader.Out P.In diff --git a/packages/itk/src/bbitkImageReader.cxx b/packages/itk/src/bbitkImageReader.cxx index b6d9bb1..83711eb 100644 --- a/packages/itk/src/bbitkImageReader.cxx +++ b/packages/itk/src/bbitkImageReader.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbitkImageReader.cxx,v $ Language: C++ - Date: $Date: 2008/04/18 12:59:50 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/06/26 09:09:47 $ + 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 @@ -36,7 +36,7 @@ namespace bbitk void ImageReader::Read() { - std::string filename = bbGetInputFilename(); + std::string filename = bbGetInputIn(); itk::ImageIOBase::Pointer genericReader = itk::ImageIOFactory::CreateImageIO(filename.c_str(), @@ -68,7 +68,7 @@ namespace bbitk typedef itk::ImageFileReader< itkImageType > itkReaderType; typename itkReaderType::Pointer reader = itkReaderType::New(); - std::string filename = bbGetInputFilename(); + std::string filename = bbGetInputIn(); reader->SetFileName(filename.c_str()); try { reader->Update(); } catch( std::exception& e ) diff --git a/packages/itk/src/bbitkImageReader.h b/packages/itk/src/bbitkImageReader.h index 44a6318..3d9e490 100644 --- a/packages/itk/src/bbitkImageReader.h +++ b/packages/itk/src/bbitkImageReader.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbitkImageReader.h,v $ Language: C++ - Date: $Date: 2008/04/18 12:59:50 $ - Version: $Revision: 1.5 $ + Date: $Date: 2008/06/26 09:09:47 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -42,7 +42,7 @@ namespace bbitk BBTK_BLACK_BOX_INTERFACE(ImageReader, bbtk::AtomicBlackBox); - BBTK_DECLARE_INPUT(Filename,std::string); + BBTK_DECLARE_INPUT(In,std::string); BBTK_DECLARE_OUTPUT(Out,anyImagePointer); BBTK_PROCESS(Read); void Read(); @@ -60,7 +60,7 @@ namespace bbitk BBTK_AUTHOR("laurent.guigues at creatis.insa-lyon.fr"); BBTK_CATEGORY("image;read/write"); BBTK_DESCRIPTION("Generic itk image reader"); - BBTK_INPUT(ImageReader,Filename, + BBTK_INPUT(ImageReader,In, "filename with complete path",std::string,"file name"); BBTK_OUTPUT(ImageReader,Out,"Output image",anyImagePointer,""); BBTK_END_DESCRIBE_BLACK_BOX(ImageReader); diff --git a/packages/vtk/bbs/appli/ExampleGaussianSmooth_02.bbs b/packages/vtk/bbs/appli/ExampleGaussianSmooth_02.bbs index 9d587b0..20fbc6b 100644 --- a/packages/vtk/bbs/appli/ExampleGaussianSmooth_02.bbs +++ b/packages/vtk/bbs/appli/ExampleGaussianSmooth_02.bbs @@ -13,7 +13,7 @@ new FileSelector fileselectoropen set fileselectoropen.OpenSave "Open" new ImageReader imagereader - connect fileselectoropen.Out imagereader.Filename + connect fileselectoropen.Out imagereader.In new Viewer2D viewerleft connect imagereader.Out viewerleft.In @@ -60,4 +60,4 @@ new LayoutSplit main connect layoutline.Widget main.Widget2 -exec main \ No newline at end of file +exec main -- 2.45.0