From 73d680c356c6ccde9f67d0288933581948a64b08 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Mon, 14 Aug 2017 23:27:12 +0200
Subject: [PATCH] UDPSink plugin GUI: added VU meter

---
 plugins/channelrx/udpsrc/udpsrcgui.ui   | 135 +++++----
 plugins/channeltx/udpsink/udpsinkgui.ui | 372 +++++++++++++-----------
 2 files changed, 263 insertions(+), 244 deletions(-)

diff --git a/plugins/channelrx/udpsrc/udpsrcgui.ui b/plugins/channelrx/udpsrc/udpsrcgui.ui
index ee29cc255..2d374c474 100644
--- a/plugins/channelrx/udpsrc/udpsrcgui.ui
+++ b/plugins/channelrx/udpsrc/udpsrcgui.ui
@@ -150,43 +150,6 @@
       </item>
      </layout>
     </item>
-    <item row="7" column="1">
-     <layout class="QHBoxLayout" name="VolumeLayout">
-      <item>
-       <widget class="QLabel" name="volumeLabel">
-        <property name="text">
-         <string>Vol</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QSlider" name="volume">
-        <property name="toolTip">
-         <string>Audio volume</string>
-        </property>
-        <property name="maximum">
-         <number>100</number>
-        </property>
-        <property name="pageStep">
-         <number>1</number>
-        </property>
-        <property name="value">
-         <number>20</number>
-        </property>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="volumeText">
-        <property name="text">
-         <string>20</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
     <item row="0" column="0">
      <layout class="QHBoxLayout" name="DeltaFrequencyLayout">
       <property name="topMargin">
@@ -358,6 +321,23 @@
       </item>
      </layout>
     </item>
+    <item row="3" column="1">
+     <widget class="QLabel" name="label_3">
+      <property name="text">
+       <string>RF BW (Hz)</string>
+      </property>
+     </widget>
+    </item>
+    <item row="5" column="1">
+     <widget class="QLineEdit" name="rfBandwidth">
+      <property name="toolTip">
+       <string>Signal bandwidth</string>
+      </property>
+      <property name="text">
+       <string>32000</string>
+      </property>
+     </widget>
+    </item>
     <item row="6" column="0">
      <layout class="QHBoxLayout" name="AudioPortLayout">
       <item>
@@ -415,36 +395,6 @@
       </item>
      </layout>
     </item>
-    <item row="5" column="1">
-     <widget class="QLineEdit" name="rfBandwidth">
-      <property name="toolTip">
-       <string>Signal bandwidth</string>
-      </property>
-      <property name="text">
-       <string>32000</string>
-      </property>
-     </widget>
-    </item>
-    <item row="7" column="0">
-     <widget class="QPushButton" name="applyBtn">
-      <property name="enabled">
-       <bool>false</bool>
-      </property>
-      <property name="toolTip">
-       <string>Apply text input and/or samples format</string>
-      </property>
-      <property name="text">
-       <string>Apply</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="1">
-     <widget class="QLabel" name="label_3">
-      <property name="text">
-       <string>RF BW (Hz)</string>
-      </property>
-     </widget>
-    </item>
     <item row="2" column="1">
      <widget class="QLineEdit" name="sampleRate">
       <property name="toolTip">
@@ -529,6 +479,56 @@
       </item>
      </layout>
     </item>
+    <item row="7" column="0">
+     <layout class="QHBoxLayout" name="VolumeLayout">
+      <item>
+       <widget class="QLabel" name="volumeLabel">
+        <property name="text">
+         <string>Vol</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QSlider" name="volume">
+        <property name="toolTip">
+         <string>Audio volume</string>
+        </property>
+        <property name="maximum">
+         <number>100</number>
+        </property>
+        <property name="pageStep">
+         <number>1</number>
+        </property>
+        <property name="value">
+         <number>20</number>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="volumeText">
+        <property name="text">
+         <string>20</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item row="7" column="1">
+     <widget class="QPushButton" name="applyBtn">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
+      <property name="toolTip">
+       <string>Apply text input and/or samples format</string>
+      </property>
+      <property name="text">
+       <string>Apply</string>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QWidget" name="spectrumBox" native="true">
@@ -605,7 +605,6 @@
   <tabstop>sampleFormat</tabstop>
   <tabstop>sampleRate</tabstop>
   <tabstop>rfBandwidth</tabstop>
-  <tabstop>applyBtn</tabstop>
  </tabstops>
  <resources>
   <include location="../../../sdrbase/resources/res.qrc"/>
