250221.1

Author: graham-trott

dist/easycoder-250220.1-py2.py3-none-any.whl renamed to dist/easycoder-250221.1-py2.py3-none-any.whl

@@ -9,4 +9,4 @@
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250220.1"
+__version__ = "250221.1"

dist/easycoder-250220.1.tar.gz renamed to dist/easycoder-250221.1.tar.gz

@@ -1393,8 +1393,8 @@ def k_split(self, command):
                         self.nextToken()
                     else:
                         command['on'] = self.nextValue()
-                    self.add(command)
-                    return True
+                self.add(command)
+                return True
         return False
 
     def r_split(self, command):

easycoder/__init__.py

@@ -98,29 +98,54 @@ def k_column(self, command):
     def r_column(self, command):
         return self.nextPC()
 
+    # create layout {name} from {spec}
     # create {window} layout {layout}
-    # create {element} {args...}
     def k_create(self, command):
-        if self.nextIsSymbol():
+        token = self.nextToken()
+        if token == 'layout':
+            if self.nextIsSymbol():
+                record = self.getSymbolRecord()
+                if record['keyword'] == 'layout':
+                    command['layout'] = record['name']
+                    if self.nextIs('from'):
+                        command['spec'] = self.nextValue()
+                        self.addCommand(command)
+                        return True
+        elif self.isSymbol():
             symbolRecord = self.getSymbolRecord()
-            type = symbolRecord['keyword']
-            command['type'] = type
             command['name'] = symbolRecord['name']
-            if type == 'window':
-                command['title'] = self.nextValue()
-                if self.nextIs('layout'):
-                    if self.nextIsSymbol():
-                        symbolRecord = self.getSymbolRecord()
-                        if symbolRecord['keyword'] == 'layout':
-                            command['layout'] = symbolRecord['name']
-                            self.addCommand(command)
-                            return True
+            command['title'] = self.nextValue()
+            if self.nextIs('layout'):
+                if self.nextIsSymbol():
+                    symbolRecord = self.getSymbolRecord()
+                    if symbolRecord['keyword'] == 'layout':
+                        command['layout'] = symbolRecord['name']
+                        self.addCommand(command)
+                        return True
         return False
 
     def r_create(self, command):
-        type = command['type']
-        record = self.getVariable(command['name'])
-        if type == 'window':
+        def processItem(name, item):
+            print(name, item['type'])
+            children = item['#']
+            if isinstance(children, list):
+                print("List")
+                for child in children:
+                    print(child)
+            else:
+                print("Single:", children)
+
+        if 'spec' in command:
+            spec = self.getRuntimeValue(command['spec'])
+            layout = self.getVariable(command['layout'])
+            for key in spec.keys():
+                item = spec[key]
+                print(key, item['type'])
+                if item['type'] == 'column':
+                    for child in item['#']: processItem(child, item[child])
+            return self.nextPC()
+        else:
+            record = self.getVariable(command['name'])
             title = self.getRuntimeValue(command['title'])
             layout = self.getVariable(command['layout'])['layout']
             window = psg.Window(title, layout, finalize=True)
@@ -130,8 +155,12 @@ def r_create(self, command):
             self.program.run(self.nextPC())
             self.mainLoop()
             return 0
-        else:
-            RuntimeError(self.program, 'Variable is not a window or an element')
+
+    def k_frame(self, command):
+        return self.compileVariable(command)
+
+    def r_frame(self, command):
+        return self.nextPC()
 
     def k_init(self, command):
         if self.nextIsSymbol():

easycoder/ec_core.py

@@ -25,6 +25,7 @@ def getDefaultArgs(self, type):
         if type == 'Button': self.getDefaultButton(args)
         elif type == 'Checkbox': self.getDefaultCheckbox(args)
         elif type == 'Column': self.getDefaultColumn(args)
+        elif type == 'Frame': self.getDefaultFrame(args)
         elif type == 'Input': self.getDefaultInput(args)
         elif type == 'Listbox': self.getDefaultListbox(args)
         elif type == 'Multiline': self.getDefaultMultiline(args)
@@ -61,6 +62,7 @@ def createWidget(self, type, layout, args):
         if type == 'Button': return self.createButton(layout, args)
         elif type == 'Checkbox': return self.createCheckbox(layout, args)
         elif type == 'Column': return self.createColumn(layout, args)
+        elif type == 'Frame': return self.createFrame(layout, args)
         elif type == 'Input': return self.createInput(layout, args)
         elif type == 'Listbox': return self.createListbox(layout, args)
         elif type == 'Multiline': return self.createMultiline(layout, args)
@@ -74,6 +76,7 @@ def getWidgetValue(self, window, key):
         if type(widget) is psg.Button: return widget.get()
         elif type(widget) is psg.Checkbox: return widget.get()
         elif type(widget) is psg.Column: return widget.get()
+        elif type(widget) is psg.Frame: return widget.get()
         elif type(widget) is psg.Input: return widget.get()
         elif type(widget) is psg.Listbox:
             items = widget.get()
@@ -95,13 +98,6 @@ def updateProperty(self, element, property, value):
         elif property == 'values':
             element.update(values=value)
 
-    def getPad(self, args):
-        pad = args['pad']
-        if pad == (None, None):
-            return pad
-        pad = pad.split()
-        return (pad[0], pad[1])
-
     def getSize(self, args):
         size = args['size']
         if size == (None, None):
@@ -128,10 +124,19 @@ def createCheckbox(self, layout, args):
 
     def getDefaultColumn(self, args):
         args['expand_x'] = False
-        args['pad'] = (None, None)
+        args['pad'] = (0, 0)
 
     def createColumn(self, layout, args):
-        return psg.Column(layout, expand_x=args['expand_x'], pad=self.getPad(args))
+        return psg.Column(layout, expand_x=args['expand_x'], pad=args['pad'])
+
+    def getDefaultFrame(self, args):
+        args['title'] = ''
+        args['border_width'] = 1
+        args['expand_x'] = False
+        args['pad'] = (0, 0)
+
+    def createFrame(self, layout, args):
+        return psg.Frame(args['title'], layout, border_width=args['border_width'], expand_x=args['expand_x'], pad=args['pad'])
 
     def getDefaultInput(self, args):
         args['default_text'] = ''
@@ -145,11 +150,11 @@ def getDefaultListbox(self, args):
         args['list'] = []
         args['key'] = [None]
         args['size'] = '10 2'
-        args['pad'] = (None, None)
+        args['pad'] = 1
         args['select_mode'] = None
 
     def createListbox(self, layout, args):
-        return psg.Listbox([], key=args['key'], pad=self.getPad(args), size=self.getSize(args))
+        return psg.Listbox([], key=args['key'], pad=args['pad'], size=self.getSize(args))
 
     def getDefaultMultiline(self, args):
         args['default_text'] = ''

easycoder/ec_graphics.py

@@ -1,14 +1,3 @@
-!	A test script
+variable X
+print X
 
-	script Test
-
-	variable File
-	variable Segment
-
-	set the encoding to `hex`
-	load File from `/data/Projects/rbr/roombyroom/Controller/home/orangepi/firmware/NOW/config.py`
-	put left 200 of File into Segment
-	print Segment
-	put encode Segment into Segment
-	print Segment
-	exit

easycoder/ec_gutils.py

@@ -1,3 +1,13 @@
-variable X
-print X
+!   Test
 
+    script Test
+
+    variable Text
+
+    debug step
+
+    put `12345jj6789 S Room1` into Text
+!    split Text on ` `
+!    index Text to 2
+    print Text
+    exit