Major API simplification (continued)

Author: PierreRaybaut

doc/reference/index.rst

@@ -19,11 +19,7 @@ Private API:
 
     graphic
     interval
-    legend_data
-    legend_label
     plot_directpainter
     plot_layout
-    plot_seriesitem
-    series_data
-    series_store
+    plot_series
     transform

doc/reference/legend_data.rst

@@ -0,0 +1,2 @@
+.. automodule:: qwt.plot_series
+   :members:

doc/reference/legend_label.rst

@@ -3,6 +3,3 @@ Text
 
 .. automodule:: qwt.text
    :members:
-
-.. automodule:: qwt.text_engine
-   :members:

doc/reference/plot_series.rst

@@ -21,7 +21,7 @@
 
 .. _GitHub: https://github.com/PierreRaybaut/PythonQwt
 """
-__version__ = '0.4.0'
+__version__ = '0.5.0'
 QWT_VERSION_STR = '6.1.2'
 
 import warnings
@@ -35,7 +35,7 @@
 from qwt.plot_curve import QwtPlotItem
 from qwt.scale_map import QwtScaleMap
 from qwt.interval import QwtInterval
-from qwt.legend import QwtLegend
+from qwt.legend import QwtLegend, QwtLegendData, QwtLegendLabel
 from qwt.plot_marker import QwtPlotMarker
 from qwt.plot_grid import QwtPlotGrid as QPG  # see deprecated section
 from qwt.color_map import QwtLinearColorMap
@@ -46,9 +46,9 @@
 from qwt.scale_draw import QwtScaleDraw
 from qwt.scale_draw import QwtAbstractScaleDraw
 from qwt.painter import QwtPainter
-from qwt.legend_data import QwtLegendData
 
-from qwt.series_data import QwtPointArrayData
+from qwt.plot_series import (QwtSeriesData, QwtPointArrayData, QwtSeriesStore,
+                             QwtPlotSeriesItem)
 
 from qwt.plot_renderer import QwtPlotRenderer
 

doc/reference/plot_seriesitem.rst

@@ -6,7 +6,6 @@
 # (see LICENSE file for more details)
 
 from qwt.interval import QwtInterval
-from qwt.painter import QwtPainter
 
 from qwt.qt.QtGui import QPolygonF, QPalette
 from qwt.qt.QtCore import QRectF, Qt