@@ -25,10 +25,10 @@ class TMC4671Ui(WidgetUI,CommunicationHandler):
25
25
STATES = ["uninitialized" ,"waitPower" ,"Shutdown" ,"Running" ,"EncoderInit" ,"EncoderFinished" ,"HardError" ,"OverTemp" ,"IndexSearch" ,"FullCalibration" ,"ExternalEncoderInit" ,"PI Autotune" ]
26
26
27
27
def __init__ (self , main = None , unique = 0 ):
28
- self .axis = 0
29
- self .init_done = False
30
28
WidgetUI .__init__ (self , main ,'tmc4671_ui.ui' )
31
29
CommunicationHandler .__init__ (self )
30
+ self .axis = 0
31
+ self .init_done = False
32
32
self .main = main #type: main.MainUi
33
33
34
34
self .axis = unique
@@ -58,23 +58,23 @@ def __init__(self, main=None, unique=0):
58
58
self .chart = QChart ()
59
59
self .chart .setBackgroundRoundness (5 )
60
60
self .chart .setMargins (QMargins (0 ,0 ,0 ,0 ))
61
- self .chartXaxis = QValueAxis ()
61
+ self .chartXaxis = QValueAxis (self . chart )
62
62
# use Application.instance().palette().dark().color() but with 50% opacity
63
63
self .chartXaxis .setGridLineColor (QColor (QApplication .instance ().palette ().dark ().color ().red (),QApplication .instance ().palette ().dark ().color ().green (),QApplication .instance ().palette ().dark ().color ().blue (),128 ))
64
64
65
65
66
66
self .chart .addAxis (self .chartXaxis ,Qt .AlignmentFlag .AlignBottom )
67
67
68
- self .chartYaxis_Amps = QValueAxis ()
69
- self .chartYaxis_Temps = QValueAxis ()
68
+ self .chartYaxis_Amps = QValueAxis (self . chart )
69
+ self .chartYaxis_Temps = QValueAxis (self . chart )
70
70
# use Application.instance().palette().dark().color() but with 25% opacity
71
71
self .chartYaxis_Amps .setGridLineColor (QColor (QApplication .instance ().palette ().dark ().color ().red (),QApplication .instance ().palette ().dark ().color ().green (),QApplication .instance ().palette ().dark ().color ().blue (),64 ))
72
72
self .chartYaxis_Temps .setGridLineColor (QColor (QApplication .instance ().palette ().dark ().color ().red (),QApplication .instance ().palette ().dark ().color ().green (),QApplication .instance ().palette ().dark ().color ().blue (),64 ))
73
73
self .chart .setBackgroundBrush (QApplication .instance ().palette ().window ())
74
74
75
75
self .chart .addAxis (self .chartYaxis_Amps ,Qt .AlignmentFlag .AlignLeft )
76
76
77
- self .lines_Amps = QLineSeries ()
77
+ self .lines_Amps = QLineSeries (self . chart )
78
78
self .lines_Amps .setName ("Torque A" )
79
79
self .lines_Amps .setUseOpenGL (True )
80
80
@@ -83,7 +83,7 @@ def __init__(self, main=None, unique=0):
83
83
self .lines_Amps .attachAxis (self .chartYaxis_Amps )
84
84
self .lines_Amps .attachAxis (self .chartXaxis )
85
85
86
- self .lines_Flux = QLineSeries ()
86
+ self .lines_Flux = QLineSeries (self . chart )
87
87
self .lines_Flux .setName ("Flux A" )
88
88
self .lines_Flux .setOpacity (0.5 )
89
89
self .lines_Flux .setUseOpenGL (True )
@@ -94,7 +94,7 @@ def __init__(self, main=None, unique=0):
94
94
self .lines_Flux .attachAxis (self .chartYaxis_Amps )
95
95
self .lines_Flux .attachAxis (self .chartXaxis )
96
96
97
- self .lines_Temps = QLineSeries ()
97
+ self .lines_Temps = QLineSeries (self . chart )
98
98
self .lines_Temps .setName ("Temp °C" )
99
99
self .lines_Temps .setColor (QColor ("orange" ))
100
100
self .lines_Temps .setOpacity (0.5 )
@@ -406,7 +406,7 @@ def advancedPidChanged(self,state):
406
406
self .checkBox_I_Precision .setChecked (False )
407
407
408
408
def showVersionSelectorPopup (self ):
409
- selectorPopup = OptionsDialog (TMC_HW_Version_Selector (self .tr ("TMC Version" ),self ,self .axis ),self . main )
409
+ selectorPopup = OptionsDialog (TMC_HW_Version_Selector (self .tr ("TMC Version" ),self ,self .axis ),self )
410
410
selectorPopup .exec ()
411
411
self .send_command ("tmc" ,"tmcHwType" ,self .axis ,'!' )
412
412
self .send_command ("tmc" ,"tmcHwType" ,self .axis ,'?' )
0 commit comments