Merge branch 'master' of github.com:Team-Arduino-Logique/Arduino-Logique into paquet-installation

charlotrudel · charlotrudel · commit 81c1e0a7ff14 · 2024-11-19T12:11:43.000-05:00
diff --git a/.github/workflows/release_pipeline.yml b/.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 }}
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 __pycache__/
-.mypy_cache/
+.mypy_cache/
+build/
+dist/
diff --git a/arduino_logique.py b/arduino_logique.py
@@ -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
@@ -105,34 +80,10 @@ def refresh_sidebar():
         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)
diff --git a/arduino_logique.spec b/arduino_logique.spec
@@ -2,28 +2,11 @@
 
 
 a = Analysis(
-    ['arduino_logique.py',
-    'breadboard.py',
-    'component_params.py',
-    'component_sketch.py',
-    'dataCDLT.py',
-    'menus.py',
-    'sidebar.py',
-    'toolbar.py'],
+    ['arduino_logique.py'],
     pathex=[],
     binaries=[],
-    datas=[
-        ('Assets', 'Assets'),
-        ('Components', 'Components'),
-        ('Components', 'Components'),
-        ('object_model', 'object_model'),
-        ('Images', 'Images'),
-        ('__pycache__', '__pycache__'),
-        ('pyserial-3.5.dist-info', 'pyserial')
-    ],
-    hiddenimports=[
-        'serial',
-    ],
+    datas=[('Assets', 'Assets'), ('Components', 'Components')],
+    hiddenimports=[],
     hookspath=[],
     hooksconfig={},
     runtime_hooks=[],
@@ -36,36 +19,27 @@ pyz = PYZ(a.pure)
 exe = EXE(
     pyz,
     a.scripts,
-    a.binaries,
-    a.datas,
     [],
+    exclude_binaries=True,
     name='arduino_logique',
     debug=False,
     bootloader_ignore_signals=False,
     strip=False,
     upx=True,
-    upx_exclude=[],
-    runtime_tmpdir=None,
-    console=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.zipfiles, 
-     a.datas, 
-     strip=False, 
-     upx=True, 
-     upx_exclude=[], 
-     name='arduino_logique',
-     debug=True,
-     target_arch=None,
-     codesign_identity=None,
-     entitlements_file=None,
-     xarc={'format': 'zip', 'file': 'arduino_logique.zip'}
-)
+    exe,
+    a.binaries,
+    a.datas,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    name='arduino_logique',
+)
diff --git a/menus.py b/menus.py
@@ -63,7 +63,6 @@ class Menus:
         board (Breadboard): The Breadboard instance.
         model (list): The model data for the circuit.
         current_dict_circuit (dict): The current circuit data.
-        zoom (Callable): The zoom function to adjust the canvas.
         com_port (str | None): The selected COM port.
     """
 
@@ -73,7 +72,6 @@ def __init__(
         canvas: tk.Canvas,
         board: Breadboard,
         current_dict_circuit: dict,
-        zoom_function: Callable,
     ):
         """
         Initializes the custom menu bar.
@@ -82,8 +80,6 @@ def __init__(
         - parent (tk.Tk or tk.Frame): The main window or parent frame.
         - canvas (tk.Canvas): The canvas widget for drawing circuits.
         - board (Breadboard): The Breadboard instance.
-        - current_dict_circuit (dict): The current circuit data.
-        - zoom_function (callable): The zoom function to adjust the canvas.
         """
         self.parent: tk.Tk | tk.Frame = parent
         """The main window or parent frame."""
@@ -93,8 +89,6 @@ def __init__(
         """The Breadboard instance."""
         self.current_dict_circuit: dict = current_dict_circuit
         """The current circuit data."""
-        self.zoom: Callable = zoom_function
-        """The zoom function to adjust the canvas."""
         self.com_port: str | None = None
         """The selected COM port."""
         self.selected_microcontroller = None
@@ -359,7 +353,6 @@ def open_file(self):
                 # Update current_dict_circuit and redraw the circuit
                 self.board.sketcher.clear_board()
 
-                # self.zoom(self.canvas, 10.0, self.board, 50, 10, [])
                 x_o, y_o = self.board.sketcher.id_origins["xyOrigin"]
                 self.board.sketcher.circuit(x_o, y_o, model=[])
 
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1 @@
+pyserial==3.5
