X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxLayoutLine.cxx;h=8b40107c218f7ce0d5c40379fee53d160139f486;hb=a33ac70f8c32efdcef70b39a444117e1901086ca;hp=d2289d730e1401a519c5d79a4c621030ea73cbf7;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git

diff --git a/packages/wx/src/bbwxLayoutLine.cxx b/packages/wx/src/bbwxLayoutLine.cxx
index d2289d7..8b40107 100644
--- a/packages/wx/src/bbwxLayoutLine.cxx
+++ b/packages/wx/src/bbwxLayoutLine.cxx
@@ -1,20 +1,34 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutLine.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:52 $
-  Version:   $Revision: 1.3 $
-                                                                                
-  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: 2009/05/28 08:12:17 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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
@@ -33,24 +47,38 @@ 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::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()
   {
   }
   
+	
+/*
   void LayoutLine::TryInsertWindow(wxWindow *parent, wxWindow *w,wxBoxSizer *sizer)
   {
     if (w!=NULL)
@@ -59,11 +87,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;
@@ -75,7 +105,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);
@@ -85,11 +126,17 @@ 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::OnShowWidget()
+  {
+  }
+
 }//namespace bbwx
 
 #endif // _USE_WXWIDGETS_