diff options
| -rw-r--r-- | MANIFEST | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | NEWS | 4 | ||||
| -rwxr-xr-x | activity/activity.info | 2 | ||||
| -rwxr-xr-x | images/en/numbers/numbersgroup.gif | bin | 24445 -> 24880 bytes | |||
| -rwxr-xr-x | images/en/numbers/numbersmask.gif | bin | 2821 -> 2913 bytes | |||
| -rwxr-xr-x | images/es/numbers/numbersgroup.gif | bin | 24499 -> 24973 bytes | |||
| -rwxr-xr-x | images/es/numbers/numbersmask.gif | bin | 2821 -> 2913 bytes | |||
| -rwxr-xr-x | images/fr/numbers/numbersgroup.gif | bin | 22994 -> 23568 bytes | |||
| -rwxr-xr-x | images/fr/numbers/numbersmask.gif | bin | 2821 -> 2913 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | talogo.py | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | taproject.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | tasetup.py | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | tasprites.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | taturtle.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | tawindow.py | 0 |
15 files changed, 14 insertions, 2 deletions
@@ -43,6 +43,7 @@ images/en/numbers/print.gif images/en/numbers/product.gif images/en/numbers/random.gif images/en/numbers/remainder.gif +images/en/numbers/sqrt.gif images/en/palette/flowoff.gif images/en/palette/flowon.gif images/en/palette/myblocksoff.gif @@ -163,6 +164,7 @@ images/es/numbers/print.gif images/es/numbers/product.gif images/es/numbers/random.gif images/es/numbers/remainder.gif +images/es/numbers/sqrt.gif images/es/palette/flowoff.gif images/es/palette/flowon.gif images/es/palette/myblocksoff.gif @@ -276,6 +278,7 @@ images/fr/numbers/not.gif images/fr/numbers/number.gif images/fr/numbers/numbersgroup.gif images/fr/numbers/numbersmask.gif +images/fr/numbers/sqrt.gif images/fr/numbers/or.gif images/fr/numbers/plus.gif images/fr/numbers/print.gif @@ -1,3 +1,7 @@ +12 + +* Added sqrt function + 11 * Rename activity from TurtleArt to Turtle Art (dlo trac #2663) diff --git a/activity/activity.info b/activity/activity.info index 96e0e50..e23229c 100755 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = Turtle Art -activity_version = 11 +activity_version = 12 license = MIT service_name = org.laptop.TurtleArtActivity class = TurtleArtActivity.TurtleArtActivity diff --git a/images/en/numbers/numbersgroup.gif b/images/en/numbers/numbersgroup.gif Binary files differindex 3108073..7fe9848 100755 --- a/images/en/numbers/numbersgroup.gif +++ b/images/en/numbers/numbersgroup.gif diff --git a/images/en/numbers/numbersmask.gif b/images/en/numbers/numbersmask.gif Binary files differindex 9509618..ab61c28 100755 --- a/images/en/numbers/numbersmask.gif +++ b/images/en/numbers/numbersmask.gif diff --git a/images/es/numbers/numbersgroup.gif b/images/es/numbers/numbersgroup.gif Binary files differindex 2cc5f42..f67fc50 100755 --- a/images/es/numbers/numbersgroup.gif +++ b/images/es/numbers/numbersgroup.gif diff --git a/images/es/numbers/numbersmask.gif b/images/es/numbers/numbersmask.gif Binary files differindex 9509618..ab61c28 100755 --- a/images/es/numbers/numbersmask.gif +++ b/images/es/numbers/numbersmask.gif diff --git a/images/fr/numbers/numbersgroup.gif b/images/fr/numbers/numbersgroup.gif Binary files differindex 3143887..a3d2786 100755 --- a/images/fr/numbers/numbersgroup.gif +++ b/images/fr/numbers/numbersgroup.gif diff --git a/images/fr/numbers/numbersmask.gif b/images/fr/numbers/numbersmask.gif Binary files differindex 9509618..ab61c28 100755 --- a/images/fr/numbers/numbersmask.gif +++ b/images/fr/numbers/numbersmask.gif diff --git a/talogo.py b/talogo.py index 0e441bd..c3e6c14 100755..100644 --- a/talogo.py +++ b/talogo.py @@ -22,6 +22,7 @@ import re from time import clock from operator import isNumberType import random +from math import sqrt class taLogo: pass from taturtle import * @@ -269,6 +270,7 @@ def lcNew(tw): defprim(lc,'or', None, lambda lc,x,y:x|y) defprim(lc,'not', 1, lambda lc,x:not x) defprim(lc,'%', None, lambda lc,x,y:x%y) + defprim(lc,'sqrt', 1, lambda lc,x: sqrt(x)) defprim(lc,'clean', 0, lambda lc: clearscreen(lc.tw.turtle)) defprim(lc,'forward', 1, lambda lc, x: forward(lc.tw.turtle, x)) diff --git a/taproject.py b/taproject.py index 2078e6b..2078e6b 100755..100644 --- a/taproject.py +++ b/taproject.py diff --git a/tasetup.py b/tasetup.py index 73aa451..19c3c3e 100755..100644 --- a/tasetup.py +++ b/tasetup.py @@ -57,13 +57,15 @@ selectors = ( ('product','*','ari'), ('division','/','ari'), ('remainder','%','ari2'), + ('sqrt','sqrt','sqrt',100), ('random','random','random',0,100), ('greater','greater?','comp'), ('less','less?','comp'), ('equal','equal?','comp'), ('and','and','and'), ('or','or','and'), - ('not','not','not'), ('print','print','onearg'))), + ('not','not','not'), + ('print','print','onearg'))), ('flow', 55, (('wait','wait','onearg',10), ('forever','forever','forever'), @@ -98,6 +100,7 @@ dockdetails = { 'ifelse': (('flow',True,37,5),('logi+',False,80,31),('flow',False,132,79,'['),('flow',False,217,79,']['),('flow',False,37,120,']')), 'ari': (('numend',True,12,20),('num',False,39,20)), 'ari2': (('numend',True,12,20),('num',False,51,20)), + 'sqrt': (('num',True,0,20),('num',False,42,20)), 'stop': (('flow',True,37,5),('unavailable',False,0,0)), 'comp': (('logi+',True,0,21,'('),('num',False,32,21),('num',False,181,21),('logi-',False,320,21,')')), 'random': (('num',True,0,31,'('),('num',False,28,31),('num',False,150,31),('numend',False,279,31,')')), diff --git a/tasprites.py b/tasprites.py index 2d7376d..2d7376d 100755..100644 --- a/tasprites.py +++ b/tasprites.py diff --git a/taturtle.py b/taturtle.py index 8fbd1e1..8fbd1e1 100755..100644 --- a/taturtle.py +++ b/taturtle.py diff --git a/tawindow.py b/tawindow.py index d0ed046..d0ed046 100755..100644 --- a/tawindow.py +++ b/tawindow.py |
