X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkQtBlackBoxDialog.cxx;h=d43192ddfa6a8bf7629a203e5638d9d9833255c4;hb=afd25e07d15ac97d576d94d01927d092e7f990f5;hp=36b7834f80fd110212adfcd6a9c45d7fadab89f0;hpb=28479cf7460f053625842de2e8df98b2e3363ede;p=bbtk.git

diff --git a/kernel/src/bbtkQtBlackBoxDialog.cxx b/kernel/src/bbtkQtBlackBoxDialog.cxx
index 36b7834..d43192d 100644
--- a/kernel/src/bbtkQtBlackBoxDialog.cxx
+++ b/kernel/src/bbtkQtBlackBoxDialog.cxx
@@ -1,3 +1,40 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbtkQtBlackBoxDialog.cxx,v $
+  Language:  C++
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.5 $
+=========================================================================*/
+
+
+
 #ifdef USE_QT
 
 #include "bbtkQtBlackBoxDialog.h"
@@ -14,18 +51,21 @@ namespace bbtk
 				     int width, int height)
 
     :
-    QtBlackBoxDialogParent(box,parent)
+    QDialog(parent),
+    mBox(box)
 				    //    QDialog( parent )
   {
-    bbtkDebugMessage("qt",9,"QtBlackBoxDialog::QtBlackBoxDialog("<<
-		     bbGetBlackBox()->bbGetFullName()<<","<<parent<<","
-		     <<title<<","<<width<<"x"<<height<<")"<<std::endl);
+    bbtkDebugMessage("widget",9,"["<<
+		     box->bbGetName()<<"] QtBlackBoxDialog("<<parent<<",\""
+		     <<title<<"\","<<width<<"x"<<height<<")"<<std::endl);
+    Qt::IncNbWindowsAlive();
     // Sets up the GUI inherited from Ui::bbtkQtblackBoxDialog
     setupUi(this);
     resize ( width  , height );
     setWindowTitle(title.c_str());
     
- 
+    ///
+    box->bbSetWindow(this);
    // Create the widget
     box->bbUserCreateWidget(widget);
 
@@ -38,44 +78,19 @@ namespace bbtk
   }
   //=========================================================================
   
-  //=========================================================================
-  void QtBlackBoxDialog::bbShow()
-  { 
-    if (bbIsShown()) return;
-    bbtkDebugMessage("qt",5,"QtBlackBoxDialog::bbShow() ["
-		     <<bbGetBlackBox()->bbGetFullName()<<"]"<<std::endl);
-    Parent::bbShow();
-    updateGeometry();
-    exec();
-    //    Show(false);
-    //SetReturnCode( wxDialog::ShowModal() ); 
-    bbDestroy();
-  }
-  //=========================================================================
-
-  //=========================================================================
-  void QtBlackBoxDialog::bbHide()
-  {
-    bbtkDebugMessage("qt",9,"QtBlackBoxDialog::bbHide()"<<std::endl);
-    Parent::bbHide();
-    
-    //Hide();
-  }
-  //=========================================================================
-
-  //=========================================================================
-  void QtBlackBoxDialog::bbDestroy()
-  {
-    bbtkDebugMessage("qt",9,"QtBlackBoxDialog::bbDestroy()"<<std::endl);
-    Parent::bbDestroy();
-    //wxDialog::Destroy();
-    
-  }
-  //=========================================================================
-
+ 
   //=========================================================================
   QtBlackBoxDialog::~QtBlackBoxDialog()
   {
+    if (mBox.lock())
+      bbtkDebugMessage("widget",9,"["<<mBox.lock()->bbGetName()
+		       <<"] $$$$$$$$$$$$$$$$$$$ ~QtBlackBoxDialog()"
+		       <<std::endl);
+    else 
+      bbtkDebugMessage("widget",9,"[DEAD] $$$$$$$$$$$$$$$$$$$$$ ~QtBlackBoxDialog()"<<std::endl);
+    //bbtkDebugMessage("widget",9,"WxFrame::~WxFrame()"<<std::endl);
+    if (mBox.lock()) mBox.lock()->bbSetWindow(0); 
+    Qt::DecNbWindowsAlive();
   }
   //=========================================================================