From 98ea97de822e11c7e8c3f35f6b37d401717ec181 Mon Sep 17 00:00:00 2001
From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Mon, 22 Aug 2016 16:25:48 +0200
Subject: [PATCH] #3010 CreaMiniTools Feature New Normal  -  Interpolate option
 in box ViewerNV

---
 .../bbs/appli/PlaneViewer-MHD.bbg             | 27 ++++++++++++++++--
 .../bbs/appli/PlaneViewer-MHD.bbs             | 11 ++++++++
 .../bbs/appli/rescaleSlopeIntercept.bbg       |  6 ++--
 .../bbs/appli/rescaleSlopeIntercept.bbs       |  1 -
 .../bbs/appli/viewerNVExample.bbg             | 28 +++++++++----------
 .../bbs/appli/viewerNVExample.bbs             |  1 -
 .../boxes/LayerCol-VolRend-SurRend_Widget.bbg | 26 ++++++++---------
 7 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/bbtk_package_creaMiniTools/bbs/appli/PlaneViewer-MHD.bbg b/bbtk_package_creaMiniTools/bbs/appli/PlaneViewer-MHD.bbg
index 6d8098f..f994626 100644
--- a/bbtk_package_creaMiniTools/bbs/appli/PlaneViewer-MHD.bbg
+++ b/bbtk_package_creaMiniTools/bbs/appli/PlaneViewer-MHD.bbg
@@ -9,7 +9,7 @@ DESCRIPTION:Description ??
 AUTHOR:Author ??
 COMPLEXBOX:FALSE
 COMPLEXINPUTS:0
-BOXES:44
+BOXES:45
 BOX
 wx:FileSelector:Box00
 ISEXEC:FALSE
@@ -24,7 +24,7 @@ BOX
 creaMaracasVisu:ViewerNV:Box01
 ISEXEC:FALSE
 7.570031:-144.814069:-900.000000
-68.210031:-154.814069:-900.000000
+71.290031:-154.814069:-900.000000
 PORT
 nTypeView:"-1"
 FIN_BOX
@@ -368,7 +368,19 @@ ISEXEC:FALSE
 PORT
 In2:" "
 FIN_BOX
-CONNECTIONS:74
+BOX
+wx:CheckBox:Box67
+ISEXEC:FALSE
+-215.927321:-40.663198:-900.000000
+-170.352321:-50.663198:-900.000000
+PORT
+In:"true"
+PORT
+ReactiveOnKeystroke:"true"
+PORT
+Title:"Interpolate"
+FIN_BOX
+CONNECTIONS:77
 CONNECTION
 Box02:Out:Box01:In
 NumberOfControlPoints:0
@@ -591,4 +603,13 @@ NumberOfControlPoints:0
 CONNECTION
 Box65:Out:Box32:lstTransparenceBoundaries
 NumberOfControlPoints:0
+CONNECTION
+Box67:Widget:Box42:Widget3
+NumberOfControlPoints:0
+CONNECTION
+Box67:Out:Box01:Interpolate
+NumberOfControlPoints:0
+CONNECTION
+Box67:BoxChange:Box29:In6
+NumberOfControlPoints:0
 APP_END
diff --git a/bbtk_package_creaMiniTools/bbs/appli/PlaneViewer-MHD.bbs b/bbtk_package_creaMiniTools/bbs/appli/PlaneViewer-MHD.bbs
index 3e655c8..13a108b 100644
--- a/bbtk_package_creaMiniTools/bbs/appli/PlaneViewer-MHD.bbs
+++ b/bbtk_package_creaMiniTools/bbs/appli/PlaneViewer-MHD.bbs
@@ -155,6 +155,11 @@ new creaMaracasVisu:SliderMinMax-flexible Box68
 new std:ConcatStrings Box65
   set Box65.In2 " "
 
+new wx:CheckBox Box67
+  set Box67.In "true"
+  set Box67.ReactiveOnKeystroke "true"
+  set Box67.Title "Interpolate"
+
 
 connect Box02.Out Box01.In
 
@@ -304,6 +309,12 @@ connect Box68.outstart Box65.In1
 
 connect Box65.Out Box32.lstTransparenceBoundaries
 
+connect Box67.Widget Box42.Widget3
+
+connect Box67.Out Box01.Interpolate
+
+connect Box67.BoxChange Box29.In6
+
 
 
 # Complex input ports
diff --git a/bbtk_package_creaMiniTools/bbs/appli/rescaleSlopeIntercept.bbg b/bbtk_package_creaMiniTools/bbs/appli/rescaleSlopeIntercept.bbg
index 8dfdca0..b2aa2ad 100644
--- a/bbtk_package_creaMiniTools/bbs/appli/rescaleSlopeIntercept.bbg
+++ b/bbtk_package_creaMiniTools/bbs/appli/rescaleSlopeIntercept.bbg
@@ -39,8 +39,6 @@ creaMaracasVisu:ViewerNV:Box04
 ISEXEC:FALSE
 38.227720:-45.888872:-900.000000
 98.867720:-55.888872:-900.000000
