Skip to content

Commit

Permalink
Updated version with MNI space display
Browse files Browse the repository at this point in the history
  • Loading branch information
dbouget committed Sep 26, 2024
1 parent 9851bb1 commit 244b934
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:
jobs:
build:
name: Build packages
runs-on: macos-11
runs-on: macos-12
steps:
- uses: actions/checkout@v4
- name: Set up Python 3.8
Expand Down Expand Up @@ -72,8 +72,8 @@ jobs:
- name: Make installer
run: |
git clone https://github.com/dbouget/quickpkg.git
quickpkg/quickpkg dist/Raidionics.app --output Raidionics-1.2.3-macOS.pkg
cp -r Raidionics-1.2.3-macOS.pkg dist/Raidionics-1.2.3-macOS-x86_64.pkg
quickpkg/quickpkg dist/Raidionics.app --output Raidionics-1.2.4-macOS.pkg
cp -r Raidionics-1.2.4-macOS.pkg dist/Raidionics-1.2.4-macOS-x86_64.pkg
- name: Upload package
uses: actions/upload-artifact@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_macos_arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ jobs:
- name: Make installer
run: |
git clone https://github.com/dbouget/quickpkg.git
quickpkg/quickpkg dist/Raidionics.app --output Raidionics-1.2.3-macOS.pkg
cp -r Raidionics-1.2.3-macOS.pkg dist/Raidionics-1.2.3-macOS-arm64.pkg
quickpkg/quickpkg dist/Raidionics.app --output Raidionics-1.2.4-macOS.pkg
cp -r Raidionics-1.2.4-macOS.pkg dist/Raidionics-1.2.4-macOS-arm64.pkg
- name: Upload package
uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
cp -r dist/Raidionics assets/Raidionics_ubuntu/usr/local/bin
dpkg-deb --build --root-owner-group assets/Raidionics_ubuntu
ls -la
cp -r assets/Raidionics_ubuntu.deb dist/Raidionics-1.2.3-ubuntu.deb
cp -r assets/Raidionics_ubuntu.deb dist/Raidionics-1.2.4-ubuntu.deb
- name: Upload package
uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- name: Make installer
run: |
makensis.exe assets/Raidionics.nsi
cp -r assets/Raidionics-1.2.3-win.exe dist/Raidionics-1.2.3-win.exe
cp -r assets/Raidionics-1.2.4-win.exe dist/Raidionics-1.2.4-win.exe
- name: Upload package
uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion assets/Raidionics.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
!define COMP_NAME "SINTEF"
!define VERSION "1.2.2"
!define DESCRIPTION "Application"
!define INSTALLER_NAME "Raidionics-1.2.3-win.exe"
!define INSTALLER_NAME "Raidionics-1.2.4-win.exe"
!define MAIN_APP_EXE "Raidionics.exe"
!define INSTALL_TYPE "SetShellVarContext current"
!define REG_ROOT "HKLM"
Expand Down
2 changes: 1 addition & 1 deletion assets/main.spec
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ if sys.platform == "darwin":
'CFBundleIdentifier': 'Raidionics',
'CFBundleInfoDictionaryVersion': '6.0',
'CFBundleName': 'Raidionics',
'CFBundleVersion': '1.2.3',
'CFBundleVersion': '1.2.4',
'CFBundlePackageType': 'APPL',
'LSBackgroundOnly': 'false',
},
Expand Down
2 changes: 1 addition & 1 deletion assets/main_arm.spec
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ if sys.platform == "darwin":
'CFBundleIdentifier': 'Raidionics',
'CFBundleInfoDictionaryVersion': '6.0',
'CFBundleName': 'Raidionics',
'CFBundleVersion': '1.2.3',
'CFBundleVersion': '1.2.4',
'CFBundlePackageType': 'APPL',
'LSBackgroundOnly': 'false',
},
Expand Down
3 changes: 3 additions & 0 deletions utils/backend_logic.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ def run_pipeline(task: str, model_name: str, patient_parameters: PatientParamete
rads_config.set('System', 'output_folder', reporting_folder)
rads_config.set('System', 'model_folder', SoftwareConfigResources.getInstance().models_path)
pipeline = create_pipeline(model_name, patient_parameters, task)
if pipeline == {}:
queue.put((1, results))

pipeline_filename = os.path.join(patient_parameters.output_folder, 'rads_pipeline.json')
with open(pipeline_filename, 'w', newline='\n') as outfile:
json.dump(pipeline, outfile, indent=4)
Expand Down
4 changes: 4 additions & 0 deletions utils/logic/PipelineCreationHandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ def create_pipeline(model_name: str, patient_parameters, task: str) -> dict:
"""
# The model(s) must be downloaded first, since the pipeline.json file(s) must be used later for assembling
# the backend pipeline... Have to organize it better, and prepare reporting pipelines for download?
if 'postop_reporting' in task and "GBM" not in model_name:
logging.warning(
"[Software warning] There is currently no postoperative reporting for the requested type, only GBM is supported.")
return {}
download_model(model_name)

if task == 'folders_classification':
Expand Down
2 changes: 1 addition & 1 deletion utils/software_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class SoftwareConfigResources:
_software_home_location = None # Main dump location for the software elements (e.g., models, runtime log)
_user_preferences_filename = None # json file containing the user preferences (for when reopening the software).
_session_log_filename = None # log filename containing the runtime logging for each software execution and backend.
_software_version = "1.2.3" # Current software version (minor) for selecting which models to use in the backend.
_software_version = "1.2.4" # Current software version (minor) for selecting which models to use in the backend.
_software_medical_specialty = "neurology" # Overall medical target [neurology, thoracic]

@staticmethod
Expand Down

0 comments on commit 244b934

Please sign in to comment.