[processing] update bar plot

alexbruy · alexbruy · commit 46a9891e5c49 · 2017-02-15T20:07:07.000+02:00
diff --git a/python/plugins/processing/algs/qgis/BarPlot.py b/python/plugins/processing/algs/qgis/BarPlot.py
@@ -25,8 +25,11 @@
 
 __revision__ = '$Format:%H$'
 
-import matplotlib.pyplot as plt
-import matplotlib.pylab as lab
+#import matplotlib.pyplot as plt
+#import matplotlib.pylab as lab
+
+import plotly as plt
+import plotly.graph_objs as go
 import numpy as np
 
 from processing.core.parameters import ParameterTable
@@ -69,13 +72,8 @@ def processAlgorithm(self, feedback):
         output = self.getOutputValue(self.OUTPUT)
 
         values = vector.values(layer, namefieldname, valuefieldname)
-        plt.close()
 
         ind = np.arange(len(values[namefieldname]))
-        width = 0.8
-        plt.bar(ind, values[valuefieldname], width, color='r')
-        plt.xticks(ind, values[namefieldname], rotation=45)
-        plotFilename = output + '.png'
-        lab.savefig(plotFilename)
-        with open(output, 'w') as f:
-            f.write('<html><img src="' + plotFilename + '"/></html>')
+        data = [go.Bar(x=ind,
+                       y=values[valuefieldname])]
+        plt.offline.plot(data, filename=output)
diff --git a/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py b/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
@@ -28,11 +28,14 @@
 import os
 
 try:
-    import matplotlib.pyplot
-    assert matplotlib  # NOQA silence pyflakes
-    hasMatplotlib = True
+    #import matplotlib.pyplot
+    #assert matplotlib  # NOQA silence pyflakes
+    #hasMatplotlib = True
+    import plotly
+    hasPlotly = True
 except:
-    hasMatplotlib = False
+    #hasMatplotlib = False
+    hasPlotly = False
 
 from qgis.PyQt.QtGui import QIcon
 
@@ -259,19 +262,28 @@ def __init__(self):
                         FixGeometry(), ExecuteSQL(), FindProjection()
                         ]
 
-        if hasMatplotlib:
-            from .VectorLayerHistogram import VectorLayerHistogram
-            from .RasterLayerHistogram import RasterLayerHistogram
-            from .VectorLayerScatterplot import VectorLayerScatterplot
-            from .MeanAndStdDevPlot import MeanAndStdDevPlot
+        #~ if hasMatplotlib:
+            #~ from .VectorLayerHistogram import VectorLayerHistogram
+            #~ from .RasterLayerHistogram import RasterLayerHistogram
+            #~ from .VectorLayerScatterplot import VectorLayerScatterplot
+            #~ from .MeanAndStdDevPlot import MeanAndStdDevPlot
+            #~ from .BarPlot import BarPlot
+            #~ from .PolarPlot import PolarPlot
+
+            #~ self.alglist.extend([
+                #~ VectorLayerHistogram(), RasterLayerHistogram(),
+                #~ VectorLayerScatterplot(), MeanAndStdDevPlot(), BarPlot(),
+                #~ PolarPlot(),
+            #~ ])
+        if hasPlotly:
+            #~ from .VectorLayerHistogram import VectorLayerHistogram
+            #~ from .RasterLayerHistogram import RasterLayerHistogram
+            #~ from .VectorLayerScatterplot import VectorLayerScatterplot
+            #~ from .MeanAndStdDevPlot import MeanAndStdDevPlot
             from .BarPlot import BarPlot
-            from .PolarPlot import PolarPlot
+            #~ from .PolarPlot import PolarPlot
 
-            self.alglist.extend([
-                VectorLayerHistogram(), RasterLayerHistogram(),
-                VectorLayerScatterplot(), MeanAndStdDevPlot(), BarPlot(),
-                PolarPlot(),
-            ])
+            self.alglist.extend([BarPlot()])
 
         self.externalAlgs = []  # to store algs added by 3rd party plugins as scripts
 
