diff --git a/dialog.cpp b/dialog.cpp
index 6c2573b..63fa5f0 100644
--- a/dialog.cpp
+++ b/dialog.cpp
@@ -700,16 +700,32 @@ void Dialog::on_pushButtonInfo_clicked()
void Dialog::valueMultimeter1(QString value,QString unit)
{
- ui->lineEditUnit1->setText(unit);
- ui->lineEditValue1->setText(value);
+ if(unit=="A" || unit=="mA")
+ {
+ ui->lineEditUnitA1->setText(unit);
+ ui->lineEditValueA1->setText(value);
+ }
+ if(unit=="V" || unit=="mV")
+ {
+ ui->lineEditUnitV1->setText(unit);
+ ui->lineEditValueV1->setText(value);
+ }
dltMiniServer.sendValue3(dltMultimeter1.getPowerName(),value,unit);
}
void Dialog::valueMultimeter2(QString value,QString unit)
{
- ui->lineEditUnit2->setText(unit);
- ui->lineEditValue2->setText(value);
+ if(unit=="A" || unit=="mA")
+ {
+ ui->lineEditUnitA2->setText(unit);
+ ui->lineEditValueA2->setText(value);
+ }
+ if(unit=="V" || unit=="mV")
+ {
+ ui->lineEditUnitV2->setText(unit);
+ ui->lineEditValueV2->setText(value);
+ }
dltMiniServer.sendValue3(dltMultimeter2.getPowerName(),value,unit);
}
diff --git a/dialog.ui b/dialog.ui
index b38df8c..6651910 100644
--- a/dialog.ui
+++ b/dialog.ui
@@ -6,8 +6,8 @@
0
0
- 1246
- 695
+ 906
+ 725
@@ -83,13 +83,13 @@
Value
-
- -
-
+
+
-
+
Arial
- 24
+ 16
@@ -97,12 +97,12 @@
- -
-
+
-
+
Arial
- 24
+ 16
@@ -110,6 +110,26 @@
+ -
+
+
+
+ Arial
+ 16
+
+
+
+
+ -
+
+
+
+ Arial
+ 16
+
+
+
+
@@ -163,13 +183,13 @@
Value
-
- -
-
+
+
-
+
Arial
- 24
+ 16
@@ -177,12 +197,12 @@
- -
-
+
-
+
Arial
- 24
+ 16
@@ -190,6 +210,26 @@
+ -
+
+
+
+ Arial
+ 16
+
+
+
+
+ -
+
+
+
+ Arial
+ 16
+
+
+
+
diff --git a/dltmultimeter.cpp b/dltmultimeter.cpp
index cd75e69..12504c2 100644
--- a/dltmultimeter.cpp
+++ b/dltmultimeter.cpp
@@ -200,9 +200,9 @@ void DLTMultimeter::readyRead()
else if(line.length()==9)
{
valueMultimeter(QString("%1%2.%3%4").arg(line[4]).arg(line[5]).arg(line[6]).arg(line[7]),"A");
+ valueMultimeter(QString("%1%2.%3%4").arg(line[0]).arg(line[1]).arg(line[2]).arg(line[3]),"V");
}
-
serialData.remove(0,pos+1);
pos = serialData.indexOf('\r');
}