Merge branch 'master' of github.com:Team-Arduino-Logique/Arduino-Logique into battery-implementation

Author: charlotrudel

.github/workflows/release_pipeline.yml

@@ -0,0 +1,133 @@
+name: Build and Release
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build-macos:
+    runs-on: macos-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Install PyInstaller
+        run: pip install pyinstaller pyserial
+
+      - name: Build with PyInstaller
+        run: pyinstaller arduino_logique.spec
+
+      - name: Compress the build
+        run: tar -czvf arduino_logique_macos.tar.gz dist/arduino_logique
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: macos-build
+          path: arduino_logique_macos.tar.gz
+
+  build-ubuntu:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Install PyInstaller
+        run: pip install pyinstaller pyserial
+
+      - name: Build with PyInstaller
+        run: pyinstaller arduino_logique.spec
+
+      - name: Compress the build
+        run: tar -czvf arduino_logique_ubuntu.tar.gz dist/arduino_logique
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: ubuntu-build
+          path: arduino_logique_ubuntu.tar.gz
+
+  build-windows:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Install PyInstaller
+        run: pip install pyinstaller pyserial
+
+      - name: Build with PyInstaller
+        run: pyinstaller arduino_logique.spec
+
+      - name: Compress the build
+        run: Compress-Archive -Path dist\arduino_logique -DestinationPath arduino_logique_windows.zip
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: windows-build
+          path: arduino_logique_windows.zip
+
+  release:
+    needs: [build-macos, build-ubuntu, build-windows]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Download macOS build
+        uses: actions/download-artifact@v3
+        with:
+          name: macos-build
+          path: ./dist/
+
+      - name: Download Ubuntu build
+        uses: actions/download-artifact@v3
+        with:
+          name: ubuntu-build
+          path: ./dist/
+
+      - name: Download Windows build
+        uses: actions/download-artifact@v3
+        with:
+          name: windows-build
+          path: ./dist/
+
+      - name: Bump version and push tag
+        id: bump
+        uses: anothrNick/github-tag-action@1.36.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          WITH_V: true
+          RELEASE_BRANCHES: master
+          INITIAL_VERSION: v0.0.0
+
+      - name: Create release
+        uses: ncipollo/release-action@v1
+        with: 
+          artifacts: "./dist/arduino_logique_macos.tar.gz,./dist/arduino_logique_ubuntu.tar.gz,./dist/arduino_logique_windows.zip"
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ steps.bump.outputs.new_tag }}

.gitignore

@@ -1,2 +1,4 @@
 __pycache__/
-.mypy_cache/
+.mypy_cache/
+build/
+dist/

Assets/Icons/input.png

@@ -2,7 +2,7 @@
 ArduinoLogique.py
 Main module for the ArduinoLogique program. This module provides a graphical interface for 
 simulating logic circuits using Tkinter. It includes functionality to initialize a canvas, 
-draw a breadboard, and zoom in and out on the circuit diagram.
+draw a breadboard, etc.
 """
 
 import tkinter as tk
@@ -14,32 +14,6 @@
 from toolbar import Toolbar
 
 
-def zoom(canvas: tk.Canvas, scale: float, sketcher: ComponentSketcher) -> None:
-    """
-    Adjusts the zoom level of the given canvas by scaling the board and updating the scale factor.
-
-    Parameters:
-    - canvas (tk.Canvas): The canvas on which the board is drawn.
-    - scale (float): The scale factor to apply to the board.
-    - sketcher (ComponentSketcher): The ComponentSketcher instance used to draw the circuit.
-
-    Returns:
-    - None
-    """
-    # Calculate the scaling factor
-    new_scale_factor = scale / 10.0
-    scale_ratio = new_scale_factor / sketcher.scale_factor
-
-    # Update the scale factor in the existing ComponentSketcher instance
-    sketcher.scale_factor = new_scale_factor
-
-    # Scale all items on the canvas
-    canvas.scale("all", 0, 0, scale_ratio, scale_ratio)
-
-    # Optionally, you may need to adjust the canvas scroll region or other properties
-    canvas.configure(scrollregion=canvas.bbox("all"))
-
-
 def main():
     """
     Main function for the ArduinoLogique program. This function initializes the main window,
@@ -48,7 +22,8 @@ def main():
     # Creating main window
     win = tk.Tk()
     win.title("Laboratoire virtuel de circuit logique - GIF-1002")
