easycoder 250107.2__tar.gz → 250109.1__tar.gz

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

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

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

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

@@ -1,8 +1,7 @@
-import sys, threading, json
 from .ec_classes import FatalError, RuntimeError, Object
 from .ec_handler import Handler
 from .ec_screenspec import ScreenSpec
-from .ec_renderer import Renderer
+from .ec_renderer import Renderer, getUI
 from .ec_program import flush
 
 class Graphics(Handler):
@@ -32,7 +31,7 @@ class Graphics(Handler):
         targetRecord = self.getVariable(command['name'])
         keyword = targetRecord['keyword']
         id = self.getRuntimeValue(command['id'])
-        uiElement = self.ui.getElement(id)
+        uiElement = getUI().getElement(id)
         if uiElement == None:
             FatalError(self.program.compiler, f'There is no screen element with id \'{id}\'')
             return -1
@@ -122,6 +121,7 @@ class Graphics(Handler):
                 for item in ['width', 'height', 'left', 'bottom', 'r', 'g', 'b', 'text']:
                     if command[item] == None:
                         FatalError(self.program.compiler, f'Missing property \'{item}\'')
+            else: return False
             self.add(command)
             record['elementID'] = command['id']
         return False
@@ -199,7 +199,7 @@ class Graphics(Handler):
                 self.windowSpec.fill = (self.getRuntimeValue(command['fill'][0])/255, self.getRuntimeValue(command['fill'][1])/255, self.getRuntimeValue(command['fill'][2])/255)
                 self.windowCreated = True
             else:
-                element = self.ui.createWidget(self.getWidgetSpec(command))
+                element = getUI().createWidget(self.getWidgetSpec(command))
                 print(element)
         except Exception as e:
             RuntimeError(self.program, e)
@@ -224,8 +224,19 @@ class Graphics(Handler):
     def r_ellipse(self, command):
         return self.nextPC()
 
-    def r_getui(self, command):
-        self.ui = self.renderer.getUI()
+    # Hide an element
+    def k_hide(self, command):
+        if self.nextIsSymbol():
+            record = self.getSymbolRecord()
+            type = record['keyword']
+            if self.isGraphicType(type):
+                command['target'] = record['id']
+                self.add(command)
+                return True
+        return False
+
+    def r_hide(self, command):
+        getUI().setVisible(self.getRuntimeValue(command['target']), False)
         return self.nextPC()
 
     def k_image(self, command):
@@ -257,12 +268,12 @@ class Graphics(Handler):
 
     def r_move(self, command):
         pos = (self.getRuntimeValue(command['x']), self.getRuntimeValue(command['y']))
-        self.ui.moveElementTo(self.getRuntimeValue(command['target']), pos)
+        getUI().moveElementTo(self.getRuntimeValue(command['target']), pos)
         return self.nextPC()
 
     def r_moveBy(self, command):
         dist = (self.getRuntimeValue(command['dx']), self.getRuntimeValue(command['dy']))
-        self.ui.moveElementBy(self.getRuntimeValue(command['target']), dist)
+        getUI().moveElementBy(self.getRuntimeValue(command['target']), dist)
         return self.nextPC()
 
     # on click/tap {element} {action}
@@ -273,7 +284,7 @@ class Graphics(Handler):
             if self.nextIsSymbol():
                 target = self.getSymbolRecord()
             else:
-                FatalError(self.program.compiler, f'{self.getToken()} is not a screen element')
+                Warning(f'{self.getToken()} is not a screen element')
                 return False
             command['target'] = target['name']
             command['goto'] = self.getPC() + 2
@@ -314,7 +325,7 @@ class Graphics(Handler):
                     data = Object()
                     data.pc = pc
                     data.index = index
-                    self.ui.setOnClick(id, data, oncb)
+                    getUI().setOnClick(id, data, oncb)
             else:
                 name = record['name']
                 RuntimeError(self.program, f'{name} is not a clickable object')
