diff --git a/LFtid1056/PQSMsg.h b/LFtid1056/PQSMsg.h index 74cbb0c..4cb0216 100644 --- a/LFtid1056/PQSMsg.h +++ b/LFtid1056/PQSMsg.h @@ -760,7 +760,7 @@ public: // 直接选择绝对值更大的那个(必然是有效数值) float val = (fabs(UU_Deviation[i]) > fabs(UL_Deviation[i])) ? UU_Deviation[i] - : UL_Deviation[i]; + : -UL_Deviation[i]; float_buffer.push_back(val); } @@ -1038,7 +1038,7 @@ public: // 直接选择绝对值更大的那个(必然是有效数值) float val = (fabs(UU_Deviation[i]) > fabs(UL_Deviation[i])) ? UU_Deviation[i] - : UL_Deviation[i]; + : -UL_Deviation[i]; float_buffer.push_back(val); } @@ -1815,7 +1815,11 @@ public: // 9-11: 电压偏差(取不为0的值) for (int i = 0; i < 3; ++i) { - float val = (UU_Deviation[i] != 0.0f) ? UU_Deviation[i] : UL_Deviation[i]; + //float val = (UU_Deviation[i] != 0.0f) ? UU_Deviation[i] : UL_Deviation[i]; + // 直接选择绝对值更大的那个(必然是有效数值) + float val = (fabs(UU_Deviation[i]) > fabs(UL_Deviation[i])) + ? UU_Deviation[i] + : -UL_Deviation[i]; float_buffer.push_back(val); } @@ -1842,7 +1846,12 @@ public: // 26-33: 电压电流序分量(前8个元素) for (int i = 0; i < 2; ++i) { for (int j = 0; j < 4; ++j) { // 取每行的前4个元素 - float_buffer.push_back(UI_Seq[i][j]); + if (j == 3) { + float_buffer.push_back(UI_Seq[i][j+1]); + } + else { + float_buffer.push_back(UI_Seq[i][j]); + } } } @@ -1954,7 +1963,11 @@ public: // 12-14: 电压偏差(取不为0的值) for (int i = 0; i < 3; ++i) { - float val = (UU_Deviation[i] != 0.0f) ? UU_Deviation[i] : UL_Deviation[i]; + //float val = (UU_Deviation[i] != 0.0f) ? UU_Deviation[i] : UL_Deviation[i]; + // 直接选择绝对值更大的那个(必然是有效数值) + float val = (fabs(UU_Deviation[i]) > fabs(UL_Deviation[i])) + ? UU_Deviation[i] + : -UL_Deviation[i]; float_buffer.push_back(val); } @@ -1981,7 +1994,12 @@ public: // 26-33: 电压电流序分量(前8个元素) for (int i = 0; i < 2; ++i) { for (int j = 0; j < 4; ++j) { - float_buffer.push_back(UI_Seq[i][j]); + if (j == 3) { + float_buffer.push_back(UI_Seq[i][j + 1]); + } + else { + float_buffer.push_back(UI_Seq[i][j]); + } } }