Merge branch 'master' into gcc6-2-fix

Author: dcwhite

src/Dataflow/Engine/Controller/DynamicPortManager.cc

@@ -48,14 +48,11 @@ void DynamicPortManager::connectionAddedNeedToCloneAPort(const SCIRun::Dataflow:
 {
   if (enabled_)
   {
-    //std::cout << "need to clone a port: " << ConnectionId::create(cd).id_ << std::endl;
-    /// @todo: assumption: dynamic = input
     auto moduleIn = controller_->getNetwork()->lookupModule(cd.in_.moduleId_);
     if (moduleIn->getInputPort(cd.in_.portId_)->isDynamic())
     {
       ModuleBuilder builder;
       auto newPortId = builder.cloneInputPort(moduleIn, cd.in_.portId_);
-      //std::cout << "SIGNALLING ADD: " << moduleIn->get_id() << " /// " << newPortId << std::endl;
       portAdded_(moduleIn->get_id(), newPortId);
     }
   }
@@ -65,16 +62,16 @@ void DynamicPortManager::connectionRemovedNeedToRemoveAPort(const SCIRun::Datafl
 {
   if (enabled_)
   {
-    //std::cout << "need to remove a port: " << id.id_ << std::endl;
     auto desc = id.describe();
     auto moduleIn = controller_->getNetwork()->lookupModule(desc.in_.moduleId_);
-    //std::cout << "REMOVE CHECKING: " << desc.in_.moduleId_ << " /// " << desc.in_.portId_ << std::endl;
-    if (moduleIn->getInputPort(desc.in_.portId_)->isDynamic())
+    if (moduleIn)
     {
-      ModuleBuilder builder;
-      builder.removeInputPort(moduleIn, desc.in_.portId_);
-      //std::cout << "SIGNALLING REMOVE: " << moduleIn->get_id() << " /// " << desc.in_.portId_ << std::endl;
-      portRemoved_(moduleIn->get_id(), desc.in_.portId_);
+      if (moduleIn->getInputPort(desc.in_.portId_)->isDynamic())
+      {
+        ModuleBuilder builder;
+        builder.removeInputPort(moduleIn, desc.in_.portId_);
+        portRemoved_(moduleIn->get_id(), desc.in_.portId_);
+      }
     }
   }
 }

src/Interface/Application/Connection.cc

@@ -205,28 +205,35 @@ namespace SCIRun
       {
         deleteAction_ = addAction(deleteAction);
         addWidgetToExecutionDisableList(deleteAction_);
-        insertAction_ = addAction(insertModuleAction);
-        addWidgetToExecutionDisableList(insertAction_);
-
-
-        auto insertable = new QMenu;
-        fillInsertModuleMenu(insertable, Application::Instance().controller()->getAllAvailableModuleDescriptions(), conn->connectedPorts().first, conn);
-        insertAction_->setMenu(insertable);
-
+        if (!eitherPortDynamic(conn->connectedPorts()))
+        {
+          insertAction_ = addAction(insertModuleAction);
+          addWidgetToExecutionDisableList(insertAction_);
+          auto insertable = new QMenu;
+          fillInsertModuleMenu(insertable, Application::Instance().controller()->getAllAvailableModuleDescriptions(), conn->connectedPorts().first, conn);
+          insertAction_->setMenu(insertable);
+        }
         disableAction_ = addAction(disableEnableAction);
         addWidgetToExecutionDisableList(disableAction_);
         notesAction_ = addAction(editNotesAction);
       }
       ~ConnectionMenu()
       {
         removeWidgetFromExecutionDisableList(deleteAction_);
-        removeWidgetFromExecutionDisableList(insertAction_);
+        if (insertAction_)
+          removeWidgetFromExecutionDisableList(insertAction_);
         removeWidgetFromExecutionDisableList(disableAction_);
       }
-      QAction* notesAction_;
-      QAction* deleteAction_;
-      QAction* disableAction_;
-      QAction* insertAction_;
+      QAction* notesAction_{ nullptr };
+      QAction* deleteAction_{ nullptr };
+      QAction* disableAction_{ nullptr };
+      QAction* insertAction_{ nullptr };
+
+    private:
+      bool eitherPortDynamic(const std::pair<PortWidget*, PortWidget*>& ports) const
+      {
+        return ports.first->isDynamic() || ports.second->isDynamic();
+      }
     };
   }
 }

