Merge branch 'master' into conditional

Author: dcwhite

src/Dataflow/Engine/Controller/NetworkEditorController.cc

@@ -607,8 +607,17 @@ boost::shared_ptr<boost::thread> NetworkEditorController::executeAll(const Execu
 
 void NetworkEditorController::executeModule(const ModuleHandle& module, const ExecutableLookup* lookup, bool executeUpstream)
 {
-  ExecuteSingleModule filter(module, *theNetwork_, executeUpstream);
-  executeGeneric(lookup, filter);
+  try
+  {
+    ExecuteSingleModule filter(module, *theNetwork_, executeUpstream);
+    executeGeneric(lookup, filter);
+  }
+  catch (NetworkHasCyclesException&)
+  {
+    SCIRun::Core::Logging::Log::get() << SCIRun::Core::Logging::ERROR_LOG << "Cannot schedule execution: network has cycles. Please break all cycles and try again." << std::endl;
+    ExecutionContext::executionBounds_.executeFinishes_(-1);
+    return;
+  }
 }
 
 void NetworkEditorController::initExecutor()
@@ -624,6 +633,10 @@ ExecutionContextHandle NetworkEditorController::createExecutionContext(const Exe
 boost::shared_ptr<boost::thread> NetworkEditorController::executeGeneric(const ExecutableLookup* lookup, ModuleFilter filter)
 {
   initExecutor();
+
+
+
+
   auto context = createExecutionContext(lookup, filter);
 
   return executionManager_.enqueueContext(context);

src/Dataflow/Engine/Scheduler/GraphNetworkAnalyzer.cc

@@ -137,13 +137,40 @@ ComponentMap NetworkGraphAnalyzer::connectedComponents()
   return componentMap;
 }
 
+namespace SCIRun
+{
+  namespace Dataflow
+  {
+    namespace Engine
+    {
+      class ExecuteSingleModuleImpl
+      {
+      public:
+        ParallelModuleExecutionOrder order_;
+        bool isDownstreamFrom(const ModuleId& toCheckId, const ModuleId& rootId) const
+        {
+          return order_.groupOf(toCheckId) >= order_.groupOf(rootId);
+        }
+      };
+    }
+  }
+}
+
 ExecuteSingleModule::ExecuteSingleModule(SCIRun::Dataflow::Networks::ModuleHandle mod,
   const SCIRun::Dataflow::Networks::NetworkInterface& network,
   bool executeUpstream) : module_(mod), network_(network), executeUpstream_(executeUpstream)
 {
   //TODO: composite with which filter?
   NetworkGraphAnalyzer analyze(network, ExecuteAllModules::Instance(), false);
   components_ = analyze.connectedComponents();
+
+  if (!executeUpstream_)
+  {
+    orderImpl_.reset(new ExecuteSingleModuleImpl);
+    auto all = boost::lambda::constant(true);
+    BoostGraphParallelScheduler scheduleAll(all);
+    orderImpl_->order_ = scheduleAll.schedule(network_);
+  }
 }
 
 bool ExecuteSingleModule::operator()(SCIRun::Dataflow::Networks::ModuleHandle mod) const
@@ -167,11 +194,8 @@ bool ExecuteSingleModule::operator()(SCIRun::Dataflow::Networks::ModuleHandle mo
   }
   else
   {
-    auto all = boost::lambda::constant(true);
-    BoostGraphParallelScheduler scheduleAll(all);
-    auto order = scheduleAll.schedule(network_);
-
     // should execute if in same connected component, and downstream only
-    return modIdIter->second == rootIdIter->second && order.groupOf(toCheckId) >= order.groupOf(rootId);
+    return modIdIter->second == rootIdIter->second
+      && orderImpl_->isDownstreamFrom(toCheckId, rootId);
   }
 }

src/Dataflow/Engine/Scheduler/SchedulerInterfaces.h

@@ -137,6 +137,8 @@ namespace Engine {
     static const ModuleWaitingFilter& Instance();
   };
 
+  class ExecuteSingleModuleImpl;
+
   struct SCISHARE ExecuteSingleModule
   {
     ExecuteSingleModule(SCIRun::Dataflow::Networks::ModuleHandle mod,
@@ -147,6 +149,7 @@ namespace Engine {
     const SCIRun::Dataflow::Networks::NetworkInterface& network_;
     std::map<std::string, int> components_;
     bool executeUpstream_;
+    boost::shared_ptr<ExecuteSingleModuleImpl> orderImpl_;
   };
 
   class SCISHARE WaitsForStartupInitialization

src/Interface/Application/Connection.cc

@@ -386,6 +386,7 @@ void ConnectionLine::addSubnetCompanion(PortWidget* subnetPort)
 
   subnetCompanion_->isCompanion_ = true;
   subnetCompanion_->trackNodes();
+  subnetCompanion_->setVisible(true);
 }
 
 void ConnectionLine::deleteCompanion()
@@ -554,6 +555,7 @@ void ConnectionLine::keyPressEvent(QKeyEvent* event)
 {
   if (event->key() == Qt::Key_I)
     DataInfoDialog::show(fromPort_->getPortDataDescriber(), "Connection", id_.id_);
+  QGraphicsPathItem::keyPressEvent(event);
 }
 
 ConnectionInProgressStraight::ConnectionInProgressStraight(PortWidget* port, ConnectionDrawStrategyPtr drawer)

src/Interface/Application/ModuleWidget.cc

@@ -522,8 +522,12 @@ void ModuleWidget::setupModuleActions()
   connect(this, SIGNAL(updateProgressBarSignal(double)), this, SLOT(updateProgressBar(double)));
   connect(actionsMenu_->getAction("Help"), SIGNAL(triggered()), this, SLOT(launchDocumentation()));
   connect(actionsMenu_->getAction("Duplicate"), SIGNAL(triggered()), this, SLOT(duplicate()));
-  if (isViewScene_ || theModule_->hasDynamicPorts()) //TODO: buggy combination, will disable for now. Fix is #1035
+  if (isViewScene_
+    || theModule_->hasDynamicPorts()  //TODO: buggy combination, will disable for now. Fix is #1035
+    || theModule_->get_id().name_ == "Subnet")
     actionsMenu_->getMenu()->removeAction(actionsMenu_->getAction("Duplicate"));
+  if (theModule_->get_id().name_ == "Subnet")
+    actionsMenu_->getMenu()->removeAction(actionsMenu_->getAction("Replace With"));
 
   connectNoteEditorToAction(actionsMenu_->getAction("Notes"));
   connectUpdateNote(this);

src/Interface/Application/NetworkEditor.cc

@@ -1329,7 +1329,7 @@ void NetworkEditor::clear()
   QList<QGraphicsItem*> deleteTheseFirst;
   Q_FOREACH(QGraphicsItem* item, scene_->items())
   {
-    if (auto s = dynamic_cast<SubnetWidget*>(getModule(item)))
+    if (dynamic_cast<SubnetWidget*>(getModule(item)))
     {
       deleteTheseFirst.append(item);
     }

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

@@ -1095,9 +1095,10 @@ namespace {
   }
 
   const QString bullet = "* ";
+  const QString hash = "# ";
   const QString favoritesText = bullet + "Favorites";
-  const QString clipboardHistoryText = bullet + "Clipboard History";
-  const QString savedSubsText = bullet + "Saved Subnetworks";
+  const QString clipboardHistoryText = hash + "Clipboard History";
+  const QString savedSubsText = hash + "Saved Fragments";
 
   void addFavoriteMenu(QTreeWidget* tree)
   {
@@ -1145,16 +1146,16 @@ namespace {
 
   void readCustomSnippets(QTreeWidgetItem* snips)
   {
-    QFile inputFile("snippets.txt");
+    QFile inputFile("patterns.txt");
     if (inputFile.open(QIODevice::ReadOnly))
     {
-      GuiLogger::Instance().logInfo("Snippet file opened: " + inputFile.fileName());
+      GuiLogger::Instance().logInfo("Pattern file opened: " + inputFile.fileName());
       QTextStream in(&inputFile);
       while (!in.atEnd())
       {
         QString line = in.readLine();
         addSnippet(line, snips);
-        GuiLogger::Instance().logInfo("Snippet read: " + line);
+        GuiLogger::Instance().logInfo("Pattern read: " + line);
       }
       inputFile.close();
     }
@@ -1163,7 +1164,7 @@ namespace {
   void addSnippetMenu(QTreeWidget* tree)
 	{
 		auto snips = new QTreeWidgetItem();
-    snips->setText(0, bullet + "Snippets");
+    snips->setText(0, bullet + "Typical Patterns");
 		snips->setForeground(0, favesColor());
 
 		//hard-code a few popular ones.
@@ -1414,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;
@@ -1573,8 +1574,7 @@ void SCIRunMainWindow::hideNonfunctioningWidgets()
   nonfunctioningActions <<
     actionInsert_;
   QList<QMenu*> nonfunctioningMenus;
-  nonfunctioningMenus <<
-    menuSubnets_;
+  //nonfunctioningMenus <<  menuSubnets_;
   QList<QWidget*> nonfunctioningWidgets;
   nonfunctioningWidgets <<
     prefsWindow_->scirunNetsLabel_ <<
@@ -1802,16 +1802,50 @@ void SCIRunMainWindow::addModuleToWindowList(const QString& modId, bool hasUI)
   connect(modAction, SIGNAL(triggered()), networkEditor_, SLOT(moduleWindowAction()));
   currentModuleActions_.insert(modId, modAction);
   menuCurrent_->addAction(modAction);
+
+  if (modId.contains("Subnet"))
+  {
+    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()
@@ -1912,11 +1946,10 @@ void SCIRunMainWindow::updateClipboardHistory(const QString& xml)
 
 void SCIRunMainWindow::showSnippetHelp()
 {
-  QMessageBox::information(this, "Snippets",
-    "Snippets are strings that encode a linear subnetwork. They can vastly shorten network construction time. They take the form [A->B->...->C] where A, B, C, etc are module names, and the arrow represents a connection between adjacent modules. "
+  QMessageBox::information(this, "Patterns",
+    "Patterns are strings that encode a linear subnetwork. They can vastly shorten network construction time. They take the form [A->B->...->C] where A, B, C, etc are module names, and the arrow represents a connection between adjacent modules. "
     "\n\nThey are available in the module selector and work just like the single module entries there: double-click or drag onto the "
-    "network editor to insert the entire snippet. A '*' at the end of the module name will open the UI for that module.\n\nCustom snippets can be created by editing the file snippets.txt (if not present, create it) in the same folder as the SCIRun executable. Enter one snippet per line in the prescribed format, then restart SCIRun for them to appear."
-    "\n\nFeatures coming soon include: hotkeys."
+    "network editor to insert the entire snippet. A '*' at the end of the module name will open the UI for that module.\n\nCustom patterns can be created by editing the file patterns.txt (if not present, create it) in the same folder as the SCIRun executable. Enter one pattern per line in the prescribed format, then restart SCIRun for them to appear."
     "\n\nFor feedback, please comment on this issue: https://github.com/SCIInstitute/SCIRun/issues/1263"
     );
 }
@@ -1926,9 +1959,9 @@ void SCIRunMainWindow::showClipboardHelp()
   QMessageBox::information(this, "Clipboard",
     "The network editor clipboard works on arbitrary network selections (modules and connections). A history of five copied items is kept under \"Clipboard History\" in the module selector. "
     "\n\nTo cut/copy/paste, see the Edit menu and the corresponding hotkeys."
-    "\n\nClipboard history items can be starred like module favorites. When starred, they are saved as fragments under \"Saved Subnetworks,\" which are preserved in application settings. "
-    "\n\nThe user may edit the text of the saved subnetwork items to give them informative names, which are also saved. Hover over them to see a tooltip representation of the saved fragment."
-    "\n\nCurrently there is no way to delete a saved subnetwork in the GUI."
+    "\n\nClipboard history items can be starred like module favorites. When starred, they are saved as fragments under \"Saved Fragments,\" which are preserved in application settings. "
+    "\n\nThe user may edit the text of the saved fragment items to give them informative names, which are also saved. Hover over them to see a tooltip representation of the saved fragment."
+    "\n\nRight-click on the fragment item to rename or delete it."
     );
 }
 

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

@@ -121,11 +121,26 @@
    </widget>
    <widget class="QMenu" name="menuSubnets_">
     <property name="enabled">
-     <bool>false</bool>
+     <bool>true</bool>
     </property>
     <property name="title">
      <string>&amp;Subnets</string>
     </property>
+    <widget class="QMenu" name="menuCurrentSubnets_">
+     <property name="title">
+      <string>Current</string>
+     </property>
+    </widget>
+    <widget class="QMenu" name="menuSavedSubnets_">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="title">
+      <string>Saved</string>
+     </property>
+    </widget>
+    <addaction name="menuCurrentSubnets_"/>
+    <addaction name="menuSavedSubnets_"/>
    </widget>
    <widget class="QMenu" name="menuToolkits_">
     <property name="enabled">
@@ -239,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"/>
@@ -1147,6 +1162,16 @@
     <string>Advanced</string>
    </property>
   </action>
+  <action name="actionX">
+   <property name="text">
+    <string>x</string>
+   </property>
+  </action>
+  <action name="actionA">
+   <property name="text">
+    <string>a</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections>