Feature/UI section refactor

.github/workflows/build_and_test.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Install deps
         run: |
           sudo apt-get update -y
-          sudo apt-get --allow-releaseinfo-change update -y 
+          sudo apt-get --allow-releaseinfo-change update -y
           sudo apt-get install -y latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
           sudo apt-get install -y python3-sphinx python3-sphinx-rtd-theme python3-pip
       - name: Install Python dependencies
@@ -54,7 +54,7 @@ jobs:
       - name: Install deps
         run: |
           sudo apt-get update -y
-          sudo apt-get --allow-releaseinfo-change update -y 
+          sudo apt-get --allow-releaseinfo-change update -y
           sudo apt-get install -y latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
           sudo apt-get install -y python3-sphinx python3-sphinx-rtd-theme python3-pip
       - name: Install Python dependencies
@@ -90,9 +90,9 @@ jobs:
           - os: windows-latest
             artifact: agave-win
           # note macos-14 is arm64 and macos-13 is x86_64
-          - os: macos-14
+          - os: macos-15
             artifact: agave-macos-arm64
-          - os: macos-13
+          - os: macos-15-intel
             artifact: agave-macos-x86_64
 
     runs-on: ${{ matrix.os }}
@@ -104,7 +104,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: 6.8.3
+          version: 6.9.3
           modules: qtwebsockets qtimageformats
       - name: macos install deps
         if: contains(matrix.os, 'macos')
@@ -113,15 +113,18 @@ jobs:
           CXX: clang++
         run: |
           export MACOSX_DEPLOYMENT_TARGET=10.15
-          brew install spdlog glm nasm
+          brew install spdlog nasm
+          if [ -d /usr/local/include/openssl ]; then
+            mv /usr/local/include/openssl /usr/local/include/openssl.bak
+          fi
       - name: macos build and test
         if: contains(matrix.os, 'macos')
         env:
           CC: clang
           CXX: clang++
         run: |
           export MACOSX_DEPLOYMENT_TARGET=10.15
-          export Qt6_DIR=${{ runner.workspace }}/Qt/6.8.3/macos
+          export Qt6_DIR=${{ runner.workspace }}/Qt/6.9.3/macos
           mkdir ./build
           cd build
           cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release
@@ -154,19 +157,30 @@ jobs:
           cmake --build . --target agave_test --config Release
           cmake --build . --target install --config Release
         shell: bash
+      - name: linux upload artifact
+        if: matrix.os == 'ubuntu-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact }}
+          path: ./build/install/Release/agave-install
       - name: windows install ninja and nasm
         if: matrix.os == 'windows-latest'
         run: |
           choco install ninja
           choco install nasm
+      - name: windows install nsis
+        if: matrix.os == 'windows-latest'
+        uses: repolevedavaj/[email protected]
+        with:
+          nsis-version: "3.10"
       - name: windows install deps
         if: matrix.os == 'windows-latest'
         shell: cmd
         env:
           vc_arch: "x64"
         run: |
           call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 10.0.26100.0
-          vcpkg install --triplet x64-windows tiff glm zlib libjpeg-turbo liblzma spdlog zstd eigen3
+          vcpkg install --triplet x64-windows tiff glm zlib libjpeg-turbo liblzma spdlog zstd
       - name: Remove bad Strawberry Perl patch binary in search path
         # https://github.com/actions/runner-images/issues/5459#issuecomment-1532856844
         if: matrix.os == 'windows-latest'

.github/workflows/tagged_master_release.yml

@@ -14,9 +14,9 @@ jobs:
           - os: windows-latest
             artifact: agave-win
           # note macos-14 is arm64 and macos-13 is x86_64
-          - os: macos-14
+          - os: macos-15
             artifact: agave-macos-arm64
-          - os: macos-13
+          - os: macos-15-intel
             artifact: agave-macos-x86_64
 
     runs-on: ${{ matrix.os }}
