beremiz: comparison editors/Viewer.py

equal deleted inserted replaced

-:204ef2daa33c
+:c1e6c712cc35
 ZOOM_FACTORS = [math.sqrt(2) ** x for x in xrange(-6, MAX_ZOOMIN)]
 def GetVariableCreationFunction(variable_type):
 def variableCreationFunction(viewer, id, specific_values):
 return FBD_Variable(viewer, variable_type,
-specific_values["name"],
+specific_values.name,
-specific_values["value_type"],
+specific_values.value_type,
 id,
-specific_values["executionOrder"])
+specific_values.execution_order)
 return variableCreationFunction
 def GetConnectorCreationFunction(connector_type):
 def connectorCreationFunction(viewer, id, specific_values):
 return FBD_Connector(viewer, connector_type,
-specific_values["name"], id)
+specific_values.name, id)
 return connectorCreationFunction
 def commentCreationFunction(viewer, id, specific_values):
-return Comment(viewer, specific_values["content"], id)
+return Comment(viewer, specific_values.content, id)
 def GetPowerRailCreationFunction(powerrail_type):
 def powerRailCreationFunction(viewer, id, specific_values):
 return LD_PowerRail(viewer, powerrail_type, id,
-specific_values["connectors"])
+specific_values.connectors)
 return powerRailCreationFunction
+MODIFIER_VALUE = lambda x: x if x is not None else 'none'
 CONTACT_TYPES = {(True, "none"): CONTACT_REVERSE,
 (False, "rising"): CONTACT_RISING,
 (False, "falling"): CONTACT_FALLING}
 def contactCreationFunction(viewer, id, specific_values):
