fix bugs,keypahase and relay

This commit is contained in:
zhangsheng 2025-08-23 17:32:53 +08:00
parent bdeba32f9d
commit 19eeb8246e
8 changed files with 192 additions and 65 deletions

View File

@ -444,6 +444,12 @@
<height>25</height>
</size>
</property>
<property name="contextMenuPolicy">
<enum>Qt::ActionsContextMenu</enum>
</property>
<property name="currentIndex">
<number>1</number>
</property>
<item>
<property name="text">
<string>g</string>
@ -684,6 +690,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -700,6 +709,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -774,6 +786,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -790,6 +805,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -864,6 +882,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -880,6 +901,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>

View File

@ -394,7 +394,7 @@
</rect>
</property>
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="tab_8">
<attribute name="title">
@ -694,6 +694,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -710,6 +713,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -784,6 +790,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -800,6 +809,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -874,6 +886,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -890,6 +905,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>

View File

@ -98,7 +98,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>1</number>
<number>2</number>
</property>
<widget class="QWidget" name="tab_5">
<attribute name="title">
@ -369,7 +369,7 @@
<item>
<widget class="QTabWidget" name="tabWidget_4">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="tab_8">
<attribute name="title">
@ -429,6 +429,9 @@
<height>25</height>
</size>
</property>
<property name="currentIndex">
<number>4</number>
</property>
<item>
<property name="text">
<string>g</string>
@ -669,6 +672,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -685,6 +691,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -759,6 +768,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -775,6 +787,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -849,6 +864,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -865,6 +883,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -1135,7 +1156,7 @@
<item>
<widget class="QTabWidget" name="tabWidget_3">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="tab_10">
<attribute name="title">
@ -1195,6 +1216,9 @@
<height>25</height>
</size>
</property>
<property name="currentIndex">
<number>4</number>
</property>
<item>
<property name="text">
<string>g</string>
@ -1405,6 +1429,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -1421,6 +1448,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -1495,6 +1525,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -1511,6 +1544,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -1585,6 +1621,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -1601,6 +1640,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>

View File

@ -111,7 +111,7 @@
</size>
</property>
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
@ -200,6 +200,9 @@
<height>16777215</height>
</size>
</property>
<property name="currentIndex">
<number>3</number>
</property>
<item>
<property name="text">
<string>g</string>
@ -363,7 +366,7 @@
<double>-100.000000000000000</double>
</property>
<property name="value">
<double>20.000000000000000</double>
<double>-2.000000000000000</double>
</property>
</widget>
</item>
@ -399,7 +402,7 @@
<double>-100.000000000000000</double>
</property>
<property name="value">
<double>-20.000000000000000</double>
<double>-18.000000000000000</double>
</property>
</widget>
</item>
@ -638,6 +641,9 @@
<height>16777215</height>
</size>
</property>
<property name="currentIndex">
<number>3</number>
</property>
<item>
<property name="text">
<string>g</string>
@ -801,7 +807,7 @@
<double>-100.000000000000000</double>
</property>
<property name="value">
<double>20.000000000000000</double>
<double>-2.000000000000000</double>
</property>
</widget>
</item>
@ -837,7 +843,7 @@
<double>-100.000000000000000</double>
</property>
<property name="value">
<double>-20.000000000000000</double>
<double>-18.000000000000000</double>
</property>
</widget>
</item>
@ -1394,6 +1400,9 @@
<height>16777215</height>
</size>
</property>
<property name="currentIndex">
<number>3</number>
</property>
<item>
<property name="text">
<string>g</string>
@ -1557,7 +1566,7 @@
<double>-100.000000000000000</double>
</property>
<property name="value">
<double>20.000000000000000</double>
<double>-2.000000000000000</double>
</property>
</widget>
</item>
@ -1593,7 +1602,7 @@
<double>-100.000000000000000</double>
</property>
<property name="value">
<double>-20.000000000000000</double>
<double>-18.000000000000000</double>
</property>
</widget>
</item>
@ -1832,6 +1841,9 @@
<height>16777215</height>
</size>
</property>
<property name="currentIndex">
<number>3</number>
</property>
<item>
<property name="text">
<string>g</string>
@ -1995,7 +2007,7 @@
<double>-100.000000000000000</double>
</property>
<property name="value">
<double>20.000000000000000</double>
<double>-2.000000000000000</double>
</property>
</widget>
</item>
@ -2031,7 +2043,7 @@
<double>-100.000000000000000</double>
</property>
<property name="value">
<double>-20.000000000000000</double>
<double>-18.000000000000000</double>
</property>
</widget>
</item>

View File

