easycoder 250106.14__tar.gz → 250107.2__tar.gz

{easycoder-250106.14 → easycoder-250107.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: easycoder
-Version: 250106.14
+Version: 250107.2
 Summary: Rapid scripting in English
 Keywords: compiler,scripting,prototyping,programming,coding,python,low code,hypertalk,computer language,learn to code
 Author-email: Graham Trott <gtanyware@gmail.com>

{easycoder-250106.14 → easycoder-250107.2}/easycoder/__init__.py

@@ -10,4 +10,4 @@ from .ec_program import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250106.14"
+__version__ = "250107.2"

{easycoder-250106.14 → easycoder-250107.2}/easycoder/ec_graphics.py

@@ -32,12 +32,12 @@ class Graphics(Handler):
         targetRecord = self.getVariable(command['name'])
         keyword = targetRecord['keyword']
         id = self.getRuntimeValue(command['id'])
-        element = self.ui.getElement(id)
-        if element == None:
+        uiElement = self.ui.getElement(id)
+        if uiElement == None:
             FatalError(self.program.compiler, f'There is no screen element with id \'{id}\'')
             return -1
-        if element.getType() != keyword:
-            etype = element['type']
+        if uiElement.getType() != keyword:
+            etype = uiElement['type']
             FatalError(self.program.compiler, f'Mismatched element type: "{etype}" and "{keyword}"')
         self.putSymbolValue(targetRecord, {'type': 'text', 'content': id})
         return self.nextPC()
@@ -265,6 +265,7 @@ class Graphics(Handler):
         self.ui.moveElementBy(self.getRuntimeValue(command['target']), dist)
         return self.nextPC()
 
+    # on click/tap {element} {action}
     def k_on(self, command):
         token = self.nextToken()
         if token in ['click', 'tap']:
@@ -298,14 +299,22 @@ class Graphics(Handler):
             return True
         return False
 
+     # Set a handler on every element
     def r_on(self, command):
         pc = command['goto']
         if command['type'] == 'tap':
             record = self.getVariable(command['target'])
+            def oncb(data):
+                record['index'] = data.index
+                self.run(data.pc)
             keyword = record['keyword']
             if self.isGraphicType(keyword):
-                id = record['value'][record['index']]['content']
-                self.ui.setOnClick(id, lambda: self.run(pc))
+                for index in range(0, record['elements']):
+                    id = record['value'][index]['content']
+                    data = Object()
+                    data.pc = pc
+                    data.index = index
+                    self.ui.setOnClick(id, data, oncb)
             else:
                 name = record['name']
                 RuntimeError(self.program, f'{name} is not a clickable object')

{easycoder-250106.14 → easycoder-250107.2}/easycoder/ec_renderer.py

@@ -9,14 +9,39 @@ from kivy.clock import Clock
 from kivy.vector import Vector
 import math
 
-class Object():
-    pass
+# Get a real position or size value
+# These are {n}w/h, where w/h are percentages
+# e.g. 25w or 50h
+def getReal(spec, val):
+    if isinstance(val, str):
+        c = val[-1]
+        if c in ['w', 'h']:
+            val = int(val[0:len(val)-1])
+            if spec.parent == None:
+                if c == 'w':
+                    n = Window.width
+                else:
+                    n = Window.height
+            else:
+                if c == 'w':
+                    n = spec.parent.realsize[0]
+                else:
+                    n = spec.parent.realsize[1]
+            return val * n / 100
+    return val
 
 class Element():
 
     def __init__(self, type, spec):
         self.type = type
         self.spec = spec
+        self.actionCB = None
+
+    def getRelativePosition(self):
+        spec = self.spec
+        x = getReal(spec, spec.pos[0])
+        y = getReal(spec, spec.pos[1])
+        return Vector(x, y)
 
     def getType(self):
         return self.spec.type
@@ -24,37 +49,25 @@ class Element():
     def getID(self):
         return self.spec.id
 
-    def getRealPos(self):
-        spec = self.spec
-        pos = spec.realpos
-        if spec.parent != None:
-            pos = Vector(pos) + spec.parent.realpos
-        return pos
-
     def getPos(self):
         spec = self.spec
-        pos = spec.pos
+        pos = spec.realpos
         if spec.parent != None:
-            pos = Vector(pos) + spec.parent.pos
+            pos = self.getRelativePosition() + spec.parent.realpos
         return pos
 
     def setPos(self, pos):
+        # Update the spec
         self.spec.realpos = pos
+        # Update the displayed item
         self.spec.item.pos = pos
 
-    # Called when the parent moves
-    def repos(self):
-        spec = self.spec
-        spec.item.pos = Vector(spec.realpos) + spec.parent.realpos
-
-    def getRealSize(self):
-        return self.spec.realsize
-
     def getSize(self):
-        return self.spec.size
+        return self.spec.realsize
 
     def setSize(self, size):
-        self.spec.size = size
+        self.spec.realsize = size
+        self.spec.item.size = size
 
     def getChildren(self):
         return self.spec.children
@@ -78,25 +91,6 @@ class UI(Widget):
         self.zlist.append(element)
 
     def createElement(self, spec):
-        # Get a real position or size value
-        def getReal(val):
-            if isinstance(val, str):
-                c = val[-1]
-                if c in ['w', 'h']:
-                    val = int(val[0:len(val)-1])
-                    if spec.parent == None:
-                        if c == 'w':
-                            n = Window.width
-                        else:
-                            n = Window.height
-                    else:
-                        if c == 'w':
-                            n = spec.parent.realsize[0]
-                        else:
-                            n = spec.parent.realsize[1]
-                    return val * n / 100
-            return val
-
         with self.canvas:
             if hasattr(spec, 'fill'):
                 c = spec.fill
@@ -105,9 +99,9 @@ class UI(Widget):
                     Color(c[0], c[1], c[2])
                 else:
                     Color(c[0]/255, c[1]/255, c[2]/255)
-            pos = (getReal(spec.pos[0]), getReal(spec.pos[1]))
+            pos = (getReal(spec, spec.pos[0]), getReal(spec, spec.pos[1]))
             spec.realpos = pos
-            size = (getReal(spec.size[0]), getReal(spec.size[1]))
+            size = (getReal(spec, spec.size[0]), getReal(spec, spec.size[1]))
             spec.realsize = size
             if spec.parent != None:
                 pos = Vector(pos) + spec.parent.realpos
@@ -137,15 +131,15 @@ class UI(Widget):
     def moveElementBy(self, id, dist):
         element = self.getElement(id)
         if element != None:
-            element.setPos(Vector(element.getRealPos()) + dist)
+            element.setPos(Vector(element.getPos()) + dist)
             for id in element.getChildren():
-                self.getElement(id).repos()
+                self.moveElementBy(id, dist)
         return
 
     def moveElementTo(self, id, pos):
         element = self.getElement(id)
         if element != None:
-            self.moveElementBy(id, Vector(pos) - element.getRealPos())
+            self.moveElementBy(id, Vector(pos) - element.getPos())
         return
 
     def on_touch_down(self, touch):
@@ -153,12 +147,10 @@ class UI(Widget):
         x = tp[0]
         y = tp[1]
         for element in reversed(self.zlist):
-            if element.cb != None:
+            if element.actionCB != None:
                 spec = element.spec
                 pos = spec.realpos
-                if spec.parent != None:
-                    pos = Vector(pos) + spec.parent.realpos
-                size = spec.size
+                size = element.getSize()
                 if spec.type == 'ellipse':
                     a = int(size[0])/2
                     b = int(size[1])/2
@@ -166,15 +158,17 @@ class UI(Widget):
                     h = ctr[0]
                     k = ctr[1]
                     if (math.pow((x - h), 2) / math.pow(a, 2)) + (math.pow((y - k), 2) / math.pow(b, 2)) <= 1:
-                        element.cb()
+                        element.actionCB(element.data)
                         break
                 elif spec.type in ['rectangle', 'text', 'image']:
                     if tp[0] >= pos[0] and tp[0] < pos[0] + size[0] and tp[1] >= pos[1] and tp[1] < pos[1] + size[1]:
-                        element.cb()
+                        element.actionCB(element.data)
                         break
 
-    def setOnClick(self, id, callback):
-        self.getElement(id).cb = callback
+    def setOnClick(self, id, data, callback):
+        element = self.getElement(id)
+        element.data = data
+        element.actionCB = callback
 
     def getWindowAttribute(self, attribute):
         if attribute == 'left':
@@ -250,3 +244,6 @@ class Renderer(App):
             Window.size = spec.size
             Window.left = spec.pos[0]
             Window.top = spec.pos[1]
+
+class Object():
+    pass

{easycoder-250106.14 → easycoder-250107.2}/scripts/wave.ecg

@@ -97,6 +97,8 @@
         increment N
     end
 
+    on click Bar print `Click ` cat the index of Bar
+
     wait 1
     ! Run the main animation
     while true