X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxLayoutSplit.cxx;h=1c1e2655dcf70ec95a33fe1d5804787f0f4688ef;hb=3ccde402d1eb179b3e940ec7ca3d1d2e9c96386c;hp=1f9e079e2d34f275e275453766cbfbf94a83451e;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git

diff --git a/packages/wx/src/bbwxLayoutSplit.cxx b/packages/wx/src/bbwxLayoutSplit.cxx
index 1f9e079..1c1e265 100644
--- a/packages/wx/src/bbwxLayoutSplit.cxx
+++ b/packages/wx/src/bbwxLayoutSplit.cxx
@@ -1,20 +1,33 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutSplit.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:53 $
-  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
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2008/10/21 08:37:09 $
+  Version:   $Revision: 1.6 $
 =========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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
@@ -54,7 +67,7 @@ namespace bbwx
 					       //wxSize(400,200),
 					       wxSP_3D |
 					       wxSP_LIVE_UPDATE );
-	w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
+    w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
     wxWindow* w1 = bbGetInputWidget1();
     wxWindow* w2 = bbGetInputWidget2();
 
@@ -63,15 +76,42 @@ namespace bbwx
     w1->Reparent(w);
     w2->Reparent(w);
     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(),"0|H|HORIZONTAL")==true)  { orientation=0; }
+    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 );
+  }
 
-	if (orientation==1) { w->SplitHorizontally( w1, w2, 100); }
-	else                { w->SplitVertically( w1, w2, 100);   }
 
-    bbSetOutputWidget( w );
+  // This callback is necessary to get actual processing of the view 
+  // when window is shown
+  void  LayoutSplit::bbUserOnShow()
+  {
+    wxSplitterWindow* win = (wxSplitterWindow*)bbGetOutputWidget();
+    int w,h;
+    win->GetClientSize(&w,&h);
+    int pos = 100;
+    if (bbtk::Utilities::loosematch(bbGetInputOrientation(),
+				    "0|H|HORIZONTAL")==true)  
+      { 
+	pos = (int)(w * bbGetInputProportion() * 0.01);
+      }
+    else 
+      {
+	pos = (int)(h * bbGetInputProportion() * 0.01);
+      } 
+    //    std::cout << "pos = "<<pos<<std::endl;
+  
+    win->SetSashPosition(pos,true);
+    bbUserOnShowWidget("Widget1");
+    bbUserOnShowWidget("Widget2");
   }
 
+
+
 }//namespace bbwx
 
 #endif // _USE_WXWIDGETS_