-contact_type = CONTACT_TYPES.get((specific_values.get("negated", False),
+contact_type = CONTACT_TYPES.get((specific_values.negated,
-specific_values.get("edge", "none")),
+MODIFIER_VALUE(specific_values.edge)),
 CONTACT_NORMAL)
-return LD_Contact(viewer, contact_type, specific_values["name"], id)
+return LD_Contact(viewer, contact_type, specific_values.name, id)
 COIL_TYPES = {(True, "none", "none"): COIL_REVERSE,
 (False, "none", "set"): COIL_SET,
 (False, "none", "reset"): COIL_RESET,
 (False, "rising", "none"): COIL_RISING,
 (False, "falling", "none"): COIL_FALLING}
 def coilCreationFunction(viewer, id, specific_values):
-coil_type = COIL_TYPES.get((specific_values.get("negated", False),
+coil_type = COIL_TYPES.get((specific_values.negated,
-specific_values.get("edge", "none"),
+MODIFIER_VALUE(specific_values.edge),
-specific_values.get("storage", "none")),
+MODIFIER_VALUE(specific_values.storage)),
 COIL_NORMAL)
-return LD_Coil(viewer, coil_type, specific_values["name"], id)
+return LD_Coil(viewer, coil_type, specific_values.name, id)
 def stepCreationFunction(viewer, id, specific_values):
-step = SFC_Step(viewer, specific_values["name"],
+step = SFC_Step(viewer, specific_values.name,
-specific_values.get("initial", False), id)
+specific_values.initial, id)
-if specific_values.get("action", None):
+if specific_values.action is not None:
 step.AddAction()
 connector = step.GetActionConnector()
-connector.SetPosition(wx.Point(*specific_values["action"]["position"]))
+connector.SetPosition(wx.Point(*specific_values.action.position))
 return step
 def transitionCreationFunction(viewer, id, specific_values):
-transition = SFC_Transition(viewer, specific_values["condition_type"],
+transition = SFC_Transition(viewer, specific_values.condition_type,
-specific_values.get("condition", None),
+specific_values.condition,
-specific_values["priority"], id)
+specific_values.priority, id)
 return transition
 def GetDivergenceCreationFunction(divergence_type):
 def divergenceCreationFunction(viewer, id, specific_values):
 return SFC_Divergence(viewer, divergence_type,
-specific_values["connectors"], id)
+specific_values.connectors, id)
 return divergenceCreationFunction
 def jumpCreationFunction(viewer, id, specific_values):
-return SFC_Jump(viewer, specific_values["target"], id)
+return SFC_Jump(viewer, specific_values.target, id)
 def actionBlockCreationFunction(viewer, id, specific_values):
-return SFC_ActionBlock(viewer, specific_values["actions"], id)
+return SFC_ActionBlock(viewer, specific_values.actions, id)
 ElementCreationFunctions = {
 "input": GetVariableCreationFunction(INPUT),
 "output": GetVariableCreationFunction(OUTPUT),
 "inout": GetVariableCreationFunction(INOUT),
 self.Flush()
 self.ResetView()
 self.ResetBuffer()
 instance = {}
 # List of ids of already loaded blocks
-ids = self.Controler.GetEditedElementInstancesIds(self.TagName, debug = self.Debug)
+instances = self.Controler.GetEditedElementInstancesInfos(self.TagName, debug = self.Debug)
 # Load Blocks until they are all loaded
-while len(ids) > 0:
+while len(instances) > 0:
-instance = self.Controler.GetEditedElementInstanceInfos(
+self.loadInstance(instances.popitem(0)[1], instances, selection)
-self.TagName, ids.popitem(0)[0], debug = self.Debug)
-if instance is not None:
-self.loadInstance(instance, ids, selection)
 if (selection is not None and
 isinstance(self.SelectedElement, Graphic_Group)):
 self.SelectedElement.RefreshWireExclusion()
 self.SelectedElement.RefreshBoundingBox()
 group.AddElement(self.SelectedElement)
 group.AddElement(element)
 self.SelectedElement = group
 # Load instance from given informations
-def loadInstance(self, instance, ids, selection):
+def loadInstance(self, instance, remaining_instances, selection):
-self.current_id = max(self.current_id, instance["id"])
+self.current_id = max(self.current_id, instance.id)
-creation_function = ElementCreationFunctions.get(instance["type"], None)
+creation_function = ElementCreationFunctions.get(instance.type, None)
 connectors = {"inputs" : [], "outputs" : []}
-specific_values = instance["specific_values"]
+specific_values = instance.specific_values
 if creation_function is not None:
-element = creation_function(self, instance["id"], specific_values)
+element = creation_function(self, instance.id, specific_values)
 if isinstance(element, SFC_Step):
-if len(instance["inputs"]) > 0:
+if len(instance.inputs) > 0:
 element.AddInput()
 else:
 element.RemoveInput()
-if len(instance["outputs"]) > 0:
+if len(instance.outputs) > 0:
 element.AddOutput()
-if isinstance(element, SFC_Transition) and specific_values["condition_type"] == "connection":
+if isinstance(element, SFC_Transition) and specific_values.condition_type == "connection":
 connector = element.GetConditionConnector()
-self.CreateWires(connector, instance["id"], specific_values["connection"]["links"], ids, selection)
+self.CreateWires(connector, instance.id, specific_values.connection.links, remaining_instances, selection)
 else:
 executionControl = False
-for input in instance["inputs"]:
+for input in instance.inputs:
-if input["negated"]:
+input_edge = MODIFIER_VALUE(input.edge)
-connectors["inputs"].append((input["name"], None, "negated"))
+if input.negated:
-elif input["edge"]:
+connectors["inputs"].append((input.name, None, "negated"))
-connectors["inputs"].append((input["name"], None, input["edge"]))
+elif input_edge:
+connectors["inputs"].append((input.name, None, input_edge))
 else:
-connectors["inputs"].append((input["name"], None, "none"))
+connectors["inputs"].append((input.name, None, "none"))
-for output in instance["outputs"]:
+for output in instance.outputs:
-if output["negated"]:
+output_edge = MODIFIER_VALUE(output.edge)
-connectors["outputs"].append((output["name"], None, "negated"))
+if output.negated:
-elif output["edge"]:
+connectors["outputs"].append((output.name, None, "negated"))
-connectors["outputs"].append((output["name"], None, output["edge"]))
+elif output_edge:
+connectors["outputs"].append((output.name, None, output_edge))
 else:
-connectors["outputs"].append((output["name"], None, "none"))
+connectors["outputs"].append((output.name, None, "none"))
 if len(connectors["inputs"]) > 0 and connectors["inputs"][0][0] == "EN":
 connectors["inputs"].pop(0)
 executionControl = True
 if len(connectors["outputs"]) > 0 and connectors["outputs"][0][0] == "ENO":
 connectors["outputs"].pop(0)
 executionControl = True
-if specific_values["name"] is None:
+block_name = specific_values.name if specific_values.name is not None else ""
-specific_values["name"] = ""
+element = FBD_Block(self, instance.type, block_name,
-element = FBD_Block(self, instance["type"], specific_values["name"],
+instance.id, len(connectors["inputs"]),
-instance["id"], len(connectors["inputs"]),
 connectors=connectors, executionControl=executionControl,
-executionOrder=specific_values["executionOrder"])
+executionOrder=specific_values.execution_order)
 if isinstance(element, Comment):
 self.AddComment(element)
 else:
 self.AddBlock(element)
 connectors = element.GetConnectors()
-element.SetPosition(instance["x"], instance["y"])
+element.SetPosition(instance.x, instance.y)
-element.SetSize(instance["width"], instance["height"])
+element.SetSize(instance.width, instance.height)
-for i, output_connector in enumerate(instance["outputs"]):
+for i, output_connector in enumerate(instance.outputs):
+connector_pos = wx.Point(*output_connector.position)
 if isinstance(element, FBD_Block):
-connector = element.GetConnector(
+connector = element.GetConnector(connector_pos,
-wx.Point(*output_connector["position"]),
+output_name = output_connector.name)
-output_name = output_connector["name"])
 elif i < len(connectors["outputs"]):
 connector = connectors["outputs"][i]
 else:
 connector = None
 if connector is not None:
-if output_connector.get("negated", False):
+if output_connector.negated:
 connector.SetNegated(True)
-if output_connector.get("edge", "none") != "none":
+if output_connector.edge is not None:
-connector.SetEdge(output_connector["edge"])
+connector.SetEdge(output_connector.edge)
 if connectors["outputs"].index(connector) == i:
-connector.SetPosition(wx.Point(*output_connector["position"]))
+connector.SetPosition(connector_pos)
-for i, input_connector in enumerate(instance["inputs"]):
+for i, input_connector in enumerate(instance.inputs):
+connector_pos = wx.Point(*input_connector.position)
 if isinstance(element, FBD_Block):
-connector = element.GetConnector(
+connector = element.GetConnector(connector_pos,
-wx.Point(*input_connector["position"]),
+input_name = input_connector.name)
-input_name = input_connector["name"])
 elif i < len(connectors["inputs"]):
 connector = connectors["inputs"][i]
 else:
 connector = None
 if connector is not None:
 if connectors["inputs"].index(connector) == i:
-connector.SetPosition(wx.Point(*input_connector["position"]))
+connector.SetPosition(connector_pos)
-if input_connector.get("negated", False):
+if input_connector.negated:
 connector.SetNegated(True)
-if input_connector.get("edge", "none") != "none":
+if input_connector.edge is not None:
-connector.SetEdge(input_connector["edge"])
+connector.SetEdge(input_connector.edge)
-if not self.CreateWires(connector, instance["id"], input_connector["links"], ids, selection):
+if not self.CreateWires(connector, instance.id, input_connector.links, remaining_instances, selection):
 element.RefreshModel()
 element.RefreshConnectors()
-if selection is not None and selection[0].get(instance["id"], False):
+if selection is not None and selection[0].get(instance.id, False):
 self.SelectInGroup(element)
-def CreateWires(self, start_connector, id, links, ids, selection=None):
+def CreateWires(self, start_connector, id, links, remaining_instances, selection=None):
 links_connected = True
 for link in links:
-refLocalId = link["refLocalId"]
+refLocalId = link.refLocalId
 if refLocalId is None:
 links_connected = False
 continue
-if ids.pop(refLocalId, False):
+new_instance = remaining_instances.pop(refLocalId, None)
-new_instance = self.Controler.GetEditedElementInstanceInfos(self.TagName, refLocalId, debug = self.Debug)
+if new_instance is not None:
-if new_instance is not None:
+self.loadInstance(new_instance, remaining_instances, selection)
-self.loadInstance(new_instance, ids, selection)
 connected = self.FindElementById(refLocalId)
 if connected is None:
 links_connected = False
 continue
-points = link["points"]
+points = link.points
 end_connector = connected.GetConnector(
-wx.Point(points[-1][0], points[-1][1])
+wx.Point(points[-1].x, points[-1].y)
 if len(points) > 0 else wx.Point(0, 0),
-link["formalParameter"])
+link.formalParameter)
 if end_connector is not None:
 if len(points) > 0:
 wire = Wire(self)
 wire.SetPoints(points)
 else:

changeset 1338	c1e6c712cc35
parent 1335	1b9610fc1e6b
child 1342	c17507a10807