Skip to content

Commit

Permalink
minor bugs for osx, and handling of invalid variables in dataset
Browse files Browse the repository at this point in the history
  • Loading branch information
maartenbreddels committed Oct 31, 2014
1 parent 37c2777 commit 4c65930
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion python/gavi/dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,10 @@ class Info(object):
local_dict = dict()
# dataset scope, there will be evaluated in order
for key, value in dataset.variables.items():
local_dict[key] = eval(dataset.variables[key], np.__dict__, local_dict)
try:
local_dict[key] = eval(dataset.variables[key], np.__dict__, local_dict)
except:
local_dict[key] = None
print "local vars", local_dict
local_dict.update(variables) # window scope
for key, value in dataset.columns.items():
Expand Down
4 changes: 2 additions & 2 deletions python/gavi/vaex/volumerendering.py
Original file line number Diff line number Diff line change
Expand Up @@ -786,8 +786,8 @@ def initializeGL(self):
glAttachObjectARB(self.program, f);


glClearColor(0.0, 0.0, 0.0, 1.0)
glClear(GL_COLOR_BUFFER_BIT)
#glClearColor(0.0, 0.0, 0.0, 1.0)
#glClear(GL_COLOR_BUFFER_BIT)

print bool(glGenFramebuffers)
self.fbo = glGenFramebuffers(1)
Expand Down

0 comments on commit 4c65930

Please sign in to comment.