Merge pull request #1935 from vallsv/fix-calib2-calibrant

calib2: Fixes calibrant selection

bootstrap.py

@@ -184,7 +184,12 @@ def find_executable(target):
     # search the executable in pyproject.toml
     with open(os.path.join(PROJECT_DIR, "pyproject.toml")) as f:
         pyproject = tomli.loads(f.read())
-    for script, entry_point in list(pyproject.get("console_scripts", {}).items()) + list(pyproject.get("gui_scripts", {}).items()):
+
+    scripts = {}
+    scripts.update(pyproject.get("project", {}).get("scripts", {}))
+    scripts.update(pyproject.get("project", {}).get("gui-scripts", {}))
+
+    for script, entry_point in scripts.items():
         if script == target:
             print(script, entry_point)
             return ("entry_point", target, entry_point)

pyFAI/gui/widgets/CalibrantSelector2.py

@@ -262,6 +262,16 @@ def __init__(self, parent=None):
         view.sigLoadFileRequested.connect(self.__loadFileRequested)
         self.setView(view)
 
+        self.activated.connect(self.__calibrantWasSelected)
+
+    def __calibrantWasSelected(self):
+        index = self.currentIndex()
+        if index == -1:
+            calibrant = None
+        else:
+            calibrant = self.itemData(index, role=CalibrantItemModel.CALIBRANT_ROLE)
+        self.__calibrantModel.setCalibrant(calibrant)
+
     def __modelChanged(self):
         calibrant = self.__calibrantModel.calibrant()
         model = self.model()