mirror
/
wfview
kopia lustrzana https://gitlab.com/eliggett/wfview
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'master' into usb-macfix

failbranch
Phil Taylor 2023-02-06 15:03:19 +00:00
rodzic 7b7d21d3a7 16eb4591eb
commit 6464f28159
6 zmienionych plików z 611 dodań i 368 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

80
CHANGELOG
Wyświetl plik

@ -1,3 +1,83 @@
commit eae5b93f0e404fc15561ad310e39fd3be9d01ccf
Merge: 2128e6f 02c1dcd
Author: Roeland Jansen <roeland.jansen69@gmail.com>
Date: Mon Feb 6 10:44:34 2023 +0100
Merge branch 'wsjtx-fix'
commit 02c1dcdb8b2abefe0e78bb53cea4c1e17914746a
Author: Phil Taylor <phil@m0vse.uk>
Date: Sun Feb 5 21:58:49 2023 +0000
Request passband at startup
commit f4e772e1c7903e0d31492917a053e849da38236f
Author: Phil Taylor <phil@m0vse.uk>
Date: Sun Feb 5 21:51:00 2023 +0000
Update wfmain.cpp
commit 4a3f8692b553ad3d5030cf04796fd9f08e966cf6
Author: Phil Taylor <phil@m0vse.uk>
Date: Sun Feb 5 21:50:24 2023 +0000
Update rigState on receipt of new passband from rig.
commit 2ec62b6c807702fb96bc0a10eaa2614ec7bea5b4
Author: Phil Taylor <phil@m0vse.uk>
Date: Sun Feb 5 21:43:51 2023 +0000
Make CRC hex
commit 01e01321d397ef812ceb5d2b2c5e97082d99268b
Author: Phil Taylor <phil@m0vse.uk>
Date: Sun Feb 5 21:40:59 2023 +0000
This might cause a compile warning?
commit f0c8842c058c3481463e8b99e542302eaf96b7a5
Author: Phil Taylor <phil@m0vse.uk>
Date: Sun Feb 5 21:33:02 2023 +0000
Actually send the response!
commit 979dffc1761c5e86821be46b2f16faf5db20c58a
Author: Phil Taylor <phil@m0vse.uk>
Date: Sun Feb 5 21:28:24 2023 +0000
Add some more commands
commit 2128e6fc1080ea7c7a31597e5c23626f97dd4ae4
Merge: fd86efa 27ac972
Author: Phil Taylor <phil@m0vse.uk>
Date: Sun Feb 5 20:15:42 2023 +0000
Merge branch 'wsjtx-fix' into pbt-color-picker
commit fd86efa4b90123882d45a2d86474f69784d35dcc
Author: Phil Taylor <phil@m0vse.uk>
Date: Sun Feb 5 13:21:12 2023 +0000
Add color picker for PBT
commit 27ac972f4a1e5a0d9606d74df47d0a490b1298a0
Author: Phil Taylor <phil@m0vse.uk>
Date: Sun Feb 5 11:30:38 2023 +0000
Add support for latest version of wsjt-x to rigctld
commit bb632b8e2b1115c5e4cf7d56726e6c55046b93a8
Author: Elliott Liggett <kilocharlie8@gmail.com>
Date: Sat Feb 4 09:57:12 2023 -0800
Fixed placement of "out of range" data byte reading.
commit 11f8cb702ff236f96b40ee1e9b255f97becb1a72
Author: Roeland Jansen <roeland.jansen69@gmail.com>
Date: Sat Feb 4 14:49:58 2023 +0100
v1.60 milestone released
commit 82f268508ea210a8a3c89fcc31c7799833cb26ea
Merge: a08ada4 a1db8d1
Author: Roeland Jansen <roeland.jansen69@gmail.com>

139
rigctld.cpp
Wyświetl plik

