X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxLayoutLine.cxx;h=961218b5888125e3ffce94559a0cac5603c71e76;hb=8ba18df584ba0a409fb042663be9fa76ccb0e0b0;hp=d9043f958a5fc96c9f8460eeaf2b415fd609f84b;hpb=17ac9460f5ea5600d1065fbe3ee4ad826d7bb4fc;p=bbtk.git

diff --git a/packages/wx/src/bbwxLayoutLine.cxx b/packages/wx/src/bbwxLayoutLine.cxx
index d9043f9..961218b 100644
--- a/packages/wx/src/bbwxLayoutLine.cxx
+++ b/packages/wx/src/bbwxLayoutLine.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: bbwxLayoutLine.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/15 14:58:03 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2012/11/16 08:52:14 $
+  Version:   $Revision: 1.10 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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
@@ -73,9 +78,10 @@ namespace bbwx
 	}	
 	
 	
-  void LayoutLine::Process()
-  {
-  }
+void LayoutLine::Process()
+{
+	PutWinTitle();
+}
   
 	
 /*
@@ -92,30 +98,47 @@ namespace bbwx
   void LayoutLine::CreateWidget(wxWindow* parent)
   {
     wxBoxSizer *sizer;
-    wxPanel *w=new wxPanel(parent, //bbGetWxParent(),
-						   -1);
+    wxPanel *w=new wxPanel(parent, -1, wxDefaultPosition, wxSize(20,20) );
     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;   }
+    if (bbtk::Utilities::loosematch(bbGetInputOrientation(), "0|H|HORIZONTAL")==true)  
+    { 
+		style=wxHORIZONTAL; 
+	} // if
+    if (bbtk::Utilities::loosematch(bbGetInputOrientation(), "1|V|VERTICAL")==true) 	
+    { 
+		style=wxVERTICAL;   
+	} // if
     
     sizer	= new wxBoxSizer(style);
 
-	  wxWindow* cw;
-	if ((cw=bbCreateWidgetOfInput("Widget1",w)) != 0) sizer->Add(cw, 1, wxEXPAND, 0);
-	  if ((cw=bbCreateWidgetOfInput("Widget2",w)) != 0) sizer->Add(cw, 1, wxEXPAND, 0);
-	  if ((cw=bbCreateWidgetOfInput("Widget3",w)) != 0) sizer->Add(cw, 1, wxEXPAND, 0);
-	  if ((cw=bbCreateWidgetOfInput("Widget4",w)) != 0) sizer->Add(cw, 1, wxEXPAND, 0);
-	  if ((cw=bbCreateWidgetOfInput("Widget5",w)) != 0) sizer->Add(cw, 1, wxEXPAND, 0);
-	  if ((cw=bbCreateWidgetOfInput("Widget6",w)) != 0) sizer->Add(cw, 1, wxEXPAND, 0);
-	  if ((cw=bbCreateWidgetOfInput("Widget7",w)) != 0) sizer->Add(cw, 1, wxEXPAND, 0);
-	  if ((cw=bbCreateWidgetOfInput("Widget8",w)) != 0) sizer->Add(cw, 1, wxEXPAND, 0);
-	  if ((cw=bbCreateWidgetOfInput("Widget9",w)) != 0) sizer->Add(cw, 1, wxEXPAND, 0);
+	wxWindow* cw;
+      
+//
+//Borrame
+//      , 0, wxGROW|wxALL,
+/*
+      if ((cw=bbCreateWidgetOfInput("Widget1",w)) != 0) sizer->Add(cw, 0, wxGROW|wxALL, 0);
+      if ((cw=bbCreateWidgetOfInput("Widget2",w)) != 0) sizer->Add(cw, 0, wxGROW|wxALL, 0);
+      if ((cw=bbCreateWidgetOfInput("Widget3",w)) != 0) sizer->Add(cw, 0, wxGROW|wxALL, 0);
+      if ((cw=bbCreateWidgetOfInput("Widget4",w)) != 0) sizer->Add(cw, 0, wxGROW|wxALL, 0);
+      if ((cw=bbCreateWidgetOfInput("Widget5",w)) != 0) sizer->Add(cw, 0, wxGROW|wxALL, 0);
+      if ((cw=bbCreateWidgetOfInput("Widget6",w)) != 0) sizer->Add(cw, 0, wxGROW|wxALL, 0);
+      if ((cw=bbCreateWidgetOfInput("Widget7",w)) != 0) sizer->Add(cw, 0, wxGROW|wxALL, 0);
+      if ((cw=bbCreateWidgetOfInput("Widget8",w)) != 0) sizer->Add(cw, 0, wxGROW|wxALL, 0);
+      if ((cw=bbCreateWidgetOfInput("Widget9",w)) != 0) sizer->Add(cw, 0, wxGROW|wxALL, 0);
+*/
+	if ((cw=bbCreateWidgetOfInput("Widget1",w)) != 0) sizer->Add(cw, 1, wxGROW, 0);
+	if ((cw=bbCreateWidgetOfInput("Widget2",w)) != 0) sizer->Add(cw, 1, wxGROW, 0);
+	if ((cw=bbCreateWidgetOfInput("Widget3",w)) != 0) sizer->Add(cw, 1, wxGROW, 0);
+	if ((cw=bbCreateWidgetOfInput("Widget4",w)) != 0) sizer->Add(cw, 1, wxGROW, 0);
+	if ((cw=bbCreateWidgetOfInput("Widget5",w)) != 0) sizer->Add(cw, 1, wxGROW, 0);
+	if ((cw=bbCreateWidgetOfInput("Widget6",w)) != 0) sizer->Add(cw, 1, wxGROW, 0);
+	if ((cw=bbCreateWidgetOfInput("Widget7",w)) != 0) sizer->Add(cw, 1, wxGROW, 0);
+	if ((cw=bbCreateWidgetOfInput("Widget8",w)) != 0) sizer->Add(cw, 1, wxGROW, 0);
+	if ((cw=bbCreateWidgetOfInput("Widget9",w)) != 0) sizer->Add(cw, 1, wxGROW, 0);
+      
 	  /*
     TryInsertWindow(w,bbGetInputWidget1(),sizer);
     TryInsertWindow(w,bbGetInputWidget2(),sizer);
@@ -135,15 +158,6 @@ namespace bbwx
   // when window is shown
   void  LayoutLine::OnShowWidget()
   {
-	  bbUserOnShowWidget("Widget1");
-	  bbUserOnShowWidget("Widget2");
-	  bbUserOnShowWidget("Widget3");
-	  bbUserOnShowWidget("Widget4");
-	  bbUserOnShowWidget("Widget5");
-	  bbUserOnShowWidget("Widget6");
-	  bbUserOnShowWidget("Widget7");
-	  bbUserOnShowWidget("Widget8");
-	  bbUserOnShowWidget("Widget9");
   }
 
 }//namespace bbwx