Improved replace-with menu

Author: dcwhite

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

@@ -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),
@@ -536,35 +537,26 @@ void ModuleWidget::setupModuleActions()
 void ModuleWidget::postLoadAction()
 {
   auto replaceWith = actionsMenu_->getAction("Replace With...");
-  connect(replaceWith, SIGNAL(triggered()), this, SLOT(showReplaceWithWidget()));
-  replaceWithWidget_ = new QPushButton(this);
-  auto menu = new QMenu(this);
-  replaceWithWidget_->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()));
+  if (replaceWith)
+    connect(replaceWith, SIGNAL(triggered()), this, SLOT(showReplaceWithWidget()));
 }
 
 void ModuleWidget::showReplaceWithWidget()
 {
-  qDebug() << __FUNCTION__;
-  /*QMessageBox msgBox;
-  QPushButton *connectButton = msgBox.addButton("Replacement", QMessageBox::ActionRole);
-  qDebug() << replaceWithWidget_->menu()->actions().size();
-  connectButton->setMenu(replaceWithWidget_->menu());
-  QPushButton *abortButton = msgBox.addButton(QMessageBox::Abort);
-  msgBox.setText("Press button to replace.");
-
-  QDialog dialog;
-  auto l = new QHBoxLayout;
-  auto b = new QPushButton("Replacement");
-  auto menu = new QMenu(this);
-  b->setMenu(menu);
-  fillReplaceWithMenuImpl(menu);
-  l->addWidget(b);
-  dialog.setLayout(l);
-  dialog.exec();
-  */
+  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();
 }
 
 bool ModuleWidget::guiVisible() const
@@ -574,15 +566,7 @@ bool ModuleWidget::guiVisible() const
   return false;
 }
 
-void ModuleWidget::fillReplaceWithMenu()
-{
-  if (deleting_ || networkBeingCleared_)
-    return;
-
-  fillReplaceWithMenuImpl(getReplaceWithMenu());
-}
-
-void ModuleWidget::fillReplaceWithMenuImpl(QMenu* menu)
+void ModuleWidget::fillReplaceWithMenu(QMenu* menu)
 {
   if (deleting_ || networkBeingCleared_)
     return;
@@ -594,22 +578,12 @@ void ModuleWidget::fillReplaceWithMenuImpl(QMenu* menu)
   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 replaceWithWidget_->menu();
+    replaceWithDialog_);
 }
 
 void ModuleWidget::replaceModuleWith()
 {
+  delete replaceWithDialog_;
   auto action = qobject_cast<QAction*>(sender());
   auto moduleToReplace = action->text();
   Q_EMIT replaceModuleWith(theModule_, moduleToReplace.toStdString());
@@ -998,7 +972,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,7 +233,6 @@ 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);
@@ -254,7 +252,7 @@ private Q_SLOTS:
   bool executedOnce_, skipExecuteDueToFatalError_, disabled_;
   std::atomic<bool> errored_;
   int previousPageIndex_ {0};
-  QPushButton* replaceWithWidget_{nullptr};
+  QDialog* replaceWithDialog_{ nullptr };
 
   SCIRun::Dataflow::Networks::ModuleHandle theModule_;
   std::atomic<int> previousModuleState_;
@@ -266,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();
@@ -276,10 +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 fillReplaceWithMenuImpl(QMenu* menu);
+  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/Subnetworks.cc

@@ -125,13 +125,7 @@ void NetworkEditor::sendItemsToParent()
       {
         conn->deleteCompanion();
       }
-
-      auto module = getModule(item);
-      if (module)
-      {
-        module->menuFunction();
-      }
-
+      
       auto proxy = dynamic_cast<ModuleProxyWidget*>(item);
       if (proxy)
       {