Merge branch '1.2.0_fixes' of https://github.com/EasyScience/EasyReflectometryApp into 1.2.0_fixes

Author: rozyczko

EasyReflectometryApp/Backends/Py/experiment.py

@@ -12,6 +12,7 @@
 class Experiment(QObject):
     experimentChanged = Signal()
     externalExperimentChanged = Signal()
+    qRangeUpdated = Signal()
 
     def __init__(self, project_lib: ProjectLib, parent=None):
         super().__init__(parent)
@@ -59,12 +60,16 @@ def load(self, paths: str) -> None:
         if isinstance(paths, str):
             paths = paths.split(',')
 
+        q_range_changed = False
         for path in paths:
             generalized = IO.generalizePath(path)
             if self._project_logic.count_datasets_in_file(generalized) > 1:
-                self._project_logic.load_all_experiments_from_file(generalized)
+                _count, changed = self._project_logic.load_all_experiments_from_file(generalized)
             else:
-                self._project_logic.load_new_experiment(generalized)
+                changed = self._project_logic.load_new_experiment(generalized)
+            if changed:
+                q_range_changed = True
             self.experimentChanged.emit()
             self.externalExperimentChanged.emit()
-        pass  # debug anchor
+        if q_range_changed:
+            self.qRangeUpdated.emit()

EasyReflectometryApp/Backends/Py/logic/project.py

@@ -1,6 +1,7 @@
 from copy import copy
 from pathlib import Path
 
+import numpy as np
 from easyreflectometry import Project as ProjectLib
 
 
@@ -107,17 +108,61 @@ def save(self) -> None:
     def load(self, path: str) -> None:
         self._project_lib.load_from_json(path)
 
-    def load_experiment(self, path: str) -> None:
+    def load_experiment(self, path: str) -> bool:
         self._project_lib.load_experiment_for_model_at_index(path, self._project_lib._current_model_index)
+        return self._sync_q_max_with_loaded_experiments()
 
-    def load_new_experiment(self, path: str) -> None:
+    def load_new_experiment(self, path: str) -> bool:
         self._project_lib.load_new_experiment(path)
+        return self._sync_q_max_with_loaded_experiments()
 
     def count_datasets_in_file(self, path: str) -> int:
         return self._project_lib.count_datasets_in_file(path)
 
-    def load_all_experiments_from_file(self, path: str) -> int:
-        return self._project_lib.load_all_experiments_from_file(path)
+    def load_all_experiments_from_file(self, path: str) -> tuple[int, bool]:
+        loaded_count = self._project_lib.load_all_experiments_from_file(path)
+        q_max_changed = self._sync_q_max_with_loaded_experiments()
+        return loaded_count, q_max_changed
+
+    def _sync_q_max_with_loaded_experiments(self) -> bool:
+        """Set model q_max to the largest q value found in loaded experiments.
+
+        :return: True if q_max was changed, False otherwise.
+        :rtype: bool
+        """
+        experiments = self._project_lib._experiments
+        if not experiments:
+            return False
+
+        if hasattr(experiments, 'values'):
+            experiment_iterable = experiments.values()
+        else:
+            experiment_iterable = experiments
+
+        q_max_candidates = []
+        for experiment in experiment_iterable:
+            x_values = getattr(experiment, 'x', None)
+            if x_values is None:
+                continue
+
+            q_values = np.asarray(x_values, dtype=float)
+            if q_values.size == 0:
+                continue
+
+            finite_q_values = q_values[np.isfinite(q_values)]
+            if finite_q_values.size == 0:
+                continue
+
+            q_max_candidates.append(float(np.max(finite_q_values)))
+
+        if not q_max_candidates:
+            return False
+
+        new_q_max = max(q_max_candidates)
+        if new_q_max != self._project_lib.q_max:
+            self._project_lib.q_max = new_q_max
+            return True
+        return False
 
     def set_sample_from_orso(self, sample) -> None:
         self._project_lib.set_sample_from_orso(sample)

EasyReflectometryApp/Backends/Py/py_backend.py

@@ -160,6 +160,7 @@ def _connect_sample_page(self) -> None:
     def _connect_experiment_page(self) -> None:
         self._experiment.externalExperimentChanged.connect(self._relay_experiment_page_experiment_changed)
         self._experiment.externalExperimentChanged.connect(self._refresh_plots)
+        self._experiment.qRangeUpdated.connect(self._sample.qRangeChanged)
 
     def _connect_analysis_page(self) -> None:
         self._analysis.externalMinimizerChanged.connect(self._relay_analysis_page)

EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Groups/Fittables.qml

@@ -343,7 +343,6 @@ EaElements.GroupBox {
                 EaComponents.TableViewParameter {
                     enabled: Globals.BackendWrapper.analysisFitableParameters[index].independent !== undefined ?
                              Globals.BackendWrapper.analysisFitableParameters[index].independent : true
-                    minored: true
                     text: EaLogic.Utils.toDefaultPrecision(Globals.BackendWrapper.analysisFitableParameters[index].min).replace('Infinity', 'inf')
                     onEditingFinished: {
                         focus = false
@@ -356,7 +355,6 @@ EaElements.GroupBox {
                 EaComponents.TableViewParameter {
                     enabled: Globals.BackendWrapper.analysisFitableParameters[index].independent !== undefined ?
                              Globals.BackendWrapper.analysisFitableParameters[index].independent : true
-                    minored: true
                     text: EaLogic.Utils.toDefaultPrecision(Globals.BackendWrapper.analysisFitableParameters[index].max).replace('Infinity', 'inf')
                     onEditingFinished: {
                         focus = false