X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBlackBox.h;h=095553d59b3023405e39e47016feb01dd4b704d7;hb=9e2b6d4716a5d12f39d8dde0a2d719fe961bdd2c;hp=700fa3e044a32849732f2995e398f759f1a3c0c0;hpb=141959873bfc3610f427de9a7690458a8b18bd2a;p=bbtk.git

diff --git a/kernel/src/bbtkWxBlackBox.h b/kernel/src/bbtkWxBlackBox.h
index 700fa3e..095553d 100644
--- a/kernel/src/bbtkWxBlackBox.h
+++ b/kernel/src/bbtkWxBlackBox.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.h,v $
   Language:  C++
-  Date:      $Date: 2008/03/10 12:28:43 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2008/07/24 14:37:06 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -61,17 +61,22 @@ namespace bbtk
   //==================================================================
   /// Widget black boxes
   class BBTK_EXPORT WxBlackBox : public bbtk::AtomicBlackBox  
-  {
-    BBTK_USER_BLACK_BOX_INTERFACE(WxBlackBox,bbtk::AtomicBlackBox);
+  { 
+    BBTK_BLACK_BOX_INTERFACE(WxBlackBox,bbtk::AtomicBlackBox);
     //   BBTK_DECLARE_INPUT(WinParent,WxParentToChildData*);
     BBTK_DECLARE_INPUT(WinTitle,std::string);
     BBTK_DECLARE_INPUT(WinWidth,int);
     BBTK_DECLARE_INPUT(WinHeight,int);
     BBTK_DECLARE_INPUT(WinDialog,bool);
     BBTK_DECLARE_INPUT(WinHide,Void);
+    BBTK_DECLARE_INPUT(WinClose,Void);
     BBTK_DECLARE_OUTPUT(Widget, wxWindow*);//WxBlackBoxWidget*);
 
   public:
+    /// Main processing method of the box. Overloaded to handle windows inclusion : if the output Widget is connected then the execution is transfered to the box to which it is connected (as the container window must be created and displayed - this box will be executed by the normal pipeline recursion mechanism)
+    virtual void bbExecute(bool force = false);
+
+
     typedef WxBlackBoxWindow Window;
     
     /// Returns the **OWN** window associated to the box
@@ -129,8 +134,10 @@ namespace bbtk
 
     
 
-
-
+    //==================================================================
+    /// Main processing method of the box.
+    virtual IOStatus bbBackwardUpdate( Connection::Pointer caller );
+    //==================================================================
 
 
 
@@ -152,6 +159,8 @@ namespace bbtk
     void bbShowWindow();
     /// Hides the WxBlackBoxWindow associated to the box (if exists)
     void bbHideWindow();
+    /// Closes (destroys) the WxBlackBoxWindow associated to the box (if exists)
+    void bbCloseWindow();
     //==================================================================
 
   private:
@@ -179,8 +188,17 @@ namespace bbtk
     void bbInitAttributes();
 
   protected :
-    /// Main processing method of the box. Overloaded to handle windows inclusion : if the output Widget is connected then the execution is transfered to the box to which it is connected (the container window must be created and displayed - this box will be also executed by the normal pipeline recursion mechanism)
-    virtual void bbExecute(bool force = false);
+
+
+    /// For Forward update mechanism when execution is called 
+    /// on a contained window
+    /// Is set to true before transfering update to parent 
+    /// in order to not re-transfer a second time...
+    bool bbmUpdateTransferedToParent;
+
+    bool bbGetUpdateTransferedToParent() const { return bbmUpdateTransferedToParent; }
+    void bbSetUpdateTransferedToParent(bool b) 
+    { bbmUpdateTransferedToParent = b; }
 
   };
   //=================================================================
@@ -192,10 +210,10 @@ namespace bbtk
   public:								\
   inline void bbUserCreateWidget()					\
   {									\
-    bbtkDebugMessageInc("Process",1,"=> "<<bbGetTypeName()<<"::bbUserCreateWidget() [" \
+    bbtkDebugMessageInc("process",1,"**> Creating widget for ["		\
 			<<bbGetFullName()<<"]"<<std::endl);		\
     CALLBACK();								\
-    bbtkDebugMessageDec("Process",1,"<= "<<bbGetTypeName()<<"::bbUserCreateWidget() [" \
+    bbtkDebugMessageInc("process",2,"<** Creating widget for ["		\
 			<<bbGetFullName()<<"]"<<std::endl);		\
   }
   
@@ -209,16 +227,18 @@ namespace bbtk
   BBTK_CATEGORY("widget");
   BBTK_INPUT(WxBlackBox,WinTitle,
 	     "Title of the window (*)",
-	     std::string);
+	     std::string,"");
   BBTK_INPUT(WxBlackBox,WinWidth,
-	     "Width of the window (* : only used if the widget is not inserted in another widget)",int);
+	     "Width of the window (* : only used if the widget is not connected to a Layout box)",int,"");
   BBTK_INPUT(WxBlackBox,WinHeight,
-	     "Height of the window (*)",int);
+	     "Height of the window (*)",int,"");
   BBTK_INPUT(WxBlackBox,WinDialog,
-	     "Set to 'true' to create a dialog window, i.e. which blocks the pipeline until it is closed (modal) (*)",bool);
+	     "Set to 'true' to create a dialog window, i.e. which blocks the pipeline until it is closed (modal) (*)",bool,"");
   BBTK_INPUT(WxBlackBox,WinHide,
-	     "Any signal received hides the window (*)",Void);
-  BBTK_OUTPUT(WxBlackBox,Widget,"Output widget",wxWindow*);
+	     "Any signal received hides the window (*)",Void,"signal");
+  BBTK_INPUT(WxBlackBox,WinClose,
+	     "Any signal received closes the window (*)",Void,"signal");
+  BBTK_OUTPUT(WxBlackBox,Widget,"Output widget",wxWindow*,"");
   BBTK_END_DESCRIBE_BLACK_BOX(WxBlackBox);
   //=================================================================
 
