bec-widgets 0.99.0__py3-none-any.whl → 0.99.8__py3-none-any.whl

bec_widgets/widgets/waveform/waveform_widget.py

@@ -28,6 +28,7 @@ except ImportError:
 
 
 class BECWaveformWidget(BECWidget, QWidget):
+    ICON_NAME = "show_chart"
     USER_ACCESS = [
         "curves",
         "plot",
@@ -58,8 +59,14 @@ class BECWaveformWidget(BECWidget, QWidget):
     dap_summary_update = Signal(dict)
     autorange_signal = Signal()
     new_scan = Signal()
+    crosshair_position_changed = Signal(tuple)
+    crosshair_position_changed_string = Signal(str)
+    crosshair_position_clicked = Signal(tuple)
+    crosshair_position_clicked_string = Signal(str)
     crosshair_coordinates_changed = Signal(tuple)
+    crosshair_coordinates_changed_string = Signal(str)
     crosshair_coordinates_clicked = Signal(tuple)
+    crosshair_coordinates_clicked_string = Signal(str)
 
     def __init__(
         self,
@@ -99,7 +106,7 @@ class BECWaveformWidget(BECWidget, QWidget):
                 ),
                 "separator_2": SeparatorAction(),
                 "curves": MaterialIconAction(
-                    icon_name="stacked_line_chart", tooltip="Open Curves Configuration"
+                    icon_name="timeline", tooltip="Open Curves Configuration"
                 ),
                 "fit_params": MaterialIconAction(
                     icon_name="monitoring", tooltip="Open Fitting Parameters"
@@ -136,6 +143,20 @@ class BECWaveformWidget(BECWidget, QWidget):
         self.waveform.new_scan.connect(self.new_scan)
         self.waveform.crosshair_coordinates_changed.connect(self.crosshair_coordinates_changed)
         self.waveform.crosshair_coordinates_clicked.connect(self.crosshair_coordinates_clicked)
+        self.waveform.crosshair_coordinates_changed.connect(
+            self._emit_crosshair_coordinates_changed_string
+        )
+        self.waveform.crosshair_coordinates_clicked.connect(
+            self._emit_crosshair_coordinates_clicked_string
+        )
+        self.waveform.crosshair_position_changed.connect(self.crosshair_position_changed)
+        self.waveform.crosshair_position_clicked.connect(self.crosshair_position_clicked)
+        self.waveform.crosshair_position_changed.connect(
+            self._emit_crosshair_position_changed_string
+        )
+        self.waveform.crosshair_position_clicked.connect(
+            self._emit_crosshair_position_clicked_string
+        )
 
     def _hook_actions(self):
         self.toolbar.widgets["save"].action.triggered.connect(self.export)
@@ -156,6 +177,22 @@ class BECWaveformWidget(BECWidget, QWidget):
         #     lambda: self.save_config(path=None, gui=True)
         # )
 
+    @SafeSlot(tuple)
+    def _emit_crosshair_coordinates_changed_string(self, coordinates):
+        self.crosshair_coordinates_changed_string.emit(str(coordinates))
+
+    @SafeSlot(tuple)
+    def _emit_crosshair_coordinates_clicked_string(self, coordinates):
+        self.crosshair_coordinates_clicked_string.emit(str(coordinates))
+
+    @SafeSlot(tuple)
+    def _emit_crosshair_position_changed_string(self, position):
+        self.crosshair_position_changed_string.emit(str(position))
+
+    @SafeSlot(tuple)
+    def _emit_crosshair_position_clicked_string(self, position):
+        self.crosshair_position_clicked_string.emit(str(position))
+
     ###################################
     # Dialog Windows
     ###################################
@@ -248,7 +285,7 @@ class BECWaveformWidget(BECWidget, QWidget):
         y_entry: str | None = None,
         z_entry: str | None = None,
         color: str | None = None,
-        color_map_z: str | None = "plasma",
+        color_map_z: str | None = "magma",
         label: str | None = None,
         validate: bool = True,
         dap: str | None = None,  # TODO add dap custom curve wrapper

bec_widgets/widgets/website/website.py

@@ -1,6 +1,6 @@
-from qtpy.QtCore import QUrl, qInstallMessageHandler
+from qtpy.QtCore import Property, QUrl, Slot, qInstallMessageHandler
 from qtpy.QtWebEngineWidgets import QWebEngineView
-from qtpy.QtWidgets import QApplication
+from qtpy.QtWidgets import QApplication, QVBoxLayout, QWidget
 
 from bec_widgets.utils.bec_widget import BECWidget
 
@@ -14,18 +14,45 @@ def suppress_qt_messages(type_, context, msg):
 qInstallMessageHandler(suppress_qt_messages)
 
 
-class WebsiteWidget(BECWidget, QWebEngineView):
+class WebsiteWidget(BECWidget, QWidget):
     """
     A simple widget to display a website
     """
 
+    ICON_NAME = "travel_explore"
     USER_ACCESS = ["set_url", "get_url", "reload", "back", "forward"]
 
     def __init__(self, parent=None, url: str = None, config=None, client=None, gui_id=None):
         super().__init__(client=client, config=config, gui_id=gui_id)
-        QWebEngineView.__init__(self, parent=parent)
+        QWidget.__init__(self, parent=parent)
+        layout = QVBoxLayout()
+        layout.setContentsMargins(0, 0, 0, 0)
+        self.website = QWebEngineView()
+        layout.addWidget(self.website)
+        self.setLayout(layout)
         self.set_url(url)
 
+    @Property(str)
+    def url(self) -> str:
+        """
+        The url of the website widget
+
+        Returns:
+            str: The url
+        """
+        return self.get_url()
+
+    @url.setter
+    def url(self, url: str) -> None:
+        """
+        Set the url of the website widget
+
+        Args:
+            url (str): The url to set
+        """
+        self.set_url(url)
+
+    @Slot(str)
     def set_url(self, url: str) -> None:
         """
         Set the url of the website widget
@@ -35,7 +62,9 @@ class WebsiteWidget(BECWidget, QWebEngineView):
         """
         if not url:
             return
-        self.setUrl(QUrl(url))
+        if not isinstance(url, str):
+            return
+        self.website.setUrl(QUrl(url))
 
     def get_url(self) -> str:
         """
@@ -44,31 +73,34 @@ class WebsiteWidget(BECWidget, QWebEngineView):
         Returns:
             str: The current url
         """
-        return self.url().toString()
+        return self.website.url().toString()
 
+    @Slot()
     def reload(self):
         """
         Reload the website
         """
-        QWebEngineView.reload(self)
+        QWebEngineView.reload(self.website)
 
+    @Slot()
     def back(self):
         """
         Go back in the history
         """
-        QWebEngineView.back(self)
+        QWebEngineView.back(self.website)
 
+    @Slot()
     def forward(self):
         """
         Go forward in the history
         """
-        QWebEngineView.forward(self)
+        QWebEngineView.forward(self.website)
 
     def cleanup(self):
         """
         Cleanup the widget
         """
-        self.page().deleteLater()
+        self.website.page().deleteLater()
 
 
 if __name__ == "__main__":

bec_widgets/widgets/website/website_widget_plugin.py

@@ -33,7 +33,7 @@ class WebsiteWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Utils"
 
     def icon(self):
-        return designer_material_icon("travel_explore")
+        return designer_material_icon(WebsiteWidget.ICON_NAME)
 
     def includeFile(self):
         return "website_widget"

{bec_widgets-0.99.0.dist-info → bec_widgets-0.99.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.99.0
+Version: 0.99.8
 Summary: BEC Widgets
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec_widgets/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec_widgets
@@ -11,7 +11,7 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.10
 Requires-Dist: bec-ipython-client>=2.21.4,~=2.21
 Requires-Dist: bec-lib>=2.21.4,~=2.21
-Requires-Dist: bec-qthemes~=0.0
+Requires-Dist: bec-qthemes>=0.4.2,~=0.4
 Requires-Dist: black~=24.0
 Requires-Dist: isort>=5.13.2,~=5.13
 Requires-Dist: pydantic~=2.0