X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkWidgetBlackBox.txx;h=3da66eb0a4facfd0325cfbe8608dc2ed46178bb4;hb=1688b52778caa9985ecea38aad38341817e0401a;hp=1abdaad92f81ad694410b80c9fc9ccd974c94137;hpb=b8fe96fbebd153e92de1f1bfcad48ad009365df5;p=bbtk.git

diff --git a/kernel/src/bbtkWidgetBlackBox.txx b/kernel/src/bbtkWidgetBlackBox.txx
index 1abdaad..3da66eb 100644
--- a/kernel/src/bbtkWidgetBlackBox.txx
+++ b/kernel/src/bbtkWidgetBlackBox.txx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWidgetBlackBox.txx,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 14:43:34 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2010/01/14 13:17:27 $
+  Version:   $Revision: 1.6 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -27,6 +27,7 @@
 *  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.
 * ------------------------------------------------------------------------ */                                                                         
+
 /**
  *  \file 
  *  \brief 
@@ -34,7 +35,7 @@
 
 
  
-#include "bbtkWidgetBlackBoxWindow.h"
+//#include "bbtkWidgetBlackBoxWindow.h"
 #include "bbtkBlackBoxOutputConnector.h"
 
 
@@ -56,8 +57,8 @@ namespace bbtk
   template <class T>  
   void WidgetBlackBox<T>::bbUserSetDefaultValues()
   {
-    bbtkDebugMessage("widget",9,"WidgetBlackBox::bbUserSetDefaultValues()"<<std::endl);
-    bbmWindow = 0;
+    bbtkBlackBoxDebugMessage("widget",9,"WidgetBlackBox::bbUserSetDefaultValues()"<<std::endl);
+    //    bbmWindow = 0;
     bbSetInputWinTitle(bbGetName());
     bbSetInputWinWidth(800);
     bbSetInputWinHeight(800);
@@ -71,6 +72,7 @@ namespace bbtk
   template <class T>  
   void WidgetBlackBox<T>::bbUserInitializeProcessing()
   {
+    bbmShown = false;
   }
   //=========================================================================
 
@@ -78,12 +80,25 @@ namespace bbtk
   template <class T>  
   void WidgetBlackBox<T>::bbUserFinalizeProcessing()
   {
-    bbtkDebugMessage("widget",9,"==> WidgetBlackBox::bbUserFinalizeProcessing() ["<<bbGetFullName()<<"]"<<std::endl);
-    if (bbGetWindow()) {
-      bbGetWindow()->bbClose();
-      bbSetWindow(0);
-    }
-    bbtkDebugMessage("widget",9,"<== WidgetBlackBox::bbUserFinalizeProcessing() ["<<bbGetFullName()<<"]"<<std::endl);
+    /*
+    std::cout << "****** WidgetBlackBox<T>::bbUserFinalizeProcessing()"<<std::endl;
+    bbtkBlackBoxDebugMessage("widget",9,"==> WidgetBlackBox::bbUserFinalizeProcessing() ["<<bbGetFullName()<<"]"<<std::endl);
+    if (bbGetWindow()) 
+      {
+	bool shown = bbGetWindow()->bbIsShown();
+	bbGetWindow()->bbDestroy();
+	bbSetWindow(0);
+	
+	if (GetUseCount()==0)
+	  {    
+	    bbtkBlackBoxDebugMessage("widget",9,"**** HERE use count == 0"<<std::endl);
+	    if (shown) DecNbWindowsShown();
+	    DecNbWindowsAlive();
+	  }
+
+      }
+    bbtkBlackBoxDebugMessage("widget",9,"<== WidgetBlackBox::bbUserFinalizeProcessing() ["<<bbGetFullName()<<"]"<<std::endl);
+    */
   }
   //=========================================================================
   
