easycoder 241215.1__tar.gz → 241218.1__tar.gz

{easycoder-241215.1 → easycoder-241218.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: easycoder
-Version: 241215.1
+Version: 241218.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>
@@ -62,7 +62,7 @@ Here in the repository is a folder called `scripts` containing some sample scrip
 ## Graphical programmming
 **_EasyCoder_** is currently being extended to include a graphical programming environment. A single demo script `graphics-demo.ecs` is included in the `scripts` directory. To run it, first install the Python graphics library if it's not already present on your system. On Linux this is done with `sudo apt install python3-tk`. On Windows it's `pip install tk`. Then give the command `easycoder -g scripts/graphics-demo.ecs`.
 
-As development progresses this demo script will be extended to include new features as they are added. **_EasyCoder_** graphics are handled by a library module, `ec_renderer` that can be used outside of the **EasyCoder_** environment, in other Python programs.
+As development progresses this demo script will be extended to include new features as they are added. **_EasyCoder_** graphics are handled by a library module, `ec_renderer` that can be used outside of the **_EasyCoder_** environment, in other Python programs.
 
 ## EasyCoder programming reference
 
@@ -74,5 +74,5 @@ The language comprises a general-purpose core package, which can be enhanced by
 
 **_EasyCoder_** can be extended to add new functionality with the use of 'plugins'. These contain compiler and runtime modules for the added language features. **_EasyCoder_** can use the added keywords, values and conditions freely; the effect is completely seamless. There is an outline example in the `plugins` directory called `example.py`, which comprises a module called `Points` with new language syntax to deal with two-valued items such as coordinates. In the `scripts` directory there is `points.ecs`, which exercises the new functionality.
 
-A plugin can act as a wrapper around any Python functionality that has a sensible API, thereby hiding its complexity. The only challenge is to devise an unambiguous syntax that doesn't clash with anything already existing in **_EasyCoder_**
+A plugin can act as a wrapper around any Python functionality that has a sensible API, thereby hiding its complexity. The only challenge is to devise an unambiguous syntax that doesn't clash with anything already existing in **_EasyCoder_**.
 

{easycoder-241215.1 → easycoder-241218.1}/README.md

@@ -51,7 +51,7 @@ Here in the repository is a folder called `scripts` containing some sample scrip
 ## Graphical programmming
 **_EasyCoder_** is currently being extended to include a graphical programming environment. A single demo script `graphics-demo.ecs` is included in the `scripts` directory. To run it, first install the Python graphics library if it's not already present on your system. On Linux this is done with `sudo apt install python3-tk`. On Windows it's `pip install tk`. Then give the command `easycoder -g scripts/graphics-demo.ecs`.
 
-As development progresses this demo script will be extended to include new features as they are added. **_EasyCoder_** graphics are handled by a library module, `ec_renderer` that can be used outside of the **EasyCoder_** environment, in other Python programs.
+As development progresses this demo script will be extended to include new features as they are added. **_EasyCoder_** graphics are handled by a library module, `ec_renderer` that can be used outside of the **_EasyCoder_** environment, in other Python programs.
 
 ## EasyCoder programming reference
 
@@ -63,4 +63,4 @@ The language comprises a general-purpose core package, which can be enhanced by
 
 **_EasyCoder_** can be extended to add new functionality with the use of 'plugins'. These contain compiler and runtime modules for the added language features. **_EasyCoder_** can use the added keywords, values and conditions freely; the effect is completely seamless. There is an outline example in the `plugins` directory called `example.py`, which comprises a module called `Points` with new language syntax to deal with two-valued items such as coordinates. In the `scripts` directory there is `points.ecs`, which exercises the new functionality.
 
-A plugin can act as a wrapper around any Python functionality that has a sensible API, thereby hiding its complexity. The only challenge is to devise an unambiguous syntax that doesn't clash with anything already existing in **_EasyCoder_**
+A plugin can act as a wrapper around any Python functionality that has a sensible API, thereby hiding its complexity. The only challenge is to devise an unambiguous syntax that doesn't clash with anything already existing in **_EasyCoder_**.

{easycoder-241215.1 → easycoder-241218.1}/easycoder/__init__.py

@@ -10,4 +10,4 @@ from .ec_timestamp import *
 from .ec_value import *
 from .ec_graphics import *
 
-__version__ = "241215.1"
+__version__ = "241218.1"

{easycoder-241215.1 → easycoder-241218.1}/easycoder/ec_renderer.py

@@ -2,7 +2,7 @@
 
 import sys, json
 import tkinter as tk
-from PIL import *
+from PIL import Image, ImageTk
 
 elements = {}
 zlist = []
@@ -50,8 +50,8 @@ def createScreen(values):
             id = list(element)[0]
             values = element[id]
             x1 = values['left']
-            x2 = x1 + values['width']
-            y1 = values['top']
+            x2 = x1 + values['width'] + getScreenLeft(values['parent'])
+            y1 = values['top'] + getScreenTop(values['parent'])
             y2 = y1 + values['height']
             if x >= x1 and x < x2 and y >= y1 and y < y2:
                 if id in elements:
@@ -110,16 +110,16 @@ def render(spec, parent):
             return args[item]
         return item
 
-    def renderIntoRectangle(widgetType, values, offset, args):
+    def renderIntoRectangle(widgetType, values, parent, args):
         global zlist
         left = getValue(args, values['left']) if 'left' in values else 10
+        screenLeft = left + getScreenLeft(parent)
         top = getValue(args, values['top']) if 'top' in values else 10
-        left = offset['dx'] + left
-        top = offset['dy'] + top
+        screenTop = top + getScreenTop(parent)
         width = getValue(args, values['width']) if 'width' in values else 100
         height = getValue(args, values['height']) if 'height' in values else 100
-        right = left + width
-        bottom = top + height
+        right = screenLeft + width
+        bottom = screenTop + height
         fill = values['fill'] if 'fill' in values else None
         outline = values['outline'] if 'outline' in values else None
         if outline != None:
@@ -127,9 +127,9 @@ def render(spec, parent):
         else:
             outlineWidth = 0
         if widgetType == 'rectangle':
-            widgetId = getCanvas().create_rectangle(left, top, right, bottom, fill=fill, outline=outline, width=outlineWidth)
+            widgetId = getCanvas().create_rectangle(screenLeft, screenTop, right, bottom, fill=fill, outline=outline, width=outlineWidth)
         elif widgetType == 'ellipse':
-            widgetId = getCanvas().create_oval(left, top, right, bottom, fill=fill, outline=outline, width=outlineWidth)
+            widgetId = getCanvas().create_oval(screenLeft, screenTop, right, bottom, fill=fill, outline=outline, width=outlineWidth)
         else:
             return f'Unknown widget type \'{widgetType}\''
         if 'name' in values:
@@ -144,6 +144,7 @@ def render(spec, parent):
             "top": top,
             "width": width,
             "height": height,
+            "parent": parent,
             "children": []
         }
         elements[widgetName] = widgetSpec
