- ScatterPlotItem disables render cache during export

- Fixes for SVG exporter
- functions.isosurface() is a bazillion times faster (API change: return value format has changed)

examples/GLIsosurface.py

@@ -45,9 +45,9 @@ data = np.abs(np.fromfunction(psi, (50,50,100)))
 
 
 print("Generating isosurface..")
-verts = pg.isosurface(data, data.max()/4.)
+verts, faces = pg.isosurface(data, data.max()/4.)
 
-md = gl.MeshData(vertexes=verts)
+md = gl.MeshData(vertexes=verts, faces=faces)
 
 colors = np.ones((md.faceCount(), 4), dtype=float)
 colors[:,3] = 0.2

exporters/Exporter.py

@@ -73,7 +73,8 @@ class Exporter(object):
         
     def getSourceRect(self):
         if isinstance(self.item, pg.GraphicsScene):
-            return self.item.getViewWidget().viewRect()
+            w = self.item.getViewWidget()
+            return w.viewportTransform().inverted()[0].mapRect(w.rect())
         else:
             return self.item.sceneBoundingRect()
         

exporters/SVGExporter.py

@@ -36,11 +36,14 @@ class SVGExporter(Exporter):
             return
         self.svg = QtSvg.QSvgGenerator()
         self.svg.setFileName(fileName)
-        self.svg.setSize(QtCore.QSize(100,100))
-        #self.svg.setResolution(600)
+        dpi = QtGui.QDesktopWidget().physicalDpiX()
+        ## not really sure why this works, but it seems to be important:
+        self.svg.setSize(QtCore.QSize(self.params['width']*dpi/90., self.params['height']*dpi/90.))
+        self.svg.setResolution(dpi)
         #self.svg.setViewBox()
         targetRect = QtCore.QRect(0, 0, self.params['width'], self.params['height'])
         sourceRect = self.getSourceRect()
+        
         painter = QtGui.QPainter(self.svg)
         try:
             self.setExportMode(True)

graphicsItems/ScatterPlotItem.py

@@ -233,7 +233,7 @@ class ScatterPlotItem(GraphicsObject):
         self.bounds = [None, None]  ## caches data bounds
         self._maxSpotWidth = 0      ## maximum size of the scale-variant portion of all spots
         self._maxSpotPxWidth = 0    ## maximum size of the scale-invariant portion of all spots
-        self.opts = {'pxMode': True, 'useCache': True}   ## If useCache is False, symbols are re-drawn on every paint.
+        self.opts = {'pxMode': True, 'useCache': True, 'exportMode': False}   ## If useCache is False, symbols are re-drawn on every paint.
         
         self.setPen(200,200,200, update=False)
         self.setBrush(100,100,150, update=False)
@@ -664,10 +664,14 @@ class ScatterPlotItem(GraphicsObject):
             rect = QtCore.QRectF(y, x, h, w)
             self.fragments.append(QtGui.QPainter.PixmapFragment.create(pos, rect))
             
+    def setExportMode(self, enabled, opts):
+        self.opts['exportMode'] = enabled
+            
+            
     def paint(self, p, *args):
         #p.setPen(fn.mkPen('r'))
         #p.drawRect(self.boundingRect())
-        if self.opts['pxMode']:
+        if self.opts['pxMode'] is True:
             atlas = self.fragmentAtlas.getAtlas()
             #arr = fn.imageToArray(atlas.toImage(), copy=True)
             #if hasattr(self, 'lastAtlas'):
@@ -681,7 +685,7 @@ class ScatterPlotItem(GraphicsObject):
                     
             p.resetTransform()
             
-            if not USE_PYSIDE and self.opts['useCache']:
+            if not USE_PYSIDE and self.opts['useCache'] and self.opts['exportMode'] is False:
                 p.drawPixmapFragments(self.fragments, atlas)
             else:
                 for i in range(len(self.data)):