plcopeneditor_history: comparison LDViewer.py

equal deleted inserted replaced

-:04a02b4b2a57
+:dd6f693e46a1
 #
 #You should have received a copy of the GNU General Public
 #License along with this library; if not, write to the Free Software
 #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-from wxPython.wx import *
 import wx
 from types import *
 from Viewer import *
 result = element.TestSegment(event.GetLogicalPosition(dc), True)
 if result and result[1] in [EAST, WEST]:
 element.SetSelectedSegment(result[0])
 else:
 element.OnLeftUp(event, dc, self.Scaling)
-wxCallAfter(self.SetCursor, wxNullCursor)
+wx.CallAfter(self.SetCursor, wx.NullCursor)
 self.ReleaseMouse()
 self.Refresh()
 event.Skip()
 def OnViewerRightUp(self, event):
 if self.IsWire(self.SelectedElement):
 self.SelectedElement.SetSelectedSegment(0)
 else:
 self.SelectedElement.SetSelected(True)
 self.SelectedElement.OnRightUp(event, dc, self.Scaling)
-wxCallAfter(self.SetCursor, wxNullCursor)
+wx.CallAfter(self.SetCursor, wx.NullCursor)
 self.ReleaseMouse()
 self.Refresh()
 event.Skip()
 def OnViewerLeftDClick(self, event):
 def OnChar(self, event):
 if self.GetDrawingMode() == FREEDRAWING_MODE:
 Viewer.OnChar(self, event)
 else:
+xpos, ypos = self.GetScrollPos(wx.HORIZONTAL), self.GetScrollPos(wx.VERTICAL)
+xmax = self.GetScrollRange(wx.HORIZONTAL) - self.GetScrollThumb(wx.HORIZONTAL)
+ymax = self.GetScrollRange(wx.VERTICAL) - self.GetScrollThumb(wx.VERTICAL)
 keycode = event.GetKeyCode()
-if keycode == WXK_DELETE and self.SelectedElement:
+if keycode == wx.WXK_DELETE and self.SelectedElement:
 if self.IsBlock(self.SelectedElement):
 self.SelectedElement.Delete()
 elif self.IsWire(self.SelectedElement):
 self.DeleteWire(self.SelectedElement)
 elif isinstance(self.SelectedElement, Graphic_Group):
 else:
 self.SelectedElement.Delete()
 self.RefreshBuffer()
 self.RefreshScrollBars()
 self.Refresh()
-elif keycode == WXK_LEFT:
+elif keycode == wx.WXK_LEFT:
 if event.ControlDown() and event.ShiftDown():
 self.Scroll(0, ypos)
 elif event.ControlDown():
 self.Scroll(max(0, xpos - 1), ypos)
-elif keycode == WXK_RIGHT:
+elif keycode == wx.WXK_RIGHT:
 if event.ControlDown() and event.ShiftDown():
 self.Scroll(xmax, ypos)
 elif event.ControlDown():
 self.Scroll(min(xpos + 1, xmax), ypos)
-elif keycode == WXK_UP:
+elif keycode == wx.WXK_UP:
 if event.ControlDown() and event.ShiftDown():
 self.Scroll(xpos, 0)
 elif event.ControlDown():
 self.Scroll(xpos, max(0, ypos - 1))
-elif keycode == WXK_DOWN:
+elif keycode == wx.WXK_DOWN:
 if event.ControlDown() and event.ShiftDown():
 self.Scroll(xpos, ymax)
 elif event.ControlDown():
 self.Scroll(xpos, min(ypos + 1, ymax))
 event.Skip()
 returntype = self.Controler.GetCurrentElementEditingInterfaceReturnType()
 if returntype == "BOOL":
 varlist.append(self.Controler.GetCurrentElementEditingName())
 dialog.SetVariables(varlist)
 dialog.SetValues({"name":"","type":COIL_NORMAL})
-if dialog.ShowModal() == wxID_OK:
+if dialog.ShowModal() == wx.ID_OK:
 values = dialog.GetValues()
 startx, starty = LD_OFFSET[0], 0
 if len(self.Rungs) > 0:
 bbox = self.Rungs[-1].GetBoundingBox()
 starty = bbox.y + bbox.height
 for var in vars:
 if var["Class"] != "Output" and var["Type"] == "BOOL":
 varlist.append(var["Name"])
 dialog.SetVariables(varlist)
 dialog.SetValues({"name":"","type":CONTACT_NORMAL})
-if dialog.ShowModal() == wxID_OK:
+if dialog.ShowModal() == wx.ID_OK:
 values = dialog.GetValues()
 points = wires[0].GetSelectedSegmentPoints()
 id = self.GetNewId()
 contact = LD_Contact(self, values["type"], values["name"], id)
 contact.SetPosition(0, points[0].y - (LD_ELEMENT_SIZE[1] + 1) / 2)
 self.RefreshRungs(new_bbox.height - old_bbox.height, rungindex + 1)
 self.RefreshBuffer()
 self.RefreshScrollBars()
 self.Refresh()
 else:
