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

Various tidying fixes 

Add date/time support back

Fix some compile warnings.

Replace foreach with for to stop local copies of container
translations
Phil Taylor 2024-10-26 10:33:32 +01:00
rodzic 232a1f949e
commit 677b21dc67
14 zmienionych plików z 170 dodań i 104 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
audiodevices.cpp
Wyświetl plik

@ -40,7 +40,7 @@ void audioDevices::enumerate()
qInfo(logAudio()) << "Audio device(s) found (*=default)";
#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
foreach(const QAudioDeviceInfo & deviceInfo, QAudioDeviceInfo::availableDevices(QAudio::AudioInput))
for(const auto &deviceInfo: QAudioDeviceInfo::availableDevices(QAudio::AudioInput))
#else
const auto audioInputs = mediaDevices.audioInputs();
for (const QAudioDevice& deviceInfo : audioInputs)
@ -99,7 +99,7 @@ void audioDevices::enumerate()
}
#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
foreach(const QAudioDeviceInfo & deviceInfo, QAudioDeviceInfo::availableDevices(QAudio::AudioOutput))
for(const auto &deviceInfo: QAudioDeviceInfo::availableDevices(QAudio::AudioOutput))
#else
const auto audioOutputs = mediaDevices.audioOutputs();
for (const QAudioDevice& deviceInfo : audioOutputs)

5
cachingqueue.cpp
Wyświetl plik

