Support multiple parameter sets in DBWindow

Author: spmccormack

src/gui/windows/bayesian/DBPresenter.py

@@ -55,13 +55,15 @@ async def coro_calculate(self):
         if self.mp_handler:
             self.mp_handler.stop()
 
+        param_sets = self.get_paramsets()
+
         self.mp_handler = MPHandler()
         data = await self.mp_handler.coro_bayesian(
-            self.signals, self.get_paramsets(), self.on_progress_updated
+            self.signals, param_sets, self.on_progress_updated
         )
 
-        for d in data:
-            self.on_bayesian_inference_completed(*d)
+        for d, p in zip(data, param_sets):
+            self.on_bayesian_inference_completed(p.to_string(), *d)
 
         if data:
             self.update_slider()
@@ -74,6 +76,7 @@ async def coro_calculate(self):
 
     def on_bayesian_inference_completed(
         self,
+        key: str,
         signal_name: str,
         tm,
         p1,
@@ -89,13 +92,21 @@ def on_bayesian_inference_completed(
     ):
         signal = self.signals.get(signal_name)
 
-        signal.db_data = DBOutputData(
+        if not hasattr(signal, "db_data"):
+            signal.db_data = {}
+
+        signal.db_data[key] = DBOutputData(
             tm, p1, p2, cpl1, cpl2, cf1, cf2, mcf1, mcf2, surr_cpl1, surr_cpl2
         )
 
     def update_slider(self) -> None:
         signal, _ = self.get_selected_signal_pair()
-        data: DBOutputData = signal.db_data
+
+        try:
+            key = self.get_selected_param_set().to_string()
+            data: DBOutputData = signal.db_data[key]
+        except (AttributeError, KeyError):
+            return
 
         cf1 = data.cf1
         length = cf1.shape[2]
@@ -117,7 +128,8 @@ def plot_bayesian(self) -> None:
 
         times = signal.times
         try:
-            data: DBOutputData = signal.db_data
+            key = self.get_selected_param_set().to_string()
+            data: DBOutputData = signal.db_data.get(key)
         except AttributeError:
             return
 
@@ -140,6 +152,9 @@ def plot_bayesian2d(self, times: ndarray, data: DBOutputData) -> None:
         for p in (top, middle, bottom):
             p.clear()
 
+        if not data:
+            return
+
         for p in (middle, top):
             p.axes.xaxis.label.set_visible(False)
             p.toolbar.hide()
@@ -173,6 +188,9 @@ def plot_bayesian3d(self, data: DBOutputData) -> None:
         for p in (left, right):
             p.clear()
 
+        if not data:
+            return
+
         xlabel = r"$\phi_1$"
         ylabel = r"$\phi_2$"
         zlabel1 = r"$q_1(\phi_1,\phi_2)$"
@@ -247,6 +265,16 @@ def get_paramsets(self) -> List[ParamSet]:
     def has_paramset(self, text1, text2):
         return self.get_paramset(text1, text2) is not None
 
+    def get_selected_param_set(self) -> ParamSet:
+        param_sets = self.get_paramsets()
+
+        try:
+            index = self.view.listwidget_freq_band1.selectedIndexes()[0].row()
+        except IndexError:
+            return 0
+
+        return param_sets[index]
+
     def add_paramset(self, params: ParamSet):
         self.param_sets[params.to_string()] = params
 

src/gui/windows/bayesian/DBWindow.py

@@ -125,7 +125,7 @@ def on_calculate_stopped(self):
         self.btn_calculate_single.hide()
         self.btn_calculate_all.setText("Calculate")
 
-    def get_param_set(self) -> ParamSet:
+    def create_param_set(self) -> ParamSet:
         """
         Creates a parameter set from the current UI elements. This is used when
         adding a parameter set to the list.
@@ -166,6 +166,9 @@ def on_paramset_selected(self, widget_index: int, _: QListWidgetItem) -> None:
 
         self.fill_paramset_ui(text1, text2)
 
+        self.presenter.update_slider()
+        self.presenter.plot_bayesian()
+
     def fill_paramset_ui(self, text1, text2) -> None:
         """
         Fills the UI with the values from a parameter set.
@@ -189,7 +192,7 @@ def on_add_paramset_clicked(self) -> None:
         """
         Called when the user clicks the "add parameter set" button.
         """
-        params = self.get_param_set()
+        params = self.create_param_set()
         band1, band2 = params.to_string()
 
         if not self.presenter.has_paramset(band1, band2):
@@ -201,6 +204,7 @@ def on_add_paramset_clicked(self) -> None:
             self.listwidget_freq_band2.setCurrentRow(lastIndex)
 
             self.presenter.add_paramset(params)
+            self.presenter.plot_bayesian()
 
     def on_delete_paramset_clicked(self):
         """
@@ -220,6 +224,8 @@ def on_delete_paramset_clicked(self):
         for i in (item1, item2):
             sip.delete(i)
 
+        self.presenter.plot_bayesian()
+
     def setup_radio_preproc(self):
         pass