Skip to content
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.

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

Corr plot module #220

Merged
merged 30 commits into from
Nov 23, 2020
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f61a696
fillDiagonal in correlation utils
IKrukov-HORIS Oct 28, 2020
8d5253b
corr.py module
IKrukov-HORIS Oct 28, 2020
879af8a
Removed format parameter
IKrukov-HORIS Oct 28, 2020
fd3d999
Removed _get_format method
IKrukov-HORIS Oct 28, 2020
6927fcd
_tooltip_spec without format parameter
IKrukov-HORIS Oct 28, 2020
4c079ab
flip = True by default
IKrukov-HORIS Oct 28, 2020
d1240b5
flip = True by default
IKrukov-HORIS Oct 28, 2020
53912e8
flip = True by default
IKrukov-HORIS Nov 10, 2020
04bbd2b
_set_diverging_palette renamed to _set_brewer_palette
IKrukov-HORIS Nov 10, 2020
791deef
Using API in build
IKrukov-HORIS Nov 10, 2020
9e6e822
Removed div arg
IKrukov-HORIS Nov 10, 2020
2d0eee9
layers creation deferred till build
IKrukov-HORIS Nov 10, 2020
6dbfcbd
Legend change: Correlation -> Corr
IKrukov-HORIS Nov 11, 2020
4e74f4c
Add fill_scale
IKrukov-HORIS Nov 11, 2020
0f51ad7
tiles implemented via geom_tile
IKrukov-HORIS Nov 11, 2020
f3495e0
Fixed tile implementation.
IKrukov-HORIS Nov 12, 2020
8e4c8e5
Fix height calculation
IKrukov-HORIS Nov 12, 2020
3aabfeb
coord_cartesian when tiles layer is active
IKrukov-HORIS Nov 16, 2020
84d893f
tiles width / height = 0.99
IKrukov-HORIS Nov 17, 2020
663666c
Additive expand 0.5
IKrukov-HORIS Nov 17, 2020
0116ad0
Set fill_diagonal in StatProto
IKrukov-HORIS Nov 17, 2020
7b240e9
Change parameter passing way and some defaults
IKrukov-HORIS Nov 18, 2020
35dda1e
correlation matrix examples
IKrukov-HORIS Nov 18, 2020
709fe1b
Fix typo in methods names
IKrukov-HORIS Nov 18, 2020
ce6aac2
Fix typo in demo
IKrukov-HORIS Nov 18, 2020
25c24b5
Demo layout fix
IKrukov-HORIS Nov 18, 2020
f821be6
brewer palette legend fix
IKrukov-HORIS Nov 19, 2020
80deb81
brewer palette legend fix in demo
IKrukov-HORIS Nov 19, 2020
6eb36e8
brewer palette example update
IKrukov-HORIS Nov 20, 2020
206be8f
add scale_fill_identity for tiles na values
IKrukov-HORIS Nov 23, 2020
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
Prev Previous commit
Next Next commit
_tooltip_spec without format parameter
  • Loading branch information
IKrukov-HORIS committed Nov 18, 2020
commit 6927fcd36c32095bd4e6411fb50e437f83a825ad
10 changes: 5 additions & 5 deletions python-package/lets_plot/bistro/corr.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def points(self, type=None, fill_diagonal=None):
"""

self._points_layer = geom_point(stat='corr', show_legend=self._show_legend, size_unit='x',
tooltips=self._tooltip_spec(None),
tooltips=self._tooltip_spec(),
type=self._get_type(type), fill_diagonal=fill_diagonal)

return self
Expand Down Expand Up @@ -109,9 +109,9 @@ def labels(self, type=None, fill_diagonal=None, map_size=False, color=None):
other_args['color'] = self._text_color
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happens with text's color if user adds 'tiles' after 'labels'?


self._labels_layer = geom_text(stat='corr', show_legend=self._show_legend,
tooltips=self._tooltip_spec(None),
tooltips=self._tooltip_spec(),
type=self._get_type(type), fill_diagonal=fill_diagonal,
na_value='', label_format=self.format,
na_value='', label_format=self._format,
size_unit = 'x', **other_args)

return self
Expand All @@ -135,7 +135,7 @@ def tiles(self, type=None, fill_diagonal=None):
self._text_color = 'white'

self._tiles_layer = geom_point(stat='corr', show_legend=self._show_legend, size_unit='x',
tooltips=self._tooltip_spec(None),
tooltips=self._tooltip_spec(),
type=self._get_type(type), fill_diagonal=fill_diagonal,
size=1.0, shape=15)

Expand Down Expand Up @@ -328,7 +328,7 @@ def _add_common_params(self, plot):

def _tooltip_spec(self):
return layer_tooltips(). \
format(field='@..corr..', format=self.format). \
format(field='@..corr..', format=self._format). \
line('@..corr..')

def _get_type(self, type):
Expand Down