Toolbar

Author: dcwhite

src/Interface/Application/NetworkEditor.cc

@@ -1033,6 +1033,12 @@ void NetworkEditor::fillModulePositionMap(ModulePositions& positions, ModuleFilt
 
 void NetworkEditor::centerView()
 {
+  if (!isActiveWindow())
+  {
+    tailRecurse(boost::bind(&NetworkEditor::centerView, _1));
+    return;
+  }
+
   ModulePositions positions;
   fillModulePositionMap(positions, boost::lambda::constant(true));
   centerOn(findCenterOfNetwork(positions));
@@ -1471,7 +1477,10 @@ QPixmap NetworkEditor::sceneGrab()
 void NetworkEditor::selectAll()
 {
   if (!isActiveWindow())
+  {
+    tailRecurse(boost::bind(&NetworkEditor::selectAll, _1));
     return;
+  }
 
   Q_FOREACH(QGraphicsItem* item, scene_->items())
   {
@@ -1481,6 +1490,12 @@ void NetworkEditor::selectAll()
 
 void NetworkEditor::pinAllModuleUIs()
 {
+  if (!isActiveWindow())
+  {
+    tailRecurse(boost::bind(&NetworkEditor::pinAllModuleUIs, _1));
+    return;
+  }
+
   Q_FOREACH(QGraphicsItem* item, scene_->items())
   {
     auto module = getModule(item);
@@ -1491,6 +1506,12 @@ void NetworkEditor::pinAllModuleUIs()
 
 void NetworkEditor::hideAllModuleUIs()
 {
+  if (!isActiveWindow())
+  {
+    tailRecurse(boost::bind(&NetworkEditor::hideAllModuleUIs, _1));
+    return;
+  }
+
   Q_FOREACH(QGraphicsItem* item, scene_->items())
   {
     auto module = getModule(item);
@@ -1501,6 +1522,12 @@ void NetworkEditor::hideAllModuleUIs()
 
 void NetworkEditor::restoreAllModuleUIs()
 {
+  if (!isActiveWindow())
+  {
+    tailRecurse(boost::bind(&NetworkEditor::restoreAllModuleUIs, _1));
+    return;
+  }
+
   Q_FOREACH(QGraphicsItem* item, scene_->items())
   {
     auto module = getModule(item);

src/Interface/Application/SCIRunMainWindow.h

@@ -82,6 +82,7 @@ class SCIRunMainWindow : public QMainWindow, public Ui::SCIRunMainWindow
   void addToDataDirectory(const QString& dir);
   void setCurrentFile(const QString& fileName);
   void addToolkit(const QString& filename, const QString& directory, const SCIRun::Dataflow::Networks::ToolkitFile& toolkit);
+  void addNetworkActionsToBar(QToolBar* toolbar) const;
 
   //TODO: extract another interface for command objects
   NetworkEditor* networkEditor() { return networkEditor_; }
@@ -137,7 +138,6 @@ public Q_SLOTS:
   void createStandardToolbars();
   void createExecuteToolbar();
   void createAdvancedToolbar();
-  void addNetworkActionsToBar(QToolBar* toolbar) const;
   void postConstructionSignalHookup();
   void executeCommandLineRequests();
   void setTipsAndWhatsThis();

src/Interface/Application/SubnetEditor.ui

@@ -23,19 +23,6 @@
    <property name="spacing">
     <number>-1</number>
    </property>
-   <item>
-    <widget class="QPushButton" name="openAllPushButton_">
-     <property name="maximumSize">
-      <size>
-       <width>220</width>
-       <height>25</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Open all module UIs</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QPushButton" name="expandPushButton_">
      <property name="maximumSize">

src/Interface/Application/Subnetworks.cc

@@ -91,9 +91,7 @@ editor_(editor), name_(name), subnetModuleId_(subnetModuleId)
   auto subnetBar = new QToolBar("Subnet");
   WidgetStyleMixin::toolbarStyle(subnetBar);
   subnetBar->setObjectName("SubnetToolbar");
-
-  subnetBar->addAction("hi");
-  subnetBar->addAction("bye");
+  SCIRunMainWindow::Instance()->addNetworkActionsToBar(subnetBar);
   vbox->setMenuBar(subnetBar);
 
   saveAsTemplatePushButton_->hide();
@@ -208,7 +206,7 @@ NetworkEditor* NetworkEditor::inEditingContext_(nullptr);
 NetworkEditor::ConnectorFunc NetworkEditor::connectorFunc_;
 
 std::function<QPointF(const QRectF&)> NetworkEditor::topSubnetPortHolderPositioner_([](const QRectF& rect) { return rect.topLeft(); });
-std::function<QPointF(const QRectF&)> NetworkEditor::bottomSubnetPortHolderPositioner_([](const QRectF& rect) { return rect.bottomLeft() + QPointF(0, -23); });
+std::function<QPointF(const QRectF&)> NetworkEditor::bottomSubnetPortHolderPositioner_([](const QRectF& rect) { return rect.bottomLeft() + QPointF(0, -40); });
 
 void NetworkEditor::setupPortHolder(const std::vector<SharedPointer<PortDescriptionInterface>>& ports, const QString& name, std::function<QPointF(const QRectF&)> position)
 {
@@ -263,15 +261,15 @@ void NetworkEditor::setupPortHolder(const std::vector<SharedPointer<PortDescript
   scene_->addItem(proxy);
   subnetPortHolders_.append(proxy);
 
-  proxy->setPos(position(visible));
+  proxy->setPos(position(visibleRect()));
 }
 
 SubnetInputPortWidget::SubnetInputPortWidget(const QString& name, const QColor& color, const std::string& datatype,
   boost::function<boost::shared_ptr<ConnectionFactory>()> connectionFactory,
   boost::function<boost::shared_ptr<ClosestPortFinder>()> closestPortFinder,
   PortDescriptionInterface* realPort,
   QWidget* parent)
-  : InputPortWidget(name, color, datatype, ModuleId(), PortId(), 0, false, connectionFactory, closestPortFinder, {}, parent), realPort_(realPort)
+  : InputPortWidget(name, color, datatype, ModuleId(), PortId(), 0, true, connectionFactory, closestPortFinder, {}, parent), realPort_(realPort)
 
 {
 
@@ -283,7 +281,7 @@ SubnetOutputPortWidget::SubnetOutputPortWidget(const QString& name, const QColor
   boost::function<boost::shared_ptr<ClosestPortFinder>()> closestPortFinder,
   PortDescriptionInterface* realPort,
   QWidget* parent)
-  : OutputPortWidget(name, color, datatype, ModuleId(), PortId(), 0, false, connectionFactory, closestPortFinder, {}, parent), realPort_(realPort)
+  : OutputPortWidget(name, color, datatype, ModuleId(), PortId(), 0, true, connectionFactory, closestPortFinder, {}, parent), realPort_(realPort)
 {
 
 }
@@ -325,12 +323,12 @@ void NetworkEditor::initializeSubnet(const QString& name, ModuleHandle mod, Netw
   connectorFunc_(subnet);
   subnet->setupPortHolders(mod);
 
-  subnet->setSceneRect(QRectF());
-  subnet->centerView();
-
   auto dock = new SubnetworkEditor(subnet, mod->get_id(), name, nullptr);
   dock->setStyleSheet(SCIRunMainWindow::Instance()->styleSheet());
+  //subnet->setSceneRect(QRectF());
+
   dock->show();
+  subnet->centerView();
 
   childrenNetworks_[name] = dock;
 }