Merge pull request #186 from michaellans/update_curve_settings

Live + archive data moved to curve settings

Author: zdomke

trace/widgets/control_panel.py

@@ -718,33 +718,26 @@ def __init__(self, plot_curve_item: ArchivePlotCurveItem, variable_name: str = N
         self.pv_settings_modal = None
         self.pv_settings_button.clicked.connect(self.show_settings_modal)
         pv_settings_layout.addWidget(self.pv_settings_button)
-        self.delete_button = QtWidgets.QPushButton()
-        self.delete_button.setIcon(qta.icon("msc.trash"))
-        self.delete_button.setFlat(True)
-        self.delete_button.clicked.connect(self.close)
-        pv_settings_layout.addWidget(self.delete_button)
 
         self.setup_line_edit()
 
-        self.live_toggle = QtWidgets.QCheckBox("Live")
-        self.live_toggle.setCheckState(QtCore.Qt.Checked if self.source.liveData else QtCore.Qt.Unchecked)
-        self.live_toggle.stateChanged.connect(self.set_live_data_connection)
-        data_type_layout.addWidget(self.live_toggle)
         self.live_connection_status = QtWidgets.QLabel()
         self.live_connection_status.setPixmap(self.icon_disconnected.pixmap(16, 16))
         self.live_connection_status.setToolTip("Not connected to live data")
         self.source.live_channel_connection.connect(self.update_live_icon)
-        data_type_layout.addWidget(self.live_connection_status)
+        pv_settings_layout.addWidget(self.live_connection_status)
 
-        self.archive_toggle = QtWidgets.QCheckBox("Archive")
-        self.archive_toggle.setCheckState(QtCore.Qt.Checked if self.source.use_archive_data else QtCore.Qt.Unchecked)
-        self.archive_toggle.stateChanged.connect(self.set_archive_data_connection)
-        data_type_layout.addWidget(self.archive_toggle)
         self.archive_connection_status = QtWidgets.QLabel()
         self.archive_connection_status.setPixmap(self.icon_disconnected.pixmap(16, 16))
         self.archive_connection_status.setToolTip("Not connected to archive data")
         self.source.archive_channel_connection.connect(self.update_archive_icon)
-        data_type_layout.addWidget(self.archive_connection_status)
+        pv_settings_layout.addWidget(self.archive_connection_status)
+
+        self.delete_button = QtWidgets.QPushButton()
+        self.delete_button.setIcon(qta.icon("msc.trash"))
+        self.delete_button.setFlat(True)
+        self.delete_button.clicked.connect(self.close)
+        pv_settings_layout.addWidget(self.delete_button)
 
         data_type_layout.addStretch()
 
@@ -799,12 +792,6 @@ def set_active(self, state: QtCore.Qt.CheckState):
         else:
             self.source.show()
 
-    def set_live_data_connection(self, state: QtCore.Qt.CheckState) -> None:
-        self.source.liveData = state == QtCore.Qt.Checked
-
-    def set_archive_data_connection(self, state: QtCore.Qt.CheckState) -> None:
-        self.source.use_archive_data = state == QtCore.Qt.Checked
-
     def update_live_icon(self, connected: bool) -> None:
         self.live_connection_status.setVisible(not connected)
 

trace/widgets/curve_settings.py

@@ -41,6 +41,18 @@ def __init__(self, parent: QWidget, plot: PyDMArchiverTimePlot, curve: TimePlotC
         bin_count_line_edit.setPlaceholderText(str(bin_count))
         main_layout.addLayout(optimized_bin_count)
 
+        self.live_toggle = QCheckBox("")
+        self.live_toggle.setCheckState(Qt.Checked if self.curve.liveData else Qt.Unchecked)
+        self.live_toggle.stateChanged.connect(self.set_live_data_connection)
+        live_toggle_row = SettingsRowItem(self, "Connect to Live", self.live_toggle)
+        main_layout.addLayout(live_toggle_row)
+
+        self.archive_toggle = QCheckBox("")
+        self.archive_toggle.setCheckState(Qt.Checked if self.curve.use_archive_data else Qt.Unchecked)
+        self.archive_toggle.stateChanged.connect(self.set_archive_data_connection)
+        archive_toggle_row = SettingsRowItem(self, "Connect to Archive", self.archive_toggle)
+        main_layout.addLayout(archive_toggle_row)
+
         line_title_label = SettingsTitle(self, "Line")
         main_layout.addWidget(line_title_label)
 
@@ -95,6 +107,12 @@ def set_curve_data_bins(self):
         except (AttributeError, ValueError) as e:
             logger.warning(f"Unable to set data bins: {e}")
 
+    def set_live_data_connection(self, state: Qt.CheckState) -> None:
+        self.curve.liveData = state == Qt.Checked
+
+    def set_archive_data_connection(self, state: Qt.CheckState) -> None:
+        self.curve.use_archive_data = state == Qt.Checked
+
     def show(self):
         parent_pos = self.parent().rect().bottomRight()
         global_pos = self.parent().mapToGlobal(parent_pos)

trace/widgets/plot_settings.py

@@ -47,6 +47,7 @@ def __init__(self, parent: QWidget, plot: PyDMArchiverTimePlot):
 
         self.legend_checkbox = QCheckBox(self)
         self.legend_checkbox.stateChanged.connect(lambda check: self.plot.setShowLegend(bool(check)))
+        self.legend_checkbox.setChecked(True)  # legend on by default
         legend_row = SettingsRowItem(self, "Show Legend", self.legend_checkbox)
         main_layout.addLayout(legend_row)