#3532 Maximized main wxFrame

diff --git a/kernel/src/bbtkBlackBox.h b/kernel/src/bbtkBlackBox.h
index 2bd1bbd9f4d407003d61ebafef142fe397b982f1..77ebcab00812dd89d5566edd3ba9b8c769bc0c21 100644 (file)
--- a/kernel/src/bbtkBlackBox.h
+++ b/kernel/src/bbtkBlackBox.h
@@ -33,8 +33,6 @@
   Version:   $Revision: 1.34 $
 =========================================================================*/
 
-
-
 /**
  *  \file
  *  \brief Class bbtk::BlackBox : abstract black-box interface.
@@ -59,7 +57,6 @@
 #include <boost/bind.hpp>
 #include <boost/signals2/signal.hpp>
 
-
 #define bbtkBlackBoxMessage(key,level,mess) \
   bbtkMessage(key,level,"["<<bbGetTypeName()<<":"<<bbGetName()<<"] "<<mess)
 #define bbtkBlackBoxDebugMessage(key,level,mess)       \

diff --git a/kernel/src/bbtkWidgetBlackBox.h b/kernel/src/bbtkWidgetBlackBox.h
index b0333a6985241a0d1668da493a8067fe469098d1..7e3db1ac619662a5cfdc3aaf21a1096828e049bf 100644 (file)
--- a/kernel/src/bbtkWidgetBlackBox.h
+++ b/kernel/src/bbtkWidgetBlackBox.h
@@ -82,6 +82,7 @@ namespace bbtk
     BBTK_DECLARE_INPUT(WinWidth,int);
     BBTK_DECLARE_INPUT(WinHeight,int);
     BBTK_DECLARE_INPUT(WinDialog,bool);
+    BBTK_DECLARE_INPUT(WinMaximized,bool);
     BBTK_DECLARE_INPUT(WinHide,Void);
     BBTK_DECLARE_INPUT(WinClose,Void);
     BBTK_DECLARE_OUTPUT(Widget,Widget*);
@@ -107,7 +108,6 @@ namespace bbtk
     bool bbIsShown();
     //==================================================================    
  
-   
     //==================================================================    
     /// User callback for creating the widget associated to the box
     /// ** Must be defined ** in user classes
@@ -117,7 +117,6 @@ namespace bbtk
     }
     //==================================================================    
 
-         
   protected:
     
     void bbSetShown(bool);
@@ -211,32 +210,18 @@ namespace bbtk
   BBTK_NAME("WidgetBlackBox_"+HumanTypeName<T>());
   // BBTK_DESCRIPTION("Widget box. The inputs marked with (*) are only used if the widget is not inserted in another widget.\n");
   BBTK_CATEGORY("widget");
-  BBTK_TEMPLATE_INPUT(WidgetBlackBox,WinTitle,
-            "Title of the window (*)",
-            std::string);
-  BBTK_TEMPLATE_INPUT(WidgetBlackBox,WinWidth,
-            "Width of the window (* : only used if the widget is not connected to a Layout box)",int);
-  BBTK_TEMPLATE_INPUT(WidgetBlackBox,WinHeight,
-            "Height of the window (*)",int);
-  BBTK_TEMPLATE_INPUT(WidgetBlackBox,WinDialog,
-            "Set to 'true' to create a dialog window, i.e. which blocks the pipeline until it is closed (modal) (*)",bool);
-  BBTK_TEMPLATE_INPUT(WidgetBlackBox,WinHide,
-            "Any signal received hides the window (*)",Void);
-  BBTK_TEMPLATE_INPUT(WidgetBlackBox,WinClose,
-            "Any signal received closes the window (*)",Void);
+  BBTK_TEMPLATE_INPUT(WidgetBlackBox,WinTitle,"Title of the window (*)",std::string);
+  BBTK_TEMPLATE_INPUT(WidgetBlackBox,WinWidth,"Width of the window (* : only used if the widget is not connected to a Layout box)",int);
+  BBTK_TEMPLATE_INPUT(WidgetBlackBox,WinHeight,"Height of the window (*)",int);
+  BBTK_TEMPLATE_INPUT(WidgetBlackBox,WinDialog,"Set to 'true' to create a dialog window, i.e. which blocks the pipeline until it is closed (modal) (*)",bool);
+  BBTK_TEMPLATE_INPUT(WidgetBlackBox,WinHide,"Any signal received hides the window (*)",Void);
+  BBTK_TEMPLATE_INPUT(WidgetBlackBox,WinClose,"Any signal received closes the window (*)",Void);
+  BBTK_TEMPLATE_INPUT(WidgetBlackBox,WinMaximized,"Start Application Maximazed",bool);
   typedef typename WidgetBlackBox<T>::WidgetPointer WidgetPointer;
   BBTK_TEMPLATE_OUTPUT(WidgetBlackBox,Widget,"Output widget",WidgetPointer);
   BBTK_END_DESCRIBE_BLACK_BOX(WidgetBlackBox);
   //=================================================================
 
-
-
-
-
-
-
-
-
 } //namespace bbtk
 
 // template code inclusion

diff --git a/kernel/src/bbtkWidgetBlackBox.txx b/kernel/src/bbtkWidgetBlackBox.txx
index 0c2a7a12f6751428e461385c2f4b4897b52e9d4d..3f1c7b259127ded5a20467675c9a65a9d566ba7e 100644 (file)
--- a/kernel/src/bbtkWidgetBlackBox.txx
+++ b/kernel/src/bbtkWidgetBlackBox.txx
@@ -33,19 +33,14 @@
   Version:   $Revision: 1.7 $
 =========================================================================*/
 
