X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBlackBox.cxx;h=a9b4f0b6215b75dae564b8362599d31626395add;hb=85be7d05390ee84a66308c17c740565456ce15d2;hp=08c58c97554c34a08cd8bd92af7c73f8967a8026;hpb=c333db268f8b73bcf7fe7ff9eeed8394252f1c94;p=bbtk.git

diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index 08c58c9..a9b4f0b 100644
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -1,38 +1,42 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbtkWxBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/28 14:22:11 $
-  Version:   $Revision: 1.42 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.45 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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.
-* ------------------------------------------------------------------------ */                                                                         
 
 
 #ifdef _USE_WXWIDGETS_
 
-
-
 /**
  *  \file 
  *  \brief 
@@ -47,16 +51,8 @@
 //#include "bbtkData.h"
 //#include "bbtkFactory.h"
 
-
-
-
 namespace bbtk
 {
-
-
-
- 
-
   //=========================================================================
   // WxFrame
   //=========================================================================
@@ -81,7 +77,7 @@ namespace bbtk
   BEGIN_EVENT_TABLE(WxFrame, wxFrame)
   //  EVT_CLOSE(WxFrame::OnCloseWindow)
     END_EVENT_TABLE();
-     //==================================================================
+     //==========================================Window  ========================
   
      //==================================================================
   WxFrame::WxFrame(WxBlackBox::Pointer b,
@@ -103,13 +99,21 @@ namespace bbtk
 	     ),
     mBox(b)
   {   
+		std::cout<<"Creando Widget DELETE ME bbtkWxBlackBox.cxx--"<<std::endl;
+		std::cout<<"NAME :  "<<bbtk::wx2std(title);
+		if(parent)
+			std::cout<<"PARENT :   "<<bbtk::wx2std(parent->GetName())<<std::endl;
+		else
+			std::cout<<"        SIN PADRE "<<std::endl;
     bbtkDebugMessage("widget",9,"["<<b->bbGetName()<<"] WxFrame()"
 		     <<std::endl);
     Wx::IncNbWindowsAlive();
     b->bbSetWindow(this);
     // Insert the widget into the window
     wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+	std::cout<<"------------------------------------USER CREATE WIDGET pre DELETE ME bbtkWxBlackBox.cxx--"<<std::endl;
     b->bbUserCreateWidget(this);
+	std::cout<<"------------------------------------USER CREATE WIDGET post DELETE ME bbtkWxBlackBox.cxx--"<<std::endl;
     wxWindow* widget = b->bbGetOutputWidget();
     sizer->Add( widget, 1, wxALL|wxGROW, 2);
     SetSizer(sizer);
@@ -148,11 +152,7 @@ namespace bbtk
     }
    //==================================================================
 
-
-
-
-
-  //=========================================================================
+  //====================================================SetWin=====================
   // WxDialog
   //=========================================================================
 
@@ -177,7 +177,7 @@ namespace bbtk
   BEGIN_EVENT_TABLE(WxDialog, wxDialog)
     EVT_CLOSE(WxDialog::OnCloseWindow)
     END_EVENT_TABLE();
-  //==================================================================
+  //=========================================================================
 
   //=========================================================================
   WxDialog::WxDialog(WxBlackBox::Pointer b,
@@ -199,6 +199,7 @@ namespace bbtk
 	      ),
     mBox(b)
   {
+		
     bbtkDebugMessage("widget",9,"WxDialog::WxDialog ["<<b->bbGetName()<<"]"
 		     <<std::endl);
     Wx::IncNbWindowsAlive();
@@ -211,7 +212,7 @@ namespace bbtk
     SetSizer(sizer);
     Layout();
   }
-  //=========================================================================
+  //==================================================================
   //==================================================================
   WxDialog::~WxDialog() 
     { 
@@ -232,11 +233,6 @@ namespace bbtk
    //==================================================================
 
 
-
-
-
-
-
  //=========================================================================
   // WxBlackBox
   //=========================================================================
@@ -252,7 +248,7 @@ namespace bbtk
   void WxBlackBox::bbUserSetDefaultValues()
   {
     bbtkBlackBoxDebugMessage("widget",5,"WxBlackBox::bbUserSetDefaultValues()"<<std::endl);
-    bbmWindow = 0;
+    bbmWindow = 0;  
   }
   //=========================================================================
 
@@ -283,7 +279,7 @@ namespace bbtk
     w = new WxDialog( GetThisPointer<WxBlackBox>(),
 		      Wx::GetTopWindow(),
 		      std2wx( bbGetInputWinTitle()  
-			      + " - bbtk (c) CREATIS-LRMN"),
+			      + " - bbtk (c) CREATIS"),
 		      wxSize( bbGetInputWinWidth() , 
 			      bbGetInputWinHeight() ) );
     w->Show(false);
@@ -297,6 +293,7 @@ namespace bbtk
   /// Callback for creating a Frame window 
   void WxBlackBox::bbCreateFrameWindow()
   {
+    std::cout<<"--/////////////*****////////////////--JFGA Testing bbCreateFrameWindow Starting ....."<<bbGetInputWinTitle()<<"......!! D E L E T  M E !! bbtkWxBlackBox.cxx"<<std::endl;
     bbtkBlackBoxDebugMessage("widget",3,
 		     "==> WxBlackBox::bbCreateFrameWindow() - parent = "
 		     <<Wx::GetTopWindow()
@@ -305,11 +302,13 @@ namespace bbtk
     w = new WxFrame( GetThisPointer<WxBlackBox>(),
 		     Wx::GetTopWindow(),
 		     std2wx( bbGetInputWinTitle()  
-			     + " - bbtk (c) CREATIS-LRMN"),
+			     + " - bbtk (c) CREATIS"),
 		     wxSize( bbGetInputWinWidth() , 
 			     bbGetInputWinHeight() ) );
