From: jean-pierre roux Date: Thu, 8 Apr 2010 14:37:53 +0000 (+0000) Subject: re-indent / Fix comments X-Git-Tag: CREATOOLS.2-0-3~54 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a35823bf58c3560e9fe218ecd0f1fab421b6ebed;p=bbtk.git re-indent / Fix comments --- diff --git a/packages/demo/bbs/appli/demoFiltering1.bbs b/packages/demo/bbs/appli/demoFiltering1.bbs index 215cf1d..8326a39 100644 --- a/packages/demo/bbs/appli/demoFiltering1.bbs +++ b/packages/demo/bbs/appli/demoFiltering1.bbs @@ -167,7 +167,6 @@ new LayoutSplit mainSplit set colourSmooth.In "1 1 0" connect colourSmooth.Widget buttonLayout.Widget2 - /* new CommandButton refresh set refresh.Label "Refresh (to be used once at start time)" diff --git a/packages/demo/bbs/appli/demoPlane3Pts.bbs b/packages/demo/bbs/appli/demoPlane3Pts.bbs index 23aa8c2..325be85 100644 --- a/packages/demo/bbs/appli/demoPlane3Pts.bbs +++ b/packages/demo/bbs/appli/demoPlane3Pts.bbs @@ -1,7 +1,9 @@ description " ? ? ? " -author "???creatis.insa-lyon.fr" +author "davila at creatis.insa-lyon.fr" category "demo" +// See also examplePlane3Pts.bbs + include vtk/boxes/bbLoadHola load vtk load wxvtk @@ -9,13 +11,15 @@ load creaMaracasVisu load std load wx -//new LoadHola image +new LoadHola image +/* new FileSelector openFileDialog set openFileDialog.Wildcard "(*.mhd)|*.mhd" new MetaImageReader image connect openFileDialog.Out image.In - +*/ + new ImagePlanes planes connect image.Out planes.In @@ -69,7 +73,7 @@ connect viewernv.Widget layoutline1.Widget1 new LayoutSplit mainSplit set mainSplit.Orientation H -set mainSplit.Proportion 10 +set mainSplit.Proportion 30 connect layoutline0.Widget mainSplit.Widget1 connect layoutline1.Widget mainSplit.Widget2 diff --git a/packages/demo/bbs/appli/demoViewing3.bbs b/packages/demo/bbs/appli/demoViewing3.bbs index 4612a2f..1d6464c 100644 --- a/packages/demo/bbs/appli/demoViewing3.bbs +++ b/packages/demo/bbs/appli/demoViewing3.bbs @@ -24,8 +24,9 @@ connect upright.Widget main.Widget1 connect upleft.Widget main.Widget2 connect downleft.Widget main.Widget3 -# Here loads hola.mhd -# ------------------- +# Here loads 'hola.mhd' +# --------------------- + # Don't forget to comment out the following 2 lines # If you want to check someting else. diff --git a/packages/itk/src/bbitkImageProperties.h b/packages/itk/src/bbitkImageProperties.h index 8f20835..8d63f26 100644 --- a/packages/itk/src/bbitkImageProperties.h +++ b/packages/itk/src/bbitkImageProperties.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkImageProperties.h,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:21 $ - Version: $Revision: 1.8 $ + Date: $Date: 2010/04/08 14:37:58 $ + Version: $Revision: 1.9 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -71,7 +71,6 @@ namespace bbitk template void DoIt(); }; //================================================================= - //================================================================= // BlackBox description @@ -89,7 +88,6 @@ namespace bbitk BBTK_OUTPUT(ImageProperties,Spacing,"Size of the voxels",std::vector,"voxel size"); BBTK_END_DESCRIBE_BLACK_BOX(ImageProperties); //================================================================= - } //namespace bbitk diff --git a/packages/itk/src/bbitkImageReader.cxx b/packages/itk/src/bbitkImageReader.cxx index ecb8a8c..023ccd5 100644 --- a/packages/itk/src/bbitkImageReader.cxx +++ b/packages/itk/src/bbitkImageReader.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkImageReader.cxx,v $ Language: C++ - Date: $Date: 2009/06/24 08:08:57 $ - Version: $Revision: 1.7 $ + Date: $Date: 2010/04/08 14:37:58 $ + Version: $Revision: 1.8 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -79,7 +79,6 @@ namespace bbitk } - /** Template Processing */ @@ -107,11 +106,6 @@ namespace bbitk bbtkDebugDecTab("Core",9); } - - - - - } // eo namespace bbtk diff --git a/packages/itk/src/bbitkImageReader.h b/packages/itk/src/bbitkImageReader.h index a651d17..fa25357 100644 --- a/packages/itk/src/bbitkImageReader.h +++ b/packages/itk/src/bbitkImageReader.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkImageReader.h,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:21 $ - Version: $Revision: 1.8 $ + Date: $Date: 2010/04/08 14:37:58 $ + Version: $Revision: 1.9 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -56,7 +56,7 @@ namespace bbitk bbtk::AtomicBlackBox); BBTK_DECLARE_INPUT(In,std::string); - BBTK_DECLARE_OUTPUT(Out,anyImagePointer); + BBTK_DECLARE_OUTPUT(Out, anyImagePointer); BBTK_PROCESS(Read); void Read(); @@ -71,11 +71,11 @@ namespace bbitk BBTK_BEGIN_DESCRIBE_BLACK_BOX(ImageReader,bbtk::AtomicBlackBox); BBTK_NAME("ImageReader"); BBTK_AUTHOR("laurent.guigues at creatis.insa-lyon.fr"); - BBTK_CATEGORY("image;read/write"); + BBTK_CATEGORY("image; read/write"); BBTK_DESCRIPTION("Generic itk image reader"); - BBTK_INPUT(ImageReader,In, - "filename with complete path",std::string,"file name"); - BBTK_OUTPUT(ImageReader,Out,"Output image",anyImagePointer,""); + 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/src/bbvtkMIPCreator.cxx b/packages/vtk/src/bbvtkMIPCreator.cxx index 0e737bd..58ee8ae 100644 --- a/packages/vtk/src/bbvtkMIPCreator.cxx +++ b/packages/vtk/src/bbvtkMIPCreator.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkMIPCreator.cxx,v $ Language: C++ - Date: $Date: 2009/05/15 14:58:01 $ - Version: $Revision: 1.6 $ + Date: $Date: 2010/04/08 14:37:59 $ + Version: $Revision: 1.7 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -33,25 +33,16 @@ * \brief */ - - #ifdef _USE_VTK_ - #include "bbvtkMIPCreator.h" #include "bbvtkPackage.h" namespace bbvtk { - - BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,MIPCreator) BBTK_BLACK_BOX_IMPLEMENTATION(MIPCreator,bbtk::AtomicBlackBox); - - - - - + //--------------------------------------------------------------------- void MIPCreator::bbUserSetDefaultValues() { @@ -62,11 +53,9 @@ namespace bbvtk mMapper = NULL; mVolume = NULL; } - //--------------------------------------------------------------------- void MIPCreator::bbUserInitializeProcessing() - { - + { // Create the pipeline mCast = vtkImageShiftScale::New(); mCast->SetOutputScalarTypeToUnsignedChar(); @@ -83,12 +72,12 @@ namespace bbvtk mVolume->SetMapper(mMapper); // mMapper->ScalarVisibilityOff(); - // mMapper->ImmediateModeRenderingOn(); + // mMapper->ImmediateModeRenderingOn(); bbSetOutputOut(mVolume); } - //--------------------------------------------------------------------- +//--------------------------------------------------------------------- void MIPCreator::bbUserFinalizeProcessing() { if (mCast!=NULL) @@ -114,8 +103,6 @@ namespace bbvtk mVolume->Delete(); mVolume=NULL; } - - } //--------------------------------------------------------------------- diff --git a/packages/vtk/src/bbvtkMIPCreator.h b/packages/vtk/src/bbvtkMIPCreator.h index 55ec756..c37149b 100644 --- a/packages/vtk/src/bbvtkMIPCreator.h +++ b/packages/vtk/src/bbvtkMIPCreator.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkMIPCreator.h,v $ Language: C++ - Date: $Date: 2009/05/15 14:58:01 $ - Version: $Revision: 1.8 $ + Date: $Date: 2010/04/08 14:37:59 $ + Version: $Revision: 1.9 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -28,7 +28,6 @@ * knowledge of the CeCILL-B license and that you accept its terms. * ------------------------------------------------------------------------ */ - /** * \brief Short description in one line * @@ -44,14 +43,11 @@ * \brief Pattern for the definition of a new type of Node */ - #ifdef _USE_VTK_ - #ifndef __bbvtkMIPCreator_h_INCLUDED__ #define __bbvtkMIPCreator_h_INCLUDED__ - #include "bbtkAtomicBlackBox.h" #include "vtkImageData.h" @@ -65,9 +61,6 @@ namespace bbvtk { - - - class bbvtk_EXPORT MIPCreator : public bbtk::AtomicBlackBox { public: @@ -82,10 +75,10 @@ namespace bbvtk protected: private: - vtkImageShiftScale *mCast; + vtkImageShiftScale *mCast; vtkVolumeRayCastMIPFunction *mMIP; - vtkVolumeRayCastMapper *mMapper; - vtkVolume *mVolume; + vtkVolumeRayCastMapper *mMapper; + vtkVolume *mVolume; }; //================================================================= @@ -102,7 +95,6 @@ namespace bbvtk BBTK_END_DESCRIBE_BLACK_BOX(MIPCreator); //================================================================= - }//namespace bbvtk #endif //__bbtvtkMIPCreator_h__ diff --git a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx index 5c33b54..da6d9c9 100644 --- a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx +++ b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkSegmentationConnectivity.cxx,v $ Language: C++ - Date: $Date: 2009/05/15 14:58:01 $ - Version: $Revision: 1.5 $ + Date: $Date: 2010/04/08 14:37:59 $ + Version: $Revision: 1.6 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -33,22 +33,19 @@ * \brief */ - #ifdef _USE_VTK_ - #include "bbvtkSegmentationConnectivity.h" #include "bbvtkPackage.h" namespace bbvtk { - BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,SegmentationConnectivity); BBTK_BLACK_BOX_IMPLEMENTATION(SegmentationConnectivity, bbtk::AtomicBlackBox); - - - // -------------------------------------------------------------- + +// -------------------------------------------------------------- + void SegmentationConnectivity::bbUserSetDefaultValues() { thresh2 = NULL; @@ -69,7 +66,8 @@ namespace bbvtk bbSetOutputOut(NULL); } - // -------------------------------------------------------------- +// -------------------------------------------------------------- + void SegmentationConnectivity::bbUserInitializeProcessing() { thresh2 = vtkImageThreshold::New(); @@ -88,8 +86,9 @@ namespace bbvtk cast4->SetInput(connect2->GetOutput()); cast4->SetOutputScalarTypeToUnsignedShort(); } - - // -------------------------------------------------------------- + +// -------------------------------------------------------------- + void SegmentationConnectivity::bbUserFinalizeProcessing() { if (thresh2!=NULL) @@ -111,11 +110,11 @@ namespace bbvtk { cast4->Delete(); cast4=NULL; - } - + } } - // -------------------------------------------------------------- +// -------------------------------------------------------------- + void SegmentationConnectivity::DoProcess() { vtkImageData *imagedata = bbGetInputIn(); @@ -135,10 +134,8 @@ namespace bbvtk bbSetOutputOut(cast4->GetOutput() ); } - }// EO namespace bbvtk - #endif //_USE_VTK_ diff --git a/packages/vtk/src/bbvtkSegmentationConnectivity.h b/packages/vtk/src/bbvtkSegmentationConnectivity.h index d111364..914fb17 100644 --- a/packages/vtk/src/bbvtkSegmentationConnectivity.h +++ b/packages/vtk/src/bbvtkSegmentationConnectivity.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkSegmentationConnectivity.h,v $ Language: C++ - Date: $Date: 2009/05/15 14:58:01 $ - Version: $Revision: 1.5 $ + Date: $Date: 2010/04/08 14:37:59 $ + Version: $Revision: 1.6 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -74,12 +74,10 @@ namespace bbvtk protected: private: - vtkImageCast *cast2; - vtkImageCast *cast4; // binary segmentation result - vtkImageThreshold *thresh2; - vtkImageSeedConnectivity *connect2; - - + vtkImageCast *cast2; + vtkImageCast *cast4; // binary segmentation result + vtkImageThreshold *thresh2; + vtkImageSeedConnectivity *connect2; }; @@ -97,5 +95,4 @@ namespace bbvtk #endif // __bbvtkSegmentationConnectivity_h_INCLUDED__ - #endif //_USE_VTK_ diff --git a/packages/vtk/src/bbvtkTransform.cxx b/packages/vtk/src/bbvtkTransform.cxx index b6b5089..8d896bf 100644 --- a/packages/vtk/src/bbvtkTransform.cxx +++ b/packages/vtk/src/bbvtkTransform.cxx @@ -1,41 +1,37 @@ #include "bbvtkTransform.h" #include "bbvtkPackage.h" - - namespace bbvtk { - BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,Transform); BBTK_BLACK_BOX_IMPLEMENTATION(Transform,bbtk::AtomicBlackBox); - // -------------------------------------------------------------- - + void Transform::bbUserSetDefaultValues() { bbSetInputIn(NULL); - + vecScale.push_back(1); // scale x vecScale.push_back(1); // scale y vecScale.push_back(1); // scale z bbSetInputScale(vecScale); - + vecRotateWXYZ.push_back(0); //angle vecRotateWXYZ.push_back(1); //vx vecRotateWXYZ.push_back(0); //vy vecRotateWXYZ.push_back(0); //vz bbSetInputRotateWXYZ(vecRotateWXYZ); - + vecTranslate.push_back(0); //tx vecTranslate.push_back(0); //ty vecTranslate.push_back(0); //tz bbSetInputTranslate(vecTranslate); - + vecSpacing.push_back(1); //spacing x vecSpacing.push_back(1); //spacing y vecSpacing.push_back(1); //spacing z bbSetInputTranslate(vecSpacing); - + result = NULL; } @@ -45,8 +41,7 @@ namespace bbvtk bbUserFinalizeProcessing(); result = vtkTransform::New(); } - - + // -------------------------------------------------------------- void Transform::bbUserFinalizeProcessing() { @@ -55,10 +50,8 @@ namespace bbvtk result->Delete(); result=NULL; } - } - - + // -------------------------------------------------------------- void Transform::Process() { @@ -75,7 +68,7 @@ namespace bbvtk result->Scale(bbGetInputScale()[0], bbGetInputScale()[1], bbGetInputScale()[2]); printf("EED %p Transform::Process() 3\n", this); } - + if ((bbGetInputTranslate().size()>=3) && (bbGetInputSpacing().size()>=3)) { double tx = bbGetInputTranslate()[0] * bbGetInputSpacing()[0]; @@ -84,20 +77,17 @@ namespace bbvtk result->Translate(tx,ty,tz); printf("EED %p Transform::Process() 4\n", this); } - + if (bbGetInputRotateWXYZ().size()>=4) { result->RotateWXYZ(bbGetInputRotateWXYZ()[0],bbGetInputRotateWXYZ()[1], bbGetInputRotateWXYZ()[2], bbGetInputRotateWXYZ()[3]); printf("EED %p Transform::Process() 5\n", this); } - + result->Update(); printf("EED %p Transform::Process() 6\n", this); - + bbSetOutputOut(result); } - } // EO namespace bbvtk - - diff --git a/packages/vtk/src/bbvtkTransform.h b/packages/vtk/src/bbvtkTransform.h index 760cce4..2a1594a 100644 --- a/packages/vtk/src/bbvtkTransform.h +++ b/packages/vtk/src/bbvtkTransform.h @@ -27,7 +27,7 @@ namespace bbvtk std::vector vecRotateWXYZ; std::vector vecTranslate; std::vector vecSpacing; - vtkTransform *result; + vtkTransform *result; }; BBTK_BEGIN_DESCRIBE_BLACK_BOX(Transform,bbtk::AtomicBlackBox); diff --git a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx index ebe70c1..61e9246 100644 --- a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx +++ b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx @@ -13,6 +13,10 @@ BBTK_BLACK_BOX_IMPLEMENTATION(VecIsoSurfaceExtractor,bbtk::AtomicBlackBox); //----------------------------------------------------------- void VecIsoSurfaceExtractor::bbUserSetDefaultValues() { + +std::cout << +"================================VecIsoSurfaceExtractor::bbUserSetDefaultValues()" +<< std::endl; std::vector colour; // 1- red colour.push_back(1.0); @@ -51,15 +55,21 @@ BBTK_BLACK_BOX_IMPLEMENTATION(VecIsoSurfaceExtractor,bbtk::AtomicBlackBox); //----------------------------------------------------------- void VecIsoSurfaceExtractor::bbUserInitializeProcessing() + { // bbSetInputIn(NULL); - // bbSetInputInVtkObject(NULL); - + // bbSetInputInVtkObject(NULL); +std::cout << +"================================VecIsoSurfaceExtractor::bbUserInitializeProcessing()" +<< std::endl; } //----------------------------------------------------------- void VecIsoSurfaceExtractor::bbUserFinalizeProcessing() { +std::cout << +"================================VecIsoSurfaceExtractor::bbUserFinalizeProcessing()" +<< std::endl; int i,size = VecMarchingcubes.size(); for (i=0;iSetInput(marchingcubes->GetOutput()); vtkactor->SetMapper(polydatamapper); @@ -115,14 +127,13 @@ BBTK_BLACK_BOX_IMPLEMENTATION(VecIsoSurfaceExtractor,bbtk::AtomicBlackBox); VecVtkactor.push_back(vtkactor); } // for i - for( i=0 ; iSetInput( bbGetInputIn()[i] ); - marchingcubes->SetValue(0, bbGetInputIsovalue() ); + marchingcubes->SetValue(0, bbGetInputIsovalue() ); marchingcubes->Update(); if ( (i*3+1)<(int)(bbGetInputColour().size()) ){ @@ -135,7 +146,7 @@ BBTK_BLACK_BOX_IMPLEMENTATION(VecIsoSurfaceExtractor,bbtk::AtomicBlackBox); b = bbGetInputColour()[2]; } vtkactor->GetProperty()->SetColor( r,g,b ); - + vtkactor->GetProperty()->SetOpacity( bbGetInputOpacity() ); if ( bbGetInputTransform()!=NULL ) @@ -152,9 +163,5 @@ BBTK_BLACK_BOX_IMPLEMENTATION(VecIsoSurfaceExtractor,bbtk::AtomicBlackBox); bbSetOutputOut( VecVtkactor ); } - - } // EO namespace bbvtk - - diff --git a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.h b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.h index c26a6c2..a78f7e7 100644 --- a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.h +++ b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.h @@ -11,7 +11,6 @@ #include "vtkActor.h" #include - namespace bbvtk { @@ -36,9 +35,9 @@ class /*BBTK_EXPORT*/ VecIsoSurfaceExtractor // virtual void bbUserDestructor(); void Init(); - std::vector VecMarchingcubes; - std::vector VecPolydatamapper; - std::vector VecVtkactor; + std::vector VecMarchingcubes; + std::vector VecPolydatamapper; + std::vector VecVtkactor; }; diff --git a/packages/wx/src/bbwxLayoutSplit.cxx b/packages/wx/src/bbwxLayoutSplit.cxx index f588595..94c0e48 100644 --- a/packages/wx/src/bbwxLayoutSplit.cxx +++ b/packages/wx/src/bbwxLayoutSplit.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxLayoutSplit.cxx,v $ Language: C++ - Date: $Date: 2009/05/28 08:12:17 $ - Version: $Revision: 1.12 $ + Date: $Date: 2010/04/08 14:38:00 $ + Version: $Revision: 1.13 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -97,10 +97,10 @@ namespace bbwx int orientation=0; if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"0|H|HORIZONTAL")==true) { orientation=0; } - if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|V|VERTICAL")==true) { orientation=1; } + if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|V|VERTICAL")==true) { orientation=1; } - if (orientation==1) { w->SplitHorizontally( w1, w2, 100); } + if (orientation==1) { w->SplitHorizontally( w1, w2, 100); } else { w->SplitVertically( w1, w2, 100); } bbSetOutputWidget( w ); diff --git a/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs b/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs index 5655f82..f7f1862 100644 --- a/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs +++ b/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs @@ -47,7 +47,6 @@ define IsoSurfaceWidget wxvtk # set colourButton.Label "Colour" - input Title controls.WinTitle "Title of the control panel" input In surface.In "Input image"