v250109.1

Author: graham-trott

dist/easycoder-250108.1-py2.py3-none-any.whl renamed to dist/easycoder-250109.1-py2.py3-none-any.whl

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

dist/easycoder-250108.1.tar.gz renamed to dist/easycoder-250109.1.tar.gz

@@ -1,13 +1,15 @@
 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
 
@@ -114,10 +116,19 @@ def createElement(self, spec):
                     Color(c[0], c[1], c[2])
                 else:
                     Color(c[0]/255, c[1]/255, c[2]/255)
-            pos = (getActual(spec.pos[0], spec), getActual(spec.pos[1], spec))
-            spec.realpos = pos
             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':
@@ -134,10 +145,12 @@ def createElement(self, spec):
                         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

easycoder/__init__.py

@@ -58,6 +58,8 @@ def createWidget(self, widget, parent):
 
     # 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):

easycoder/ec_renderer.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 @@ def getItem(self):
 			return None
 
 		value = {}
-			
+
 		if token == 'true':
 			value['type'] = 'boolean'
 			value['content'] = True
@@ -80,7 +87,7 @@ def compileValue(self):
 			value = domain.modifyValue(value)
 
 		return value
-	
+
 	def compileConstant(self, token):
 		value = {}
 		if type(token) == 'str':

easycoder/ec_screenspec.py

@@ -1,5 +1,6 @@
 from easycoder import Object, FatalError, RuntimeError
 from easycoder import Handler
+from easycoder import getConstant
 from easycoder.ec_screenspec import ScreenSpec
 from easycoder.ec_renderer import getActual, getUI
 import json
@@ -21,16 +22,74 @@ def getName(self):
     # Create a keyboard
     def k_create(self, command):
         if self.nextIs('keyboard'):
-            command['style'] = self.nextValue()
+            command['template'] = self.nextValue()
+            buttonStyle = 'ellipse'
+            buttonTemplate = None
+            buttonTextWidth = getConstant('50w')
+            buttonTextHeight = getConstant('50h')
+            buttonTextColor = getConstant('black')
+            buttonTextX = getConstant('center')
+            buttonTextY = getConstant('center')
+            buttonColor = getConstant('white')
+            buttonFont = None
+            while True:
+                token = self.peek()
+                if token == 'button':
+                    self.nextToken()
+                    token = self.nextToken()
+                    if token == 'style':
+                        token = self.nextToken()
+                        if token in ['ellipse', 'rectangle', 'image']:
+                            buttonStyle = token
+                        else: RuntimeError(self.program, f'Unknown style \'token\'')
+                    elif token == 'color':
+                        buttonColor = self.nextValue()
+                    elif token == 'font':
+                        buttonFont = self.nextValue()
+                    elif token == 'template':
+                        buttonTemplate = self.nextValue()
+                    elif token == 'text':
+                        token = self.nextToken()
+                        if token =='width':
+                            buttonTextWidth = self.nextValue()
+                        elif token == 'height':
+                            buttonTextHeight = self.nextValue()
+                        elif token == 'color':
+                            buttonTextColor = self.nextValue()
+                        elif token == 'x':
+                            buttonTextX = self.nextValue()
+                        elif token == 'y':
+                            buttonTextY = self.nextValue()
+                        else: RuntimeError(self.program, f'Unknown property \'token\'')
+                else:
+                    break
+            command['button-style'] = buttonStyle
+            command['button-template'] = buttonTemplate
+            command['button-text-width'] = buttonTextWidth
+            command['button-text-height'] = buttonTextHeight
+            command['button-text-color'] = buttonTextColor
+            command['button-text-x'] = buttonTextX
+            command['button-text-y'] = buttonTextY
+            command['button-color'] = buttonColor
+            command['button-font'] = buttonFont
             self.add(command)
             return True
         return False
 
     def r_create(self, command):
         self.keyboard = Object()
-        style = self.getRuntimeValue(command['style'])
-        with open(f'plugins/keyboards/{style}.json') as f: s = f.read()
+        template = self.getRuntimeValue(command['template'])
+        with open(f'{template}') as f: s = f.read()
         self.keyboard.layout = json.loads(s)