@ -109,7 +109,6 @@ void SingleRelay::Init(){
std::shared_ptr<CardBase> cardbase_ptr = ConfigMgr::Instance()->GetSlotPtr(i + 1);
if(cardbase_ptr != nullptr &&
cardbase_ptr->card_type_ == kCardVibSingle){
qDebug() << "i" << i;
std::shared_ptr<VibrationData> ptr = std::dynamic_pointer_cast<VibrationData>(cardbase_ptr);
for (int var = 0; var < CHANNEL_COUNT; ++var) {
std::shared_ptr<VariableBase> variable_base = ptr->GetChannelPtr(var + 1);
@ -175,6 +174,8 @@ void SingleRelay::OnButtonGroup(QAbstractButton *slot_btn) {
for(int var = 0; var < CHANNEL_COUNT ; ++var){
std::shared_ptr<CardBase> base_ptr = ConfigMgr::Instance()->GetSlotPtr(button_id);
std::shared_ptr<VariableBase> variable_base = ptr->GetChannelPtr(var + 1);
if(variable_base == nullptr)
continue;
if(base_ptr->card_type_ == kCardVibSingle){
QString item_data;
if(variable_base->alert_high.enable){

View File

@ -158,7 +158,7 @@
<double>50.000000000000000</double>
</property>
<property name="value">
<double>25.000000000000000</double>
<double>-2.000000000000000</double>
</property>
</widget>
</item>
@ -213,7 +213,7 @@
<double>50.000000000000000</double>
</property>
<property name="value">
<double>-25.000000000000000</double>
<double>-18.000000000000000</double>
</property>
</widget>
</item>
@ -1374,7 +1374,7 @@
<double>50.000000000000000</double>
</property>
<property name="value">
<double>25.000000000000000</double>
<double>-2.000000000000000</double>
</property>
</widget>
</item>
@ -1429,7 +1429,7 @@
<double>50.000000000000000</double>
</property>
<property name="value">
<double>-25.000000000000000</double>
<double>-18.000000000000000</double>
</property>
</widget>
</item>
@ -2572,7 +2572,7 @@
<double>50.000000000000000</double>
</property>
<property name="value">
<double>25.000000000000000</double>
<double>-2.000000000000000</double>
</property>
</widget>
</item>
@ -2627,7 +2627,7 @@
<double>50.000000000000000</double>
</property>
<property name="value">
<double>-25.000000000000000</double>
<double>-18.000000000000000</double>
</property>
</widget>
</item>
@ -3770,7 +3770,7 @@
<double>50.000000000000000</double>
</property>
<property name="value">
<double>25.000000000000000</double>
<double>-2.000000000000000</double>
</property>
</widget>
</item>
@ -3825,7 +3825,7 @@
<double>50.000000000000000</double>
</property>
<property name="value">
<double>-25.000000000000000</double>
<double>-18.000000000000000</double>
</property>
</widget>
</item>
@ -5011,8 +5011,8 @@
<resources/>
<connections/>
<buttongroups>
<buttongroup name="buttonGroup"/>
<buttongroup name="buttonGroup_2"/>
<buttongroup name="buttonGroup"/>
<buttongroup name="buttonGroup_3"/>
</buttongroups>
</ui>

View File

@ -369,7 +369,7 @@
<item>
<widget class="QTabWidget" name="tabWidget_3">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="tab_8">
<attribute name="title">
@ -433,6 +433,9 @@
<height>25</height>
</size>
</property>
<property name="currentIndex">
<number>5</number>
</property>
<item>
<property name="text">
<string>g</string>
@ -490,41 +493,11 @@
<height>25</height>
</size>
</property>
<item>
<property name="text">
<string>True Peak</string>
</property>
</item>
<item>
<property name="text">
<string>True Peak-To-Peak</string>
</property>
</item>
<item>
<property name="text">
<string>RMS Scaled Peak</string>
</property>
</item>
<item>
<property name="text">
<string>RMS Scaled Peak-To-Peak</string>
</property>
</item>
<item>
<property name="text">
<string>AVG</string>
</property>
</item>
<item>
<property name="text">
<string>RMS Scaled AVG</string>
</property>
</item>
<item>
<property name="text">
<string>RMS</string>
</property>
</item>
</widget>
</item>
<item>
@ -739,6 +712,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -755,12 +731,15 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_alert_low_level">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -774,12 +753,15 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_danger_low_level">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -793,6 +775,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
</layout>
@ -829,6 +814,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -845,12 +833,15 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_alert_low_hysteresis">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -864,12 +855,15 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_danger_low_hysteresis">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -883,6 +877,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
</layout>
@ -919,6 +916,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -935,12 +935,15 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_alert_low_delay">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -954,12 +957,15 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_danger_low_delay">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -973,6 +979,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
</layout>
@ -1042,7 +1051,7 @@
<item>
<widget class="QCheckBox" name="checkBox_alert_low_enable">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1064,7 +1073,7 @@
<item>
<widget class="QCheckBox" name="checkBox_danger_low_enable">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1132,7 +1141,7 @@
<item>
<widget class="QCheckBox" name="checkBox_alert_low_latch">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1148,7 +1157,7 @@
<item>
<widget class="QCheckBox" name="checkBox_danger_low_latch">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>

View File

@ -375,7 +375,7 @@
<item>
<widget class="QTabWidget" name="tabWidget_3">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="tab_8">
<attribute name="title">
@ -435,6 +435,9 @@
<height>25</height>
</size>
</property>
<property name="currentIndex">
<number>2</number>
</property>
<item>
<property name="text">
<string>g</string>
@ -675,6 +678,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -691,6 +697,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -765,6 +774,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -781,6 +793,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -855,6 +870,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
@ -871,6 +889,9 @@
<height>25</height>
</size>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>