beremiz: comparison editors/LDViewer.py

equal deleted inserted replaced

-:14b40afccd69
+:6198190bc121
 if "inputs" in connectors:
 input_connectors = connectors["inputs"]
 if "input" in connectors:
 input_connectors = [connectors["input"]]
 for connector in input_connectors:
-for wire, handle in connector.GetWires():
+for wire, _handle in connector.GetWires():
 next = wire.EndConnected.GetParentBlock()
 if not isinstance(next, LD_PowerRail) and next not in block_list:
 block_list.append(next)
 next_list.append(next)
 current_list = next_list
 if "inputs" in connectors:
 input_connectors = connectors["inputs"]
 if "input" in connectors:
 input_connectors = [connectors["input"]]
 for connector in input_connectors:
-for wire, handle in connector.GetWires():
+for wire, _handle in connector.GetWires():
 next = wire.EndConnected.GetParentBlock()
 if isinstance(next, LD_PowerRail) and next.GetType() == LEFTRAIL or next in stop_list:
 # for remove in element_tree[element]["children"]:
 #     RemoveElement(remove, element_tree)
 # element_tree[element]["children"] = ["stop"]
 element = self.FindElementById(instance["id"])
 element_connectors = element.GetConnectors()
 self.Rungs[rungs[0]].SelectElement(element)
 for connector in element_connectors["inputs"]:
-for wire, num in connector.GetWires():
+for wire, _num in connector.GetWires():
 self.Rungs[rungs[0]].SelectElement(wire)
 wx.CallAfter(self.RefreshPosition, element)
 elif instance["type"] in ["contact", "coil"]:
 rungs = []
 for link in instance["inputs"][0]["links"]:
 % instance["id"])
 element = self.FindElementById(instance["id"])
 element_connectors = element.GetConnectors()
 self.Rungs[rungs[0]].SelectElement(element)
-for wire, num in element_connectors["inputs"][0].GetWires():
+for wire, _num in element_connectors["inputs"][0].GetWires():
 self.Rungs[rungs[0]].SelectElement(wire)
 wx.CallAfter(self.RefreshPosition, element)
 elif instance["type"] == "comment":
 element = self.FindElementById(instance["id"])
 pos = element.GetPosition()
 for block in blocks:
 connectors = block.GetConnectors()
 block_infos = {"lefts": [], "rights": []}
 block_infos.update(connectors)
 for connector in block_infos["inputs"]:
-for wire, handle in connector.GetWires():
+for wire, _handle in connector.GetWires():
 found = False
 for infos in blocks_infos:
 if wire.EndConnected in infos["outputs"]:
 for left_element in infos["lefts"]:
 if left_element not in block_infos["lefts"]:
 left_index.append(wire.EndConnected.GetWireIndex(wire))
 else:
 index = left_elements.index(wire.EndConnected)
 left_index[index] = max(left_index[index], wire.EndConnected.GetWireIndex(wire))
 for connector in block_infos["outputs"]:
-for wire, handle in connector.GetWires():
+for wire, _handle in connector.GetWires():
 found = False
 for infos in blocks_infos:
 if wire.StartConnected in infos["inputs"]:
 for right_element in infos["rights"]:
 if right_element not in block_infos["rights"]:
 left_elements.reverse()
 right_elements.reverse()
 for i, left_element in enumerate(left_elements):
 for j, right_element in enumerate(right_elements):
 exist = False
-for wire, handle in right_element.GetWires():
+for wire, _handle in right_element.GetWires():
 exist |= wire.EndConnected == left_element
 if not exist:
 new_wire = Wire(self)
 wires.append(new_wire)
 right_element.InsertConnect(right_index[j] + 1, (new_wire, 0), False)
 else:
 rungindex = self.FindRung(contact)
 rung = self.Rungs[rungindex]
 old_bbox = rung.GetBoundingBox()
 connectors = contact.GetConnectors()
-input_wires = [wire for wire, handle in connectors["inputs"][0].GetWires()]
+input_wires = [wire for wire, _handle in connectors["inputs"][0].GetWires()]
-output_wires = [wire for wire, handle in connectors["outputs"][0].GetWires()]
+output_wires = [wire for wire, _handle in connectors["outputs"][0].GetWires()]
 left_elements = [(wire.EndConnected, wire.EndConnected.GetWireIndex(wire)) for wire in input_wires]
 right_elements = [(wire.StartConnected, wire.StartConnected.GetWireIndex(wire)) for wire in output_wires]
 for wire in input_wires:
 wire.Clean()
 rung.SelectElement(wire)
 right_elements.reverse()
 powerrail = len(left_elements) == 1 and isinstance(left_elements[0][0].GetParentBlock(), LD_PowerRail)
 for left_element, left_index in left_elements:
 for right_element, right_index in right_elements:
 wire_removed = []