@@ -326,25 +337,26 @@ class Graphics(Handler):
     def r_rectangle(self, command):
         return self.nextPC()
 
-    # render {spec}
+    # render spec {spec}
     def k_render(self, command):
-        command['spec'] = self.nextValue()
-        command['parent'] = None
-        if self.peek() == 'in':
-            self.nextToken()
-            if self.nextIsSymbol():
-                command['parent'] = self.getSymbolRecord()['name']
-        self.add(command)
-        return True
+        if self.nextToken() in ['specification', 'spec']:
+            command['spec'] = self.nextValue()
+            command['parent'] = None
+            if self.peek() == 'in':
+                self.nextToken()
+                if self.nextIsSymbol():
+                    command['parent'] = self.getSymbolRecord()['name']
+            self.add(command)
+            return True
+        return False
 
     def r_render(self, command):
         spec = self.getRuntimeValue(command['spec'])
         parent = command['parent']
         if parent !=None:
             parent = self.getVariable(command['parent'])
-        self.ui = self.renderer.getUI()
         try:
-            ScreenSpec().render(spec, parent, self.ui)
+            ScreenSpec().render(spec, parent)
         except Exception as e:
             RuntimeError(self.program, e)
         return self.nextPC()
@@ -359,7 +371,6 @@ class Graphics(Handler):
     def r_run(self, command):
         self.renderer = Renderer()
         self.renderer.init(self.windowSpec)
-        self.ui = self.renderer.getUI()
         self.program.setExternalControl()
         self.program.run(self.nextPC())
         self.renderer.run()
@@ -390,7 +401,22 @@ class Graphics(Handler):
         target = self.getVariable(command['target'])
         id = target['value'][target['index']]['content']
         value = self.getRuntimeValue(command['value'])
-        self.ui.setAttribute(id, attribute, value)
+        getUI().setAttribute(id, attribute, value)
+        return self.nextPC()
+
+    # Show an element (restore it to its current position)
+    def k_show(self, command):
+        if self.nextIsSymbol():
+            record = self.getSymbolRecord()
+            type = record['keyword']
+            if self.isGraphicType(type):
+                command['target'] = record['id']
+                self.add(command)
+                return True
+        return False
+
+    def r_show(self, command):
+        getUI().setVisible(self.getRuntimeValue(command['target']), True)
         return self.nextPC()
 
     def k_text(self, command):
@@ -453,7 +479,7 @@ class Graphics(Handler):
             attribute = self.getRuntimeValue(v['attribute'])
             target = self.getVariable(v['target'])
             val = self.getSymbolValue(target)
-            v = self.ui.getAttribute(val['content'], attribute)
+            v = getUI().getAttribute(val['content'], attribute)
             value = {}
             value['type'] = 'int'
             value['content'] = int(round(v))
@@ -475,7 +501,7 @@ class Graphics(Handler):
             attribute = v['attribute']
             value = {}
             value['type'] = 'int'
-            value['content'] = int(round(self.ui.getWindowAttribute(attribute)))
+            value['content'] = int(round(getUI().getWindowAttribute(attribute)))
             return value
         except Exception as e:
             RuntimeError(self.program, e)

{easycoder-250107.2 → easycoder-250109.1}/easycoder/ec_program.py

@@ -18,7 +18,6 @@ class Program:
 
 	def __init__(self, argv):
 		global queue
-		print(f'EasyCoder version {version("easycoder")}')
 		if len(argv) == 0:
 			print('No script supplied')
 			exit()
@@ -387,6 +386,7 @@ class Program:
 
 # This is the program launcher
 def Main():
+	print(f'EasyCoder version {version("easycoder")}')
 	if (len(sys.argv) > 1):
 		Program(sys.argv[1]).start()
 	else:

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

@@ -1,23 +1,31 @@
 from kivy.app import App
 from kivy.uix.widget import Widget
+from kivy.graphics import Color, Ellipse, Rectangle
 from kivy.uix.label import CoreLabel
 from kivy.uix.image import AsyncImage
 from kivy.core.window import Window