@@ -111,16 +126,20 @@ namespace bbtk
     if ( ! bbIsOutputWidgetConnected() )
       {
 	// create the Window if does not exist
-	if ( bbGetWindow() == 0)
+	if (!bbWindowIsCreated())
 	  {
-	    bbtkDebugMessage("widget",2,
+	    bbtkBlackBoxDebugMessage("widget",2,
 			     "-> Creating the window"
 			     <<std::endl);
+	    // Reinitializing
+	    bbSetShown(false);
+	    bbmNestedWidgetBoxes.clear();
+	    
 	    //	    this->InitWindowManagerIfNeeded();
 	    // If is a Dialog requested
 	    if ( bbGetInputWinDialog() )
 	      {
-		bbtkDebugMessage("process",2,
+		bbtkBlackBoxDebugMessage("widget",2,
 				 "   Input WinDialog set to true : creating a Dialog"
 				 <<std::endl);
 		this->bbCreateDialogWindow();
@@ -128,22 +147,28 @@ namespace bbtk
 	    // Input WinDialog set to false : creating a Frame
 	    else 
 	      {
-		bbtkDebugMessage("process",2,
+		bbtkBlackBoxDebugMessage("widget",2,
 				 "   Input WinDialog set to false : creating a Frame"
 				 <<std::endl);
 		this->bbCreateFrameWindow();
 	      }
 	  }
+	/*
 	// Show the window
 	if ( !bbGetWindow() )
 	  {
 	    bbtkInternalError("Need to show the Window of widget "<<bbGetName()
 			      <<" however was not created by apropriate cb");
 	  }
-	bbtkDebugMessage("widget",2,
+	*/
+
+	/*
+	bbtkBlackBoxDebugMessage("widget",2,
 			 "-> Showing the window"
 			 <<std::endl);
-	bbGetWindow()->bbShow(); 
+	//	bbGetWindow()->bbShow(); 
+	this->bbShowWindow();
+	*/
       }		  
     //   
   }
@@ -156,6 +181,9 @@ namespace bbtk
   WidgetBlackBox<T>::bbCreateWidgetOfInput
   (const std::string& in, typename WidgetBlackBox<T>::WidgetPointer parent)
   {
+    bbtkBlackBoxDebugMessage("widget",2,"bbCreateWidgetOfInput("
+			     <<in<<","<<parent<<")"
+			     <<std::endl);
     Widget* w = 0;
     // If input is connected 
     BlackBoxInputConnector* c = bbGetInputConnectorMap().find(in)->second ;
@@ -174,6 +202,8 @@ namespace bbtk
 	wfrom->bbUserCreateWidget(parent);
 	// Get the widget created
 	w = wfrom->bbGetOutputWidget();
+	// Insert the box into the NestedWidgetBoxes list
+	bbmNestedWidgetBoxes.push_back(from);
       }
     return w;
   }
@@ -187,16 +217,52 @@ namespace bbtk
   }
   //==================================================================
 
+  //==================================================================
+  template <class T>  
+  void WidgetBlackBox<T>::bbSetShown(bool b)
+  {
+    if (b==bbmShown) return;
+
+    bbtkBlackBoxDebugMessage("widget",5,"WidgetBlackBox::bbSetShown("
+			     <<b<<")"
+			     <<std::endl);
+    
+    bbmShown = b;
+    if (b)
+      {
+	this->bbUserOnShow();
+     }
+    // Have to propagate to nested widgets
+    std::vector<BlackBox::WeakPointer>::const_iterator i;
+    for (i =bbmNestedWidgetBoxes.begin();
+	 i!=bbmNestedWidgetBoxes.end();
+	 ++i)
+      {
+	if (!i->expired()) i->lock()->bbSetShown(b);
+      }
+	 
+  }
+  //==================================================================
+
+  //==================================================================
+   template <class T>  
+   bool WidgetBlackBox<T>::bbIsShown()
+  {
+    return bbmShown;
+  }
+  //==================================================================
+ 
+  /*
  //==================================================================
   template <class T>  
    void WidgetBlackBox<T>::bbShowWindow()
   {
-    bbtkDebugMessageInc("widget",1,"=> WidgetBlackBox::bbShowWindow() ["
+    bbtkBlackBoxDebugMessage("widget",1,"=> WidgetBlackBox::bbShowWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
 
     if (bbGetWindow()!=0) bbGetWindow()->bbShow();
 
-    bbtkDebugMessageDec("widget",2,"<= WidgetBlackBox::bbShowWindow() ["
+    bbtkBlackBoxDebugMessage("widget",1,"<= WidgetBlackBox::bbShowWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
   }
   //==================================================================
@@ -205,12 +271,12 @@ namespace bbtk
   template <class T>  
    void WidgetBlackBox<T>::bbHideWindow()
   {
-    bbtkDebugMessageInc("widget",1,"=> WidgetBlackBox::bbHideWindow() ["
+    bbtkBlackBoxDebugMessage("widget",1,"=> WidgetBlackBox::bbHideWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
 
     if (bbGetWindow()!=0) bbGetWindow()->bbHide();
 
-    bbtkDebugMessageDec("widget",2,"<= WidgetBlackBox::bbHideWindow() ["
+    bbtkBlackBoxDebugMessage("widget",1,"<= WidgetBlackBox::bbHideWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
   }
   //==================================================================
@@ -220,12 +286,12 @@ namespace bbtk
   template <class T>  
   void WidgetBlackBox<T>::bbCloseWindow()
   {
-    bbtkDebugMessageInc("widget",1,"=> WidgetBlackBox::bbCloseWindow() ["
+    bbtkBlackBoxDebugMessage("widget",1,"=> WidgetBlackBox::bbCloseWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
 
-    if (bbGetWindow()!=0) bbGetWindow()->bbClose();
+    if (bbGetWindow()!=0) bbGetWindow()->bbDestroy();
 
-    bbtkDebugMessageDec("widget",2,"<= WidgetBlackBox::bbCloseWindow() ["
+    bbtkBlackBoxDebugMessage("widget",1,"<= WidgetBlackBox::bbCloseWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
   }
   //==================================================================
@@ -258,7 +324,7 @@ namespace bbtk
     return false;
   }
   //==================================================================
-
+  */
 
 }//namespace bbtk