easycoder 250107.1__tar.gz → 250107.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: easycoder
-Version: 250107.1
+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-250107.1 → easycoder-250107.2}/easycoder/__init__.py

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

{easycoder-250107.1 → 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-250107.1 → easycoder-250107.2}/easycoder/ec_renderer.py

@@ -35,6 +35,7 @@ class Element():
     def __init__(self, type, spec):
         self.type = type
         self.spec = spec
+        self.actionCB = None
 
     def getRelativePosition(self):
         spec = self.spec
@@ -146,11 +147,9 @@ 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.spec.getPos()
                 size = element.getSize()
                 if spec.type == 'ellipse':
                     a = int(size[0])/2
@@ -159,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':

{easycoder-250107.1 → 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