First version of DockManager

dcwhite · dcwhite · commit 471c1357a0db · 2017-07-01T18:00:36.000-06:00
For #1625
diff --git a/src/Interface/Application/MainWindowCollaborators.cc b/src/Interface/Application/MainWindowCollaborators.cc
@@ -29,9 +29,11 @@
 #include <QtGui>
 #include <Interface/Application/MainWindowCollaborators.h>
 #include <Interface/Application/SCIRunMainWindow.h>
+#include <Interface/Modules/Base/ModuleDialogGeneric.h>
 #include <Core/Logging/Log.h>
 #include <Core/Application/Preferences/Preferences.h>
 #include <Interface/Application/NetworkEditorControllerGuiProxy.h>
+#include <numeric>
 
 #include "ui_ConnectionStyleWizardPage.h"
 #include "ui_OtherSettingsWizardPage.h"
@@ -397,3 +399,40 @@ void NetworkEditorBuilder::connectAll(NetworkEditor* editor)
   // children only
   // addDockWidget(Qt::RightDockWidgetArea, subnet);
 }
+
+DockManager::DockManager(int& availableSize, QObject* parent) : QObject(parent),
+  availableHeight_(availableSize),
+  currentDialogs_(ModuleDialogGeneric::instances())
+{
+
+}
+
+void DockManager::requestShow(ModuleDialogGeneric* dialog)
+{
+  //clear out old pointers
+  collapseQueue_.erase(std::remove_if(collapseQueue_.begin(), collapseQueue_.end(),
+    [this](ModuleDialogGeneric* d) { return currentDialogs_.find(d) == currentDialogs_.end(); }),
+    collapseQueue_.end());
+
+  // collapse oldest until they fit
+  auto needToFit = availableHeight_ - dialog->size().height();
+  while (usedSpace() > needToFit)
+  {
+    auto firstNonCollapsed = std::find_if(collapseQueue_.begin(), collapseQueue_.end(),
+      [dialog](ModuleDialogGeneric* d) { return d != dialog && !d->isCollapsed(); });
+    if (firstNonCollapsed != collapseQueue_.end())
+      (*firstNonCollapsed)->collapse();
+    else
+      break;
+  }
+
+  // add latest
+  collapseQueue_.push_back(dialog);
+  dialog->expand();
+}
+
+int DockManager::usedSpace() const
+{
+  return std::accumulate(currentDialogs_.begin(), currentDialogs_.end(), 0,
+    [](int height, ModuleDialogGeneric* d) { return height + (d->isCollapsed() ? 0 : d->size().height()); });
+}
diff --git a/src/Interface/Application/MainWindowCollaborators.h b/src/Interface/Application/MainWindowCollaborators.h
@@ -34,7 +34,7 @@
 #include <Core/Logging/Log.h>
 #include <Core/Utils/Singleton.h>
 #include <set>
-#include <queue>
+#include <deque>
 #include <Interface/Application/NetworkEditor.h>  //TODO
 #include <Interface/Application/NetworkExecutionProgressBar.h>
 #endif
@@ -242,11 +242,13 @@ namespace Gui {
     Q_OBJECT
   public:
     explicit DockManager(int& availableSize, QObject* parent);
+  public Q_SLOTS:
     void requestShow(ModuleDialogGeneric* dialog);
   private:
-    int& availableSize_;
-    std::set<ModuleDialogGeneric*>& currentDialogs_;
-    std::queue<ModuleDialogGeneric*> collapseQueue_;
+    int& availableHeight_;
+    const std::set<ModuleDialogGeneric*>& currentDialogs_;
+    std::deque<ModuleDialogGeneric*> collapseQueue_;
+    int usedSpace() const;
   };
 }
 }
diff --git a/src/Interface/Application/ModuleWidget.cc b/src/Interface/Application/ModuleWidget.cc
@@ -1195,6 +1195,7 @@ void ModuleWidget::updateDockWidgetProperties(bool isFloating)
   {
     dockable_->setWindowFlags(Qt::Window);
     dockable_->show();
+    Q_EMIT showUIrequested(dialog_);
   }
   dialog_->setButtonBarTitleVisible(!isFloating);
 }