-
-
 /**
  *  \file 
  *  \brief 
  */
-
-
  
 //#include "bbtkWidgetBlackBoxWindow.h"
 #include "bbtkBlackBoxOutputConnector.h"
 
-
 namespace bbtk
 {
 
@@ -69,6 +64,7 @@ namespace bbtk
     bbSetInputWinTitle(bbGetName());
     bbSetInputWinWidth(800);
     bbSetInputWinHeight(800);
+    bbSetInputWinMaximized(false);
     bbSetInputWinDialog(false);
     bbSetOutputWidget(0);
   }

diff --git a/kernel/src/bbtkWtBlackBox.cxx b/kernel/src/bbtkWtBlackBox.cxx
index a3cb0db75c09fec514311476812fcc3367d60e98..fa8d51e813d818c179e58c21d122da0fad4923a9 100644 (file)
--- a/kernel/src/bbtkWtBlackBox.cxx
+++ b/kernel/src/bbtkWtBlackBox.cxx
@@ -405,32 +405,26 @@ int argc=2;
 
   //==================================================================
   void WtBlackBox::bbShowWindow()
-  {
-    if ((bbmWindow) && (!bbIsShown()))
+{
+      if ((bbmWindow) && (!bbIsShown()))
       {
-       bbtkBlackBoxDebugMessage("widget",3,"==> WtBlackBox::bbShowWindow()"
-                        <<std::endl);
-       if (bbGetInputWinDialog()) 
-         {
-         //  ((WxDialog*)bbmWindow)->ShowModal();
-         }
-       else
-         {
-               // There is not such a thing like show becouse it is a webapp
-          // bbGetWindow()->Show();
-         //  WWt::CreateWtAppIfNeeded();
-
-
-               Wt::WRun(WtBlackBox::wtServerData::argc,
-                         WtBlackBox::wtServerData::argv,
-                         &createApplication);  
-
-
-           bbSetShown(true);
-         } 
-      }
+          bbtkBlackBoxDebugMessage("widget",3,"==> WtBlackBox::bbShowWindow()"
+                                   <<std::endl);
+          if (bbGetInputWinDialog())
+          {
+              //  ((WxDialog*)bbmWindow)->ShowModal();
+          } else {
+              // There is not such a thing like show becouse it is a webapp
+              // bbGetWindow()->Show();
+              //  WWt::CreateWtAppIfNeeded();
+              Wt::WRun(WtBlackBox::wtServerData::argc,
+                       WtBlackBox::wtServerData::argv,
+                       &createApplication);
+              bbSetShown(true);
+          }  // if WinDialog
+      } // if bbmWindow && !bbIsShown
   }
