plcopen/plcopen.py
changeset 1763 bcc07ff2362c
parent 1762 fcc406143e5b
child 1765 ccf59c1f0b45
equal deleted inserted replaced
1762:fcc406143e5b 1763:bcc07ff2362c
  1680             self.checkedBlocksDict[localid] = True
  1680             self.checkedBlocksDict[localid] = True
  1681             if isinstance(instance, PLCOpenParser.GetElementClass("block", "fbdObjects")) and instance.getexecutionOrderId() == 0:
  1681             if isinstance(instance, PLCOpenParser.GetElementClass("block", "fbdObjects")) and instance.getexecutionOrderId() == 0:
  1682                 for variable in instance.inputVariables.getvariable():
  1682                 for variable in instance.inputVariables.getvariable():
  1683                     connections = variable.connectionPointIn.getconnections()
  1683                     connections = variable.connectionPointIn.getconnections()
  1684                     if connections and len(connections) == 1:
  1684                     if connections and len(connections) == 1:
  1685                         if not self.checkedBlocksDict.has_key(connections[0].getrefLocalId()):
  1685                         if not connections[0].getrefLocalId() in self.checkedBlocksDict:
  1686                             self.compileelementExecutionOrder(connections[0])
  1686                             self.compileelementExecutionOrder(connections[0])
  1687                 if instance.getexecutionOrderId() == 0:
  1687                 if instance.getexecutionOrderId() == 0:
  1688                     instance.setexecutionOrderId(self.getnewExecutionOrderId())
  1688                     instance.setexecutionOrderId(self.getnewExecutionOrderId())
  1689             elif isinstance(instance, PLCOpenParser.GetElementClass("continuation", "commonObjects")) and instance.getexecutionOrderId() == 0:
  1689             elif isinstance(instance, PLCOpenParser.GetElementClass("continuation", "commonObjects")) and instance.getexecutionOrderId() == 0:
  1690                 for tmp_instance in self.getcontentInstances():
  1690                 for tmp_instance in self.getcontentInstances():
  1864 def _filterConnections(connectionPointIn, localId, connections):
  1864 def _filterConnections(connectionPointIn, localId, connections):
  1865     in_connections = connectionPointIn.getconnections()
  1865     in_connections = connectionPointIn.getconnections()
  1866     if in_connections is not None:
  1866     if in_connections is not None:
  1867         for connection in in_connections:
  1867         for connection in in_connections:
  1868             connected = connection.getrefLocalId()
  1868             connected = connection.getrefLocalId()
  1869             if not connections.has_key((localId, connected)) and \
  1869             if not (localId, connected) in connections and \
  1870                not connections.has_key((connected, localId)):
  1870                not (connected, localId) in connections:
  1871                 connectionPointIn.remove(connection)
  1871                 connectionPointIn.remove(connection)
  1872 
  1872 
  1873 
  1873 
  1874 def _filterConnectionsSingle(self, connections):
  1874 def _filterConnectionsSingle(self, connections):
  1875     if self.connectionPointIn is not None:
  1875     if self.connectionPointIn is not None: