Merge pull request #2533 from SCIInstitute/amorris/minor-updates

Minor updates

Author: akenmorris

.github/workflows/build-mac-arm64.yml

@@ -95,6 +95,18 @@ jobs:
       shell: bash -l {0}
       run: conda activate shapeworks && source ./devenv.sh ./build/bin && cd build && ctest -VV
 
+    - name: Print crash reports
+      if: failure()
+      run: |
+        echo "=== Crash Reports ==="
+        for f in ~/Library/Logs/DiagnosticReports/*.crash ~/Library/Logs/DiagnosticReports/*.ips; do
+          if [ -f "$f" ]; then
+            echo "--- $f ---"
+            cat "$f"
+            echo ""
+          fi
+        done
+
     - uses: actions/upload-artifact@v4
       with:
         name: artifact-${{github.sha}}-mac-arm64

.github/workflows/build-mac.yml

@@ -95,6 +95,18 @@ jobs:
       shell: bash -l {0}
       run: conda activate shapeworks && source ./devenv.sh ./build/bin && cd build && ctest -VV
 
+    - name: Print crash reports
+      if: failure()
+      run: |
+        echo "=== Crash Reports ==="
+        for f in ~/Library/Logs/DiagnosticReports/*.crash ~/Library/Logs/DiagnosticReports/*.ips; do
+          if [ -f "$f" ]; then
+            echo "--- $f ---"
+            cat "$f"
+            echo ""
+          fi
+        done
+
     - uses: actions/upload-artifact@v4
       with:
         name: artifact-${{github.sha}}-mac

Python/shapeworks/shapeworks/utils.py

@@ -316,11 +316,12 @@ def check_results(args, project_spreadsheet):
         if "world" in file:
             world_point_files.append(particle_dir + file)
     if args.tiny_test or args.verify:
-        # if verification dir doesn't exist, unzip verification.zip
-        if not os.path.exists("Data/Verification"):
+        # if verification dir doesn't exist or zip is newer, unzip verification.zip
+        zip_path = "Data/Verification.zip"
+        ver_path = "Data/Verification"
+        if not os.path.exists(ver_path) or os.path.getmtime(zip_path) > os.path.getmtime(ver_path):
             print("Unzipping verification data")
-            # unzip using python
-            with zipfile.ZipFile("Data/Verification.zip", 'r') as zip_ref:
+            with zipfile.ZipFile(zip_path, 'r') as zip_ref:
                 zip_ref.extractall("Data/")
 
         print("Verifying shape model")

Studio/main.cpp

@@ -7,6 +7,7 @@
 #include <QMessageBox>
 #include <QResource>
 #include <QStandardPaths>
+#include <QStyleFactory>
 #include <QSurfaceFormat>
 #include <iostream>
 
@@ -18,6 +19,7 @@
 // vtk
 #include <Applications/Configuration.h>
 #include <Interface/ShapeWorksStudioApp.h>
+#include <Utils/PlatformUtils.h>
 #include <Logging.h>
 #include <QVTKOpenGLNativeWidget.h>
 
@@ -107,6 +109,9 @@ int main(int argc, char** argv) {
     SW_LOG("ShapeWorks Studio " SHAPEWORKS_VERSION " initializing...");
 
     OverrideQApplication app(argc, argv);
+    if (PlatformUtils::is_windows()) {
+      app.setStyle(QStyleFactory::create("Fusion"));
+    }
     QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
 
     auto studio_app = QSharedPointer<ShapeWorksStudioApp>::create();

install_shapeworks.bat

@@ -10,6 +10,10 @@ REM update anaconda
 call conda config --add channels anaconda
 call conda config --add channels conda-forge
 
+REM Accept Anaconda TOS for required channels
+call conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main
+call conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r
+
 REM install shapeworks deps
 call conda create --yes --name %CONDAENV% python=3.12.3 pip=24.3.1 openblas=0.3.30 || goto :error
 call conda activate %CONDAENV%