#3403 vtk8itk5wx3-macos

diff --git a/packages/std/src/bbstdReadColumnsDouble.cxx b/packages/std/src/bbstdReadColumnsDouble.cxx
index ca3dd76be41105337377f09a2f51270f0f0a1959..92f0557ab138d05213d6c32b85d3968123ad2fde 100644 (file)
--- a/packages/std/src/bbstdReadColumnsDouble.cxx
+++ b/packages/std/src/bbstdReadColumnsDouble.cxx
@@ -40,7 +40,7 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ReadColumnsDouble,bbtk::AtomicBlackBox);
 //===== 
 void ReadColumnsDouble::Process()
 {      
-       std::vector< std::vector<double> * > tlst;      
+       std::vector< std::vector<double> * > tlst;
        int i;
        for( i=0 ;  i<bbGetInputDimension() ; i++)
        {
@@ -86,6 +86,7 @@ void ReadColumnsDouble::Process()
        i=14; if (i<=bbGetInputDimension()) { bbSetOutputlstData14( *(tlst[i-1]) ); }
        i=15; if (i<=bbGetInputDimension()) { bbSetOutputlstData15( *(tlst[i-1]) ); }
 }
+
 //===== 
 // 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/packages/wx/src/bbwxListCtrl.cxx b/packages/wx/src/bbwxListCtrl.cxx
index 0576e5470360da40415eaa1deda860ae041d0b34..9f06a830376555f350c0900921c4bf13a8b64032 100644 (file)
--- a/packages/wx/src/bbwxListCtrl.cxx
+++ b/packages/wx/src/bbwxListCtrl.cxx
@@ -22,7 +22,7 @@ void ListCtrl::Process()
        unsigned int i,iSize=bbGetInputTitles().size();
        for (i=0;i<iSize;i++)
        {
-               lstctrl->AppendColumn( bbtk::std2wx( bbGetInputTitles()[i] ) );         
+               lstctrl->AppendColumn( bbtk::std2wx( bbGetInputTitles()[i] ) , wxLIST_FORMAT_CENTRE );          
        } // for i
 
     unsigned int j,jSize=bbGetInputColumn00().size();

diff --git a/packages/wxvtk/bbs/boxes/SphereListWidget.bbg b/packages/wxvtk/bbs/boxes/SphereListWidget.bbg
index 92a7c8d2b6fc6cbe94ffc865299364da644a4120..b5b492098064bfbd52cec58e0a50cddd6e0b36a0 100644 (file)
--- a/packages/wxvtk/bbs/boxes/SphereListWidget.bbg
+++ b/packages/wxvtk/bbs/boxes/SphereListWidget.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/C11/creatools_source/bbtk/packages/wxvtk/bbs/boxes/SphereListWidget.bbg
+# - /Users/davila/Creatis/C11/creatools_source/bbtk/packages/wxvtk/bbs/boxes/SphereListWidget.bbg
 # ----------------------------------
 
 APP_START
@@ -13,51 +13,55 @@ PACKAGENAME:wxvtk
 COMPLEXOUTPUTS:2
 COMPLEX_PORT
 Widget
--98.843138:-92.871946:-900.000000
+-130.889722:-93.605837:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 BoxChangeForRender
--27.298894:-91.470701:-900.000000
+-38.551893:-95.384788:-900.000000
 FIN_COMPLEX_PORT
-COMPLEXINPUTS:8
+COMPLEXINPUTS:9
 COMPLEX_PORT
 lstPointX
-8.139713:82.586776:-900.000000
+11.075278:107.539078:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 lstPointY
-24.043459:82.712003:-900.000000
+27.468285:109.132087:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 lstPointZ
-39.321073:82.461550:-900.000000
+44.213681:110.349417:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Renderer
--24.568408:81.683772:-900.000000
+-24.813038:108.593117:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 spc
--7.675531:83.753591:-900.000000
+-4.984596:107.238110:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 WinTitle
--55.788338:78.579533:-900.000000
+-51.140360:105.978139:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 transform
-60.235872:85.258911:-900.000000
+66.596263:110.700474:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 boxExecute
--81.896681:82.155439:-900.000000
+-73.579247:104.661437:-900.000000
 FIN_COMPLEX_PORT
-BOXES:9
+COMPLEX_PORT
+Color
+-121.404228:101.403165:-900.000000
+FIN_COMPLEX_PORT
+BOXES:10
 BOX
 wx:Slider:Box00
 ISEXEC:FALSE
--167.678079:54.285621:-900.000000
--116.278079:44.285621:-900.000000
+-184.312947:47.680600:-900.000000
+-132.912947:37.680600:-900.000000
 PORT
 In:"50"
 PORT
@@ -90,8 +94,8 @@ FIN_BOX
 BOX
 wx:LayoutLine:Box02
 ISEXEC:FALSE
--119.477285:-59.570700:-900.000000
--61.917285:-69.570700:-900.000000
+-134.155110:-45.626767:-900.000000
+-76.595110:-55.626767:-900.000000
 PORT
 WinTitle:"Center Point"
 FIN_BOX
@@ -114,8 +118,8 @@ FIN_BOX
 BOX
 std:Div:Box04
 ISEXEC:FALSE
--116.710956:22.728582:-900.000000
--87.385956:12.728582:-900.000000
+-115.977065:19.793017:-900.000000
+-86.652065:9.793017:-900.000000
 PORT
 In2:"100"
 FIN_BOX
@@ -128,8 +132,8 @@ FIN_BOX
 BOX
 std:MultipleInputs:Box08
 ISEXEC:FALSE
--89.040146:-12.511793:-900.000000
--49.340146:-22.511793:-900.000000
+-113.503187:-17.159771:-900.000000
+-73.803187:-27.159771:-900.000000
 PORT
 BoxProcessMode:"Reactive"
 FIN_BOX
@@ -145,7 +149,13 @@ ISEXEC:FALSE
 52.379365:62.243159:-900.000000
 88.454365:52.243159:-900.000000
 FIN_BOX
-CONNECTIONS:22
+BOX
+std:ConcatStrings:Box11
+ISEXEC:FALSE
+-111.619012:67.888799:-900.000000
+-71.894012:57.888799:-900.000000
+FIN_BOX
+CONNECTIONS:24
 CONNECTION
 Box00:Widget:Box02:Widget1
 NumberOfControlPoints:0
@@ -212,4 +222,10 @@ NumberOfControlPoints:0
 CONNECTION
 Box08:BoxChange:BoxChangeForRender:BoxChangeForRender
 NumberOfControlPoints:0
+CONNECTION
+Color:Color:Box11:In1
+NumberOfControlPoints:0
+CONNECTION
+Box11:Out:Box03:Colour
+NumberOfControlPoints:0
 APP_END

diff --git a/packages/wxvtk/bbs/boxes/SphereListWidget.bbs b/packages/wxvtk/bbs/boxes/SphereListWidget.bbs
index 2e41b77b1815f804997b4fa32c1edf11d0179017..a64fc757369048df5a97897f6ae9b90b356b4eb1 100644 (file)
--- a/packages/wxvtk/bbs/boxes/SphereListWidget.bbs
+++ b/packages/wxvtk/bbs/boxes/SphereListWidget.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/C11/creatools_source/bbtk/packages/wxvtk/bbs/boxes/SphereListWidget.bbs
+# - /Users/davila/Creatis/C11/creatools_source/bbtk/packages/wxvtk/bbs/boxes/SphereListWidget.bbs
 # ----------------------------------
 
 include std
@@ -53,6 +53,8 @@ new std:MagicBox Box09
 
 new std:MagicBox Box10
 
+new std:ConcatStrings Box11
+
 
 connect Box00.Widget Box02.Widget1
 connect Box01.Widget Box02.Widget2
@@ -66,6 +68,7 @@ connect Box05.Out Box03.lstRadio
 connect Box05.BoxChange Box08.In2
 connect Box01.BoxChange Box08.In3
 connect Box10.Out Box03.Transform
+connect Box11.Out Box03.Colour
 
 # Complex input ports
 input Renderer Box09.In " "
@@ -76,6 +79,7 @@ input spc Box03.Spacing " "
 input WinTitle Box02.WinTitle " "
 input transform Box10.In " "
 input boxExecute Box08.In5 " "
+input Color Box11.In1 " "
 
 # Complex output ports
 output Widget Box02.Widget " "