From: guigues <guigues>
Date: Wed, 3 Dec 2008 09:38:02 +0000 (+0000)
Subject: No more transfered execution to parent for widget boxes (buggy...)
X-Git-Tag: v0.9.1~55
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0391cd0cbb90e513fdc877a6eed61534b28f70ff;p=bbtk.git

No more transfered execution to parent for widget boxes (buggy...)
---

diff --git a/kernel/src/bbtkKWBlackBox.cxx b/kernel/src/bbtkKWBlackBox.cxx
index 3df2005..99a0da4 100644
--- a/kernel/src/bbtkKWBlackBox.cxx
+++ b/kernel/src/bbtkKWBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkKWBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/02 13:37:54 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2008/12/03 09:38:02 $
+  Version:   $Revision: 1.5 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -174,7 +174,7 @@ namespace bbtk
     bbtkDebugMessageInc("process",2,
 			"=> KWBlackBox::bbExecute("<<(int)force<<") ["
 			<<bbGetFullName()<<"]"<<std::endl);
-
+    /*
     // If the output 'Widget' is connected then 
     // we must execute the parent box
     BlackBox::OutputConnectorMapType::const_iterator i 
@@ -190,10 +190,14 @@ namespace bbtk
 	  ->GetBlackBoxTo()->bbExecute(force);
 
       }
+    */
+    if (false)
+      {
+      }
     // else call 'standard' BlackBox execution method
     else 
       {
-	BlackBox::bbExecute(force);
+	AtomicBlackBox::bbExecute(force);
       }
     //
 
@@ -208,6 +212,7 @@ namespace bbtk
   /// Main processing method of the box.
   IOStatus KWBlackBox::bbBackwardUpdate( Connection::Pointer caller )
   {
+    /*
     bbtkDebugMessage("process",3,
 		     "=> KWBlackBox::bbBackwardUpdate("
 		     <<(caller?caller->GetFullName():"0")<<") ["
@@ -223,10 +228,10 @@ namespace bbtk
 			 <<bbGetFullName()<<"]"<<std::endl);
 	return bbGetStatus();
       }
- 
+    */
     // If the caller's box to is not the box to connected to the 
     // output 'Widget'
-
+    /*
     BlackBox::OutputConnectorMapType::const_iterator i 
       = bbGetOutputConnectorMap().find("Widget") ;
     if ( i->second->GetConnectionVector().size() != 0 )
@@ -274,7 +279,9 @@ namespace bbtk
 			     "   ... No need to transfer to parent"
 			     <<std::endl);
 	  }
-      }
+      
+	  }
+    */
     /*    
 
     // If the caller is not the connection to the output widget
@@ -289,15 +296,15 @@ namespace bbtk
       }
     */
     // call 'standard' BlackBox execution method
-    if (!bbGetUpdateTransferedToParent()) 
+    //if (!bbGetUpdateTransferedToParent()) 
       { 
-	  AtomicBlackBox::bbBackwardUpdate(caller);
+	  return AtomicBlackBox::bbBackwardUpdate(caller);
       }
-    
+      /*
     bbtkDebugMessageDec("process",3,
 			"<= KWBlackBox::bbBackwardUpdate() ["
 			<<bbGetFullName()<<"]"<<std::endl);
-    
+      */
    return bbGetStatus();
      
 
diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index 01ee471..e99469c 100644
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/25 11:17:13 $
-  Version:   $Revision: 1.31 $
+  Date:      $Date: 2008/12/03 09:38:02 $
+  Version:   $Revision: 1.32 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -422,10 +422,12 @@ namespace bbtk
   /// Main processing method of the box.
   void WxBlackBox::bbExecute(bool force)
   {
+    /*
     bbtkDebugMessageInc("process",2,
 			"=> WxBlackBox::bbExecute("<<(int)force<<") ["
 			<<bbGetFullName()<<"]"<<std::endl);
-
+    */
+    /*
     // If the output 'Widget' is connected then 
     // we must execute the parent box
     BlackBox::OutputConnectorMapType::const_iterator i 
@@ -441,16 +443,24 @@ namespace bbtk
 	  ->GetBlackBoxTo()->bbExecute(force);
 
       }
+    */
+    /*
+    if (false)
+      {
+      }
     // else call 'standard' BlackBox execution method
     else 
       {
-	BlackBox::bbExecute(force);
+    */
+	return AtomicBlackBox::bbExecute(force);
+	/*
       }
     //
 
     bbtkDebugMessageDec("process",2,
 			"<= WxBlackBox::bbExecute() ["
 			<<bbGetFullName()<<"]"<<std::endl);
+	*/
   }
   //=========================================================================
 
@@ -477,7 +487,7 @@ namespace bbtk
  
     // If the caller's box to is not the box to connected to the 
     // output 'Widget'
-
+    /*
     BlackBox::OutputConnectorMapType::const_iterator i 
       = bbGetOutputConnectorMap().find("Widget") ;
     if ( i->second->GetConnectionVector().size() != 0 )
@@ -526,6 +536,7 @@ namespace bbtk
 			     <<std::endl);
 	  }
       }
+    */
     /*    
 
     // If the caller is not the connection to the output widget