Merge branch 'withAnaconda3' of github.com:SCECcode/ucvm_plotting into withAnaconda3

Author: meihuisu

dist/ucvm_plotting-0.0.6-py3-none-any.whl

@@ -275,7 +275,7 @@ def _plot_file(self) :
         self.getplotvals(mproperty)
 
         # Call the plot object.
-        p = Plot(None, None, None, None, 10, 10)
+        p = Plot(False, None, None, None, None, 10, 10)
 
         plt.axes([0.1,0.7,0.8,0.25])
 

dist/ucvm_plotting-0.0.6.tar.gz

@@ -54,17 +54,23 @@ class Plot:
     #  Initializes the Plot with a set of basic parameters. Use the
     #  addsubplot() method to add a sub-plot to the plot.
     #
+    #  @param subplots The plot can contain subplots
     #  @param title The title for the plot.
     #  @param xlabel The label to be displayed on the x-axis.
     #  @param ylabel The label for the y-axis.
     #  @param legend A legend to be displayed on the lower left of the plot.
     #  @param width The width of the plot in inches (dpi = 100).
     #  @param height The height of the plot in inches (dpi = 100).
-    def __init__(self, title = None, xlabel = None, ylabel = None, legend = None, width = 10, height = 10):
+    def __init__(self, subplots = True, title = None, xlabel = None, ylabel = None, legend = None, width = 10, height = 10):
         ## Defines the figure and plot object to which we can add subplots.
 
-        self.figure = plt.figure(figsize=(width, height), dpi=100)
-        self.plot = None
+        ## For depth profile with subplots
+        if subplots :
+          self.figure, self.axs = plt.subplots(figsize=(width, height), dpi=100)
+        else :
+          ## For cross section/horizontal slice -- no subplots
+          self.figure = plt.figure(figsize=(width, height), dpi=100)
+          self.axs = None
 
         if ylabel != None:
             plt.ylabel(ylabel, fontsize=14)
@@ -86,12 +92,12 @@ def __init__(self, title = None, xlabel = None, ylabel = None, legend = None, wi
     # 
     #  @return The subplot that has been added to the already generated plot.
     def addsubplot(self):
-        if(self.plot == None) :
-          self.plot = self.figure.add_subplot(1, 1, 1)
-          self.subplotcounter = 1
+        if(self.axs == None) :
+          print("ERROR: PLOT is not setup to take subplots.")
+          exit(1)
         else:
           self.subplotcounter += 1;
-        return self.plot;
+        return self.axs;
 
     ## 
     #  Shows the plot.

pycvm/cross_section.py

@@ -235,7 +235,6 @@ def addtoplot(self, plot, colors = None, customlabels = None):
             max_x = max(max_x, max(newvplist))
             plot.addsubplot().plot(newvplist, yvals, "-", color=vpcolor, label=vplabel)
 
-
         if "vs" in self.properties:
             myInt=1000
             newvslist=np.array(self.vslist)/myInt
@@ -307,11 +306,11 @@ def _plot_file(self):
             title = "%s%s Depth Profile From %sm To %sm at (%.6f,%.6f)" % (location_text, cvmdesc, self.startingpoint.depth, self.todepth, self.startingpoint.longitude, self.startingpoint.latitude)
 
         # Call the plot object.
-        p = Plot(title, "Units (see legend)", "Depth (m)", None, 7, 10)
+        p = Plot(True, title, "Units (see legend)", "Depth (m)", None, 7, 10)
 
         # Add to plot.
         self.addtoplot(p)
-                
+
         if self.filename == None:
             plt.show()
         else:

pycvm/cvm_plot.py

@@ -85,7 +85,7 @@ def plot(self, property, filename = None, title = None):
                 title = "Horizontal Slice Difference Plot"
 
             # Call the plot object.
-            p = Plot(title, "", "", None, 10, 10)
+            p = Plot(False,title, "", "", None, 10, 10)
 
             colormap = basemap.cm.GMT_seis
 
@@ -137,7 +137,7 @@ def plot(self, property, filename = None, title = None):
                 title = "Horizontal Slice Difference Plot"
 
             # Call the plot object.
-            p = Plot(None, None, None, None, 10, 10)
+            p = Plot(False,None, None, None, None, 10, 10)
 
             colormap = basemap.cm.GMT_seis
 

pycvm/depth_profile.py

@@ -241,7 +241,7 @@ def plot(self) :
         self.getplotvals(mproperty)
 
         # Call the plot object.
-        p = Plot(None, None, None, None, 10, 10)
+        p = Plot(False,None, None, None, None, 10, 10)
 
         plt.axes([0.1,0.7,0.8,0.25])
 

pycvm/difference.py

@@ -218,7 +218,7 @@ def plot(self, horizontal_label = None):
         self.getplotvals(mproperty)
 
         # Call the plot object.
-        p = Plot(title, "", "", None, 10, 10)
+        p = Plot(False,title, "", "", None, 10, 10)
 
         u = UCVM(install_dir=self.installdir, config_file=self.configfile)
 

pycvm/elevation_cross_section.py

@@ -297,7 +297,7 @@ def _plot_file(self):
             title = "%s%s Elevation Profile From %sm To %sm at (%.2f,%.2f)" % (location_text, cvmdesc, self.startelevation, self.toelevation, self.startingpoint.longitude, self.startingpoint.latitude)
 
         # Call the plot object.
-        p = Plot(title, "Units (see legend)", "Elevation (m)", None, 7, 10)
+        p = Plot(True,title, "Units (see legend)", "Elevation (m)", None, 7, 10)
 
         # Add to plot.
         self.addtoplot(p)

pycvm/elevation_horizontal_slice.py

@@ -257,7 +257,7 @@ def _plot_file(self, horizontal_label = None):
         self.getplotvals(mproperty)
 
         # Call the plot object.
-        p = Plot(self.title, "", "", None, 10, 10)
+        p = Plot(False,self.title, "", "", None, 10, 10)
 
         ucvm = self.ucvm
 #        UCVM(install_dir=self.installdir, config_file=self.configfile)