-    win.geometry("1600x900")  # Initial window size
+    win.geometry("1400x800")  # Initial window size
+    win.resizable(False, False)  # Disabling window resizing
     win.configure(bg="#333333")  # Setting consistent background color
 
     # Configuring grid layout for the main window
@@ -70,8 +45,6 @@ def main():
     board = Breadboard(canvas, sketcher)
     board.fill_matrix_1260_pts()
 
-
-
     # Creating the toolbar instance
     toolbar = Toolbar(parent=win, canvas=canvas, sketcher=sketcher, current_dict_circuit=sketcher.current_dict_circuit)
     # Placing the secondary top bar in row=1, column=1 (spanning only the canvas area)
@@ -83,10 +56,9 @@ def main():
 
     # Draw the circuit
     board.draw_blank_board_model(50, 10)
-    
 
     # Creating the Sidebar instance after canvas, board, sketcher, component_data are defined
-    _ = Sidebar(
+    sidebar = Sidebar(
         parent=win,
         chip_images_path="Assets/chips",
         canvas=canvas,
@@ -95,40 +67,23 @@ def main():
         toolbar=toolbar,
     )
 
+    def refresh_sidebar():
+        sidebar.refresh()
+        win.after(5000, refresh_sidebar)
+
+    # Start the periodic refresh
+    refresh_sidebar()
+
     # Creating the Menus instance with proper references
     menus = Menus(
         parent=win,
         canvas=canvas,
         board=board,
         current_dict_circuit=sketcher.current_dict_circuit,
-        zoom_function=zoom,
     )
     # Placing the menu_bar in row=0, spanning both columns
     menus.menu_bar.grid(row=0, column=0, columnspan=2, sticky="nsew")
 
-    # Assigning the references to menus
-    menus.zoom_function = zoom
-
-    # Creating a slider and placing it in row=3, spanning both columns
-    h_slider = tk.Scale(
-        win,
-        from_=10,
-        to=30,
-        orient="horizontal",
-        command=lambda scale: zoom(canvas, float(scale), sketcher),
-        bg="#333333",
-        fg="white",
-        activebackground="#444444",
-        troughcolor="#555555",
-        highlightbackground="#333333",
-        sliderrelief="flat",
-        bd=0,
-        highlightthickness=0,
-    )
-    h_slider.set(10)  # Setting initial slider value
-
-    h_slider.grid(row=3, column=0, columnspan=2, sticky="ew", padx=0, pady=0)
-
     # Setting default font for all widgets
     default_font = font.Font(family="Arial", size=10)
     win.option_add("*Font", default_font)

Assets/Icons/output.png

@@ -0,0 +1,45 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+a = Analysis(
+    ['arduino_logique.py'],
+    pathex=[],
+    binaries=[],
+    datas=[('Assets', 'Assets'), ('Components', 'Components')],
+    hiddenimports=[],
+    hookspath=[],
+    hooksconfig={},
+    runtime_hooks=[],
+    excludes=[],
+    noarchive=False,
+    optimize=0,
+)
+pyz = PYZ(a.pure)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    [],
+    exclude_binaries=True,
+    name='arduino_logique',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    console=False,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+    contents_directory='.',
+)
+coll = COLLECT(
+    exe,
+    a.binaries,
+    a.datas,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    name='arduino_logique',
+)

arduino_logique.py

@@ -32,34 +32,7 @@ class Breadboard:
     def __init__(self, canvas: Canvas, sketcher: ComponentSketcher):
         self.canvas = canvas
         self.sketcher = sketcher
-        self.selector()
         self.canvas.config(cursor="")
-        canvas.bind("<Motion>", self.follow_mouse)
-
-    def follow_mouse(self, event):
-        """
-        Updates the mouse coordinates based on the given event.
-        Args:
-            event: An event object that contains the current mouse position.
-        """
-        # FIXME fixing the coords crashes the app
-        self.canvas.coords("selector_cable", [event.x - 10, event.y - 10, event.x + 0, event.y + 0])
-
-    def selector(self):
-        """
-        Create the round selector cable movement
-        """
-        self.canvas.create_oval(
-            100,
-            100,
-            110,
-            110,
-            fill="#dfdfdf",
-            outline="#404040",
-            width=1,
-            tags=("selector_cable"),
-        )
-        self.canvas.itemconfig("selector_cable", state="hidden")
 
     def fill_matrix_830_pts(self, col_distance=1, line_distance=1):
         """