Merge branch 'master' into 2023-11-21_stdev-in-ui

PhotonVision · Dec 19, 2023 · 8ab70eb · 8ab70eb
2 parents 9b487f4 + 796b8e7
commit 8ab70eb
Show file tree

Hide file tree

Showing 99 changed files with 6,821 additions and 452 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -18,7 +18,7 @@ Steps to reproduce the behavior:
 4. See error
 
 **Screenshots / Videos**
-If applicable, add screenshots to help explain your problem. Additionally, provide journalctl logs and settings zip export.
+If applicable, add screenshots to help explain your problem. Additionally, provide journalctl logs and settings zip export. If your issue is regarding the web dashboard, please provide screenshots and the output of the browser console.
 
 **Platform:**
  - Hardware Platform (ex. Raspberry Pi 4, Windows x64):

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,16 +16,16 @@ jobs:
         working-directory: photon-client
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
       - name: Install Dependencies
         run: npm ci
       - name: Build Production Client
         run: npm run build
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v4
         with:
           name: built-client
           path: photon-client/dist/
@@ -34,13 +34,13 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Fetch tags
         run: git fetch --tags --force
       - name: Install Java 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
@@ -68,7 +68,7 @@ jobs:
     steps:
       # Checkout code.
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Fetch tags
@@ -98,11 +98,11 @@ jobs:
     name: "Build Offline Docs"
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: 'PhotonVision/photonvision-docs.git'
           ref: master
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.9'
       - name: Install dependencies
@@ -136,11 +136,11 @@ jobs:
     name: "Photonlib - Build Host - ${{ matrix.artifact-name }}"
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install Java 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
@@ -169,7 +169,7 @@ jobs:
     container: ${{ matrix.container }}
     name: "Photonlib - Build Docker - ${{ matrix.artifact-name }}"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Config Git
@@ -222,11 +222,11 @@ jobs:
     name: "Build fat JAR - ${{ matrix.artifact-name }}"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install Java 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
@@ -238,11 +238,11 @@ jobs:
           del photon-server\src\main\resources\web\*.*
           mkdir photon-server\src\main\resources\web\docs
         if: ${{ (matrix.os) == 'windows-latest' }}
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: built-client
           path: photon-server/src/main/resources/web/
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: built-docs
           path: photon-server/src/main/resources/web/docs
