Add getPorts API to steps to get the current steps ports. Tidy names from C++ to Python style.

Author: hsorby

src/mapclient/core/workflow/workflowdependencygraph.py

@@ -223,8 +223,8 @@ def execute(self):
                     # But don't use this as it is not what is documented.
                     # source_step = connection.source()._step
                     # destination_step = current_node._step
-                    # source_ports = [port for port in source_step._ports if port.hasProvides()]
-                    # destination_ports = [port for port in destination_step._ports if port.hasUses()]
+                    # source_ports = [port for port in source_step._ports if port.has_provides()]
+                    # destination_ports = [port for port in destination_step._ports if port.has_uses()]
                     # source_data_index = source_ports.index(source_step._ports[connection.sourceIndex()])
                     # destination_data_index = destination_ports.index(destination_step._ports[connection.destinationIndex()])
 

src/mapclient/mountpoints/workflowstep.py

@@ -59,14 +59,14 @@ def getTriplesForObj(self, obj):
 
     #        return [triple[2] for triple in self.obj[obj]]
 
-    def hasUses(self):
+    def has_uses(self):
         for uses_annotation in USES_ANNOTATIONS:
             if uses_annotation in self.pred:
                 return True
 
         return False
 
-    def hasProvides(self):
+    def has_provides(self):
         for provides_annotation in PROVIDES_ANNOTATIONS:
             if provides_annotation in self.pred:
                 return True
@@ -95,7 +95,7 @@ def _test_for_possible_connection(self, mineProvides, theirsUses):
 
         return False
 
-    def canConnect(self, other):
+    def can_connect(self, other):
         if PORT_ANNOTATION in self.subj and PORT_ANNOTATION in other.subj:
             myPorts = self.subj[PORT_ANNOTATION]
             theirPorts = other.subj[PORT_ANNOTATION]
@@ -237,6 +237,13 @@ def _workflow_step_addPort(self, triple):
     self._ports.append(port)
 
 
+def _workflow_step_getPorts(self):
+    """
+    Returns a list of WorkflowStepPort objects that describe the ports of this step.
+    """
+    return self._ports
+
+
 def _workflow_step_getName(self):
     if hasattr(self, '_name'):
         return self._name
@@ -300,6 +307,7 @@ def _workflow_step_relocate_configuration(self, to_location):
     'getIcon': _workflow_step_get_icon,
     'getLocation': _workflow_step_getLocation,
     'getPortData': _workflow_step_getPortData,
+    'getPorts': _workflow_step_getPorts,
     'getSourceURI': _workflow_step_get_source_uri,
     'getName': _workflow_step_getName,
     'gitInclude': _workflow_step_git_include,

src/mapclient/view/workflow/workflowgraphicsitems.py

@@ -302,7 +302,7 @@ def __init__(self, metastep):
 
         self.updateDVCSIcon()
 
-    def update(self):
+    def update(self, rect=None):
         self._update_configure_icon()
         self._update_ports()
         self._update_text_icon()
@@ -320,7 +320,7 @@ def _update_configure_icon(self):
         self._set_tool_tip()
 
     def _set_tool_tip(self):
-        self.setToolTip(self._metastep._step.getName() + ": " + self._metastep._step.getIdentifier())
+        self.setToolTip(self._metastep.getName() + ": " + self._metastep.getIdentifier())
         self._text.setText(
             self._metastep.getStepIdentifier() if self._metastep.getStepIdentifier() != self._metastep.getUniqueIdentifier() else self._metastep.getName())
         self._update_text_icon()
@@ -333,8 +333,8 @@ def _update_ports(self):
 
         self._step_port_items = []
         # Collect all ports that provide or use from the step
-        uses_ports = [port for port in current_step_ports if port.hasUses()]
-        provides_ports = [port for port in current_step_ports if port.hasProvides()]
+        uses_ports = [port for port in current_step_ports if port.has_uses()]
+        provides_ports = [port for port in current_step_ports if port.has_provides()]
 
         uses_count = 0
         uses_total = len(uses_ports)
@@ -471,7 +471,7 @@ def showContextMenu(self, pos):
         self._contextMenu.popup(pos)
 
     def _getStepLocation(self):
-        return os.path.join(self._metastep._step._location, self._metastep._step.getIdentifier())
+        return os.path.join(self._metastep._step._location, self._metastep.getIdentifier())
 
 
 class StepPort(QtWidgets.QGraphicsEllipseItem):
@@ -522,11 +522,11 @@ def width(self):
     def height(self):
         return self.boundingRect().height()
 
-    def canConnect(self, other):
+    def can_connect(self, other):
         if other.hasConnections():
             return False
 
-        return self._port.canConnect(other._port)
+        return self._port.can_connect(other.port())
 
     def hasConnections(self):
         self._removeDeadwood()

src/mapclient/view/workflow/workflowgraphicsview.py

@@ -99,7 +99,7 @@ def showStepNames(self, show):
     def connectNodes(self, src_port, dest_port):
         # Check if nodes are already connected
         if not src_port.hasArcToDestination(dest_port):
-            if src_port.canConnect(dest_port):
+            if src_port.can_connect(dest_port):
                 command = CommandAdd(self.scene(), Arc(src_port, dest_port))
                 self._undoStack.push(command)
             else: