From b8d189cd5cd2b155424e41e40c0516c00d247b18 Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Fri, 22 Feb 2013 15:17:12 +0000 Subject: adjust positions of scaled up dots and labels --- diff --git a/TurtleArt/tabasics.py b/TurtleArt/tabasics.py index ffa07a2..1416a61 100644 --- a/TurtleArt/tabasics.py +++ b/TurtleArt/tabasics.py @@ -571,7 +571,7 @@ tasetshade :shade \r') primitive_dictionary['minus'] = self._prim_minus palette.add_block('minus2', style='number-style-porch', - label='–', + label=' –', special_name=_('minus'), prim_name='minus', logo_command='taminus', @@ -597,7 +597,7 @@ minus :y\rend\r') primitive_dictionary['division'] = self._prim_careful_divide palette.add_block('division2', style='number-style-porch', - label='/', + label=' /', special_name=_('divide'), prim_name='division', logo_command='quotient', @@ -666,7 +666,7 @@ operators')) primitive_dictionary['more'] = self._prim_more palette.add_block('greater2', style='compare-porch-style', - label='>', + label=' >', string_or_number=True, special_name=_('greater than'), prim_name='greater?', @@ -679,7 +679,7 @@ operators')) primitive_dictionary['less'] = self._prim_less palette.add_block('less2', style='compare-porch-style', - label='<', + label=' <', special_name=_('less than'), string_or_number=True, prim_name='less?', diff --git a/TurtleArt/tablock.py b/TurtleArt/tablock.py index 3f64066..6b9e5be 100644 --- a/TurtleArt/tablock.py +++ b/TurtleArt/tablock.py @@ -866,7 +866,7 @@ class Block: self.svg.docks[1][1]]] def _make_compare_style(self, svg): - self.svg.expand(10 + self.dx + self.ex, self.ey) + self.svg.expand(15 + self.dx + self.ex, self.ey) self._make_block_graphics(svg, self.svg.boolean_compare) self.docks = [['bool', True, self.svg.docks[0][0], self.svg.docks[0][1], '('], @@ -881,7 +881,7 @@ class Block: self._make_compare_style(svg) def _make_boolean_style(self, svg): - self.svg.expand(10 + self.dx + self.ex, self.ey) + self.svg.expand(15 + self.dx + self.ex, self.ey) self._make_block_graphics(svg, self.svg.boolean_and_or) self.docks = [['bool', True, self.svg.docks[0][0], self.svg.docks[0][1]], diff --git a/TurtleArt/tasprite_factory.py b/TurtleArt/tasprite_factory.py index c40d13a..6ea0136 100755 --- a/TurtleArt/tasprite_factory.py +++ b/TurtleArt/tasprite_factory.py @@ -305,7 +305,7 @@ class SVG: self._innie_spacer - self._stroke_width) self._hide_x = self._x + self._radius + self._stroke_width - self._hide_y = self._y - self._radius * 0 + self._stroke_width + self._hide_y = self._y + self._stroke_width self._show_x = self._x + self._radius + self._stroke_width svg += self._rarc_to(1, -1) @@ -321,7 +321,7 @@ class SVG: svg += self._do_boolean() svg += self._rline_to(0, self._radius / 2.0) - self._show_y = self._y + self._radius * 0 + self._show_y = self._y self._show_y -= (self._innie_y1 + self._innie_y2 + self._stroke_width) svg += self.line_to(xx, self._y) @@ -402,7 +402,7 @@ class SVG: svg += self._rline_to(0, yoffset) self._hide_x = self._x + self._radius + self._stroke_width - self._hide_y = self._y - self._radius * 0 + self._stroke_width + self._hide_y = self._y + self._stroke_width self._show_x = self._x + self._radius + self._stroke_width svg += self._rarc_to(1, -1) @@ -421,7 +421,7 @@ class SVG: svg += self._rline_to(-self._expand_x, 0) - self._show_y = self._y + self._radius * 0 + self._show_y = self._y self._show_y -= (self._innie_y1 + self._innie_y2 + self._stroke_width) svg += self._end_boolean() @@ -949,12 +949,15 @@ class SVG: svg_str = "" if sign_x == 1 and sign_y == -1: self._hide_x = self._x + self._radius + self._stroke_width - self._hide_y = self._y - self._radius * 0 + self._stroke_width + self._hide_y = self._y + self._stroke_width self._show_x = self._x + self._radius + self._stroke_width - if sign_x == 1 and sign_y == 1 and len(self._innie) == 1: - self._show_x = self._x - self._radius + self._stroke_width + if sign_x == 1 and sign_y == 1 \ + and len(self._innie) == 1 and self._innie[0]: + self._show_x = self._x - self._radius + self._show_y = self._hide_y if sign_x == -1 and sign_y == 1: - self._show_y = self._y + self._radius * 0 - self._stroke_width + if not (len(self._innie) == 1 and self._innie[0]): + self._show_y = self._y - self._stroke_width if self._radius > 0: r2 = self._radius / 2.0 if start: @@ -1010,14 +1013,11 @@ class SVG: self._fill, self._stroke = _saved_fill, _saved_stroke return svg - def _show_dot(self, noscale=False): + def _show_dot(self): _saved_fill, _saved_stroke = self._fill, self._stroke self._fill, self._stroke = HIT_GREEN, HIT_GREEN svg = "/n/n" - if noscale: - scale = self._scale - else: - scale = self._scale * 2 + scale = self._scale * 2 scale2 = scale / 2 svg += self._circle(self._dot_radius * scale2, self._show_x * scale2, self._show_y * scale2) -- cgit v0.9.1