@@ -254,7 +254,7 @@ jobs:
           chmod +x gradlew
           ./gradlew photon-server:shadowJar --max-workers 2
         if: ${{ (matrix.arch-override == 'none') }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: jar-${{ matrix.artifact-name }}
           path: photon-server/build/libs
@@ -280,17 +280,17 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
         with:
           name: jar-${{ matrix.artifact-name }}
       - name: Generate image
         run: |
           chmod +x scripts/generatePiImage.sh
           ./scripts/generatePiImage.sh ${{ matrix.image_url }} ${{ matrix.image_suffix }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         name: Upload image
         with:
           name: image-${{ matrix.image_suffix }}
@@ -301,7 +301,7 @@ jobs:
     steps:
       # Download literally every single artifact. This also downloads client and docs,
       # but the filtering below won't pick these up (I hope)
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
       - run: find
       # Push to dev release
       - uses: pyTooling/Actions/releaser@r0

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -0,0 +1,62 @@
+name: Build and Distribute PhotonLibPy
+
+permissions:
+  id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
+
+on:
+  push:
+    branches: [ master ]
+    tags:
+      - 'v*'
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  buildAndDeploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          sparse-checkout-cone-mode: false
+          fetch-tags: true
+          fetch-depth: 99999
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.11
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install setuptools wheel pytest
+
+      - name: Build wheel
+        working-directory: ./photon-lib/py
+        run: |
+          python setup.py sdist bdist_wheel
+
+      - name: Run Unit Tests
+        working-directory: ./photon-lib/py
+        run: |
+            pip install --no-cache-dir dist/*.whl
+            pytest
+
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@master
+        with:
+          name: dist
+          path: ./photon-lib/py/dist/
+
+      - name: Publish package distributions to TestPyPI
+        # Only upload on tags
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          packages_dir: ./photon-lib/py/dist/
+
+    permissions:
+      id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id "com.diffplug.spotless" version "6.22.0"
-    id "edu.wpi.first.NativeUtils" version "2024.3.2" apply false
+    id "edu.wpi.first.NativeUtils" version "2024.6.1" apply false
     id "edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin" version "2020.2"
-    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-3"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-4"
     id 'edu.wpi.first.WpilibTools' version '1.3.0'
 }
 
@@ -20,7 +20,8 @@ allprojects {
 apply from: "versioningHelper.gradle"
 
 ext {
-    wpilibVersion = "2024.1.1-beta-3"
+    wpilibVersion = "2024.1.1-beta-4"
+    wpimathVersion = wpilibVersion
     openCVversion = "4.8.0-2"
     joglVersion = "2.4.0-rc-20200307"
     javalinVersion = "5.6.2"
@@ -36,16 +37,11 @@ ext {
     if (nativeName == "macx64") nativeName = "osxx86-64";
     if (nativeName == "macarm64") nativeName = "osxarm64";
     jniPlatform = nativeName
-    println("Building for platform " + jniPlatform)
+    println("Building for platform: " + jniPlatform)
+    println("Using Wpilib: " + wpilibVersion)
+    println("Using OpenCV: " + openCVversion)
 }
 
-wpilibTools.deps.wpilibVersion = wpilibVersion
-
-// Tell gradlerio what version of things to use (that we care about)
-// See: https://github.com/wpilibsuite/GradleRIO/blob/main/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java
-wpi.getVersions().getOpencvVersion().convention(openCVversion);
-wpi.getVersions().getWpilibVersion().convention(wpilibVersion);
-
 spotless {
     java {
         target fileTree('.') {

diff --git a/photon-client/src/components/app/photon-camera-stream.vue b/photon-client/src/components/app/photon-camera-stream.vue
@@ -8,7 +8,7 @@ import PvIcon from "@/components/common/pv-icon.vue";
 
 const props = defineProps<{
   streamType: "Raw" | "Processed";
-  id?: string;
+  id: string;
 }>();
 
 const streamSrc = computed<string>(() => {
@@ -25,8 +25,6 @@ const streamDesc = computed<string>(() => `${props.streamType} Stream View`);
 const streamStyle = computed<StyleValue>(() => {
   if (useStateStore().colorPickingMode) {
     return { width: "100%", cursor: "crosshair" };
-  } else if (streamSrc.value !== loadingImage) {
-    return { width: "100%", cursor: "pointer" };
   }
 
   return { width: "100%" };
@@ -40,37 +38,45 @@ const overlayStyle = computed<StyleValue>(() => {
   }
 });
 
-const handleStreamClick = () => {
-  if (!useStateStore().colorPickingMode && streamSrc.value !== loadingImage) {
-    window.open(streamSrc.value);
-  }
-};
 const handleCaptureClick = () => {
   if (props.streamType === "Raw") {
     useCameraSettingsStore().saveInputSnapshot();
   } else {
     useCameraSettingsStore().saveOutputSnapshot();
   }
 };
+const handlePopoutClick = () => {
+  window.open(streamSrc.value);
+};
+const handleFullscreenRequest = () => {
+  const stream = document.getElementById(props.id);
+  if (!stream) return;
+  stream.requestFullscreen();
+};
 </script>
 
 <template>
   <div class="stream-container">
-    <img
-      :id="id"
-      crossorigin="anonymous"
-      :src="streamSrc"
-      :alt="streamDesc"
-      :style="streamStyle"
-      @click="handleStreamClick"
-    />
+    <img :id="id" crossorigin="anonymous" :src="streamSrc" :alt="streamDesc" :style="streamStyle" />
     <div class="stream-overlay" :style="overlayStyle">
       <pv-icon
         icon-name="mdi-camera-image"
         tooltip="Capture and save a frame of this stream"
         class="ma-1 mr-2"
         @click="handleCaptureClick"
       />
+      <pv-icon
+        icon-name="mdi-fullscreen"
+        tooltip="Open this stream in fullscreen"
+        class="ma-1 mr-2"
+        @click="handleFullscreenRequest"
+      />
+      <pv-icon
+        icon-name="mdi-open-in-new"
+        tooltip="Open this stream in a new window"
+        class="ma-1 mr-2"
+        @click="handlePopoutClick"
+      />
     </div>
   </div>
 </template>
@@ -81,6 +87,7 @@ const handleCaptureClick = () => {
 }
 
 .stream-overlay {
+  display: flex;
   opacity: 0;
   transition: 0.1s ease;
   position: absolute;

diff --git a/photon-client/src/components/cameras/CamerasView.vue b/photon-client/src/components/cameras/CamerasView.vue
@@ -78,10 +78,20 @@ const fpsTooLow = computed<boolean>(() => {
     </v-card-title>
     <div class="stream-container pb-4">
       <div class="stream">
-        <photon-camera-stream v-show="value.includes(0)" stream-type="Raw" style="max-width: 100%" />
+        <photon-camera-stream
+          v-show="value.includes(0)"
+          id="input-camera-stream"
+          stream-type="Raw"
+          style="max-width: 100%"
+        />
       </div>
       <div class="stream">
-        <photon-camera-stream v-show="value.includes(1)" stream-type="Processed" style="max-width: 100%" />
+        <photon-camera-stream
+          v-show="value.includes(1)"
+          id="output-camera-stream"
+          stream-type="Processed"
+          style="max-width: 100%"
+        />
       </div>
     </div>
     <v-divider />