@@ -1233,8 +1234,8 @@ void ModuleWidget::toggleOptionsDialog()
   {
     if (dockable_->isHidden())
     {
-      qDebug() << "h: " << dockable_->size().height();
       dockable_->show();
+      Q_EMIT showUIrequested(dialog_);
       dockable_->raise();
       dockable_->activateWindow();
       if (isViewScene_)
@@ -1329,7 +1330,7 @@ void ModuleWidget::pinUI()
   if (dockable_)
   {
     dockable_->setFloating(false);
-    qDebug() << dockable_->size().height();
+    Q_EMIT showUIrequested(dialog_);
   }
 }
 
@@ -1345,7 +1346,7 @@ void ModuleWidget::showUI()
   {
     dockable_->show();
     dialog_->expand();
-    qDebug() << dockable_->size().height();
+    Q_EMIT showUIrequested(dialog_);
   }
 }
 
diff --git a/src/Interface/Application/ModuleWidget.h b/src/Interface/Application/ModuleWidget.h
@@ -224,6 +224,7 @@ public Q_SLOTS:
   void executionDisabled(bool disabled);
   void findInNetwork();
   void showSubnetworkEditor(const QString& name);
+  void showUIrequested(class ModuleDialogGeneric* dialog);
 private Q_SLOTS:
   void subnetButtonClicked();
   void updateBackgroundColorForModuleState(int moduleState);
diff --git a/src/Interface/Application/NetworkEditor.cc b/src/Interface/Application/NetworkEditor.cc
@@ -46,6 +46,7 @@
 #include <Core/Application/Preferences/Preferences.h>
 #include <Core/Application/Application.h>
 #include <Dataflow/Serialization/Network/XMLSerializer.h>
+#include <Interface/Application/MainWindowCollaborators.h>
 #ifdef BUILD_WITH_PYTHON
 #include <Dataflow/Engine/Python/NetworkEditorPythonAPI.h>
 #endif
@@ -386,6 +387,7 @@ ModuleProxyWidget* NetworkEditor::setupModuleWidget(ModuleWidget* module)
   connect(module, SIGNAL(disableWidgetDisabling()), this, SIGNAL(disableWidgetDisabling()));
   connect(module, SIGNAL(reenableWidgetDisabling()), this, SIGNAL(reenableWidgetDisabling()));
   connect(module, SIGNAL(showSubnetworkEditor(const QString&)), this, SLOT(showSubnetChild(const QString&)));
+  connect(module, SIGNAL(showUIrequested(ModuleDialogGeneric*)), ctorParams_.dockManager_, SLOT(requestShow(ModuleDialogGeneric*)));
 
   if (module->hasDynamicPorts())
   {
diff --git a/src/Interface/Application/SCIRunMainWindow.cc b/src/Interface/Application/SCIRunMainWindow.cc
@@ -85,6 +85,7 @@ SCIRunMainWindow::SCIRunMainWindow()
 {
   setupUi(this);
   builder_ = boost::make_shared<NetworkEditorBuilder>(this);
+  dockManager_ = new DockManager(dockSpace_, this);
 
   startup_ = true;
 
@@ -313,13 +314,11 @@ SCIRunMainWindow::SCIRunMainWindow()
   setupVersionButton();
 
   WidgetStyleMixin::tabStyle(optionsTabWidget_);
-
-  qDebug() << "available height:" << size().height();
+  setMaximumHeight(QApplication::desktop()->screenGeometry().height());
 }
 
 void SCIRunMainWindow::resizeEvent(QResizeEvent* event)
 {
-  qDebug() << "available height:" << size().height();
   dockSpace_ = size().height();
   QMainWindow::resizeEvent(event);
 }
@@ -542,7 +541,7 @@ void SCIRunMainWindow::setupNetworkEditor()
       highResolutionExpandFactor *= 1.5;
   }
   networkEditor_ = new NetworkEditor({ getter, defaultNotePositionGetter_, dialogErrorControl_, preexecuteFunc,
-    tagColorFunc, tagNameFunc, highResolutionExpandFactor }, scrollAreaWidgetContents_);
+    tagColorFunc, tagNameFunc, highResolutionExpandFactor, dockManager_ }, scrollAreaWidgetContents_);
   gridLayout_5->addWidget(networkEditor_, 0, 0, 1, 1);
 
   builder_->connectAll(networkEditor_);
