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

Add TriMesh element #2143

Merged
merged 28 commits into from Dec 14, 2017
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
432ab07
Added TriMesh element
Nov 22, 2017
c1e60ad
Simplified TriMesh path generation
Nov 22, 2017
c095010
Declared TriMesh.group constant
Nov 22, 2017
75b3676
Simplified TriMesh edgepaths code
Nov 23, 2017
21451e6
Improvements for TriMesh
Nov 24, 2017
63067ce
Added support for filled TriMesh simplices
Nov 24, 2017
c6e9146
Defined default TriMesh styling
Nov 24, 2017
3f61cca
Small fix for TriMesh path computation
Nov 24, 2017
bcbb7bf
Added TriMesh reference entries
Nov 24, 2017
bdbb3cc
Added tests and small fixes for TriMesh element
Nov 24, 2017
58b98b0
Various TriMesh improvements
Nov 28, 2017
2dcbc26
Added trimesh rasterization and generalized API
Nov 28, 2017
d16a637
Split matplotlib paths before displaying them
Dec 3, 2017
d5a6ea6
Optimized static bokeh Graph plots
Dec 3, 2017
3f2a28d
Fixed various Graph edgepaths bugs
Dec 3, 2017
d8cfd66
Restored default datashading aggregator
Dec 3, 2017
1c9585d
Updated unit test
Dec 3, 2017
9f9b569
Improved datashader dimension lookup
Dec 7, 2017
b7f04ae
Added interpolation support for trimesh rasterization
Dec 7, 2017
635a8ce
Improved datashader operations
Dec 8, 2017
cf0d3c4
Improvements for bokeh GraphPlot
Dec 8, 2017
2243bf6
Cleaned up datashader class hierarchy
Dec 8, 2017
586a506
Handled empty TriMesh
Dec 9, 2017
3480316
Addressed various TriMesh review comments
Dec 14, 2017
ad2fcca
Fixed Dataset.add_dimension dtype bug
Dec 14, 2017
74f961a
Fixed datashade operation docstrings
Dec 14, 2017
65a44bd
Added vertex averaging to TriMesh plots
Dec 14, 2017
ddf38cd
Revised TriMesh reference notebooks
Dec 14, 2017
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.
+5 −1
Diff settings

Always

Just for now

Fixed Dataset.add_dimension dtype bug

  • Loading branch information...
Philipp Rudiger Philipp Rudiger
Philipp Rudiger authored and Philipp Rudiger committed Dec 14, 2017
commit ad2fcca9e2da2273eeef842d87db76d2f9088d69
@@ -275,7 +275,11 @@ def add_dimension(self, dimension, dim_pos, dim_val, vdim=False, **kwargs):
dims.insert(dim_pos, dimension)
dimensions = dict(kdims=dims)

data = self.interface.add_dimension(self, dimension, dim_pos, dim_val, vdim)
if issubclass(self.interface, ArrayInterface) and np.asarray(dim_val).dtype != self.data.dtype:
element = self.clone(datatype=['pandas', 'dictionary'])
data = element.interface.add_dimension(element, dimension, dim_pos, dim_val, vdim)
else:
data = self.interface.add_dimension(self, dimension, dim_pos, dim_val, vdim)
return self.clone(data, **dimensions)


ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.