-PORT
-nTypeView:"6 1 2 0"
 FIN_BOX
 BOX
 wx:LayoutSplit:Box05
@@ -54,13 +52,13 @@ BOX
 wx:LayoutTab:Box06
 ISEXEC:FALSE
 -39.979714:-66.072124:-900.000000
-17.580286:-76.072124:-900.000000
+5.595286:-76.072124:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box07
 ISEXEC:FALSE
 -26.720894:-44.371641:-900.000000
-30.839106:-54.371641:-900.000000
+18.854106:-54.371641:-900.000000
 PORT
 WinTitle:"Rescale Reslope"
 FIN_BOX
diff --git a/bbtk_package_creaMiniTools/bbs/appli/rescaleSlopeIntercept.bbs b/bbtk_package_creaMiniTools/bbs/appli/rescaleSlopeIntercept.bbs
index f45872b..ac10834 100644
--- a/bbtk_package_creaMiniTools/bbs/appli/rescaleSlopeIntercept.bbs
+++ b/bbtk_package_creaMiniTools/bbs/appli/rescaleSlopeIntercept.bbs
@@ -27,7 +27,6 @@ new vtk:LoadHola Box02
 new vtk:vtkImageDataPointerRelay Box03
 
 new creaMaracasVisu:ViewerNV Box04
-  set Box04.nTypeView "6 1 2 0"
 
 new wx:LayoutSplit Box05
   set Box05.Orientation "H"
diff --git a/bbtk_package_creaMiniTools/bbs/appli/viewerNVExample.bbg b/bbtk_package_creaMiniTools/bbs/appli/viewerNVExample.bbg
index 9c6c102..36891d1 100755
--- a/bbtk_package_creaMiniTools/bbs/appli/viewerNVExample.bbg
+++ b/bbtk_package_creaMiniTools/bbs/appli/viewerNVExample.bbg
@@ -20,9 +20,7 @@ BOX
 creaMaracasVisu:ViewerNV:Box01
 ISEXEC:FALSE
 92.878707:104.248747:-900.000000
-153.518707:94.248747:-900.000000
-PORT
-nTypeView:"6 1 2 0"
+138.453707:94.248747:-900.000000
 FIN_BOX
 BOX
 toolsbbtk:ImageVtkPropertiesWidget:Box04
@@ -34,7 +32,7 @@ BOX
 wx:LayoutTab:Box05
 ISEXEC:FALSE
 17.115805:9.090075:-900.000000
-74.675805:-0.909925:-900.000000
+62.690805:-0.909925:-900.000000
 PORT
 WinHide:"800"
 PORT
@@ -64,13 +62,13 @@ BOX
 wx:LayoutTab:Box11
 ISEXEC:FALSE
 -119.524604:-326.768067:-900.000000
--61.964604:-336.768067:-900.000000
+-73.949604:-336.768067:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box14
 ISEXEC:FALSE
--107.476803:-88.313588:-900.000000
--49.916803:-98.313588:-900.000000
+-124.941177:-104.054489:-900.000000
+-67.381177:-114.054489:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -164,7 +162,7 @@ BOX
 wx:LayoutTab:Box36
 ISEXEC:FALSE
 85.590716:-276.693831:-900.000000
-143.150716:-286.693831:-900.000000
+131.165716:-286.693831:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box50
@@ -176,7 +174,7 @@ BOX
 wx:LayoutLine:Box57
 ISEXEC:FALSE
 -147.527923:-145.339995:-900.000000
--89.967923:-155.339995:-900.000000
+-101.952923:-155.339995:-900.000000
 PORT
 WinTitle:"Layer"
 FIN_BOX
@@ -198,13 +196,13 @@ BOX
 creaMaracasVisu:Measure3DLength_Widget:Box74
 ISEXEC:FALSE
 -274.335219:-145.856647:-900.000000
--203.160219:-155.856647:-900.000000
+-196.272398:-155.856647:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box75
 ISEXEC:FALSE
 -152.976375:-295.546787:-900.000000
--95.416375:-305.546787:-900.000000
+-107.401375:-305.546787:-900.000000
 PORT
 WinTitle:"Tools"
 FIN_BOX
@@ -279,8 +277,8 @@ FIN_BOX
 BOX
 wx:LayoutLine:Box81
 ISEXEC:FALSE
--115.952612:-113.323200:-900.000000
--58.392612:-123.323200:-900.000000
+-104.510538:-132.482021:-900.000000
+-46.950538:-142.482021:-900.000000
 PORT
 Orientation:"V"
 FIN_BOX
@@ -297,8 +295,8 @@ FIN_BOX
 BOX
 std:MathOperationVector:Box87
 ISEXEC:FALSE
--152.877707:-84.484955:-900.000000
--81.702707:-94.484955:-900.000000
+-136.645928:-73.308976:-900.000000
+-65.470928:-83.308976:-900.000000
 FIN_BOX
 BOX
 creaMiniTools:crop-viewer-widget:Box88
