From dc4bdf0496eecfd676835fb9c783c867cfc5d901 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 26 Jul 2023 08:38:32 +0200 Subject: [PATCH] #3506 LayoutSplit minimum size --- packages/kw/src/bbkwLayoutSplit.cxx | 65 ++++++++-------------- packages/std/src/bbstdVectorFilterDouble.h | 2 +- packages/wx/src/bbwxLayoutSplit.cxx | 4 +- packages/wx/src/bbwxLayoutTab.cxx | 3 +- 4 files changed, 29 insertions(+), 45 deletions(-) diff --git a/packages/kw/src/bbkwLayoutSplit.cxx b/packages/kw/src/bbkwLayoutSplit.cxx index 938ef98..70dbc6f 100644 --- a/packages/kw/src/bbkwLayoutSplit.cxx +++ b/packages/kw/src/bbkwLayoutSplit.cxx @@ -82,31 +82,25 @@ namespace bbkw int height = parent->GetHeight(); int orientation = 0; if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"0|H|HORIZONTAL")==true) - { - orientation = 0; - } - else if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|V|VERTICAL")==true) - { - orientation = 1; - } - else - { - bbtkWarning("Unrecognized value '"<SetOrientationToHorizontal (); - width = width / 2; - } - else - { - splitframe->SetOrientationToVertical (); - height = height / 2 ; - } - - width = width - 5; - height = height - 5 ; + { + splitframe->SetOrientationToHorizontal (); + width = width / 2; + } else { + splitframe->SetOrientationToVertical (); + height = height / 2 ; + } + + width = width - 5; + height = height - 5 ; /* bbGetOutputWidget()->GetApplication()->Script("place %s -x 0 -y 0 -width %d -height %d", @@ -114,24 +108,13 @@ namespace bbkw parent->GetWidth(), parent->GetHeight() ); */ - bbGetOutputWidget()->GetApplication()->Script - ("pack %s -expand yes -fill both", - bbGetOutputWidget()->GetWidgetName()); - - splitframe->SetReliefToGroove(); - splitframe->SetBorderWidth(2); - - - vtkKWWidget* w1 = bbCreateWidgetOfInput("Widget1",splitframe->GetFrame1()); - - vtkKWWidget* w2 = bbCreateWidgetOfInput("Widget2",splitframe->GetFrame2()); - - splitframe->GetApplication()->Script - ("pack %s -expand yes -fill both", - w1->GetWidgetName()) ; - splitframe->GetApplication()->Script - ("pack %s -expand yes -fill both", - w2->GetWidgetName()) ; + bbGetOutputWidget()->GetApplication()->Script("pack %s -expand yes -fill both", bbGetOutputWidget()->GetWidgetName()); + splitframe->SetReliefToGroove(); + splitframe->SetBorderWidth(2); + vtkKWWidget* w1 = bbCreateWidgetOfInput("Widget1",splitframe->GetFrame1()); + vtkKWWidget* w2 = bbCreateWidgetOfInput("Widget2",splitframe->GetFrame2()); + splitframe->GetApplication()->Script("pack %s -expand yes -fill both",w1->GetWidgetName()) ; + splitframe->GetApplication()->Script("pack %s -expand yes -fill both",w2->GetWidgetName()) ; /* splitframe->GetApplication()->Script("pack %s -expand yes -fill x -fill y", w2->GetWidgetName()); diff --git a/packages/std/src/bbstdVectorFilterDouble.h b/packages/std/src/bbstdVectorFilterDouble.h index 2f3b556..c9d9438 100644 --- a/packages/std/src/bbstdVectorFilterDouble.h +++ b/packages/std/src/bbstdVectorFilterDouble.h @@ -52,7 +52,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(VectorFilterDouble,bbtk::AtomicBlackBox); BBTK_AUTHOR("InfoDev"); BBTK_DESCRIPTION("No Description."); BBTK_CATEGORY("empty"); - BBTK_INPUT(VectorFilterDouble,Type,"default (0) 0=Erase duplicated lines, 1=Redimention Vectors, 2=Insert intermediat points,3=Adition k1, 4=Substraction k1, 5=Multilication k1, 6=Division k1, 7=Connect mesh X1,Y1,Z1,idxs1,X2,X2,X2,idx2, 8=Order All vectors with the logic of In0 , 9=Invert Vectors, 10=Nearest Point in the vector. In3PointXYZ In0LstX In1LstY In2LstZ (Out0-index Out1-PointXYZ), 11=Mul Spacing (K1[spcX,spcY,spcZ]=Spacing), 12=Div Spacing (K1[spcX,spcY,spcZ]=Spacing), 13=Distance pointIn0 and pontIn1, 14=Select specific segments In0=lstPx In1=lstPy In2=lstPz In3=lstIndex (if k1 empty all segments are selected) ",int,""); + BBTK_INPUT(VectorFilterDouble,Type,"default (0) 0=Erase duplicated lines, 1=Redimention Vectors, 2=Insert intermediat points,3=Adition k1, 4=Substraction k1, 5=Multilication k1, 6=Division k1, 7=Connect mesh X1,Y1,Z1,idxs1,X2,X2,X2,idx2, 8=Order All vectors with the logic of In0 , 9=Invert Vectors, 10=Nearest Point in the vector. In3PointXYZ In0LstX In1LstY In2LstZ (Out0-index Out1-PointXYZ), 11=Mul Spacing (K1[spcX,spcY,spcZ]=Spacing), 12=Div Spacing (K1[spcX,spcY,spcZ]=Spacing), 13=Distance pointIn0 and pontIn1, 14=Select specific segments [k1] in In0=lstPx In1=lstPy In2=lstPz In3=lstIndex (if k1 empty all segments are selected) ",int,""); BBTK_INPUT(VectorFilterDouble,k1,"(default [0]) nothing (Type0), k1[0]=new size vectors (Type 1) , nothing (Type2), k1[0] = Addition const. (Type 3), k1[0] = Substraction const. (Type 4), k1[0] = Multiplication const. (Type 5) , k1[0] = Division const. (Type 6) , k1[spcX,spcY,spcZ] MulSpc In0_X,In1_Y,In2_Z (type 11), k1[spcX,spcY,spcZ] DivSpc In0_X,In1_Y,In2_Z (type 12) , k1[segment1, segment2,..] (type 14) ",std::vector,""); BBTK_INPUT(VectorFilterDouble,In0,"Input vector",std::vector,""); BBTK_INPUT(VectorFilterDouble,In1,"Input vector",std::vector,""); diff --git a/packages/wx/src/bbwxLayoutSplit.cxx b/packages/wx/src/bbwxLayoutSplit.cxx index 460dc86..de0a432 100644 --- a/packages/wx/src/bbwxLayoutSplit.cxx +++ b/packages/wx/src/bbwxLayoutSplit.cxx @@ -82,10 +82,10 @@ namespace bbwx wxDefaultPosition, wxDefaultSize, //wxSize(400,200), - wxSP_3D | + wxSP_3DSASH | wxSP_LIVE_UPDATE ); w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) ); - w->SetMinimumPaneSize(2); + w->SetMinimumPaneSize(15); //RaC Nov2012 Correctly resize internal panels with the window resize event w->SetSashGravity(0.5); /* diff --git a/packages/wx/src/bbwxLayoutTab.cxx b/packages/wx/src/bbwxLayoutTab.cxx index 6923062..fac1678 100644 --- a/packages/wx/src/bbwxLayoutTab.cxx +++ b/packages/wx/src/bbwxLayoutTab.cxx @@ -76,7 +76,8 @@ namespace bbwx mwxNotebook = new wxNotebook(panel, //bbGetWxParent(), -1, wxDefaultPosition, - wxDefaultSize, +// wxDefaultSize, + wxSize(50,50), style ); Connect( mwxNotebook->GetId(), wxEVT_NOTEBOOK_PAGE_CHANGED , (wxObjectEventFunction) -- 2.45.1