easycoder 250508.1__tar.gz → 250517.1__tar.gz

{easycoder-250508.1 → easycoder-250517.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easycoder
-Version: 250508.1
+Version: 250517.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>
@@ -8,6 +8,7 @@ Description-Content-Type: text/markdown
 Classifier: License :: OSI Approved :: MIT License
 License-File: LICENSE
 Requires-Dist: pytz
+Requires-Dist: requests
 Requires-Dist: pyside6
 Project-URL: Home, https://github.com/easycoder/easycoder-py
 

{easycoder-250508.1 → easycoder-250517.1}/easycoder/__init__.py

@@ -9,4 +9,4 @@ from .ec_program import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250508.1"
+__version__ = "250517.1"

{easycoder-250508.1 → easycoder-250517.1}/easycoder/ec_core.py

@@ -1,6 +1,6 @@
-import json, math, hashlib, threading, os, subprocess, sys, requests, time, numbers, base64, binascii, random
+import json, math, hashlib, threading, os, subprocess, sys, time, numbers, base64, binascii, random, requests
 from psutil import Process
-from datetime import datetime, timezone
+from datetime import datetime
 from random import randrange
 from .ec_classes import FatalError, RuntimeWarning, RuntimeError, AssertionError, NoValueError, NoValueRuntimeError, Condition, Object
 from .ec_handler import Handler
@@ -381,7 +381,7 @@ class Core(Handler):
 
     def r_exit(self, command):
         if self.program.graphics != None:
-            self.program.graphics.force_exit()
+            self.program.graphics.force_exit(None)
         return -1
 
     # Declare a file variable

{easycoder-250508.1 → easycoder-250517.1}/easycoder/ec_pyside.py

@@ -386,9 +386,13 @@ class Graphics(Handler):
         if y == None: y = (self.screenHeight - h) / 2
         else: y = self.getRuntimeValue(x)
         window.setGeometry(x, y, w, h)
-        container = QWidget()
-        container.setLayout(self.getVariable(command['layout'])['widget'])
-        window.setCentralWidget(container)
+        # content = self.getVariable(command['layout'])['widget']
+        # if isinstance(content, QWidget):
+        #     container = content
+        # else:
+        #     container = QWidget()
+        #     container.setLayout(content)
+        # window.setCentralWidget(container)
         record['window'] = window
         return self.nextPC()
     
@@ -712,6 +716,7 @@ class Graphics(Handler):
         return self.nextPC()
 
     # set [the] width/height [of] {widget} [to] {value}
+    # set [the] layout of {window} to {layout}
     # set [the] text [of] {label}/{button}/{lineinput} [to] {text}
     # set [the] color [of] {label}/{button}/{lineinput} [to] {color}
     # set [the] state [of] {checkbox} [to] {color}
@@ -730,6 +735,18 @@ class Graphics(Handler):
                     command['value'] = self.nextValue()
                     self.add(command)
                     return True
+        elif token == 'layout':
+            self.skip('of')
+            if self.nextIsSymbol():
+                record = self.getSymbolRecord()
+                if record['keyword'] == 'window':
+                    command['name'] = record['name']
+                    self.skip('to')
+                    if self.nextIsSymbol():
+                        record = self.getSymbolRecord()
+                        command['layout'] = record['name']
+                        self.add(command)
+                        return True
         elif token == 'text':
             self.skip('of')
             if self.nextIsSymbol():
@@ -790,6 +807,13 @@ class Graphics(Handler):
         elif what == 'width':
             widget = self.getVariable(command['name'])['widget']
             widget.setFixedWidth(self.getRuntimeValue(command['value']))
+        elif what == 'layout':
+            window = self.getVariable(command['name'])['window']
+            layout = self.getVariable(command['layout'])
+            content = self.getVariable(command['layout'])['widget']
+            container = QWidget()
+            container.setLayout(content)
+            window.setCentralWidget(container)
         elif what == 'text':
             record = self.getVariable(command['name'])
             widget = self.getVariable(command['name'])['widget']

easycoder-250517.1/plugins/rbr_ui.py

@@ -0,0 +1,82 @@
+from easycoder import Handler, FatalError, RuntimeError
+from PySide6.QtWidgets import (
+    QApplication, QMainWindow, QVBoxLayout, QLabel, QPushButton, QWidget, QHBoxLayout, QSpacerItem, QSizePolicy
+)
+from PySide6.QtGui import QPixmap, QFont, QPalette, QBrush
+from PySide6.QtCore import Qt
+
+# This is the package that handles the RBR user interface.
+
+class RBR_UI(Handler):
+
+    def __init__(self, compiler):
+        Handler.__init__(self, compiler)
+
+    def getName(self):
+        return 'points'
+
+    #############################################################################
+    # Keyword handlers
+
+    def k_rbr_ui(self, command):
+        return self.compileVariable(command, False)
+
+    def r_rbr_ui(self, command):
+        return self.nextPC()
+
+    # create the main UI
+    def k_create(self, command):
+        if self.nextIsSymbol():
+            record = self.getSymbolRecord()
+            if record['keyword'] == 'rbr_ui':
+                command['name'] = record['name']
+                self.skip('in')
+                if self.nextIsSymbol():
+                    record = self.getSymbolRecord()
+                    if record['keyword'] == 'window':
+                        command['window'] = record['name']
+                        self.addCommand(command)
+                        return True
+        return False
+
+    def r_create(self, command):
+        record = self.getVariable(command['name'])
+        window = self.getVariable(command['window'])['window']
+        # Set the background image
+        palette = QPalette()
+        background_pixmap = QPixmap("/home/graham/dev/rbr/ui/main/backdrop.jpg")
+        palette.setBrush(QPalette.Window, QBrush(background_pixmap))
+        window.setPalette(palette)
+
+        # Main layout
+        main_widget = QWidget()
+        main_layout = QVBoxLayout(main_widget)
+        main_layout.setSpacing(10)  # Set spacing between rows to 10
+
+        record['layout'] = main_widget
+        return self.nextPC()
+
+    #############################################################################
+    # Compile a value in this domain
+    def compileValue(self):
+        return None
+
+    #############################################################################
+    # Modify a value or leave it unchanged.
+    def modifyValue(self, value):
+        return value
+
+    #############################################################################
+    # Value handlers
+
+    def v_none(self, v):
+        return None
+
+    #############################################################################
+    # Compile a condition
+    def compileCondition(self):
+        condition = {}
+        return condition
+
+    #############################################################################
+    # Condition handlers

{easycoder-250508.1 → easycoder-250517.1}/pyproject.toml

@@ -13,6 +13,7 @@ keywords = ["compiler", "scripting", "prototyping", "programming", "coding", "py
 dynamic = ["version"]
 dependencies = [
     "pytz",
+    "requests",
     "pyside6"
 ]
 

easycoder-250517.1/rbr_ui.code-workspace

@@ -0,0 +1,3 @@
+{
+	"folders": []
+}

easycoder-250517.1/rbrconf.code-workspace

@@ -0,0 +1,3 @@
+{
+	"folders": []
+}

{easycoder-250508.1 → easycoder-250517.1}/scripts/config.ecg

@@ -98,7 +98,7 @@
     add Row to Layout
 
     create Window `RBR XR Config`
-        layout Layout
+    set the layout of Window to Layout
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !   Event handlers for the main window

easycoder-250517.1/scripts/rbr_ui.ecs

@@ -0,0 +1,24 @@
+
+!   rbr-ui.ecs
+
+    script RBR_UI
+
+    use graphics
+    
+    import plugin RBR_UI from plugins/rbr_ui.py
+
+    window Window
+    rbr_ui MainPanel
+
+    debug step
+
+    init graphics
+
+    create Window title `Room By Room` size 600 1024
+
+    create MainPanel in Window
+!    set the layout of Window to MainPanel
+    show Window
+
+    start graphics
+    stop

easycoder-250508.1/test.py → easycoder-250517.1/scripts/rbr_ui.py

@@ -1,3 +1,3 @@
 from easycoder import Program
 
-Program('test.ecs').start()
+Program('rbr-ui.ecs').start()

{easycoder-250508.1 → easycoder-250517.1/scripts}/rbrconf.ecs

@@ -160,8 +160,6 @@
     add Label to Layout
     create UptimeLabel text `0`
     add UptimeLabel to Layout
-    create Label text `sec`
-    add Label to Layout
     add stretch to Layout
     
     create Layout type QHBoxLayout
@@ -220,7 +218,8 @@
     gosub to OK 
     add StatusLabel to RightPanel
 
-    create Window title `RBR-Now configurator` size 700 500 layout MainPanel
+    create Window title `RBR-Now configurator` size 700 500
+    set the layout of Window to MainPanel
     show Window
 
     start graphics
@@ -631,9 +630,9 @@ GetFirmware:
 ScanForDevicesClick:
     gosub to SetBusy
     put `Scanning for new devices...` into StatusMessage
-    log StatusMessage
     gosub to Working
     put system `nmcli device wifi list` into SystemCallResult
+    log SystemCallResult
     split SystemCallResult
     put json `[]` into List
     put 1 into N
@@ -674,7 +673,7 @@ ScanForDevicesClick:
     SFDC2:
         increment N
     end
-!    log `SSIDs: ` cat List
+    log `SSIDs: ` cat List
     if the count of List is 0
     begin
         put `No new devices were found` into StatusMessage
@@ -736,7 +735,8 @@ SelectSSIDFromList:
     end
     add CancelButton to HLayout
     add HLayout to Layout
-    create Dialog title Title layout Layout size 250 200
+    create Dialog title Title size 250 200
+    set the layout of Dialog to Layout
     center Dialog on Window
     show Dialog
     stop
@@ -896,7 +896,8 @@ PopulateSystemInfo:
         create MessageBox on Window
             style question
             title `Move system`
-            message `Shall I move the system to the current host (` cat HostSSID cat `)?`
+            message `Shall I move system ` cat SystemName cat ` to the current host (` cat HostSSID cat `)?` cat newline
+                cat `(If 'No' I will attempt to connect to ` cat SystemHostSSID cat `)`
         show MessageBox giving Value
         if Value is `Yes`
         begin
@@ -909,6 +910,7 @@ PopulateSystemInfo:
         begin
             put SystemHostSSID into HostSSID
             put Password into HostPassword
+            system `nmcli connection delete ` cat HostSSID
             put system `nmcli dev wifi connect ` cat HostSSID cat ` password ` cat HostPassword into SystemCallResult
             split SystemCallResult on ` `
             if the elements of SystemCallResult is greater than 2
@@ -1103,7 +1105,8 @@ GetRequestedText:
         return
     end
     add CancelButton to HLayout
-    create Dialog title Title layout VLayout size 300 80
+    create Dialog title Title size 300 80
+    set the layout of Dialog to VLayout
     center Dialog on Window
     show Dialog
     stop
@@ -1148,6 +1151,7 @@ GetAccessPoints:
 ConnectToHost:
     put `Connect to host ` cat HostSSID cat ` with password ` cat HostPassword into StatusMessage
     gosub to Working
+    system `nmcli connection delete ` cat HostSSID
     put system `nmcli dev wifi connect ` cat HostSSID cat ` password ` cat HostPassword into SystemCallResult
     split SystemCallResult on ` `
     if the elements of SystemCallResult is greater than 2
@@ -1184,6 +1188,7 @@ FailedToConnect:
 ConnectToDevice:
     put `Connect to device ` cat SSID cat ` with password 00000000` into StatusMessage
     gosub to Working
+    system `nmcli connection delete ` cat SSID
     put system `nmcli dev wifi connect ` cat SSID cat ` password 00000000` into SystemCallResult
     put SystemCallResult into Value
     split Value on ` `
@@ -1310,7 +1315,8 @@ SendFileToDevice:
         put the length of Segment into Length
         add Length to Total
         put encode Segment into Segment
-        put `Send ` cat FileName cat `, part ` cat Sequence cat ` (attempt ` cat Attempt cat `)` into StatusMessage
+        put `Send ` cat FileName cat `, part ` cat Sequence into StatusMessage
+        if Attempt is not 1 put StatusMessage cat ` (attempt ` cat Attempt cat `)` into StatusMessage
         gosub to Working
         put `part:`  cat Sequence cat `,text:` cat Segment into Message
         gosub to SendMessageToDevice
@@ -1407,8 +1413,13 @@ CheckDevice:
 
 CheckDevice2:
     put the position of ` ` in Uptime into P
-    if P is greater than 0 put left P of Uptime into Uptime
-    log Name cat ` uptime: ` cat Uptime
+    if P is greater than 0
+    begin
+        put left P of Uptime into Uptime
+        put Uptime cat ` sec` into Uptime
+    end
+    else put `Unknown` into Uptime
+!    log Name cat ` uptime: ` cat Uptime
     set the text of UptimeLabel to Uptime
     go to OK
 
@@ -1427,6 +1438,7 @@ RelayOffClick:
     end
     begin
         put from 3 of Response into Uptime
+        put Uptime cat ` sec` into Uptime
         set the text of RelayStateLabel to `OFF`
     end
     gosub to CheckDevice2
@@ -1448,6 +1460,7 @@ RelayOnClick:
     else
     begin
         put from 3 of Response into Uptime
+        put Uptime cat ` sec` into Uptime
         set the text of RelayStateLabel to `ON`
     end
     gosub to CheckDevice2
@@ -1496,6 +1509,7 @@ SendMessageToDevice:
             put Path into MAC
         end
     end
+    put empty into Response
     put `http://` cat MasterIPAddr cat `/?mac=` cat MAC cat `&msg=` cat Message2 into URL
 !    log URL
     get Response from url URL
@@ -1508,7 +1522,6 @@ SendMessageToDevice:
             set property `path` of Device to empty
             go to SendMessageToDevice
         end
-        put empty into Response
         return
     end
 !    log URL cat ` - ` cat Response
@@ -1559,13 +1572,23 @@ UpdateConfig:
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !   Pause the system controller
 PauseSystemController:
-    if SystemIPAddr is not empty get Response from url `http://` cat SystemIPAddr cat `:17348/cgi-bin/pause.py`
+    if SystemIPAddr is not empty
+        get Response from url `http://` cat SystemIPAddr cat `:17348/cgi-bin/pause.py`
+        or begin
+            put `Unable to contact server at ` cat IPAddr into StatusMessage
+            goto Working
+        end
     return
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!   PaResumeuse the system controller
+!   Resume the system controller
 ResumeSystemController:
-    if SystemIPAddr is not empty get Response from url `http://` cat SystemIPAddr cat `:17348/cgi-bin/resume.py`
+    if SystemIPAddr is not empty
+        get Response from url `http://` cat SystemIPAddr cat `:17348/cgi-bin/resume.py`
+        or begin
+            put `Unable to contact server at ` cat IPAddr into StatusMessage
+            goto Working
+        end
     return
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

easycoder-250517.1/test.py

@@ -0,0 +1,3 @@
+from easycoder import Program
+
+Program('scripts/rbr_ui.ecs').start()

easycoder-250517.1/testrc.py

@@ -0,0 +1,3 @@
+from easycoder import Program
+
+Program('scripts/rbrconf.ecs').start()

easycoder-250517.1/ui.py

@@ -0,0 +1,84 @@
+from PySide6.QtWidgets import (
+    QApplication, QMainWindow, QVBoxLayout, QLabel, QPushButton, QWidget, QHBoxLayout, QSpacerItem, QSizePolicy
+)
+from PySide6.QtGui import QPixmap, QFont, QPalette, QBrush
+from PySide6.QtCore import Qt
+import sys
+
+class MainWindow(QMainWindow):
+    def __init__(self):
+        super().__init__()
+        self.setWindowTitle("Custom UI")
+        self.setFixedSize(600, 1024)  # Set the window size to 600x1024
+
+        # Set the background image
+        palette = QPalette()
+        background_pixmap = QPixmap("/home/graham/dev/rbr/ui/main/backdrop.jpg")
+        palette.setBrush(QPalette.Window, QBrush(background_pixmap))
+        self.setPalette(palette)
+
+        # Main layout
+        main_widget = QWidget()
+        main_layout = QVBoxLayout(main_widget)
+        main_layout.setSpacing(10)  # Set spacing between rows to 10
+
+        # Create 5 rows
+        for _ in range(5):
+            row = self.create_row()
+            main_layout.addWidget(row)
+
+        # Add a stretch below the last row
+        main_layout.addSpacerItem(QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding))
+
+        self.setCentralWidget(main_widget)
+
+    def create_row(self):
+        """Create a single row with the specified elements."""
+        row_widget = QWidget()
+        row_widget.setFixedHeight(1024 // 12)  # Each row is 1/12 the height of the window
+        row_widget.setStyleSheet("background-color: #ffffcc; border: 2px solid gray;")  # Set background and border
+
+        row_layout = QHBoxLayout(row_widget)
+        row_layout.setContentsMargins(10, 0, 10, 0)  # Add margins for spacing
+        row_layout.setSpacing(10)  # Add spacing between elements
+
+        # Icon 1: Clock
+        clock_icon = QLabel()
+        clock_pixmap = QPixmap("/home/graham/dev/rbr/ui/main/clock.png").scaled(1024 // 12 * 3 // 4, 1024 // 12 * 3 // 4, Qt.KeepAspectRatio, Qt.SmoothTransformation)
+        clock_icon.setPixmap(clock_pixmap)
+        clock_icon.setStyleSheet("border-left: none; border-right: none;")
+
+        # Name label
+        name_label = QLabel("Room Name")
+        name_label.setAlignment(Qt.AlignVCenter | Qt.AlignLeft)
+        name_label.setStyleSheet("background-color: transparent; border: none;")  # Transparent background
+        font = QFont()
+        font.setPointSize(16)  # Adjust font size to fit at least 20 characters
+        font.setBold(True)  # Make the font bold
+        name_label.setFont(font)
+
+        # Button with white text and blue background
+        button = QPushButton("20.0°C")
+        button.setStyleSheet("color: white; background-color: blue; border: none;")
+        button.setFixedSize(80, 40)  # Adjust button size
+        button.setFont(font)  # Use the same font as the label
+
+        # Icon 2: Edit
+        edit_icon = QLabel()
+        edit_pixmap = QPixmap("/home/graham/dev/rbr/ui/main/edit.png").scaled(1024 // 12 * 3 // 4, 1024 // 12 * 3 // 4, Qt.KeepAspectRatio, Qt.SmoothTransformation)
+        edit_icon.setPixmap(edit_pixmap)
+        edit_icon.setStyleSheet("border-left: none; border-right: none;")
+
+        # Add elements to the row layout
+        row_layout.addWidget(clock_icon)
+        row_layout.addWidget(name_label, 1)  # Expand the name label to use all spare space
+        row_layout.addWidget(button)
+        row_layout.addWidget(edit_icon)
+
+        return row_widget
+
+if __name__ == "__main__":
+    app = QApplication(sys.argv)
+    window = MainWindow()
+    window.show()
+    sys.exit(app.exec())

easycoder-250508.1/plugins/keyboards/4-function.json

@@ -1,62 +0,0 @@
-{
-    "face": "plugins/keyboards/4-function.png",
-    "rows":
-        [
-            [
-                {
-                    "id": "1"
-                },
-                {
-                    "id": "2"
-                },
-                {
-                    "id": "3"
-                },
-                {
-                    "id": "+"
-                }
-            ],
-            [
-                {
-                    "id": "4"
-                },
-                {
-                    "id": "5"
-                },
-                {
-                    "id": "6"
-                },
-                {
-                    "id": "-"
-                }
-            ],
-            [
-                {
-                    "id": "7"
-                },
-                {
-                    "id": "8"
-                },
-                {
-                    "id": "9"
-                },
-                {
-                    "id": "*"
-                }
-            ],
-            [
-                {
-                    "id": "0"
-                },
-                {
-                    "id": "C"
-                },
-                {
-                    "id": "="
-                },
-                {
-                    "id": "/"
-                }
-            ]
-        ]
-}