Customizable plot: no need for QApplication at import

Author: VesnaT

Orange/widgets/visualize/owbarplot.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Tuple, Union
+from typing import List, Optional, Tuple, Union, Dict
 from functools import lru_cache
 from xml.sax.saxutils import escape
 
@@ -27,7 +27,7 @@
 from Orange.widgets.utils.state_summary import format_summary_details
 from Orange.widgets.visualize.owscatterplotgraph import LegendItem
 from Orange.widgets.visualize.utils.customizableplot import Updater, \
-    BaseParameterSetter as Setter
+    CommonParameterSetter
 from Orange.widgets.visualize.utils.plotutils import AxisItem, \
     HelpEventDelegate
 from Orange.widgets.widget import OWWidget, Input, Output, Msg
@@ -65,40 +65,79 @@ def mouseClickEvent(self, ev):
             ev.accept()
 
 
-class BarPlotGraph(gui.OWComponent, pg.PlotWidget, Setter):
+class ParameterSetter(CommonParameterSetter):
     GRID_LABEL, SHOW_GRID_LABEL = "Gridlines", "Show"
     DEFAULT_ALPHA_GRID, DEFAULT_SHOW_GRID = 80, True
     BOTTOM_AXIS_LABEL, IS_VERTICAL_LABEL = "Bottom axis", "Vertical tick text"
