Merge branch 'main' of https://github.com/Timoite/GF2

Author: hw617

__pycache__/parse.cpython-310.pyc

@@ -42,7 +42,6 @@ class MyGLCanvas(wxcanvas.GLCanvas):
                                            operations.
     """
 
-    # Keep a record of all canvases
     instances = []
 
     def __init__(self, parent, monitor_name):
@@ -57,7 +56,7 @@ def __init__(self, parent, monitor_name):
 
         self.monitor_name = monitor_name
         self.parent = parent
-        MyGLCanvas.instances.append(self)
+        MyGLCanvas.instances.append(self)  # Keep a record of all canvases
 
         # Bind events to the canvas
         self.Bind(wx.EVT_PAINT, self.on_paint)
@@ -100,8 +99,8 @@ def render(self):
                 self.devices.get_signal_ids(self.monitor_name)
             signal_list = self.monitors_dictionary[(device_id, output_id)]
 
-            # Draw signal trace
-            GL.glColor3f(1.0, 0.0, 0.0)
+            # Draw a sample signal trace
+            GL.glColor3f(0.0, 0.0, 1.0)  # signal trace is blue
             GL.glBegin(GL.GL_LINE_STRIP)
             i = 0
             y_HIGH = 40
@@ -128,7 +127,7 @@ def render(self):
                 GL.glVertex2f(x_next, y_next)
                 i += 1
             GL.glEnd()
-        except (AttributeError):  # TODO this is the wrong error to catch
+        except (AttributeError):  # this is the wrong error to catch
             pass
 
         # We have been drawing to the back buffer, flush the graphics pipeline
@@ -186,7 +185,7 @@ def on_run(self, cycles_completed):
 
     def on_resize(self, event):
         """Refresh scroll position when resized."""
-        virtual_size = [max(self.parent.GetSize()[0]-216,
+        virtual_size = [max(self.parent.GetSize()[0]-196,
                             (self.cycles_completed+2)*20), 60]
         self.canvas.SetSize(virtual_size)
         self.SetScrollbars(1, 1, virtual_size[0], virtual_size[1])
@@ -214,8 +213,8 @@ def __init__(self, title):
         self.main_sizer = wx.StaticBoxSizer(wx.VERTICAL, self)
         self.upper_sizer = wx.BoxSizer(wx.HORIZONTAL)
         self.lower_sizer = wx.StaticBoxSizer(wx.VERTICAL, self)
-        self.main_sizer.Add(self.upper_sizer, 0, wx.EXPAND | wx.LEFT | wx.RIGHT, 10)
-        self.main_sizer.Add(self.lower_sizer, 0, wx.EXPAND | wx.LEFT | wx.RIGHT | wx.TOP, 10)
+        self.main_sizer.Add(self.upper_sizer, 0, wx.EXPAND, 0)
+        self.main_sizer.Add(self.lower_sizer, 0, wx.EXPAND | wx.TOP, 10)
 
         self.io_sizer = wx.StaticBoxSizer(wx.VERTICAL, self)
         self.switches_sizer = wx.StaticBoxSizer(wx.VERTICAL, self)
@@ -228,8 +227,8 @@ def __init__(self, title):
         total_sizer = wx.BoxSizer(wx.HORIZONTAL)
         self.io_sizer.Add(fileio_sizer, 0, wx.ALL | wx.CENTER, 5)
         self.io_sizer.Add(cycles_sizer, 0, wx.TOP | wx.CENTER, 15)
-        self.io_sizer.Add(run_cont_sizer, 0, wx.ALL | wx.CENTER, 20)
-        self.io_sizer.Add(total_sizer, 0, wx.BOTTOM | wx.CENTER, 20)
+        self.io_sizer.Add(run_cont_sizer, 0, wx.ALL | wx.CENTER, 10)
+        self.io_sizer.Add(total_sizer, 0, wx.TOP | wx.CENTER, 15)
 
         # Configure the widgets
 
@@ -255,7 +254,7 @@ def __init__(self, title):
 
         # Total cycles widgets
         text = wx.StaticText(self, wx.ID_ANY, "Total Cycles: ")
-        total_sizer.Add(text, 0, wx.CENTER | wx.RIGHT, 15)
+        total_sizer.Add(text, 0, wx.CENTER | wx.RIGHT, 5)
         self.total_cycles_text = \
             wx.StaticText(self, wx.ID_ANY, str(self.cycles_completed))
         total_sizer.Add(self.total_cycles_text, 0, wx.CENTER)
@@ -294,7 +293,7 @@ def __init__(self, title):
         self.SetSizeHints(500, 500)
         self.SetSize(600, 600)
         self.SetSizer(self.main_sizer)
-        self.SetPosition((100, 100))
+        self.SetPosition((0, 39))
 
     def AddSwitch(self, switch_id, switch_state):
         """Add a switch to GUI."""

__pycache__/scanner.cpython-310.pyc

@@ -1,5 +1,3 @@
-import sys
-
 """Read the circuit definition file and translate the characters into symbols.
 
 Used in the Logic Simulator project to read the characters in the definition