Merge pull request #2752 from JakaKokosar/PaintData

Add option to adjust symbol size

Author: lanzagar

Orange/widgets/data/owpaintdata.py

@@ -759,6 +759,8 @@ class Outputs:
 
     brushRadius = Setting(75)
     density = Setting(7)
+    symbol_size = Setting(10)
+
     #: current data array (shape=(N, 3)) as presented on the output
     data = Setting(None, schema_only=True)
     labels = Setting(["C1", "C2"], schema_only=True)
@@ -922,6 +924,14 @@ def _init_ui(self):
         )
 
         form.addRow("Intensity:", slider)
+
+        slider = gui.hSlider(
+            indBox, self, "symbol_size", None, minValue=1, maxValue=100,
+            createLabel=False, callback=self.set_symbol_size
+        )
+
+        form.addRow("Symbol:", slider)
+
         self.btResetToInput = gui.button(
             tBox, self, "Reset to Input Data", self.reset_to_input)
         self.btResetToInput.setDisabled(True)
@@ -964,6 +974,10 @@ def _init_ui(self):
 
         self.set_dimensions()
 
+    def set_symbol_size(self):
+        if self._scatter_item:
+            self._scatter_item.setSize(self.symbol_size)
+
     def set_dimensions(self):
         if self.hasAttr2:
             self.plot.setYRange(0, 1, padding=0.01)
@@ -1235,10 +1249,13 @@ def pen(color):
 
         colors = self.colors[self.__buffer[:, 2]]
         pens = [pen(c) for c in colors]
+        brushes = [QBrush(c) for c in colors]
+
         self._scatter_item = pg.ScatterPlotItem(
-            x, y, symbol="+", pen=pens
+            x, y, symbol="+", brush=brushes, pen=pens
         )
         self.plot.addItem(self._scatter_item)
+        self.set_symbol_size()
 
     def _attr_name_changed(self):
         self.plot.getAxis("bottom").setLabel(self.attr1)