-message = wxMessageDialog(self, "You must select the wire where a contact should be added!", "Error", wxOK|wxICON_ERROR)
+message = wx.MessageDialog(self, "You must select the wire where a contact should be added!", "Error", wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 def AddLadderBranch(self):
 blocks = []
 returntype = self.Controler.GetCurrentElementEditingInterfaceReturnType()
 if returntype == "BOOL":
 varlist.append(self.Controler.GetCurrentElementEditingName())
 dialog.SetVariables(varlist)
 dialog.SetValues({"name":"","type":COIL_NORMAL})
-if dialog.ShowModal() == wxID_OK:
+if dialog.ShowModal() == wx.ID_OK:
 values = dialog.GetValues()
 powerrail = right_elements[0].GetParentBlock()
 index = 0
 for right_element in right_elements:
 index = max(index, powerrail.GetConnectorIndex(right_element))
 self.RefreshRungs(new_bbox.height - old_bbox.height, rungindex + 1)
 self.RefreshBuffer()
 self.RefreshScrollBars()
 self.Refresh()
 else:
-message = wxMessageDialog(self, "The group of block must be coherent!", "Error", wxOK|wxICON_ERROR)
+message = wx.MessageDialog(self, "The group of block must be coherent!", "Error", wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 else:
-message = wxMessageDialog(self, "You must select the block or group of blocks around which a branch should be added!", "Error", wxOK|wxICON_ERROR)
+message = wx.MessageDialog(self, "You must select the block or group of blocks around which a branch should be added!", "Error", wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 def AddLadderBlock(self):
-message = wxMessageDialog(self, "This option isn't available yet!", "Warning", wxOK|wxICON_EXCLAMATION)
+message = wx.MessageDialog(self, "This option isn't available yet!", "Warning", wx.OK|wx.ICON_EXCLAMATION)
 message.ShowModal()
 message.Destroy()
 #-------------------------------------------------------------------------------
 #                          Delete element functions
 else:
 offset = start_offset + LD_LINE_SIZE * CalcBranchSize(previous_blocks, blocks)
 if block in block_list:
 wires = wire.EndConnected.GetWires()
 endmiddlepoint = wires[0][0].StartConnected.GetPosition(False)[0] - LD_WIRE_SIZE
-points = [startpoint, wxPoint(middlepoint, startpoint.y),
+points = [startpoint, wx.Point(middlepoint, startpoint.y),
-wxPoint(middlepoint, startpoint.y + offset),
+wx.Point(middlepoint, startpoint.y + offset),
-wxPoint(endmiddlepoint, startpoint.y + offset),
+wx.Point(endmiddlepoint, startpoint.y + offset),
-wxPoint(endmiddlepoint, endpoint.y), endpoint]
+wx.Point(endmiddlepoint, endpoint.y), endpoint]
 else:
 if startpoint.y + offset != endpoint.y:
 if isinstance(element, LD_PowerRail):
 diff = (startpoint.y - endpoint.y) / LD_LINE_SIZE
 for k in xrange(abs(diff)):
 else:
 block.Move(0, startpoint.y + offset - endpoint.y)
 self.RefreshPosition(block, False)
 endpoint = wire.EndConnected.GetPosition(False)
 if not onlyone[i]:
-points = [startpoint, wxPoint(middlepoint, startpoint.y),
+points = [startpoint, wx.Point(middlepoint, startpoint.y),
-wxPoint(middlepoint, endpoint.y), endpoint]
+wx.Point(middlepoint, endpoint.y), endpoint]
 else:
 points = [startpoint, endpoint]
 wire.SetPoints(points)
 previous_blocks.append(block)
 blocks.remove(block)
 for var in vars:
 if var["Class"] != "Output" and var["Type"] == "BOOL":
 varlist.append(var["Name"])
 dialog.SetVariables(varlist)
 dialog.SetValues({"name":contact.GetName(),"type":contact.GetType()})
-if dialog.ShowModal() == wxID_OK:
+if dialog.ShowModal() == wx.ID_OK:
 values = dialog.GetValues()
 contact.SetName(values["name"])
 contact.SetType(values["type"])
 contact.RefreshModel(False)
 self.RefreshBuffer()
 returntype = self.Controler.GetCurrentElementEditingInterfaceReturnType()
 if returntype == "BOOL":
 varlist.append(self.Controler.GetCurrentElementEditingName())
 dialog.SetVariables(varlist)
 dialog.SetValues({"name":coil.GetName(),"type":coil.GetType()})
-if dialog.ShowModal() == wxID_OK:
+if dialog.ShowModal() == wx.ID_OK:
 values = dialog.GetValues()
 coil.SetName(values["name"])
 coil.SetType(values["type"])
 coil.RefreshModel(False)
 self.RefreshBuffer()

changeset 64	dd6f693e46a1
parent 58	39cd981ff242
child 67	3a1b0afdaf84