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

Merge branch 'creator-widgets' of https://gitlab.com/eliggett/wfview into creator-widgets

translations
Phil Taylor 2023-12-18 10:47:21 +00:00
rodzic 138a303724 64ed43642b
commit 3071662b46
8 zmienionych plików z 54 dodań i 46 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
bandbuttons.cpp
Wyświetl plik

@ -76,7 +76,7 @@ void bandbuttons::setUIToRig()
hideButton(ui->band2200mbtn);
hideButton(ui->bandGenbtn);
foreach (auto band, rigCaps.bands)
for (auto &band: rigCaps.bands)
{
switch(band.band)
{
@ -192,7 +192,7 @@ void bandbuttons::bandStackBtnClick(availableBands band)
{
if(haveRigCaps)
{
foreach (auto b, rigCaps.bands)
for (auto &b: rigCaps.bands)
{
if (b.band == band)
{
@ -215,7 +215,7 @@ void bandbuttons::bandStackBtnClick(availableBands band)
void bandbuttons::jumpToBandWithoutBSR(availableBands band)
{
// Sometimes we do not have a BSR for these bands:
foreach (auto b, rigCaps.bands)
for (auto &b: rigCaps.bands)
{
if (b.band == band)
{

8
memories.cpp
Wyświetl plik

@ -95,7 +95,7 @@ memories::memories(rigCapabilities rigCaps, bool slowLoad, QWidget *parent) :
vfos << "MAIN" << "SUB";
}
foreach (auto mode, rigCaps.modes){
for (auto &mode: rigCaps.modes){
modes.append(mode.name);
}
@ -307,7 +307,7 @@ void memories::on_table_cellChanged(int row, int col)
currentMemory.frequency.Hz = (ui->table->item(row,columnFrequency) == NULL) ? 0 : quint64(ui->table->item(row,columnFrequency)->text().toDouble()*1000000.0);
currentMemory.frequencyB.Hz = (ui->table->item(row,columnFrequencyB) == NULL) ? 0 : quint64(ui->table->item(row,columnFrequencyB)->text().toDouble()*1000000.0);
foreach (auto m, rigCaps.modes){
for (auto &m: rigCaps.modes){
if (!ui->table->isColumnHidden(columnMode) && ui->table->item(row,columnMode) != NULL && ui->table->item(row,columnMode)->text()==m.name) {
currentMemory.mode=m.reg;
}
@ -454,7 +454,7 @@ void memories::on_group_currentIndexChanged(int index)
}
foreach (auto parse, parser) {
for (auto &parse: parser) {
switch (parse.spec)
{
case 'a':
@ -883,7 +883,7 @@ void memories::on_group_currentIndexChanged(int index)
QTimer::singleShot(MEMORY_SLOWLOAD, this, [this]{ emit getMemory(lastMemoryRequested); });
} else {
// Is the current group attached to a particular band?
foreach (auto band, rigCaps.bands)
for (auto &band: rigCaps.bands)
{
if (band.memGroup==ui->group->currentData().toInt())
{

15
rigcommander.cpp
Wyświetl plik

@ -572,9 +572,6 @@ void rigCommander::parseData(QByteArray dataInput)
{
data = dataList[index];
data.append('\xFD'); // because we expect it to be there.
// foreach(listitem)
// listitem.append('\xFD');
// continue parsing...
count++;
// Data echo'd back from the rig start with this:
@ -1033,7 +1030,7 @@ void rigCommander::parseCommand()
case funcDATA2Mod:
case funcDATA3Mod:
{
foreach (auto r, rigCaps.inputs)
for (auto &r: rigCaps.inputs)
{
if (r.reg == bcdHexToUChar(payloadIn[0]))
{
@ -1115,7 +1112,7 @@ void rigCommander::parseCommand()
case funcScopeMainSpan:
{
freqt f = parseFrequency(payloadIn, 3);
foreach (auto s, rigCaps.scopeCenterSpans)
for (auto &s: rigCaps.scopeCenterSpans)
{
if (s.freq == f.Hz)
{
@ -1990,7 +1987,7 @@ modeInfo rigCommander::parseMode(quint8 mode, quint8 filter, bool sub)
{
modeInfo mi;
bool found=false;
foreach (auto& m, rigCaps.modes)
for (auto& m: rigCaps.modes)
{
if (m.reg == mode)
{
@ -2118,7 +2115,7 @@ bool rigCommander::parseMemory(QVector<memParserFormat>* memParser, memoryType*
memset(mem->name, 0x0, sizeof(mem->name));
// We need to add 2 characters so that the parser works!
payloadIn.insert(0,"**");
foreach (auto parse, *memParser) {
for (auto &parse: *memParser) {
// non-existant memory is short so send what we have so far.
if (payloadIn.size() < (parse.pos+1+parse.len)) {
return true;
@ -2580,7 +2577,7 @@ void rigCommander::receiveCommand(funcs func, QVariant value, bool sub)
{
qInfo(logRig()) << "Get Memory Contents" << (value.value<uint>() & 0xffff);
// Format is different for all radios!
foreach (auto parse, rigCaps.memParser) {
for (auto &parse: rigCaps.memParser) {
// If "a" exists, break out of the loop as soon as we have the value.
if (parse.spec == 'a') {
if (parse.len == 1) {
@ -2613,7 +2610,7 @@ void rigCommander::receiveCommand(funcs func, QVariant value, bool sub)
}
// Format is different for all radios!
foreach (auto parse, parser) {
for (auto &parse: parser) {
switch (parse.spec)
{
case 'a':

10
rigctld.cpp
Wyświetl plik

@ -468,7 +468,7 @@ void rigCtlClient::socketReadyRead()
// We have finished parsing all commands and have a response to send (hopefully)
commandBuffer.clear();
foreach (QString str, response)
for (QString &str: response)
{
if (!str.isEmpty())
sendData(QString("%1%2").arg(str,sep));
@ -583,7 +583,7 @@ bool rigCtlClient::getMode(QString modeString, modeInfo& mode)
{
if (QString(mode_str[i].str) == modeString)
{
foreach (auto m, rigCaps.modes)
for (auto &m: rigCaps.modes)
{
if (m.mk == mode_str[i].mk)
{
@ -602,7 +602,7 @@ bool rigCtlClient::getMode(QString modeString, modeInfo& mode)
quint8 rigCtlClient::getAntennas()
{
quint8 ant=0;
foreach (auto i, rigCaps.antennas)
for (auto &i: rigCaps.antennas)
{
ant |= 1<<i.num;
}
@ -1108,7 +1108,7 @@ int rigCtlClient::dumpState(QStringList &response, bool extended)
}
}
response.append("0 0 0 0 0 0 0");
foreach (auto step, rigCaps.steps)
for (auto& step: rigCaps.steps)
{
if (step.num > 0)
response.append(QString("0x%1 %2").arg(modes, 0, 16).arg(step.hz));
@ -1158,7 +1158,7 @@ int rigCtlClient::dumpState(QStringList &response, bool extended)
response.append("0");
QString preamps="";
if(rigCaps.commands.contains(funcPreamp)) {
foreach (auto pre, rigCaps.preamps)
for (auto &pre: rigCaps.preamps)
{
if (pre.num == 0)
continue;

2
rigidentities.h
Wyświetl plik

@ -68,7 +68,7 @@ enum inputTypes{ inputMic=0,
struct rigInput {
rigInput() : type(inputUnknown),reg(0), name(""), level(0) {}
rigInput(rigInput const &r): type(r.type), reg(r.reg), name(r.name), level(r.level) {};
//rigInput(rigInput const &r): type(r.type), reg(r.reg), name(r.name), level(r.level) {};
rigInput(inputTypes type) : type(type),reg(0) ,name(""),level(0) {}
rigInput(inputTypes type, uchar reg, QString name) : type(type), reg(reg), name(name) {}
inputTypes type;

4
usbcontroller.cpp
Wyświetl plik

@ -2083,8 +2083,8 @@ void usbController::restoreController(USBDEVICE* dev, QString file)
but.backgroundOff.setNamedColor(settings->value("BackgroundOff", QColor(Qt::blue).name(QColor::HexArgb)).toString());
but.toggle = settings->value("Toggle", false).toBool();
#if (QT_VERSION > QT_VERSION_CHECK(6,0,0))
if (settings->value("Icon",NULL) != NULL) {
but.icon = new QImage(settings->value("Icon",NULL).value<QImage>());
if (settings->value("Icon","") != "") {
but.icon = new QImage(settings->value("Icon", "").value<QImage>());
but.iconName = settings->value("IconName", "").toString();
}
#endif

31
wfmain.cpp
Wyświetl plik

@ -130,7 +130,7 @@ wfmain::wfmain(const QString settingsFile, const QString logFile, bool debugMode
qWarning() << "********* Rig directory does not exist ********";
} else {
QStringList rigs = systemRigDir.entryList(QStringList() << "*.rig" << "*.RIG", QDir::Files);
foreach (QString rig, rigs) {
for (QString &rig: rigs) {
QSettings* rigSettings = new QSettings(systemRigDir.absoluteFilePath(rig), QSettings::Format::IniFormat);
if (!rigSettings->childGroups().contains("Rig"))
{
@ -151,7 +151,7 @@ wfmain::wfmain(const QString settingsFile, const QString logFile, bool debugMode
QDir userRigDir(userRigLocation);
if (userRigDir.exists()){
QStringList rigs = userRigDir.entryList(QStringList() << "*.rig" << "*.RIG", QDir::Files);
foreach (QString rig, rigs) {
for (QString& rig: rigs) {
QSettings* rigSettings = new QSettings(userRigDir.absoluteFilePath(rig), QSettings::Format::IniFormat);
if (!rigSettings->childGroups().contains("Rig"))
{
@ -557,7 +557,7 @@ void wfmain::findSerialPort()
// qInfo(logSystem()) << "Searching for serial port...";
bool found = false;
// First try to find first Icom port:
foreach(const QSerialPortInfo & serialPortInfo, QSerialPortInfo::availablePorts())
for(const QSerialPortInfo & serialPortInfo: QSerialPortInfo::availablePorts())
{
if (serialPortInfo.serialNumber().left(3) == "IC-") {
qInfo(logSystem()) << "Serial Port found: " << serialPortInfo.portName() << "Manufacturer:" << serialPortInfo.manufacturer() << "Product ID" << serialPortInfo.description() << "S/N" << serialPortInfo.serialNumber();
@ -1353,7 +1353,7 @@ void wfmain::buttonControl(const COMMAND* cmd)
}
}
} else {
foreach (auto band, rigCaps.bands)
for (auto &band: rigCaps.bands)
{
if (band.band == cmd->value)
{
@ -2148,7 +2148,6 @@ void wfmain::extChangedRsPrefs(quint64 items)
{
qDebug(logSystem()) << "Updating Rs pref in wfmain" << (int)i;
prs = (prefRsItem)i;
(prs);
}
}
}
@ -3193,7 +3192,7 @@ void wfmain::on_tuningStepCombo_currentIndexChanged(int index)
tsWfScrollHz = ui->tuningStepCombo->itemData(index).toUInt();
tsKnobHz = ui->tuningStepCombo->itemData(index).toUInt();
foreach (auto s, rigCaps.steps) {
for (auto &s: rigCaps.steps) {
if (tsWfScrollHz == s.hz)
{
ui->mainScope->setStepSize(s.hz);
@ -3467,7 +3466,7 @@ void wfmain:: getInitialRigState()
ui->preampAttGroup->setVisible(rigCaps.commands.contains(funcPreamp));
quint64 start=UINT64_MAX;
quint64 end=0;
foreach (auto band, rigCaps.bands)
for (auto &band: rigCaps.bands)
{
if (start > band.lowFreq)
start = band.lowFreq;
@ -3736,7 +3735,7 @@ void wfmain::receiveRigID(rigCapabilities rigCaps)
ui->mainScope->clearMode();
ui->subScope->clearMode();
foreach (auto m, rigCaps.modes)
for (auto &m: rigCaps.modes)
{
//ui->modeSelectCombo->addItem(m.name, m.mk);
ui->mainScope->addMode("Mode "+m.name,QVariant::fromValue(m));
@ -3746,7 +3745,7 @@ void wfmain::receiveRigID(rigCapabilities rigCaps)
ui->mainScope->clearFilter();
ui->subScope->clearFilter();
foreach (auto f, rigCaps.filters)
for (auto& f: rigCaps.filters)
{
ui->mainScope->addFilter(f.name,f.num);
ui->subScope->addFilter(f.name,f.num);
@ -3756,7 +3755,7 @@ void wfmain::receiveRigID(rigCapabilities rigCaps)
// Set the tuning step combo box up:
ui->tuningStepCombo->blockSignals(true);
ui->tuningStepCombo->clear();
foreach (auto s, rigCaps.steps)
for (auto &s: rigCaps.steps)
{
ui->tuningStepCombo->addItem(s.name, s.hz);
}
@ -3802,7 +3801,7 @@ void wfmain::receiveRigID(rigCapabilities rigCaps)
if(rigCaps.commands.contains(funcAttenuator))
{
ui->attSelCombo->setDisabled(false);
foreach (auto att, rigCaps.attenuators)
for (auto &att: rigCaps.attenuators)
{
ui->attSelCombo->addItem(((att == 0) ? QString("0 dB") : QString("-%1 dB").arg(att)),att);
}
@ -3814,7 +3813,7 @@ void wfmain::receiveRigID(rigCapabilities rigCaps)
if(rigCaps.commands.contains(funcPreamp))
{
ui->preampSelCombo->setDisabled(false);
foreach (auto pre, rigCaps.preamps)
for (auto &pre: rigCaps.preamps)
{
ui->preampSelCombo->addItem(pre.name, pre.num);
}
@ -3826,7 +3825,7 @@ void wfmain::receiveRigID(rigCapabilities rigCaps)
if(rigCaps.commands.contains(funcAntenna))
{
ui->antennaSelCombo->setDisabled(false);
foreach (auto ant, rigCaps.antennas)
for (auto &ant: rigCaps.antennas)
{
ui->antennaSelCombo->addItem(ant.name,ant.num);
}
@ -4021,7 +4020,7 @@ void wfmain::changeMode(rigMode_t mode)
void wfmain::changeMode(rigMode_t mode, unsigned char data)
{
foreach (modeInfo mi, rigCaps.modes)
for (modeInfo &mi: rigCaps.modes)
{
if (mi.mk == mode)
{
@ -4564,7 +4563,7 @@ void wfmain::receiveTuningStep(unsigned char step)
{
if (step > 0)
{
foreach (auto s, rigCaps.steps)
for (auto &s: rigCaps.steps)
{
if (step == s.num && ui->tuningStepCombo->currentData().toUInt() != s.hz) {
qInfo(logSystem()) << QString("Received new Tuning Step %0").arg(s.name);
@ -5582,7 +5581,7 @@ void wfmain::receiveValue(cacheItem val){
queue->add(priorityImmediate,queueItem(funcSelectedFreq,QVariant::fromValue<freqt>(bsr.freq),false));
foreach (auto md, rigCaps.modes)
for (auto &md: rigCaps.modes)
{
if (md.reg == bsr.mode) {
md.filter=bsr.filter;

24
wfview.pro
Wyświetl plik

@ -141,9 +141,15 @@ macx:LIBS += -framework CoreAudio -framework CoreFoundation -lpthread -lopus
# CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT
CONFIG(debug, release|debug) {
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libQCustomPlotd.so/ {print \"-lQCustomPlotd\"}'")
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplotd2.so/ {print \"-lqcustomplotd2\"}'")
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplotd.so/ {print \"-lqcustomplotd\"}'")
lessThan(QT_MAJOR_VERSION, 6) {
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libQCustomPlotd.so/ {print \"-lQCustomPlotd\"}'")
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplotd2.so/ {print \"-lqcustomplotd2\"}'")
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplotd.so/ {print \"-lqcustomplotd\"}'")
} else {
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libQCustomPlotdQt6.so/ {print \"-lQCustomPlotdQt6\"}'")
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 {
@ -174,9 +180,15 @@ CONFIG(debug, release|debug) {
}
}
} else {
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libQCustomPlot.so/ {print \"-lQCustomPlot\"}'")
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplot2.so/ {print \"-lqcustomplot2\"}'")
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplot.so/ {print \"-lqcustomplot\"}'")
lessThan(QT_MAJOR_VERSION, 6) {
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libQCustomPlot.so/ {print \"-lQCustomPlot\"}'")
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplot2.so/ {print \"-lqcustomplot2\"}'")
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplot.so/ {print \"-lqcustomplot\"}'")
} else {
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libQCustomPlotQt6.so/ {print \"-lQCustomPlotQt6\"}'")
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplot2qt6.so/ {print \"-lqcustomplot2qt6\"}'")
linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplotqt6.so/ {print \"-lqcustomplotqt6\"}'")
}
macos:LIBS += -lqcustomplot
win32:LIBS += -lqcustomplot2
win32 {