-for wire, handle in right_element.GetWires():
+for wire, _handle in right_element.GetWires():
 if wire.EndConnected == left_element:
 wire_removed.append(wire)
 elif isinstance(wire.EndConnected.GetParentBlock(), LD_PowerRail) and powerrail:
 left_powerrail = wire.EndConnected.GetParentBlock()
 index = left_powerrail.GetConnectorIndex(wire.EndConnected)
 self.RefreshRungs(new_bbox.height - old_bbox.height, rungindex + 1)
 self.SelectedElement = None
 def RecursiveDeletion(self, element, rung):
 connectors = element.GetConnectors()
-input_wires = [wire for wire, handle in connectors["inputs"][0].GetWires()]
+input_wires = [wire for wire, _handle in connectors["inputs"][0].GetWires()]
 left_elements = [wire.EndConnected for wire in input_wires]
 rung.SelectElement(element)
 element.Clean()
 for wire in input_wires:
 wire.Clean()
 for element in rung.GetElements():
 if isinstance(element, LD_Coil):
 nbcoils += 1
 if nbcoils > 1:
 connectors = coil.GetConnectors()
-output_wires = [wire for wire, handle in connectors["outputs"][0].GetWires()]
+output_wires = [wire for wire, _handle in connectors["outputs"][0].GetWires()]
 right_elements = [wire.StartConnected for wire in output_wires]
 for wire in output_wires:
 wire.Clean()
 self.Wires.remove(wire)
 self.Elements.remove(wire)
 if len(right_element.GetWires()) == 0:
 index = right_block.GetConnectorIndex(right_element)
 right_block.DeleteConnector(index)
 powerrail_connectors = right_block.GetConnectors()
 for connector in powerrail_connectors["inputs"]:
-for wire, handle in connector.GetWires():
+for wire, _handle in connector.GetWires():
 block = wire.EndConnected.GetParentBlock()
 endpoint = wire.EndConnected.GetPosition(False)
 startpoint = connector.GetPosition(False)
 block.Move(0, startpoint.y - endpoint.y)
 self.RefreshPosition(block)
 index = left_block.GetConnectorIndex(left_element)
 left_block.DeleteConnector(index)
 else:
 connectors = left_block.GetConnectors()
 for connector in connectors["outputs"]:
-for wire, handle in connector.GetWires():
+for wire, _handle in connector.GetWires():
 self.RefreshPosition(wire.StartConnected.GetParentBlock())
 for right_element in right_elements:
 self.RefreshPosition(right_element.GetParentBlock())
 rung.RefreshBoundingBox()
 new_bbox = rung.GetBoundingBox()
 position = element.GetPosition()
 maxx = 0
 onlyone = []
 for connector in connectors["inputs"]:
 onlyone.append(len(connector.GetWires()) == 1)
-for wire, handle in connector.GetWires():
+for wire, _handle in connector.GetWires():
 onlyone[-1] &= len(wire.EndConnected.GetWires()) == 1
 leftblock = wire.EndConnected.GetParentBlock()
 pos = leftblock.GetPosition()
 size = leftblock.GetSize()
 maxx = max(maxx, pos[0] + size[0])
 position = element.GetPosition()
 # Extract blocks connected to inputs
 blocks = []
 for i, connector in enumerate(connectors["inputs"]):
-for j, (wire, handle) in enumerate(connector.GetWires()):
+for j, (wire, _handle) in enumerate(connector.GetWires()):
 blocks.append(wire.EndConnected.GetParentBlock())
 for i, connector in enumerate(connectors["inputs"]):
 startpoint = connector.GetPosition(False)
 previous_blocks = []
 block_list = []
 start_offset = 0
 if not onlyone[i]:
 middlepoint = maxx + LD_WIRE_SIZE
-for j, (wire, handle) in enumerate(connector.GetWires()):
+for j, (wire, _handle) in enumerate(connector.GetWires()):
 block = wire.EndConnected.GetParentBlock()
 if isinstance(element, LD_PowerRail):
 pos = block.GetPosition()
 size = leftblock.GetSize()
 movex = position[0] - LD_WIRE_SIZE - size[0] - pos[0]
 ExtractNextBlocks(block, block_list)
 element.RefreshModel(False)
 if recursive:
 for connector in connectors["outputs"]:
-for wire, handle in connector.GetWires():
+for wire, _handle in connector.GetWires():
 self.RefreshPosition(wire.StartConnected.GetParentBlock())
 def RefreshRungs(self, movey, fromidx):
 if movey != 0:
 for i in xrange(fromidx, len(self.Rungs)):

changeset 1847	6198190bc121
parent 1832	0f1081928d65
child 1850	614396cbffbf