@@ -154,54 +155,49 @@ def render(spec, parent):
                 for item in children:
                     if item in values:
                         child = values[item]
-                        childSpec = renderWidget(child, {'dx': left, 'dy': top}, args)
+                        childSpec = renderWidget(child, widgetSpec, args)
                         widgetSpec['children'].append(childSpec['name'])
             else:
                 child = values[children]
-                childSpec = renderWidget(child, {'dx': left, 'dy': top}, args)
+                childSpec = renderWidget(child, widgetSpec, args)
                 widgetSpec['children'].append(childSpec['name'])
         return widgetSpec
    
-    def renderText(values, offset, args):
+    def renderText(values, parent, args):
         left = getValue(args, values['left']) if 'left' in values else 10
+        screenLeft = left + getScreenLeft(parent)
         top = getValue(args, values['top']) if 'top' in values else 10
-        left = offset['dx'] + left
-        top = offset['dy'] + top
+        screenTop = top + getScreenTop(parent)
         width = getValue(args, values['width']) if 'width' in values else 100
         height = getValue(args, values['height']) if 'height' in values else 100
-        right = left + width
-        bottom = top + height
         shape = getValue(args, values['shape']) if 'shape' in values else 'rectangle'
-        fill = getValue(args, values['fill']) if 'fill' in values else None
         outline = getValue(args, values['outline']) if 'outline' in values else None
-        outlineWidth = getValue(args, values['outlineWidth']) if 'outlineWidth' in values else 0 if outline == None else 1
         color = getValue(args, values['color']) if 'color' in values else None
         text = getValue(args, values['text']) if 'text' in values else ''
         fontFace = getValue(args, values['fontFace']) if 'fontFace' in values else 'Helvetica'
         fontWeight = getValue(args, values['fontWeight']) if 'fontWeight' in values else 'normal'