src/Interface/Application/ModuleProxyWidget.cc

@@ -369,11 +369,6 @@ bool ModuleProxyWidget::isSubwidget(QWidget* alienWidget) const
     qobject_cast<QProgressBar*>(alienWidget);
 }
 
-void ModuleProxyWidget::menuFunction()
-{
-  module_->menuFunction();
-}
-
 void ModuleProxyWidget::highlightIfSelected()
 {
   if (!isSelected_ && isSelected())

src/Interface/Application/ModuleProxyWidget.h

@@ -52,7 +52,6 @@ namespace SCIRun
       void createStartupNote();
       void adjustHeight(int delta);
       void adjustWidth(int delta);
-      void menuFunction();
 
       //TODO: move to utility
       static void ensureItemVisible(QGraphicsItem* item);

src/Interface/Application/ModuleWidget.cc

@@ -74,7 +74,7 @@ namespace Gui {
         << new QAction("Help", parent)
         << new QAction("Edit Notes...", parent)
         << new QAction("Duplicate", parent)
-        << new QAction("Replace With", parent)
+        << new QAction("Replace With...", parent)
         //<< disabled(new QAction("Ignore*", parent))
         << new QAction("Show Log", parent)
         //<< disabled(new QAction("Make Sub-Network", parent))  // Issue #287
@@ -335,6 +335,7 @@ ModuleWidget::ModuleWidget(NetworkEditor* ed, const QString& name, ModuleHandle
   theModule_(theModule),
   previousModuleState_(UNSET),
   moduleId_(id(theModule)),
+  name_(name),
   dialog_(nullptr),
   dockable_(nullptr),
   dialogErrorControl_(dialogErrorControl),
@@ -527,20 +528,39 @@ void ModuleWidget::setupModuleActions()
     || theModule_->get_id().name_ == "Subnet")
     actionsMenu_->getMenu()->removeAction(actionsMenu_->getAction("Duplicate"));
   if (theModule_->get_id().name_ == "Subnet")
-    actionsMenu_->getMenu()->removeAction(actionsMenu_->getAction("Replace With"));
+    actionsMenu_->getMenu()->removeAction(actionsMenu_->getAction("Replace With..."));
 
   connectNoteEditorToAction(actionsMenu_->getAction("Notes"));
   connectUpdateNote(this);
 }
 
 void ModuleWidget::postLoadAction()
 {
-  auto replaceWith = actionsMenu_->getAction("Replace With");
-  auto menu = new QMenu(this);
-  replaceWith->setMenu(menu);
-  fillReplaceWithMenu();
-  connect(this, SIGNAL(connectionAdded(const SCIRun::Dataflow::Networks::ConnectionDescription&)), this, SLOT(fillReplaceWithMenu()));
-  connect(this, SIGNAL(connectionDeleted(const SCIRun::Dataflow::Networks::ConnectionId&)), this, SLOT(fillReplaceWithMenu()));
+  auto replaceWith = actionsMenu_->getAction("Replace With...");
+  if (replaceWith)
+    connect(replaceWith, SIGNAL(triggered()), this, SLOT(showReplaceWithWidget()));
+}
+
+void ModuleWidget::showReplaceWithWidget()
+{
+#ifndef __APPLE__
+  replaceWithDialog_ = new QDialog;
+  replaceWithDialog_->setWindowTitle("Replace a module");
+  auto layout = new QHBoxLayout;
+  layout->addWidget(new QLabel("Replace " + name_ + " with:"));
+  auto button = new QPushButton("Choose a compatible module");
+  auto menu = new QMenu;
+  button->setMenu(menu);
+  fillReplaceWithMenu(menu);
+  layout->addWidget(button);
+  auto cancel = new QPushButton("Cancel");
+  connect(cancel, SIGNAL(clicked()), replaceWithDialog_, SLOT(reject()));
+  layout->addWidget(cancel);
+  replaceWithDialog_->setLayout(layout);
+  replaceWithDialog_->exec();
+#else
+  QMessageBox::information(nullptr, "Replace with disabled", "The replace with command is disabled on OSX until the Qt 5 upgrade is complete.");
+#endif
 }
 
 bool ModuleWidget::guiVisible() const
@@ -550,35 +570,25 @@ bool ModuleWidget::guiVisible() const
   return false;
 }
 
