Finalizing latest CIs, RTStruct preferences properly saved.

raidionics · Aug 31, 2023 · 53f0f60 · 53f0f60
1 parent 7cadb85
commit 53f0f60
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 19 deletions.
diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
@@ -23,11 +23,6 @@ jobs:
       with:
         python-version: "3.7"
 
-    - name: Collect submodules
-      uses: actions/checkout@v3
-      with:
-        submodules: 'recursive'
-
     - name: Download ANTs
       uses: robinraju/release-downloader@main
       with:
@@ -47,7 +42,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r assets/requirements.txt
-#        pip install matplotlib==3.3.4
+        pip install matplotlib==3.3.4
 
     - name: Build software
       run: |

diff --git a/.github/workflows/build_macos_m1.yml b/.github/workflows/build_macos_m1.yml
@@ -11,11 +11,6 @@ jobs:
     steps:
     - uses: actions/checkout@v1
 
-    - name: Collect submodules
-      uses: actions/checkout@v3
-      with:
-        submodules: 'recursive'
-
     - name: Create environment and install python packages
       run: |
         cd ${{github.workspace}}
@@ -83,8 +78,8 @@ jobs:
     - name: Make installer
       run: |
         git clone https://github.com/dbouget/quickpkg.git
-        quickpkg/quickpkg dist/Raidionics.app --output Raidionics-1.2.0-macOS.pkg
-        cp -r Raidionics-1.2.0-macOS.pkg dist/Raidionics-1.2.0-macOS.pkg
+        quickpkg/quickpkg dist/Raidionics.app --output Raidionics-1.2.1-macOS.pkg
+        cp -r Raidionics-1.2.1-macOS.pkg dist/Raidionics-1.2.1-macOS.pkg
 
     - name: Upload package
       uses: actions/upload-artifact@v3

diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
@@ -20,11 +20,6 @@ jobs:
       with:
         python-version: "3.7"
 
-    - name: Collect submodules
-      uses: actions/checkout@v3
-      with:
-        submodules: 'recursive'
-
     - name: Free Up GitHub Actions Ubuntu Runner Disk Space
       uses: jlumbroso/free-disk-space@main
       with:

diff --git a/gui/UtilsWidgets/CustomQDialog/SoftwareSettingsDialog.py b/gui/UtilsWidgets/CustomQDialog/SoftwareSettingsDialog.py
@@ -395,7 +395,7 @@ def __on_use_registered_inputs_status_changed(self, status):
         UserPreferencesStructure.getInstance().use_registered_inputs = status
 
     def __on_export_results_rtstruct_status_changed(self, status):
-        UserPreferencesStructure.getInstance()._export_results_as_rtstruct = status
+        UserPreferencesStructure.getInstance().export_results_as_rtstruct = status
 
     def __on_compute_corticalstructures_status_changed(self, state):
         UserPreferencesStructure.getInstance().compute_cortical_structures = state

diff --git a/utils/logic/PipelineResultsCollector.py b/utils/logic/PipelineResultsCollector.py
@@ -184,4 +184,5 @@ def collect_results(patient_parameters, pipeline):
         except Exception:
             logging.error("Could not collect results for step {}.\n Received: {}".format(pipeline[step]["description"],
                                                                                          traceback.format_exc()))
+            continue
     return results