-  //==================================================================    
+  //==================================================================
 
   //==================================================================    
   void WtBlackBox::bbDestroyWindow()

diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index ffe21f5f728b6a112c5a862ba273fb5eaa37f66e..f1b9544a6ff22f3609eeaaae8fab05f30b0444f3 100644 (file)
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -33,8 +33,6 @@
   Version:   $Revision: 1.45 $
 =========================================================================*/
 
-
-
 #ifdef _USE_WXWIDGETS_
 
 /**
@@ -68,7 +66,6 @@ namespace bbtk
     ~WxFrame();
     void OnCloseWindow(wxCloseEvent& event);
 
-
     WxBlackBox::WeakPointer mBox;      
     DECLARE_EVENT_TABLE();
     
@@ -94,7 +91,7 @@ namespace bbtk
             wxSYSTEM_MENU  |
             wxCLOSE_BOX |
             wxMAXIMIZE_BOX | 
-            wxMINIMIZE_BOX | 
+            wxMINIMIZE_BOX |  wxFRAME_FLOAT_ON_PARENT  |
             wxCAPTION
         ),
     mBox(b)
@@ -112,12 +109,11 @@ namespace bbtk
     Layout();
   }
   //==================================================================
+
   //==================================================================
   WxFrame::~WxFrame() 
-    { 
-       
-printf("EED WxFrame::~WxFrame\n");     
-       
+    {
+printf("EED WxFrame::~WxFrame\n");
       if (mBox.lock())
          {
                bbtkDebugMessage("widget",9,"["<<mBox.lock()->bbGetName()
@@ -167,8 +163,6 @@ printf("EED WxFrame::~WxFrame\n");
                     wxSize size);
     ~WxDialog();
     void OnCloseWindow(wxCloseEvent& event);
-
-
     WxBlackBox::WeakPointer mBox;      
     DECLARE_EVENT_TABLE();
     
@@ -194,8 +188,8 @@ printf("EED WxFrame::~WxFrame\n");
                wxSYSTEM_MENU  |
                wxCLOSE_BOX |
                wxMAXIMIZE_BOX | 
-               wxMINIMIZE_BOX | 
-               wxCAPTION  
+               wxMINIMIZE_BOX | wxSTAY_ON_TOP |
+               wxCAPTION
              ),
     mBox(b)
   {

diff --git a/kernel/src/bbtkWxBlackBox.h b/kernel/src/bbtkWxBlackBox.h
index e5e529bdc8afbf4fcdd12822465a3dd6344b4020..cb160fc646da314de6df780ba4a222dd8c7a3e45 100644 (file)
--- a/kernel/src/bbtkWxBlackBox.h
+++ b/kernel/src/bbtkWxBlackBox.h
@@ -33,8 +33,6 @@
   Version:   $Revision: 1.33 $
 ========================================================================*/
 
-
-
 /**
  * \brief Short description in one line
  * 
@@ -50,24 +48,17 @@
  * \brief 
  */
 
-
 #ifdef USE_WXWIDGETS
 
-
 #ifndef __bbtkWxBlackBox_h__
 #define __bbtkWxBlackBox_h__
 
-
-
 #include "bbtkWidgetBlackBox.h"
 #include "bbtkWx.h"
 
-
 namespace bbtk
 {
 
- 
-
   //==================================================================
   /// Widget black boxes
 //EED 10/06/2009 /*BBTK_EXPORT*/
@@ -76,9 +67,7 @@ namespace bbtk
   public:
     BBTK_BLACK_BOX_INTERFACE(WxBlackBox,bbtk::WidgetBlackBox<wxWindow>);
 
-         
     //  protected:
-    
   public:
   
    //==================================================================    
@@ -93,14 +82,12 @@ namespace bbtk
     virtual void bbCreateFrameWindow();
     //==================================================================    
 
-     
     //==================================================================    
     wxWindow* bbGetWindow() { return bbmWindow; }
     void bbSetWindow(wxWindow*) ;
     bool bbWindowIsCreated() { return (bbGetWindow() != 0); }
     //==================================================================    
 
-
     //==================================================================    
     virtual void bbShowWindow();
     //==================================================================   
@@ -116,13 +103,10 @@ namespace bbtk
        virtual std::string ConstructWinTitle();
 
   private:
-
     wxWindow* bbmWindow;
- 
   };
   //=================================================================
  
