Use also voltage value in power supply

alexmucde · Jul 9, 2021 · 10f02f3 · 10f02f3
1 parent 14a9799
commit 10f02f3
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 21 deletions.
diff --git 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
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1246</width>
-    <height>695</height>
+    <width>906</width>
+    <height>725</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -83,33 +83,53 @@
           <property name="title">
            <string>Value</string>
           </property>
-          <layout class="QHBoxLayout" name="horizontalLayout_5">
-           <item>
-            <widget class="QLineEdit" name="lineEditValue1">
+          <layout class="QFormLayout" name="formLayout">
+           <item row="0" column="0">
+            <widget class="QLineEdit" name="lineEditValueV1">
              <property name="font">
               <font>
                <family>Arial</family>
-               <pointsize>24</pointsize>
+               <pointsize>16</pointsize>
               </font>
              </property>
              <property name="readOnly">
               <bool>true</bool>
              </property>
             </widget>
            </item>
-           <item>
-            <widget class="QLineEdit" name="lineEditUnit1">
+           <item row="0" column="1">
+            <widget class="QLineEdit" name="lineEditUnitV1">
              <property name="font">
               <font>
                <family>Arial</family>
-               <pointsize>24</pointsize>
+               <pointsize>16</pointsize>
               </font>
              </property>
              <property name="readOnly">
               <bool>true</bool>
              </property>
             </widget>
            </item>
+           <item row="1" column="0">
+            <widget class="QLineEdit" name="lineEditValueA1">
+             <property name="font">
+              <font>
+               <family>Arial</family>
+               <pointsize>16</pointsize>
+              </font>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QLineEdit" name="lineEditUnitA1">
+             <property name="font">
+              <font>
+               <family>Arial</family>
+               <pointsize>16</pointsize>
+              </font>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </item>
@@ -163,33 +183,53 @@
           <property name="title">
            <string>Value</string>
           </property>
-          <layout class="QHBoxLayout" name="horizontalLayout_12">
-           <item>
-            <widget class="QLineEdit" name="lineEditValue2">
+          <layout class="QFormLayout" name="formLayout_2">
+           <item row="0" column="0">
+            <widget class="QLineEdit" name="lineEditValueV2">
              <property name="font">
               <font>
                <family>Arial</family>
-               <pointsize>24</pointsize>
+               <pointsize>16</pointsize>
               </font>
              </property>
              <property name="readOnly">
               <bool>true</bool>
              </property>
             </widget>
            </item>
-           <item>
-            <widget class="QLineEdit" name="lineEditUnit2">
+           <item row="0" column="1">
+            <widget class="QLineEdit" name="lineEditUnitV2">
              <property name="font">
               <font>
                <family>Arial</family>
-               <pointsize>24</pointsize>
+               <pointsize>16</pointsize>
               </font>
              </property>
              <property name="readOnly">
               <bool>true</bool>
              </property>
             </widget>
            </item>
+           <item row="1" column="0">
+            <widget class="QLineEdit" name="lineEditValueA2">
+             <property name="font">
+              <font>
+               <family>Arial</family>
+               <pointsize>16</pointsize>
+              </font>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QLineEdit" name="lineEditUnitA2">
+             <property name="font">
+              <font>
+               <family>Arial</family>
+               <pointsize>16</pointsize>
+              </font>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </item>

diff --git 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');
             }