More fixes, some reversions
parent
3912b22b41
commit
c830183073
|
@ -351,7 +351,7 @@ class XAxisLabel(AxisLabel):
|
||||||
|
|
||||||
def _draw_arrow_path(self):
|
def _draw_arrow_path(self):
|
||||||
y_offset = self._parent.style['tickTextOffset'][1]
|
y_offset = self._parent.style['tickTextOffset'][1]
|
||||||
path = QtWidgets.QPainterPath()
|
path = QtGui.QPainterPath()
|
||||||
h, w = self.rect.height(), self.rect.width()
|
h, w = self.rect.height(), self.rect.width()
|
||||||
middle = w/2 - 0.5
|
middle = w/2 - 0.5
|
||||||
aw = h/2
|
aw = h/2
|
||||||
|
@ -453,7 +453,7 @@ class YAxisLabel(AxisLabel):
|
||||||
|
|
||||||
def _draw_arrow_path(self):
|
def _draw_arrow_path(self):
|
||||||
x_offset = self._parent.style['tickTextOffset'][0]
|
x_offset = self._parent.style['tickTextOffset'][0]
|
||||||
path = QtWidgets.QPainterPath()
|
path = QtGui.QPainterPath()
|
||||||
h = self.rect.height()
|
h = self.rect.height()
|
||||||
path.moveTo(0, 0)
|
path.moveTo(0, 0)
|
||||||
path.lineTo(-x_offset - h/4, h/2.)
|
path.lineTo(-x_offset - h/4, h/2.)
|
||||||
|
|
|
@ -103,7 +103,7 @@ class LineDot(pg.CurvePoint):
|
||||||
i = index - x[0]
|
i = index - x[0]
|
||||||
if i > 0 and i < len(y):
|
if i > 0 and i < len(y):
|
||||||
newPos = (index, y[i])
|
newPos = (index, y[i])
|
||||||
QtGui.QGraphicsItem.setPos(self, *newPos)
|
QtWidgets.QGraphicsItem.setPos(self, *newPos)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
return False
|
return False
|
||||||
|
|
|
@ -101,7 +101,7 @@ class FastAppendCurve(pg.PlotCurveItem):
|
||||||
|
|
||||||
# XXX: pretty annoying but, without this there's little
|
# XXX: pretty annoying but, without this there's little
|
||||||
# artefacts on the append updates to the curve...
|
# artefacts on the append updates to the curve...
|
||||||
self.setCacheMode(QtGui.QGraphicsItem.NoCache)
|
self.setCacheMode(QtWidgets.QGraphicsItem.NoCache)
|
||||||
self.prepareGeometryChange()
|
self.prepareGeometryChange()
|
||||||
flip_cache = True
|
flip_cache = True
|
||||||
|
|
||||||
|
@ -121,7 +121,7 @@ class FastAppendCurve(pg.PlotCurveItem):
|
||||||
self.update()
|
self.update()
|
||||||
|
|
||||||
if flip_cache:
|
if flip_cache:
|
||||||
self.setCacheMode(QtGui.QGraphicsItem.DeviceCoordinateCache)
|
self.setCacheMode(QtWidgets.QGraphicsItem.DeviceCoordinateCache)
|
||||||
|
|
||||||
def boundingRect(self):
|
def boundingRect(self):
|
||||||
if self.path is None:
|
if self.path is None:
|
||||||
|
|
|
@ -22,7 +22,6 @@ from typing import List, Optional, Tuple
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import pyqtgraph as pg
|
import pyqtgraph as pg
|
||||||
from numba import njit, float64, int64 # , optional
|
from numba import njit, float64, int64 # , optional
|
||||||
import PyQt5
|
|
||||||
from PyQt5 import QtCore, QtGui, QtWidgets
|
from PyQt5 import QtCore, QtGui, QtWidgets
|
||||||
from PyQt5.QtCore import QLineF, QPointF
|
from PyQt5.QtCore import QLineF, QPointF
|
||||||
# from numba import types as ntypes
|
# from numba import types as ntypes
|
||||||
|
@ -315,7 +314,7 @@ class BarItems(pg.GraphicsObject):
|
||||||
|
|
||||||
# trigger redraw despite caching
|
# trigger redraw despite caching
|
||||||
self.prepareGeometryChange()
|
self.prepareGeometryChange()
|
||||||
self.setCacheMode(QtGui.QGraphicsItem.NoCache)
|
self.setCacheMode(QtWidgets.QGraphicsItem.NoCache)
|
||||||
flip_cache = True
|
flip_cache = True
|
||||||
|
|
||||||
self._xrange = first_index, last_index
|
self._xrange = first_index, last_index
|
||||||
|
@ -353,7 +352,7 @@ class BarItems(pg.GraphicsObject):
|
||||||
self.update()
|
self.update()
|
||||||
|
|
||||||
if flip_cache:
|
if flip_cache:
|
||||||
self.setCacheMode(QtGui.QGraphicsItem.DeviceCoordinateCache)
|
self.setCacheMode(QtWidgets.QGraphicsItem.DeviceCoordinateCache)
|
||||||
|
|
||||||
def paint(
|
def paint(
|
||||||
self,
|
self,
|
||||||
|
|
|
@ -23,7 +23,7 @@ WARNING: this code likely doesn't work at all (yet)
|
||||||
"""
|
"""
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import pyqtgraph as pg
|
import pyqtgraph as pg
|
||||||
from PyQt5 import QtCore, QtGui
|
from PyQt5 import QtCore, QtGui, QtWidgets
|
||||||
|
|
||||||
from .quantdom.charts import CenteredTextItem
|
from .quantdom.charts import CenteredTextItem
|
||||||
from .quantdom.base import Quotes
|
from .quantdom.base import Quotes
|
||||||
|
@ -57,8 +57,8 @@ class SignallingApi(object):
|
||||||
self.signals_visible = False
|
self.signals_visible = False
|
||||||
|
|
||||||
def add_signals(self):
|
def add_signals(self):
|
||||||
self.signals_group_text = QtGui.QGraphicsItemGroup()
|
self.signals_group_text = QtWidgets.QGraphicsItemGroup()
|
||||||
self.signals_group_arrow = QtGui.QGraphicsItemGroup()
|
self.signals_group_arrow = QtWidgets.QGraphicsItemGroup()
|
||||||
self.signals_text_items = np.empty(len(Quotes), dtype=object)
|
self.signals_text_items = np.empty(len(Quotes), dtype=object)
|
||||||
|
|
||||||
for p in Portfolio.positions:
|
for p in Portfolio.positions:
|
||||||
|
|
Loading…
Reference in New Issue