From: Eduardo Davila Date: Fri, 15 Feb 2008 10:23:59 +0000 (+0000) Subject: Split Orientation X-Git-Tag: r0.6.1~196 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;ds=inline;h=188a2b179b83ce7a7dd0e3687eff8f60fe07c5b7;p=bbtk.git Split Orientation --- diff --git a/packages/wx/bbs/appli/testSizerOrientation.bbs b/packages/wx/bbs/appli/testSizerOrientation.bbs index ae19a00..e390249 100644 --- a/packages/wx/bbs/appli/testSizerOrientation.bbs +++ b/packages/wx/bbs/appli/testSizerOrientation.bbs @@ -6,7 +6,7 @@ load std load wx new Sizer main - set main.Orientation H + set main.Orientation V new Sizer Sizer2 new Slider s1 @@ -19,7 +19,7 @@ new Slider s3 connect s1.Widget main.Widget1 connect Sizer2.Widget main.Widget2 -set Sizer2.Orientation V +set Sizer2.Orientation H connect s2.Widget Sizer2.Widget1 connect s3.Widget Sizer2.Widget2 diff --git a/packages/wx/bbs/appli/testSplitOrientation.bbs b/packages/wx/bbs/appli/testSplitOrientation.bbs index ca0c491..0c5bfe4 100644 --- a/packages/wx/bbs/appli/testSplitOrientation.bbs +++ b/packages/wx/bbs/appli/testSplitOrientation.bbs @@ -6,7 +6,7 @@ load std load wx new Split main - set main.Orientation H + set main.Orientation V new Split split2 new Slider s1 @@ -19,7 +19,7 @@ new Slider s3 connect s1.Widget main.Widget1 connect split2.Widget main.Widget2 -set split2.Orientation V +set split2.Orientation H connect s2.Widget split2.Widget1 connect s3.Widget split2.Widget2 diff --git a/packages/wx/src/bbwxSplit.cxx b/packages/wx/src/bbwxSplit.cxx index 0b5a71f..3862761 100644 --- a/packages/wx/src/bbwxSplit.cxx +++ b/packages/wx/src/bbwxSplit.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxSplit.cxx,v $ Language: C++ - Date: $Date: 2008/02/14 20:55:52 $ - Version: $Revision: 1.7 $ + Date: $Date: 2008/02/15 10:23:59 $ + Version: $Revision: 1.8 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -36,7 +36,7 @@ namespace bbwx void Split::bbUserConstructor() { bbSetInputWinTitle("Split"); - bbSetInputOrientation("HORIZONTAL"); + bbSetInputOrientation("VERTICAL"); bbSetInputProportion(50); bbSetInputWidget1(NULL); bbSetInputWidget2(NULL); @@ -67,7 +67,7 @@ namespace bbwx if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"0|H|HORIZONTAL")==true) { orientation=0; } if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|V|VERTICAL")==true) { orientation=1; } - if (orientation==0) { w->SplitHorizontally( w1, w2, 100); } + if (orientation==1) { w->SplitHorizontally( w1, w2, 100); } else { w->SplitVertically( w1, w2, 100); } bbSetOutputWidget( w );