X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkKW.cxx;h=fb2a4eb43de4ce16dcc0f88e272ff981775e1805;hb=cd39bfaca5c64598de7046df6989f244fc6e32cd;hp=f4eb6fcd5d31276d505753d9d92bb2fe3446fb7b;hpb=26a8c332dda10ace9e3e088b2ca8544d188c9743;p=bbtk.git

diff --git a/kernel/src/bbtkKW.cxx b/kernel/src/bbtkKW.cxx
index f4eb6fc..fb2a4eb 100644
--- a/kernel/src/bbtkKW.cxx
+++ b/kernel/src/bbtkKW.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: bbtkKW.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/29 21:41:32 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.4 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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_KWWIDGETS
 
@@ -36,9 +43,12 @@
 
 
 //#include "vtkConditionVariable.h"
-#include "vtkMultiThreader.h"
+//#include "vtkMultiThreader.h"
 
 #include <ctime>
+
+extern "C" int Bbtk_Init(Tcl_Interp *interp);
+
 namespace bbtk
 {
 
@@ -50,7 +60,8 @@ namespace bbtk
 
   //=========================================================================
   static vtkKWApplication* mgKWApp = 0;
-  static vtkMultiThreader* mgMultiThreader = 0;  /*
+  //static vtkMultiThreader* mgMultiThreader = 0;  
+  /*
   static vtkKWWindowBase* mgKWTopWindow = 0;
   static vtkKWWindowBase* mgKWTopWindowParent = 0;
   static bool mgKWAutoDestroyTopWindow = true;
@@ -113,6 +124,9 @@ namespace bbtk
 	mgKWApp = vtkKWApplication::New();
 	mgKWApp->SetName("bbtk");
 
+	Bbtk_Init(interp);
+
+
 	/*
 	if (mgMultiThreader == 0)
 	  {
@@ -126,7 +140,7 @@ namespace bbtk
 	*/
 
 	// Dies as soon as it starts because no window at this point !!!
-	mgKWApp->Start();
+	//	mgKWApp->Start();
 
 	/*
 	clock_t endwait;