@@ -28,7 +28,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: 6.8.3
+          version: 6.9.3
           modules: qtwebsockets qtimageformats
       - name: macos install deps
         if: contains(matrix.os, 'macos')
@@ -37,15 +37,18 @@ jobs:
           CXX: clang++
         run: |
           export MACOSX_DEPLOYMENT_TARGET=10.15
-          brew install spdlog glm nasm
+          brew install spdlog nasm
+          if [ -d /usr/local/include/openssl ]; then
+            mv /usr/local/include/openssl /usr/local/include/openssl.bak
+          fi
       - name: macos build and test
         if: contains(matrix.os, 'macos')
         env:
           CC: clang
           CXX: clang++
         run: |
           export MACOSX_DEPLOYMENT_TARGET=10.15
-          export Qt6_DIR=${{ runner.workspace }}/Qt/6.8.3/macos
+          export Qt6_DIR=${{ runner.workspace }}/Qt/6.9.3/macos
           mkdir ./build
           cd build
           cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release
@@ -79,11 +82,22 @@ jobs:
           cmake --build . --target agave_test --config Release
           cmake --build . --target install --config Release
         shell: bash
+      - name: linux upload artifact
+        if: matrix.os == 'ubuntu-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact }}
+          path: ./build/install/Release/agave-install
       - name: windows install ninja
         if: matrix.os == 'windows-latest'
         run: |
           choco install ninja
           choco install nasm
+      - name: windows install nsis
+        if: matrix.os == 'windows-latest'
+        uses: repolevedavaj/[email protected]
+        with:
+          nsis-version: "3.10"
       - name: windows install deps
         if: matrix.os == 'windows-latest'
         shell: cmd
@@ -92,7 +106,7 @@ jobs:
         # use older sdk to work around https://github.com/grpc/grpc/issues/37210
         run: |
           call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 10.0.26100.0
-          vcpkg install --triplet x64-windows tiff glm zlib libjpeg-turbo liblzma spdlog zstd eigen3
+          vcpkg install --triplet x64-windows tiff glm zlib libjpeg-turbo liblzma spdlog zstd
       - name: Remove bad Strawberry Perl patch binary in search path
         # https://github.com/actions/runner-images/issues/5459#issuecomment-1532856844
         if: matrix.os == 'windows-latest'

CMakeLists.txt

@@ -49,7 +49,7 @@ if(DEFINED ENV{Qt6_DIR})
   list(INSERT CMAKE_PREFIX_PATH 0 $ENV{Qt6_DIR})
 endif()
 
-set(AGAVE_QT_VERSION 6.8.3)
+set(AGAVE_QT_VERSION 6.9.3)
 
 if(WIN32)
   set(GUESS_Qt6_DIR C:/Qt/${AGAVE_QT_VERSION}/msvc2022_64 CACHE STRING "Qt6 directory")
@@ -58,20 +58,11 @@ elseif(APPLE)
 else()
   set(GUESS_Qt6_DIR ~/Qt/${AGAVE_QT_VERSION}/gcc_64)
   set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+  set(CMAKE_INSTALL_RPATH "\$ORIGIN")
 endif(WIN32)
 
 list(INSERT CMAKE_PREFIX_PATH 0 ${GUESS_Qt6_DIR})
 
-if(APPLE)
-  # homebrew
-  list(APPEND CMAKE_LIBRARY_PATH /usr/local/lib /usr/local/opt/icu4c/lib)
-  list(APPEND CMAKE_INCLUDE_PATH /usr/local/include)
-
-  # set(CMAKE_MACOSX_RPATH TRUE)
-  add_compile_options("-I/usr/local/opt/icu4c/include")
-  add_link_options("-L/usr/local/opt/icu4c/lib")
-endif(APPLE)
-
 find_package(Qt6 REQUIRED COMPONENTS Widgets Core Gui OpenGL OpenGLWidgets Network WebSockets Xml Svg REQUIRED)
 
 find_package(spdlog REQUIRED)
