sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing] update vector layer histogram

Browse Source
This commit is contained in:
Alexander Bruy 2017-02-10 14:30:32 +02:00
parent a352773887
commit e0131a7526
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
View File

@ -276,14 +276,16 @@ class QGISAlgorithmProvider(AlgorithmProvider):
#~ PolarPlot(), #~ PolarPlot(),
#~ ]) #~ ])
if hasPlotly: if hasPlotly:
#~ from .VectorLayerHistogram import VectorLayerHistogram from .VectorLayerHistogram import VectorLayerHistogram
#~ from .RasterLayerHistogram import RasterLayerHistogram #~ from .RasterLayerHistogram import RasterLayerHistogram
from .VectorLayerScatterplot import VectorLayerScatterplot from .VectorLayerScatterplot import VectorLayerScatterplot
#~ from .MeanAndStdDevPlot import MeanAndStdDevPlot #~ from .MeanAndStdDevPlot import MeanAndStdDevPlot
from .BarPlot import BarPlot from .BarPlot import BarPlot
#~ from .PolarPlot import PolarPlot #~ from .PolarPlot import PolarPlot
self.alglist.extend([VectorLayerScatterplot(), BarPlot()]) self.alglist.extend([
VectorLayerHistogram(), VectorLayerScatterplot(),
BarPlot()])
self.externalAlgs = [] # to store algs added by 3rd party plugins as scripts self.externalAlgs = [] # to store algs added by 3rd party plugins as scripts

14
python/plugins/processing/algs/qgis/VectorLayerHistogram.py
View File

@ -25,8 +25,8 @@ __copyright__ = '(C) 2013, Victor Olaya'
__revision__ = '$Format:%H$' __revision__ = '$Format:%H$'
import matplotlib.pyplot as plt import plotly as plt
import matplotlib.pylab as lab import plotly.graph_objs as go
from processing.core.GeoAlgorithm import GeoAlgorithm from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.parameters import ParameterVector from processing.core.parameters import ParameterVector
@ -66,9 +66,7 @@ class VectorLayerHistogram(GeoAlgorithm):
output = self.getOutputValue(self.OUTPUT) output = self.getOutputValue(self.OUTPUT)
values = vector.values(layer, fieldname) values = vector.values(layer, fieldname)
plt.close()
plt.hist(values[fieldname], bins) data = [go.Histogram(x=values[fieldname],
plotFilename = output + '.png' nbinsx=bins)]
lab.savefig(plotFilename) plt.offline.plot(data, filename=output)
with open(output, 'w') as f:
f.write('<html><img src="' + plotFilename + '"/></html>')

3
python/plugins/processing/algs/qgis/VectorLayerScatterplot.py
View File

@ -72,6 +72,5 @@ class VectorLayerScatterplot(GeoAlgorithm):
values = vector.values(layer, xfieldname, yfieldname) values = vector.values(layer, xfieldname, yfieldname)
data = [go.Scatter(x=values[xfieldname], data = [go.Scatter(x=values[xfieldname],
y=values[yfieldname], y=values[yfieldname],
mode='markers' mode='markers')]
)]
plt.offline.plot(data, filename=output) plt.offline.plot(data, filename=output)