@@ -235,16 +255,17 @@ namespace bbtk
   class BBTK_EXPORT WxBlackBoxWindow //: public wxWindow
   {
   public:
-    WxBlackBoxWindow(WxBlackBox* box);
+    WxBlackBoxWindow(WxBlackBox::Pointer box);
     virtual ~WxBlackBoxWindow();
     virtual void bbShow();
     virtual void bbHide();
+    virtual void bbClose();
     bool bbIsShown() { return mShown; }
-    virtual WxBlackBox* bbGetBlackBox() { return mBox; }
+    virtual WxBlackBox::Pointer bbGetBlackBox() { return mBox.lock(); }
     virtual wxDialog* bbGetDialog() { return 0; } 
     virtual wxFrame* bbGetFrame() { return 0; } 
   private:
-    WxBlackBox* mBox;
+    WxBlackBox::WeakPointer mBox;
     bool mShown;
   };
   //==================================================================
@@ -254,11 +275,12 @@ namespace bbtk
   class BBTK_EXPORT  WxBlackBoxDialog : public wxDialog, public WxBlackBoxWindow
   {
   public:
-    WxBlackBoxDialog(WxBlackBox* box, 
+    WxBlackBoxDialog(WxBlackBox::Pointer box, 
 		     wxWindow *parent, wxString title, wxSize size);
     ~WxBlackBoxDialog();
     void bbShow();  
     void bbHide();
+    void bbClose();
     wxDialog* bbGetDialog() { return this; } 
   };
   //==================================================================
@@ -268,43 +290,17 @@ namespace bbtk
   class BBTK_EXPORT  WxBlackBoxFrame : public wxFrame, public WxBlackBoxWindow
   {
   public:
-    WxBlackBoxFrame(WxBlackBox* box,
+    WxBlackBoxFrame(WxBlackBox::Pointer box,
 		    wxWindow *parent, wxString title, wxSize size);
     ~WxBlackBoxFrame();
     void bbShow();
     void bbHide();
+    void bbClose();
     wxFrame* bbGetFrame() { return this; } 
   };
   //==================================================================
 
 
-  /*
- //=================================================================
-  /// Class from which a user defined widget associated to a WxBlackBox 
-  /// should inherit
-  class BBTK_EXPORT  WxBlackBoxWidget
-  {
-  public:
-    /// Ctor with the WxBlackBox which created it 
-    WxBlackBoxWidget( WxBlackBox* box);
-    /// Dtor
-    virtual ~WxBlackBoxWidget();
-
-    /// Returns the WxBlackBox which created it
-    WxBlackBox* GetBlackBox() { return mBox; }
-    /// Returns the WxBlackBox which created it (const)
-    const WxBlackBox* GetBlackBox() const { return mBox; }
-
-    /// Returns the wxWindow associated to the widget
-    virtual wxWindow* GetWxWindow() { return 0; }
-
-    virtual bool IsDead() { return false; }
-
-  private:
-    WxBlackBox* mBox;
-  };  
-  //=================================================================
-  */
 
   //=================================================================
   // Handles the destroy events of a widget associated to a WxBlackBox 
@@ -313,7 +309,7 @@ namespace bbtk
   {
   public:
     /// Ctor with the box and widget 
-    WxBlackBoxWidgetEventHandler( WxBlackBox* box, wxWindow *widget );
+    WxBlackBoxWidgetEventHandler( WxBlackBox::Pointer box, wxWindow *widget );
     /// Dtor
     ~WxBlackBoxWidgetEventHandler();
     /// Returns true iff is the handler for that window  
@@ -325,37 +321,12 @@ namespace bbtk
     //bool IsDead() { return mDead; }
 
   private:
-    WxBlackBox* mBox;
+    WxBlackBox::WeakPointer mBox;
     wxWindow* mWindow;
     //bool mDead;
   };  
   //=================================================================
 
-  /*
-  //=================================================================
-  /// A WxBlackBoxWidget which is a wxPanel also
-  class BBTK_EXPORT  WxBlackBoxWidgetPanel :	  
-				public wxPanel,
-				public WxBlackBoxWidget
-//				public WxBlackBoxWidget,
-//				public wxPanel
-  {
-  public:
-    /// Ctor with the parent and the WxBlackBox which created it 
-    WxBlackBoxWidgetPanel(WxBlackBox* box,  wxWindow *parent)
-      :
-      wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
-      WxBlackBoxWidget(box)
-    {}
-    
-    /// Returns the top panel of the widget    
-    wxWindow* GetWxWindow() { return (wxWindow*)(wxPanel*)(this); }
-    /// Returns the top panel of the widget    
-    wxPanel* GetPanel() { return (wxPanel*)(this); }
-
-  };  
-  //=================================================================
-  */
 
 
 } //namespace bbtk