Fill in menu

Author: dcwhite

src/Interface/Application/Connection.cc

@@ -30,6 +30,8 @@
 #include <stdexcept>
 #include <QtGui>
 #include <boost/bind.hpp>
+#include <Core/Application/Application.h>
+#include <Dataflow/Engine/Controller/NetworkEditorController.h>
 #include <Interface/Application/Connection.h>
 #include <Interface/Application/Port.h>
 #include <Interface/Application/GuiLogger.h>
@@ -39,12 +41,13 @@
 #include <Core/Utils/Exception.h>
 
 using namespace SCIRun::Gui;
+using namespace SCIRun::Core;
 using namespace SCIRun::Dataflow::Networks;
 
 class EuclideanDrawStrategy : public ConnectionDrawStrategy
 {
 public:
-  void draw(QGraphicsPathItem* item, const QPointF& from, const QPointF& to)
+  virtual void draw(QGraphicsPathItem* item, const QPointF& from, const QPointF& to) override
   {
     QPainterPath path;
 
@@ -70,7 +73,7 @@ class EuclideanDrawStrategy : public ConnectionDrawStrategy
 class CubicBezierDrawStrategy : public ConnectionDrawStrategy
 {
 public:
-  void draw(QGraphicsPathItem* item, const QPointF& from, const QPointF& to)
+  virtual void draw(QGraphicsPathItem* item, const QPointF& from, const QPointF& to) override
   {
     QPainterPath path;
     QPointF start = from;
@@ -79,7 +82,7 @@ class CubicBezierDrawStrategy : public ConnectionDrawStrategy
     auto mid = (to - start) / 2 + start;
 
     double qDirXNum = -(to-start).y();
-    double qDirXDenom = ((double)(to-start).x());
+    double qDirXDenom = static_cast<double>((to-start).x());
     if (0 == qDirXDenom)
       qDirXDenom = -0.0001;
     QPointF qDir(qDirXNum / qDirXDenom , 1);
@@ -100,7 +103,7 @@ class CubicBezierDrawStrategy : public ConnectionDrawStrategy
 class ManhattanDrawStrategy : public ConnectionDrawStrategy
 {
 public:
-  void draw(QGraphicsPathItem* item, const QPointF& from, const QPointF& to)
+  virtual void draw(QGraphicsPathItem* item, const QPointF& from, const QPointF& to) override
   {
     QPainterPath path;
     path.moveTo(from);
@@ -185,15 +188,31 @@ namespace SCIRun
     const QString disableEnableAction("Disable");
     const QString editNotesAction("Edit Notes...");
 
+    QList<QAction*> fillInsertModuleMenu(QMenu* menu, const ModuleDescriptionMap& moduleMap, PortWidget* output, ConnectionLine* conn)
+    {
+      auto portTypeToMatch = output->get_typename();
+
+      return fillMenuWithFilteredModuleActions(menu, moduleMap,
+        [portTypeToMatch](const ModuleDescription& m) { return portTypeMatches(portTypeToMatch, true, m) && portTypeMatches(portTypeToMatch, false, m); },
+        [conn](QAction* action) { QObject::connect(action, SIGNAL(triggered()), conn, SLOT(insertNewModule())); },
+        menu);
+    }
+
     class ConnectionMenu : public QMenu
     {
     public:
-      explicit ConnectionMenu(QWidget* parent = nullptr) : QMenu(parent)
+      explicit ConnectionMenu(ConnectionLine* conn, QWidget* parent = nullptr) : QMenu(parent)
       {
         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);
+
         disableAction_ = addAction(disableEnableAction);
         addWidgetToExecutionDisableList(disableAction_);
         notesAction_ = addAction(editNotesAction);
@@ -219,7 +238,7 @@ namespace SCIRun
     class ConnectionLineNoteDisplayStrategy : public NoteDisplayStrategy
     {
     public:
-      virtual QPointF relativeNotePosition(QGraphicsItem* item, const QGraphicsTextItem* note, NotePosition position) const
+      virtual QPointF relativeNotePosition(QGraphicsItem* item, const QGraphicsTextItem* note, NotePosition position) const override
       {
         return QPointF(0,0);
       }
@@ -260,17 +279,19 @@ ConnectionLine::ConnectionLine(PortWidget* fromPort, PortWidget* toPort, const C
   setFlags(ItemIsSelectable | ItemIsMovable | ItemSendsGeometryChanges | ItemIsFocusable);
 
   setZValue(defaultZValue());
-  setToolTip("Left - Highlight\nDouble-Left - Menu\ni - Datatype info");
+  setToolTip("<font color=\"#000000\" size=2>Left - Highlight\nDouble-Left - Menu\ni - Datatype info");
   setAcceptHoverEvents(true);
 
-  menu_ = new ConnectionMenu();
+  menu_ = new ConnectionMenu(this);
   connectNoteEditorToAction(menu_->notesAction_);
   connectUpdateNote(this);
 
   NeedsScenePositionProvider::setPositionObject(boost::make_shared<MidpointPositionerFromPorts>(fromPort_, toPort_));
 
   connect(menu_->disableAction_, SIGNAL(triggered()), this, SLOT(toggleDisabled()));
 
+  menu_->setStyleSheet(fromPort->styleSheet());
+
   trackNodes();
   GuiLogger::Instance().logInfoStd("Connection made: " + id_.id_);
 }
@@ -430,6 +451,11 @@ QVariant ConnectionLine::itemChange(GraphicsItemChange change, const QVariant& v
 	return QGraphicsItem::itemChange(change, value);
 }
 
+void ConnectionLine::insertNewModule()
+{
+  qDebug() << "INSERTING NEW MODULE";
+}
+
 ModuleIdPair ConnectionLine::getConnectedToModuleIds() const
 {
 	return std::make_pair(toPort_->getUnderlyingModuleId(), fromPort_->getUnderlyingModuleId());
@@ -574,7 +600,7 @@ ConnectionInProgress* ConnectionFactory::makeConnectionInProgress(PortWidget* po
     }
     default:
       std::cerr << "Unknown connection type." << std::endl;
-      return 0;
+      return nullptr;
   }
 }
 
@@ -626,7 +652,7 @@ ConnectionDrawStrategyPtr ConnectionFactory::getCurrentDrawer() const
   }
 }
 
-ConnectionLine* ConnectionFactory::makeFinishedConnection(PortWidget* fromPort, PortWidget* toPort, const SCIRun::Dataflow::Networks::ConnectionId& id) const
+ConnectionLine* ConnectionFactory::makeFinishedConnection(PortWidget* fromPort, PortWidget* toPort, const ConnectionId& id) const
 {
   auto c = new ConnectionLine(fromPort, toPort, id, getCurrentDrawer());
   activate(c);

src/Interface/Application/Connection.h

@@ -81,6 +81,7 @@ public Q_SLOTS:
   void setDrawStrategy(ConnectionDrawStrategyPtr drawer);
   void updateNote(const Note& note);
   void toggleDisabled();
+  void insertNewModule();
 
 Q_SIGNALS:
   void deleted(const SCIRun::Dataflow::Networks::ConnectionId& id);

src/Interface/Application/ModuleWidget.cc

@@ -681,8 +681,8 @@ QMenu* ModuleWidget::getReplaceWithMenu()
 
 void ModuleWidget::replaceModuleWith()
 {
-  QAction* action = qobject_cast<QAction*>(sender());
-  QString moduleToReplace = action->text();
+  auto action = qobject_cast<QAction*>(sender());
+  auto moduleToReplace = action->text();
   Q_EMIT replaceModuleWith(theModule_, moduleToReplace.toStdString());
 }
 
@@ -715,7 +715,7 @@ void ModuleWidget::addPorts(int index)
 
 void ModuleWidget::createInputPorts(const ModuleInfoProvider& moduleInfoProvider)
 {
-  const ModuleId moduleId = moduleInfoProvider.get_id();
+  const auto moduleId = moduleInfoProvider.get_id();
   size_t i = 0;
   const auto& inputs = moduleInfoProvider.inputPorts();
   for (const auto& port : inputs)
@@ -753,9 +753,9 @@ void ModuleWidget::createInputPorts(const ModuleInfoProvider& moduleInfoProvider
   }
 }
 
-void ModuleWidget::printInputPorts(const ModuleInfoProvider& moduleInfoProvider)
+void ModuleWidget::printInputPorts(const ModuleInfoProvider& moduleInfoProvider) const
 {
-  const ModuleId moduleId = moduleInfoProvider.get_id();
+  const auto moduleId = moduleInfoProvider.get_id();
   std::cout << "Module input ports: " << moduleId << std::endl;
   size_t i = 0;
   for (const auto& port : moduleInfoProvider.inputPorts())

src/Interface/Application/ModuleWidget.h

@@ -241,7 +241,7 @@ private Q_SLOTS:
   void setupLogging();
   void adjustDockState(bool dockEnabled);
   Qt::DockWidgetArea allowedDockArea() const;
-  void printInputPorts(const SCIRun::Dataflow::Networks::ModuleInfoProvider& moduleInfoProvider);
+  void printInputPorts(const SCIRun::Dataflow::Networks::ModuleInfoProvider& moduleInfoProvider) const;
   QMenu* getReplaceWithMenu();
   void setInputPortSpacing(bool highlighted);
   void setOutputPortSpacing(bool highlighted);

src/Interface/Application/Port.cc

@@ -55,13 +55,13 @@ namespace SCIRun {
         return std::find_if(module.input_ports_.begin(), module.input_ports_.end(), [&](const InputPortDescription& in) { return in.datatype == portTypeToMatch; }) != module.input_ports_.end();
     }
 
-    QList<QAction*> fillMenu(QMenu* menu, const ModuleDescriptionMap& moduleMap, PortWidget* parent)
+    QList<QAction*> fillConnectToEmptyPortMenu(QMenu* menu, const ModuleDescriptionMap& moduleMap, PortWidget* parent)
     {
-      const std::string& portTypeToMatch = parent->get_typename();
-      bool isInput = parent->isInput();
+      auto portTypeToMatch = parent->get_typename();
+      auto isInput = parent->isInput();
       return fillMenuWithFilteredModuleActions(menu, moduleMap,
-        [=](const ModuleDescription& m) { return portTypeMatches(portTypeToMatch, isInput, m); },
-        [=](QAction* action) { QObject::connect(action, SIGNAL(triggered()), parent, SLOT(connectNewModule())); },
+        [portTypeToMatch, isInput](const ModuleDescription& m) { return portTypeMatches(portTypeToMatch, isInput, m); },
+        [parent](QAction* action) { QObject::connect(action, SIGNAL(triggered()), parent, SLOT(connectNewModule())); },
         parent);
     }
 
@@ -73,18 +73,20 @@ namespace SCIRun {
       QList<QAction*> allCompatibleActions;
       for (const auto& package : moduleMap)
       {
-        const std::string& packageName = package.first;
+        const auto& packageName = package.first;
 
         QList<QMenu*> packageMenus;
         for (const auto& category : package.second)
         {
-          const std::string& categoryName = category.first;
+          const auto& categoryName = category.first;
           QList<QAction*> actions;
 
           for (const auto& module : category.second)
           {
+            //qDebug() << module.second.lookupInfo_.module_name_.c_str();
             if (modulePred(module.second))
             {
+              //qDebug() << "is compatible";
               const auto& moduleName = module.first;
               auto qname = QString::fromStdString(moduleName);
               auto action = new QAction(qname, menu);
@@ -95,13 +97,15 @@ namespace SCIRun {
           }
           if (!actions.empty())
           {
+            //qDebug() << "action list not empty, adding to submenu" << categoryName.c_str();
             auto m = new QMenu(QString::fromStdString(categoryName), parent);
             m->addActions(actions);
             packageMenus.append(m);
           }
         }
         if (!packageMenus.isEmpty())
         {
+          //qDebug() << "package menu not empty, adding to menu" << packageName.c_str();
           auto p = new QMenu(QString::fromStdString(packageName), parent);
           for (auto pm : packageMenus)
             p->addMenu(pm);
@@ -137,7 +141,7 @@ namespace SCIRun {
         auto m = new QMenu("Connect Module", parent);
         faves_ = new QMenu("Favorites", parent);
         m->addMenu(faves_);
-        compatibleModuleActions_ = fillMenu(m, Application::Instance().controller()->getAllAvailableModuleDescriptions(), parent);
+        compatibleModuleActions_ = fillConnectToEmptyPortMenu(m, Application::Instance().controller()->getAllAvailableModuleDescriptions(), parent);
         addMenu(m);
       }
       void filterFavorites()

src/Interface/Application/Utility.h

@@ -75,6 +75,7 @@ namespace Gui
   typedef boost::function<bool(const Dataflow::Networks::ModuleDescription&)> ModulePredicate;
   typedef boost::function<void(QAction*)> QActionHookup;
   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);
 }