715 if width < 260: |
715 if width < 260: |
716 break |
716 break |
717 faces["size"] -= 1 |
717 faces["size"] -= 1 |
718 self.Editor.SetFont(font) |
718 self.Editor.SetFont(font) |
719 self.MiniTextDC = wx.MemoryDC(wx.Bitmap(1, 1)) |
719 self.MiniTextDC = wx.MemoryDC(wx.Bitmap(1, 1)) |
720 self.MiniTextDC.SetFont(wx.Font(faces["size"] * 0.75, wx.SWISS, wx.NORMAL, wx.NORMAL, faceName=faces["helv"])) |
720 self.MiniTextDC.SetFont(wx.Font(int(faces["size"] * 0.75), wx.SWISS, wx.NORMAL, wx.NORMAL, faceName=faces["helv"])) |
721 |
721 |
722 self.CurrentScale = None |
722 self.CurrentScale = None |
723 self.SetScale(ZOOM_FACTORS.index(1.0), False) |
723 self.SetScale(ZOOM_FACTORS.index(1.0), False) |
724 |
724 |
725 self.RefreshHighlightsTimer = wx.Timer(self, -1) |
725 self.RefreshHighlightsTimer = wx.Timer(self, -1) |
1371 self.AddBlock(element) |
1371 self.AddBlock(element) |
1372 connectors = element.GetConnectors() |
1372 connectors = element.GetConnectors() |
1373 element.SetPosition(instance.x, instance.y) |
1373 element.SetPosition(instance.x, instance.y) |
1374 element.SetSize(instance.width, instance.height) |
1374 element.SetSize(instance.width, instance.height) |
1375 for i, output_connector in enumerate(instance.outputs): |
1375 for i, output_connector in enumerate(instance.outputs): |
1376 connector_pos = wx.Point(*output_connector.position) |
1376 connector_pos = wx.Point(*map(int, output_connector.position)) |
1377 if isinstance(element, FBD_Block): |
1377 if isinstance(element, FBD_Block): |
1378 connector = element.GetConnector(connector_pos, |
1378 connector = element.GetConnector(connector_pos, |
1379 output_name=output_connector.name) |
1379 output_name=output_connector.name) |
1380 elif i < len(connectors["outputs"]): |
1380 elif i < len(connectors["outputs"]): |
1381 connector = connectors["outputs"][i] |
1381 connector = connectors["outputs"][i] |
1387 if output_connector.edge is not None: |
1387 if output_connector.edge is not None: |
1388 connector.SetEdge(output_connector.edge) |
1388 connector.SetEdge(output_connector.edge) |
1389 if connectors["outputs"].index(connector) == i: |
1389 if connectors["outputs"].index(connector) == i: |
1390 connector.SetPosition(connector_pos) |
1390 connector.SetPosition(connector_pos) |
1391 for i, input_connector in enumerate(instance.inputs): |
1391 for i, input_connector in enumerate(instance.inputs): |
1392 connector_pos = wx.Point(*input_connector.position) |
1392 connector_pos = wx.Point(*map(int,input_connector.position)) |
1393 if isinstance(element, FBD_Block): |
1393 if isinstance(element, FBD_Block): |
1394 connector = element.GetConnector(connector_pos, |
1394 connector = element.GetConnector(connector_pos, |
1395 input_name=input_connector.name) |
1395 input_name=input_connector.name) |
1396 elif i < len(connectors["inputs"]): |
1396 elif i < len(connectors["inputs"]): |
1397 connector = connectors["inputs"][i] |
1397 connector = connectors["inputs"][i] |
1428 links_connected = False |
1428 links_connected = False |
1429 continue |
1429 continue |
1430 |
1430 |
1431 points = link.points |
1431 points = link.points |
1432 end_connector = connected.GetConnector( |
1432 end_connector = connected.GetConnector( |
1433 wx.Point(points[-1].x, points[-1].y) |
1433 wx.Point(int(points[-1].x), int(points[-1].y)) |
1434 if len(points) > 0 else wx.Point(0, 0), |
1434 if len(points) > 0 else wx.Point(0, 0), |
1435 link.formalParameter) |
1435 link.formalParameter) |
1436 if end_connector is not None: |
1436 if end_connector is not None: |
1437 if len(points) > 0: |
1437 if len(points) > 0: |
1438 wire = Wire(self) |
1438 wire = Wire(self) |