Working on subnet renaming

Author: dcwhite

src/Interface/Application/NetworkEditor.h

@@ -323,6 +323,7 @@ namespace Gui {
     void showSubnetChild(const QString& name);
     void addSubnetChild(const QString& name, SCIRun::Dataflow::Networks::ModuleHandle mod);
     void removeSubnetChild(const QString& name);
+    void subnetMenuActionTriggered();
 
   Q_SIGNALS:
     void connectionDeleted(const SCIRun::Dataflow::Networks::ConnectionId& id);
@@ -425,6 +426,7 @@ namespace Gui {
     std::vector<QGraphicsItem*> subnetItemsToMove();
     PortRewiringMap portRewiringMap_;
     QSet<QString> currentSubnetNames_;
+    std::map<std::string, QString> subnetNameMap_;
 
     template <typename Func>
     void tailRecurse(Func func)

src/Interface/Application/SCIRunMainWindow.cc

@@ -1415,7 +1415,7 @@ void SCIRunMainWindow::renameSavedSubnetwork()
 {
   auto toRename = sender()->property("ID").toString();
   bool ok;
-  auto text = QInputDialog::getText(this, tr("Rename subnet"), tr("Enter new subnet name:"), QLineEdit::Normal, savedSubnetworksNames_[toRename].toString(), &ok);
+  auto text = QInputDialog::getText(this, tr("Rename fragment"), tr("Enter new fragment name:"), QLineEdit::Normal, savedSubnetworksNames_[toRename].toString(), &ok);
   if (ok && !text.isEmpty())
   {
     savedSubnetworksNames_[toRename] = text;
@@ -1805,18 +1805,47 @@ void SCIRunMainWindow::addModuleToWindowList(const QString& modId, bool hasUI)
 
   if (modId.contains("Subnet"))
   {
-    qDebug() << "do subnet stuff";
+    if (menuCurrentSubnets_->actions().isEmpty())
+      menuCurrentSubnets_->setEnabled(true);
+
+    auto subnetMenu = new QMenu(modId, this);
+    auto showAction = new QAction(subnetMenu);
+    showAction->setText("Show");
+    subnetMenu->addAction(showAction);
+    auto renameAction = new QAction(subnetMenu);
+    renameAction->setText("Rename...");
+    subnetMenu->addAction(renameAction);
+
+    connect(showAction, SIGNAL(triggered()), networkEditor_, SLOT(subnetMenuActionTriggered()));
+    connect(renameAction, SIGNAL(triggered()), networkEditor_, SLOT(subnetMenuActionTriggered()));
+    qDebug() << "add" << modId;
+    currentSubnetActions_.insert(modId, subnetMenu);
+    menuCurrentSubnets_->addMenu(subnetMenu);
   }
 }
 
 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);
   if (menuCurrent_->actions().isEmpty())
     menuCurrent_->setEnabled(false);
+
+  if (modId.id_.find("Subnet") != std::string::npos)
+  {
+    qDebug() << currentSubnetActions_;
+    auto subnet = currentSubnetActions_[name];
+    if (subnet)
+      subnet->setEnabled(false);
+    // //menuCurrentSubnets_->remove(subnet);
+    // currentSubnetActions_.remove(name);
+    // if (menuCurrentSubnets_->actions().isEmpty())
+    //   menuCurrentSubnets_->setEnabled(false);
+  }
+
 }
 
 void SCIRunMainWindow::setupTagManagerWindow()

src/Interface/Application/SCIRunMainWindow.h

@@ -173,6 +173,7 @@ public Q_SLOTS:
   int returnCode_ { 0 };
   QMap<QString,QMap<QString,QString>> styleSheetDetails_;
   QMap<QString, QAction*> currentModuleActions_;
+  QMap<QString, QMenu*> currentSubnetActions_;
   boost::shared_ptr<class DialogErrorControl> dialogErrorControl_;
   boost::shared_ptr<class NetworkExecutionProgressBar> networkProgressBar_;
   boost::shared_ptr<class GuiActionProvenanceConverter> commandConverter_;

src/Interface/Application/SCIRunMainWindow.ui

@@ -254,8 +254,8 @@
    </widget>
    <addaction name="menuFile_"/>
    <addaction name="menuEdit"/>
-   <addaction name="menuModules_"/>
    <addaction name="menuNetwork"/>
+   <addaction name="menuModules_"/>
    <addaction name="menuSubnets_"/>
    <addaction name="menuToolkits_"/>
    <addaction name="menuWindow"/>

src/Interface/Application/Subnetworks.cc

@@ -170,6 +170,7 @@ std::vector<QGraphicsItem*> NetworkEditor::subnetItemsToMove()
 void NetworkEditor::removeSubnetChild(const QString& name)
 {
   childrenNetworks_.erase(name);
+  //TODO: erase from subnetNameMap_
 }
 
 void NetworkEditor::addSubnetChild(const QString& name, ModuleHandle mod)
@@ -206,6 +207,41 @@ void NetworkEditor::showSubnetChild(const QString& name)
   }
 }
 
+void NetworkEditor::subnetMenuActionTriggered()
+{
+  auto action = qobject_cast<QAction*>(sender());
+  auto subnetId = qobject_cast<QMenu*>(action->parent())->title();
+  auto actionText = action->text();
+  if ("Show" == actionText)
+  {
+    showSubnetChild(subnetNameMap_[subnetId.toStdString()]);
+  }
+  else if ("Rename..." == actionText)
+  {
+    bool ok;
+    auto text = QInputDialog::getText(this, tr("Rename subnet"), tr("Enter new subnet name:"),
+      QLineEdit::Normal, subnetNameMap_[subnetId.toStdString()], &ok);
+    if (ok && !text.isEmpty())
+    {
+      qDebug() << "how to rename subnet";
+    }
+
+
+  }
+  // Q_FOREACH(QGraphicsItem* item, scene_->items())
+  // {
+  //   auto module = getModule(item);
+  //   if (module && module->getModuleId() == action->text().toStdString())
+  //   {
+  //     if (module->guiVisible())
+  //       module->hideUI();
+  //     else
+  //       module->showUI();
+  //     break;
+  //   }
+  // }
+}
+
 QRectF NetworkEditor::visibleRect() const
 {
   return mapToScene(rect()).boundingRect();
@@ -658,6 +694,7 @@ void NetworkEditor::makeSubnetworkFromComponents(const QString& name, const std:
   childrenNetworkItems_[name] = items;
 
   addSubnetChild(name, subnetModule);
+  subnetNameMap_[subnetModule->get_id()] = name;
 
   Q_EMIT modified();
   Q_EMIT newModule(QString::fromStdString(subnetModule->get_id()), subnetModule->has_ui());