Changeset 17502

Timestamp:

03/20/14 10:56:07 (12 years ago)

Author:

cborstad

Message:

BUG: instantiation of pairoptions in plotoptions

Location:

issm/trunk-jpl/src/m

Files:

• classes/plotoptions.py (modified) (2 diffs)
• plot/plotmodel.py (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/plotoptions.py

@@ -41 +41 @@
 
                 #go through args and build list (like pairoptions)
-                rawoptions=pairoptions(*arg)
+                rawoptions=pairoptions.pairoptions(*arg)
                 numoptions=len(arg)/2
                 rawlist=[] # cannot be a dict since they do not support duplicate keys
@@ -69 +69 @@
                 #self.list=defaultdict(dict)
                 for i in xrange(numberofplots):
-                        self.list[i]=pairoptions()
+                        self.list[i]=pairoptions.pairoptions()
 
                 #process plot options

issm/trunk-jpl/src/m/plot/plotmodel.py

@@ -1 +1 @@
 import numpy as npy
+from plotoptions import plotoptions
 
 try:
@@ -6 +7 @@
         print "could not import pylab, matplotlib has not been installed, no plotting capabilities enabled"
 
-from plotoptions import plotoptions
 from plot_manager import plot_manager
 from math import ceil, sqrt