[yt-svn] commit/yt: ngoldbaum: Merged in mzingale/yt/yt-3.0 (pull request #922)

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/3c7983a318d5/
Changeset:   3c7983a318d5
Branch:      yt-3.0
User:        ngoldbaum
Date:        2014-05-24 23:31:18
Summary:     Merged in mzingale/yt/yt-3.0 (pull request #922)

fix transfer function tick labels
Affected #:  1 file

diff -r 4702092b7f7dd94137bc5efda428a62eb0532f04 -r 3c7983a318d58fcd39b65eaf24198a3d03e0cb19 yt/visualization/volume_rendering/transfer_functions.py
--- a/yt/visualization/volume_rendering/transfer_functions.py
+++ b/yt/visualization/volume_rendering/transfer_functions.py
@@ -466,10 +466,10 @@
         ax.fill_between(np.arange(self.alpha.y.size), self.alpha.x.size * self.alpha.y, y2=self.alpha.x.size, color='white')
         ax.set_xlim(0, self.alpha.x.size)
         xticks = np.arange(np.ceil(self.alpha.x[0]), np.floor(self.alpha.x[-1]) + 1, 1) - self.alpha.x[0]
-        xticks *= self.alpha.x.size / (self.alpha.x[-1] - self.alpha.x[0])
+        xticks *= (self.alpha.x.size-1) / (self.alpha.x[-1] - self.alpha.x[0])
         ax.xaxis.set_ticks(xticks)
         def x_format(x, pos):
-            return "%.1f" % (x * (self.alpha.x[-1] - self.alpha.x[0]) / (self.alpha.x.size) + self.alpha.x[0])
+            return "%.1f" % (x * (self.alpha.x[-1] - self.alpha.x[0]) / (self.alpha.x.size-1) + self.alpha.x[0])
         ax.xaxis.set_major_formatter(FuncFormatter(x_format))
         yticks = np.linspace(0,1,5) * self.alpha.y.size
         ax.yaxis.set_ticks(yticks)
@@ -507,12 +507,12 @@
         ax.fill_between(np.arange(self.alpha.y.size), self.alpha.x.size * self.alpha.y, y2=self.alpha.x.size, color='white')
         ax.set_xlim(0, self.alpha.x.size)
         xticks = np.arange(np.ceil(self.alpha.x[0]), np.floor(self.alpha.x[-1]) + 1, 1) - self.alpha.x[0]
-        xticks *= self.alpha.x.size / (self.alpha.x[-1] - self.alpha.x[0])
+        xticks *= (self.alpha.x.size-1) / (self.alpha.x[-1] - self.alpha.x[0])
         if len(xticks) > 5:
             xticks = xticks[::len(xticks)/5]
         ax.xaxis.set_ticks(xticks)
         def x_format(x, pos):
-            return "%.1f" % (x * (self.alpha.x[-1] - self.alpha.x[0]) / (self.alpha.x.size) + self.alpha.x[0])
+            return "%.1f" % (x * (self.alpha.x[-1] - self.alpha.x[0]) / (self.alpha.x.size-1) + self.alpha.x[0])
         ax.xaxis.set_major_formatter(FuncFormatter(x_format))
         yticks = np.linspace(0,1,5) * self.alpha.y.size
         ax.yaxis.set_ticks(yticks)
@@ -561,16 +561,18 @@
 
         # Display colobar values
         xticks = np.arange(np.ceil(self.alpha.x[0]), np.floor(self.alpha.x[-1]) + 1, 1) - self.alpha.x[0]
-        xticks *= self.alpha.x.size / (self.alpha.x[-1] - self.alpha.x[0])
+        xticks *= (self.alpha.x.size-1) / (self.alpha.x[-1] - self.alpha.x[0])
         if len(xticks) > 5:
             xticks = xticks[::len(xticks)/5]
 
         # Add colorbar limits to the ticks (May not give ideal results)
         xticks = np.append(visible[0], xticks)
         xticks = np.append(visible[-1], xticks)
+        # remove dupes
+        xticks = list(set(xticks))
         ax.yaxis.set_ticks(xticks)
         def x_format(x, pos):
-            val = x * (self.alpha.x[-1] - self.alpha.x[0]) / (self.alpha.x.size) + self.alpha.x[0]
+            val = x * (self.alpha.x[-1] - self.alpha.x[0]) / (self.alpha.x.size-1) + self.alpha.x[0]
             if abs(val) < 1.e-3 or abs(val) > 1.e4:
                 e = np.floor(np.log10(abs(val)))
                 return r"${:.2f}\times 10^{:d}$".format(val/10.0**e, int(e))

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.