X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxLayoutSplit.cxx;h=460dc8697c18fb9cd23e20f5e6153e8f322c6c54;hb=4d3619bf05342807aec39f571d94e4aea2efa38b;hp=939355f8d4175bf9f3cbd42f28c5eee05e6eb7a2;hpb=236a8e2fee9937c050e2d16c7222e1caa993f01c;p=bbtk.git

diff --git a/packages/wx/src/bbwxLayoutSplit.cxx b/packages/wx/src/bbwxLayoutSplit.cxx
index 939355f..460dc86 100644
--- a/packages/wx/src/bbwxLayoutSplit.cxx
+++ b/packages/wx/src/bbwxLayoutSplit.cxx
@@ -1,33 +1,38 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutSplit.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/13 14:46:46 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2012/11/16 08:52:14 $
+  Version:   $Revision: 1.14 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  This software is governed by the CeCILL-B license under French law and 
-*  abiding by the rules of distribution of free software. You can  use, 
-*  modify and/ or redistribute the software under the terms of the CeCILL-B 
-*  license as circulated by CEA, CNRS and INRIA at the following URL 
-*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-*  or in the file LICENSE.txt.
-*
-*  As a counterpart to the access to the source code and  rights to copy,
-*  modify and redistribute granted by the license, users are provided only
-*  with a limited warranty  and the software's author,  the holder of the
-*  economic rights,  and the successive licensors  have only  limited
-*  liability. 
-*
-*  The fact that you are presently reading this means that you have had
-*  knowledge of the CeCILL-B license and that you accept its terms.
-* ------------------------------------------------------------------------ */                                                                         
-
 /**
  *  \file
  *  \brief
@@ -46,21 +51,33 @@ namespace bbwx
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,LayoutSplit);
   BBTK_BLACK_BOX_IMPLEMENTATION(LayoutSplit,bbtk::WxBlackBox);
 
-  void LayoutSplit::bbUserConstructor()
-  {
-    bbSetInputOrientation("VERTICAL");
-    bbSetInputProportion(50);
-    bbSetInputWidget1(NULL);
-    bbSetInputWidget2(NULL);
-  }
-
-  void LayoutSplit::Process()
+	//-----------------------------------------------------------------	
+	void LayoutSplit::bbUserSetDefaultValues()
+	{
+		bbSetInputOrientation("VERTICAL");
+		bbSetInputProportion(50);
+		bbSetInputWidget1(NULL);
+		bbSetInputWidget2(NULL);		
+	}
+	
+	//-----------------------------------------------------------------	
+	void LayoutSplit::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void LayoutSplit::bbUserFinalizeProcessing()
+	{
+	}	
+	
+  	void LayoutSplit::Process()
+  	{
+		PutWinTitle();
+  	}
+
+  void LayoutSplit::CreateWidget(wxWindow* parent)
   {
-  }
-
-  void LayoutSplit::CreateWidget()
-  {
-    wxSplitterWindow* w = new wxSplitterWindow(bbGetWxParent(),
+    wxSplitterWindow* w = new wxSplitterWindow(parent, //bbGetWxParent(),
 					       -1,
 					       wxDefaultPosition,
 					       wxDefaultSize,
@@ -68,20 +85,32 @@ namespace bbwx
 					       wxSP_3D |
 					       wxSP_LIVE_UPDATE );
     w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
-    wxWindow* w1 = bbGetInputWidget1();
+	w->SetMinimumPaneSize(2);
+	//RaC Nov2012 Correctly resize internal panels with the window resize event
+	w->SetSashGravity(0.5);
+/*
+	  wxWindow* w1 = bbGetInputWidget1();
     wxWindow* w2 = bbGetInputWidget2();
 
     if (w1==NULL) { w1=new wxPanel(bbGetWxParent()); }
     if (w2==NULL) { w2=new wxPanel(bbGetWxParent()); }
     w1->Reparent(w);
     w2->Reparent(w);
-    int orientation=0;
+ */ 
+
+	  wxWindow* w1 = bbCreateWidgetOfInput("Widget1",w);
+	  wxWindow* w2 = bbCreateWidgetOfInput("Widget2",w);
+	  if (w1==NULL) { w1=new wxPanel(parent); }
+	  if (w2==NULL) { w2=new wxPanel(parent); }
+	  
+	  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; }
+    if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|V|VERTICAL")==true)    { orientation=1; }
     
+
     if (orientation==1) { w->SplitHorizontally( w1, w2, 100); }
     else                { w->SplitVertically( w1, w2, 100);   }
-    
+  
     bbSetOutputWidget( w );
   }
 
@@ -90,6 +119,7 @@ namespace bbwx
   // when window is shown
   void  LayoutSplit::OnShowWidget()
   {
+    //    std::cout << "LayoutSplit::OnShowWidget()" << std::endl;
     if (bbGetOutputWidget()==0)
       {
 	return;
@@ -116,8 +146,9 @@ namespace bbwx
     //    std::cout << "pos = "<<pos<<std::endl;
   
     win->SetSashPosition(pos,true);
-    bbUserOnShowWidget("Widget1");
-    bbUserOnShowWidget("Widget2");
+    //RaC Nov2012 Correctly resize internal panels with the window resize event
+    win->SetSashGravity(0.5);
+
   }