Testing the latest seg/rads lib

.github/workflows/build_macos.yml

@@ -45,7 +45,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install git+https://github.com/dbouget/raidionics_rads_lib.git@software
+        pip install git+https://github.com/dbouget/raidionics_rads_lib.git@req
         pip install -r assets/requirements.txt
         pip install matplotlib==3.3.4
         pip install --force-reinstall --no-cache-dir pyside6

.github/workflows/build_macos_arm.yml

@@ -28,7 +28,7 @@ jobs:
         python3 -m pip install --upgrade pip
         pip3 install ffmpeg
         pip3 install matplotlib
-        pip install git+https://github.com/dbouget/raidionics_rads_lib.git@master
+        pip install git+https://github.com/dbouget/raidionics_rads_lib.git@req
         pip3 install -r assets/requirements.txt
         pip install --force-reinstall --no-cache-dir pyside6
         pip install urllib3==1.26.6

.github/workflows/build_ubuntu.yml

@@ -72,7 +72,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install git+https://github.com/dbouget/raidionics_rads_lib.git@master
+        pip install git+https://github.com/dbouget/raidionics_rads_lib.git@req
         pip install -r assets/requirements.txt
         pip uninstall -y PySide6 PySide6-Addons PySide6-Essentials
         pip install --force-reinstall --no-cache-dir pyside6==6.2.4

.github/workflows/build_windows.yml

@@ -41,7 +41,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         ls
-        pip install git+https://github.com/dbouget/raidionics_rads_lib.git@master
+        pip install git+https://github.com/dbouget/raidionics_rads_lib.git@req
         pip install -r assets/requirements.txt
         pip install matplotlib==3.3.4
         pip install --force-reinstall --no-cache-dir pyside6

gui/SinglePatientComponent/CentralAreaExecutionWidget.py

@@ -146,7 +146,7 @@ def on_pipeline_execution(self, pipeline_code: str) -> None:
 
         """
         self.model_name = ""
-        if ("Classification" not in pipeline_code) and ("Brain" not in pipeline_code) and ("postop" not in pipeline_code):
+        if ("Classification" not in pipeline_code) and ("Brain" not in pipeline_code) and ("postop" not in pipeline_code) and ("Edema" not in pipeline_code):
             diag = TumorTypeSelectionQDialog(self)
             code = diag.exec_()
             if code == 0:  # Operation cancelled
@@ -169,6 +169,8 @@ def on_pipeline_execution(self, pipeline_code: str) -> None:
             self.model_name = "MRI_Brain"
         elif "postop" in pipeline_code:
             self.model_name = "MRI_GBM_Postop_FV_4p"
+        elif "Edema" in pipeline_code:
+            self.model_name = "MRI_Edema"
 
         self.process_started.emit()
         self.pipeline_main_wrapper(pipeline_code)

utils/logic/PipelineCreationHandler.py

@@ -392,7 +392,7 @@ def __create_custom_pipeline(task, tumor_type, patient_parameters):
             pip[pip_num]["description"] = "Lungs segmentation in T1CE (T{})".format(str(timestamp_order))
             download_model(model_name="CT_Lungs")
 
-        if split_task[1] == 'Tumor':
+        if split_task[1] == 'Tumor' or split_task[1] == 'Edema':
             infile = open(os.path.join(SoftwareConfigResources.getInstance().models_path, tumor_type, 'pipeline.json'),
                           'rb')
             raw_pip = json.load(infile)
@@ -401,7 +401,7 @@ def __create_custom_pipeline(task, tumor_type, patient_parameters):
                 pip_num_int = pip_num_int + 1
                 pip_num = str(pip_num_int)
                 pip[pip_num] = raw_pip[steps]
-        if split_task[1] == 'Brain':
+        elif split_task[1] == 'Brain':
             infile = open(os.path.join(SoftwareConfigResources.getInstance().models_path, tumor_type, 'pipeline.json'),
                           'rb')
             raw_pip = json.load(infile)