equal
deleted
inserted
replaced
1664 self.SelectedElement.HighlightPoint(pos) |
1664 self.SelectedElement.HighlightPoint(pos) |
1665 self.RefreshBuffer() |
1665 self.RefreshBuffer() |
1666 elif connector is None or self.SelectedElement.GetDragging(): |
1666 elif connector is None or self.SelectedElement.GetDragging(): |
1667 self.DrawingWire = False |
1667 self.DrawingWire = False |
1668 rect = self.SelectedElement.GetRedrawRect() |
1668 rect = self.SelectedElement.GetRedrawRect() |
1669 self.SelectedElement.Delete() |
1669 wire = self.SelectedElement |
1670 self.SelectedElement = None |
1670 self.SelectedElement = self.SelectedElement.StartConnected.GetParentBlock() |
|
1671 self.SelectedElement.SetSelected(True) |
|
1672 rect.Union(self.SelectedElement.GetRedrawRect()) |
|
1673 wire.Delete() |
1671 self.RefreshRect(self.GetScrolledRect(rect), False) |
1674 self.RefreshRect(self.GetScrolledRect(rect), False) |
1672 else: |
1675 else: |
1673 if self.Debug: |
1676 if self.Debug: |
1674 Graphic_Element.OnLeftUp(self.SelectedElement, event, dc, self.Scaling) |
1677 Graphic_Element.OnLeftUp(self.SelectedElement, event, dc, self.Scaling) |
1675 else: |
1678 else: |
1702 if self.Mode == MODE_SELECTION: |
1705 if self.Mode == MODE_SELECTION: |
1703 element = self.FindElement(event) |
1706 element = self.FindElement(event) |
1704 if self.SelectedElement is not None and self.SelectedElement != element: |
1707 if self.SelectedElement is not None and self.SelectedElement != element: |
1705 self.SelectedElement.SetSelected(False) |
1708 self.SelectedElement.SetSelected(False) |
1706 self.SelectedElement = None |
1709 self.SelectedElement = None |
1707 if element: |
1710 if element is not None: |
1708 self.SelectedElement = element |
1711 self.SelectedElement = element |
1709 if self.Debug: |
1712 if self.Debug: |
1710 Graphic_Element.OnRightDown(self.SelectedElement, event, self.GetLogicalDC(), self.Scaling) |
1713 Graphic_Element.OnRightDown(self.SelectedElement, event, self.GetLogicalDC(), self.Scaling) |
1711 else: |
1714 else: |
1712 self.SelectedElement.OnRightDown(event, self.GetLogicalDC(), self.Scaling) |
1715 self.SelectedElement.OnRightDown(event, self.GetLogicalDC(), self.Scaling) |
1729 if self.Editor.HasCapture(): |
1732 if self.Editor.HasCapture(): |
1730 self.Editor.ReleaseMouse() |
1733 self.Editor.ReleaseMouse() |
1731 event.Skip() |
1734 event.Skip() |
1732 |
1735 |
1733 def OnViewerLeftDClick(self, event): |
1736 def OnViewerLeftDClick(self, event): |
1734 if self.Mode == MODE_SELECTION and self.SelectedElement is not None: |
1737 element = self.FindElement(event, connectors=False) |
|
1738 if self.Mode == MODE_SELECTION and element is not None: |
|
1739 if self.SelectedElement is not None and self.SelectedElement != element: |
|
1740 self.SelectedElement.SetSelected(False) |
|
1741 if self.HighlightedElement is not None and self.HighlightedElement != element: |
|
1742 self.HighlightedElement.SetHighlighted(False) |
|
1743 |
|
1744 self.SelectedElement = element |
|
1745 self.HighlightedElement = element |
|
1746 self.SelectedElement.SetHighlighted(True) |
|
1747 |
1735 if self.Debug: |
1748 if self.Debug: |
1736 if self.IsBlock(self.SelectedElement): |
1749 if self.IsBlock(self.SelectedElement): |
1737 instance_type = self.SelectedElement.GetType() |
1750 instance_type = self.SelectedElement.GetType() |
1738 pou_type = { |
1751 pou_type = { |
1739 "program": ITEM_PROGRAM, |
1752 "program": ITEM_PROGRAM, |