X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxLayoutLine.cxx;h=888bc39dcb74663cfbac4736841737b0983597e8;hb=4d3619bf05342807aec39f571d94e4aea2efa38b;hp=977404c1cafa7487464713f89ae27d8cc23d7de7;hpb=b34cf856c1869c53b175398d26c33d9e12740d5b;p=bbtk.git

diff --git a/packages/wx/src/bbwxLayoutLine.cxx b/packages/wx/src/bbwxLayoutLine.cxx
index 977404c..888bc39 100644
--- a/packages/wx/src/bbwxLayoutLine.cxx
+++ b/packages/wx/src/bbwxLayoutLine.cxx
@@ -1,20 +1,39 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: 2008/02/15 12:19:58 $
-  Version:   $Revision: 1.1 $
-                                                                                
-  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: 2012/11/16 08:52:14 $
+  Version:   $Revision: 1.10 $
 =========================================================================*/
+
+
 /**
  *  \file
  *  \brief
@@ -31,9 +50,10 @@
 namespace bbwx
 {
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx, LayoutLine);
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(LayoutLine,bbtk::WxBlackBox);
-
-	void LayoutLine::bbUserConstructor()
+  BBTK_BLACK_BOX_IMPLEMENTATION(LayoutLine,bbtk::WxBlackBox);
+  
+	//-----------------------------------------------------------------	
+	void LayoutLine::bbUserSetDefaultValues()
 	{
 		bbSetInputOrientation("VERTICAL");
 		bbSetInputWidget1(NULL);
@@ -46,44 +66,81 @@ namespace bbwx
 		bbSetInputWidget8(NULL);
 		bbSetInputWidget9(NULL);
 	}
-
-	  void LayoutLine::Process()
-	  {
-	  }
-
-	void LayoutLine::TryInsertWindow(wxWindow *parent, wxWindow *w,wxBoxSizer *sizer)
+	
+	//-----------------------------------------------------------------	
+	void LayoutLine::bbUserInitializeProcessing()
 	{
-		  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::bbUserFinalizeProcessing()
+	{
+	}	
+	
+	
+	void LayoutLine::Process()
+	{
+		PutWinTitle();
+ 	}
+  
+	
+/*
+  void LayoutLine::TryInsertWindow(wxWindow *parent, wxWindow *w,wxBoxSizer *sizer)
+  {
+    if (w!=NULL)
+      {
+	w->Reparent(parent);
+	sizer->Add(w, 1, wxEXPAND, 0);
+      }
+  }
+  */
+	
+  void LayoutLine::CreateWidget(wxWindow* parent)
+  {
+    wxBoxSizer *sizer;
+    wxPanel *w=new wxPanel(parent, //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);
+
+	  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);
+	  /*
+    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 );
+  }
+  
+  // This callback is necessary to get actual processing of the view 
+  // when window is shown
+  void  LayoutLine::OnShowWidget()
+  {
   }
 
 }//namespace bbwx