-        fontSize = round(height*2/5) if shape == 'ellipse' else round(height*3/5)
-        fontTop = top + height/2
+        fontTop = int(round(screenTop + height/2))
         if 'fontSize' in values:
             fontSize = getValue(args, values['fontSize'])
-            fontTop = top + round(fontSize * 5 / 4)
-        adjust = round(fontSize/5) if shape == 'ellipse' else 0
+            fontTop = int(round(screenTop + height/2 - fontSize/4))
+        else:
+            fontSize = int(round(height*2/5) if shape == 'ellipse' else round(height*3/5))
+            fontTop -= int(round(screenTop + height/2 - fontSize/5))
+        adjust = int(round(fontSize/5)) if shape == 'ellipse' else 0
         align = getValue(args, values['align']) if 'align' in values else 'center'
         if align == 'left':
-            xoff = round(fontSize/5)
+            xoff = int(round(fontSize/5))
             anchor = 'w'
         elif align == 'right':
-            xoff = width - round(fontSize/5)
+            xoff = width - int(round(fontSize/5))
             anchor = 'e'
         else:
-            xoff = width/2
+            xoff = int(round(width/2))
             anchor = 'center'
         if xoff < 3:
             xoff = 3
-        if shape == 'ellipse':
-            containerId = getCanvas().create_oval(left, top, right, bottom, fill=fill, outline=outline, width=outlineWidth)
-        else:
-            containerId = getCanvas().create_rectangle(left, top, right, bottom, fill=fill, outline=outline, width=outlineWidth)
-        textId = canvas.create_text(left + xoff, fontTop + adjust, fill=color, font=f'"{fontFace}" {fontSize} {fontWeight}', text=text, anchor=anchor)
+        xoff -= int(round(fontSize/4))
+        textId = canvas.create_text(screenLeft + xoff, fontTop + adjust, fill=color, font=f'"{fontFace}" {fontSize} {fontWeight}', text=text, anchor=anchor)
         if 'name' in values:
             widgetName = getValue(args, values['name'])
         else:
@@ -210,87 +206,84 @@ def render(spec, parent):
             "type": "text",
             "name": widgetName,
             "id": textId,
-            "containerId": containerId,
             "left": left,
             "top": top,
             "width": width,
-            "height": height
+            "height": height,
+            "parent": parent
         }
         elements[widgetName] = widgetSpec
         zlist.append({widgetName: widgetSpec})
         return widgetSpec
 
-    def renderImage(values, offset, args):
+    def renderImage(values, parent, args):
         global images
         left = getValue(args, values['left']) if 'left' in values else 10
+        screenLeft = left + getScreenLeft(parent)
         top = getValue(args, values['top']) if 'top' in values else 10
-        left = offset['dx'] + left
-        top = offset['dy'] + top
+        screenTop = top + getScreenTop(parent)
         width = getValue(args, values['width']) if 'width' in values else 100
-        height = getValue(args, values['height']) if 'height' in values else 100
-        right = left + width
-        bottom = top + height
-        src = getValue(args, values['src']) if 'src' in values else None
-        containerId = getCanvas().create_rectangle(left, top, right, bottom, width=0)
+        source = getValue(args, values['source']) if 'source' in values else None
         if 'name' in values:
             widgetName = values['name']
         else:
             widgetName = None
+        if source == None:
+            raise(Exception(f'No image source given for \'{id}\''))
+        img = (Image.open(source))
+        height = int(round(img.height * width / img.width))
+        resized_image= img.resize((width, height), Image.LANCZOS)
+        new_image= ImageTk.PhotoImage(resized_image)
+        imageid = getCanvas().create_image(screenLeft, screenTop, anchor='nw', image=new_image)
+        images[widgetName] = {'id': imageid, "image": new_image}
         widgetSpec = {
             "type": "image",
             "nme": widgetName,
-            "id": containerId,
             "left": left,
             "top": top,
             "width": width,
-            "height": height
+            "height": height,
+            "source": source,
+            "parent": parent
         }
         elements[widgetName] = widgetSpec
         zlist.append({widgetName: widgetSpec})
-        if src == None:
-            raise(Exception(f'No image source given for \'{id}\''))
-        img = (Image.open(src))
-        resized_image= img.resize((width, height), Image.ANTIALIAS)
-        new_image= ImageTk.PhotoImage(resized_image)
-        imageid = getCanvas().create_image(left, top, anchor='nw', image=new_image)
-        images[containerId] = {'id': imageid, "image": new_image}
         return widgetSpec
 
     # Create a canvas or render a widget