@@ -1936,7 +1935,6 @@ void SCIRunMainWindow::addModuleToWindowList(const QString& modId, bool hasUI)
 
     connect(showAction, SIGNAL(triggered()), networkEditor_, SLOT(subnetMenuActionTriggered()));
     connect(renameAction, SIGNAL(triggered()), networkEditor_, SLOT(subnetMenuActionTriggered()));
-    //qDebug() << "add" << modId;
     currentSubnetActions_.insert(modId, subnetMenu);
     menuCurrentSubnets_->addMenu(subnetMenu);
   }
@@ -1945,7 +1943,6 @@ void SCIRunMainWindow::addModuleToWindowList(const QString& modId, bool hasUI)
 void SCIRunMainWindow::removeModuleFromWindowList(const ModuleId& modId)
 {
   auto name = QString::fromStdString(modId.id_);
-  //qDebug() << "remove" << name;
   auto action = currentModuleActions_[name];
   menuCurrent_->removeAction(action);
   currentModuleActions_.remove(name);
@@ -1954,7 +1951,6 @@ void SCIRunMainWindow::removeModuleFromWindowList(const ModuleId& modId)
 
   if (modId.id_.find("Subnet") != std::string::npos)
   {
-    //qDebug() << currentSubnetActions_;
     auto subnet = currentSubnetActions_[name];
     if (subnet)
       menuCurrentSubnets_->removeAction(subnet->menuAction());
diff --git a/src/Interface/Application/SCIRunMainWindow.h b/src/Interface/Application/SCIRunMainWindow.h
@@ -186,6 +186,7 @@ public Q_SLOTS:
   bool startup_;
   boost::shared_ptr<NetworkEditorBuilder> builder_;
   int dockSpace_{0};
+  class DockManager* dockManager_;
 
 Q_SIGNALS:
   void moduleItemDoubleClicked();
diff --git a/src/Interface/Modules/Base/ModuleDialogGeneric.h b/src/Interface/Modules/Base/ModuleDialogGeneric.h
@@ -78,9 +78,11 @@ namespace Gui {
     void updateWindowTitle(const QString& title);
     void setButtonBarTitleVisible(bool visible);
     void setupButtonBar();
+    bool isCollapsed() const { return collapsed_; }
     virtual void createStartupNote() {}
     static void setExecutionDisablingServiceFunctionAdd(ExecutionDisablingServiceFunction add) { disablerAdd_ = add; }
     static void setExecutionDisablingServiceFunctionRemove(ExecutionDisablingServiceFunction remove) { disablerRemove_ = remove; }
+    static const std::set<ModuleDialogGeneric*>& instances() { return instances_; }
 
     //TODO: input state hookup?
     //yeah: eventually replace int with generic dialog state object, but needs to be two-way (set/get)

Original file line number	Diff line number	Diff line change
`@@ -1195,6 +1195,7 @@ void ModuleWidget::updateDockWidgetProperties(bool isFloating)`
`1195`	`1195`	`{`
`1196`	`1196`	`dockable_->setWindowFlags(Qt::Window);`
`1197`	`1197`	`dockable_->show();`
	`1198`	`+ Q_EMIT showUIrequested(dialog_);`
`1198`	`1199`	`}`
`1199`	`1200`	`dialog_->setButtonBarTitleVisible(!isFloating);`
`1200`	`1201`	`}`
`@@ -1233,8 +1234,8 @@ void ModuleWidget::toggleOptionsDialog()`
`1233`	`1234`	`{`
`1234`	`1235`	`if (dockable_->isHidden())`
`1235`	`1236`	`{`
`1236`		`- qDebug() << "h: " << dockable_->size().height();`
`1237`	`1237`	`dockable_->show();`
	`1238`	`+ Q_EMIT showUIrequested(dialog_);`
`1238`	`1239`	`dockable_->raise();`
`1239`	`1240`	`dockable_->activateWindow();`
`1240`	`1241`	`if (isViewScene_)`
`@@ -1329,7 +1330,7 @@ void ModuleWidget::pinUI()`
`1329`	`1330`	`if (dockable_)`
`1330`	`1331`	`{`
`1331`	`1332`	`dockable_->setFloating(false);`
`1332`		`- qDebug() << dockable_->size().height();`
	`1333`	`+ Q_EMIT showUIrequested(dialog_);`
`1333`	`1334`	`}`
`1334`	`1335`	`}`
`1335`	`1336`
`@@ -1345,7 +1346,7 @@ void ModuleWidget::showUI()`
`1345`	`1346`	`{`
`1346`	`1347`	`dockable_->show();`
`1347`	`1348`	`dialog_->expand();`
`1348`		`- qDebug() << dockable_->size().height();`
	`1349`	`+ Q_EMIT showUIrequested(dialog_);`
`1349`	`1350`	`}`
`1350`	`1351`	`}`
`1351`	`1352`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ SCIRunMainWindow::SCIRunMainWindow()`
`85`	`85`	`{`
`86`	`86`	`setupUi(this);`
`87`	`87`	`builder_ = boost::make_shared<NetworkEditorBuilder>(this);`
	`88`	`+ dockManager_ = new DockManager(dockSpace_, this);`
`88`	`89`
`89`	`90`	`startup_ = true;`
`90`	`91`
`@@ -313,13 +314,11 @@ SCIRunMainWindow::SCIRunMainWindow()`
`313`	`314`	`setupVersionButton();`
`314`	`315`
`315`	`316`	`WidgetStyleMixin::tabStyle(optionsTabWidget_);`
`316`		`-`
`317`		`- qDebug() << "available height:" << size().height();`
	`317`	`+ setMaximumHeight(QApplication::desktop()->screenGeometry().height());`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`void SCIRunMainWindow::resizeEvent(QResizeEvent* event)`
`321`	`321`	`{`
`322`		`- qDebug() << "available height:" << size().height();`
`323`	`322`	`dockSpace_ = size().height();`
`324`	`323`	`QMainWindow::resizeEvent(event);`
`325`	`324`	`}`
`@@ -542,7 +541,7 @@ void SCIRunMainWindow::setupNetworkEditor()`
`542`	`541`	`highResolutionExpandFactor *= 1.5;`
`543`	`542`	`}`
`544`	`543`	`networkEditor_ = new NetworkEditor({ getter, defaultNotePositionGetter_, dialogErrorControl_, preexecuteFunc,`
`545`		`- tagColorFunc, tagNameFunc, highResolutionExpandFactor }, scrollAreaWidgetContents_);`
	`544`	`+ tagColorFunc, tagNameFunc, highResolutionExpandFactor, dockManager_ }, scrollAreaWidgetContents_);`
`546`	`545`	`gridLayout_5->addWidget(networkEditor_, 0, 0, 1, 1);`
`547`	`546`
`548`	`547`	`builder_->connectAll(networkEditor_);`
`@@ -1936,7 +1935,6 @@ void SCIRunMainWindow::addModuleToWindowList(const QString& modId, bool hasUI)`
`1936`	`1935`
`1937`	`1936`	`connect(showAction, SIGNAL(triggered()), networkEditor_, SLOT(subnetMenuActionTriggered()));`
`1938`	`1937`	`connect(renameAction, SIGNAL(triggered()), networkEditor_, SLOT(subnetMenuActionTriggered()));`
`1939`		`- //qDebug() << "add" << modId;`
`1940`	`1938`	`currentSubnetActions_.insert(modId, subnetMenu);`
`1941`	`1939`	`menuCurrentSubnets_->addMenu(subnetMenu);`
`1942`	`1940`	`}`
`@@ -1945,7 +1943,6 @@ void SCIRunMainWindow::addModuleToWindowList(const QString& modId, bool hasUI)`
`1945`	`1943`	`void SCIRunMainWindow::removeModuleFromWindowList(const ModuleId& modId)`
`1946`	`1944`	`{`
`1947`	`1945`	`auto name = QString::fromStdString(modId.id_);`
`1948`		`- //qDebug() << "remove" << name;`
`1949`	`1946`	`auto action = currentModuleActions_[name];`
`1950`	`1947`	`menuCurrent_->removeAction(action);`
`1951`	`1948`	`currentModuleActions_.remove(name);`
`@@ -1954,7 +1951,6 @@ void SCIRunMainWindow::removeModuleFromWindowList(const ModuleId& modId)`
`1954`	`1951`
`1955`	`1952`	`if (modId.id_.find("Subnet") != std::string::npos)`
`1956`	`1953`	`{`
`1957`		`- //qDebug() << currentSubnetActions_;`
`1958`	`1954`	`auto subnet = currentSubnetActions_[name];`
`1959`	`1955`	`if (subnet)`
`1960`	`1956`	`menuCurrentSubnets_->removeAction(subnet->menuAction());`