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

diff --git a/packages/wx/src/bbwxLayoutLine.cxx b/packages/wx/src/bbwxLayoutLine.cxx
index 3d15b3f..888bc39 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: 2008/10/17 08:18:32 $
-  Version:   $Revision: 1.5 $
+  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
@@ -47,24 +52,39 @@ namespace bbwx
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx, LayoutLine);
   BBTK_BLACK_BOX_IMPLEMENTATION(LayoutLine,bbtk::WxBlackBox);
   
-  void LayoutLine::bbUserConstructor()
-  {
-    bbSetInputOrientation("VERTICAL");
-    bbSetInputWidget1(NULL);
-    bbSetInputWidget2(NULL);
-    bbSetInputWidget3(NULL);
-    bbSetInputWidget4(NULL);
-    bbSetInputWidget5(NULL);
-    bbSetInputWidget6(NULL);
-    bbSetInputWidget7(NULL);
-    bbSetInputWidget8(NULL);
-    bbSetInputWidget9(NULL);
-  }
-  
-  void LayoutLine::Process()
-  {
-  }
+	//-----------------------------------------------------------------	
+	void LayoutLine::bbUserSetDefaultValues()
+	{
+		bbSetInputOrientation("VERTICAL");
+		bbSetInputWidget1(NULL);
+		bbSetInputWidget2(NULL);
+		bbSetInputWidget3(NULL);
+		bbSetInputWidget4(NULL);
+		bbSetInputWidget5(NULL);
+		bbSetInputWidget6(NULL);
+		bbSetInputWidget7(NULL);
+		bbSetInputWidget8(NULL);
+		bbSetInputWidget9(NULL);
+	}
+	
+	//-----------------------------------------------------------------	
+	void LayoutLine::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void LayoutLine::bbUserFinalizeProcessing()
+	{
+	}	
+	
+	
+	void LayoutLine::Process()
+	{
+		PutWinTitle();
+ 	}
   
+	
+/*
   void LayoutLine::TryInsertWindow(wxWindow *parent, wxWindow *w,wxBoxSizer *sizer)
   {
     if (w!=NULL)
@@ -73,11 +93,13 @@ namespace bbwx
 	sizer->Add(w, 1, wxEXPAND, 0);
       }
   }
-  
-  void LayoutLine::CreateWidget()
+  */
+	
+  void LayoutLine::CreateWidget(wxWindow* parent)
   {
     wxBoxSizer *sizer;
-    wxPanel *w=new wxPanel(bbGetWxParent(), -1);
+    wxPanel *w=new wxPanel(parent, //bbGetWxParent(),
+						   -1);
     w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
     
     int style=0;
@@ -89,7 +111,18 @@ namespace bbwx
       { 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);
@@ -99,24 +132,15 @@ namespace bbwx
     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::bbUserOnShow()
+  void  LayoutLine::OnShowWidget()
   {
-	  bbUserOnShowWidget("Widget1");
-	  bbUserOnShowWidget("Widget2");
-	  bbUserOnShowWidget("Widget3");
-	  bbUserOnShowWidget("Widget4");
-	  bbUserOnShowWidget("Widget5");
-	  bbUserOnShowWidget("Widget6");
-	  bbUserOnShowWidget("Widget7");
-	  bbUserOnShowWidget("Widget8");
-	  bbUserOnShowWidget("Widget9");
   }
 
 }//namespace bbwx