🖊️

Author: jonasvdd

plotly_resampler/figure_resampler/figure_resampler.py

@@ -149,3 +149,28 @@ def stop_server(self, warn: bool = True):
                 + "\t- 'show-dash' method was not called, or \n"
                 + "\t- the dash-server wasn't started with 'show_dash'"
             )
+
+    def register_update_graph_callback(
+        self, app: dash.Dash, graph_id: str, trace_updater_id: str
+    ):
+        """Register the :func:`construct_update_data` method as callback function to
+        the passed dash-app.
+
+        Parameters
+        ----------
+        app: Union[dash.Dash, JupyterDash]
+            The app in which the callback will be registered.
+        graph_id:
+            The id of the ``dcc.Graph``-component which withholds the to-be resampled
+            Figure.
+        trace_updater_id
+            The id of the ``TraceUpdater`` component. This component is leveraged by
+            ``FigureResampler`` to efficiently POST the to-be-updated data to the
+            front-end.
+
+        """
+        app.callback(
+            dash.dependencies.Output(trace_updater_id, "updateData"),
+            dash.dependencies.Input(graph_id, "relayoutData"),
+            prevent_initial_call=True,
+        )(self.construct_update_data)

plotly_resampler/figure_resampler/figure_resampler_interface.py

@@ -913,31 +913,6 @@ def construct_update_data(self, relayout_data: dict) -> List[dict]:
             layout_traces_list.append(trace_reduced)
         return layout_traces_list
 
-    def register_update_graph_callback(
-        self, app: dash.Dash, graph_id: str, trace_updater_id: str
-    ):
-        """Register the :func:`construct_update_data` method as callback function to
-        the passed dash-app.
-
-        Parameters
-        ----------
-        app: Union[dash.Dash, JupyterDash]
-            The app in which the callback will be registered.
-        graph_id:
-            The id of the ``dcc.Graph``-component which withholds the to-be resampled
-            Figure.
-        trace_updater_id
-            The id of the ``TraceUpdater`` component. This component is leveraged by
-            ``FigureResampler`` to efficiently POST the to-be-updated data to the
-            front-end.
-
-        """
-        app.callback(
-            dash.dependencies.Output(trace_updater_id, "updateData"),
-            dash.dependencies.Input(graph_id, "relayoutData"),
-            prevent_initial_call=True,
-        )(self.construct_update_data)
-
     @staticmethod
     def _re_matches(regex: re.Pattern, strings: Iterable[str]) -> List[str]:
         """Returns all the items in ``strings`` which regex.match(es) ``regex``."""

plotly_resampler/figure_resampler/figurewidget_resampler.py

@@ -73,7 +73,7 @@ def __init__(
         self._xaxis_list = self._re_matches(re.compile("xaxis\d*"), self._layout.keys())
         # edge case: an empty `go.Figure()` does not yet contain xaxis keys
         if not len(self._xaxis_list):
-            self._xaxis_list = ['xaxis']
+            self._xaxis_list = ["xaxis"]
 
         # Assign the the update-methods to the corresponding classes
         showspike_keys = [f"{xaxis}.showspikes" for xaxis in self._xaxis_list]
@@ -118,7 +118,7 @@ def _update_x_ranges(self, layout, *x_ranges):
 
                 # An update will take place for that trace
                 # -> save current xaxis range to _prev_layout
-                self._prev_layout[xaxis_str]['range'] = x_range
+                self._prev_layout[xaxis_str]["range"] = x_range
 
         if len(relayout_dict):
             # Construct the update data
@@ -135,7 +135,7 @@ def _update_x_ranges(self, layout, *x_ranges):
                 self.layout.update(update_data[0])
 
                 for xaxis_str in self._xaxis_list:
-                    if 'showspikes' in layout[xaxis_str]:
+                    if "showspikes" in layout[xaxis_str]:
                         self.layout[xaxis_str].pop("showspikes")
 
                 # Then update the data
@@ -177,8 +177,8 @@ def _update_spike_ranges(self, layout, *showspikes):
                 relayout_dict[f"{xaxis_str}.autorange"] = True
                 relayout_dict[f"{xaxis_str}.showspikes"] = showspike
                 # autorange -> we pop the xaxis range
-                if 'range' in layout[xaxis_str]:
-                    del layout[xaxis_str]['range']
+                if "range" in layout[xaxis_str]:
+                    del layout[xaxis_str]["range"]
 
         if len(relayout_dict):
             # An update will take place, save current layout to _prev_layout
@@ -209,6 +209,3 @@ def _update_spike_ranges(self, layout, *showspikes):
         elif self._print_verbose:
             self._relayout_hist.append(["showspikes", "initial call or showspikes"])
             self._relayout_hist.append("-" * 40)
-
-    # def show(self, *args, **kwargs):
-    #     super(go.FigureWidget, self).show(*args, **kwargs)

tests/test_figure_resampler.py

@@ -90,7 +90,7 @@ def test_add_trace_not_resampling(float_series):
 
 
 def test_add_scatter_trace_no_data():
-    fig = FigureResampler(go.Figure(), default_n_shown_samples=1000)
+    fig = FigureResampler(default_n_shown_samples=1000)
 
     # no x and y data
     fig.add_trace(go.Scatter())

tests/test_figurewidget_resampler.py

@@ -90,7 +90,7 @@ def test_add_trace_not_resampling(float_series):
 
 
 def test_add_scatter_trace_no_data():
-    fig = FigureWidgetResampler(go.Figure(), default_n_shown_samples=1000)
+    fig = FigureWidgetResampler(default_n_shown_samples=1000)
 
     # no x and y data
     fig.add_trace(go.Scatter())