From b0f948e65655a106e7328784444554f34da7dcac Mon Sep 17 00:00:00 2001 From: guigues Date: Mon, 10 Mar 2008 10:01:14 +0000 Subject: [PATCH] *** empty log message *** --- kernel/src/bbtkWxBlackBox.cxx | 8 +- kernel/src/bbtkWxConsole.cxx | 14 ++- packages/wx/src/bbwxLayoutLine.cxx | 114 ++++++++++--------- packages/wx/src/bbwxSlider.cxx | 37 +++--- packages/wxvtk/bbs/appli/ExampleViewer2D.bbs | 10 +- packages/wxvtk/bbs/boxes/bbSimpleSlicer.bbs | 2 +- 6 files changed, 102 insertions(+), 83 deletions(-) diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx index 06ec967..f214188 100644 --- a/kernel/src/bbtkWxBlackBox.cxx +++ b/kernel/src/bbtkWxBlackBox.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxBlackBox.cxx,v $ Language: C++ - Date: $Date: 2008/03/06 09:23:43 $ - Version: $Revision: 1.8 $ + Date: $Date: 2008/03/10 10:01:14 $ + Version: $Revision: 1.9 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -594,7 +594,7 @@ namespace bbtk " Input WinDialog set to true : creating a Dialog" <Show(); + // Layout //EED SetSizer(sizer); diff --git a/packages/wx/src/bbwxLayoutLine.cxx b/packages/wx/src/bbwxLayoutLine.cxx index 977404c..6740462 100644 --- a/packages/wx/src/bbwxLayoutLine.cxx +++ b/packages/wx/src/bbwxLayoutLine.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxLayoutLine.cxx,v $ Language: C++ - Date: $Date: 2008/02/15 12:19:58 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/03/10 10:01:15 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -32,60 +32,64 @@ namespace bbwx { BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx, LayoutLine); BBTK_USER_BLACK_BOX_IMPLEMENTATION(LayoutLine,bbtk::WxBlackBox); - - void LayoutLine::bbUserConstructor() - { - bbSetInputOrientation("VERTICAL"); - bbSetInputWidget1(NULL); - bbSetInputWidget2(NULL); - bbSetInputWidget3(NULL); - bbSetInputWidget4(NULL); - bbSetInputWidget5(NULL); - bbSetInputWidget6(NULL); - bbSetInputWidget7(NULL); - bbSetInputWidget8(NULL); - bbSetInputWidget9(NULL); - } - - void LayoutLine::Process() - { - } - - void LayoutLine::TryInsertWindow(wxWindow *parent, wxWindow *w,wxBoxSizer *sizer) - { - if (w!=NULL) - { - w->Reparent(parent); - sizer->Add(w, 1, wxEXPAND, 0); - } - } - - void LayoutLine::CreateWidget() - { - wxBoxSizer *sizer; - wxPanel *w=new wxPanel(bbGetWxParent(), -1); - w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) ); - - int style=0; - if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"0|H|HORIZONTAL")==true) { style=wxHORIZONTAL; } - if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|V|VERTICAL")==true) { style=wxVERTICAL; } - - sizer = new wxBoxSizer(style); - - TryInsertWindow(w,bbGetInputWidget1(),sizer); - TryInsertWindow(w,bbGetInputWidget2(),sizer); - TryInsertWindow(w,bbGetInputWidget3(),sizer); - TryInsertWindow(w,bbGetInputWidget4(),sizer); - TryInsertWindow(w,bbGetInputWidget5(),sizer); - TryInsertWindow(w,bbGetInputWidget6(),sizer); - TryInsertWindow(w,bbGetInputWidget7(),sizer); - TryInsertWindow(w,bbGetInputWidget8(),sizer); - TryInsertWindow(w,bbGetInputWidget9(),sizer); - - w -> SetSizer(sizer); - bbSetOutputWidget( w ); + + void LayoutLine::bbUserConstructor() + { + bbSetInputOrientation("VERTICAL"); + bbSetInputWidget1(NULL); + bbSetInputWidget2(NULL); + bbSetInputWidget3(NULL); + bbSetInputWidget4(NULL); + bbSetInputWidget5(NULL); + bbSetInputWidget6(NULL); + bbSetInputWidget7(NULL); + bbSetInputWidget8(NULL); + bbSetInputWidget9(NULL); } - + + void LayoutLine::Process() + { + } + + void LayoutLine::TryInsertWindow(wxWindow *parent, wxWindow *w,wxBoxSizer *sizer) + { + if (w!=NULL) + { + w->Reparent(parent); + sizer->Add(w, 1, wxEXPAND, 0); + } + } + + void LayoutLine::CreateWidget() + { + wxBoxSizer *sizer; + wxPanel *w=new wxPanel(bbGetWxParent(), -1); + w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) ); + + int style=0; + if (bbtk::Utilities::loosematch(bbGetInputOrientation(), + "0|H|HORIZONTAL")==true) + { style=wxHORIZONTAL; } + if (bbtk::Utilities::loosematch(bbGetInputOrientation(), + "1|V|VERTICAL")==true) + { style=wxVERTICAL; } + + sizer = new wxBoxSizer(style); + + TryInsertWindow(w,bbGetInputWidget1(),sizer); + TryInsertWindow(w,bbGetInputWidget2(),sizer); + TryInsertWindow(w,bbGetInputWidget3(),sizer); + TryInsertWindow(w,bbGetInputWidget4(),sizer); + TryInsertWindow(w,bbGetInputWidget5(),sizer); + TryInsertWindow(w,bbGetInputWidget6(),sizer); + TryInsertWindow(w,bbGetInputWidget7(),sizer); + TryInsertWindow(w,bbGetInputWidget8(),sizer); + TryInsertWindow(w,bbGetInputWidget9(),sizer); + + w -> SetSizer(sizer); + bbSetOutputWidget( w ); + } + }//namespace bbwx #endif // _USE_WXWIDGETS_ diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx index 3017b5e..6261380 100644 --- a/packages/wx/src/bbwxSlider.cxx +++ b/packages/wx/src/bbwxSlider.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxSlider.cxx,v $ Language: C++ - Date: $Date: 2008/02/13 15:09:37 $ - Version: $Revision: 1.8 $ + Date: $Date: 2008/03/10 10:01:15 $ + Version: $Revision: 1.9 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -351,21 +351,24 @@ namespace bbwx void Slider::CreateWidget() { - int orientation=0; - if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"0|H|HORIZONTAL")==true) { orientation=0; } - if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|V|VERTICAL")==true) { orientation=1; } - - SliderWidget *w = new SliderWidget(this, - bbGetWxParent(), - orientation , - bbGetInputChangeResolution(), - bbGetInputLabel(), - bbtk::std2wx( bbGetInputTitle() ), - bbGetInputMin(), - bbGetInputMax(), - bbGetInputIn(), - bbGetInputReactiveOnTrack() - ); + int orientation=0; + if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"0|H|HORIZONTAL")==true) { orientation=0; } + if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|V|VERTICAL")==true) { orientation=1; } + + + std::cout << "bbGetWxParent = "<