@ -190,7 +190,7 @@ void cachingQueue::add(queuePriority prio ,queueItem item)
qWarning() << "Warning, cannot add recurring command with immediate priority!" << funcString[item.command];
} else {
if (item.recurring) {
// also insert an immediate command to get the current value "now" (removes the need to get rigstate)
// also insert an immediate command to get the current value "now" (removes the need to get rigstate)
queueItem it=item;
it.recurring=false;
it.param.clear();
@ -440,7 +440,8 @@ bool cachingQueue::compare(QVariant a, QVariant b)
} else if (!strcmp(a.typeName(),"centerSpanData")) {
if (a.value<centerSpanData>().cstype != b.value<centerSpanData>().cstype || a.value<centerSpanData>().freq != b.value<centerSpanData>().freq )
changed=true;
} else if (!strcmp(a.typeName(),"scopeData") || !strcmp(a.typeName(),"memoryType") || !strcmp(a.typeName(),"bandStackType") ) {
} else if (!strcmp(a.typeName(),"scopeData") || !strcmp(a.typeName(),"memoryType")
|| !strcmp(a.typeName(),"bandStackType") || !strcmp(a.typeName(),"timekind") || !strcmp(a.typeName(),"datekind") ) {
changed=true; // Always different
} else {
// Maybe Try simple comparison?

2
commhandler.cpp
Wyświetl plik

@ -28,7 +28,7 @@ commHandler::commHandler(QString portName, quint32 baudRate, quint8 wfFormat, QO
if (wfFormat == 1) { // Single waterfall packet
combineWf = true;
qDebug(logSerial()) << "*********** Combine Waterfall Mode Enabled!";
qDebug(logSerial()) << "Combine Waterfall Mode Enabled!";
}
// TODO: The following should become arguments and/or functions

49
icomcommander.cpp
Wyświetl plik

@ -954,7 +954,7 @@ void icomCommander::parseCommand()
bandStackType bsr;
bsr.band = bcdHexToUChar(payloadIn[0]);
bsr.regCode = bcdHexToUChar(payloadIn[1]);
foreach (bandType b, rigCaps.bands)
for (const auto &b: rigCaps.bands)
{
if (b.bsr == bsr.band)
{
@ -1193,13 +1193,13 @@ void icomCommander::parseCommand()
qWarning(logRig()) << "Error (FA) received from rig, last command sent:";
QStringList messages = getHexArray(lastCommandToRig);
foreach (auto msg, messages)
for (const auto &msg: messages)
qWarning(logRig()) << msg;
}
break;
}
default:
qWarning(logRig()) << "Unhandled command received from rig" << payloadIn.toHex().mid(0,10) << "Contact support!";
qWarning(logRig()).noquote() << "Unhandled command received from rig " << payloadIn.toHex().mid(0,10);
break;
}
@ -2366,6 +2366,20 @@ uchar icomCommander::makeFilterWidth(ushort pass,uchar receiver)
return b1;
}
unsigned char icomCommander::convertNumberToHex(unsigned char num)
{
// Two digit only
if(num > 99)
{
qInfo(logRig()) << "Invalid numeric conversion from num " << num << " to hex.";
return 0xFA;
}
unsigned char result = 0;
result = (num/10) << 4;
result |= (num - 10*(num/10));
return result;
}
void icomCommander::receiveCommand(funcs func, QVariant value, uchar receiver)
{
//qInfo() << "Got command:" << funcString[func];
@ -2815,7 +2829,7 @@ void icomCommander::receiveCommand(funcs func, QVariant value, uchar receiver)
if (bsr.freq.Hz != 0) {
// We are setting the bsr so send freq/mode data.
// First find which band we are working on.
foreach (bandType b, rigCaps.bands)
for (const auto &b: rigCaps.bands)
{
if (b.bsr == bsr.band)
{
@ -2832,6 +2846,33 @@ void icomCommander::receiveCommand(funcs func, QVariant value, uchar receiver)
}
qInfo(logRig()) << "Sending BSR, Band Code:" << bsr.band << "Register Code:" << bsr.regCode << "(Sent:" << payload.toHex(' ') << ")";
}
else if (!strcmp(value.typeName(),"datekind"))
{
datekind d = value.value<datekind>();
qInfo(logRig()) << QString("Sending new date: (MM-DD-YYYY) %0-%1-%2").arg(d.month).arg(d.day).arg(d.year);
// YYYYMMDD
payload.append(convertNumberToHex(d.year/100)); // 20
payload.append(convertNumberToHex(d.year - 100*(d.year/100))); // 21
payload.append(convertNumberToHex(d.month));
payload.append(convertNumberToHex(d.day));
}
else if (!strcmp(value.typeName(),"timekind"))
{
timekind t = value.value<timekind>();
if (cmd.cmd == funcTime) {
qInfo(logRig()) << QString("Sending new time: (HH:MM) %0:%1").arg(t.hours).arg(t.minutes);
payload.append(convertNumberToHex(t.hours));
payload.append(convertNumberToHex(t.minutes));
} else if (cmd.cmd == funcUTCOffset) {
qInfo(logRig()) << QString("Sending new UTC offset: %0%1:%2").arg(t.isMinus?"-":"+").arg(t.hours).arg(t.minutes);
payload.append(convertNumberToHex(t.hours));
payload.append(convertNumberToHex(t.minutes));
payload.append((uchar)t.isMinus);
}
}
else
{
qInfo(logRig()) << "Got unknown value type" << QString(value.typeName());

1
icomcommander.h
Wyświetl plik

@ -78,6 +78,7 @@ private:
//quint16 decodeTone(QByteArray eTone, bool &tinv, bool &rinv);
uchar makeFilterWidth(ushort width, uchar receiver);
uchar convertNumberToHex(uchar num);
quint8 audioLevelRxMean[50];
quint8 audioLevelRxPeak[50];

1
rigcommander.cpp
Wyświetl plik

@ -189,7 +189,6 @@ void rigCommander::getDebug()
void rigCommander::dataFromServer(QByteArray data)
{
//qInfo(logRig()) << "***************** emit dataForComm()" << data;
emit dataForComm(data);
}

6
rigcreator.cpp
Wyświetl plik

@ -21,7 +21,7 @@ rigCreator::rigCreator(QWidget *parent) :
priorityModel = new QStandardItemModel();
foreach (auto key, priorityMap.keys())
for (const auto &key: priorityMap.keys())
{
QStandardItem *itemName = new QStandardItem(key);
QStandardItem *itemId = new QStandardItem(priorityMap.value(key));
@ -262,7 +262,7 @@ void rigCreator::loadRigFile(QString file)
settings->endArray();
int c=0;
foreach (auto p, defaultPeriodic)
for (const auto &p: defaultPeriodic)
{
ui->periodicCommands->insertRow(ui->periodicCommands->rowCount());
ui->periodicCommands->model()->setData(ui->periodicCommands->model()->index(c,0),p.priority);
@ -613,7 +613,7 @@ void rigCreator::saveRigFile(QString file)
QList<QCheckBox*> getSet =ui->commands->cellWidget(n,5)->findChildren<QCheckBox*>(QString(), Qt::FindChildrenRecursively);
qDebug() << "size = "<<getSet.size();
foreach (auto c, getSet)
for (const auto &c: getSet)
{
if (c->objectName() == "get")
settings->setValue("GetCommand", c->isChecked());

22
settingswidget.cpp
Wyświetl plik

@ -311,7 +311,7 @@ void settingswidget::updateRsPrefs(quint64 items)
{
if(items & i)
{
qInfo(logGui()) << "Updating Rs pref" << (int)i;
qDebug(logGui()) << "Updating Rs pref" << (int)i;
prs = (prefRsItem)i;
updateRsPref(prs);
}
@ -381,7 +381,7 @@ void settingswidget::updateClusterPrefs(quint64 items)
items = 0xffffffff;
// Initial setup, populate combobox
ui->clusterServerNameCombo->clear();
foreach (auto c, prefs->clusters)
for (const auto &c: prefs->clusters)
{
ui->clusterServerNameCombo->addItem(c.server);
}
@ -503,7 +503,6 @@ void settingswidget::updateIfPref(prefIfItem pif)
quietlyUpdateLineEdit(ui->regionTxt,prefs->region);
break;
case if_showBands:
qInfo() << "************* SHOWBANDS **********" << prefs->showBands;
quietlyUpdateCheckbox(ui->showBandsChk, prefs->showBands);
break;
case if_separators:
@ -755,7 +754,7 @@ void settingswidget::updateRaPref(prefRaItem pra)
ui->serialDeviceListCombo->clear();
ui->serialDeviceListCombo->addItem("Auto", 0);
int i = 0;
foreach(const QSerialPortInfo & serialPortInfo, QSerialPortInfo::availablePorts())
for(const auto &serialPortInfo: QSerialPortInfo::availablePorts())
{
#if defined(Q_OS_LINUX) || defined(Q_OS_MAC)
ui->serialDeviceListCombo->addItem(QString("/dev/") + serialPortInfo.portName(), i++);
@ -786,7 +785,7 @@ void settingswidget::updateRaPref(prefRaItem pra)
ui->vspCombo->clear();
ui->vspCombo->addItem("Auto", 0);
int i = 0;
foreach(const QSerialPortInfo & serialPortInfo, QSerialPortInfo::availablePorts())
for(const auto &serialPortInfo: QSerialPortInfo::availablePorts())
{
#if defined(Q_OS_LINUX) || defined(Q_OS_MAC)
ui->vspCombo->addItem(QString("/dev/") + serialPortInfo.portName(), i++);
@ -844,6 +843,17 @@ void settingswidget::updateRsPref(prefRsItem prs)
case rs_data3Mod:
quietlyUpdateModCombo(ui->modInputData3Combo,QVariant::fromValue(prefs->inputSource[3]));
break;
case rs_clockUseUtc:
quietlyUpdateCheckbox(ui->useUTCChk,prefs->useUTC);
break;
// Not used
case rs_setClock:
case rs_pttOn:
case rs_pttOff:
case rs_satOps:
case rs_adjRef:
case rs_debug:
break;
default:
qWarning(logGui()) << "Cannot update rs pref" << (int)prs;
}
@ -1223,7 +1233,7 @@ void settingswidget::updateModSourceList(uchar num, QVector<rigInput> data)
combo->blockSignals(true);
combo->clear();
foreach (auto input, data)
for (const auto &input: data)
{
combo->addItem(input.name, QVariant::fromValue(input));
}

126
settingswidget.ui
Wyświetl plik

@ -41,7 +41,7 @@
<item>
<widget class="QStackedWidget" name="settingsStack">
<property name="currentIndex">
<number>1</number>
<number>2</number>
</property>
<widget class="QWidget" name="radioAccess">
<layout class="QVBoxLayout" name="verticalLayout_21">
@ -178,7 +178,7 @@ Please use the &quot;Radio Server&quot; page to select server audio.
ONLY use Manual CI-V when Transceive mode is not supported</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
@ -268,7 +268,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -372,7 +372,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -440,14 +440,14 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
</size>
</property>
<property name="echoMode">
<enum>QLineEdit::PasswordEchoOnEdit</enum>
<enum>QLineEdit::EchoMode::PasswordEchoOnEdit</enum>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -483,7 +483,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<number>500</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
@ -510,7 +510,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<number>500</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
@ -552,7 +552,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_13">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -655,7 +655,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_31">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -712,7 +712,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_37">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -744,7 +744,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -759,7 +759,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -821,7 +821,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -908,7 +908,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_12">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -995,7 +995,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1099,7 +1099,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<number>64</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
@ -1113,7 +1113,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_27">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1130,10 +1130,10 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_30">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1221,7 +1221,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_11">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1254,7 +1254,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<string>Preset:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
</property>
</widget>
</item>
@ -1325,7 +1325,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_29">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1376,7 +1376,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item row="0" column="0">
<widget class="QScrollArea" name="colorEditorScrollArea">
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::AdjustIgnored</enum>
<enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustIgnored</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
@ -1386,15 +1386,15 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<rect>
<x>0</x>
<y>0</y>
<width>884</width>
<height>320</height>
<width>902</width>
<height>352</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="4" column="3">
<spacer name="horizontalSpacer_14">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1431,7 +1431,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item row="0" column="8">
<spacer name="horizontalSpacer_35">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1672,7 +1672,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item row="0" column="4">
<spacer name="horizontalSpacer_34">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -2218,7 +2218,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item row="5" column="0">
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -2257,7 +2257,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<string>Transmit modulation source</string>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
<enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
</property>
</widget>
</item>
@ -2277,7 +2277,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<string>Transmit Data-mode modulation input source</string>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
<enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
</property>
</widget>
</item>
@ -2304,7 +2304,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_15">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -2358,7 +2358,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_16">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -2402,7 +2402,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_22">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -2417,7 +2417,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -2432,7 +2432,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<widget class="QWidget" name="radioServer">
<layout class="QVBoxLayout" name="verticalLayout_27">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
<enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_35">
@ -2458,7 +2458,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_24">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -2621,7 +2621,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_25">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -2710,7 +2710,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_23">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -2751,7 +2751,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
</size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
<enum>QFrame::Shape::StyledPanel</enum>
</property>
<property name="lineWidth">
<number>1</number>
@ -2760,7 +2760,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<number>0</number>
</property>
<property name="editTriggers">
<set>QAbstractItemView::DoubleClicked</set>
<set>QAbstractItemView::EditTrigger::DoubleClicked</set>
</property>
<property name="columnCount">
<number>3</number>
@ -2811,7 +2811,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="verticalSpacer_7">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -2841,7 +2841,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<widget class="QCheckBox" name="enableRigctldChk">
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
<enum>Qt::LayoutDirection::LeftToRight</enum>
</property>
<property name="text">
<string>Enable RigCtld</string>
@ -2851,10 +2851,10 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_18">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -2890,7 +2890,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_20">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -2936,7 +2936,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_19">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -2980,7 +2980,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_26">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -3021,7 +3021,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -3071,7 +3071,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_28">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -3105,7 +3105,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_8">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -3132,7 +3132,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_38">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -3147,7 +3147,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -3267,7 +3267,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item row="4" column="1">
<widget class="QLineEdit" name="clusterPasswordLineEdit">
<property name="echoMode">
<enum>QLineEdit::PasswordEchoOnEdit</enum>
<enum>QLineEdit::EchoMode::PasswordEchoOnEdit</enum>
</property>
</widget>
</item>
@ -3307,7 +3307,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -3357,10 +3357,10 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<widget class="QPlainTextEdit" name="clusterOutputTextEdit">
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<enum>QFrame::Shadow::Raised</enum>
</property>
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::AdjustIgnored</enum>
<enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustIgnored</enum>
</property>
</widget>
</item>
@ -3376,7 +3376,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_36">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -3424,7 +3424,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_21">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -3441,7 +3441,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_361">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -3456,7 +3456,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -3502,7 +3502,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>

3
spectrumscope.cpp
Wyświetl plik

@ -384,6 +384,7 @@ spectrumScope::spectrumScope(bool scope, uchar receiver, uchar vfo, QWidget *par
connect(configResetIf, &QPushButton::clicked, this, [=](const bool &val) {
Q_UNUSED(val)
double pbFreq = (pbtDefault / passbandWidth) * 127.0;
qint16 newFreq = pbFreq + 128;
queue->add(priorityImmediate,queueItem(funcPBTInner,QVariant::fromValue<ushort>(newFreq),false,receiver));
@ -1747,7 +1748,7 @@ void spectrumScope::receiveSpots(uchar receiver, QList<spotData> spots)
current=clusterSpots.begin().value()->current;
}
foreach(spotData s, spots)
for(const auto &s: spots)
{
bool found = false;
QMap<QString, spotData*>::iterator spot = clusterSpots.find(s.dxcall);

4
udphandler.cpp
Wyświetl plik

@ -33,7 +33,7 @@ udpHandler::udpHandler(udpPreferences prefs, audioSetup rx, audioSetup tx) :
if (!radioIP.setAddress(prefs.ipAddress))
{
QHostInfo remote = QHostInfo::fromName(prefs.ipAddress);
foreach(QHostAddress addr, remote.addresses())
for(const auto &addr: remote.addresses())
{
if (addr.protocol() == QAbstractSocket::IPv4Protocol) {
radioIP = addr;
@ -51,7 +51,7 @@ udpHandler::udpHandler(udpPreferences prefs, audioSetup rx, audioSetup tx) :
// Convoluted way to find the external IP address, there must be a better way????
QString localhostname = QHostInfo::localHostName();
QList<QHostAddress> hostList = QHostInfo::fromName(localhostname).addresses();
foreach(const QHostAddress & address, hostList)
for(const auto &address: hostList)
{
if (address.protocol() == QAbstractSocket::IPv4Protocol && address.isLoopback() == false)
{

4
udpserver.cpp
Wyświetl plik

@ -46,7 +46,7 @@ void udpServer::init()
// Convoluted way to find the external IP address, there must be a better way????
QString localhostname = QHostInfo::localHostName();
QList<QHostAddress> hostList = QHostInfo::fromName(localhostname).addresses();
foreach(const QHostAddress & address, hostList)
for(const auto &address: hostList)
{
if (address.protocol() == QAbstractSocket::IPv4Protocol && address.isLoopback() == false)
{
@ -55,7 +55,7 @@ void udpServer::init()
}
QString macTemp;
foreach(QNetworkInterface netInterface, QNetworkInterface::allInterfaces())
for(const auto &netInterface: QNetworkInterface::allInterfaces())
{
// Return only the first non-loopback MAC Address
if (!(netInterface.flags() & QNetworkInterface::IsLoopBack)) {

35
wfmain.cpp
Wyświetl plik

@ -387,7 +387,7 @@ wfmain::~wfmain()
}
// Each rig needs deleting before we close.
foreach (auto rig, serverConfig.rigs) {
for (auto &rig: serverConfig.rigs) {
delete rig;
}
@ -4071,9 +4071,14 @@ bool wfmain::on_exitBtn_clicked()
msgbox.addButton(QMessageBox::No);
msgbox.setDefaultButton(QMessageBox::Yes);
msgbox.setCheckBox(cb);
QObject::connect(cb, &QCheckBox::stateChanged, this, [this](int state){
if (static_cast<Qt::CheckState>(state) == Qt::CheckState::Checked) {
#if (QT_VERSION < QT_VERSION_CHECK(6,7,0))
QObject::connect(cb, &QCheckBox::stateChanged, this, [this](Qt::CheckState state){
if (state == Qt::CheckState::Checked)
#else
QObject::connect(cb, &QCheckBox::checkStateChanged, this, [this](int state){
if (static_cast<Qt::CheckState>(state) == Qt::CheckState::Checked)
#endif
{
prefs.confirmSettingsChanged=false;
} else {
prefs.confirmSettingsChanged=true;
@ -4110,9 +4115,14 @@ bool wfmain::on_exitBtn_clicked()
msgbox.addButton(QMessageBox::No);
msgbox.setDefaultButton(QMessageBox::Yes);
msgbox.setCheckBox(cb);
QObject::connect(cb, &QCheckBox::stateChanged, this, [this](int state){
if (static_cast<Qt::CheckState>(state) == Qt::CheckState::Checked) {
#if (QT_VERSION < QT_VERSION_CHECK(6,7,0))
QObject::connect(cb, &QCheckBox::stateChanged, this, [this](Qt::CheckState state){
if (state == Qt::CheckState::Checked)
#else
QObject::connect(cb, &QCheckBox::checkStateChanged, this, [this](int state){
if (static_cast<Qt::CheckState>(state) == Qt::CheckState::Checked)
#endif
{
prefs.confirmExit=false;
} else {
prefs.confirmExit=true;
@ -4672,9 +4682,14 @@ void wfmain::on_rigPowerOffBtn_clicked()
msgbox.addButton(QMessageBox::No);
msgbox.setDefaultButton(QMessageBox::Yes);
msgbox.setCheckBox(cb);
QObject::connect(cb, &QCheckBox::stateChanged, this, [this](int state) {
if (static_cast<Qt::CheckState>(state) == Qt::CheckState::Checked) {
#if (QT_VERSION < QT_VERSION_CHECK(6,7,0))
QObject::connect(cb, &QCheckBox::stateChanged, this, [this](Qt::CheckState state){
if (state == Qt::CheckState::Checked)
#else
QObject::connect(cb, &QCheckBox::checkStateChanged, this, [this](int state){
if (static_cast<Qt::CheckState>(state) == Qt::CheckState::Checked)
#endif
{
prefs.confirmPowerOff = false;
}
else {

12
wfview.pro
Wyświetl plik

@ -176,12 +176,11 @@ CONFIG(debug, release|debug) {
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplotd2qt6.so/ {print \"-lqcustomplotd2qt6\"}'")
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplotdqt6.so/ {print \"-lqcustomplotdqt6\"}'")
}
macos:LIBS += -lqcustomplotd
win32:LIBS += -lqcustomplotd2
win32 {
contains(QMAKE_TARGET.arch, x86_64) {
LIBS += -L../opus/win32/VS2015/x64/DebugDLL/
LIBS += -L../qcustomplot/x64
LIBS += -L../qcustomplot/x64 -lqcustomplotd2
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\qcustomplot\x64\qcustomplotd2.dll wfview-debug $$escape_expand(\\n\\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\portaudio\msvc\x64\Debug\portaudio_x64.dll wfview-debug $$escape_expand(\\n\\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\hidapi\windows\X64\Debug\hidapi.dll wfview-debug $$escape_expand(\\n\\t))
@ -193,7 +192,7 @@ CONFIG(debug, release|debug) {
}
} else {
LIBS += -L../opus/win32/VS2015/win32/DebugDLL/
LIBS += -L../qcustomplot/win32
LIBS += -L../qcustomplot/win32 -lqcustomplotd2
LIBS += -L../portaudio/msvc/Win32/Debug/ -lportaudio_x86
QMAKE_POST_LINK +=$$quote(cmd /c copy /y .\qcustomplot\win32\qcustomplotd2.dll wfview-debug $$escape_expand(\\n\\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\portaudio\msvc\win32\Debug\portaudio_x86.dll wfview-debug\$$escape_expand(\\n\\t))
@ -216,11 +215,10 @@ CONFIG(debug, release|debug) {
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplotqt6.so/ {print \"-lqcustomplotqt6\"}'")
}
macos:LIBS += -lqcustomplot
win32:LIBS += -lqcustomplot2
win32 {
contains(QMAKE_TARGET.arch, x86_64) {
LIBS += -L../opus/win32/VS2015/x64/ReleaseDLL/
LIBS += -L../qcustomplot/x64
LIBS += -L../qcustomplot/x64 -lqcustomplot2
LIBS += -L../portaudio/msvc/X64/Release/ -lportaudio_x64
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\qcustomplot\x64\qcustomplot2.dll wfview-release $$escape_expand(\\n\\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\portaudio\msvc\x64\Release\portaudio_x64.dll wfview-release $$escape_expand(\\n\\t))
@ -232,7 +230,7 @@ CONFIG(debug, release|debug) {
}
} else {
LIBS += -L../opus/win32/VS2015/win32/ReleaseDLL/
LIBS += -L../qcustomplot/win32
LIBS += -L../qcustomplot/win32 -lqcustomplot2
LIBS += -L../portaudio/msvc/Win32/Release/ -lportaudio_x86
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\qcustomplot\win32\qcustomplot2.dll wfview-release $$escape_expand(\\n\\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\portaudio\msvc\win32\Release\portaudio_x86.dll wfview-release $$escape_expand(\\n\\t))