diff --git a/bbtk_package_creaMiniTools/bbs/appli/viewerNVExample.bbs b/bbtk_package_creaMiniTools/bbs/appli/viewerNVExample.bbs
index b6d8886..96439bb 100755
--- a/bbtk_package_creaMiniTools/bbs/appli/viewerNVExample.bbs
+++ b/bbtk_package_creaMiniTools/bbs/appli/viewerNVExample.bbs
@@ -24,7 +24,6 @@ category "<VOID>"
 new creaImageIO:ImagesChooserDialogBox Box00
 
 new creaMaracasVisu:ViewerNV Box01
-  set Box01.nTypeView "6 1 2 0"
 
 new toolsbbtk:ImageVtkPropertiesWidget Box04
 
diff --git a/bbtk_package_creaMiniTools/bbs/boxes/LayerCol-VolRend-SurRend_Widget.bbg b/bbtk_package_creaMiniTools/bbs/boxes/LayerCol-VolRend-SurRend_Widget.bbg
index c811098..0d08547 100644
--- a/bbtk_package_creaMiniTools/bbs/boxes/LayerCol-VolRend-SurRend_Widget.bbg
+++ b/bbtk_package_creaMiniTools/bbs/boxes/LayerCol-VolRend-SurRend_Widget.bbg
@@ -18,7 +18,7 @@ FIN_COMPLEX_PORT
 COMPLEXINPUTS:5
 COMPLEX_PORT
 Rederer3D
--69.799718:220.214310:-900.000000
+-6.791163:282.884110:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 vtkbaseview1
@@ -41,7 +41,7 @@ BOX
 wx:LayoutLine:Box06
 ISEXEC:FALSE
 -281.340411:-127.155729:-900.000000
--201.065896:-137.155729:-900.000000
+-223.780411:-137.155729:-900.000000
 PORT
 WinTitle:"Superpose"
 FIN_BOX
@@ -81,7 +81,7 @@ BOX
 vtk:VolumeRenderer:Box32
 ISEXEC:FALSE
 -231.930975:39.582988:-900.000000
--186.355975:29.582988:-900.000000
+-176.952438:29.582988:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:TransferFunctionView:Box33
@@ -121,7 +121,7 @@ BOX
 wx:LayoutTab:Box27
 ISEXEC:FALSE
 -408.503358:68.807042:-900.000000
--242.642464:58.807042:-900.000000
+-350.943358:58.807042:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box28
@@ -135,13 +135,13 @@ BOX
 wx:LayoutTab:Box29
 ISEXEC:FALSE
 -248.735549:-48.711503:-900.000000
--190.262536:-58.711503:-900.000000
+-191.175549:-58.711503:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box30
 ISEXEC:FALSE
 -244.163542:-28.541590:-900.000000
--188.953038:-38.541590:-900.000000
+-186.603542:-38.541590:-900.000000
 PORT
 WinTitle:"Volume Rendering"
 FIN_BOX
@@ -155,7 +155,7 @@ BOX
 wx:LayoutLine:Box37
 ISEXEC:FALSE
 -121.404862:47.404626:-900.000000
--75.829862:37.404626:-900.000000
+-63.844862:37.404626:-900.000000
 PORT
 WinTitle:"Surface Rendering-1"
 FIN_BOX
@@ -163,7 +163,7 @@ BOX
 creaMaracasVisu:ViewerNV:Box39
 ISEXEC:FALSE
 -416.458696:-28.597979:-900.000000
--242.181461:-38.597979:-900.000000
+-352.738696:-38.597979:-900.000000
 PORT
 WinTitle:"ups"
 FIN_BOX
@@ -171,13 +171,13 @@ BOX
 wx:LayoutTab:Box40
 ISEXEC:FALSE
 -245.919128:-189.914313:-900.000000
--189.280412:-199.914313:-900.000000
+-188.359128:-199.914313:-900.000000
 FIN_BOX
 BOX
 wx:LayoutSplit:Box41
 ISEXEC:FALSE
 -336.519542:-218.920349:-900.000000
--237.551497:-228.920349:-900.000000
+-290.944542:-228.920349:-900.000000
 PORT
 Proportion:"10"
 PORT
@@ -187,7 +187,7 @@ BOX
 wx:LayoutLine:Box43
 ISEXEC:FALSE
 -225.050510:-146.533489:-900.000000
--179.475510:-156.533489:-900.000000
+-167.490510:-156.533489:-900.000000
 PORT
 WinTitle:"Viewer"
 FIN_BOX
@@ -255,7 +255,7 @@ BOX
 wx:LayoutLine:Box55
 ISEXEC:FALSE
 -201.484471:-169.361130:-900.000000
--155.909471:-179.361130:-900.000000
+-130.811069:-179.361130:-900.000000
 PORT
 WinTitle:"Image Properties"
 FIN_BOX
@@ -275,7 +275,7 @@ BOX
 creaMaracasVisu:ImageChangeInformation:Box59
 ISEXEC:FALSE
 -437.948998:7.260499:-900.000000
--295.256326:-2.739501:-900.000000
+-366.773998:-2.739501:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:SliderMinMax-flexible:Box60
-- 
2.47.1