X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/102e2b26c00f2361df4f57b834be26cd04a27240..d8d7193d767beecab7335e58df1fa0d25ae1e2ea:/wxPython/wx/lib/analogclock.py?ds=sidebyside diff --git a/wxPython/wx/lib/analogclock.py b/wxPython/wx/lib/analogclock.py index 5d1b91f3e3..72a21e7957 100644 --- a/wxPython/wx/lib/analogclock.py +++ b/wxPython/wx/lib/analogclock.py @@ -103,11 +103,17 @@ class AnalogClockWindow(wx.PyWindow): self.currentTime=None + size = wx.Size(*size) + bestSize = self.GetBestSize() + size.x = max(size.x, bestSize.x) + size.y = max(size.y, bestSize.y) + self.SetSize(size) + # Make an initial bitmap for the face, it will be updated and # painted at the first EVT_SIZE event. W, H = size self.faceBitmap = wx.EmptyBitmap(max(W,1), max(H,1)) - + # Set event handlers... self.Bind(wx.EVT_PAINT, self.OnPaint) self.Bind(wx.EVT_ERASE_BACKGROUND, lambda x: None) @@ -117,18 +123,21 @@ class AnalogClockWindow(wx.PyWindow): self.Bind(wx.EVT_RIGHT_DOWN, self.OnRightDown) self.Bind(wx.EVT_RIGHT_UP, self.OnRightClick) - # Initialize the timer that drives the update of the clock # face. Update every half second to ensure that there is at # least one true update during each realtime second. self.timer = wx.Timer(self) self.timer.Start(500) + def DoGetBestSize(self): return wx.Size(25,25) + def OnPaint(self, event): - self._doDrawHands(wx.BufferedPaintDC(self), True) + dc = wx.BufferedPaintDC(self) + if hasattr(self, 'coords'): + self._doDrawHands(dc, True) def OnTimerExpire(self, event): @@ -187,6 +196,9 @@ class AnalogClockWindow(wx.PyWindow): # The faceBitmap init is done here, to make sure the buffer is always # the same size as the Window size = self.GetClientSize() + if size.x < 1 or size.y < 1: + return + self.faceBitmap = wx.EmptyBitmap(size.width, size.height) # Update drawing coordinates... @@ -221,7 +233,7 @@ class AnalogClockWindow(wx.PyWindow): hour, minutes, seconds = currentTime # Start by drawing the face bitmap - drawDC.DrawBitmap(self.faceBitmap, (0,0)) + drawDC.DrawBitmap(self.faceBitmap, 0,0) # NOTE: All this hand drawing code below should be refactored into a helper function. @@ -240,10 +252,10 @@ class AnalogClockWindow(wx.PyWindow): drawDC.SetPen(wx.Pen(self.shadowPenColour, int(self.handHoursThickness * self.scale), wx.SOLID)) - drawDC.DrawLineXY(int(self.centerX + self.shadowDistance), - int(self.centerY + self.shadowDistance), - int(x + self.shadowDistance), - int(y + self.shadowDistance)) + drawDC.DrawLine(self.centerX + self.shadowDistance, + self.centerY + self.shadowDistance, + x + self.shadowDistance, + y + self.shadowDistance) # Draw minutes hand shadow angle = minutes * 6 @@ -253,10 +265,10 @@ class AnalogClockWindow(wx.PyWindow): drawDC.SetPen(wx.Pen(self.shadowPenColour, int(self.handMinutesThickness * self.scale), wx.SOLID)) - drawDC.DrawLineXY(int(self.centerX + self.shadowDistance), - int(self.centerY + self.shadowDistance), - int(x + self.shadowDistance), - int(y + self.shadowDistance)) + drawDC.DrawLine(self.centerX + self.shadowDistance, + self.centerY + self.shadowDistance, + x + self.shadowDistance, + y + self.shadowDistance) # Draw seconds hand shadow if required if seconds >= 0: @@ -267,10 +279,10 @@ class AnalogClockWindow(wx.PyWindow): drawDC.SetPen(wx.Pen(self.shadowPenColour, int(self.handSecondsThickness * self.scale), wx.SOLID)) - drawDC.DrawLineXY(int(self.centerX + self.shadowDistance), - int(self.centerY + self.shadowDistance), - int(x + self.shadowDistance), - int(y + self.shadowDistance)) + drawDC.DrawLine(self.centerX + self.shadowDistance, + self.centerY + self.shadowDistance, + x + self.shadowDistance, + y + self.shadowDistance) # Draw hours hand @@ -285,7 +297,7 @@ class AnalogClockWindow(wx.PyWindow): drawDC.SetPen(wx.Pen(self.handHoursColour, int(self.handHoursThickness * self.scale), wx.SOLID)) - drawDC.DrawLineXY(int(self.centerX), int(self.centerY), int(x), int(y)) + drawDC.DrawLine(self.centerX, self.centerY, x, y) # Draw minutes hand angle = minutes * 6 @@ -295,7 +307,7 @@ class AnalogClockWindow(wx.PyWindow): drawDC.SetPen(wx.Pen(self.handMinutesColour, int(self.handMinutesThickness * self.scale), wx.SOLID)) - drawDC.DrawLineXY(int(self.centerX), int(self.centerY), int(x), int(y)) + drawDC.DrawLine(self.centerX, self.centerY, x, y) # Draw seconds hand if required if seconds >= 0: @@ -305,7 +317,7 @@ class AnalogClockWindow(wx.PyWindow): drawDC.SetPen(wx.Pen(self.handSecondsColour, int(self.handSecondsThickness * self.scale), wx.SOLID)) - drawDC.DrawLineXY(int(self.centerX), int(self.centerY), int(x), int(y)) + drawDC.DrawLine(self.centerX, self.centerY, x, y) @@ -371,11 +383,11 @@ class AnalogClockWindow(wx.PyWindow): if style & TICKS_CIRCLE: x, y = self._center2corner(x, y, tipo) - drawDC.DrawEllipse((x, y), (int(size), int(size))) + drawDC.DrawEllipse(x, y, size, size) elif style & TICKS_SQUARE: x, y = self._center2corner(x, y, tipo) - drawDC.DrawRectangle((x, y), (int(size), int(size))) + drawDC.DrawRectangle(x, y, size, size) elif (style & TICKS_DECIMAL) or (style & TICKS_ROMAN): self._draw_rotate_text(drawDC, x, y, tipo, angle) @@ -398,12 +410,12 @@ class AnalogClockWindow(wx.PyWindow): y = int(y - ((math.cos((angle) * radiansPerDegree)*lY) - (math.sin((angle) * radiansPerDegree)*lX))) - drawDC.DrawRotatedText(text, (x,y), angle) + drawDC.DrawRotatedText(text, x,y, angle) else: x = x - lX y = y - lY - drawDC.DrawText(text, (x, y)) + drawDC.DrawText(text, x, y) def _draw_rotate_polygon(self, drawDC, x, y, tipo, angle): @@ -527,7 +539,7 @@ class AnalogClockWindow(wx.PyWindow): drawDC.SetBrush(self.watchBrush) else: drawDC.SetBrush(wx.Brush(self.GetBackgroundColour(), wx.SOLID)) - drawDC.DrawCircle((self.centerX, self.centerY), self.radius_watch) + drawDC.DrawCircle(self.centerX, self.centerY, self.radius_watch) def _calcSteps(self): @@ -574,7 +586,7 @@ class AnalogClockWindow(wx.PyWindow): f=False coords["ticks_minutes"][3][i][2]=f - self.coords=coords + self.coords = coords def _getCoords(self, tipo, angle): @@ -724,21 +736,23 @@ class AnalogClockWindow(wx.PyWindow): def SetClockStyle(self, style): """ - Set the clock style, acording to the options: + Set the clock style, acording to these options: - SHOW_QUARTERS_TICKS - Show marks for hours 3, 6, 9, 12 - SHOW_HOURS_TICKS - Show marks for all hours - SHOW_MINUTES_TICKS - Show marks for minutes + ==================== ================================ + SHOW_QUARTERS_TICKS Show marks for hours 3, 6, 9, 12 + SHOW_HOURS_TICKS Show marks for all hours + SHOW_MINUTES_TICKS Show marks for minutes - SHOW_HOURS_HAND - Show hours hand - SHOW_MINUTES_HAND - Show minutes hand - SHOW_SECONDS_HAND - Show seconds hand + SHOW_HOURS_HAND Show hours hand + SHOW_MINUTES_HAND Show minutes hand + SHOW_SECONDS_HAND Show seconds hand - SHOW_SHADOWS - Show hands and marks shadows + SHOW_SHADOWS Show hands and marks shadows - ROTATE_TICKS - Align tick marks to watch - OVERLAP_TICKS - Draw tick marks for minutes even + ROTATE_TICKS Align tick marks to watch + OVERLAP_TICKS Draw tick marks for minutes even when they match the hours marks. + ==================== ================================ """ self.clockStyle = style @@ -748,14 +762,17 @@ class AnalogClockWindow(wx.PyWindow): """ Set the ticks styles, acording to the options below. - TICKS_NONE = Don't show tick marks. - TICKS_SQUARE = Use squares as tick marks. - TICKS_CIRCLE = Use circles as tick marks. - TICKS_POLY = Use a polygon as tick marks. The polygon - must be passed using SetTickShapes, - otherwise the default polygon will be used. - TICKS_DECIMAL = Use decimal numbers. - TICKS_ROMAN = Use Roman numbers. + ================= ===================================== + TICKS_NONE Don't show tick marks. + TICKS_SQUARE Use squares as tick marks. + TICKS_CIRCLE Use circles as tick marks. + TICKS_POLY Use a polygon as tick marks. The + polygon must be passed using + SetTickShapes, otherwise the default + polygon will be used. + TICKS_DECIMAL Use decimal numbers. + TICKS_ROMAN Use Roman numbers. + ================= ===================================== """ if h: