From 4f4d31c32dcb776788d8cc66ea8bbe0d27685eea Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 1 Aug 2019 07:36:40 +0200 Subject: [PATCH] #3289 creaVtk Feature New Normal - bbcreaVtkBoxWidget init box --- .../bbs/boxes/VolumeVectorVisu_Widget.bbg | 5 ++++- .../bbs/boxes/VolumeVectorVisu_Widget.bbs | 1 + bbtk_creaVtk_PKG/src/bbcreaVtkBoxWidget.cxx | 15 ++++++++++++--- bbtk_creaVtk_PKG/src/bbcreaVtkBoxWidget.h | 3 +++ 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VolumeVectorVisu_Widget.bbg b/bbtk_creaVtk_PKG/bbs/boxes/VolumeVectorVisu_Widget.bbg index 7f68e9d..b8a5942 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VolumeVectorVisu_Widget.bbg +++ b/bbtk_creaVtk_PKG/bbs/boxes/VolumeVectorVisu_Widget.bbg @@ -93,7 +93,7 @@ ISEXEC:FALSE -64.370903:22.659312:-900.000000 -24.670903:12.659312:-900.000000 FIN_BOX -CONNECTIONS:23 +CONNECTIONS:24 CONNECTION Box02:AcitiveVector:Box00:Active NumberOfControlPoints:0 @@ -163,4 +163,7 @@ NumberOfControlPoints:0 CONNECTION externalLut:externalLut:Box00:ExternalLut NumberOfControlPoints:0 +CONNECTION +Box06:Out:Box09:ImageInitSize +NumberOfControlPoints:0 APP_END diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VolumeVectorVisu_Widget.bbs b/bbtk_creaVtk_PKG/bbs/boxes/VolumeVectorVisu_Widget.bbs index a6f74b0..3e28e25 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VolumeVectorVisu_Widget.bbs +++ b/bbtk_creaVtk_PKG/bbs/boxes/VolumeVectorVisu_Widget.bbs @@ -56,6 +56,7 @@ connect Box09.BoxChange Box10.In1 connect Box10.BoxChange Box00.BoxExecute connect Box02.ActiveBoxWidget Box09.Active connect Box02.AcitiveVector Box07.Active +connect Box06.Out Box09.ImageInitSize # Complex input ports input renderer Box04.In " " diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkBoxWidget.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkBoxWidget.cxx index d16cf2a..a973e3b 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkBoxWidget.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkBoxWidget.cxx @@ -67,9 +67,18 @@ void BoxWidget::Process() planes = vtkPlanes::New(); boxWidget->SetInteractor( bbGetInputRenderer()->GetRenderWindow()->GetInteractor() ); boxWidget->SetPlaceFactor(1.25); - boxWidget->PlaceWidget(0,500,0,500,0,500); + if (bbGetInputImageInitSize()!=NULL) + { + int ext[6]; + bbGetInputImageInitSize()->GetExtent( ext ); + double spc[3]; + bbGetInputImageInitSize()->GetSpacing( spc ); + boxWidget->PlaceWidget( ext[0]*spc[0] , ext[1]*spc[0] , ext[2]*spc[1] , ext[3]*spc[1] , ext[4]*spc[2] , ext[5]*spc[2] ); + } else { + boxWidget->PlaceWidget(0,500,0,500,0,500); + }// if ImageInitSize boxWidget->GetPlanes( planes ); - } + } // if firsttime // boxWidget->SetProp3D(coneActor); bbBoxWidgetCallback *callback = bbBoxWidgetCallback::New(); @@ -99,7 +108,7 @@ void BoxWidget::bbUserSetDefaultValues() firsttime=true; bbSetInputRenderer(NULL); bbSetInputActive( false ); - + bbSetInputImageInitSize(NULL); } //===== // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkBoxWidget.h b/bbtk_creaVtk_PKG/src/bbcreaVtkBoxWidget.h index ca223de..cfa8bc6 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkBoxWidget.h +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkBoxWidget.h @@ -12,6 +12,7 @@ #include "vtkRenderer.h" #include "vtkImplicitFunction.h" #include "vtkPlanes.h" +#include "vtkImageData.h" namespace bbcreaVtk { @@ -26,6 +27,7 @@ class bbcreaVtk_EXPORT BoxWidget //===== BBTK_DECLARE_INPUT( Active , bool ); BBTK_DECLARE_INPUT( Renderer , vtkRenderer* ); + BBTK_DECLARE_INPUT( ImageInitSize , vtkImageData* ); BBTK_DECLARE_OUTPUT( ImplicitFunction , vtkImplicitFunction* ); BBTK_PROCESS(Process); void Process(); @@ -45,6 +47,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(BoxWidget,bbtk::AtomicBlackBox); BBTK_CATEGORY("empty"); BBTK_INPUT(BoxWidget,Active,"(default false) true/false",bool,""); + BBTK_INPUT(BoxWidget,ImageInitSize,"(default NULL=> 0,500,0,500,0,500) Boudaring image size ",vtkImageData*,""); BBTK_INPUT(BoxWidget,Renderer,"vtkRenderer",vtkRenderer*,""); BBTK_OUTPUT(BoxWidget,ImplicitFunction,"vtkImplicitFunction",vtkImplicitFunction*,""); -- 2.45.1