-
   //=================================================================
   // WxBlackBoxDescriptor declaration
   class WxBlackBoxDescriptor : public WidgetBlackBoxDescriptor<wxWindow>
@@ -131,7 +115,6 @@ namespace bbtk
   BBTK_END_DESCRIBE_BLACK_BOX(WxBlackBox);
   //=================================================================
 
-
 } //namespace bbtk
 
 #endif  //__bbtkWxBlackBox_h__

diff --git a/packages/qt/src/bbqtLayoutLine.cxx b/packages/qt/src/bbqtLayoutLine.cxx
index d7925c17d819018fe9e4c7a59ac7a322b6b35f5f..065720c7773ac0f0ef9b35c2b8604657db646e26 100644 (file)
--- a/packages/qt/src/bbqtLayoutLine.cxx
+++ b/packages/qt/src/bbqtLayoutLine.cxx
@@ -33,15 +33,11 @@
   Version:   $Revision: 1.4 $
 =========================================================================*/
 
-
-    
-
 /**
  *  \file
  *  \brief
  */
 
-
 #ifdef USE_QT
 
 #include "bbqtLayoutLine.h"

diff --git a/packages/vtk/src/bbvtkTransform.cxx b/packages/vtk/src/bbvtkTransform.cxx
index 1b29f8b33f29ea910afc72bc93f180de6ad6f3ee..88cc6acbc3c5a5a4c8c309d29b0dbeb092ea3674 100644 (file)
--- a/packages/vtk/src/bbvtkTransform.cxx
+++ b/packages/vtk/src/bbvtkTransform.cxx
@@ -142,7 +142,7 @@ namespace bbvtk
           {
               for (i=0;i<4;i++)
               {
-                  m->SetElement(i,j,manaulMatrixIn[ii]);
+                  m->SetElement(j,i,manaulMatrixIn[ii]);
                   ii++;
               }// for i
           } // for j

diff --git a/packages/wx/src/bbwxLayoutLine.cxx b/packages/wx/src/bbwxLayoutLine.cxx
index af131a24c980f37b9313f167a18ecdd971257a68..3b254390d91c637aefd33914ae98fe07d11134ec 100644 (file)
--- a/packages/wx/src/bbwxLayoutLine.cxx
+++ b/packages/wx/src/bbwxLayoutLine.cxx
@@ -33,20 +33,17 @@
   Version:   $Revision: 1.10 $
 =========================================================================*/
 
-
 /**
  *  \file
  *  \brief
  */
 
-
 #ifdef _USE_WXWIDGETS_
 
 #include "bbwxLayoutLine.h"
 #include "bbwxPackage.h"
 #include "bbtkUtilities.h"
 
-
 namespace bbwx
 {
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx, LayoutLine);
@@ -67,23 +64,36 @@ namespace bbwx
                bbSetInputWidget9(NULL);
        }
        
-       //-----------------------------------------------------------------     
-       void LayoutLine::bbUserInitializeProcessing()
-       {
-       }
-       
-       //-----------------------------------------------------------------     
-       void LayoutLine::bbUserFinalizeProcessing()
-       {
-       }       
+//-----------------------------------------------------------------
+void LayoutLine::bbUserInitializeProcessing()
+{
+}
        
+//-----------------------------------------------------------------
+void LayoutLine::bbUserFinalizeProcessing()
+{
+}
        
 void LayoutLine::Process()
 {
-       PutWinTitle();
+    PutWinTitle();
+    
+    if (bbGetInputWinMaximized()==true)
+    {
+        wxWindow *ww = bbGetOutputWidget();
+        while (ww->GetParent()!=NULL)
+        {
+            ww = ww->GetParent();
+        } // while
+        wxFrame *f = (wxFrame*)ww;
+        f->Iconize(false);
+        f->Maximize(true);
+        f->Raise();
+        f->Show(true);
+        f->SetFocus();
+    }// if
 }