-from kivy.graphics import Color, Ellipse, Rectangle
 from kivy.utils import colormap
 from kivy.clock import Clock
 from kivy.vector import Vector
-import math
+import math, os
+
+os.environ['KIVY_TEXT'] = 'pango'
+
+ec_ui = None
+
+def getUI():
+    global ec_ui
+    return ec_ui
 
-# Get a real position or size value
-# These are {n}w/h, where w/h are percentages
+# Get an actual screeen position or size value from a specified value
+# such as {n}w/h, where w/h are percentages
 # e.g. 25w or 50h
-def getReal(spec, val):
+def getActual(val, spec=None):
     if isinstance(val, str):
         c = val[-1]
         if c in ['w', 'h']:
             val = int(val[0:len(val)-1])
-            if spec.parent == None:
+            if spec == None or spec.parent == None:
                 if c == 'w':
                     n = Window.width
                 else:
@@ -35,12 +43,13 @@ class Element():
     def __init__(self, type, spec):
         self.type = type
         self.spec = spec
+        self.visible= True
         self.actionCB = None
 
     def getRelativePosition(self):
         spec = self.spec
-        x = getReal(spec, spec.pos[0])
-        y = getReal(spec, spec.pos[1])
+        x = getActual(spec.pos[0], spec)
+        y = getActual(spec.pos[1], spec)
         return Vector(x, y)
 
     def getType(self):
@@ -57,10 +66,11 @@ class Element():
         return pos
 
     def setPos(self, pos):
-        # Update the spec
-        self.spec.realpos = pos
-        # Update the displayed item
-        self.spec.item.pos = pos
+        if self.visible:
+            # Update the spec
+            self.spec.realpos = pos
+            # Update the displayed item
+            self.spec.item.pos = pos
 
     def getSize(self):
         return self.spec.realsize
@@ -69,6 +79,13 @@ class Element():
         self.spec.realsize = size
         self.spec.item.size = size
 
+    def setVisible(self, vis):
+        self.visible = vis
+        if vis:
+            self.setPos(self.spec.realpos)
+        else:
+            self.spec.item.pos = (Window.width, self.getPos()[1])
+
     def getChildren(self):
         return self.spec.children
 
@@ -99,10 +116,19 @@ class UI(Widget):
                     Color(c[0], c[1], c[2])
                 else:
                     Color(c[0]/255, c[1]/255, c[2]/255)
-            pos = (getReal(spec, spec.pos[0]), getReal(spec, spec.pos[1]))
-            spec.realpos = pos
-            size = (getReal(spec, spec.size[0]), getReal(spec, spec.size[1]))
+            size = (getActual(spec.size[0], spec), getActual(spec.size[1], spec))
             spec.realsize = size
+            # Deal with special case of 'center'
+            if spec.pos[0] == 'center':
+                left = getActual('50w', spec) - spec.realsize[0]/2
+            else:
+                left = getActual(spec.pos[0], spec)
+            if spec.pos[1] == 'center':
+                bottom = getActual('50h', spec) - spec.realsize[1]/2
+            else:
+                bottom = getActual(spec.pos[1], spec)
+            pos = (left, bottom)
+            spec.realpos = pos
             if spec.parent != None:
                 pos = Vector(pos) + spec.parent.realpos
             if spec.type == 'ellipse':
@@ -119,10 +145,12 @@ class UI(Widget):
                         Color(c[0]/255, c[1]/255, c[2]/255)
                 else:
                     Color(1, 1, 1, 1)
-                label = CoreLabel(text=spec.text, font_size=1000, halign='center', valign='center')
+                if self.font == None:
+                    label = CoreLabel(text=spec.text, font_size=1000, halign='center', valign='center')
+                else:
+                    label = CoreLabel(text=spec.text, font_context = None, font_name=self.font, font_size=1000, halign='center', valign='center')
                 label.refresh()
