GetObjectDialog: new panel argument

Author: PierreRaybaut

cdlclient/tests/get_object_dialog.py

@@ -20,10 +20,20 @@ def test_dialog():
     proxy = SimpleRemoteProxy()
     proxy.connect()
     with qt_app_context():
+        # 1. Select an image or signal object
         dlg = GetObjectDialog(None, proxy)
         if dlg.exec():
-            obj_uuid = dlg.get_current_object_uuid()
-            obj = proxy.get_object(obj_uuid)
+            obj = proxy.get_object(dlg.get_current_object_uuid())
+            print(str(obj))
+        # 2. Select a signal object only
+        dlg = GetObjectDialog(None, proxy, panel="signal")
+        if dlg.exec():
+            obj = proxy.get_object(dlg.get_current_object_uuid())
+            print(str(obj))
+        # 3. Select an image object only
+        dlg = GetObjectDialog(None, proxy, panel="image")
+        if dlg.exec():
+            obj = proxy.get_object(dlg.get_current_object_uuid())
             print(str(obj))
 
 

cdlclient/widgets/connection.py

@@ -22,7 +22,8 @@
 from qtpy import QtWidgets as QW
 
 from cdlclient.config import _
-from cdlclient.widgets import datalab_banner
+from cdlclient.qthelpers import svgtext_to_icon
+from cdlclient.widgets import datalab_banner, svg_icons
 
 
 class ConnectionThread(QC.QThread):
@@ -56,6 +57,7 @@ def __init__(self, connect_callback: Callable, parent: QW.QWidget = None) -> Non
         super().__init__(parent)
         win32_fix_title_bar_background(self)
         self.setWindowTitle(_("Connection to DataLab"))
+        self.setWindowIcon(svgtext_to_icon(svg_icons.DATALAB))
         self.resize(300, 50)
         self.host_label = QW.QLabel()
         pixmap = QG.QPixmap()
@@ -79,44 +81,44 @@ def __init__(self, connect_callback: Callable, parent: QW.QWidget = None) -> Non
         layout.addWidget(status)
         self.setLayout(layout)
         self.thread = ConnectionThread(connect_callback)
-        self.thread.SIG_CONNECTION_OK.connect(self.on_connection_successful)
-        self.thread.SIG_CONNECTION_KO.connect(self.on_connection_failed)
+        self.thread.SIG_CONNECTION_OK.connect(self.__on_connection_successful)
+        self.thread.SIG_CONNECTION_KO.connect(self.__on_connection_failed)
         button_box = QW.QDialogButtonBox(QW.QDialogButtonBox.Cancel)
         button_box.rejected.connect(self.reject)
         layout.addWidget(button_box)
 
-    def set_status_icon(self, name: str) -> None:
+    def __set_status_icon(self, name: str) -> None:
         """Set status icon with standard Qt icon name"""
         self.status_icon.setPixmap(QG.QPixmap(get_std_icon(name).pixmap(24)))
 
-    def exec(self) -> int:
-        """Execute dialog"""
-        self.connect_to_server()
-        return super().exec()
-
-    def connect_to_server(self) -> None:
+    def __connect_to_server(self) -> None:
         """Connect to server"""
         self.progress_bar.setRange(0, 0)
-        self.set_status_icon("BrowserReload")
+        self.__set_status_icon("BrowserReload")
         self.status_label.setText(_("Connecting to server..."))
         self.thread.start()
 
-    def on_connection_successful(self) -> None:
+    def __on_connection_successful(self) -> None:
         """Connection successful"""
         self.progress_bar.setRange(0, 1)
         self.progress_bar.setValue(1)
-        self.set_status_icon("DialogApplyButton")
+        self.__set_status_icon("DialogApplyButton")
         self.status_label.setText(_("Connection successful!"))
         QC.QTimer.singleShot(1000, self.accept)
 
-    def on_connection_failed(self) -> None:
+    def __on_connection_failed(self) -> None:
         """Connection failed"""
         self.progress_bar.setRange(0, 1)
         self.progress_bar.setValue(1)
-        self.set_status_icon("MessageBoxCritical")
+        self.__set_status_icon("MessageBoxCritical")
         self.status_label.setText(_("Connection failed."))
         QC.QTimer.singleShot(2000, self.reject)
 
+    def exec(self) -> int:
+        """Execute dialog"""
+        self.__connect_to_server()
+        return super().exec()
+
 
 if __name__ == "__main__":
 

cdlclient/widgets/objectdialog.py