-    def renderWidget(widget, offset, args):
+    def renderWidget(widget, parent, args):
         widgetType = widget['type']
         if widgetType in ['rectangle', 'ellipse']:
-            return renderIntoRectangle(widgetType, widget, offset, args)
+            return renderIntoRectangle(widgetType, widget, parent, args)
         elif widgetType == 'text':
-            return renderText(widget, offset, args)
+            return renderText(widget, parent, args)
         elif widgetType == 'image':
-            return renderImage(widget, offset, args)
+            return renderImage(widget, parent, args)
 
     # Render a complete specification
-    def renderSpec(spec, offset, args):
+    def renderSpec(spec, parent, args):
         widgets = spec['#']
         # If a list, iterate it
         if type(widgets) is list:
             for widget in widgets:
-                renderWidget(spec[widget], offset, args)
+                renderWidget(spec[widget], parent, args)
         # Otherwise, process the single widget
         else:
-            renderWidget(spec[widgets], offset, args)
+            renderWidget(spec[widgets], parent, args)
 
     # Main entry point
-    offset = {'dx': 0, 'dy': 0}
     if parent != screen:
         RuntimeError(None, 'Can\'t yet render into parent widget')
 
     # If it'a string, process it
     if type(spec) is str:
-        renderSpec(json.loads(spec), offset, {})
+        renderSpec(json.loads(spec), None, {})
 
     # If it's a 'dict', extract the spec and the args
     if type(spec) is dict:
         args = spec['args']
         spec = json.loads(spec['spec'])
-        renderSpec(spec, offset, args)
+        renderSpec(spec, None, args)
 
 # Get the widget whose name is given
 def getElement(name):
@@ -328,3 +321,15 @@ def moveElementTo(name, left, top):
 def getAttribute(name, attribute):
     element = getElement(name)
     return element[attribute]
+
+# Get the screen left position of an element
+def getScreenLeft(element):
+    if element == None:
+        return 0
+    return element['left'] + getScreenLeft(element['parent'])
+
+# Get the screen top position of an element
+def getScreenTop(element):
+    if element == None:
+        return 0
+    return element['top'] + getScreenTop(element['parent'])

{easycoder-241215.1/scripts → easycoder-241218.1/json}/graphics-demo.json

@@ -1,7 +1,8 @@
 {
     "#": [
         "BlueRect",
-        "RedEllipse"
+        "RedEllipse",
+        "Photo"
     ],
     "BlueRect": {
         "type": "rectangle",
@@ -27,10 +28,33 @@
     "RedEllipse": {
         "type": "ellipse",
         "left": 300,
-        "top": 200,
+        "top": 100,
         "width": 200,
         "height": 100,
         "fill": "red",
-        "name": "redellipse"
+        "name": "redellipse",
+        "#": [
+            "WhiteText"
+        ],
+        "WhiteText": {
+            "type": "text",
+            "left": 25,
+            "top": 40,
+            "width": 160,
+            "height": 32,
+            "color": "white",
+            "text": "Graphics demo",
+            "fontSize": 20,
+            "name": "mytext"
+        }
+    },
+
+    "Photo": {
+        "type": "image",
+        "left": 150,
+        "top": 250,
+        "width": 300,
+        "source": "images/Semoigo Dawn.jpg",
+        "name": "dawn"
     }
 }

{easycoder-241215.1 → easycoder-241218.1}/scripts/graphics-demo.ecs

@@ -5,6 +5,7 @@
     rectangle BlueRect
     ellipse RedEllipse
     ellipse GreenCircle
+    text WhiteText
     file File
     variable Spec
     variable UpDown
@@ -16,7 +17,7 @@
 
     create screen at 300 300 size 640 480 fill color yellow
 
-    open File `scripts/graphics-demo.json` for reading
+    open File `json/graphics-demo.json` for reading
     read Spec from File
     close File
 
@@ -48,7 +49,7 @@
                 clear UpDown
             end
             move RedEllipse to Left Top
-            take 5 from Left
+            add 5 to Left
         end
         else
         begin
@@ -62,7 +63,7 @@
                 set UpDown
             end
             move RedEllipse to Left Top
-            add 5 to Left
+            take 5 from Left
         end
         increment N
     end