From 80fb59a800a7f9ab59bfa948d9a0046313d77bbb Mon Sep 17 00:00:00 2001
From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Mon, 1 Feb 2016 15:03:52 +0100
Subject: [PATCH] #2809 creaMaracas Visu Feature New Normal  -  update
 UnitLayerPaint DrawAxisTree

---
 bbtk/bbs/boxes/UnitLayerPaint.bbg        | 14 +++++----
 bbtk/bbs/boxes/UnitLayerPaint.bbs        | 36 +++++++++++++-----------
 bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx | 18 ++++++------
 3 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/bbtk/bbs/boxes/UnitLayerPaint.bbg b/bbtk/bbs/boxes/UnitLayerPaint.bbg
index 45b0ea3..b749040 100644
--- a/bbtk/bbs/boxes/UnitLayerPaint.bbg
+++ b/bbtk/bbs/boxes/UnitLayerPaint.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/All/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/UnitLayerPaint.bbg
+# - /tmpEED/creaTools/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/UnitLayerPaint.bbg
 # ----------------------------------
 
 APP_START
@@ -41,7 +41,7 @@ BOX
 creaMaracasVisu:ViewerNV:Box09
 ISEXEC:FALSE
 33.629033:-1.576918:-900.000000
-94.269033:-11.576918:-900.000000
+79.204033:-11.576918:-900.000000
 PORT
 nTypeView:"0"
 FIN_BOX
@@ -57,7 +57,7 @@ BOX
 wx:LayoutLine:Box13
 ISEXEC:FALSE
 -92.239645:-52.736806:-900.000000
--34.679645:-62.736806:-900.000000
+-46.664645:-62.736806:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -71,7 +71,7 @@ BOX
 wx:LayoutTab:Box16
 ISEXEC:FALSE
 -30.536965:-32.299285:-900.000000
-27.023035:-42.299285:-900.000000
+15.038035:-42.299285:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box17
@@ -85,7 +85,7 @@ BOX
 wx:LayoutLine:Box18
 ISEXEC:FALSE
 -34.328234:-13.564862:-900.000000
-23.231766:-23.564862:-900.000000
+11.246766:-23.564862:-900.000000
 PORT
 WinTitle:"Paint"
 FIN_BOX
@@ -114,6 +114,8 @@ PORT
 lstBaseColor:"1 0 0 1 1 0 0 0 1"
 PORT
 lstGreyLevelBoundaries:"500 1500 2500 5000"
+PORT
+lstTransparenceBoundaries:"0"
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box23
@@ -125,7 +127,7 @@ BOX
 wx:LayoutTab:Box24
 ISEXEC:FALSE
 -4.772832:-89.823842:-900.000000
-52.787168:-99.823842:-900.000000
+40.802168:-99.823842:-900.000000
 PORT
 WinWidth:"0"
 FIN_BOX
diff --git a/bbtk/bbs/boxes/UnitLayerPaint.bbs b/bbtk/bbs/boxes/UnitLayerPaint.bbs
index 78fedf9..4552892 100644
--- a/bbtk/bbs/boxes/UnitLayerPaint.bbs
+++ b/bbtk/bbs/boxes/UnitLayerPaint.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/All/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/UnitLayerPaint.bbs
+# - /tmpEED/creaTools/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/UnitLayerPaint.bbs
 # ----------------------------------
 
 include std
@@ -18,47 +18,48 @@ description "Description ??"
 
 category "<VOID>"
 
-new ViewerNV Box09
+new creaMaracasVisu:ViewerNV Box09
   set Box09.nTypeView "0"
 
-new ManualPaint Box11
+new creaMaracasVisu:ManualPaint Box11
   set Box11.WinTitle "Paint"
 
-new LayoutLine Box13
+new wx:LayoutLine Box13
   set Box13.Orientation "H"
 
-new LayoutTab Box15
+new wx:LayoutTab Box15
 
-new LayoutTab Box16
+new wx:LayoutTab Box16
 
-new LayoutLine Box17
+new wx:LayoutLine Box17
   set Box17.WinTitle "Color"
 
-new LayoutLine Box18
+new wx:LayoutLine Box18
   set Box18.WinTitle "Paint"
 
-new LayoutSplit Box19
+new wx:LayoutSplit Box19
   set Box19.Proportion "30"
 
-new SaveMHD-Button Box20
+new toolsbbtk:SaveMHD-Button Box20
 
-new ColorLayerImageView Box21
+new creaMaracasVisu:ColorLayerImageView Box21
   set Box21.WinTitle "Color"
   set Box21.lstBaseColor "1 0 0 1 1 0 0 0 1"
   set Box21.lstGreyLevelBoundaries "500 1500 2500 5000"
+  set Box21.lstTransparenceBoundaries "0"
 
-new vtkImageDataPointerRelay Box23
+new vtk:vtkImageDataPointerRelay Box23
 
-new LayoutTab Box24
+new wx:LayoutTab Box24
   set Box24.WinWidth "0"
 
-new ImageVtkPropertiesWidget Box25
+new toolsbbtk:ImageVtkPropertiesWidget Box25
 
-new MagicBox Box26
+new std:MagicBox Box26
 
-new MagicBox Box27
+new std:MagicBox Box27
 
-new MagicBox Box28
+new std:MagicBox Box28
 
 
 connect Box15.Widget Box13.Widget1
@@ -94,5 +95,6 @@ input TitleModule Box19.WinTitle " "
 # Complex output ports
 output OutWidget Box19.Widget " "
 
+message    
 
 endefine
diff --git a/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx b/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
index 00fae17..fec8240 100644
--- a/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
+++ b/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
@@ -192,9 +192,9 @@ void DrawAxisTree3D::Process()
     int iActor,sizeActors = vecVtkActors.size();
 	int numPoints;
 
-    if (oldLstSize!=sizeLstAxis)
-	 {
-        oldLstSize=sizeLstAxis;
+//    if (oldLstSize!=sizeLstAxis)
+//	 {
+//        oldLstSize=sizeLstAxis;
          for (iActor=0 ; iActor<sizeActors; iActor++)
          {
             if (bbGetInputRenderer()!=NULL )
@@ -203,8 +203,8 @@ void DrawAxisTree3D::Process()
                 vecVtkPolyData[iActor]->Delete();
                 vecVtkPolyDataMaper[iActor]->Delete();
                 vecVtkActors[iActor]->Delete();
-            }
-         }
+            } // if
+         } // for iActor
          vecVtkPolyData.clear();
          vecVtkPolyDataMaper.clear();
          vecVtkActors.clear();
@@ -220,22 +220,22 @@ void DrawAxisTree3D::Process()
     //			printf("EED  DrawAxisTree3D::Process  %d/%d\n", iAxis,sizeLstAxis );
     //		}
 
-        }
+        } // for iAxis
 
         if ( bbGetInputiAxis() < (int)(vecVtkActors.size()-1) )
         {
             bbSetOutputOutAxis( vecVtkActors[ bbGetInputiAxis() ] );
         } else 	{
             printf("DrawAxisTree3D .ERROR. missing index vector...\n");
-        }
+        } // if 
 
-    } else {// if oldLstSize
+ //   } else {// if oldLstSize
         for (iActor=0 ; iActor<sizeActors; iActor++)
         {
             vecVtkActors[iActor]->GetProperty()->SetOpacity( bbGetInputOpacity() );
    	    vecVtkActors[iActor]->GetProperty()->SetLineWidth( bbGetInputLineWidth() );
         }
-    }
+//    } // if oldLstSize
 
 	printf("EED DrawAxisTree3D::Process end \n");
 
-- 
2.47.1