@@ -160,18 +160,28 @@ def contextMenuEvent(
 
 
 class GetObjectDialog(QW.QDialog):
-    """Get object dialog box"""
+    """Get object dialog box
+
+    Args:
+        parent: Parent widget
+        proxy: Remote proxy
+        panel: Panel to retrieve objects from ('signal', 'image' or None for both)
+        title: Dialog title
+    """
 
     def __init__(
         self,
         parent: QW.QWidget,
         proxy: SimpleRemoteProxy,
+        panel: str | None = None,
         title: str | None = None,
     ) -> None:
         super().__init__(parent)
+        assert panel in (None, "signal", "image")
         self.__proxy = proxy
         self.__current_object_uuid: str | None = None
         self.setWindowTitle(_("Select object") if title is None else title)
+        self.setWindowIcon(svgtext_to_icon(svg_icons.DATALAB))
         vlayout = QW.QVBoxLayout()
         self.setLayout(vlayout)
 
@@ -181,31 +191,37 @@ def __init__(
         logo_label.setPixmap(pixmap)
         logo_label.setAlignment(QC.Qt.AlignCenter)
 
-        panelgroup = QW.QWidget()
-        panellayout = QW.QHBoxLayout()
-        panellayout.setContentsMargins(0, 0, 0, 0)
-        # panellayout.setAlignment(QC.Qt.AlignCenter)
-        panelgroup.setLayout(panellayout)
-
-        panelcombo = QW.QComboBox()
-        panelcombo.addItem(svgtext_to_icon(svg_icons.SIGNAL), _("Signals"))
-        panelcombo.addItem(svgtext_to_icon(svg_icons.IMAGE), _("Images"))
-        panelcombo.setCurrentIndex(0 if proxy.get_current_panel() == "signal" else 1)
-        panelcombo.currentIndexChanged.connect(self.__change_panel)
-
-        panellabel = QW.QLabel(_("Active panel:"))
-        panellayout.addWidget(panellabel)
-        panellayout.addWidget(panelcombo)
-        panellayout.setStretch(1, 1)
+        panelgroup = None
+        if panel is None:
+            panelgroup = QW.QWidget()
+            panellayout = QW.QHBoxLayout()
+            panellayout.setContentsMargins(0, 0, 0, 0)
+            # panellayout.setAlignment(QC.Qt.AlignCenter)
+            panelgroup.setLayout(panellayout)
+
+            panelcombo = QW.QComboBox()
+            panelcombo.addItem(svgtext_to_icon(svg_icons.SIGNAL), _("Signals"))
+            panelcombo.addItem(svgtext_to_icon(svg_icons.IMAGE), _("Images"))
+            if proxy.get_current_panel() == "image":
+                panelcombo.setCurrentIndex(1)
+            panelcombo.currentIndexChanged.connect(self.__change_panel)
+
+            panellabel = QW.QLabel(_("Active panel:"))
+            panellayout.addWidget(panellabel)
+            panellayout.addWidget(panelcombo)
+            panellayout.setStretch(1, 1)
+        else:
+            self.__proxy.set_current_panel(panel)
 
         self.tree = SimpleObjectTree(parent)
         self.tree.init_from(proxy)
         self.tree.SIG_ITEM_DOUBLECLICKED.connect(lambda oid: self.accept())
-        self.tree.itemSelectionChanged.connect(self.current_object_changed)
+        self.tree.itemSelectionChanged.connect(self.__current_object_changed)
 
         vlayout.addWidget(logo_label)
         vlayout.addSpacing(10)
-        vlayout.addWidget(panelgroup)
+        if panelgroup is not None:
+            vlayout.addWidget(panelgroup)
         vlayout.addWidget(self.tree)
 
         bbox = QW.QDialogButtonBox(QW.QDialogButtonBox.Ok | QW.QDialogButtonBox.Cancel)
@@ -215,21 +231,21 @@ def __init__(
         vlayout.addSpacing(10)
         vlayout.addWidget(bbox)
         # Update OK button state:
-        self.current_object_changed()
+        self.__current_object_changed()
 
     def __change_panel(self, index: int) -> None:
         """Change panel"""
         self.__proxy.set_current_panel("signal" if index == 0 else "image")
         self.tree.init_from(self.__proxy)
-        self.current_object_changed()
-
-    def get_current_object_uuid(self) -> str:
-        """Return current object uuid"""
-        return self.__current_object_uuid
+        self.__current_object_changed()
 
-    def current_object_changed(self) -> None:
+    def __current_object_changed(self) -> None:
         """Item selection has changed"""
         self.__current_object_uuid = self.tree.get_current_item_id()
         self.ok_btn.setEnabled(bool(self.__current_object_uuid))
         self.ok_btn.setEnabled(bool(self.__current_object_uuid))
         self.ok_btn.setEnabled(bool(self.__current_object_uuid))
+
+    def get_current_object_uuid(self) -> str:
+        """Return current object uuid"""
+        return self.__current_object_uuid