+        self.keyboard.buttonStyle = command['button-style']
+        self.keyboard.buttonTemplate = self.getRuntimeValue(command['button-template'])
+        self.keyboard.buttonTextWidth =  self.getRuntimeValue(command['button-text-width'])
+        self.keyboard.buttonTextHeight =  self.getRuntimeValue(command['button-text-height'])
+        self.keyboard.buttonTextColor =  self.getRuntimeValue(command['button-text-color'])
+        self.keyboard.buttonTextX =  self.getRuntimeValue(command['button-text-x'])
+        self.keyboard.buttonTextY =  self.getRuntimeValue(command['button-text-y'])
+        self.keyboard.buttonColor =  self.getRuntimeValue(command['button-color'])
+        self.keyboard.buttonFont =  self.getRuntimeValue(command['button-font'])
         return self.nextPC()
 
     # on click/tap keyboard
@@ -60,26 +119,24 @@ def k_on(self, command):
                 self.getCommandAt(pcNext)['goto'] = self.getPC()
                 return True
         return False
-    
+
      # Set a handler
     def r_on(self, command):
         self.onTap = command['goto']
         return self.nextPC()
 
     # Render a keyboard
-    # render keyboard at {left} {bottom} width {width} using {button image}
+    # render keyboard at {left} {bottom} width {width}
     def k_render(self, command):
         if self.nextIs('keyboard'):
             token = self.peek()
-            while token in ['at', 'width', 'using']:
+            while token in ['at', 'width']:
                     self.nextToken()
                     if token == 'at':
                         command['x'] = self.nextValue()
                         command['y'] = self.nextValue()
                     elif token == 'width':
                         command['w'] = self.nextValue()
-                    elif token == 'using':
-                        command['u'] = self.nextValue()
                     token = self.peek()
             self.add(command)
             return True
@@ -89,7 +146,6 @@ def r_render(self, command):
         x = getActual(self.getRuntimeValue(command['x']))
         y = getActual(self.getRuntimeValue(command['y']))
         w = getActual(self.getRuntimeValue(command['w']))
-        u = self.getRuntimeValue(command['u'])
         # Scan the keyboard layout to find the longest row
         max = 0
         nrows = len(self.keyboard.layout)
@@ -111,19 +167,21 @@ def r_render(self, command):
             for b in range(0, len(row)):
                 button = row[b]
                 id = button['id']
-                button['type'] = 'ellipse'
+                button['type'] = self.keyboard.buttonStyle
+                button['source'] = self.keyboard.buttonTemplate
                 button['left'] = bx
                 button['bottom'] = by
                 button['width'] = bs
                 button['height'] = bs
-                button['fill'] = 'magenta'
+                button['fill'] = self.keyboard.buttonColor
                 label = {}
                 label['type'] = 'text'
-                label['left'] = '25w'
-                label['bottom'] = '25h'
-                label['width'] = '50w'
-                label['height'] = '50h'
+                label['left'] = self.keyboard.buttonTextX
+                label['bottom'] = self.keyboard.buttonTextY
+                label['width'] = self.keyboard.buttonTextWidth
+                label['height'] = self.keyboard.buttonTextHeight
                 label['text'] = id
+                label['color'] = self.keyboard.buttonTextColor
                 button['#'] = 'Label'
                 button['Label'] = label
                 buttons.append(button)
@@ -135,6 +193,7 @@ def r_render(self, command):
         for n in range(0, len(list)):
             spec[list[n]] = buttons[n]
 
+        spec['font'] = self.keyboard.buttonFont
         try:
             ScreenSpec().render(spec, None)
         except Exception as e:

easycoder/ec_value.py

@@ -43,16 +43,16 @@
     ],
     [
         {
-            "id": "C"
+            "id": "0"
         },
         {
             "id": "="
         },
         {
-            "id": "0"
+            "id": "C"
         },
         {
             "id": "/"
         }
     ]
-]
+]

plugins/ec_keyboard.py

@@ -1,16 +1,22 @@
-!   Keyboard tester
+!   Keyboard demo
 
     script Keyboard
 
     import plugin Keyboard from plugins/ec_keyboard.py
 
 !    debug step
 
-    create window title `Keyboard` at 300 300 size 640 480 fill color 255 255 200
+    create window title `Number Pad` at 300 300 size 640 480 fill color 255 255 200
     run graphics
 
-    create keyboard `4-function`
-    render keyboard at `25w` `10h` width `40w` using `keyboards/round-button.png`
+    create keyboard `plugins/keyboards/4-function.json`
+        button style image
+        button template `plugins/keyboards/round-button.png`
+        button text color `black`
+        button text width `30w`
+        button text height `30h`
+        button font `/usr/share/fonts/truetype/msttcorefonts/arial.ttf`
+    render keyboard at `25w` `10h` width `40w`
     on click keyboard print the key
 
     stop