[yt-svn] commit/yt: 3 new changesets

[commits-noreply at bitbucket.org]

3 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/3345e4da8622/
Changeset:   3345e4da8622
User:        MatthewTurk
Date:        2017-06-12 16:19:57+00:00
Summary:     Split up help printing per event.
Affected #:  1 file

diff -r dc5db14f8d317185cad8648b3c0c8fc488fb7b34 -r 3345e4da86228fb6110c4f3f4fdff75aa126a67f yt/visualization/volume_rendering/input_events.py
--- a/yt/visualization/volume_rendering/input_events.py
+++ b/yt/visualization/volume_rendering/input_events.py
@@ -333,8 +333,8 @@
         key_map[glfw.__dict__.get(key)] = key[4:]
     for cb in (f for f in sorted(event_coll.key_callbacks)
                if isinstance(f, tuple)):
-        print("%s - %s" % (key_map[cb[0]],
-                           event_coll.key_callbacks[cb][0].__doc__))
+        for e in event_coll.key_callbacks[cb]:
+            print("%s - %s" % (key_map[cb[0]], e.__doc__))
     return False
 
 @register_event("nplane_closer")


https://bitbucket.org/yt_analysis/yt/commits/cfb9c8971fbc/
Changeset:   cfb9c8971fbc
User:        MatthewTurk
Date:        2017-06-12 16:20:08+00:00
Summary:     If handed a YTQuantity, turn into a float value.
Affected #:  1 file

diff -r 3345e4da86228fb6110c4f3f4fdff75aa126a67f -r cfb9c8971fbc99367776f84e395c082e207c90b2 yt/visualization/volume_rendering/shader_objects.py
--- a/yt/visualization/volume_rendering/shader_objects.py
+++ b/yt/visualization/volume_rendering/shader_objects.py
@@ -23,6 +23,7 @@
     YTInvalidShaderType, \
     YTUnknownUniformKind, \
     YTUnknownUniformSize
+from yt.units.yt_array import YTQuantity
 
 known_shaders = {}
 
@@ -83,7 +84,7 @@
         # but we will not be using that here.
         if isinstance(value, int):
             return GL.glUniform1i
-        elif isinstance(value, float):
+        elif isinstance(value, (YTQuantity, float)):
             return GL.glUniform1f
         else:
             kind = value.dtype.kind


https://bitbucket.org/yt_analysis/yt/commits/08aa2c014d88/
Changeset:   08aa2c014d88
User:        ngoldbaum
Date:        2017-06-14 16:12:18+00:00
Summary:     Merge pull request #1451 from MatthewTurk/idv_fixes

Two minor IDV fixes for interactivity and non-logged fields
Affected #:  2 files

diff -r dc5db14f8d317185cad8648b3c0c8fc488fb7b34 -r 08aa2c014d88854ea385b0a14166170220017619 yt/visualization/volume_rendering/input_events.py
--- a/yt/visualization/volume_rendering/input_events.py
+++ b/yt/visualization/volume_rendering/input_events.py
@@ -333,8 +333,8 @@
         key_map[glfw.__dict__.get(key)] = key[4:]
     for cb in (f for f in sorted(event_coll.key_callbacks)
                if isinstance(f, tuple)):
-        print("%s - %s" % (key_map[cb[0]],
-                           event_coll.key_callbacks[cb][0].__doc__))
+        for e in event_coll.key_callbacks[cb]:
+            print("%s - %s" % (key_map[cb[0]], e.__doc__))
     return False
 
 @register_event("nplane_closer")

diff -r dc5db14f8d317185cad8648b3c0c8fc488fb7b34 -r 08aa2c014d88854ea385b0a14166170220017619 yt/visualization/volume_rendering/shader_objects.py
--- a/yt/visualization/volume_rendering/shader_objects.py
+++ b/yt/visualization/volume_rendering/shader_objects.py
@@ -23,6 +23,7 @@
     YTInvalidShaderType, \
     YTUnknownUniformKind, \
     YTUnknownUniformSize
+from yt.units.yt_array import YTQuantity
 
 known_shaders = {}
 
@@ -83,7 +84,7 @@
         # but we will not be using that here.
         if isinstance(value, int):
             return GL.glUniform1i
-        elif isinstance(value, float):
+        elif isinstance(value, (YTQuantity, float)):
             return GL.glUniform1f
         else:
             kind = value.dtype.kind

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.