Skip to content

Disable projected click, fix time values #1800

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
doutriaux1 merged 4 commits into from
Feb 3, 2016
Merged

Disable projected click, fix time values #1800

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
568d66d
Disable data viewing for projection
Jan 20, 2016
0c3c70e
Now properly selects current time value instead of first time value
Jan 21, 2016
db0d244
Properly uses time axis
Jan 21, 2016
78c96b8
Made sure that the time value will be grabbed, regardless of number o…
Jan 21, 2016
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 Packages/vcs/Lib/VTKPlots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,27 +124,16 @@ def leftButtonPressEvent(self, obj, event):
continue
t = vcs.elements["template"][d.template]
gm = vcs.elements[d.g_type][d.g_name]
if gm.projection != "linear":
return
if t.data.x1 <= x <= t.data.x2 and t.data.y1 <= y <= t.data.y2:
# Ok we clicked within template
if numpy.allclose(gm.datawc_x1, 1.e20):
x1 = d.array[0].getAxis(-1)[0]
else:
x1 = gm.datawc_x1
if numpy.allclose(gm.datawc_x2, 1.e20):
x2 = d.array[0].getAxis(-1)[-1]
else:
x2 = gm.datawc_x2
if numpy.allclose(gm.datawc_y1, 1.e20):
y1 = d.array[0].getAxis(-2)[0]
else:
y1 = gm.datawc_y1
if numpy.allclose(gm.datawc_y2, 1.e20):
y2 = d.array[0].getAxis(-2)[-1]
else:
y2 = gm.datawc_y2
x1, x2, y1, y2 = vcs.utils.getworldcoordinates(gm,
d.array[0].getAxis(-1),
d.array[0].getAxis(-2))

X = (x - t.data.x1) / (t.data.x2 - t.data.x1) * (x2 - x1) + x1
Y = (y - t.data.y1) / (t.data.y2 - t.data.y1) * (y2 - y1) + y1

# Ok we now have the X/Y values we need to figure out the
# indices
try:
Expand All @@ -157,7 +146,16 @@ def leftButtonPressEvent(self, obj, event):
except:
V = d.array[0][..., I]
if isinstance(V, numpy.ndarray):
V = V.flat[0]
# Grab the appropriate time slice
if self.canvas.animate.created():
t = self.canvas.animate.frame_num
try:
taxis = V.getTime()
V = V(time=taxis[t % len(taxis)]).flat[0]
except:
V = V.flat[0]
else:
V = V.flat[0]
try:
st += "Var: %s\nX[%i] = %g\nY[%i] = %g\nValue: %g" % (
d.array[0].id, I, X, J, Y, V)
Expand Down
⚡