From: jean-pierre roux Date: Tue, 10 Feb 2009 16:05:41 +0000 (+0000) Subject: move xxxWithControls to xxxWidget X-Git-Tag: EED.02Oct2009~105 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1e0e4d85b2001be9e92f6e23e30910bf92d5feb3;p=bbtk.git move xxxWithControls to xxxWidget --- diff --git a/kernel/doc/bbtkUsersGuide/bbtkReferenceManual.tex b/kernel/doc/bbtkUsersGuide/bbtkReferenceManual.tex index 03304f5..560e53b 100644 --- a/kernel/doc/bbtkUsersGuide/bbtkReferenceManual.tex +++ b/kernel/doc/bbtkUsersGuide/bbtkReferenceManual.tex @@ -495,7 +495,7 @@ It contains two atomic black boxes. It contains too some sophisticated complex black boxes : - \paragraph{IsoSurfaceWithControls} + \paragraph{IsoSurfaceWidget} Image iso-surface extractor (vtk::IsoSurfaceExtractor) with associated control panel (isovalue, opacity and colour)\\ Receives :\\ - an initial isovalue (Isovalue) @@ -504,7 +504,7 @@ It contains too some sophisticated complex black boxes : Outputs :\\ \textless vtkProp3D* \textgreater (In)\\ - \paragraph{MIPWithControls} + \paragraph{MIPWidget} Maximum Intensity Projection (MIP) creator (vtk::MIPCreator) with associated control panel (shift and scale) \\ Receives :\\ - an initial scale (Scale) diff --git a/packages/appli/bbs/appli/Renderer.bbs b/packages/appli/bbs/appli/Renderer.bbs index 7e1cb9e..01b61ae 100644 --- a/packages/appli/bbs/appli/Renderer.bbs +++ b/packages/appli/bbs/appli/Renderer.bbs @@ -11,7 +11,7 @@ include kw load creaImageIO new Gimmick reader -new kwVolumeRendererWithControls renderer +new kwVolumeRendererWidget renderer new kwViewer3D viewer connect reader.Out renderer.In diff --git a/packages/demo/bbs/appli/demoViewing3Try.bbs b/packages/demo/bbs/appli/demoViewing3Try.bbs index 1a345ea..1c709e1 100644 --- a/packages/demo/bbs/appli/demoViewing3Try.bbs +++ b/packages/demo/bbs/appli/demoViewing3Try.bbs @@ -28,7 +28,7 @@ connect upleft.Widget main.Widget2 connect downleft.Widget main.Widget3 // Uncomment the following lines to be able to read a 3D images stack -/* ----------------- + // To choose the directory new DirectorySelector ds // To get the image names into a vector @@ -47,12 +47,12 @@ set reader.YSpacing 23.4 set reader.ZSpacing 35 connect fd.Out reader.FileNames -*/ + // Comment out to following line if you want to be able to read a 3D images stack -new LoadHola reader +//new LoadHola reader print "Image properties : $reader.Out" diff --git a/packages/kw/bbs/appli/kwTour.bbs b/packages/kw/bbs/appli/kwTour.bbs index f47bd32..22e8a6d 100644 --- a/packages/kw/bbs/appli/kwTour.bbs +++ b/packages/kw/bbs/appli/kwTour.bbs @@ -59,11 +59,11 @@ clear print "==================================" print "Volume renderer with controls" print "==================================" -help kwVolumeRendererWithControls +help kwVolumeRendererWidget message echo 2 new LoadHola image -new kwVolumeRendererWithControls renderer +new kwVolumeRendererWidget renderer new kwViewer3D viewer connect image.Out renderer.In diff --git a/packages/kw/bbs/boxes/bbVolumeRendererWithControls.bbs b/packages/kw/bbs/boxes/bbVolumeRendererWidget.bbs similarity index 96% rename from packages/kw/bbs/boxes/bbVolumeRendererWithControls.bbs rename to packages/kw/bbs/boxes/bbVolumeRendererWidget.bbs index 851e59a..d5a2fcb 100644 --- a/packages/kw/bbs/boxes/bbVolumeRendererWithControls.bbs +++ b/packages/kw/bbs/boxes/bbVolumeRendererWidget.bbs @@ -3,7 +3,7 @@ load std load kw -define kwVolumeRendererWithControls kw +define kwVolumeRendererWidget kw author "laurent.guigues@creatis.insa-lyon.fr" description "Volume renderer (vtk::VolumeRenderer) with associated control panel (transfer function and opacity editors)" category "image;widget;viewer" diff --git a/packages/wxvtk/bbs/appli/exampleIsoSurfaceWithControls.bbs b/packages/wxvtk/bbs/appli/exampleIsoSurfaceWidget.bbs similarity index 86% rename from packages/wxvtk/bbs/appli/exampleIsoSurfaceWithControls.bbs rename to packages/wxvtk/bbs/appli/exampleIsoSurfaceWidget.bbs index 6ff4bcf..6ffcb0d 100644 --- a/packages/wxvtk/bbs/appli/exampleIsoSurfaceWithControls.bbs +++ b/packages/wxvtk/bbs/appli/exampleIsoSurfaceWidget.bbs @@ -1,12 +1,12 @@ -description "Example of IsoSurfaceWithControls." +description "Example of IsoSurfaceWidget." author "laurent.guigues at creatis.insa-lyon.fr" category "example" -include wxvtk/boxes/bbIsoSurfaceWithControls +include wxvtk/boxes/bbIsoSurfaceWidget include vtk/boxes/bbLoadHola -new IsoSurfaceWithControls surface1 -new IsoSurfaceWithControls surface2 +new IsoSurfaceWidget surface1 +new IsoSurfaceWidget surface2 load wxvtk new Viewer3D viewer diff --git a/packages/wxvtk/bbs/appli/exampleMIPWithControls.bbs b/packages/wxvtk/bbs/appli/exampleMIPWidget.bbs similarity index 74% rename from packages/wxvtk/bbs/appli/exampleMIPWithControls.bbs rename to packages/wxvtk/bbs/appli/exampleMIPWidget.bbs index f7bb732..67e4603 100644 --- a/packages/wxvtk/bbs/appli/exampleMIPWithControls.bbs +++ b/packages/wxvtk/bbs/appli/exampleMIPWidget.bbs @@ -1,11 +1,11 @@ -description "Example of MIPWithControls." +description "Example of MIPWidget." author "laurent.guigues at creatis.insa-lyon.fr" category "example" -include wxvtk/boxes/bbMIPWithControls +include wxvtk/boxes/bbMIPWidget include vtk/boxes/bbLoadHola -new MIPWithControls MIP +new MIPWidget MIP load wxvtk new Viewer3D viewer @@ -24,5 +24,5 @@ set MIP.Scale 200 #set MIP.Colour "0.5 0 0" set MIP.Title "MIP Controls" -set main.WinTitle "ExampleMIPWithControls" +set main.WinTitle "ExampleMIPWidget" exec main diff --git a/packages/wxvtk/bbs/appli/exampleView2D3D.bbs b/packages/wxvtk/bbs/appli/exampleView2D3D.bbs index 71bf836..26b96d6 100644 --- a/packages/wxvtk/bbs/appli/exampleView2D3D.bbs +++ b/packages/wxvtk/bbs/appli/exampleView2D3D.bbs @@ -14,7 +14,7 @@ connect slider.Out v2d.Slice connect slider.Widget layout.Widget1 connect v2d.Widget layout.Widget2 connect slider.BoxChange v2d.BoxExecute -new IsoSurfaceWithControls surface +new IsoSurfaceWidget surface connect reader.Out surface.In connect surface.Out v3d.In1 connect surface.Widget layout.Widget3 diff --git a/packages/wxvtk/bbs/appli/exampleView3DImage1.bbs b/packages/wxvtk/bbs/appli/exampleView3DImage1.bbs index 3b79bf7..bffee89 100644 --- a/packages/wxvtk/bbs/appli/exampleView3DImage1.bbs +++ b/packages/wxvtk/bbs/appli/exampleView3DImage1.bbs @@ -1,15 +1,15 @@ -description "Example of complex 3D view of an image using vtk::ImagePlanes and wxvtk::IsoSurfaceWithControls. Screenshot : " +description "Example of complex 3D view of an image using vtk::ImagePlanes and wxvtk::IsoSurfaceWidget. Screenshot : " author "laurent.guigues at creatis.insa-lyon.fr" category "example" include vtk/boxes/bbLoadHola -include wxvtk/boxes/bbIsoSurfaceWithControls +include wxvtk/boxes/bbIsoSurfaceWidget load vtk load wxvtk new LoadHola image new ImagePlanes planes -new IsoSurfaceWithControls surface +new IsoSurfaceWidget surface new Viewer3D viewer connect image.Out planes.In diff --git a/packages/wxvtk/bbs/appli/exampleView3DImage1_Stereo.bbs b/packages/wxvtk/bbs/appli/exampleView3DImage1_Stereo.bbs index fd8f7cd..5a415f6 100644 --- a/packages/wxvtk/bbs/appli/exampleView3DImage1_Stereo.bbs +++ b/packages/wxvtk/bbs/appli/exampleView3DImage1_Stereo.bbs @@ -1,15 +1,15 @@ -description "Example of complex 3D view of an image using vtk::ImagePlanes and wxvtk::IsoSurfaceWithControls. Screenshot : " +description "Example of complex 3D view of an image using vtk::ImagePlanes and wxvtk::IsoSurfaceWidget. Screenshot : " author "laurent.guigues at creatis.insa-lyon.fr" category "example" include vtk/boxes/bbLoadHola -include wxvtk/boxes/bbIsoSurfaceWithControls +include wxvtk/boxes/bbIsoSurfaceWidget load vtk load wxvtk new LoadHola image new ImagePlanes planes -new IsoSurfaceWithControls surface +new IsoSurfaceWidget surface new Viewer3D viewer connect image.Out planes.In diff --git a/packages/wxvtk/bbs/appli/wxvtkTour.bbs b/packages/wxvtk/bbs/appli/wxvtkTour.bbs index 046ef78..65f0553 100644 --- a/packages/wxvtk/bbs/appli/wxvtkTour.bbs +++ b/packages/wxvtk/bbs/appli/wxvtkTour.bbs @@ -97,7 +97,7 @@ print " " print "=====================================" print "Viewing both 3 slices and an iso-surface of an image in 3D" print "=====================================" -help IsoSurfaceWithControls +help IsoSurfaceWidget message echo 2 new LoadHola image @@ -107,7 +107,7 @@ connect image.Out planes.In connect planes.PlaneX viewer.Obs1 connect planes.PlaneY viewer.Obs2 connect planes.PlaneZ viewer.Obs3 -new IsoSurfaceWithControls isosurface +new IsoSurfaceWidget isosurface connect image.Out isosurface.In connect isosurface.Out viewer.In1 connect isosurface.BoxChange viewer.BoxExecute diff --git a/packages/wxvtk/bbs/boxes/bbIsoSurfaceWithControls.bbs b/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs similarity index 98% rename from packages/wxvtk/bbs/boxes/bbIsoSurfaceWithControls.bbs rename to packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs index 01ada2e..6b9af87 100644 --- a/packages/wxvtk/bbs/boxes/bbIsoSurfaceWithControls.bbs +++ b/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs @@ -3,7 +3,7 @@ load vtk load std load wxvtk -define IsoSurfaceWithControls wxvtk +define IsoSurfaceWidget wxvtk author "laurent.guigues@creatis.insa-lyon.fr" description "Image iso-surface extractor (vtk::IsoSurfaceExtractor) with associated control panel (isovalue, opacity and colour)" category "image;mesh;widget;viewer" diff --git a/packages/wxvtk/bbs/boxes/bbMIPWithControls.bbs b/packages/wxvtk/bbs/boxes/bbMIPWidget.bbs similarity index 98% rename from packages/wxvtk/bbs/boxes/bbMIPWithControls.bbs rename to packages/wxvtk/bbs/boxes/bbMIPWidget.bbs index 35f4939..a8a5864 100644 --- a/packages/wxvtk/bbs/boxes/bbMIPWithControls.bbs +++ b/packages/wxvtk/bbs/boxes/bbMIPWidget.bbs @@ -3,7 +3,7 @@ load vtk load std load wxvtk -define MIPWithControls wxvtk +define MIPWidget wxvtk author "laurent.guigues@creatis.insa-lyon.fr" description "Maximum Intensity Projection (MIP) creator (vtk::MIPCreator) with associated control panel (shift and scale)" category "image;mesh;widget;viewer" diff --git a/packages/wxvtk/bbs/boxes/bbSimpleIsoSurfaceViewer.bbs b/packages/wxvtk/bbs/boxes/bbSimpleIsoSurfaceViewer.bbs index b024691..adf6942 100644 --- a/packages/wxvtk/bbs/boxes/bbSimpleIsoSurfaceViewer.bbs +++ b/packages/wxvtk/bbs/boxes/bbSimpleIsoSurfaceViewer.bbs @@ -3,7 +3,7 @@ load wx load wxvtk load vtk -include wxvtk/boxes/bbIsoSurfaceWithControls +include wxvtk/boxes/bbIsoSurfaceWidget define SimpleIsoSurfaceViewer wxvtk @@ -14,7 +14,7 @@ define SimpleIsoSurfaceViewer wxvtk new LayoutSplit main new Viewer3D viewer - new IsoSurfaceWithControls surface + new IsoSurfaceWidget surface set surface.Isovalue 10 set surface.Title "Surface"