-void ModuleWidget::fillReplaceWithMenu()
+void ModuleWidget::fillReplaceWithMenu(QMenu* menu)
 {
   if (deleting_ || networkBeingCleared_)
     return;
 
-  auto menu = getReplaceWithMenu();
   menu->clear();
   LOG_DEBUG("Filling menu for " << theModule_->get_module_name() << std::endl);
   auto replacements = Application::Instance().controller()->possibleReplacements(this->theModule_);
   auto isReplacement = [&](const ModuleDescription& md) { return replacements.find(md.lookupInfo_) != replacements.end(); };
   fillMenuWithFilteredModuleActions(menu, Application::Instance().controller()->getAllAvailableModuleDescriptions(),
     isReplacement,
     [=](QAction* action) { QObject::connect(action, SIGNAL(triggered()), this, SLOT(replaceModuleWith())); },
-    fullWidgetDisplay_->getModuleActionButton());
-}
-
-void ModuleWidget::menuFunction()
-{
-  // fullWidgetDisplay_->getModuleActionButton()->setMenu(nullptr);
-  // actionsMenu_.reset();
-}
-
-QMenu* ModuleWidget::getReplaceWithMenu()
-{
-  return actionsMenu_->getAction("Replace With")->menu();
+    replaceWithDialog_);
 }
 
 void ModuleWidget::replaceModuleWith()
 {
+  delete replaceWithDialog_;
+  replaceWithDialog_ = nullptr;
   auto action = qobject_cast<QAction*>(sender());
   auto moduleToReplace = action->text();
   Q_EMIT replaceModuleWith(theModule_, moduleToReplace.toStdString());
@@ -967,7 +977,6 @@ ModuleWidget::NetworkClearingScope::~NetworkClearingScope()
 ModuleWidget::~ModuleWidget()
 {
   disconnect(this, SIGNAL(dynamicPortChanged(const std::string&, bool)), this, SLOT(updateDialogForDynamicPortChange(const std::string&, bool)));
-  disconnect(this, SIGNAL(connectionDeleted(const SCIRun::Dataflow::Networks::ConnectionId&)), this, SLOT(fillReplaceWithMenu()));
 
   if (!theModule_->isStoppable())
   {

src/Interface/Application/ModuleWidget.h

@@ -151,9 +151,9 @@ class ModuleWidget : public QStackedWidget,
   int portSpacing() const;
   void setPortSpacing(bool highlighted);
 
-  virtual boost::signals2::connection connectExecuteBegins(const SCIRun::Dataflow::Networks::ExecuteBeginsSignalType::slot_type& subscriber) override final;
-  virtual boost::signals2::connection connectExecuteEnds(const SCIRun::Dataflow::Networks::ExecuteEndsSignalType::slot_type& subscriber) override final;
-  virtual boost::signals2::connection connectErrorListener(const SCIRun::Dataflow::Networks::ErrorSignalType::slot_type& subscriber) override final;
+  boost::signals2::connection connectExecuteBegins(const SCIRun::Dataflow::Networks::ExecuteBeginsSignalType::slot_type& subscriber) override final;
+  boost::signals2::connection connectExecuteEnds(const SCIRun::Dataflow::Networks::ExecuteEndsSignalType::slot_type& subscriber) override final;
+  boost::signals2::connection connectErrorListener(const SCIRun::Dataflow::Networks::ErrorSignalType::slot_type& subscriber) override final;
 
   void updateNoteFromFile(const Note& note);
 
@@ -174,7 +174,7 @@ class ModuleWidget : public QStackedWidget,
   void setupPortSceneCollaborator(QGraphicsProxyWidget* proxy);
 
 public Q_SLOTS:
-  virtual bool executeWithSignals() override;
+  bool executeWithSignals() override;
   void toggleOptionsDialog();
   void setLogButtonColor(const QColor& color);
   void resetLogButtonColor();
@@ -194,7 +194,6 @@ public Q_SLOTS:
   void updateMetadata(bool active);
   void updatePortSpacing(bool highlighted);
   void replaceMe();
-  void menuFunction();
 Q_SIGNALS:
   void removeModule(const SCIRun::Dataflow::Networks::ModuleId& moduleId);
   void interrupt(const SCIRun::Dataflow::Networks::ModuleId& moduleId);
@@ -234,14 +233,14 @@ private Q_SLOTS:
   void executeTriggeredProgrammatically(bool upstream);
   void stopButtonPushed();
   void colorOptionsButton(bool visible);
-  void fillReplaceWithMenu();
   void replaceModuleWith();
   void updateDialogForDynamicPortChange(const std::string& portName, bool adding);
   void handleDialogFatalError(const QString& message);
   void changeExecuteButtonToPlay();
   void changeExecuteButtonToStop();
   void updateDockWidgetProperties(bool isFloating);
   void incomingConnectionStateChanged(bool disabled, int index);
+  void showReplaceWithWidget();
 protected:
   virtual void enterEvent(QEvent* event) override;
   virtual void leaveEvent(QEvent* event) override;
@@ -253,6 +252,7 @@ private Q_SLOTS:
   bool executedOnce_, skipExecuteDueToFatalError_, disabled_;
   std::atomic<bool> errored_;
   int previousPageIndex_ {0};
+  QDialog* replaceWithDialog_{ nullptr };
 
   SCIRun::Dataflow::Networks::ModuleHandle theModule_;
   std::atomic<int> previousModuleState_;
@@ -264,6 +264,7 @@ private Q_SLOTS:
   void setupDisplayConnections(ModuleWidgetDisplayBase* display);
   void resizeBasedOnModuleName(ModuleWidgetDisplayBase* display, int index);
   std::string moduleId_;
+  QString name_;
   class ModuleDialogGeneric* dialog_;
   QDockWidget* dockable_;
   void makeOptionsDialog();
@@ -274,9 +275,9 @@ private Q_SLOTS:
   void adjustDockState(bool dockEnabled);
   Qt::DockWidgetArea allowedDockArea() const;
   void printInputPorts(const SCIRun::Dataflow::Networks::ModuleInfoProvider& moduleInfoProvider) const;
-  QMenu* getReplaceWithMenu();
   void setInputPortSpacing(bool highlighted);
   void setOutputPortSpacing(bool highlighted);
+  void fillReplaceWithMenu(QMenu* menu);
 
   class ModuleLogWindow* logWindow_;
   boost::scoped_ptr<class ModuleActionsMenu> actionsMenu_;

src/Interface/Application/NetworkEditor.cc

@@ -276,7 +276,7 @@ void NetworkEditor::replaceModuleWith(const ModuleHandle& moduleToReplace, const
   InEditingContext iec(this);
 
   auto oldModule = findById(scene_->items(), moduleToReplace->get_id());
-  lastModulePosition_ = oldModule->scenePos();
+  lastModulePosition_ = oldModule->scenePos() - QPointF(15, 15);;
   controller_->addModule(newModuleName);
 
   // connect up same ports

src/Interface/Application/NetworkEditor.h

@@ -269,6 +269,17 @@ namespace Gui {
     using ConnectorFunc = std::function<void(NetworkEditor*)>;
     static void setConnectorFunc(ConnectorFunc func) { connectorFunc_ = func; }
 
+    struct InEditingContext
+    {
+      explicit InEditingContext(NetworkEditor* ed)
+      {
+        inEditingContext_ = ed;
+      }
+      ~InEditingContext()
+      {
+        inEditingContext_ = nullptr;
+      }
+    };
   protected:
     void dropEvent(QDropEvent* event) override;
     void dragEnterEvent(QDragEnterEvent* event) override;
@@ -438,17 +449,7 @@ namespace Gui {
     }
 
     static NetworkEditor* inEditingContext_;
-    struct InEditingContext
-    {
-      explicit InEditingContext(NetworkEditor* ed)
-      {
-        inEditingContext_ = ed;
-      }
-      ~InEditingContext()
-      {
-        inEditingContext_ = nullptr;
-      }
-    };
+    
     static ConnectorFunc connectorFunc_;
     static std::function<QPointF(const QRectF&)> topSubnetPortHolderPositioner_;
     static std::function<QPointF(const QRectF&)> bottomSubnetPortHolderPositioner_;