Hook up signal/slots to distinguish actions

Author: dcwhite

src/Interface/Application/Connection.cc

@@ -291,7 +291,8 @@ ConnectionLine::ConnectionLine(PortWidget* fromPort, PortWidget* toPort, const C
   connect(menu_->disableAction_, SIGNAL(triggered()), this, SLOT(toggleDisabled()));
 
   connect(this, SIGNAL(insertNewModule(const SCIRun::Dataflow::Networks::PortDescriptionInterface*, const std::string&, const SCIRun::Dataflow::Networks::PortDescriptionInterface*)),
-    fromPort_, SIGNAL(connectNewModule(const SCIRun::Dataflow::Networks::PortDescriptionInterface*, const std::string&)));
+    fromPort_, SLOT(insertNewModule(const SCIRun::Dataflow::Networks::PortDescriptionInterface*, const std::string&, const SCIRun::Dataflow::Networks::PortDescriptionInterface*)));
+  setProperty(addNewModuleActionTypePropertyName(), QString("insertModule"));
 
   menu_->setStyleSheet(fromPort->styleSheet());
 
@@ -446,7 +447,7 @@ QVariant ConnectionLine::itemChange(GraphicsItemChange change, const QVariant& v
 	//Position drag movement relative to movement in network. Otherwise CL moves relative to modules as though they are the whole scene (faster, CL moves out of modules).
 	if (change == ItemPositionChange && scene())
 	{
-		QPointF newPos = value.toPointF();
+	  auto newPos = value.toPointF();
 		newPos.setX(0);
 		newPos.setY(0);
 		return newPos;

src/Interface/Application/GuiCommands.cc

@@ -171,6 +171,11 @@ QPointF SCIRun::Gui::findCenterOfNetwork(const ModulePositions& positions)
   return centroidOfPointRange(pointRange.begin(), pointRange.end());
 }
 
+const char* SCIRun::Gui::addNewModuleActionTypePropertyName()
+{
+  return "connectNewModuleSource";
+}
+
 namespace std
 {
 template <typename T1, typename T2>

src/Interface/Application/ModuleWidget.cc

@@ -1312,6 +1312,17 @@ void ModuleWidget::duplicate()
 
 void ModuleWidget::connectNewModule(const PortDescriptionInterface* portToConnect, const std::string& newModuleName)
 {
+  auto prop = sender()->property(addNewModuleActionTypePropertyName());
+  qDebug() << sender();
+  qDebug() << "ModuleWidget SENDER PROPERTY:" << prop;
+  if (prop.value<QString>() == "addNew")
+  {
+    qDebug() << "Action is done.";
+  }
+  else
+  {
+    qDebug() << "Action is not done, need to change a connection.";
+  }
   Q_EMIT connectNewModule(theModule_, portToConnect, newModuleName);
 }
 

src/Interface/Application/NetworkEditor.cc

@@ -570,12 +570,16 @@ void NetworkEditor::paste()
 
 void NetworkEditor::contextMenuEvent(QContextMenuEvent *event)
 {
-  auto items = scene_->items(mapToScene(event->pos()));
-  if (items.isEmpty())
+  //TODO: this menu needs to check for certain editing conditions. Disabling for now.
+  if (false)
   {
-    QMenu menu(this);
-    menu.addActions(actions());
-    menu.exec(event->globalPos());
+    auto items = scene_->items(mapToScene(event->pos()));
+    if (items.isEmpty())
+    {
+      QMenu menu(this);
+      menu.addActions(actions());
+      menu.exec(event->globalPos());
+    }
   }
 }
 

src/Interface/Application/Port.cc

@@ -61,7 +61,7 @@ namespace SCIRun {
       auto isInput = parent->isInput();
       return fillMenuWithFilteredModuleActions(menu, moduleMap,
         [portTypeToMatch, isInput](const ModuleDescription& m) { return portTypeMatches(portTypeToMatch, isInput, m); },
-        [parent](QAction* action) { QObject::connect(action, SIGNAL(triggered()), parent, SLOT(connectNewModule())); },
+        [parent](QAction* action) { QObject::connect(action, SIGNAL(triggered()), parent, SLOT(connectNewModule())); action->setProperty(addNewModuleActionTypePropertyName(), QString("addNew")); },
         parent);
     }
 
@@ -600,9 +600,21 @@ void PortWidget::connectNewModule()
 {
   auto action = qobject_cast<QAction*>(sender());
   auto moduleToAddName = action->text();
+  qDebug() << "OLD SLOT:" << sender();
+  qDebug() << "PortWidget SENDER PROPERTY:" << action->property(addNewModuleActionTypePropertyName());
+  setProperty(addNewModuleActionTypePropertyName(), action->property(addNewModuleActionTypePropertyName()));
   Q_EMIT connectNewModule(this, moduleToAddName.toStdString());
 }
 
+void PortWidget::insertNewModule(const SCIRun::Dataflow::Networks::PortDescriptionInterface* output, const std::string& newModuleName, const SCIRun::Dataflow::Networks::PortDescriptionInterface* input)
+{
+  qDebug() << "NEW SLOT:" << sender();
+  //auto action = qobject_cast<QAction*>(sender());
+  qDebug() << "PortWidget SENDER PROPERTY:" << sender()->property(addNewModuleActionTypePropertyName());
+  setProperty(addNewModuleActionTypePropertyName(), sender()->property(addNewModuleActionTypePropertyName()));
+  Q_EMIT connectNewModule(output, newModuleName);
+}
+
 InputPortWidget::InputPortWidget(const QString& name, const QColor& color, const std::string& datatype,
   const ModuleId& moduleId, const PortId& portId, size_t index, bool isDynamic,
   boost::shared_ptr<ConnectionFactory> connectionFactory,

src/Interface/Application/Port.h

@@ -151,6 +151,7 @@ public Q_SLOTS:
   void portCachingChanged(bool checked);
   void connectNewModule();
   void clearPotentialConnections();
+  void insertNewModule(const SCIRun::Dataflow::Networks::PortDescriptionInterface* output, const std::string& newModuleName, const SCIRun::Dataflow::Networks::PortDescriptionInterface* input);
 Q_SIGNALS:
   void requestConnection(const SCIRun::Dataflow::Networks::PortDescriptionInterface* from, const SCIRun::Dataflow::Networks::PortDescriptionInterface* to);
   void connectionDeleted(const SCIRun::Dataflow::Networks::ConnectionId& id);

src/Interface/Application/Utility.h

@@ -77,6 +77,8 @@ namespace Gui
   QList<QAction*> fillMenuWithFilteredModuleActions(QMenu* menu, const Dataflow::Networks::ModuleDescriptionMap& moduleMap, ModulePredicate modulePred, QActionHookup hookup, QWidget* parent);
   bool portTypeMatches(const std::string& portTypeToMatch, bool isInput, const Dataflow::Networks::ModuleDescription& module);
   QPointF findCenterOfNetwork(const Dataflow::Networks::ModulePositions& positions);
+
+  const char* addNewModuleActionTypePropertyName();
 }
 
 }