Added various minor optimizations for axes/ticks drawing features

Author: PierreRaybaut

qwt/scale_draw.py

@@ -27,6 +27,7 @@
 from qtpy.QtGui import QPalette, QFontMetrics, QTransform
 from qtpy.QtCore import Qt, qFuzzyCompare, QLocale, QRectF, QPointF, QRect, QPoint
 
+from math import ceil
 import numpy as np
 
 
@@ -609,8 +610,7 @@ def getBorderDistHint(self, font):
             e = self.labelRect(font, maxTick).right()
             e -= abs(maxPos - self.scaleMap().p2())
 
-        start, end = np.ceil(np.nan_to_num(np.array([s, e])).clip(0, None))
-        return start, end
+        return max(ceil(s), 0), max(ceil(e), 0)
 
     def minLabelDist(self, font):
         """

qwt/scale_engine.py

@@ -326,9 +326,8 @@ def contains(self, interval, value):
         """
         if not interval.isValid():
             return False
-        elif qwtFuzzyCompare(value, interval.minValue(), interval.width()) < 0:
-            return False
-        elif qwtFuzzyCompare(value, interval.maxValue(), interval.width()) > 0:
+        eps = abs(1.0e-6 * interval.width())
+        if interval.minValue() - value > eps or value - interval.maxValue() > eps:
             return False
         else:
             return True

qwt/text.py

@@ -230,19 +230,17 @@ def __init__(self):
 
     def fontmetrics(self, font):
         fid = font.toString()
-        fm = self._fm_cache.get(fid)
-        if fm is None:
+        try:
+            return self._fm_cache[fid]
+        except KeyError:
             return self._fm_cache.setdefault(fid, QFontMetrics(font))
-        else:
-            return fm
 
     def fontmetrics_f(self, font):
         fid = font.toString()
-        fm = self._fm_cache_f.get(fid)
-        if fm is None:
+        try:
+            return self._fm_cache_f[fid]
+        except KeyError:
             return self._fm_cache_f.setdefault(fid, QFontMetricsF(font))
-        else:
-            return fm
 
     def heightForWidth(self, font, flags, text, width):
         """