Changeset 565 for branches

Timestamp:

09/20/12 14:55:38 (4 years ago)

Author:

mmckerns

Message:

enable toggle between 'expected' coord alignment and values-last alignment

File:

• branches/UQ/math/legacy/plot_data.py (modified) (11 diffs)

branches/UQ/math/legacy/plot_data.py

@@ -97 +97 @@
 
 #### plotting the cones ####
-def plot_cones(ax, data, slope, bounds, color='0.75', axis=-1):
+def plot_cones(ax, data, slope, bounds, color='0.75', axis=None):
   """plot double cones for a given dataset
 
@@ -116 +116 @@
     _cone = cone(datapt, top=True)
     if _cone:
-      X,Z,Y = swap(_cone, xs) # 'unswap' the axes
-      ax.plot_surface(X, Z,Y, rstride=1, cstride=1, color=color) 
+      X,Z,Y = swap(_cone, axis) # 'unswap' the axes
+      ax.plot_surface(X, Y,Z, rstride=1, cstride=1, color=color) 
     _cone = cone(datapt, top=False)
     if _cone:
-      X,Z,Y = swap(_cone, xs) # 'unswap' the axes
-      ax.plot_surface(X, Z,Y, rstride=1, cstride=1, color=color)
+      X,Z,Y = swap(_cone, axis) # 'unswap' the axes
+      ax.plot_surface(X, Y,Z, rstride=1, cstride=1, color=color)
   return ax
 
-def plot_data(ax, data, bounds, color='red', axis=-1):
+def plot_data(ax, data, bounds, color='red'):
   """plot datapoints for a given dataset
 
@@ -131 +131 @@
   bounds -- list of tuples of bounds for the plot; (lower,upper) for each axis
   color -- string name (or rbg value) of color to use for datapoints
-  axis -- the axis of the cone
 """
   strict = True # always respect the bounds
@@ -144 +143 @@
       pass  # don't plot if datapt is out of bounds
     else:
-      ax.plot([datapt[0]], [datapt[2]], [datapt[1]], \
+      ax.plot([datapt[0]], [datapt[1]], [datapt[2]], \
               color=color, marker='o', markersize=10)
   return ax
@@ -157 +156 @@
   # plot only within [lb,ub]
   ax.set_xlim3d(lb[0], ub[0])
-  ax.set_zlim3d(lb[1], ub[1])
-  ax.set_ylim3d(lb[2], ub[2]) # cone "center" axis
+  ax.set_ylim3d(lb[1], ub[1])
+  ax.set_zlim3d(lb[2], ub[2]) # cone "center" axis
   return ax
 
@@ -168 +167 @@
 """
   ax.set_xlabel(labels[0])
-  ax.set_zlabel(labels[1])
-  ax.set_ylabel(labels[2]) # cone "center" axis
+  ax.set_ylabel(labels[1])
+  ax.set_zlabel(labels[2]) # cone "center" axis
   return ax
 
@@ -189 +188 @@
   return coords, slope
 
-def reduce(alist, axis=-1):
-  """ reduce a n-member list to a (n-1)-member list
-
-  alist -- a list
-  axis -- selected member (an int) to remove
+def swap(alist, index=None):
+  """ swap the selected list element with the last element in alist
+
+  alist -- a list of objects
+  index -- the selected element
   """
-  if axis not in range(len(alist[:-1])):  # reduce the last axis
-    return alist[:-1] 
-  return alist[:axis] + alist[axis+1:]
-
-def swap(alist, axis=-1):
-  if axis not in range(len(alist)):  # don't swap an axis
+  if index not in range(len(alist)):  # don't swap an element
     return alist 
-  return alist[:axis] + alist[axis+1:] + alist[axis:axis+1]
+  return alist[:index] + alist[index+1:] + alist[index:index+1]
 
 
@@ -223 +217 @@
                     metavar="INT",default=None,
                     help="id # of axis to plot values NOT coords")
+  parser.add_option("-v","--vertical",action="store_true",dest="vertical",\
+                    default=False,help="always plot cones on vertical axis")
   parsed_opts, parsed_args = parser.parse_args()
 
@@ -262 +258 @@
     xs = None # don't plot values; plot values on 'x' axis with xs = 0
 
+  try: # always plot cones on vertical axis
+    vertical_cones = parsed_opts.vertical
+  except:
+    vertical_cones = False
+
   # ensure all terms of bounds and xyz are tuples
   for bound in bounds:
@@ -273 +274 @@
 
   # get coords (and values) for selected axes
-  coords, slope = get_coords(data, xs)  #FIXME: requires Y-value to be last
+  coords, slope = get_coords(data, xs)
   print "bounds: %s" % bounds
   print "slope: %s" % slope
@@ -290 +291 @@
   ax = Axes3D(fig)#,aspect='equal') 
   if xs in range(len(bounds)):  # we are replacing an axis
+    if vertical_cones:
+      # adjust slope, bounds, and data so cone axis is last 
+      slope = swap(slope, xs) 
+      bounds = swap(bounds, xs) 
+      coords = [swap(pt,xs) for pt in coords]
+      label = swap(label, xs)
+      xs = None
     plot_cones(ax, coords, slope, bounds, axis=xs)
-  plot_data(ax, coords, bounds, axis=xs)
+  plot_data(ax, coords, bounds)
  #clip_axes(ax, bounds)
   label_axes(ax, label)