[Yt-svn] yt-commit r823 - trunk/yt/raven

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Sun Oct 12 09:20:20 2008
New Revision: 823
URL: http://yt.spacepope.org/changeset/823

Log:
Added fixed resolution plots, to be added from Fixed Res buffers.



Modified:
   trunk/yt/raven/FixedResolution.py
   trunk/yt/raven/PlotCollection.py
   trunk/yt/raven/PlotTypes.py

Modified: trunk/yt/raven/FixedResolution.py
==============================================================================
--- trunk/yt/raven/FixedResolution.py	(original)
+++ trunk/yt/raven/FixedResolution.py	Sun Oct 12 09:20:20 2008
@@ -37,10 +37,12 @@
         the buffer should have pixel boundary antialiasing.
         """
         self.data_source = data_source
+        self.pf = data_source.pf
         self.bounds = bounds
         self.buff_size = buff_size
         self.antialias = antialias
         self.data = {}
+        self.axis = data_source.axis
 
     def __getitem__(self, item):
         if item in self.data: return self.data[item]

Modified: trunk/yt/raven/PlotCollection.py
==============================================================================
--- trunk/yt/raven/PlotCollection.py	(original)
+++ trunk/yt/raven/PlotCollection.py	Sun Oct 12 09:20:20 2008
@@ -346,6 +346,14 @@
         p["Axis"] = None
         return p
 
+    def add_fixed_resolution_plot(self, frb, field, center=None, use_colorbar=True,
+                      figure = None, axes = None, fig_size=None, **kwargs):
+        p = self._add_plot(PlotTypes.FixedResolutionPlot(frb, field,
+                         use_colorbar=use_colorbar, axes=axes, figure=figure,
+                         size=fig_size))
+        p["Axis"] = "na"
+        return p
+
     def _get_new_id(self):
         self.__id_counter += 1
         return self.__id_counter-1

Modified: trunk/yt/raven/PlotTypes.py
==============================================================================
--- trunk/yt/raven/PlotTypes.py	(original)
+++ trunk/yt/raven/PlotTypes.py	Sun Oct 12 09:20:20 2008
@@ -140,7 +140,7 @@
         canvas = engineVals["canvas"](self._figure)
         only_on_root(canvas.print_figure, fn)
         self["Type"] = self._type_name
-        self["GeneratedAt"] = self.data.hierarchy["CurrentTimeIdentifier"]
+        self["GeneratedAt"] = self.data.pf["CurrentTimeIdentifier"]
         return fn
 
     def _redraw_image(self):
@@ -399,7 +399,40 @@
     def selfSetup(self):
         pass
 
-    
+class FixedResolutionPlot(VMPlot):
+
+    # This is a great argument in favor of changing the name
+    # from VMPlot to something else
+
+    _type_name = "FixedResolution"
+    _projected = False
+
+    def _get_buff(self, width=None):
+        return self.data[self.axis_names["Z"]]
+
+    def autoset_label(self):
+        if self.datalabel != None:
+            self.colorbar.set_label(str(self.datalabel))
+            return
+        field_name = self.axis_names["Z"]
+        data_label = r"$\rm{%s}" % field_name.replace("_","\hspace{0.5}")
+        if lagos.fieldInfo.has_key(field_name):
+            if self._projected:
+                data_label += r"\/\/ (%s)" % (lagos.fieldInfo[field_name].get_projected_units())
+            else:
+                data_label += r"\/\/ (%s)" % (lagos.fieldInfo[field_name].get_units())
+        data_label += r"$"
+        if self.colorbar != None: self.colorbar.set_label(str(data_label))
+
+    def set_width(self, width, unit):
+        mylog.debug("Not changing FixedResolution width")
+        pass
+
+    def _refresh_display_width(self, width=None):
+        self._redraw_image()
+
+    def setup_domain_edges(self, *args, **kwargs):
+        return
 
 class SlicePlot(VMPlot):
     _type_name = "Slice"