diff options
Diffstat (limited to 'ui/windows')
| -rw-r--r-- | ui/windows/channels_window.py | 2 | ||||
| -rw-r--r-- | ui/windows/devices_window.py | 2 | ||||
| -rw-r--r-- | ui/windows/plot_window.py | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ui/windows/channels_window.py b/ui/windows/channels_window.py index 9a90670..01b798c 100644 --- a/ui/windows/channels_window.py +++ b/ui/windows/channels_window.py @@ -933,7 +933,7 @@ class ChannelsWindow(QWidget): def __init__(self, registry: DeviceRegistry, processor: SignalProcessor, parent=None): - super().__init__(parent, Qt.WindowType.Window | Qt.WindowType.Tool) + super().__init__(parent, Qt.WindowType.Window) self.registry = registry self.processor = processor diff --git a/ui/windows/devices_window.py b/ui/windows/devices_window.py index f942552..5919938 100644 --- a/ui/windows/devices_window.py +++ b/ui/windows/devices_window.py @@ -256,7 +256,7 @@ class DevicesWindow(QWidget): closed = pyqtSignal() def __init__(self, registry: DeviceRegistry, engine: AcquisitionEngine, parent=None): - super().__init__(parent, Qt.WindowType.Window | Qt.WindowType.Tool) + super().__init__(parent, Qt.WindowType.Window) self.registry = registry self.engine = engine self._rows: dict = {} diff --git a/ui/windows/plot_window.py b/ui/windows/plot_window.py index 9a13781..0207af1 100644 --- a/ui/windows/plot_window.py +++ b/ui/windows/plot_window.py @@ -212,7 +212,7 @@ class PaneBlock(QFrame): self._x_cb.addItem(f"{dev.info.device_id}/{ch.channel_id} ({ch.name})", userData=f"{dev.info.device_id}/{ch.channel_id}") for dc in self.processor.get_derived(): - self._x_cb.addItem(f"[derived] {dc.channel_id}", + self._x_cb.addItem(f"[virtual] {dc.channel_id}", userData=f"derived/{dc.channel_id}") # Select current for i in range(self._x_cb.count()): @@ -264,7 +264,7 @@ class PaneBlock(QFrame): pick_row = QHBoxLayout() self._picker = self._make_picker(); pick_row.addWidget(self._picker,1) - ab = QPushButton("＋ Add Signal"); ab.setObjectName("addTraceBtn") + ab = QPushButton("＋ Add Channel"); ab.setObjectName("addTraceBtn") ab.clicked.connect(self._on_add); pick_row.addWidget(ab) self._tlay.addLayout(pick_row) outer.addWidget(tr_w) @@ -278,7 +278,7 @@ class PaneBlock(QFrame): cb.addItem(f"{dev.info.device_id} / {ch.channel_id} ({ch.name})", userData=(dev.info.device_id, ch.channel_id, ch.name, ch.color)) for dc in self.processor.get_derived(): - cb.addItem(f"[derived] {dc.channel_id} ({dc.name})", + cb.addItem(f"[virtual] {dc.channel_id} ({dc.name})", userData=("derived", dc.channel_id, dc.name, dc.color)) return cb @@ -314,7 +314,7 @@ class PlotWindow(QWidget): def __init__(self, registry: DeviceRegistry, processor: SignalProcessor, current: Optional[LayoutConfig] = None, parent=None): - super().__init__(parent, Qt.WindowType.Window | Qt.WindowType.Tool) + super().__init__(parent, Qt.WindowType.Window) self.registry = registry self.processor = processor self.cfg = deepcopy(current) if current \ |