Skip to content

[ENH] Scatter Plot Graph: legend opacity #2819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lanzagar merged 2 commits into from
Dec 11, 2017
Merged

[ENH] Scatter Plot Graph: legend opacity #2819

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e7bd83
Scatter Plot Graph: remove duplicate code
jerneju Dec 6, 2017
fb1537a
Scatter Plot Graph: legend opacity
jerneju Dec 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions Orange/widgets/visualize/owscatterplotgraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,12 @@ def _define_symbols():
_define_symbols()


def _make_pen(color, width):
p = QPen(color, width)
p.setCosmetic(True)
return p


class OWScatterPlotGraph(gui.OWComponent, ScaleScatterPlotData):
attr_color = ContextSetting(None, required=ContextSetting.OPTIONAL)
attr_label = ContextSetting(None, required=ContextSetting.OPTIONAL)
Expand Down Expand Up @@ -827,25 +833,20 @@ def compute_colors_sel(self, keep_colors=False):
if not keep_colors:
self.pen_colors_sel = self.brush_colors_sel = None

def make_pen(color, width):
p = QPen(color, width)
p.setCosmetic(True)
return p

nopen = QPen(Qt.NoPen)
if self.selection is not None:
sels = np.max(self.selection)
if sels == 1:
pens = [nopen,
make_pen(QColor(255, 190, 0, 255),
SELECTION_WIDTH + 1.)]
_make_pen(QColor(255, 190, 0, 255),
SELECTION_WIDTH + 1.)]
else:
# Start with the first color so that the colors of the
# additional attribute in annotation (which start with 0,
# unselected) will match these colors
palette = ColorPaletteGenerator(number_of_colors=sels + 1)
pens = [nopen] + \
[make_pen(palette[i + 1], SELECTION_WIDTH + 1.)
[_make_pen(palette[i + 1], SELECTION_WIDTH + 1.)
for i in range(sels)]
pen = [pens[a] for a in self.selection[self.valid_data]]
else:
Expand All @@ -858,19 +859,14 @@ def compute_colors(self, keep_colors=False):
self.pen_colors = self.brush_colors = None
self.get_color()

def make_pen(color, width):
p = QPen(color, width)
p.setCosmetic(True)
return p

subset = None
if self.subset_indices:
subset = np.array([ex.id in self.subset_indices
for ex in self.data[self.valid_data]])

if self.attr_color is None: # same color
color = self.plot_widget.palette().color(OWPalette.Data)
pen = [make_pen(color, 1.5)] * self.n_points
pen = [_make_pen(color, 1.5)] * self.n_points
if subset is not None:
brush = [(QBrush(QColor(128, 128, 128, 0)),
QBrush(QColor(128, 128, 128, 255)))[s]
Expand All @@ -896,7 +892,7 @@ def make_pen(color, width):
np.full((self.n_points, 1), self.alpha_value, dtype=int)])
self.pen_colors *= 100
self.pen_colors //= self.DarkerValue
self.pen_colors = [make_pen(QColor(*col), 1.5)
self.pen_colors = [_make_pen(QColor(*col), 1.5)
for col in self.pen_colors.tolist()]
if subset is not None:
self.brush_colors[:, 3] = 0
Expand All @@ -916,7 +912,7 @@ def make_pen(color, width):
colors = np.r_[palette.getRGB(np.arange(n_colors)),
[[128, 128, 128]]]
pens = np.array(
[make_pen(QColor(*col).darker(self.DarkerValue), 1.5)
[_make_pen(QColor(*col).darker(self.DarkerValue), 1.5)
for col in colors])
self.pen_colors = pens[c_data]
alpha = self.alpha_value if subset is None else 255
Expand Down Expand Up @@ -1064,10 +1060,12 @@ def make_color_legend(self):
palette = self.discrete_palette
for i, value in enumerate(self.attr_color.values):
color = QColor(*palette.getRGB(i))
brush = color.lighter(self.DarkerValue)
pen = _make_pen(color.darker(self.DarkerValue), 1.5)
color.setAlpha(self.alpha_value if self.subset_indices is None else 255)
brush = QBrush(color)
self.legend.addItem(
ScatterPlotItem(
pen=color, brush=brush, size=10,
pen=pen, brush=brush, size=10,
symbol=self.CurveSymbols[i] if use_shape else "o"),
escape(value))
else:
Expand Down