easycoder 251104.1__py2.py3-none-any.whl → 251105.1__py2.py3-none-any.whl

easycoder/__init__.py

@@ -12,4 +12,4 @@ from .ec_pyside import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "251104.1"
+__version__ = "251105.1"

easycoder/ec_border.py

@@ -9,34 +9,38 @@ class Border(QWidget):
 
     def __init__(self):
         super().__init__()
-        self.size = 40
-        self.setFixedHeight(self.size)
+        self._size = 40
+        self.setFixedHeight(self._size)
         self._drag_active = False
         self._drag_start_pos = None
+        self._tick: QPixmap = QPixmap()
+        self._close_icon: QPixmap = QPixmap()
 
     def paintEvent(self, event):
         painter = QPainter(self)
-        painter.setRenderHint(QPainter.Antialiasing)
+        painter.setRenderHint(QPainter.RenderHint.Antialiasing)
         # Draw the tick icon
-        self.tick = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/tick.png').scaled(self.size, self.size, Qt.KeepAspectRatio, Qt.SmoothTransformation)
+        self._tick = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/icons/tick.png').scaled(
+            self._size, self._size, Qt.AspectRatioMode.KeepAspectRatio, Qt.TransformationMode.SmoothTransformation)
         x = 0
         y = 0
-        painter.drawPixmap(x, y, self.tick)
+        painter.drawPixmap(x, y, self._tick)
         # Draw the close icon
-        self.close = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/close.png').scaled(self.size, self.size, Qt.KeepAspectRatio, Qt.SmoothTransformation)
-        x = self.width() - self.close.width()
+        self._close_icon = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/icons/close.png').scaled(
+            self._size, self._size, Qt.AspectRatioMode.KeepAspectRatio, Qt.TransformationMode.SmoothTransformation)
+        x = self.width() - self._close_icon.width()
         y = 0
-        painter.drawPixmap(x, y, self.close)
+        painter.drawPixmap(x, y, self._close_icon)
 
     def mousePressEvent(self, event):
         # Tick icon
         x = 0
         y = 0
-        tickRect = self.tick.rect().translated(x, y)
+        tickRect = self._tick.rect().translated(x, y)
         # Close icon
-        x = self.width() - self.close.width()
+        x = self.width() - self._close_icon.width()
         y = 0
-        closeRect = self.close.rect().translated(x, y)
+        closeRect = self._close_icon.rect().translated(x, y)
         if tickRect.contains(event.pos()):
             self.tickClicked.emit()
         if closeRect.contains(event.pos()):

easycoder/ec_classes.py

@@ -1,6 +1,6 @@
 import sys
 
-class FatalError:
+class FatalError(BaseException):
 	def __init__(self, compiler, message):
 		compiler.showWarnings()
 		lino = compiler.tokens[compiler.index].lino
@@ -58,4 +58,9 @@ class Token:
 		self.token = token
 	
 class Object():
-    pass
+    """Dynamic object that allows arbitrary attribute assignment"""
+    def __setattr__(self, name: str, value) -> None:
+        self.__dict__[name] = value
+    
+    def __getattr__(self, name: str):
+        return self.__dict__.get(name)

easycoder/ec_compiler.py

@@ -85,6 +85,7 @@ class Compiler:
 
 	# Add a command to the code list
 	def addCommand(self, command):
+		command['bp'] = False
 		self.code.append(command)
 
 	# Test if the current token is a symbol
@@ -191,7 +192,7 @@ class Compiler:
 		if not token:
 			return False
 		if len(self.code) == 0:
-			if self.program.parent == None and hasattr(self.program, 'usingGraphics'):
+			if self.program.parent == None and self.program.usingGraphics:
 				cmd = {'domain': 'graphics', 'keyword': 'init', 'debug': False}
 				self.code.append(cmd)
 		mark = self.getIndex()

easycoder/ec_core.py

@@ -1771,15 +1771,8 @@ class Core(Handler):
             return False
         else:
             token = self.nextToken()
-            if token in ['graphics', 'debugger']:
-                if not hasattr(self.program, 'usingGraphics'):
-                    print('Loading graphics module')
-                    from .ec_pyside import Graphics
-                    self.program.graphics = Graphics
-                    self.program.useClass(Graphics)
-                    self.program.usingGraphics = True
-                if token == 'debugger': self.program.debugging = True
-                return True
+            if token == 'graphics':
+                return self.program.useGraphics()
         return False
 
     # Declare a general-purpose variable