diff --git a/plugins/channeltx/udpsink/udpsinkgui.ui b/plugins/channeltx/udpsink/udpsinkgui.ui
index 13a3a8fc1..d98024079 100644
--- a/plugins/channeltx/udpsink/udpsinkgui.ui
+++ b/plugins/channeltx/udpsink/udpsinkgui.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>340</width>
+    <width>348</width>
     <height>355</height>
    </rect>
   </property>
@@ -36,7 +36,7 @@
     <rect>
      <x>2</x>
      <y>2</y>
-     <width>330</width>
+     <width>340</width>
      <height>142</height>
     </rect>
    </property>
@@ -65,78 +65,52 @@
     <property name="spacing">
      <number>3</number>
     </property>
-    <item row="1" column="0">
-     <widget class="QLabel" name="label">
-      <property name="text">
-       <string>Format</string>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="0">
-     <widget class="QComboBox" name="sampleFormat">
-      <property name="toolTip">
-       <string>Samples format</string>
-      </property>
-      <property name="currentIndex">
-       <number>0</number>
-      </property>
+    <item row="3" column="0">
+     <layout class="QHBoxLayout" name="AddressLayout">
       <item>
-       <property name="text">
-        <string>S16LE I/Q</string>
-       </property>
+       <widget class="QLabel" name="Addresslabel">
+        <property name="text">
+         <string>Addr</string>
+        </property>
+       </widget>
       </item>
       <item>
-       <property name="text">
-        <string>S16LE NFM</string>
-       </property>
+       <widget class="QLineEdit" name="udpAddress">
+        <property name="toolTip">
+         <string>Remote address</string>
+        </property>
+        <property name="inputMask">
+         <string>000.000.000.000</string>
+        </property>
+        <property name="text">
+         <string>127.0.0.1</string>
+        </property>
+       </widget>
       </item>
       <item>
-       <property name="text">
-        <string>S16LE NFM Mono</string>
-       </property>
+       <widget class="QLabel" name="udpPortlabel">
+        <property name="text">
+         <string>D</string>
+        </property>
+       </widget>
       </item>
       <item>
-       <property name="text">
-        <string>S16LE LSB</string>
-       </property>
+       <widget class="QLineEdit" name="udpPort">
+        <property name="toolTip">
+         <string>Remote data port</string>
+        </property>
+        <property name="inputMask">
+         <string>00000</string>
+        </property>
+        <property name="text">
+         <string>9999</string>
+        </property>
+       </widget>
       </item>
-      <item>
-       <property name="text">
-        <string>S16LE USB</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>S16LE LSB Mono</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>S16LE USB Mono</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>S16LE AM Mono</string>
-       </property>
-      </item>
-     </widget>
+     </layout>
     </item>
     <item row="0" column="2">
      <layout class="QHBoxLayout" name="ChannelPowerLayout">
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
       <item>
        <widget class="QLabel" name="channelPower">
         <property name="toolTip">
@@ -177,30 +151,6 @@
       </item>
      </layout>
     </item>
-    <item row="1" column="2">
-     <widget class="QLabel" name="label_2">
-      <property name="text">
-       <string>Rate (Hz)</string>
-      </property>
-     </widget>
-    </item>
-    <item row="8" column="2">
-     <layout class="QHBoxLayout" name="BoostLayout">
-      <item>
-       <widget class="QPushButton" name="applyBtn">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="toolTip">
-         <string>Apply text input and/or samples format</string>
-        </property>
-        <property name="text">
-         <string>Apply</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
     <item row="0" column="0">
      <layout class="QHBoxLayout" name="DeltaFrequencyLayout">
       <property name="topMargin">
@@ -328,8 +278,8 @@
       </item>
      </layout>
     </item>
-    <item row="7" column="0">
-     <layout class="QHBoxLayout" name="PortLayout">
+    <item row="8" column="0">
+     <layout class="QHBoxLayout" name="FMDevLayout">
       <item>
        <widget class="QLabel" name="fmDevLabel">
         <property name="text">
@@ -352,28 +302,8 @@
       </item>
      </layout>
     </item>
-    <item row="5" column="2">
-     <widget class="QLabel" name="label_3">
-      <property name="text">
-       <string>RF BW (Hz)</string>
-      </property>
-     </widget>
-    </item>
-    <item row="7" column="2">
-     <widget class="QLineEdit" name="rfBandwidth">
-      <property name="toolTip">
-       <string>Signal bandwidth</string>
-      </property>
-      <property name="inputMask">
-       <string>0009999</string>
-      </property>
-      <property name="text">
-       <string>32000</string>
-      </property>
-     </widget>
-    </item>
-    <item row="8" column="0">
-     <layout class="QHBoxLayout" name="AudioPortLayout">
+    <item row="4" column="2">
+     <layout class="QHBoxLayout" name="VolumeLayout">
       <item>
        <widget class="QLabel" name="volumeLabel">
         <property name="text">
