Changed certain parts of scripts

diff --git a/PackRecalage/bbs/appli/ExampleRecalage.bbs b/PackRecalage/bbs/appli/ExampleRecalage.bbs
index c9cc57ca8ed8f6b6479ed700363712fb43c14a22..da8b61470c77e33c53366ca077f2eabd33ac4517 100644 (file)
--- a/PackRecalage/bbs/appli/ExampleRecalage.bbs
+++ b/PackRecalage/bbs/appli/ExampleRecalage.bbs
@@ -38,6 +38,16 @@ new ShowNPoints showNpoints
   connect viewer.BoxChange showNpoints.BoxExecute
   set showNpoints.Radio 10
 
+/////////////////////////////////////////////////////
+#Calculate Vector Box
+/////////////////////////////////////////////////////
+/*
+new CalculateVectorBox vector1
+  connect showNpoints.lstPointsX vector1.PointsX1
+  connect showNpoints.BoxChange vector1.BoxExecute
+*/
+////////////////////////////////////////////////////
+
 //Viewer NV and ShowPoints for the second image
 
 new ViewerNV viewer2

diff --git a/PackRecalage/bbs/appli/ViewerMerge2DInteractive.bbs b/PackRecalage/bbs/appli/ViewerMerge2DInteractive.bbs
index f9e1e57681509b5f44e4a1721ace047cfcb9dd24..ef7331975058f2663abf98a9b66bb92568e29766 100644 (file)
--- a/PackRecalage/bbs/appli/ViewerMerge2DInteractive.bbs
+++ b/PackRecalage/bbs/appli/ViewerMerge2DInteractive.bbs
@@ -330,6 +330,9 @@ new Slider sdrC
   set sdrC.In "100"
   set sdrC.ReactiveOnTrack "true"
 
+  connect sdrC.Out convol1.Factor
+  connect sdrC.Out convol2.Factor
+
 #Layout for convolution
 
 new LayoutSplit lyConvView
@@ -438,8 +441,8 @@ new LayoutSplit window1
 
 new LayoutTab tabs
   connect checkerBoard.Widget tabs.Widget1
-  connect substraction.Widget tabs.Widget2
-  connect transparency.Widget tabs.Widget3
+  //connect substraction.Widget tabs.Widget2
+  //connect transparency.Widget tabs.Widget3
   connect convolution.Widget tabs.Widget4
   //connect switch.Widget tabs.Widget4
 

diff --git a/PackRecalage/bbs/appli/ViewerMerge3D_MorePoints.bbs b/PackRecalage/bbs/appli/ViewerMerge3D_MorePoints.bbs
index 52cb9fefe157f0c83f14176da5555e3e030bccf3..5ba583369e4f5be9b49865ca674f523ca44d391c 100644 (file)
--- a/PackRecalage/bbs/appli/ViewerMerge3D_MorePoints.bbs
+++ b/PackRecalage/bbs/appli/ViewerMerge3D_MorePoints.bbs
@@ -3,9 +3,9 @@ load std
 load vtk
 load wxvtk
 load creaMaracasVisu
-load PackTransform2D
-load PackReSlicer
-//load PackVisuImages
+//load PackTransform2D
+//load PackReSlicer
+load PackRecalage
 
 include vtk/boxes/bbLoadHola