X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBlackBox.cxx;h=22f0a6baf910f7859f156803d2afe8857cc7c934;hb=afd25e07d15ac97d576d94d01927d092e7f990f5;hp=a7d7442eafd1f128b4a83212e4d1830a1a029970;hpb=ca35bb0588533c9eac29b7d3ef8689c97ccfcfe7;p=bbtk.git

diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index a7d7442..22f0a6b 100644
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -1,32 +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: bbtkWxBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/01/14 13:17:27 $
-  Version:   $Revision: 1.43 $
+  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_
 
@@ -70,7 +77,7 @@ namespace bbtk
   BEGIN_EVENT_TABLE(WxFrame, wxFrame)
   //  EVT_CLOSE(WxFrame::OnCloseWindow)
     END_EVENT_TABLE();
-     //==================================================================
+     //==========================================Window  ========================
   
      //==================================================================
   WxFrame::WxFrame(WxBlackBox::Pointer b,
@@ -137,7 +144,7 @@ namespace bbtk
     }
    //==================================================================
 
-  //=========================================================================
+  //====================================================SetWin=====================
   // WxDialog
   //=========================================================================
 
@@ -184,6 +191,7 @@ namespace bbtk
 	      ),
     mBox(b)
   {
+		
     bbtkDebugMessage("widget",9,"WxDialog::WxDialog ["<<b->bbGetName()<<"]"
 		     <<std::endl);
     Wx::IncNbWindowsAlive();
@@ -232,7 +240,7 @@ namespace bbtk
   void WxBlackBox::bbUserSetDefaultValues()
   {
     bbtkBlackBoxDebugMessage("widget",5,"WxBlackBox::bbUserSetDefaultValues()"<<std::endl);
-    bbmWindow = 0;
+    bbmWindow = 0;  
   }
   //=========================================================================
 
@@ -263,7 +271,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);
@@ -285,10 +293,12 @@ namespace bbtk
     w = new WxFrame( GetThisPointer<WxBlackBox>(),
 		     Wx::GetTopWindow(),
 		     std2wx( bbGetInputWinTitle()  
-			     + " - bbtk (c) CREATIS-LRMN"),
+			     + " - bbtk (c) CREATIS"),
 		     wxSize( bbGetInputWinWidth() , 
 			     bbGetInputWinHeight() ) );
     w->Show();
+
+
    }
 
   //==================================================================    
@@ -298,9 +308,9 @@ namespace bbtk
   {
     bbtkBlackBoxDebugMessage("widget",9,"==> WxBlackBox::bbSetWindow("<<w<<")"<<std::endl);
     if ((bbmWindow != 0)&&(w!=0)) 
-      { 
-	std::cout << "ERRRRRRRROOOOR"<<std::endl; 
-      }
+	{ 
+		std::cout << "WxBlackBox::bbSetWindow   ?? EED ?? ERRRRRRRROOOOR"<<std::endl; 
+	}
     bbmWindow = w;
   }
   //==================================================================    
@@ -316,12 +326,14 @@ namespace bbtk
 	  {
 	    ((WxDialog*)bbmWindow)->ShowModal();
 	  }
-	else
+	else	
 	  {
 	    bbGetWindow()->Show();
 	    bbSetShown(true);
 	  } 
-      }
+      } // if
+
+
   }
   //==================================================================