@@ -382,21 +312,12 @@
        </widget>
       </item>
       <item>
-       <widget class="QSlider" name="volume">
-        <property name="toolTip">
-         <string>Audio volume</string>
-        </property>
-        <property name="maximum">
-         <number>100</number>
-        </property>
-        <property name="pageStep">
-         <number>1</number>
-        </property>
-        <property name="value">
-         <number>20</number>
-        </property>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+       <widget class="QDial" name="volume">
+        <property name="maximumSize">
+         <size>
+          <width>24</width>
+          <height>24</height>
+         </size>
         </property>
        </widget>
       </item>
@@ -409,58 +330,155 @@
       </item>
      </layout>
     </item>
-    <item row="2" column="2">
-     <widget class="QLineEdit" name="sampleRate">
-      <property name="toolTip">
-       <string>Samples rate</string>
+    <item row="1" column="0" rowspan="2">
+     <layout class="QHBoxLayout" name="FormatLayout">
+      <item>
+       <widget class="QLabel" name="sampleFormatLabel">
+        <property name="maximumSize">
+         <size>
+          <width>30</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Fmt</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="sampleFormat">
+        <property name="toolTip">
+         <string>Samples format</string>
+        </property>
+        <property name="currentIndex">
+         <number>0</number>
+        </property>
+        <item>
+         <property name="text">
+          <string>S16LE I/Q</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>S16LE NFM</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>S16LE NFM Mono</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>S16LE LSB</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>S16LE USB</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>S16LE LSB Mono</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>S16LE USB Mono</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>S16LE AM Mono</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item row="1" column="2">
+     <layout class="QHBoxLayout" name="SampleRateLayout">
+      <item>
+       <widget class="QLabel" name="sampleRateLabel">
+        <property name="minimumSize">
+         <size>
+          <width>21</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>SR</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="sampleRate">
+        <property name="toolTip">
+         <string>Samples rate</string>
+        </property>
+        <property name="inputMask">
+         <string>0009999</string>
+        </property>
+        <property name="text">
+         <string>48000</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item row="3" column="2">
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <widget class="QLabel" name="label_3">
+        <property name="minimumSize">
+         <size>
+          <width>21</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>BW</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="rfBandwidth">
+        <property name="toolTip">
+         <string>Signal bandwidth</string>
+        </property>
+        <property name="inputMask">
+         <string>0009999</string>
+        </property>
+        <property name="text">
+         <string>32000</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item row="8" column="2">
+     <widget class="QPushButton" name="applyBtn">
+      <property name="enabled">
+       <bool>false</bool>
       </property>
-      <property name="inputMask">
-       <string>0009999</string>
+      <property name="toolTip">
+       <string>Apply text input and/or samples format</string>
       </property>
       <property name="text">
-       <string>48000</string>
+       <string>Apply</string>
       </property>
      </widget>
     </item>
-    <item row="5" column="0">
-     <layout class="QHBoxLayout" name="AddressLayout">
+    <item row="4" column="0">
+     <layout class="QHBoxLayout" name="VUMeterLayout">
       <item>
-       <widget class="QLabel" name="Addresslabel">
-        <property name="text">
-         <string>Addr</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="udpAddress">
-        <property name="toolTip">
-         <string>Remote address</string>
-        </property>
-        <property name="inputMask">
-         <string>000.000.000.000</string>
-        </property>
-        <property name="text">
-         <string>127.0.0.1</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="udpPortlabel">
-        <property name="text">
-         <string>D</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="udpPort">
-        <property name="toolTip">
-         <string>Remote data port</string>
-        </property>
-        <property name="inputMask">
-         <string>00000</string>
-        </property>
-        <property name="text">
-         <string>9999</string>
+       <widget class="LevelMeterVU" name="volumeMeter" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
        </widget>
       </item>
@@ -473,7 +491,7 @@
     <rect>
      <x>15</x>
      <y>160</y>
-     <width>231</width>
+     <width>321</width>
      <height>156</height>
     </rect>
    </property>
@@ -537,11 +555,13 @@
    <header>gui/valuedialz.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>LevelMeterVU</class>
+   <extends>QWidget</extends>
+   <header>gui/levelmeter.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
- <tabstops>
-  <tabstop>sampleRate</tabstop>
-  <tabstop>rfBandwidth</tabstop>
- </tabstops>
  <resources>
   <include location="../../../sdrbase/resources/res.qrc"/>
  </resources>