Try #167 (oops)

tieugene · Oct 27, 2022 · 6077bc2 · 6077bc2
1 parent e8b932c
commit 6077bc2
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/iosc/sig/widget/chart.py b/iosc/sig/widget/chart.py
@@ -6,7 +6,7 @@
 from PyQt5.QtCore import Qt, QMargins, QObject
 from PyQt5.QtGui import QResizeEvent, QMouseEvent, QBrush, QColor, QFont, QPen
 from PyQt5.QtWidgets import QScrollArea, QLabel, QWidget
-from QCustomPlot2 import QCustomPlot, QCPScatterStyle, QCPItemText, QCPGraphData, QCPGraph, QCPRange
+from QCustomPlot2 import QCustomPlot, QCPScatterStyle, QCPItemText, QCPGraphData, QCPGraph, QCPRange, QCPPainter
 # 3. local
 import iosc.const
 from iosc.core import mycomtrade
@@ -354,6 +354,13 @@ def __init__(self, num: int, point: QCPGraphData, parent: QCustomPlot):
             self.setText(str(num))
             self.position.setCoords(point.key, point.value)
 
+    class DigitScatterStyle(QCPScatterStyle):
+        def __init__(self):
+            super().__init__(QCPScatterStyle.ssCircle)
+        # def drawShape(self, painter: QCPPainter, *__args):  # not works
+        #     print(len(__args))
+        #     super().drawShape(painter, *__args)
+
     _signal: mycomtrade.AnalogSignal
     _sibling: AnalogSignalLabel
     __scat_style: EScatter
@@ -398,10 +405,12 @@ def refresh_scatter(self, scat_style: EScatter) -> bool:
         if self.__scat_style != scat_style:
             if scat_style < EScatter.P:
                 shape = QCPScatterStyle(QCPScatterStyle.ssNone)
-            else:
+            elif scat_style < EScatter.D:
                 shape = QCPScatterStyle(QCPScatterStyle.ssPlus)
-            self._graph.setScatterStyle(QCPScatterStyle(shape))
-            # <dirtyhack>  # TODO:
+            else:
+                shape = self.DigitScatterStyle()
+            self._graph.setScatterStyle(shape)
+            # <dirtyhack>
             '''
             if self.__pps < iosc.const.X_SCATTER_NUM <= pps:
                 # self.graph().setScatterStyle(self.__myscatter)