X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBlackBox.cxx;h=6a26356ce46850b9e14a029e2e6089ed165bc339;hb=4d3619bf05342807aec39f571d94e4aea2efa38b;hp=1983cb36492145a13a5ac1f87b599f3d4339c65a;hpb=8c690fedb5ea897b6a69584e1e237cb5dbad97a5;p=bbtk.git

diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index 1983cb3..6a26356 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 08:12:06 $
-  Version:   $Revision: 1.41 $
+  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,
@@ -148,11 +144,7 @@ namespace bbtk
     }
    //==================================================================
 
-
-
-
-
-  //=========================================================================
+  //====================================================SetWin=====================
   // WxDialog
   //=========================================================================
 
@@ -177,7 +169,7 @@ namespace bbtk
   BEGIN_EVENT_TABLE(WxDialog, wxDialog)
     EVT_CLOSE(WxDialog::OnCloseWindow)
     END_EVENT_TABLE();
-  //==================================================================
+  //=========================================================================
 
   //=========================================================================
   WxDialog::WxDialog(WxBlackBox::Pointer b,
@@ -199,6 +191,7 @@ namespace bbtk
 	      ),
     mBox(b)
   {
+		
     bbtkDebugMessage("widget",9,"WxDialog::WxDialog ["<<b->bbGetName()<<"]"
 		     <<std::endl);
     Wx::IncNbWindowsAlive();
@@ -211,7 +204,7 @@ namespace bbtk
     SetSizer(sizer);
     Layout();
   }
-  //=========================================================================
+  //==================================================================
   //==================================================================
   WxDialog::~WxDialog() 
     { 
@@ -232,11 +225,6 @@ namespace bbtk
    //==================================================================
 
 
-
-
-
-
-
  //=========================================================================
   // WxBlackBox
   //=========================================================================
@@ -252,8 +240,7 @@ namespace bbtk
   void WxBlackBox::bbUserSetDefaultValues()
   {
     bbtkBlackBoxDebugMessage("widget",5,"WxBlackBox::bbUserSetDefaultValues()"<<std::endl);
-    //    bbSetWidgetEventHandler(0);
-    bbmWindow = 0;
+    bbmWindow = 0;  
   }
   //=========================================================================
 
@@ -283,8 +270,8 @@ namespace bbtk
     WxDialog* w = 0;  
     w = new WxDialog( GetThisPointer<WxBlackBox>(),
 		      Wx::GetTopWindow(),
-		      std2wx( bbGetInputWinTitle()  
-			      + " - bbtk (c) CREATIS-LRMN"),
+//		      std2wx( bbGetInputWinTitle() + " - bbtk (c) CREATIS"),
+		      std2wx( ConstructWinTitle() ),
 		      wxSize( bbGetInputWinWidth() , 
 			      bbGetInputWinHeight() ) );
     w->Show(false);
@@ -305,12 +292,15 @@ namespace bbtk
     WxFrame* w = 0;  
     w = new WxFrame( GetThisPointer<WxBlackBox>(),
 		     Wx::GetTopWindow(),
-		     std2wx( bbGetInputWinTitle()  
-			     + " - bbtk (c) CREATIS-LRMN"),
+//		     std2wx( bbGetInputWinTitle() + " - bbtk (c) CREATIS"),
+		     std2wx( ConstructWinTitle() ),
 		     wxSize( bbGetInputWinWidth() , 
 			     bbGetInputWinHeight() ) );
     w->Show();
+
+
    }
+
   //==================================================================    
 
   //==================================================================    
@@ -318,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;
   }
   //==================================================================    
@@ -336,12 +326,14 @@ namespace bbtk
 	  {
 	    ((WxDialog*)bbmWindow)->ShowModal();
 	  }
-	else
+	else	
 	  {
 	    bbGetWindow()->Show();
 	    bbSetShown(true);
 	  } 
-    }
+      } // if
+
+
   }
   //==================================================================    
 
@@ -364,11 +356,29 @@ namespace bbtk
 
   }
   //==================================================================    
+  
+  //==================================================================    
+  void WxBlackBox::PutWinTitle()
+  {
+	if ( ! bbIsOutputWidgetConnected() )
+    {
+		wxTopLevelWindow* wParent = (wxTopLevelWindow*)( bbGetOutputWidget()->GetParent() );
+		wParent->SetTitle( std2wx( ConstructWinTitle() ) );
+	} // if
+  }
+  //==================================================================    
+
+  //==================================================================    
+  std::string WxBlackBox::ConstructWinTitle()
+  {
+	std::string title( bbGetInputWinTitle() + " - bbtk (c) CREATIS");
+	return title;
+  }
+  //==================================================================    
 
 
 
 }//namespace bbtk
 
-
 #endif