Skip to content

debug report and gridlines bugs #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yumisims merged 2 commits into from
Apr 20, 2026
Merged

debug report and gridlines bugs #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6d07eb
debug report and gridlines bugs
yumisims Apr 20, 2026
3f1bdd8
Upgrade checkout action from v2 to v4
yumisims Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: echo "Runner OS is ${{ runner.os }}"

- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Install NSIS on Windows
if: runner.os == 'Windows'
Expand Down
10 changes: 6 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 3.17)
project(PretextView VERSION "1.0.6")
project(PretextView VERSION "1.0.7")
# User-visible version (window title, macOS CFBundleShortVersionString); keep in sync with PretextView.cpp
set(PRETEXTVIEW_APP_VERSION_STRING "1.0.7-beta")


option(FORCE_MAC_X86 "Force macOS x86_64 build" OFF)
Expand Down Expand Up @@ -170,7 +172,6 @@ else()
)
endif()

target_compile_definitions(${target_name} PRIVATE PV=${PROJECT_VERSION})
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
target_compile_definitions(${target_name} PRIVATE DEBUG)
target_compile_definitions(copy_texture PRIVATE DEBUG)
Expand Down Expand Up @@ -304,7 +305,7 @@ file(GLOB aimodel_files "${CMAKE_CURRENT_SOURCE_DIR}/ai_model/*")
file(GLOB torch_copy_libs "${TORCH_INSTALL_PREFIX}/lib/*")
if (APPLE)
execute_process(
COMMAND bash ${CMAKE_SOURCE_DIR}/make_macos_app_plist.sh ${PROJECT_VERSION}
COMMAND bash ${CMAKE_SOURCE_DIR}/make_macos_app_plist.sh "${PRETEXTVIEW_APP_VERSION_STRING}"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
RESULT_VARIABLE result
OUTPUT_VARIABLE output
Expand Down Expand Up @@ -436,7 +437,8 @@ endif()
# ==== CPack: installation package ====
include(InstallRequiredSystemLibraries)
set(CPACK_PACKAGE_NAME ${target_name})
set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
# Match installer/DMG name to user-visible version (e.g. PretextViewAI-1.0.7-beta-Darwin-x86_64.dmg)
set(CPACK_PACKAGE_VERSION "${PRETEXTVIEW_APP_VERSION_STRING}")
set(CPACK_PACKAGE_DIRECTORY ${CMAKE_BINARY_DIR})
set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/sanger-tol/PretextView")
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}-${ARCH_TYPE}")
Expand Down
2 changes: 1 addition & 1 deletion Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundleIconFile</key>
<string>icon.icns</string>
<key>CFBundleShortVersionString</key>
<string>1.0.6</string>
<string>1.0.7-beta</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
Expand Down
Loading
Loading