Commit f7c8e235 authored by Guido van Rossum's avatar Guido van Rossum

*** empty log message ***

parent e5bc4267
...@@ -54,12 +54,9 @@ class LabelAppearance(): ...@@ -54,12 +54,9 @@ class LabelAppearance():
self.redraw() self.redraw()
# #
def setbounds(self, bounds): def setbounds(self, bounds):
if self.bounds <> _rect.empty:
self.parent.change(self.bounds)
self.bounds = bounds self.bounds = bounds
if self.bounds <> _rect.empty: if self.bounds <> _rect.empty:
self.recalc() self.recalc()
self.parent.change(bounds)
# #
def realize(self): def realize(self):
pass pass
...@@ -109,14 +106,15 @@ class LabelAppearance(): ...@@ -109,14 +106,15 @@ class LabelAppearance():
# #
def redraw(self): def redraw(self):
if self.bounds <> _rect.empty: if self.bounds <> _rect.empty:
self.draw(self.parent.begindrawing(), self.bounds) d = self.parent.begindrawing()
d.erase(self.bounds)
self.draw(d, self.bounds)
# #
def draw(self, (d, area)): def draw(self, (d, area)):
area = _rect.intersect(area, self.bounds) area = _rect.intersect(area, self.bounds)
if area = _rect.empty: if area = _rect.empty:
return return
d.cliprect(area) d.cliprect(area)
d.erase(self.bounds)
self.drawit(d) self.drawit(d)
d.noclip() d.noclip()
# #
...@@ -203,11 +201,10 @@ class RadioAppearance() = CheckAppearance(): ...@@ -203,11 +201,10 @@ class RadioAppearance() = CheckAppearance():
def drawpict(self, d): def drawpict(self, d):
(left, top), (right, bottom) = self.boxbounds (left, top), (right, bottom) = self.boxbounds
radius = self.size / 2 radius = self.size / 2
h, v = left + radius, top + radius center = left + radius, top + radius
d.circle((h, v), radius) d.circle(center, radius)
if self.selected: if self.selected:
some = radius/3 d.fillcircle(center, radius*3/5)
d.paint((h-some, v-some), (h+some, v+some))
# #
......
...@@ -52,7 +52,6 @@ class StripChart() = LabelAppearance(), NoReactivity(): ...@@ -52,7 +52,6 @@ class StripChart() = LabelAppearance(), NoReactivity():
def draw(self, (d, area)): def draw(self, (d, area)):
area = rect.intersect(area, self.bounds) area = rect.intersect(area, self.bounds)
if area = rect.empty: if area = rect.empty:
print 'mt'
return return
d.cliprect(area) d.cliprect(area)
d.erase(self.bounds) d.erase(self.bounds)
......
...@@ -54,12 +54,9 @@ class LabelAppearance(): ...@@ -54,12 +54,9 @@ class LabelAppearance():
self.redraw() self.redraw()
# #
def setbounds(self, bounds): def setbounds(self, bounds):
if self.bounds <> _rect.empty:
self.parent.change(self.bounds)
self.bounds = bounds self.bounds = bounds
if self.bounds <> _rect.empty: if self.bounds <> _rect.empty:
self.recalc() self.recalc()
self.parent.change(bounds)
# #
def realize(self): def realize(self):
pass pass
...@@ -109,14 +106,15 @@ class LabelAppearance(): ...@@ -109,14 +106,15 @@ class LabelAppearance():
# #
def redraw(self): def redraw(self):
if self.bounds <> _rect.empty: if self.bounds <> _rect.empty:
self.draw(self.parent.begindrawing(), self.bounds) d = self.parent.begindrawing()
d.erase(self.bounds)
self.draw(d, self.bounds)
# #
def draw(self, (d, area)): def draw(self, (d, area)):
area = _rect.intersect(area, self.bounds) area = _rect.intersect(area, self.bounds)
if area = _rect.empty: if area = _rect.empty:
return return
d.cliprect(area) d.cliprect(area)
d.erase(self.bounds)
self.drawit(d) self.drawit(d)
d.noclip() d.noclip()
# #
...@@ -203,11 +201,10 @@ class RadioAppearance() = CheckAppearance(): ...@@ -203,11 +201,10 @@ class RadioAppearance() = CheckAppearance():
def drawpict(self, d): def drawpict(self, d):
(left, top), (right, bottom) = self.boxbounds (left, top), (right, bottom) = self.boxbounds
radius = self.size / 2 radius = self.size / 2
h, v = left + radius, top + radius center = left + radius, top + radius
d.circle((h, v), radius) d.circle(center, radius)
if self.selected: if self.selected:
some = radius/3 d.fillcircle(center, radius*3/5)
d.paint((h-some, v-some), (h+some, v+some))
# #
......
...@@ -52,7 +52,6 @@ class StripChart() = LabelAppearance(), NoReactivity(): ...@@ -52,7 +52,6 @@ class StripChart() = LabelAppearance(), NoReactivity():
def draw(self, (d, area)): def draw(self, (d, area)):
area = rect.intersect(area, self.bounds) area = rect.intersect(area, self.bounds)
if area = rect.empty: if area = rect.empty:
print 'mt'
return return
d.cliprect(area) d.cliprect(area)
d.erase(self.bounds) d.erase(self.bounds)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment