From c9c98b029587e097dffc0b4b7f90ff2e0c9cf71c Mon Sep 17 00:00:00 2001
From: EspoTek <admin@espotek.com>
Date: Sat, 19 Nov 2016 17:29:32 +1100
Subject: [PATCH] Slight change to terminology

Changed things like "Aplitude" to "Amplitude (peak-peak)".
Just to make things a bit less confusing for the user.
---
 Desktop Interface/Labrador.pro.user          |   2 +-
 Desktop Interface/bin/Labrador.exe           | Bin 695808 -> 695808 bytes
 Desktop Interface/mainwindow.ui              |  14 +++++++-------
 Desktop Interface/release/main.obj           | Bin 43965 -> 43965 bytes
 Desktop Interface/release/mainwindow.obj     | Bin 687393 -> 687421 bytes
 Desktop Interface/release/moc_mainwindow.obj | Bin 56995 -> 56995 bytes
 Desktop Interface/ui_mainwindow.h            |   8 ++++----
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Desktop Interface/Labrador.pro.user b/Desktop Interface/Labrador.pro.user
index 144ec73a..803d1dfe 100644
--- a/Desktop Interface/Labrador.pro.user	
+++ b/Desktop Interface/Labrador.pro.user	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.1.0, 2016-11-10T15:49:48. -->
+<!-- Written by QtCreator 4.1.0, 2016-11-15T11:26:59. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/Desktop Interface/bin/Labrador.exe b/Desktop Interface/bin/Labrador.exe
index 33a68b4eb2203f6284e7345c9d85d8d591e1d116..4b23d4571fa1d4c0a8ff13d7884676617e151449 100644
GIT binary patch
delta 96
zcmZqJqt&oSYl8$MGrO18W@*N_nT*Ywt7bi7WL(f3JEuK%4kHjV0WmWWvuux@!#ZVw
psDeg7YGSr7h|pwUVDL{%D^4wGXR~DkVs;?r0AkMVY_?p#5&(3DAJ_l@

delta 96
zcmZqJqt&oSYl8$M^L9~{&C-l<Ga0KlSIv6F$T*`pc20Zj97Z5!0%B$$X4xJ)hjq#V
kQ3eQbaaQn8ODj$-0dw2gY}tUA9f&!Am~%UuE!VFE05j_yL;wH)

diff --git a/Desktop Interface/mainwindow.ui b/Desktop Interface/mainwindow.ui
index ca658703..2b20088a 100644
--- a/Desktop Interface/mainwindow.ui	
+++ b/Desktop Interface/mainwindow.ui	
@@ -800,7 +800,7 @@
            <item>
             <widget class="QLabel" name="amplitudeLabel_CH1">
              <property name="text">
-              <string>Amplitude</string>
+              <string>Amplitude (Peak-Peak)</string>
              </property>
             </widget>
            </item>
@@ -820,7 +820,7 @@
            <item>
             <widget class="QLabel" name="dcOffsetLabel_CH1">
              <property name="text">
-              <string>DC Offset</string>
+              <string>Offset</string>
              </property>
             </widget>
            </item>
@@ -910,7 +910,7 @@
               <bool>true</bool>
              </property>
              <property name="text">
-              <string>Amplitude</string>
+              <string>Amplitude (Peak-Peak)</string>
              </property>
             </widget>
            </item>
@@ -936,7 +936,7 @@
               <bool>true</bool>
              </property>
              <property name="text">
-              <string>DC Offset</string>
+              <string>Offset</string>
              </property>
             </widget>
            </item>
@@ -1068,7 +1068,7 @@
         <item>
          <widget class="QGroupBox" name="busSifferGroup_CH1">
           <property name="title">
-           <string>Bus Sniffer CH1</string>
+           <string>Logic Analyzer CH1</string>
           </property>
           <property name="checkable">
            <bool>true</bool>
@@ -1148,7 +1148,7 @@
            <bool>false</bool>
           </property>
           <property name="title">
-           <string>Bus Sniffer CH2</string>
+           <string>Logic Analyzer CH2</string>
           </property>
           <property name="checkable">
            <bool>true</bool>
@@ -1405,7 +1405,7 @@
    </widget>
    <widget class="QMenu" name="menuBus_Sniffer">
     <property name="title">
-     <string>Bus Sniffer</string>
+     <string>Logic Analyzer</string>
     </property>
     <widget class="QMenu" name="menuUART_1">
      <property name="title">
diff --git a/Desktop Interface/release/main.obj b/Desktop Interface/release/main.obj
index aea34bd79bc0721b77ac12da6de33e431a398860..77dd6efec3c84ce9b0c7de288c5e01b8a481737f 100644
GIT binary patch
delta 18
acmdmcooVlNCiaxJGYqU=S{vE7tp)%~TL*jq

delta 18
acmdmcooVlNCiaxJGYnfrRW`D3TMYnC&j;}U

diff --git a/Desktop Interface/release/mainwindow.obj b/Desktop Interface/release/mainwindow.obj
index 72baa90eb9c32fa3711c0d68a5065c2e769ac124..7826ccdf7a42774f5bca9ba235c74aed786d9db3 100644
GIT binary patch
delta 9771
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

delta 9711
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
F`~RU%fK~ti

diff --git a/Desktop Interface/release/moc_mainwindow.obj b/Desktop Interface/release/moc_mainwindow.obj
index bb5f01cc4381f45c1d3e2aca0b85ba452554564b..32881448e85d989226ad790a4a32ef2c2980e704 100644
GIT binary patch
delta 18
acmZ3ymwEACX7-e}3k<AYS{vEt+yekb8wWE0

delta 18
acmZ3ymwEACX7-e}3k=&uRW`EExd#A9od>D_

diff --git a/Desktop Interface/ui_mainwindow.h b/Desktop Interface/ui_mainwindow.h
index cf90ea3a..5855a346 100644
--- a/Desktop Interface/ui_mainwindow.h	
+++ b/Desktop Interface/ui_mainwindow.h	
@@ -1594,16 +1594,16 @@ public:
         signalGenGroup_CH1->setTitle(QApplication::translate("MainWindow", "Signal Gen CH1", 0));
         waveformLabel_CH1->setText(QApplication::translate("MainWindow", "Waveform", 0));
         frequencyLabel_CH1->setText(QApplication::translate("MainWindow", "Frequency", 0));
-        amplitudeLabel_CH1->setText(QApplication::translate("MainWindow", "Amplitude", 0));
+        amplitudeLabel_CH1->setText(QApplication::translate("MainWindow", "Amplitude (Peak-Peak)", 0));
         amplitudeValue_CH1->setSuffix(QApplication::translate("MainWindow", "V", 0));
-        dcOffsetLabel_CH1->setText(QApplication::translate("MainWindow", "DC Offset", 0));
+        dcOffsetLabel_CH1->setText(QApplication::translate("MainWindow", "Offset", 0));
         dcOffsetValue_CH1->setSuffix(QApplication::translate("MainWindow", "V", 0));
         signalGenGroup_CH2->setTitle(QApplication::translate("MainWindow", "Signal Gen CH2", 0));
         waveformLabel_CH2->setText(QApplication::translate("MainWindow", "Waveform", 0));
         frequencyLabel_CH2->setText(QApplication::translate("MainWindow", "Frequency", 0));
-        amplitudeLabel_CH2->setText(QApplication::translate("MainWindow", "Amplitude", 0));
+        amplitudeLabel_CH2->setText(QApplication::translate("MainWindow", "Amplitude (Peak-Peak)", 0));
         amplitudeValue_CH2->setSuffix(QApplication::translate("MainWindow", "V", 0));
-        dcOffsetLabel_CH2->setText(QApplication::translate("MainWindow", "DC Offset", 0));
+        dcOffsetLabel_CH2->setText(QApplication::translate("MainWindow", "Offset", 0));
         dcOffsetValue_CH2->setSuffix(QApplication::translate("MainWindow", "V", 0));
         controller_iso->setText(QApplication::translate("MainWindow", "SALUTON MI ESTAS ISO DRIVER", 0));
         psuGroup->setTitle(QApplication::translate("MainWindow", "PSU", 0));