Merge branch 'master' into master

WEEE-Open · Oct 5, 2024 · acf5390 · acf5390
2 parents 1dab2f0 + d7e0248
commit acf5390
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/src/peracotta/constants.py b/src/peracotta/constants.py
@@ -18,7 +18,7 @@
     "source_code": "https://github.com/WEEE-Open/peracotta",
 }
 
-VERSION = "2.5.5"
+VERSION = "2.5.6"
 
 PATH = {
     "UI": "assets/interface.ui",

diff --git a/src/peracotta/gui/Toolbox.py b/src/peracotta/gui/Toolbox.py
@@ -593,14 +593,14 @@ def minimumSizeHint(self) -> QtCore.QSize:
         return old
 
     def remove_item_from_toolbox(self, button):
+        logger.debug(f"Removing {button.text()}")
         i = 0
         for item in self.children():
+            if item is button:
+                self.removeItem(i)
+                break
             if isinstance(item, QtWidgets.QAbstractButton):
-                if item == button:
-                    self.removeItem(i)
-                    break
-                else:
-                    i += 1
+                i += 1
 
     def removeItem(self, index: int) -> None:
         i = 0

diff --git a/src/peracotta/gui/gui.py b/src/peracotta/gui/gui.py
@@ -82,6 +82,7 @@ def __init__(
         self.intCpuRadioBtn = self.findChild(QtWidgets.QRadioButton, "intCpuRadioBtn")
         self.intMoboRadioBtn = self.findChild(QtWidgets.QRadioButton, "intMoboRadioBtn")
         self.bothGpuRadioBtn = self.findChild(QtWidgets.QRadioButton, "bothGpuRadioBtn")
+        self.GpuRadioBtns = [self.discreteRadioBtn, self.intCpuRadioBtn, self.intMoboRadioBtn, self.bothGpuRadioBtn]
 
         # Selectors area
         self.selectorsWidget = self.findChild(QtWidgets.QWidget, "selectorsWidget")
@@ -189,6 +190,10 @@ def setup(self):
         niy = commons.ParserComponents.not_implemented_yet()
         for item in commons.ParserComponents:
             checkbox = QtWidgets.QCheckBox(item.value)
+            if item is commons.ParserComponents.GPU:
+                checkbox.toggled.connect(
+                    lambda c=checkbox: [radio.setAutoExclusive(c) or radio.setChecked(False) or radio.setEnabled(c) for radio in self.GpuRadioBtns]
+                )
             if item in niy:
                 checkbox.setEnabled(False)
             layout.addWidget(checkbox)
@@ -380,7 +385,6 @@ def gpu_location_from_buttons(self):
             )
             return commons.GpuLocation.DISCRETE
         else:
-            QtWidgets.QMessageBox.warning(self, "Warning", "Please, select one of the GPU locations to proceed.")
             return None
 
     def get_selected_filters(self):
@@ -395,7 +399,11 @@ def generate(self):
         if self.perathread.isRunning():
             return
 
-        if not self.set_thread_buttons_values():
+        self.set_thread_buttons_values()
+        logger.debug(f"Selected filters: {self.perathread.filters}")
+
+        if not self.perathread.gpu_location and commons.ParserComponents.GPU in self.perathread.filters:
+            QtWidgets.QMessageBox.warning(self, "Warning", "Please, select one of the GPU locations to proceed.")
             self.perathread.set_default_values()
             return
 
@@ -422,12 +430,10 @@ def generate(self):
 
     def set_thread_buttons_values(self):
         gpu_location = self.gpu_location_from_buttons()
-        if gpu_location is None:
-            return False
-        self.perathread.gpu_location = gpu_location
+
         self.perathread.owner = self.ownerLineEdit.text()
         self.perathread.filters = self.get_selected_filters()
-        return True
+        self.perathread.gpu_location = gpu_location
 
     def _ask_sudo_pass(self):
         sudo_passwd, ok = QtWidgets.QInputDialog.getText(
@@ -512,7 +518,8 @@ def load_raw_files(self, path: str = ""):
         if self.perathread.isRunning():
             return
 
-        if not self.set_thread_buttons_values():
+        self.set_thread_buttons_values()
+        if not self.perathread.gpu_location:
             self.perathread.set_default_values()
             return