From: Eduardo DAVILA <davila@ei-ed-606.creatis.insa-lyon.fr>
Date: Tue, 18 Jun 2019 09:47:18 +0000 (+0200)
Subject: #3100 creaVtk Feature New Normal  -  Vectors Visu refresh
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=cbdbf09b7dd78d20a0f9dd91a82876f1a029a44d;p=creaVtk.git

#3100 creaVtk Feature New Normal  -  Vectors Visu refresh
---

diff --git a/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg b/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg
index aca1f16..aff184d 100644
--- a/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg
+++ b/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /tmpEED/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg
+# - /home/davila/Creatis/C8/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg
 # ----------------------------------
 
 APP_START
@@ -37,7 +37,7 @@ BOX
 creaVtk:VectorsVisu:Box00
 ISEXEC:FALSE
 -4.465574:-69.418679:-900.000000
-41.109426:-79.418679:-900.000000
+33.159426:-79.418679:-900.000000
 FIN_BOX
 BOX
 creaVtk:PlaneWidget:Box01
@@ -91,9 +91,9 @@ BOX
 std:MagicBox:Box11
 ISEXEC:FALSE
 -116.304953:49.494646:-900.000000
--70.729953:39.494646:-900.000000
+-80.229953:39.494646:-900.000000
 FIN_BOX
-CONNECTIONS:22
+CONNECTIONS:23
 CONNECTION
 Box03:Out:Box00:In
 NumberOfControlPoints:0
@@ -160,4 +160,7 @@ NumberOfControlPoints:0
 CONNECTION
 Box11:Out:Box15:In2
 NumberOfControlPoints:0
+CONNECTION
+Box01:BoxChange:Box15:In3
+NumberOfControlPoints:0
 APP_END
diff --git a/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbs b/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbs
index 05e401e..443ca11 100644
--- a/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbs
+++ b/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /tmpEED/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbs
+# - /home/davila/Creatis/C8/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbs
 # ----------------------------------
 
 include std
@@ -55,6 +55,7 @@ connect Box15.Out Box00.BoxExecute
 connect Box06.boxChange Box15.In1
 connect Box15.Out Box13.BoxExecute
 connect Box11.Out Box15.In2
+connect Box01.BoxChange Box15.In3
 
 # Complex input ports
 input vtkImageData Box04.In " "
diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkVectorsVisu.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkVectorsVisu.cxx
index a0d8fdd..d15268b 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkVectorsVisu.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkVectorsVisu.cxx
@@ -26,7 +26,6 @@ void VectorsVisu::Process()
 //    * TYPE is the C++ type of the input/output
 //      (the one provided in the attribute 'type' of the tag 'input')
 
-printf("EED VectorsVisu::Process Start \n");
      vectorsvisu.SetActive( bbGetInputActive() );
      vectorsvisu.SetDataObject( bbGetInputIn() );
      vectorsvisu.SetScaleFactor( bbGetInputScaleFactor() );
@@ -36,9 +35,7 @@ printf("EED VectorsVisu::Process Start \n");
      vectorsvisu.SetOrientation( bbGetInputOrientation() );
      vectorsvisu.SetExternalLut( bbGetInputExternalLut() );
      vectorsvisu.Process();
-     bbSetOutputOut( vectorsvisu.GetProp3D() );
-printf("EED VectorsVisu::Process End \n");
-  
+     bbSetOutputOut( vectorsvisu.GetProp3D() );  
 }
 //===== 
 // 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)
@@ -55,7 +52,7 @@ void VectorsVisu::bbUserSetDefaultValues()
    bbSetInputScaleFactor(500);
    bbSetInputOpacity(1);
    bbSetInputTypeForm(0);  
-   bbSetInputOrientation(0);  
+   bbSetInputOrientation(-1);  
    bbSetInputExternalLut(NULL);  
 }
 //===== 
diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkVectorsVisu.h b/bbtk_creaVtk_PKG/src/bbcreaVtkVectorsVisu.h
index 14b1e56..61a059f 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkVectorsVisu.h
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkVectorsVisu.h
@@ -55,7 +55,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(VectorsVisu,bbtk::AtomicBlackBox);
   BBTK_INPUT(VectorsVisu,Opacity,"Opacity (1 default)",double,"");
   BBTK_INPUT(VectorsVisu,Renderer,"vtkRenderer",vtkRenderer*,"");
   BBTK_INPUT(VectorsVisu,TypeForm,"0 Line, 1 Arrow   (default 0)",int,"");
-  BBTK_INPUT(VectorsVisu,Orientation,"(default 5) -1=xy, 0=yz, 1=yz, 2=xz, 5=3D, 6=3D",int,"");
+  BBTK_INPUT(VectorsVisu,Orientation,"(default -1) -1=3D, 0=yz, 1=xz, 2=xy",int,"");
   BBTK_INPUT(VectorsVisu,ExternalLut,"Lookuptable",vtkScalarsToColors*,"");
   BBTK_OUTPUT(VectorsVisu,Out,"vtkProp3D of an vtkActor",vtkProp3D*,"");
 BBTK_END_DESCRIBE_BLACK_BOX(VectorsVisu);