+    std::cout<<"--/////////////*****////////////////!!--JFGA Testing bbCreateFrameWindow Done ........"<<bbGetInputWinTitle()<<"......!! D E L E T  M E !! bbtkWxBlackBox.cxx"<<std::endl;
     w->Show();
    }
+
   //==================================================================    
 
   //==================================================================    
@@ -320,6 +319,8 @@ namespace bbtk
       { 
 	std::cout << "ERRRRRRRROOOOR"<<std::endl; 
       }
+		std::cout<<"SetWindow   DELETE ME bbtkWxBlackBox.cxx ------"<<std::endl;
+		std::cout<<"WINDOW     :  "<<bbtk::wx2std(w->GetName())<<std::endl;
     bbmWindow = w;
   }
   //==================================================================    
@@ -327,6 +328,7 @@ namespace bbtk
   //==================================================================    
   void WxBlackBox::bbShowWindow()
   {
+	 std::cout<<"--!!--JFGA Testing bbShowWindow PRE IF "<<bbGetInputWinTitle()<<"......!! D E L E T  M E !! bbtkWxBlackBox.cxx"<<std::endl;
     if ((bbmWindow) && (!bbIsShown()))
       {
 	bbtkBlackBoxDebugMessage("widget",3,"==> WxBlackBox::bbShowWindow()"
@@ -335,12 +337,13 @@ namespace bbtk
 	  {
 	    ((WxDialog*)bbmWindow)->ShowModal();
 	  }
-	else
+	else	
 	  {
+	    std::cout<<"--!!--JFGA Testing bbShowWindow "<<bbGetInputWinTitle()<<"......!! D E L E T  M E !! bbtkWxBlackBox.cxx"<<std::endl;
 	    bbGetWindow()->Show();
 	    bbSetShown(true);
 	  } 
-    }
+      }
   }
   //==================================================================    
 
@@ -364,10 +367,7 @@ namespace bbtk
   }
   //==================================================================    
 
-
-
 }//namespace bbtk
 
-
 #endif