|
22 | 22 | import qwt.scale_map |
23 | 23 | from qtpy.QtCore import QPointF, QRectF |
24 | 24 | from qtpy.QtGui import QPainter |
| 25 | + from qwt import QwtSymbol |
25 | 26 |
|
| 27 | + from plotpy.plot import BasePlot |
26 | 28 | from plotpy.styles.base import ItemParameters |
27 | 29 |
|
28 | 30 |
|
@@ -137,34 +139,31 @@ def draw( |
137 | 139 | yMap: Y axis scale map |
138 | 140 | canvasRect: Canvas rectangle |
139 | 141 | """ |
140 | | - plot = self.plot() |
| 142 | + plot: BasePlot = self.plot() |
141 | 143 | if not plot: |
142 | 144 | return |
143 | 145 | if self.selected: |
144 | | - pen = self.sel_pen |
145 | | - sym = self.sel_symbol |
| 146 | + pen: QG.QPen = self.sel_pen |
| 147 | + sym: QwtSymbol = self.sel_symbol |
146 | 148 | else: |
147 | | - pen = self.pen |
148 | | - sym = self.symbol |
| 149 | + pen: QG.QPen = self.pen |
| 150 | + sym: QwtSymbol = self.symbol |
149 | 151 |
|
150 | | - rct = plot.canvas().contentsRect() |
151 | | - rct2 = QC.QRectF(rct) |
152 | | - rct2.setLeft(xMap.transform(self._min)) |
153 | | - rct2.setRight(xMap.transform(self._max)) |
| 152 | + rct = QC.QRectF(plot.canvas().contentsRect()) |
| 153 | + rct.setLeft(xMap.transform(self._min)) |
| 154 | + rct.setRight(xMap.transform(self._max)) |
154 | 155 |
|
155 | | - painter.fillRect(rct2, self.brush) |
| 156 | + painter.fillRect(rct, self.brush) |
156 | 157 | painter.setPen(pen) |
157 | | - painter.drawLine(rct2.topLeft(), rct2.bottomLeft()) |
158 | | - painter.drawLine(rct2.topRight(), rct2.bottomRight()) |
| 158 | + painter.drawLine(rct.topLeft(), rct.bottomLeft()) |
| 159 | + painter.drawLine(rct.topRight(), rct.bottomRight()) |
| 160 | + |
159 | 161 | dash = QG.QPen(pen) |
160 | 162 | dash.setStyle(QC.Qt.DashLine) |
161 | 163 | dash.setWidth(1) |
162 | 164 | painter.setPen(dash) |
163 | | - |
164 | | - center_x = int(rct2.center().x()) |
165 | | - top = int(rct2.top()) |
166 | | - bottom = int(rct2.bottom()) |
167 | | - painter.drawLine(center_x, top, center_x, bottom) |
| 165 | + cx = rct.center().x() |
| 166 | + painter.drawLine(QC.QPointF(cx, rct.top()), QC.QPointF(cx, rct.bottom())) |
168 | 167 |
|
169 | 168 | painter.setPen(pen) |
170 | 169 | x0, x1, y = self.get_handles_pos() |
|
0 commit comments