-                text = label.texture
-                item = Rectangle(pos=pos, size=size, texture=text)
+                item = Rectangle(pos=pos, size=size, texture=label.texture)
             elif spec.type == 'image':
                 item = AsyncImage(pos=pos, size=size, source=spec.source)
             spec.item = item
@@ -142,6 +170,14 @@ class UI(Widget):
             self.moveElementBy(id, Vector(pos) - element.getPos())
         return
 
+    def setVisible(self, id, vis):
+        element = self.getElement(id)
+        if element != None:
+            element.setVisible(vis)
+            for id in element.getChildren():
+                self.setVisible(id, vis)
+        return
+
     def on_touch_down(self, touch):
         tp = touch.pos
         x = tp[0]
@@ -214,9 +250,6 @@ class UI(Widget):
 
 class Renderer(App):
 
-    def getUI(self):
-        return self.ui
-
     def request_close(self):
         print('close window')
         self.kill()
@@ -230,7 +263,9 @@ class Renderer(App):
         return self.ui
 
     def init(self, spec):
-        self.ui = UI()
+        global ec_ui
+        ec_ui = UI()
+        self.ui = ec_ui
         self.title = spec.title
         self.flush = spec.flush
         self.kill = spec.kill

{easycoder-250107.2 → easycoder-250109.1}/easycoder/ec_screenspec.py

@@ -1,21 +1,28 @@
 # screenspec.py
 
 from json import loads
-from .ec_renderer import Object
+from .ec_renderer import Object, getUI
+
+global_id = 0
 
 class ScreenSpec():
 
+    id = 0
+
     # Get an attribute of an element
     def getAttribute(self, id, attribute):
-        element = self.ui.getElement(id)
+        element = getUI().getElement(id)
         return element[attribute]
 
     # Render a single widget
     def createWidget(self, widget, parent):
+        global global_id
         spec = Object()
         type = widget['type']
         spec.type = type
-        spec.id = widget['id']
+        global_id += 1
+        if 'id' in widget: spec.id = widget['id']
+        else: spec.id = f'_{global_id}'
         spec.pos = (widget['left'], widget['bottom'])
         spec.size = (widget['width'], widget['height'])
         if widget.get('fill') != None:
@@ -30,7 +37,7 @@ class ScreenSpec():
             spec.color = widget['color']
         spec.parent = parent
         spec.children = []
-        self.ui.createElement(spec)
+        getUI().createElement(spec)
 
         if '#' in widget:
             children = widget['#']
@@ -51,6 +58,8 @@ class ScreenSpec():
 
     # Render a complete specification
     def renderSpec(self, spec, parent):
+        if 'font' in spec: getUI().font = spec['font']
+        else: getUI().font = None
         widgets = spec['#']
         # If a list, iterate it
         if isinstance(widgets, list):
@@ -61,8 +70,7 @@ class ScreenSpec():
             self.createWidget(spec[widgets], parent)
 
     # Render a graphic specification
-    def render(self, spec, parent, ui):
-        self.ui = ui
+    def render(self, spec, parent):
 
         # If it'a string, process it
         if isinstance(spec, str):
@@ -71,4 +79,3 @@ class ScreenSpec():
         # If it's a 'dict', extract the spec and the args
         else:
             self.renderSpec(spec, parent)
-

{easycoder-250107.2 → easycoder-250109.1}/easycoder/ec_value.py

@@ -1,5 +1,12 @@
 from .ec_classes import FatalError
 
+# Create a constant
+def getConstant(str):
+	value = {}
+	value['type'] = 'text'
+	value['content'] = str
+	return value
+
 class Value:
 
 	def __init__(self, compiler):
@@ -15,7 +22,7 @@ class Value:
 			return None
 
 		value = {}
-			
+
 		if token == 'true':
 			value['type'] = 'boolean'
 			value['content'] = True
@@ -80,7 +87,7 @@ class Value:
 			value = domain.modifyValue(value)
 
 		return value
-	
+
 	def compileConstant(self, token):
 		value = {}
 		if type(token) == 'str':