+# 11/20/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+#
+# 11/30/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o OGL's busted bigtime. Can't even use OGLInitialize() without a
+# program error on w2k.
+#
-from wxPython.wx import *
-from wxPython.ogl import *
+import wx
+import wx.ogl as ogl
-import images
+import images
+
+##wx.Trap()
#----------------------------------------------------------------------
# This creates some pens and brushes that the OGL library uses.
-wxOGLInitialize()
+ogl.OGLInitialize()
#----------------------------------------------------------------------
-class DiamondShape(wxPolygonShape):
+class DiamondShape(ogl.PolygonShape):
def __init__(self, w=0.0, h=0.0):
- wxPolygonShape.__init__(self)
+ ogl.PolygonShape.__init__(self)
if w == 0.0:
w = 60.0
if h == 0.0:
h = 60.0
- ## Either wxRealPoints or 2-tuples of floats works.
+ # Either ogl.RealPoints or 2-tuples of floats works.
- #points = [ wxRealPoint(0.0, -h/2.0),
- # wxRealPoint(w/2.0, 0.0),
- # wxRealPoint(0.0, h/2.0),
- # wxRealPoint(-w/2.0, 0.0),
+ #points = [ ogl.RealPoint(0.0, -h/2.0),
+ # ogl.RealPoint(w/2.0, 0.0),
+ # ogl.RealPoint(0.0, h/2.0),
+ # ogl.RealPoint(-w/2.0, 0.0),
# ]
points = [ (0.0, -h/2.0),
(w/2.0, 0.0),
#----------------------------------------------------------------------
-class RoundedRectangleShape(wxRectangleShape):
+class RoundedRectangleShape(ogl.RectangleShape):
def __init__(self, w=0.0, h=0.0):
- wxRectangleShape.__init__(self, w, h)
+ ogl.RectangleShape.__init__(self, w, h)
self.SetCornerRadius(-0.3)
#----------------------------------------------------------------------
-class DividedShape(wxDividedShape):
+class DividedShape(ogl.DividedShape):
def __init__(self, width, height, canvas):
- wxDividedShape.__init__(self, width, height)
+ ogl.DividedShape.__init__(self, width, height)
- region1 = wxShapeRegion()
- region1.SetText('wxDividedShape')
+ region1 = ogl.ShapeRegion()
+ region1.SetText('DividedShape')
region1.SetProportions(0.0, 0.2)
- region1.SetFormatMode(FORMAT_CENTRE_HORIZ)
+ region1.SetFormatMode(ogl.FORMAT_CENTRE_HORIZ)
self.AddRegion(region1)
- region2 = wxShapeRegion()
+ region2 = ogl.ShapeRegion()
region2.SetText('This is Region number two.')
region2.SetProportions(0.0, 0.3)
- region2.SetFormatMode(FORMAT_CENTRE_HORIZ|FORMAT_CENTRE_VERT)
+ region2.SetFormatMode(ogl.FORMAT_CENTRE_HORIZ|ogl.FORMAT_CENTRE_VERT)
self.AddRegion(region2)
- region3 = wxShapeRegion()
+ region3 = ogl.ShapeRegion()
region3.SetText('Region 3\nwith embedded\nline breaks')
region3.SetProportions(0.0, 0.5)
- region3.SetFormatMode(FORMAT_NONE)
+ region3.SetFormatMode(ogl.FORMAT_NONE)
self.AddRegion(region3)
self.SetRegionSizes()
def ReformatRegions(self, canvas=None):
rnum = 0
+
if canvas is None:
canvas = self.GetCanvas()
- dc = wxClientDC(canvas) # used for measuring
+
+ dc = wx.ClientDC(canvas) # used for measuring
+
for region in self.GetRegions():
text = region.GetText()
self.FormatText(dc, text, rnum)
def OnSizingEndDragLeft(self, pt, x, y, keys, attch):
+ print "***", self
self.base_OnSizingEndDragLeft(pt, x, y, keys, attch)
self.SetRegionSizes()
self.ReformatRegions()
#----------------------------------------------------------------------
-class MyEvtHandler(wxShapeEvtHandler):
+class MyEvtHandler(ogl.ShapeEvtHandler):
def __init__(self, log, frame):
- wxShapeEvtHandler.__init__(self)
+ ogl.ShapeEvtHandler.__init__(self)
self.log = log
self.statbarFrame = frame
def OnLeftClick(self, x, y, keys = 0, attachment = 0):
shape = self.GetShape()
- print shape.__class__
+ print shape.__class__, shape.GetClassName()
canvas = shape.GetCanvas()
- dc = wxClientDC(canvas)
+ dc = wx.ClientDC(canvas)
canvas.PrepareDC(dc)
if shape.Selected():
redraw = False
shapeList = canvas.GetDiagram().GetShapeList()
toUnselect = []
+
for s in shapeList:
if s.Selected():
# If we unselect it now then some of the objects in
if toUnselect:
for s in toUnselect:
s.Select(False, dc)
+
canvas.Redraw(dc)
self.UpdateStatusBar(shape)
def OnEndDragLeft(self, x, y, keys = 0, attachment = 0):
shape = self.GetShape()
self.base_OnEndDragLeft(x, y, keys, attachment)
+
if not shape.Selected():
self.OnLeftClick(x, y, keys, attachment)
+
self.UpdateStatusBar(shape)
#----------------------------------------------------------------------
-class TestWindow(wxShapeCanvas):
+class TestWindow(ogl.ShapeCanvas):
def __init__(self, parent, log, frame):
- wxShapeCanvas.__init__(self, parent)
+ ogl.ShapeCanvas.__init__(self, parent)
maxWidth = 1000
maxHeight = 1000
self.log = log
self.frame = frame
- self.SetBackgroundColour("LIGHT BLUE") #wxWHITE)
- self.diagram = wxDiagram()
+ self.SetBackgroundColour("LIGHT BLUE") #wx.WHITE)
+ self.diagram = ogl.Diagram()
self.SetDiagram(self.diagram)
self.diagram.SetCanvas(self)
self.shapes = []
self.save_gdi = []
- rRectBrush = wxBrush("MEDIUM TURQUOISE", wxSOLID)
- dsBrush = wxBrush("WHEAT", wxSOLID)
-
- self.MyAddShape(wxCircleShape(80), 100, 100, wxPen(wxBLUE, 3), wxGREEN_BRUSH, "Circle")
- self.MyAddShape(wxRectangleShape(85, 50), 305, 60, wxBLACK_PEN, wxLIGHT_GREY_BRUSH, "Rectangle")
- ds = self.MyAddShape(DividedShape(140, 150, self), 495, 145, wxBLACK_PEN, dsBrush, '')
- self.MyAddShape(DiamondShape(90, 90), 345, 235, wxPen(wxBLUE, 3, wxDOT), wxRED_BRUSH, "Polygon")
- self.MyAddShape(RoundedRectangleShape(95,70), 140, 255, wxPen(wxRED, 2), rRectBrush, "Rounded Rect")
+ rRectBrush = wx.Brush("MEDIUM TURQUOISE", wx.SOLID)
+ dsBrush = wx.Brush("WHEAT", wx.SOLID)
+
+ self.MyAddShape(
+ ogl.CircleShape(80),
+ 100, 100, wx.Pen(wx.BLUE, 3), wx.GREEN_BRUSH, "Circle"
+ )
+
+ self.MyAddShape(
+ ogl.RectangleShape(85, 50),
+ 305, 60, wx.BLACK_PEN, wx.LIGHT_GREY_BRUSH, "Rectangle"
+ )
+
+ ds = self.MyAddShape(
+ DividedShape(140, 150, self),
+ 495, 145, wx.BLACK_PEN, dsBrush, ''
+ )
+
+ self.MyAddShape(
+ DiamondShape(90, 90),
+ 345, 235, wx.Pen(wx.BLUE, 3, wx.DOT), wx.RED_BRUSH, "Polygon"
+ )
+
+ self.MyAddShape(
+ RoundedRectangleShape(95,70),
+ 140, 255, wx.Pen(wx.RED, 2), rRectBrush, "Rounded Rect"
+ )
bmp = images.getTest2Bitmap()
- mask = wxMaskColour(bmp, wxBLUE)
+ mask = wx.MaskColour(bmp, wx.BLUE)
bmp.SetMask(mask)
- s = wxBitmapShape()
+ s = ogl.BitmapShape()
s.SetBitmap(bmp)
self.MyAddShape(s, 225, 150, None, None, "Bitmap")
- dc = wxClientDC(self)
+ dc = wx.ClientDC(self)
self.PrepareDC(dc)
+
for x in range(len(self.shapes)):
fromShape = self.shapes[x]
if x+1 == len(self.shapes):
toShape = self.shapes[0]
else:
toShape = self.shapes[x+1]
- line = wxLineShape()
+
+ line = ogl.LineShape()
line.SetCanvas(self)
- line.SetPen(wxBLACK_PEN)
- line.SetBrush(wxBLACK_BRUSH)
- line.AddArrow(ARROW_ARROW)
+ line.SetPen(wx.BLACK_PEN)
+ line.SetBrush(wx.BLACK_BRUSH)
+ line.AddArrow(ogl.ARROW_ARROW)
line.MakeLineControlPoints(2)
fromShape.AddLine(line, toShape)
self.diagram.AddShape(line)
# for some reason, the shapes have to be moved for the line to show up...
fromShape.Move(dc, fromShape.GetX(), fromShape.GetY())
- EVT_WINDOW_DESTROY(self, self.OnDestroy)
+ wx.EVT_WINDOW_DESTROY(self, self.OnDestroy)
def MyAddShape(self, shape, x, y, pen, brush, text):
if pen: shape.SetPen(pen)
if brush: shape.SetBrush(brush)
if text: shape.AddText(text)
- #shape.SetShadowMode(SHADOW_RIGHT)
+ #shape.SetShadowMode(ogl.SHADOW_RIGHT)
self.diagram.AddShape(shape)
shape.Show(True)
if shape.GetParent() == None:
shape.SetCanvas(None)
shape.Destroy()
+
self.diagram.Destroy()
#----------------------------------------------------------------------
def runTest(frame, nb, log):
+ # This creates some pens and brushes that the OGL library uses.
+ # It should be called after the app object has been created, but
+ # before OGL is used.
+ ogl.OGLInitialize()
+
win = TestWindow(nb, log, frame)
return win
-
+
#----------------------------------------------------------------------
class __Cleanup:
- cleanup = wxOGLCleanUp
+ cleanup = ogl.OGLCleanUp
def __del__(self):
self.cleanup()
__cu = __Cleanup()
-
-
-
-
-
-
overview = """\
The Object Graphics Library is a library supporting the creation and
manipulation of simple and complex graphic images on a canvas.
"""
-
-
if __name__ == '__main__':
import sys,os
import run
projects / wxWidgets.git / blobdiff