Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tablock.py14
-rwxr-xr-xtasprite_factory.py4
2 files changed, 9 insertions, 9 deletions
diff --git a/tablock.py b/tablock.py
index 44c91a8..0f8ca8c 100644
--- a/tablock.py
+++ b/tablock.py
@@ -96,10 +96,6 @@ class Block:
self._ex = 0
self._ey = 0
self._font_size = [6.0, 4.5]
- self._left = 0
- self._top = 0
- self._right = 0
- self._bottom = 0
if OLD_NAMES.has_key(self.name):
self.name = OLD_NAMES[self.name]
@@ -137,18 +133,14 @@ class Block:
# We may want to rescale blocks as well.
def rescale(self, scale):
- print "old font sizes:"
for i in range(len(self._font_size)):
- print self._font_size[i]
self._font_size[i] /= self.scale
self._dx /= self.scale
self._ex /= self.scale
self._ey /= self.scale
self.scale = scale
- print "new font sizes:"
for i in range(len(self._font_size)):
self._font_size[i] *= self.scale
- print self._font_size[i]
self._dx *= self.scale
self._ex *= self.scale
self._ey *= self.scale
@@ -159,7 +151,7 @@ class Block:
self.spr.set_shape(self.shapes[0])
self.spr.draw()
- # We may want to add "innies"
+ # We may want to add additional slots for arguments ("innies").
def add_arg(self):
h = self.svg.get_height()
self._ei += 1
@@ -289,6 +281,10 @@ class Block:
self.spr.set_label(label, i)
def _make_block(self, svg):
+ self._left = 0
+ self._top = 0
+ self._right = 0
+ self._bottom = 0
self._set_colors(svg)
self.svg.set_stroke_width(STANDARD_STROKE_WIDTH)
self.svg.clear_docks()
diff --git a/tasprite_factory.py b/tasprite_factory.py
index e3711d8..55c338f 100755
--- a/tasprite_factory.py
+++ b/tasprite_factory.py
@@ -118,6 +118,7 @@ class SVG:
svg += self._hide_dot(x,self._height-12-self._innie_y2-self._slot_y)
svg += self._footer()
+ print "margins: ", self.margins
return self._header() + svg
def basic_flow(self):
@@ -669,7 +670,10 @@ class SVG:
self.margins[1] = int(self._y*self._scale)
self.margins[2] = int((self._x-self._innie_x1-self._innie_x2-\
self._stroke_width*2)*self._scale)
+ print "resetting top and right to: %d, %d" % (self.margins[1],
+ self.margins[2])
self.margins[3] = int((self._y+self._innie_y2)*self._scale)
+ print "setting bottom to %d" % int((self._y+self._innie_y2)*self._scale)
# print "x: %d (%d, %d)" % (self._x, self._innie_x1, self._innie_x2)
return "%s%s%s%s%s%s%s" % (
self._rline_to(-self._innie_x1, 0),