Hans Petter Langtangen 13 jaren geleden
bovenliggende
commit
fe2d84b6e0
2 gewijzigde bestanden met toevoegingen van 12 en 3 verwijderingen
  1. 11 2
      pysketcher/MatplotlibDraw.py
  2. 1 1
      pysketcher/shapes.py

+ 11 - 2
pysketcher/MatplotlibDraw.py

@@ -323,9 +323,18 @@ self.ax.plot(x, y, linewidth=%d, color='gray',
 
     def savefig(self, filename):
         """Save figure in file."""
-        self.mpl.savefig(filename)
+        # If filename is without extension, generate all important formats
+        ext = os.path.splitext(filename)[1]
+        if not ext:
+            self.mpl.savefig(filename + '.png', dpi=300)
+            self.mpl.savefig(filename + '.pdf')
+            #self.mpl.savefig(filename + '.eps')
+        else:
+            self.mpl.savefig(filename, dpi=300)
+
         if self.instruction_file:
-            self.instruction_file.write('mpl.savefig("%s")\n' % filename)
+            self.instruction_file.write('mpl.savefig("%s", dpi=600)\n' %
+                                        filename)
 
     def text(self, text, position, alignment='center', fontsize=0,
              arrow_tip=None):

+ 1 - 1
pysketcher/shapes.py

@@ -468,7 +468,7 @@ class Curve(Shape):
             inside = False
             if verbose:
                 print 'y_min=%g < plot area y_min=%g' % (ymin, t.ymin)
-        if xmax > t.xmax:
+        if ymax > t.ymax:
             inside = False
             if verbose:
                 print 'y_max=%g > plot area y_max=%g' % (ymax, t.ymax)