-    initial_settings = {
-        Setter.LABELS_BOX: {
-            Setter.FONT_FAMILY_LABEL: Updater.FONT_FAMILY_SETTING,
-            Setter.TITLE_LABEL: Updater.FONT_SETTING,
-            Setter.AXIS_TITLE_LABEL: Updater.FONT_SETTING,
-            Setter.AXIS_TICKS_LABEL: Updater.FONT_SETTING,
-            Setter.LEGEND_LABEL: Updater.FONT_SETTING,
-        },
-        Setter.ANNOT_BOX: {
-            Setter.TITLE_LABEL: {Setter.TITLE_LABEL: ("", "")},
-        },
-        Setter.PLOT_BOX: {
-            GRID_LABEL: {
-                SHOW_GRID_LABEL: (None, True),
-                Updater.ALPHA_LABEL: (range(0, 255, 5), DEFAULT_ALPHA_GRID),
+
+    def __init__(self, master):
+        self.grid_settings: Dict = None
+        self.master: BarPlotGraph = master
+        super().__init__()
+
+    def update_setters(self):
+        self.grid_settings = {
+            Updater.ALPHA_LABEL: self.DEFAULT_ALPHA_GRID,
+            self.SHOW_GRID_LABEL: self.DEFAULT_SHOW_GRID,
+        }
+
+        self.initial_settings = {
+            self.LABELS_BOX: {
+                self.FONT_FAMILY_LABEL: self.FONT_FAMILY_SETTING,
+                self.TITLE_LABEL: self.FONT_SETTING,
+                self.AXIS_TITLE_LABEL: self.FONT_SETTING,
+                self.AXIS_TICKS_LABEL: self.FONT_SETTING,
+                self.LEGEND_LABEL: self.FONT_SETTING,
+            },
+            self.ANNOT_BOX: {
+                self.TITLE_LABEL: {self.TITLE_LABEL: ("", "")},
             },
-            BOTTOM_AXIS_LABEL: {
-                IS_VERTICAL_LABEL: (None, True),
+            self.PLOT_BOX: {
+                self.GRID_LABEL: {
+                    self.SHOW_GRID_LABEL: (None, True),
+                    Updater.ALPHA_LABEL: (range(0, 255, 5),
+                                          self.DEFAULT_ALPHA_GRID),
+                },
+                self.BOTTOM_AXIS_LABEL: {
+                    self.IS_VERTICAL_LABEL: (None, True),
+                },
             },
-        },
-    }
+        }
+
+        def update_grid(**settings):
+            self.grid_settings.update(**settings)
+            self.master.showGrid(y=self.grid_settings[self.SHOW_GRID_LABEL],
+                          alpha=self.grid_settings[Updater.ALPHA_LABEL] / 255)
+
+        def update_bottom_axis(**settings):
+            axis = self.master.getAxis("bottom")
+            axis.setRotateTicks(settings[self.IS_VERTICAL_LABEL])
+
+        self._setters[self.PLOT_BOX] = {
+            self.GRID_LABEL: update_grid,
+            self.BOTTOM_AXIS_LABEL: update_bottom_axis,
+        }
+
+    @property
+    def title_item(self):
+        return self.master.getPlotItem().titleLabel
+
+    @property
+    def axis_items(self):
+        return [value["item"] for value in
+                self.master.getPlotItem().axes.values()]
+
+    @property
+    def legend_items(self):
+        return self.master.legend.items
+
+
+class BarPlotGraph(gui.OWComponent, pg.PlotWidget):
     selection_changed = Signal(list)
     bar_width = 0.8
 
     def __init__(self, master, parent=None):
         gui.OWComponent.__init__(self, master)
-        self.grid_settings = {
-            Updater.ALPHA_LABEL: self.DEFAULT_ALPHA_GRID,
-            self.SHOW_GRID_LABEL: self.DEFAULT_SHOW_GRID,
-        }
         self.selection = []
         self.master: OWBarPlot = master
         self.state: int = SELECT
@@ -115,14 +154,17 @@ def __init__(self, master, parent=None):
         self.hideAxis("bottom")
         self.getPlotItem().buttonsHidden = True
         self.getPlotItem().setContentsMargins(10, 0, 0, 10)
-        self.showGrid(y=self.DEFAULT_SHOW_GRID,
-                      alpha=self.DEFAULT_ALPHA_GRID / 255)
         self.getViewBox().setMouseMode(pg.ViewBox.PanMode)
         self.legend = self._create_legend()
 
         self.tooltip_delegate = HelpEventDelegate(self.help_event)
         self.scene().installEventFilter(self.tooltip_delegate)
 
+        self.parameter_setter = ParameterSetter(self)
+
+        self.showGrid(y=self.parameter_setter.DEFAULT_SHOW_GRID,
+                      alpha=self.parameter_setter.DEFAULT_ALPHA_GRID / 255)
+
     def _create_legend(self):
         legend = LegendItem()
         legend.setParentItem(self.getViewBox())
@@ -140,7 +182,8 @@ def update_legend(self):
             )
             self.legend.addItem(dot, escape(text))
             self.legend.show()
-        Updater.update_legend_font(self.legend.items, **self.legend_settings)
+        Updater.update_legend_font(self.legend.items,
+                                   **self.parameter_setter.legend_settings)
 
     def reset_graph(self):
         self.clear()
@@ -275,33 +318,6 @@ def help_event(self, ev: QGraphicsSceneHelpEvent):
         else:
             return False
 
-    @property
-    def title_item(self):
-        return self.getPlotItem().titleLabel
-
-    @property
-    def axis_items(self):
-        return [value["item"] for value in self.getPlotItem().axes.values()]
-
-    @property
-    def legend_items(self):
-        return self.legend.items
-
-    def update_setters(self):
-        def update_grid(**settings):
-            self.grid_settings.update(**settings)
-            self.showGrid(y=self.grid_settings[self.SHOW_GRID_LABEL],
-                          alpha=self.grid_settings[Updater.ALPHA_LABEL] / 255)
-
-        def update_bottom_axis(**settings):
-            axis = self.getAxis("bottom")
-            axis.setRotateTicks(settings[self.IS_VERTICAL_LABEL])
-
-        self._setters[self.PLOT_BOX] = {
-            self.GRID_LABEL: update_grid,
-            self.BOTTOM_AXIS_LABEL: update_bottom_axis,
-        }
-
 
 class OWBarPlot(OWWidget):
     name = "Bar Plot"
@@ -353,7 +369,9 @@ def __init__(self):
         self.__pending_selection = self.selection
 
         self.setup_gui()
-        VisualSettingsDialog(self, BarPlotGraph.initial_settings)
+        VisualSettingsDialog(
+            self, self.graph.parameter_setter.initial_settings
+        )
 
     def setup_gui(self):
         self._add_graph()
@@ -613,7 +631,7 @@ def send_report(self):
         self.report_plot()
 
     def set_visual_settings(self, key: KeyType, value: ValueType):
-        self.graph.set_parameter(key, value)
+        self.graph.parameter_setter.set_parameter(key, value)
         self.visual_settings[key] = value
 
     def sizeHint(self):  # pylint: disable=no-self-use

Orange/widgets/visualize/tests/test_owbarplot.py

@@ -311,36 +311,40 @@ def test_visual_settings(self):
         key, value = ("Fonts", "Title", "Italic"), True
         self.widget.set_visual_settings(key, value)
         font.setPointSize(20)
-        self.assertFontEqual(graph.title_item.item.font(), font)
+        self.assertFontEqual(
+            graph.parameter_setter.title_item.item.font(), font
+        )
 
         key, value = ("Fonts", "Axis title", "Font size"), 16
         self.widget.set_visual_settings(key, value)
         key, value = ("Fonts", "Axis title", "Italic"), True
         self.widget.set_visual_settings(key, value)
         font.setPointSize(16)
-        for item in graph.axis_items:
+        for item in graph.parameter_setter.axis_items:
             self.assertFontEqual(item.label.font(), font)
 
         key, value = ("Fonts", "Axis ticks", "Font size"), 15
         self.widget.set_visual_settings(key, value)
         key, value = ("Fonts", "Axis ticks", "Italic"), True
         self.widget.set_visual_settings(key, value)
         font.setPointSize(15)
-        for item in graph.axis_items:
+        for item in graph.parameter_setter.axis_items:
             self.assertFontEqual(item.style["tickFont"], font)
 
         key, value = ("Fonts", "Legend", "Font size"), 14
         self.widget.set_visual_settings(key, value)
         key, value = ("Fonts", "Legend", "Italic"), True
         self.widget.set_visual_settings(key, value)
         font.setPointSize(14)
-        legend_item = list(graph.legend_items)[0]
+        legend_item = list(graph.parameter_setter.legend_items)[0]
         self.assertFontEqual(legend_item[1].item.font(), font)
 
         key, value = ("Annotations", "Title", "Title"), "Foo"
         self.widget.set_visual_settings(key, value)
-        self.assertEqual(graph.title_item.item.toPlainText(), "Foo")
-        self.assertEqual(graph.title_item.text, "Foo")
+        self.assertEqual(
+            graph.parameter_setter.title_item.item.toPlainText(), "Foo"
+        )
+        self.assertEqual(graph.parameter_setter.title_item.text, "Foo")
 
         key, value = ("Figure", "Gridlines", "Show"), False
         self.assertTrue(graph.getAxis("left").grid)