Renamed modules: qwt/qwt_*.py --> qwt/*.py

Author: Pierre Raybaut

qwt/__init__.py

@@ -3,31 +3,31 @@
 
 import warnings
 
-from qwt.qwt_plot import QwtPlot
-from qwt.qwt_symbol import QwtSymbol as QSbl  # see deprecated section
-from qwt.qwt_scale_engine import QwtLinearScaleEngine, QwtLogScaleEngine
-from qwt.qwt_text import QwtText
-from qwt.qwt_plot_canvas import QwtPlotCanvas
-from qwt.qwt_plot_curve import QwtPlotCurve as QPC  # see deprecated section
-from qwt.qwt_plot_curve import QwtPlotItem
-from qwt.qwt_scale_map import QwtScaleMap
-from qwt.qwt_interval import QwtInterval
-from qwt.qwt_legend import QwtLegend
-from qwt.qwt_plot_marker import QwtPlotMarker
-from qwt.qwt_plot_grid import QwtPlotGrid as QPG  # see deprecated section
-from qwt.qwt_color_map import QwtLinearColorMap
+from qwt.plot import QwtPlot
+from qwt.symbol import QwtSymbol as QSbl  # see deprecated section
+from qwt.scale_engine import QwtLinearScaleEngine, QwtLogScaleEngine
+from qwt.text import QwtText
+from qwt.plot_canvas import QwtPlotCanvas
+from qwt.plot_curve import QwtPlotCurve as QPC  # see deprecated section
+from qwt.plot_curve import QwtPlotItem
+from qwt.scale_map import QwtScaleMap
+from qwt.interval import QwtInterval
+from qwt.legend import QwtLegend
+from qwt.plot_marker import QwtPlotMarker
+from qwt.plot_grid import QwtPlotGrid as QPG  # see deprecated section
+from qwt.color_map import QwtLinearColorMap
 
-from qwt.toqimage import toQImage
+from qwt.toqimage import array_to_qimage as toQImage
 
-from qwt.qwt_scale_div import QwtScaleDiv
-from qwt.qwt_scale_draw import QwtScaleDraw
-from qwt.qwt_scale_draw import QwtAbstractScaleDraw
-from qwt.qwt_series_data import QwtIntervalSeriesData
-from qwt.qwt_sample import QwtIntervalSample
-from qwt.qwt_painter import QwtPainter
-from qwt.qwt_legend_data import QwtLegendData
+from qwt.scale_div import QwtScaleDiv
+from qwt.scale_draw import QwtScaleDraw
+from qwt.scale_draw import QwtAbstractScaleDraw
+from qwt.series_data import QwtIntervalSeriesData
+from qwt.sample import QwtIntervalSample
+from qwt.painter import QwtPainter
+from qwt.legend_data import QwtLegendData
 
-from qwt.qwt_plot_renderer import QwtPlotRenderer
+from qwt.plot_renderer import QwtPlotRenderer
 
 
 ## ============================================================================

qwt/abstract_legend.py

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+# Moved to legend.py        
+        

qwt/qwt_clipper.py qwt/clipper.pyqwt/qwt_clipper.py renamed to qwt/clipper.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from qwt.qwt_interval import QwtInterval
-from qwt.qwt_painter import QwtPainter
+from qwt.interval import QwtInterval
+from qwt.painter import QwtPainter
 
 from qwt.qt.QtGui import QPolygonF, QPalette
 from qwt.qt.QtCore import QRectF, Qt

qwt/qwt_color_map.py qwt/color_map.pyqwt/qwt_color_map.py renamed to qwt/color_map.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from qwt.qwt_spline import QwtSpline
+from qwt.spline import QwtSpline
 
 from qwt.qt.QtGui import QPolygonF
 from qwt.qt.QtCore import QPointF

qwt/qwt_column_symbol.py qwt/column_symbol.pyqwt/qwt_column_symbol.py renamed to qwt/column_symbol.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 
-from qwt.qwt_null_paintdevice import QwtNullPaintDevice
-from qwt.qwt_painter_command import QwtPainterCommand
+from qwt.null_paintdevice import QwtNullPaintDevice
+from qwt.painter_command import QwtPainterCommand
 
 from qwt.qt.QtGui import (QPainter, QPainterPathStroker, QPaintEngine, QPixmap,
                           QTransform, QImage)
 from qwt.qt.QtCore import Qt, QRectF, QSizeF, QSize, QPointF, QRect
 
-from math import ceil
+import numpy as np
 
 
 def qwtHasScalablePen(painter):
@@ -235,7 +235,7 @@ def scaledBoundingRect(self, sx, sy):
 
     def sizeMetrics(self):
         sz = self.defaultSize()
-        return QSize(ceil(sz.width()), ceil(sz.height()))
+        return QSize(np.ceil(sz.width()), np.ceil(sz.height()))
 
     def setDefaultSize(self, size):
         w = max([0., size.width()])
@@ -340,8 +340,8 @@ def toPixmap(self, *args):
             if self.isNull():
                 return QPixmap()
             sz = self.defaultSize()
-            w = ceil(sz.width())
-            h = ceil(sz.height())
+            w = np.ceil(sz.width())
+            h = np.ceil(sz.height())
             pixmap = QPixmap(w, h)
             pixmap.fill(Qt.transparent)
             r = QRectF(0., 0., sz.width(), sz.height())
@@ -367,8 +367,8 @@ def toImage(self, *args):
             if self.isNull():
                 return QImage()
             sz = self.defaultSize()
-            w = ceil(sz.width())
-            h = ceil(sz.height())
+            w = np.ceil(sz.width())
+            h = np.ceil(sz.height())
             image = QImage(w, h, QImage.Format_ARGB32)
             image.fill(0)
             r = QRect(0, 0, sz.width(), sz.height())

qwt/qwt_curve_fitter.py qwt/curve_fitter.pyqwt/qwt_curve_fitter.py renamed to qwt/curve_fitter.py

@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 
-from qwt.qwt_legend_data import QwtLegendData
-from qwt.qwt_dyngrid_layout import QwtDynGridLayout
-from qwt.qwt_painter import QwtPainter
-from qwt.qwt_legend_label import QwtLegendLabel
+from qwt.legend_data import QwtLegendData
+from qwt.dyngrid_layout import QwtDynGridLayout
+from qwt.painter import QwtPainter
+from qwt.legend_label import QwtLegendLabel
 
 from qwt.qt.QtGui import (QFrame, QScrollArea, QWidget, QVBoxLayout, QPalette,
                           QApplication)
 from qwt.qt.QtCore import SIGNAL, QEvent, QSize, Qt, QRect, QRectF
 
-from math import ceil
+import numpy as np
 
 
 class QwtAbstractLegend(QFrame):
@@ -301,10 +301,10 @@ def renderLegend(self, painter, rect, fillBackground):
             return
         left, right, top, bottom = self.getContentsMargins()
         layoutRect = QRect()
-        layoutRect.setLeft(ceil(rect.left())+left)
-        layoutRect.setTop(ceil(rect.top())+top)
-        layoutRect.setRight(ceil(rect.right())-right)
-        layoutRect.setBottom(ceil(rect.bottom())-bottom)
+        layoutRect.setLeft(np.ceil(rect.left())+left)
+        layoutRect.setTop(np.ceil(rect.top())+top)
+        layoutRect.setRight(np.ceil(rect.right())-right)
+        layoutRect.setBottom(np.ceil(rect.bottom())-bottom)
         numCols = legendLayout.columnsForWidth(layoutRect.width())
         itemRects = legendLayout.layoutItems(layoutRect, numCols)
         index = 0