DockManager class

Author: dcwhite

src/Interface/Application/MainWindowCollaborators.h

@@ -34,6 +34,7 @@
 #include <Core/Logging/Log.h>
 #include <Core/Utils/Singleton.h>
 #include <set>
+#include <queue>
 #include <Interface/Application/NetworkEditor.h>  //TODO
 #include <Interface/Application/NetworkExecutionProgressBar.h>
 #endif
@@ -54,6 +55,7 @@ namespace SCIRun {
 namespace Gui {
 
   class SCIRunMainWindow;
+  class ModuleDialogGeneric;
 
   class TextEditAppender : public Core::Logging::LegacyLoggerInterface, public Core::Logging::LogAppenderStrategy
   {
@@ -235,6 +237,17 @@ namespace Gui {
     SCIRunMainWindow* mainWindow_;
   };
 
+  class DockManager : public QObject
+  {
+    Q_OBJECT
+  public:
+    explicit DockManager(int& availableSize, QObject* parent);
+    void requestShow(ModuleDialogGeneric* dialog);
+  private:
+    int& availableSize_;
+    std::set<ModuleDialogGeneric*>& currentDialogs_;
+    std::queue<ModuleDialogGeneric*> collapseQueue_;
+  };
 }
 }
 #endif

src/Interface/Application/ModuleWidget.cc

@@ -1344,6 +1344,7 @@ void ModuleWidget::showUI()
   if (dockable_)
   {
     dockable_->show();
+    dialog_->expand();
     qDebug() << dockable_->size().height();
   }
 }

src/Interface/Application/NetworkEditor.h

@@ -177,6 +177,7 @@ namespace Gui {
     TagColorFunc tagColor;
     TagNameFunc tagName;
     double highResolutionExpandFactor;
+    class DockManager* dockManager_;
   };
 
   namespace NetworkBoundaries

src/Interface/Application/SCIRunMainWindow.cc

@@ -166,6 +166,8 @@ SCIRunMainWindow::SCIRunMainWindow()
   scrollArea_->viewport()->setAutoFillBackground(true);
   scrollArea_->setStyleSheet(styleSheet());
 
+  setDockOptions(AnimatedDocks | AllowTabbedDocks | VerticalTabs);
+
   connect(actionSave_As_, SIGNAL(triggered()), this, SLOT(saveNetworkAs()));
   connect(actionSave_, SIGNAL(triggered()), this, SLOT(saveNetwork()));
   connect(actionLoad_, SIGNAL(triggered()), this, SLOT(loadNetwork()));
@@ -318,6 +320,7 @@ SCIRunMainWindow::SCIRunMainWindow()
 void SCIRunMainWindow::resizeEvent(QResizeEvent* event)
 {
   qDebug() << "available height:" << size().height();
+  dockSpace_ = size().height();
   QMainWindow::resizeEvent(event);
 }
 

src/Interface/Application/SCIRunMainWindow.h

@@ -185,6 +185,7 @@ public Q_SLOTS:
   bool skipSaveCheck_ = false;
   bool startup_;
   boost::shared_ptr<NetworkEditorBuilder> builder_;
+  int dockSpace_{0};
 
 Q_SIGNALS:
   void moduleItemDoubleClicked();

src/Interface/Modules/Base/ModuleDialogGeneric.cc

@@ -41,6 +41,7 @@ using namespace SCIRun::Core::Logging;
 
 ExecutionDisablingServiceFunction ModuleDialogGeneric::disablerAdd_;
 ExecutionDisablingServiceFunction ModuleDialogGeneric::disablerRemove_;
+std::set<ModuleDialogGeneric*> ModuleDialogGeneric::instances_;
 
 ModuleDialogGeneric::ModuleDialogGeneric(ModuleStateHandle state, QWidget* parent) : QDialog(parent),
   state_(state),
@@ -65,10 +66,12 @@ ModuleDialogGeneric::ModuleDialogGeneric(ModuleStateHandle state, QWidget* paren
   createExecuteDownstreamAction();
   createShrinkAction();
   connectStateChangeToExecute(); //TODO: make this a module state variable if a module wants it saved
+  instances_.insert(this);
 }
 
 ModuleDialogGeneric::~ModuleDialogGeneric()
 {
+  instances_.erase(this);
   if (disablerAdd_ && disablerRemove_)
   {
     std::for_each(needToRemoveFromDisabler_.begin(), needToRemoveFromDisabler_.end(), disablerRemove_);

src/Interface/Modules/Base/ModuleDialogGeneric.h

@@ -93,6 +93,7 @@ namespace Gui {
     void moduleSelected(bool selected);
     void toggleCollapse();
     void collapse() { if (!collapsed_) toggleCollapse(); }
+    void expand() { if (collapsed_) toggleCollapse(); }
     virtual void updateFromPortChange(int numPorts, const std::string& portName, DynamicPortChange type) {}
   Q_SIGNALS:
     void pullSignal();
@@ -188,6 +189,7 @@ namespace Gui {
     std::vector<QWidget*> needToRemoveFromDisabler_;
     static ExecutionDisablingServiceFunction disablerAdd_;
     static ExecutionDisablingServiceFunction disablerRemove_;
+    static std::set<ModuleDialogGeneric*> instances_;
   };
 
   class SCISHARE ScopedWidgetSignalBlocker