-  
-       
+       
 /*
   void LayoutLine::TryInsertWindow(wxWindow *parent, wxWindow *w,wxBoxSizer *sizer)
   {
@@ -152,6 +162,7 @@ void LayoutLine::Process()
     w -> SetAutoLayout(true);
     w -> Layout();
     bbSetOutputWidget( w );
+      
   }
   
   // This callback is necessary to get actual processing of the view 

diff --git a/packages/wx/src/bbwxLayoutLine.h b/packages/wx/src/bbwxLayoutLine.h
index 1992f32eab0f73cfc4e5e8c1c4a8a2ede65c510c..9599c0384c96e423b9c1b8a250f0e73bdbb76bdf 100644 (file)
--- a/packages/wx/src/bbwxLayoutLine.h
+++ b/packages/wx/src/bbwxLayoutLine.h
@@ -48,27 +48,19 @@
  * \class bbtk::NodePatern 
  * \brief Pattern for the definition of a new type of Node 
  */
-
-
 #ifdef USE_WXWIDGETS
 
-
 #ifndef __bbWxLayoutLine_h__
 #define __bbWxLayoutLine_h__
 
 #include "bbtkWxBlackBox.h"
 #include "bbwx_EXPORT.h"
 
-
 namespace bbwx
 {
-  
-
-  
   //===========================================================
   class bbwx_EXPORT LayoutLine : public bbtk::WxBlackBox
   {
-    
     BBTK_BLACK_BOX_INTERFACE(LayoutLine,bbtk::WxBlackBox);
     BBTK_DECLARE_INPUT(Widget1,wxWindow*);
     BBTK_DECLARE_INPUT(Widget2,wxWindow*);
@@ -83,18 +75,14 @@ namespace bbwx
     BBTK_PROCESS(Process);
     BBTK_CREATE_WIDGET(CreateWidget);
     BBTK_ON_SHOW_WIDGET(OnShowWidget);
- 
     void Process();
     void CreateWidget(wxWindow*);
     void OnShowWidget();
-    
   protected:
        void TryInsertWindow(wxWindow *parent, wxWindow *w,wxBoxSizer *sizer);
-
   };
   //===========================================================
-  
- 
+
   //=================================================================
   // BlackBox description
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(LayoutLine,bbtk::WxBlackBox);
@@ -114,13 +102,7 @@ namespace bbwx
   BBTK_INPUT(LayoutLine,Orientation,"Orientation (default V), 0=H=HORIZONTAL , 1=V=VERTICAL",std::string,"");
   BBTK_END_DESCRIBE_BLACK_BOX(LayoutLine);
   //=================================================================
-  
-  
-  
 }
-
-
-
 //namespace bbtk
 #endif  //__bbtkWxLayoutLine_h__
 

diff --git a/packages/wx/src/bbwxLayoutTab.cxx b/packages/wx/src/bbwxLayoutTab.cxx
index 6b529d4a6872a6f84600391c4947644a967345df..1aad1fd3be5586d11c79e5a14a0578f2749858b0 100644 (file)
--- a/packages/wx/src/bbwxLayoutTab.cxx
+++ b/packages/wx/src/bbwxLayoutTab.cxx
@@ -32,27 +32,19 @@
   Date:      $Date: 2012/11/16 08:52:14 $
   Version:   $Revision: 1.12 $
 =========================================================================*/
-
 /**
  *  \file 
  *  \brief 
  */
-
-
 #ifdef _USE_WXWIDGETS_
 
-
 #include "bbwxLayoutTab.h"
 #include "bbwxPackage.h"
 #include "bbtkUtilities.h"
 #include "bbtkBlackBoxInputConnector.h"
 
-
-
 namespace bbwx
 {
-
-
    //--------------------------------------------------------------------------
   class TabWidget : public wxPanel
   {
@@ -66,7 +58,6 @@ namespace bbwx
     wxNotebook *mwxNotebook;
   }; 
 
-
   TabWidget::TabWidget(LayoutTab* box, wxWindow *parent,long style )
     : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
       mBox(box)