@ -1081,7 +1081,7 @@ void rigCtlClient::socketReadyRead()
}
else if (command[1] == "LOCK")
{
result = rigState->getBool(LOCKFUNC);
result = rigState->getBool(LOCKFUNC);
}
else {
qInfo(logRigCtlD()) << "Unimplemented func:" << command[0] << command[1];
@ -1227,24 +1227,72 @@ void rigCtlClient::socketReadyRead()
else if (command.length() > 0 && (command[0] == '\x88' || command[0] == "get_powerstat"))
{
QString resp;
if (longReply && command.length() > 1) {
resp.append(QString("Power Status: "));
}
resp.append(QString("%1").arg(1)); // Always reply with ON
response.append(resp);
QString resp;
if (longReply) {
resp.append(QString("Power Status: "));
}
resp.append(QString("%1").arg(1)); // Always reply with ON
response.append(resp);
}
else if (command.length() > 1 && (command[0] == '\x87' || command[0] == "set_powerstat"))
{
setCommand = true;
if (command[1] == "0")
{
rigState->set(POWERONOFF, false, true);
}
else {
rigState->set(POWERONOFF, true, true);
}
setCommand = true;
if (command[1] == "0")
{
rigState->set(POWERONOFF, false, true);
}
else {
rigState->set(POWERONOFF, true, true);
}
}
else if (command.length() > 0 && (command[0] == '\xa3' || command[0] == "get_lock_mode"))
{
QString resp;
if (longReply) {
resp.append(QString("Locked: "));
}
resp.append(QString("%1").arg(0)); // Always reply with RIG_OK (0)
response.append(resp);
}
else if (command.length() > 0 && (command[0] == '\xf5' || command[0] == "get_rig_info"))
{
duplexMode split = rigState->getDuplex(DUPLEX);
quint8 rxa = 1;
quint8 txa = split == 0;
quint8 rxb = !rxa;
quint8 txb = split == 1;
QString resp = QString("VFO=%0 Freq=%1 Mode=%2 Width=%3 RX=%4 TX=%5\nVFO=%6 Freq=%7 Mode=%8 Width=%9 RX=%10 TX=%11\nSplit=%12 SatMode=%13\nRig=%14\nApp=wfview\nVersion=%15\n")
.arg(getVfoName(0)).arg(rigState->getInt64(VFOAFREQ)).arg(getMode(rigState->getChar(MODE), rigState->getBool(DATAMODE))).arg(rigState->getUInt16(PASSBAND)).arg(rxa).arg(txa)
.arg(getVfoName(1)).arg(rigState->getInt64(VFOBFREQ)).arg(getMode(rigState->getChar(MODE), rigState->getBool(DATAMODE))).arg(rigState->getUInt16(PASSBAND)).arg(rxb).arg(txb)
.arg(split).arg(rigState->getChar(SATMODEFUNC)).arg(rigCaps.modelName).arg(WFVIEW_VERSION);
unsigned long crc = doCrc((unsigned char*)resp.toStdString().c_str(), resp.length());
resp = resp + QString("CRC=0x%0").arg(crc, 8, 16, QLatin1Char('0'));
response.append(resp);
}
else if (command.length() > 0 && (command[0] == "a" || command[0] == "get_trn"))
{
responseCode = -18; //Deprecated
}
else if (command.length() > 0 && (command[0] == "A" || command[0] == "set_trn"))
{
responseCode = -18; //Deprecated
}
else if (command.length() > 0 && (command[0] == "G" || command[0] == "vfo_op"))
{
responseCode = -11; //Not implemented
}
else if (command.length() > 0 && (command[0] == "u" || command[0] == "get_func"))
{
responseCode = -11; //Not implemented
}
else if (command.length() > 0 && (command[0] == "U" || command[0] == "set_func"))
{
responseCode = -11; //Not implemented
}
else if (command.length() > 0 && (command[0] == "_" || command[0] == "get_info"))
{
response.append("None");
}
else {
qInfo(logRigCtlD()) << "Unimplemented command" << commands;
@ -1549,6 +1597,26 @@ quint8 rigCtlClient::antFromName(QString name) {
return ret;
}
quint8 rigCtlClient::vfoFromName(QString vfo) {
if (vfo.toUpper() == "VFOA" || vfo.toUpper() == "MAIN") return 0;
if (vfo.toUpper() == "VFOB" || vfo.toUpper() == "SUB") return 1;
if (vfo.toUpper() == "MEM") return 2;
return 0;
}
QString rigCtlClient::getVfoName(quint8 vfo)
{
QString ret;
switch (vfo) {
case 0: ret = "VFOA"; break;
case 1: ret = "VFOB"; break;
default: ret = "MEM"; break;
}
return ret;
}
int rigCtlClient::getCalibratedValue(quint8 meter,cal_table_t cal) {
int interp;
@ -1580,3 +1648,42 @@ int rigCtlClient::getCalibratedValue(quint8 meter,cal_table_t cal) {
return cal.table[i].val - interp;
}
unsigned long rigCtlClient::doCrc(unsigned char* p, size_t n)
{
unsigned long crc = 0xfffffffful;
size_t i;
if (crcTable[0] == 0) { genCrc(crcTable); }
for (i = 0; i < n; i++)
{
crc = crcTable[*p++ ^ (crc & 0xff)] ^ (crc >> 8);
}
return ((~crc) & 0xffffffff);
}
void rigCtlClient::genCrc(unsigned long crcTable[])
{
unsigned long POLYNOMIAL = 0xEDB88320;
unsigned char b = 0;
while (0 != ++b)
{
unsigned long remainder = b;
unsigned long bit;
for (bit = 8; bit > 0; --bit)
{
if (remainder & 1)
{
remainder = (remainder >> 1) ^ POLYNOMIAL;
}
else
{
remainder = (remainder >> 1);
}
}
crcTable[(size_t)b] = remainder;
}
}

6
rigctld.h
Wyświetl plik

@ -403,6 +403,9 @@ private:
rigstate* rigState = Q_NULLPTR;
rigCtlD* parent;
bool chkVfoEecuted=false;
unsigned long crcTable[256];
unsigned long doCrc(unsigned char* p, size_t n);
void genCrc(unsigned long crcTable[]);
QString getMode(quint8 mode, bool datamode);
quint8 getMode(QString modeString);
QString getFilter(quint8 mode, quint8 filter);
@ -410,6 +413,9 @@ private:
quint64 getRadioModes(QString mode = "");
QString getAntName(quint8 ant);
quint8 antFromName(QString name);
quint8 vfoFromName(QString vfo);
QString getVfoName(quint8 vfo);
int getCalibratedValue(quint8 meter,cal_table_t cal);
};

20
wfmain.cpp
Wyświetl plik

@ -3506,6 +3506,7 @@ void wfmain:: getInitialRigState()
{
issueDelayedCommand(cmdGetSpectrumMode);
issueDelayedCommand(cmdGetSpectrumSpan);
issueDelayedCommand(cmdGetPassband);
}
issueDelayedCommand(cmdNone);
@ -3515,7 +3516,7 @@ void wfmain:: getInitialRigState()
{
issueDelayedCommand(cmdGetATUStatus);
}
delayedCommand->start();
}
@ -6902,6 +6903,7 @@ void wfmain::receivePassband(quint16 pass)
if (passbandWidth != (double)(pass / 1000000.0)) {
passbandWidth = (double)(pass / 1000000.0);
trxadj->updatePassband(pass);
rigState->set(PASSBAND, pass, false);
showStatusBarText(QString("IF filter width %1 Hz").arg(pass));
}
}
@ -8198,6 +8200,7 @@ void wfmain::loadColorPresetToUIandPlots(int presetNumber)
setEditAndLedFromColor(p.plotBackground, ui->colorEditPlotBackground, ui->colorSwatchPlotBackground);
setEditAndLedFromColor(p.tuningLine, ui->colorEditTuningLine, ui->colorSwatchTuningLine);
setEditAndLedFromColor(p.passband, ui->colorEditPassband, ui->colorSwatchPassband);
setEditAndLedFromColor(p.pbt, ui->colorEditPBT, ui->colorSwatchPBT);
setEditAndLedFromColor(p.meterLevel, ui->colorEditMeterLevel, ui->colorSwatchMeterLevel);
setEditAndLedFromColor(p.meterAverage, ui->colorEditMeterAvg, ui->colorSwatchMeterAverage);
@ -8451,6 +8454,7 @@ void wfmain::on_colorSetBtnPassband_clicked()
QColor* c = &(colorPreset[pos].passband);
setColorButtonOperations(c, ui->colorEditPassband, ui->colorSwatchPassband);
}
void wfmain::on_colorEditPassband_editingFinished()
{
int pos = ui->colorPresetCombo->currentIndex();
@ -8458,6 +8462,20 @@ void wfmain::on_colorEditPassband_editingFinished()
setColorLineEditOperations(c, ui->colorEditPassband, ui->colorSwatchPassband);
}
void wfmain::on_colorSetBtnPBT_clicked()
{
int pos = ui->colorPresetCombo->currentIndex();
QColor* c = &(colorPreset[pos].pbt);
setColorButtonOperations(c, ui->colorEditPBT, ui->colorSwatchPBT);
}
void wfmain::on_colorEditPBT_editingFinished()
{
int pos = ui->colorPresetCombo->currentIndex();
QColor* c = &(colorPreset[pos].pbt);
setColorLineEditOperations(c, ui->colorEditPBT, ui->colorSwatchPBT);
}
// Meter Level:
void wfmain::on_colorSetBtnMeterLevel_clicked()
{

4
wfmain.h
Wyświetl plik

@ -687,6 +687,10 @@ private slots:
void on_colorEditPassband_editingFinished();
void on_colorSetBtnPBT_clicked();
void on_colorEditPBT_editingFinished();
void on_colorSetBtnMeterLevel_clicked();
void on_colorEditMeterLevel_editingFinished();

730
wfmain.ui
Wyświetl plik

@ -18,7 +18,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
<number>3</number>
</property>
<widget class="QWidget" name="mainTab">
<attribute name="title">
@ -1821,7 +1821,6 @@
<font>
<family>DejaVu Sans Mono</family>
<pointsize>14</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -2246,7 +2245,7 @@
<item>
<widget class="QStackedWidget" name="settingsStack">
<property name="currentIndex">
<number>4</number>
<number>1</number>
</property>
<widget class="QWidget" name="radioAccess">
<layout class="QVBoxLayout" name="verticalLayout_21">
@ -3444,8 +3443,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>570</width>
<height>224</height>
<width>820</width>
<height>302</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">
@ -3470,8 +3469,8 @@
<property name="horizontalSpacing">
<number>6</number>
</property>
<item row="0" column="3">
<widget class="QLedLabel" name="colorSwatchGrid" native="true">
<item row="2" column="11">
<widget class="QLedLabel" name="colorSwatchWfBackground" native="true">
<property name="minimumSize">
<size>
<width>10</width>
@ -3480,10 +3479,46 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QPushButton" name="colorSetBtnText">
<item row="1" column="3">
<widget class="QLedLabel" name="colorSwatchAxis" native="true">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="0" column="10">
<widget class="QLineEdit" name="colorEditMeterScale">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Text</string>
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLineEdit" name="colorEditAxis">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="1" column="9">
<widget class="QPushButton" name="colorSetBtnMeterText">
<property name="text">
<string>Meter Text</string>
</property>
</widget>
</item>
@ -3494,20 +3529,59 @@
</property>
</widget>
</item>
<item row="4" column="9">
<widget class="QPushButton" name="colorSetBtnWfAxis">
<item row="2" column="0">
<widget class="QPushButton" name="colorSetBtnText">
<property name="text">
<string>Waterfall Axis</string>
<string>Text</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="colorSetBtnAxis">
<item row="2" column="2">
<widget class="QLineEdit" name="colorEditText">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Axis</string>
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QLedLabel" name="colorSwatchGrid" native="true">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="0" column="11">
<widget class="QLedLabel" name="colorSwatchMeterScale" native="true">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="0" column="4">
<spacer name="horizontalSpacer_34">
<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 row="2" column="3">
<widget class="QLedLabel" name="colorSwatchText" native="true">
<property name="minimumSize">
@ -3518,6 +3592,19 @@
</property>
</widget>
</item>
<item row="0" column="8">
<spacer name="horizontalSpacer_35">
<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 row="2" column="10">
<widget class="QLineEdit" name="colorEditWfBackground">
<property name="maximumSize">
@ -3531,6 +3618,133 @@
</property>
</widget>
</item>
<item row="0" column="9">
<widget class="QPushButton" name="colorSetBtnMeterScale">
<property name="text">
<string>Meter Scale</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLineEdit" name="colorEditGrid">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Color text format is #AARRGGBB, where AA is the &quot;alpha&quot; channel, and value &quot;00&quot; is totally transparent, and &quot;ff&quot; is totally opaque.</string>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="1" column="11">
<widget class="QLedLabel" name="colorSwatchMeterText" native="true">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="2" column="9">
<widget class="QPushButton" name="colorSetBtnwfBackground">
<property name="text">
<string>Waterfall Back</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="colorSetBtnAxis">
<property name="text">
<string>Axis</string>
</property>
</widget>
</item>
<item row="1" column="10">
<widget class="QLineEdit" name="colorEditMeterText">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QPushButton" name="colorSetBtnPlotBackground">
<property name="text">
<string>Plot Background</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QLineEdit" name="colorEditPlotBackground">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QPushButton" name="colorSetBtnSpecLine">
<property name="text">
<string>Spectrum Line</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QPushButton" name="colorSetBtnSpecFill">
<property name="text">
<string>Spectrum Fill</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QPushButton" name="colorSetBtnUnderlayLine">
<property name="text">
<string>Underlay Line</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QLineEdit" name="colorEditSpecLine">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QLineEdit" name="colorEditSpecFill">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QLineEdit" name="colorEditUnderlayLine">
<property name="maximumSize">
@ -3544,10 +3758,13 @@
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QPushButton" name="colorSetBtnPlotBackground">
<property name="text">
<string>Plot Background</string>
<item row="3" column="3">
<widget class="QLedLabel" name="colorSwatchPlotBackground" native="true">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
</widget>
</item>
@ -3561,69 +3778,6 @@
</property>
</widget>
</item>
<item row="5" column="10">
<widget class="QLineEdit" name="colorEditWfText">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QPushButton" name="colorSetBtnSpecLine">
<property name="text">
<string>Spectrum Line</string>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QLedLabel" name="colorSwatchPlotBackground" native="true">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLineEdit" name="colorEditAxis">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="2" column="9">
<widget class="QPushButton" name="colorSetBtnwfBackground">
<property name="text">
<string>Waterfall Back</string>
</property>
</widget>
</item>
<item row="4" column="10">
<widget class="QLineEdit" name="colorEditWfAxis">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="5" column="3">
<widget class="QLedLabel" name="colorSwatchSpecFill" native="true">
<property name="minimumSize">
@ -3634,125 +3788,6 @@
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QLineEdit" name="colorEditSpecFill">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QLineEdit" name="colorEditPlotBackground">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QLineEdit" name="colorEditSpecLine">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QPushButton" name="colorSetBtnSpecFill">
<property name="text">
<string>Spectrum Fill</string>
</property>
</widget>
</item>
<item row="3" column="9">
<widget class="QPushButton" name="colorSetBtnWfGrid">
<property name="text">
<string>Waterfall Grid</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QLineEdit" name="colorEditText">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="3" column="10">
<widget class="QLineEdit" name="colorEditWfGrid">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QPushButton" name="colorSetBtnUnderlayLine">
<property name="text">
<string>Underlay Line</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLedLabel" name="colorSwatchAxis" native="true">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="5" column="9">
<widget class="QPushButton" name="colorSetBtnWfText">
<property name="text">
<string>Waterfall Text</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLineEdit" name="colorEditGrid">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Color text format is #AARRGGBB, where AA is the &quot;alpha&quot; channel, and value &quot;00&quot; is totally transparent, and &quot;ff&quot; is totally opaque.</string>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="6" column="3">
<widget class="QLedLabel" name="colorSwatchUnderlayLine" native="true">
<property name="minimumSize">
@ -3763,64 +3798,15 @@
</property>
</widget>
</item>
<item row="0" column="8">
<spacer name="horizontalSpacer_35">
<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 row="0" column="4">
<spacer name="horizontalSpacer_34">
<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 row="2" column="11">
<widget class="QLedLabel" name="colorSwatchWfBackground" native="true">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
<item row="8" column="0">
<widget class="QPushButton" name="colorSetBtnUnderlayFill">
<property name="text">
<string>Underlay Fill</string>
</property>
</widget>
</item>
<item row="5" column="11">
<widget class="QLedLabel" name="colorSwatchWfText" native="true">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="1" column="11">
<widget class="QLedLabel" name="colorSwatchMeterText" native="true">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="1" column="10">
<widget class="QLineEdit" name="colorEditMeterText">
<item row="8" column="2">
<widget class="QLineEdit" name="colorEditUnderlayFill">
<property name="maximumSize">
<size>
<width>90</width>
@ -3832,15 +3818,8 @@
</property>
</widget>
</item>
<item row="1" column="9">
<widget class="QPushButton" name="colorSetBtnMeterText">
<property name="text">
<string>Meter Text</string>
</property>
</widget>
</item>
<item row="0" column="11">
<widget class="QLedLabel" name="colorSwatchMeterScale" native="true">
<item row="8" column="3">
<widget class="QLedLabel" name="colorSwatchUnderlayFill" native="true">
<property name="minimumSize">
<size>
<width>10</width>
@ -3849,8 +3828,15 @@
</property>
</widget>
</item>
<item row="0" column="10">
<widget class="QLineEdit" name="colorEditMeterScale">
<item row="0" column="5">
<widget class="QPushButton" name="colorSetBtnTuningLine">
<property name="text">
<string>Tuning Line</string>
</property>
</widget>
</item>
<item row="0" column="6">
<widget class="QLineEdit" name="colorEditTuningLine">
<property name="maximumSize">
<size>
<width>90</width>
@ -3862,15 +3848,8 @@
</property>
</widget>
</item>
<item row="0" column="9">
<widget class="QPushButton" name="colorSetBtnMeterScale">
<property name="text">
<string>Meter Scale</string>
</property>
</widget>
</item>
<item row="6" column="7">
<widget class="QLedLabel" name="colorSwatchMeterPeakScale" native="true">
<item row="0" column="7">
<widget class="QLedLabel" name="colorSwatchTuningLine" native="true">
<property name="minimumSize">
<size>
<width>10</width>
@ -3879,8 +3858,15 @@
</property>
</widget>
</item>
<item row="6" column="6">
<widget class="QLineEdit" name="colorEditMeterPeakScale">
<item row="1" column="5">
<widget class="QPushButton" name="colorSetBtnPassband">
<property name="text">
<string>Passband</string>
</property>
</widget>
</item>
<item row="1" column="6">
<widget class="QLineEdit" name="colorEditPassband">
<property name="maximumSize">
<size>
<width>90</width>
@ -3892,22 +3878,25 @@
</property>
</widget>
</item>
<item row="6" column="5">
<widget class="QPushButton" name="colorSetBtnMeterPeakScale">
<property name="text">
<string>Meter High Scale</string>
<item row="1" column="7">
<widget class="QLedLabel" name="colorSwatchPassband" native="true">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="5" column="5">
<widget class="QPushButton" name="colorSetBtnMeterPeakLevel">
<item row="2" column="5">
<widget class="QPushButton" name="colorSetBtnPBT">
<property name="text">
<string>Meter Peak Level</string>
<string>PBT Indicator</string>
</property>
</widget>
</item>
<item row="5" column="6">
<widget class="QLineEdit" name="colorEditMeterPeakLevel">
<item row="2" column="6">
<widget class="QLineEdit" name="colorEditPBT">
<property name="maximumSize">
<size>
<width>90</width>
@ -3919,8 +3908,8 @@
</property>
</widget>
</item>
<item row="5" column="7">
<widget class="QLedLabel" name="colorSwatchMeterPeakLevel" native="true">
<item row="2" column="7">
<widget class="QLedLabel" name="colorSwatchPBT" native="true">
<property name="minimumSize">
<size>
<width>10</width>
@ -3929,36 +3918,6 @@
</property>
</widget>
</item>
<item row="4" column="7">
<widget class="QLedLabel" name="colorSwatchMeterAverage" native="true">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="4" column="6">
<widget class="QLineEdit" name="colorEditMeterAvg">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="4" column="5">
<widget class="QPushButton" name="colorSetBtnMeterAvg">
<property name="text">
<string>Meter Average</string>
</property>
</widget>
</item>
<item row="3" column="5">
<widget class="QPushButton" name="colorSetBtnMeterLevel">
<property name="text">
@ -3989,15 +3948,15 @@
</property>
</widget>
</item>
<item row="2" column="5">
<widget class="QPushButton" name="colorSetBtnPassband">
<item row="4" column="5">
<widget class="QPushButton" name="colorSetBtnMeterAvg">
<property name="text">
<string>Passband</string>
<string>Meter Average</string>
</property>
</widget>
</item>
<item row="2" column="6">
<widget class="QLineEdit" name="colorEditPassband">
<item row="4" column="6">
<widget class="QLineEdit" name="colorEditMeterAvg">
<property name="maximumSize">
<size>
<width>90</width>
@ -4009,8 +3968,8 @@
</property>
</widget>
</item>
<item row="2" column="7">
<widget class="QLedLabel" name="colorSwatchPassband" native="true">
<item row="4" column="7">
<widget class="QLedLabel" name="colorSwatchMeterAverage" native="true">
<property name="minimumSize">
<size>
<width>10</width>
@ -4019,15 +3978,15 @@
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="QPushButton" name="colorSetBtnTuningLine">
<item row="5" column="5">
<widget class="QPushButton" name="colorSetBtnMeterPeakLevel">
<property name="text">
<string>Tuning Line</string>
<string>Meter Peak Level</string>
</property>
</widget>
</item>
<item row="1" column="6">
<widget class="QLineEdit" name="colorEditTuningLine">
<item row="5" column="6">
<widget class="QLineEdit" name="colorEditMeterPeakLevel">
<property name="maximumSize">
<size>
<width>90</width>
@ -4039,8 +3998,8 @@
</property>
</widget>
</item>
<item row="1" column="7">
<widget class="QLedLabel" name="colorSwatchTuningLine" native="true">
<item row="5" column="7">
<widget class="QLedLabel" name="colorSwatchMeterPeakLevel" native="true">
<property name="minimumSize">
<size>
<width>10</width>
@ -4049,18 +4008,15 @@
</property>
</widget>
</item>
<item row="0" column="7">
<widget class="QLedLabel" name="colorSwatchUnderlayFill" native="true">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
<item row="6" column="5">
<widget class="QPushButton" name="colorSetBtnMeterPeakScale">
<property name="text">
<string>Meter High Scale</string>
</property>
</widget>
</item>
<item row="0" column="6">
<widget class="QLineEdit" name="colorEditUnderlayFill">
<item row="6" column="6">
<widget class="QLineEdit" name="colorEditMeterPeakScale">
<property name="maximumSize">
<size>
<width>90</width>
@ -4072,10 +4028,63 @@
</property>
</widget>
</item>
<item row="0" column="5">
<widget class="QPushButton" name="colorSetBtnUnderlayFill">
<item row="6" column="7">
<widget class="QLedLabel" name="colorSwatchMeterPeakScale" native="true">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="3" column="9">
<widget class="QPushButton" name="colorSetBtnWfGrid">
<property name="text">
<string>Underlay Fill</string>
<string>Waterfall Grid</string>
</property>
</widget>
</item>
<item row="3" column="10">
<widget class="QLineEdit" name="colorEditWfGrid">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="3" column="11">
<widget class="QLedLabel" name="colorSwatchWfGrid" native="true">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="4" column="9">
<widget class="QPushButton" name="colorSetBtnWfAxis">
<property name="text">
<string>Waterfall Axis</string>
</property>
</widget>
</item>
<item row="4" column="10">
<widget class="QLineEdit" name="colorEditWfAxis">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
@ -4089,8 +4098,28 @@
</property>
</widget>
</item>
<item row="3" column="11">
<widget class="QLedLabel" name="colorSwatchWfGrid" native="true">
<item row="5" column="9">
<widget class="QPushButton" name="colorSetBtnWfText">
<property name="text">
<string>Waterfall Text</string>
</property>
</widget>
</item>
<item row="5" column="10">
<widget class="QLineEdit" name="colorEditWfText">
<property name="maximumSize">
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>#AARRGGBB</string>
</property>
</widget>
</item>
<item row="5" column="11">
<widget class="QLedLabel" name="colorSwatchWfText" native="true">
<property name="minimumSize">
<size>
<width>10</width>
@ -5455,7 +5484,6 @@
<widget class="QPushButton" name="exitBtn">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
@ -5475,7 +5503,7 @@
<x>0</x>
<y>0</y>
<width>1042</width>
<height>21</height>
<height>22</height>
</rect>
</property>
</widget>
@ -5502,8 +5530,8 @@
<resources/>
<connections/>
<buttongroups>
<buttongroup name="pollingButtonGroup"/>
<buttongroup name="buttonGroup"/>
<buttongroup name="underlayButtonGroup"/>
<buttongroup name="pollingButtonGroup"/>
</buttongroups>
</ui>