diff --git a/LFtid1056/PQSMsg.h b/LFtid1056/PQSMsg.h index fb3a222..44b76af 100644 --- a/LFtid1056/PQSMsg.h +++ b/LFtid1056/PQSMsg.h @@ -599,10 +599,10 @@ public: for (int j = 0; j < 4; j++) { if (i == 0) { // 电压 if (j == 2) { // 正序 - UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]) * fPT; + UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]);// *fPT; } else if (j < 3) { - UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]) * fPT; + UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]);// *fPT; } else { UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]); @@ -610,7 +610,7 @@ public: } else { // 电流 if (j < 3) { - UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]) * fCT; + UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]);// *fCT; } else { UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]); @@ -635,16 +635,16 @@ public: // 总功率 for (int i = 0; i < 4; i++) { for (int j = 0; j < 3; j++) { - Total_Power[i][j] = IntToFloat(SrcData.Total_Power[i][j]) * fPT * fCT; + Total_Power[i][j] = IntToFloat(SrcData.Total_Power[i][j]);// *fPT* fCT; } } // 谐波功率 for (int i = 0; i < 4; i++) { for (int j = 0; j < HARMNUM; j++) { - Harm_Power[i][j].P = IntToFloat(SrcData.Harm_Power[i][j].P) * fPT * fCT; - Harm_Power[i][j].Q = IntToFloat(SrcData.Harm_Power[i][j].Q) * fPT * fCT; - Harm_Power[i][j].S = IntToFloat(SrcData.Harm_Power[i][j].S) * fPT * fCT; + Harm_Power[i][j].P = IntToFloat(SrcData.Harm_Power[i][j].P);// * fPT * fCT; + Harm_Power[i][j].Q = IntToFloat(SrcData.Harm_Power[i][j].Q);// *fPT* fCT; + Harm_Power[i][j].S = IntToFloat(SrcData.Harm_Power[i][j].S);// *fPT* fCT; } } @@ -656,10 +656,10 @@ public: for (int j = 0; j < HARMNUM; j++) { if (i < 3) { // 电压谐波 - FuHarm[i][j] = IntToFloat(SrcData.FuHarm[i][j]) * fPT; + FuHarm[i][j] = IntToFloat(SrcData.FuHarm[i][j]);// *fPT; } else { // 电流谐波 - FuHarm[i][j] = IntToFloat(SrcData.FuHarm[i][j]) * fCT; + FuHarm[i][j] = IntToFloat(SrcData.FuHarm[i][j]);// *fCT; } FuHarmPhase[i][j] = IntToFloat(SrcData.FuHarmPhase[i][j]); @@ -671,10 +671,10 @@ public: // RMS值 for (int i = 0; i < 9; i++) { if (i > 2 && i < 6) { // 电流 (索引3,4,5) - Rms[i] = IntToFloat(SrcData.Rms[i]) * fCT; + Rms[i] = IntToFloat(SrcData.Rms[i]);// *fCT; } else { // 电压和其他 - Rms[i] = IntToFloat(SrcData.Rms[i]) * fPT; + Rms[i] = IntToFloat(SrcData.Rms[i]);// *fPT; } } }