@@ -91,14 +82,6 @@ FetchContent_Declare(
             GIT_TAG 1.0.1
     )
 FetchContent_MakeAvailable(glm)
-# set(glm_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glm)
-# if(APPLE)
-#   # On MacOS, newer homebrew glm is broken with respect to cmake.
-#   # Revisit in a future version to try to remove this conditional.
-#   find_path(GLM_PATH glm/glm.hpp)
-# else()
-#   find_package(glm REQUIRED)
-# endif(APPLE)
 
 find_package(TIFF)
 
@@ -146,7 +129,7 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/CMake/conf.py.cmake ${CMAKE_SOURCE_DIR}/docs/
 # #####################
 # CPack
 # #####################
-find_package(Qt6QTiffPlugin 6.8.3 REQUIRED PATHS ${Qt6Gui_DIR})
+find_package(Qt6QTiffPlugin 6.9.3 REQUIRED PATHS ${Qt6Gui_DIR})
 
 set(CPACK_PACKAGE_VENDOR "Allen Institute for Cell Science")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "AGAVE is a viewer for 4D multichannel microscopy images, using physically based lighting and rendering.")
@@ -242,8 +225,8 @@ if(WIN32)
 
 # ###############
 elseif(APPLE)
-  find_package(Qt6QCocoaIntegrationPlugin 6.8.3 REQUIRED PATHS ${Qt6Gui_DIR})
-  find_package(Qt6QMacStylePlugin 6.8.3 REQUIRED PATHS ${Qt6Widgets_DIR})
+  find_package(Qt6QCocoaIntegrationPlugin 6.9.3 REQUIRED PATHS ${Qt6Gui_DIR})
+  find_package(Qt6QMacStylePlugin 6.9.3 REQUIRED PATHS ${Qt6Widgets_DIR})
 
   # ###############
   set(PACKAGE_OSX_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET})
@@ -347,7 +330,7 @@ elseif(APPLE)
   include(CPack)
 
 else() # Linux
-  find_package(Qt6QXcbIntegrationPlugin 6.8.3 REQUIRED PATHS ${Qt6Gui_DIR})
+  find_package(Qt6QXcbIntegrationPlugin 6.9.3 REQUIRED PATHS ${Qt6Gui_DIR})
 
   install(FILES
     ${PROJECT_SOURCE_DIR}/LICENSE.txt
@@ -364,6 +347,7 @@ else() # Linux
     $<TARGET_FILE:TIFF::TIFF>
     DESTINATION ${INSTALLDIR}
   )
+  install(TARGETS libCZI LIBRARY DESTINATION ${INSTALLDIR})
   install(FILES
     $<TARGET_FILE:Qt6::QXcbIntegrationPlugin>
     DESTINATION ${INSTALLDIR}/platforms/
@@ -385,4 +369,9 @@ else() # Linux
     ${PROJECT_SOURCE_DIR}/renderlib/assets/fonts/Courier_New.ttf
     DESTINATION ${INSTALLDIR}/assets/fonts/
   )
+  set(CPACK_GENERATOR "DEB")
+  set(CPACK_DEBIAN_PACKAGE_NAME "agave")
+  set(CPACK_PACKAGE_CONTACT "Allen Institute for Cell Science")
+
+  include(CPack)
 endif(WIN32)

Dockerfile

@@ -40,7 +40,7 @@ RUN apt-get update && apt-get install -y cmake
 RUN apt-get install -y python3-pip python3-venv
 
 # get Qt installed
-ENV QT_VERSION=6.8.3
+ENV QT_VERSION=6.9.3
 RUN pip install aqtinstall --break-system-packages
 RUN aqt install-qt --outputdir /qt linux desktop ${QT_VERSION} -m qtwebsockets qtimageformats
 # required for qt offscreen platform plugin