Skip to content

Commit

Permalink
4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
marcomusy committed Oct 13, 2020
1 parent 8ffdbe6 commit 5d4e707
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 31 deletions.
13 changes: 10 additions & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,22 @@ include vedo/textures/*
include vedo/fonts/*

include examples/*
include vedo/examples/*
include examples/advanced/*
include examples/basic/*
include examples/other/*
include examples/other/dolfin/*
include examples/other/trimesh/*
include examples/pyplot/*
include examples/simulations/*
include examples/tetmesh/*
include examples/volumetric/*

include vedo/examples/*
include vedo/examples/advanced/*
include vedo/examples/basic/*

include vedo/examples/other/*
include vedo/examples/other/dolfin/*
include vedo/examples/other/trimesh/*

include vedo/examples/pyplot/*
include vedo/examples/simulations/*
include vedo/examples/tetmesh/*
Expand Down
38 changes: 20 additions & 18 deletions README.md

Large diffs are not rendered by default.

Empty file modified examples/advanced/interpolateMeshArray.py
100755 → 100644
Empty file.
Empty file modified examples/pyplot/whiskers.py
100755 → 100644
Empty file.
8 changes: 5 additions & 3 deletions vedo/addons.py
Original file line number Diff line number Diff line change
Expand Up @@ -541,9 +541,11 @@ def addScalarBar3D(

if isinstance(obj, Points):
lut = obj.mapper().GetLookupTable()
if not lut:
print("Error in addScalarBar3D: mesh has no lookup table.", [obj])
return None
if not lut or lut.GetTable().GetNumberOfTuples() == 0:
obj.cmap('jet_r') # create the most similar to the default
# todo: grab the auto created default LUT (but where is it?)
# cells or points?
lut = obj.mapper().GetLookupTable()
vmin, vmax = lut.GetRange()

elif isinstance(obj, (Volume, TetMesh)):
Expand Down
2 changes: 1 addition & 1 deletion vedo/colors.py
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ def buildPalette(color1, color2, N, hsv=True):
if hsv:
c = np.array(hsv2rgb(c))
cols.append(c)
return cols
return np.array(cols)


def buildLUT(colorlist,
Expand Down
2 changes: 1 addition & 1 deletion vedo/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# Set a default for the font to be used for axes, comments etc.
defaultFont = 'Normografo'
# Options are:
# Biysk, Bongas, Calco, Comae, Kanopus, Glasgo, Inversionz, LionelOfParis,
# Biysk, Bongas, Calco, Comae, Kanopus, Glasgo, LionelOfParis,
# LogoType, Normografo, Quikhand, SmartCouric, Theemim, VictorMono, VTK.
fontIsMono = True # mono means that all letters occupy the same space slot horizontally
fontHSpacing = 1 # an horizontal stretching factor (affects both letters and words)
Expand Down
5 changes: 0 additions & 5 deletions vedo/shapes.py
Original file line number Diff line number Diff line change
Expand Up @@ -2458,11 +2458,6 @@ def __init__(self,
mono = True
fscale = 0.75
lspacing = 0.1
# elif font=='Inversionz':
# mono = True
# fscale = 0.9
# lspacing = 0.1
# dotsep = "~^.~ "
elif font=='Kanopus':
mono = False
fscale = 0.75
Expand Down

0 comments on commit 5d4e707

Please sign in to comment.