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

Add visible band limits

translations
Phil Taylor 2024-06-12 17:11:01 +01:00
rodzic d4b92538ec
commit 52ee7c1617
21 zmienionych plików z 1526 dodań i 999 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

28
cachingqueue.cpp
Wyświetl plik

@ -71,24 +71,20 @@ void cachingQueue::run()
}
counter++;
//QMutableMultiMapIterator<queuePriority,queueItem> i(queue);
auto it = queue.find(prio);
if (it != queue.end())
auto it = queue.upperBound(prio);
it--; //upperBound returns the item immediately following the last key.
if (it != queue.end() && it.key() == prio)
{
while (it != queue.end() && it.key() == prio)
{
it++;
}
it--;
auto item = it.value();
emit haveCommand(item.command,item.param,item.receiver);
it=queue.erase(it);
queue.remove(prio,it.value());
if (item.recurring && prio != priorityImmediate) {
queue.insert(prio,item);
}
updateCache(false,item.command,item.param,item.receiver);
}
deadline.setRemainingTime(queueInterval); // reset the deadline to the poll frequency
QCoreApplication::processEvents();
@ -205,12 +201,9 @@ void cachingQueue::addUnique(queuePriority prio ,queueItem item)
if (it.value().command == item.command && it.value().recurring == item.recurring && it.value().receiver == item.receiver && it.value().param.isValid() == item.param.isValid())
{
qDebug() << "deleting" << it.value().id << funcString[it.value().command] << "VFO" << it.value().receiver << "recurring" << it.value().recurring ;
it = queue.erase(it);
}
else
{
it++;
queue.remove(it.key(),it.value());
}
it++;
}
if (item.recurring) {
// also insert an immediate command to get the current value "now" (removes the need to get initial rigstate)
@ -237,12 +230,9 @@ void cachingQueue::del(funcs func, uchar receiver)
while (it != queue.end()) {
if (it.value().command == func && it.value().receiver == receiver) {
qDebug() << "deleting" << funcString[it.value().command] << "VFO" << it.value().receiver << "recurring" << it.value().recurring;
it = queue.erase(it);
}
else
{
it++;
queue.remove(it.key(),it.value());
}
it++;
}
}
}

4
cachingqueue.h
Wyświetl plik

@ -38,6 +38,10 @@ struct queueItem {
uchar receiver;
bool recurring;
qint64 id = QDateTime::currentMSecsSinceEpoch();
bool operator==(const queueItem& lhs)
{
return (lhs.command == command && lhs.receiver == receiver && lhs.recurring == recurring);
}
};
struct cacheItem {

3
icomcommander.cpp
Wyświetl plik

@ -1475,6 +1475,7 @@ void icomCommander::determineRigCaps()
for (int c = 0; c < numBands; c++)
{
settings->setArrayIndex(c);
QString region = settings->value("Region","").toString();
availableBands band = availableBands(settings->value("Num", 0).toInt());
quint64 start = settings->value("Start", 0ULL).toULongLong();
quint64 end = settings->value("End", 0ULL).toULongLong();
@ -1484,7 +1485,7 @@ void icomCommander::determineRigCaps()
char bytes = settings->value("Bytes", 5).toInt();
QColor color(settings->value("Color", "#00000000").toString()); // Default color should be none!
QString name(settings->value("Name", "None").toString());
rigCaps.bands.push_back(bandType(band,bsr,start,end,range,memGroup,bytes,color,name));
rigCaps.bands.push_back(bandType(region,band,bsr,start,end,range,memGroup,bytes,color,name));
rigCaps.bsr[band] = bsr;
qDebug(logRig()) << "Adding Band " << band << "Start" << start << "End" << end << "BSR" << QString::number(bsr,16);
}

6
prefs.h
Wyświetl plik

@ -31,7 +31,9 @@ enum prefIfItem {
if_currentColorPresetNumber = 1 << 18,
if_rigCreatorEnable = 1 << 19,
if_frequencyUnits = 1 << 20,
if_all = 1 << 21
if_region = 1 << 21,
if_showBands = 1 << 22,
if_all = 1 << 23
};
enum prefColItem {
@ -194,6 +196,8 @@ struct preferences {
int currentColorPresetNumber = 0;
bool rigCreatorEnable = false;
int frequencyUnits = 3;
QString region;
bool showBands;
// Radio:
unsigned char radioCIVAddr;

78
rigcreator.cpp
Wyświetl plik

@ -43,6 +43,9 @@ rigCreator::rigCreator(QWidget *parent) :
*/
connect(ui->commands,SIGNAL(rowAdded(int)),this,SLOT(commandRowAdded(int)));
connect(ui->bands,SIGNAL(rowAdded(int)),this,SLOT(bandRowAdded(int)));
ui->bands->sortByColumn(1,Qt::AscendingOrder);
}
void rigCreator::commandRowAdded(int row)
@ -84,7 +87,7 @@ void rigCreator::bandRowAdded(int row)
color->setStyleSheet(QString("QPushButton { background-color : %0; }").arg(col.name(QColor::HexArgb)));
}
});
ui->bands->setCellWidget(row,8, color);
ui->bands->setCellWidget(row,9, color);
}
rigCreator::~rigCreator()
@ -193,6 +196,7 @@ void rigCreator::loadRigFile(QString file)
ui->commands->clearContents();
ui->commands->model()->removeRows(0,ui->commands->rowCount());
ui->commands->setSortingEnabled(false);
int numCommands = settings->beginReadArray("Commands");
if (numCommands == 0) {
settings->endArray();
@ -247,9 +251,12 @@ void rigCreator::loadRigFile(QString file)
}
settings->endArray();
}
ui->commands->setSortingEnabled(true);
ui->periodicCommands->clearContents();
ui->periodicCommands->model()->removeRows(0,ui->periodicCommands->rowCount());
ui->periodicCommands->setSortingEnabled(false);
int numPeriodic = settings->beginReadArray("Periodic");
if (numPeriodic == 0) {
settings->endArray();
@ -274,9 +281,12 @@ void rigCreator::loadRigFile(QString file)
}
settings->endArray();
}
ui->periodicCommands->setSortingEnabled(true);
ui->spans->clearContents();
ui->spans->model()->removeRows(0,ui->spans->rowCount());
ui->spans->setSortingEnabled(false);
int numSpans = settings->beginReadArray("Spans");
if (numSpans == 0) {
settings->endArray();
@ -293,9 +303,12 @@ void rigCreator::loadRigFile(QString file)
}
settings->endArray();
}
ui->spans->setSortingEnabled(true);
ui->inputs->clearContents();
ui->inputs->model()->removeRows(0,ui->inputs->rowCount());
ui->inputs->setSortingEnabled(false);
int numInputs = settings->beginReadArray("Inputs");
if (numInputs == 0) {
settings->endArray();
@ -311,9 +324,12 @@ void rigCreator::loadRigFile(QString file)
}
settings->endArray();
}
ui->inputs->setSortingEnabled(true);
ui->bands->clearContents();
ui->bands->model()->removeRows(0,ui->bands->rowCount());
ui->bands->setSortingEnabled(false);
int numBands = settings->beginReadArray("Bands");
if (numBands == 0) {
settings->endArray();
@ -323,14 +339,15 @@ void rigCreator::loadRigFile(QString file)
{
settings->setArrayIndex(c);
ui->bands->insertRow(ui->bands->rowCount());
ui->bands->model()->setData(ui->bands->model()->index(c,0),QString::number(settings->value("Num", 0).toUInt()).rightJustified(2,'0'));
ui->bands->model()->setData(ui->bands->model()->index(c,1),QString::number(settings->value("BSR", 0).toUInt()).rightJustified(2,'0'));
ui->bands->model()->setData(ui->bands->model()->index(c,2),settings->value("Start", 0ULL).toString(),Qt::DisplayRole);
ui->bands->model()->setData(ui->bands->model()->index(c,3),settings->value("End", 0ULL).toString(),Qt::DisplayRole);
ui->bands->model()->setData(ui->bands->model()->index(c,4),settings->value("Range", 0.0).toString());
ui->bands->model()->setData(ui->bands->model()->index(c,5),settings->value("MemoryGroup", -1).toString());
ui->bands->model()->setData(ui->bands->model()->index(c,6),settings->value("Name", "").toString());
ui->bands->model()->setData(ui->bands->model()->index(c,7),settings->value("Bytes", 5).toString());
ui->bands->model()->setData(ui->bands->model()->index(c,0),settings->value("Region", "").toString());
ui->bands->model()->setData(ui->bands->model()->index(c,1),QString::number(settings->value("Num", 0).toUInt()).rightJustified(2,'0'));
ui->bands->model()->setData(ui->bands->model()->index(c,2),QString::number(settings->value("BSR", 0).toUInt()).rightJustified(2,'0'));
ui->bands->model()->setData(ui->bands->model()->index(c,3),settings->value("Start", 0ULL).toString(),Qt::DisplayRole);
ui->bands->model()->setData(ui->bands->model()->index(c,4),settings->value("End", 0ULL).toString(),Qt::DisplayRole);
ui->bands->model()->setData(ui->bands->model()->index(c,5),settings->value("Range", 0.0).toString());
ui->bands->model()->setData(ui->bands->model()->index(c,6),settings->value("MemoryGroup", -1).toString());
ui->bands->model()->setData(ui->bands->model()->index(c,7),settings->value("Name", "").toString());
ui->bands->model()->setData(ui->bands->model()->index(c,8),settings->value("Bytes", 5).toString());
QPushButton *color = new QPushButton();
color->setStyleSheet(QString("QPushButton { background-color : %0; }").arg(settings->value("Color", "#00000000").toString()));
connect(color, &QPushButton::clicked, this, [=]() {
@ -340,15 +357,17 @@ void rigCreator::loadRigFile(QString file)
color->setStyleSheet(QString("QPushButton { background-color : %0; }").arg(col.name(QColor::HexArgb)));
}
});
ui->bands->setCellWidget(c,8, color);
ui->bands->setCellWidget(c,9, color);
}
settings->endArray();
}
ui->bands->setSortingEnabled(true);
ui->modes->clearContents();
ui->modes->model()->removeRows(0,ui->modes->rowCount());
ui->modes->setSortingEnabled(false);
int numModes = settings->beginReadArray("Modes");
if (numModes == 0) {
settings->endArray();
@ -366,9 +385,12 @@ void rigCreator::loadRigFile(QString file)
}
settings->endArray();
}
ui->modes->setSortingEnabled(true);
ui->attenuators->clearContents();
ui->attenuators->model()->removeRows(0,ui->attenuators->rowCount());
ui->attenuators->setSortingEnabled(false);
int numAttenuators = settings->beginReadArray("Attenuators");
if (numAttenuators == 0) {
settings->endArray();
@ -382,9 +404,12 @@ void rigCreator::loadRigFile(QString file)
}
settings->endArray();
}
ui->attenuators->setSortingEnabled(true);
ui->preamps->clearContents();
ui->preamps->model()->removeRows(0,ui->preamps->rowCount());
ui->preamps->setSortingEnabled(false);
int numPreamps = settings->beginReadArray("Preamps");
if (numPreamps == 0) {
settings->endArray();
@ -399,9 +424,12 @@ void rigCreator::loadRigFile(QString file)
}
settings->endArray();
}
ui->preamps->setSortingEnabled(true);
ui->antennas->clearContents();
ui->antennas->model()->removeRows(0,ui->antennas->rowCount());
ui->antennas->setSortingEnabled(false);
int numAntennas = settings->beginReadArray("Antennas");
if (numAntennas == 0) {
settings->endArray();
@ -416,9 +444,12 @@ void rigCreator::loadRigFile(QString file)
}
settings->endArray();
}
ui->antennas->setSortingEnabled(true);
ui->tuningSteps->clearContents();
ui->tuningSteps->model()->removeRows(0,ui->tuningSteps->rowCount());
ui->tuningSteps->setSortingEnabled(false);
int numSteps = settings->beginReadArray("Tuning Steps");
if (numSteps == 0) {
settings->endArray();
@ -434,9 +465,12 @@ void rigCreator::loadRigFile(QString file)
}
settings->endArray();
}
ui->tuningSteps->setSortingEnabled(true);
ui->filters->clearContents();
ui->filters->model()->removeRows(0,ui->filters->rowCount());
ui->filters->setSortingEnabled(false);
int numFilters = settings->beginReadArray("Filters");
if (numFilters == 0) {
settings->endArray();
@ -452,6 +486,7 @@ void rigCreator::loadRigFile(QString file)
}
settings->endArray();
}
ui->filters->setSortingEnabled(true);
settings->endGroup();
delete settings;
@ -625,20 +660,21 @@ void rigCreator::saveRigFile(QString file)
settings->endArray();
//settings->remove("Bands");
ui->bands->sortByColumn(0,Qt::AscendingOrder);
ui->bands->sortByColumn(1,Qt::AscendingOrder);
settings->beginWriteArray("Bands");
for (int n = 0; n<ui->bands->rowCount();n++)
{
settings->setArrayIndex(n);
settings->setValue("Num", (ui->bands->item(n,0) == NULL) ? 0 : ui->bands->item(n,0)->text().toUInt() );
settings->setValue("BSR", (ui->bands->item(n,1) == NULL) ? 0 : ui->bands->item(n,1)->text().toUInt() );
settings->setValue("Start", (ui->bands->item(n,2) == NULL) ? 0ULL : ui->bands->item(n,2)->text().toULongLong() );
settings->setValue("End", (ui->bands->item(n,3) == NULL) ? 0ULL : ui->bands->item(n,3)->text().toULongLong() );
settings->setValue("Range", (ui->bands->item(n,4) == NULL) ? 0.0 : ui->bands->item(n,4)->text().toDouble() );
settings->setValue("MemoryGroup", (ui->bands->item(n,5) == NULL) ? -1 : ui->bands->item(n,5)->text().toInt() );
settings->setValue("Name", (ui->bands->item(n,6) == NULL) ? "" : ui->bands->item(n,6)->text());
settings->setValue("Bytes", (ui->bands->item(n,7) == NULL) ? 0 : ui->bands->item(n,7)->text().toUInt() );
QPushButton* color = static_cast<QPushButton*>(ui->bands->cellWidget(n,8));
settings->setValue("Region", (ui->bands->item(n,0) == NULL) ? "" : ui->bands->item(n,0)->text() );
settings->setValue("Num", (ui->bands->item(n,1) == NULL) ? 0 : ui->bands->item(n,1)->text().toUInt() );
settings->setValue("BSR", (ui->bands->item(n,2) == NULL) ? 0 : ui->bands->item(n,2)->text().toUInt() );
settings->setValue("Start", (ui->bands->item(n,3) == NULL) ? 0ULL : ui->bands->item(n,3)->text().toULongLong() );
settings->setValue("End", (ui->bands->item(n,4) == NULL) ? 0ULL : ui->bands->item(n,4)->text().toULongLong() );
settings->setValue("Range", (ui->bands->item(n,5) == NULL) ? 0.0 : ui->bands->item(n,5)->text().toDouble() );
settings->setValue("MemoryGroup", (ui->bands->item(n,6) == NULL) ? -1 : ui->bands->item(n,6)->text().toInt() );
settings->setValue("Name", (ui->bands->item(n,7) == NULL) ? "" : ui->bands->item(n,7)->text());
settings->setValue("Bytes", (ui->bands->item(n,8) == NULL) ? 0 : ui->bands->item(n,8)->text().toUInt() );
QPushButton* color = static_cast<QPushButton*>(ui->bands->cellWidget(n,9));
if (color != nullptr)
{
settings->setValue("Color", color->palette().button().color().name(QColor::HexArgb));

1215
rigcreator.ui
Wyświetl plik

Plik diff jest za duży Load Diff

7
rigidentities.h
Wyświetl plik

@ -135,10 +135,11 @@ struct centerSpanData {
struct bandType {
bandType() {}
bandType(bandType const &b): band(b.band), bsr(b.bsr), lowFreq(b.lowFreq), highFreq(b.highFreq), range(b.range), memGroup(b.memGroup), bytes(b.bytes), color(b.color), name(b.name){};
bandType(availableBands band, uchar bsr, quint64 lowFreq, quint64 highFreq, double range, int memGroup, char bytes, QColor color, QString name) :
band(band), bsr(bsr), lowFreq(lowFreq), highFreq(highFreq), range(range), memGroup(memGroup), bytes(bytes), color(color), name(name) {}
bandType(bandType const &b): region(b.region), band(b.band), bsr(b.bsr), lowFreq(b.lowFreq), highFreq(b.highFreq), range(b.range), memGroup(b.memGroup), bytes(b.bytes), color(b.color), name(b.name){};
bandType(QString region, availableBands band, uchar bsr, quint64 lowFreq, quint64 highFreq, double range, int memGroup, char bytes, QColor color, QString name) :
region(region), band(band), bsr(bsr), lowFreq(lowFreq), highFreq(highFreq), range(range), memGroup(memGroup), bytes(bytes), color(color), name(name) {}
QString region;
availableBands band;
uchar bsr;
quint64 lowFreq;

352
rigs/IC-705.rig
Wyświetl plik

@ -966,169 +966,277 @@ Inputs\4\Num=3
Inputs\4\Reg=0
Inputs\4\Name=WLAN
Inputs\size=4
Bands\1\Region=1
Bands\1\Num=5
Bands\1\BSR=14
Bands\1\Start=420000000
Bands\1\End=450000000
Bands\1\Start=430000000
Bands\1\End=440000000
Bands\1\Range=450
Bands\1\MemoryGroup=-1
Bands\1\Name=70cm
Bands\1\Bytes=5
Bands\1\Color=#ff0000ff
Bands\2\Num=6
Bands\2\BSR=13
Bands\2\Start=144000000
Bands\2\End=148000000
Bands\2\Range=148
Bands\2\Region=2
Bands\2\Num=5
Bands\2\BSR=14
Bands\2\Start=420000000
Bands\2\End=450000000
Bands\2\Range=450
Bands\2\MemoryGroup=-1
Bands\2\Name=2m
Bands\2\Name=70cm
Bands\2\Bytes=5
Bands\2\Color=#ff00ff00
Bands\3\Num=7
Bands\3\BSR=0
Bands\3\Start=108000000
Bands\3\End=137000000
Bands\3\Range=137
Bands\2\Color=#ff0000ff
Bands\3\Region=3
Bands\3\Num=5
Bands\3\BSR=14
Bands\3\Start=430000000
Bands\3\End=440000000
Bands\3\Range=450
Bands\3\MemoryGroup=-1
Bands\3\Name=Air
Bands\3\Name=70cm
Bands\3\Bytes=5
Bands\3\Color=#ffaaaa7f
Bands\4\Num=8
Bands\4\BSR=11
Bands\4\Start=74800000
Bands\4\End=108000000
Bands\4\Range=108
Bands\3\Color=#ff0000ff
Bands\4\Region=1
Bands\4\Num=6
Bands\4\BSR=13
Bands\4\Start=144000000
Bands\4\End=146000000
Bands\4\Range=146
Bands\4\MemoryGroup=-1
Bands\4\Name=WFM
Bands\4\Name=2m
Bands\4\Bytes=5
Bands\4\Color=#ff55aa7f
Bands\5\Num=10
Bands\5\BSR=10
Bands\5\Start=50000000
Bands\5\End=54000000
Bands\5\Range=60
Bands\4\Color=#ff00ff00
Bands\5\Region=2
Bands\5\Num=6
Bands\5\BSR=13
Bands\5\Start=144000000
Bands\5\End=148000000
Bands\5\Range=148
Bands\5\MemoryGroup=-1
Bands\5\Name=6m
Bands\5\Name=2m
Bands\5\Bytes=5
Bands\5\Color=#ffff5500
Bands\6\Num=11
Bands\6\BSR=9
Bands\6\Start=28000000
Bands\6\End=29700000
Bands\6\Range=45
Bands\5\Color=#ff00ff00
Bands\6\Region=3
Bands\6\Num=6
Bands\6\BSR=13
Bands\6\Start=144000000
Bands\6\End=148000000
Bands\6\Range=148
Bands\6\MemoryGroup=-1
Bands\6\Name=10m
Bands\6\Name=2m
Bands\6\Bytes=5
Bands\6\Color=#ff00aaff
Bands\7\Num=12
Bands\7\BSR=8
Bands\7\Start=24890000
Bands\7\End=24990000
Bands\7\Range=30
Bands\6\Color=#ff00ff00
Bands\7\Region=
Bands\7\Num=7
Bands\7\BSR=0
Bands\7\Start=108000000
Bands\7\End=137000000
Bands\7\Range=137
Bands\7\MemoryGroup=-1
Bands\7\Name=12m
Bands\7\Name=Air
Bands\7\Bytes=5
Bands\7\Color=#ff00aa00
Bands\8\Num=13
Bands\8\BSR=7
Bands\8\Start=21000000
Bands\8\End=21450000
Bands\8\Range=26
Bands\7\Color=#ffaaaa7f
Bands\8\Region=
Bands\8\Num=8
Bands\8\BSR=11
Bands\8\Start=74800000
Bands\8\End=108000000
Bands\8\Range=108
Bands\8\MemoryGroup=-1
Bands\8\Name=15m
Bands\8\Name=WFM
Bands\8\Bytes=5
Bands\8\Color=#ffff00ff
Bands\9\Num=14
Bands\9\BSR=6
Bands\9\Start=18068000
Bands\9\End=18168000
Bands\9\Range=22
Bands\8\Color=#ff55aa7f
Bands\9\Region=
Bands\9\Num=10
Bands\9\BSR=10
Bands\9\Start=50000000
Bands\9\End=54000000
Bands\9\Range=60
Bands\9\MemoryGroup=-1
Bands\9\Name=17m
Bands\9\Name=6m
Bands\9\Bytes=5
Bands\9\Color=#ffaaaa00
Bands\10\Num=15
Bands\10\BSR=5
Bands\10\Start=14000000
Bands\10\End=14350000
Bands\10\Range=20
Bands\9\Color=#ffff5500
Bands\10\Region=
Bands\10\Num=11
Bands\10\BSR=9
Bands\10\Start=28000000
Bands\10\End=29700000
Bands\10\Range=45
Bands\10\MemoryGroup=-1
Bands\10\Name=20m
Bands\10\Name=10m
Bands\10\Bytes=5
Bands\10\Color=#ffff0000
Bands\11\Num=16
Bands\11\BSR=4
Bands\11\Start=10100000
Bands\11\End=10150000
Bands\11\Range=15
Bands\10\Color=#ff00aaff
Bands\11\Region=
Bands\11\Num=12
Bands\11\BSR=8
Bands\11\Start=24890000
Bands\11\End=24990000
Bands\11\Range=30
Bands\11\MemoryGroup=-1
Bands\11\Name=30m
Bands\11\Name=12m
Bands\11\Bytes=5
Bands\11\Color=#ffffaa00
Bands\12\Num=17
Bands\12\BSR=3
Bands\12\Start=7000000
Bands\12\End=7300000
Bands\12\Range=11
Bands\11\Color=#ff00aa00
Bands\12\Region=
Bands\12\Num=13
Bands\12\BSR=7
Bands\12\Start=21000000
Bands\12\End=21450000
Bands\12\Range=26
Bands\12\MemoryGroup=-1
Bands\12\Name=40m
Bands\12\Name=15m
Bands\12\Bytes=5
Bands\12\Color=#ffaa5500
Bands\13\Num=18
Bands\13\BSR=0
Bands\13\Start=493000
Bands\13\End=595000
Bands\13\Range=8
Bands\12\Color=#ffff00ff
Bands\13\Region=
Bands\13\Num=14
Bands\13\BSR=6
Bands\13\Start=18068000
Bands\13\End=18168000
Bands\13\Range=22
Bands\13\MemoryGroup=-1
Bands\13\Name=630m
Bands\13\Name=17m
Bands\13\Bytes=5
Bands\13\Color=#ffaaff7f
Bands\14\Num=19
Bands\14\BSR=2
Bands\14\Start=3500000
Bands\14\End=4000000
Bands\14\Range=6
Bands\13\Color=#ffaaaa00
Bands\14\Region=
Bands\14\Num=15
Bands\14\BSR=5
Bands\14\Start=14000000
Bands\14\End=14350000
Bands\14\Range=20
Bands\14\MemoryGroup=-1
Bands\14\Name=80m
Bands\14\Name=20m
Bands\14\Bytes=5
Bands\14\Color=#ff00ffff
Bands\15\Num=20
Bands\15\BSR=1
Bands\15\Start=1800000
Bands\15\End=2000000
Bands\15\Range=2
Bands\14\Color=#ffff0000
Bands\15\Region=
Bands\15\Num=16
Bands\15\BSR=4
Bands\15\Start=10100000
Bands\15\End=10150000
Bands\15\Range=15
Bands\15\MemoryGroup=-1
Bands\15\Name=160m
Bands\15\Name=30m
Bands\15\Bytes=5
Bands\15\Color=#ffffff00
Bands\16\Num=21
Bands\16\BSR=0
Bands\16\Start=135000
Bands\16\End=138000
Bands\16\Range=0
Bands\15\Color=#ffffaa00
Bands\16\Region=1
Bands\16\Num=17
Bands\16\BSR=3
Bands\16\Start=7000000
Bands\16\End=7200000
Bands\16\Range=11
Bands\16\MemoryGroup=-1
Bands\16\Name=2200m
Bands\16\Name=40m
Bands\16\Bytes=5
Bands\16\Color=#ff5555ff
Bands\17\Num=22
Bands\17\BSR=15
Bands\17\Start=10000
Bands\17\End=30000000
Bands\17\Range=1.6
Bands\16\Color=#ffaa5500
Bands\17\Region=2
Bands\17\Num=17
Bands\17\BSR=3
Bands\17\Start=7000000
Bands\17\End=7300000
Bands\17\Range=11
Bands\17\MemoryGroup=-1
Bands\17\Name=Gen
Bands\17\Name=40m
Bands\17\Bytes=5
Bands\17\Color=#00000000
Bands\18\Num=23
Bands\18\BSR=0
Bands\18\Start=5250000
Bands\18\End=5450000
Bands\18\Range=0
Bands\17\Color=#ffaa5500
Bands\18\Region=3
Bands\18\Num=17
Bands\18\BSR=3
Bands\18\Start=7000000
Bands\18\End=7200000
Bands\18\Range=11
Bands\18\MemoryGroup=-1
Bands\18\Name=60m
Bands\18\Name=40m
Bands\18\Bytes=5
Bands\18\Color=#00000000
Bands\size=18
Bands\18\Color=#ffaa5500
Bands\19\Region=
Bands\19\Num=18
Bands\19\BSR=0
Bands\19\Start=5250000
Bands\19\End=5450000
Bands\19\Range=0
Bands\19\MemoryGroup=-1
Bands\19\Name=60m
Bands\19\Bytes=5
Bands\19\Color=#ffaaaaff
Bands\20\Region=1
Bands\20\Num=19
Bands\20\BSR=2
Bands\20\Start=3500000
Bands\20\End=3800000
Bands\20\Range=6
Bands\20\MemoryGroup=-1
Bands\20\Name=80m
Bands\20\Bytes=5
Bands\20\Color=#ff00ffff
Bands\21\Region=2
Bands\21\Num=19
Bands\21\BSR=2
Bands\21\Start=3500000
Bands\21\End=4000000
Bands\21\Range=6
Bands\21\MemoryGroup=-1
Bands\21\Name=80m
Bands\21\Bytes=5
Bands\21\Color=#ff00ffff
Bands\22\Region=3
Bands\22\Num=19
Bands\22\BSR=2
Bands\22\Start=3500000
Bands\22\End=3900000
Bands\22\Range=6
Bands\22\MemoryGroup=-1
Bands\22\Name=80m
Bands\22\Bytes=5
Bands\22\Color=#ff00ffff
Bands\23\Region=
Bands\23\Num=20
Bands\23\BSR=1
Bands\23\Start=1800000
Bands\23\End=2000000
Bands\23\Range=2
Bands\23\MemoryGroup=-1
Bands\23\Name=160m
Bands\23\Bytes=5
Bands\23\Color=#ffffff00
Bands\24\Region=
Bands\24\Num=21
Bands\24\BSR=0
Bands\24\Start=493000
Bands\24\End=595000
Bands\24\Range=8
Bands\24\MemoryGroup=-1
Bands\24\Name=630m
Bands\24\Bytes=5
Bands\24\Color=#ffaaff7f
Bands\25\Region=
Bands\25\Num=21
Bands\25\BSR=0
Bands\25\Start=135000
Bands\25\End=138000
Bands\25\Range=0
Bands\25\MemoryGroup=-1
Bands\25\Name=2200m
Bands\25\Bytes=5
Bands\25\Color=#ff5555ff
Bands\26\Region=
Bands\26\Num=22
Bands\26\BSR=15
Bands\26\Start=10000
Bands\26\End=30000000
Bands\26\Range=1.6
Bands\26\MemoryGroup=-1
Bands\26\Name=Gen
Bands\26\Bytes=5
Bands\26\Color=#00000000
Bands\27\Region=
Bands\27\Num=23
Bands\27\BSR=0
Bands\27\Start=5250000
Bands\27\End=5450000
Bands\27\Range=0
Bands\27\MemoryGroup=-1
Bands\27\Name=60m
Bands\27\Bytes=5
Bands\27\Color=#00000000
Bands\size=27
Modes\1\Num=0
Modes\1\Reg=0
Modes\1\Min=50

143
rigs/IC-7300.rig
Wyświetl plik

@ -704,6 +704,7 @@ Inputs\5\Num=4
Inputs\5\Reg=4
Inputs\5\Name=M/U
Inputs\size=5
Bands\1\Region=
Bands\1\Num=9
Bands\1\BSR=0
Bands\1\Start=70000000
@ -713,6 +714,7 @@ Bands\1\MemoryGroup=-1
Bands\1\Name=4m
Bands\1\Bytes=5
Bands\1\Color=#ffffaaff
Bands\2\Region=
Bands\2\Num=10
Bands\2\BSR=10
Bands\2\Start=50000000
@ -722,6 +724,7 @@ Bands\2\MemoryGroup=-1
Bands\2\Name=6m
Bands\2\Bytes=5
Bands\2\Color=#ffff5500
Bands\3\Region=
Bands\3\Num=11
Bands\3\BSR=9
Bands\3\Start=28000000
@ -731,6 +734,7 @@ Bands\3\MemoryGroup=-1
Bands\3\Name=10m
Bands\3\Bytes=5
Bands\3\Color=#ff00aaff
Bands\4\Region=
Bands\4\Num=12
Bands\4\BSR=8
Bands\4\Start=24890000
@ -740,6 +744,7 @@ Bands\4\MemoryGroup=-1
Bands\4\Name=12m
Bands\4\Bytes=5
Bands\4\Color=#ff00aa00
Bands\5\Region=
Bands\5\Num=13
Bands\5\BSR=7
Bands\5\Start=21000000
@ -749,6 +754,7 @@ Bands\5\MemoryGroup=-1
Bands\5\Name=15m
Bands\5\Bytes=5
Bands\5\Color=#ffff55ff
Bands\6\Region=
Bands\6\Num=14
Bands\6\BSR=6
Bands\6\Start=18068000
@ -758,6 +764,7 @@ Bands\6\MemoryGroup=-1
Bands\6\Name=17m
Bands\6\Bytes=5
Bands\6\Color=#ffaaaa00
Bands\7\Region=
Bands\7\Num=15
Bands\7\BSR=5
Bands\7\Start=14000000
@ -767,6 +774,7 @@ Bands\7\MemoryGroup=-1
Bands\7\Name=20m
Bands\7\Bytes=5
Bands\7\Color=#ffff0000
Bands\8\Region=
Bands\8\Num=16
Bands\8\BSR=4
Bands\8\Start=10100000
@ -776,70 +784,117 @@ Bands\8\MemoryGroup=-1
Bands\8\Name=30m
Bands\8\Bytes=5
Bands\8\Color=#ffffaa00
Bands\9\Region=1
Bands\9\Num=17
Bands\9\BSR=3
Bands\9\Start=7000000
Bands\9\End=7300000
Bands\9\End=7200000
Bands\9\Range=11
Bands\9\MemoryGroup=-1
Bands\9\Name=40m
Bands\9\Bytes=5
Bands\9\Color=#ffaa5500
Bands\10\Num=18
Bands\10\BSR=0
Bands\10\Start=5250000
Bands\10\End=5450000
Bands\10\Range=0
Bands\10\Region=2
Bands\10\Num=17
Bands\10\BSR=3
Bands\10\Start=7000000
Bands\10\End=7300000
Bands\10\Range=11
Bands\10\MemoryGroup=-1
Bands\10\Name=60m
Bands\10\Name=40m
Bands\10\Bytes=5
Bands\10\Color=#ffaaaaff
Bands\11\Num=19
Bands\11\BSR=2
Bands\11\Start=3500000
Bands\11\End=4000000
Bands\11\Range=6
Bands\10\Color=#ffaa5500
Bands\11\Region=3
Bands\11\Num=17
Bands\11\BSR=3
Bands\11\Start=7000000
Bands\11\End=7200000
Bands\11\Range=11
Bands\11\MemoryGroup=-1
Bands\11\Name=80m
Bands\11\Name=40m
Bands\11\Bytes=5
Bands\11\Color=#ff55ffff
Bands\12\Num=20
Bands\12\BSR=1
Bands\12\Start=1800000
Bands\12\End=2000000
Bands\12\Range=2
Bands\11\Color=#ffaa5500
Bands\12\Region=
Bands\12\Num=18
Bands\12\BSR=0
Bands\12\Start=5250000
Bands\12\End=5450000
Bands\12\Range=0
Bands\12\MemoryGroup=-1
Bands\12\Name=160m
Bands\12\Name=60m
Bands\12\Bytes=5
Bands\12\Color=#ffffff00
Bands\13\Num=21
Bands\13\BSR=0
Bands\13\Start=493000
Bands\13\End=595000
Bands\13\Range=8
Bands\12\Color=#ffaaaaff
Bands\13\Region=1
Bands\13\Num=19
Bands\13\BSR=2
Bands\13\Start=3500000
Bands\13\End=3800000
Bands\13\Range=6
Bands\13\MemoryGroup=-1
Bands\13\Name=630m
Bands\13\Name=80m
Bands\13\Bytes=5
Bands\13\Color=#ffaaff7f
Bands\14\Num=22
Bands\14\BSR=0
Bands\14\Start=135000
Bands\14\End=138000
Bands\14\Range=0
Bands\13\Color=#ff55ffff
Bands\14\Region=2
Bands\14\Num=19
Bands\14\BSR=2
Bands\14\Start=3500000
Bands\14\End=4000000
Bands\14\Range=6
Bands\14\MemoryGroup=-1
Bands\14\Name=2200m
Bands\14\Name=80m
Bands\14\Bytes=5
Bands\14\Color=#ff5500ff
Bands\15\Num=23
Bands\15\BSR=11
Bands\15\Start=10000
Bands\15\End=30000000
Bands\15\Range=1.6
Bands\14\Color=#ff55ffff
Bands\15\Region=3
Bands\15\Num=19
Bands\15\BSR=2
Bands\15\Start=3500000
Bands\15\End=3900000
Bands\15\Range=6
Bands\15\MemoryGroup=-1
Bands\15\Name=Gen
Bands\15\Name=80m
Bands\15\Bytes=5
Bands\15\Color=#00000000
Bands\size=15
Bands\15\Color=#ff55ffff
Bands\16\Region=
Bands\16\Num=20
Bands\16\BSR=1
Bands\16\Start=1800000
Bands\16\End=2000000
Bands\16\Range=2
Bands\16\MemoryGroup=-1
Bands\16\Name=160m
Bands\16\Bytes=5
Bands\16\Color=#ffffff00
Bands\17\Region=
Bands\17\Num=21
Bands\17\BSR=0
Bands\17\Start=493000
Bands\17\End=595000
Bands\17\Range=8
Bands\17\MemoryGroup=-1
Bands\17\Name=630m
Bands\17\Bytes=5
Bands\17\Color=#ffaaff7f
Bands\18\Region=
Bands\18\Num=22
Bands\18\BSR=0
Bands\18\Start=135000
Bands\18\End=138000
Bands\18\Range=0
Bands\18\MemoryGroup=-1
Bands\18\Name=2200m
Bands\18\Bytes=5
Bands\18\Color=#ff5500ff
Bands\19\Region=
Bands\19\Num=23
Bands\19\BSR=11
Bands\19\Start=10000
Bands\19\End=30000000
Bands\19\Range=1.6
Bands\19\MemoryGroup=-1
Bands\19\Name=Gen
Bands\19\Bytes=5
Bands\19\Color=#00000000
Bands\size=19
Modes\1\Num=0
Modes\1\Reg=0
Modes\1\Min=50

142
rigs/IC-7610.rig
Wyświetl plik

@ -1146,6 +1146,7 @@ Inputs\6\Num=10
Inputs\6\Reg=4
Inputs\6\Name=M/U
Inputs\size=6
Bands\1\Region=
Bands\1\Num=10
Bands\1\BSR=10
Bands\1\Start=50000000
@ -1155,6 +1156,7 @@ Bands\1\MemoryGroup=-1
Bands\1\Name=6m
Bands\1\Bytes=5
Bands\1\Color=#ffff5500
Bands\2\Region=
Bands\2\Num=11
Bands\2\BSR=9
Bands\2\Start=28000000
@ -1164,6 +1166,7 @@ Bands\2\MemoryGroup=-1
Bands\2\Name=10m
Bands\2\Bytes=5
Bands\2\Color=#ff00aaff
Bands\3\Region=
Bands\3\Num=12
Bands\3\BSR=8
Bands\3\Start=24890000
@ -1173,6 +1176,7 @@ Bands\3\MemoryGroup=-1
Bands\3\Name=12m
Bands\3\Bytes=5
Bands\3\Color=#ff00aa00
Bands\4\Region=
Bands\4\Num=13
Bands\4\BSR=7
Bands\4\Start=21000000
@ -1182,6 +1186,7 @@ Bands\4\MemoryGroup=-1
Bands\4\Name=15m
Bands\4\Bytes=5
Bands\4\Color=#ffff55ff
Bands\5\Region=
Bands\5\Num=14
Bands\5\BSR=6
Bands\5\Start=18068000
@ -1191,6 +1196,7 @@ Bands\5\MemoryGroup=-1
Bands\5\Name=17m
Bands\5\Bytes=5
Bands\5\Color=#ffaaaa00
Bands\6\Region=
Bands\6\Num=15
Bands\6\BSR=5
Bands\6\Start=14000000
@ -1200,6 +1206,7 @@ Bands\6\MemoryGroup=-1
Bands\6\Name=20m
Bands\6\Bytes=5
Bands\6\Color=#ffff0000
Bands\7\Region=
Bands\7\Num=16
Bands\7\BSR=4
Bands\7\Start=10100000
@ -1209,70 +1216,117 @@ Bands\7\MemoryGroup=-1
Bands\7\Name=30m
Bands\7\Bytes=5
Bands\7\Color=#ffffaa00
Bands\8\Region=1
Bands\8\Num=17
Bands\8\BSR=3
Bands\8\Start=7000000
Bands\8\End=7300000
Bands\8\End=7200000
Bands\8\Range=11
Bands\8\MemoryGroup=-1
Bands\8\Name=40m
Bands\8\Bytes=5
Bands\8\Color=#ffaa5500
Bands\9\Num=18
Bands\9\BSR=0
Bands\9\Start=5250000
Bands\9\End=5450000
Bands\9\Range=0
Bands\9\Region=2
Bands\9\Num=17
Bands\9\BSR=3
Bands\9\Start=7000000
Bands\9\End=7300000
Bands\9\Range=11
Bands\9\MemoryGroup=-1
Bands\9\Name=60m
Bands\9\Name=40m
Bands\9\Bytes=5
Bands\9\Color=#ffaaaaff
Bands\10\Num=19
Bands\10\BSR=2
Bands\10\Start=3500000
Bands\10\End=4000000
Bands\10\Range=6
Bands\9\Color=#ffaa5500
Bands\10\Region=3
Bands\10\Num=17
Bands\10\BSR=3
Bands\10\Start=7000000
Bands\10\End=7200000
Bands\10\Range=11
Bands\10\MemoryGroup=-1
Bands\10\Name=80m
Bands\10\Name=40m
Bands\10\Bytes=5
Bands\10\Color=#ff55ffff
Bands\11\Num=20
Bands\11\BSR=1
Bands\11\Start=1800000
Bands\11\End=2000000
Bands\11\Range=2
Bands\10\Color=#ffaa5500
Bands\11\Region=
Bands\11\Num=18
Bands\11\BSR=0
Bands\11\Start=5250000
Bands\11\End=5450000
Bands\11\Range=0
Bands\11\MemoryGroup=-1
Bands\11\Name=160m
Bands\11\Name=60m
Bands\11\Bytes=5
Bands\11\Color=#ffffff00
Bands\12\Num=21
Bands\12\BSR=0
Bands\12\Start=493000
Bands\12\End=595000
Bands\12\Range=8
Bands\11\Color=#ffaaaaff
Bands\12\Region=1
Bands\12\Num=19
Bands\12\BSR=2
Bands\12\Start=3500000
Bands\12\End=3800000
Bands\12\Range=6
Bands\12\MemoryGroup=-1
Bands\12\Name=630m
Bands\12\Name=80m
Bands\12\Bytes=5
Bands\12\Color=#ffaaff00
Bands\13\Num=22
Bands\13\BSR=0
Bands\13\Start=135000
Bands\13\End=138000
Bands\13\Range=0
Bands\12\Color=#ff55ffff
Bands\13\Region=2
Bands\13\Num=19
Bands\13\BSR=2
Bands\13\Start=3500000
Bands\13\End=4000000
Bands\13\Range=6
Bands\13\MemoryGroup=-1
Bands\13\Name=2200m
Bands\13\Name=80m
Bands\13\Bytes=5
Bands\13\Color=#ff5555ff
Bands\14\Num=23
Bands\14\BSR=0
Bands\14\Start=10000
Bands\14\End=30000000
Bands\14\Range=1.6
Bands\13\Color=#ff55ffff
Bands\14\Region=3
Bands\14\Num=19
Bands\14\BSR=2
Bands\14\Start=3500000
Bands\14\End=3900000
Bands\14\Range=6
Bands\14\MemoryGroup=-1
Bands\14\Name=Gen
Bands\14\Name=80m
Bands\14\Bytes=5
Bands\14\Color=#00000000
Bands\size=14
Bands\14\Color=#ff55ffff
Bands\15\Region=
Bands\15\Num=20
Bands\15\BSR=1
Bands\15\Start=1800000
Bands\15\End=2000000
Bands\15\Range=2
Bands\15\MemoryGroup=-1
Bands\15\Name=160m
Bands\15\Bytes=5
Bands\15\Color=#ffffff00
Bands\16\Region=
Bands\16\Num=21
Bands\16\BSR=0
Bands\16\Start=493000
Bands\16\End=595000
Bands\16\Range=8
Bands\16\MemoryGroup=-1
Bands\16\Name=630m
Bands\16\Bytes=5
Bands\16\Color=#ffaaff00
Bands\17\Region=
Bands\17\Num=22
Bands\17\BSR=0
Bands\17\Start=135000
Bands\17\End=138000
Bands\17\Range=0
Bands\17\MemoryGroup=-1
Bands\17\Name=2200m
Bands\17\Bytes=5
Bands\17\Color=#ff5555ff
Bands\18\Region=
Bands\18\Num=23
Bands\18\BSR=0
Bands\18\Start=10000
Bands\18\End=30000000
Bands\18\Range=1.6
Bands\18\MemoryGroup=-1
Bands\18\Name=Gen
Bands\18\Bytes=5
Bands\18\Color=#00000000
Bands\size=18
Modes\1\Num=0
Modes\1\Reg=0
Modes\1\Min=50

142
rigs/IC-785x.rig
Wyświetl plik

@ -1178,6 +1178,7 @@ Inputs\11\Num=10
Inputs\11\Reg=0
Inputs\11\Name=M/U
Inputs\size=11
Bands\1\Region=
Bands\1\Num=10
Bands\1\BSR=10
Bands\1\Start=50000000
@ -1187,6 +1188,7 @@ Bands\1\MemoryGroup=-1
Bands\1\Name=6m
Bands\1\Bytes=5
Bands\1\Color=#ffff5500
Bands\2\Region=
Bands\2\Num=11
Bands\2\BSR=9
Bands\2\Start=28000000
@ -1196,6 +1198,7 @@ Bands\2\MemoryGroup=-1
Bands\2\Name=10m
Bands\2\Bytes=5
Bands\2\Color=#ff00aaff
Bands\3\Region=
Bands\3\Num=12
Bands\3\BSR=8
Bands\3\Start=24890000
@ -1205,6 +1208,7 @@ Bands\3\MemoryGroup=-1
Bands\3\Name=12m
Bands\3\Bytes=5
Bands\3\Color=#ff00aa00
Bands\4\Region=
Bands\4\Num=13
Bands\4\BSR=7
Bands\4\Start=21000000
@ -1214,6 +1218,7 @@ Bands\4\MemoryGroup=-1
Bands\4\Name=15m
Bands\4\Bytes=5
Bands\4\Color=#ffff00ff
Bands\5\Region=
Bands\5\Num=14
Bands\5\BSR=6
Bands\5\Start=18068000
@ -1223,6 +1228,7 @@ Bands\5\MemoryGroup=-1
Bands\5\Name=17m
Bands\5\Bytes=5
Bands\5\Color=#ffaaaa00
Bands\6\Region=
Bands\6\Num=15
Bands\6\BSR=5
Bands\6\Start=14000000
@ -1232,6 +1238,7 @@ Bands\6\MemoryGroup=-1
Bands\6\Name=20m
Bands\6\Bytes=5
Bands\6\Color=#ffff0000
Bands\7\Region=
Bands\7\Num=16
Bands\7\BSR=4
Bands\7\Start=10100000
@ -1241,70 +1248,117 @@ Bands\7\MemoryGroup=-1
Bands\7\Name=30m
Bands\7\Bytes=5
Bands\7\Color=#ffffaa00
Bands\8\Region=1
Bands\8\Num=17
Bands\8\BSR=3
Bands\8\Start=7000000
Bands\8\End=7300000
Bands\8\End=7200000
Bands\8\Range=11
Bands\8\MemoryGroup=-1
Bands\8\Name=40m
Bands\8\Bytes=5
Bands\8\Color=#ffaa5500
Bands\9\Num=18
Bands\9\BSR=0
Bands\9\Start=5250000
Bands\9\End=5450000
Bands\9\Range=0
Bands\9\Region=2
Bands\9\Num=17
Bands\9\BSR=3
Bands\9\Start=7000000
Bands\9\End=7300000
Bands\9\Range=11
Bands\9\MemoryGroup=-1
Bands\9\Name=60m
Bands\9\Name=40m
Bands\9\Bytes=5
Bands\9\Color=#ffaaaaff
Bands\10\Num=19
Bands\10\BSR=2
Bands\10\Start=3500000
Bands\10\End=4000000
Bands\10\Range=6
Bands\9\Color=#ffaa5500
Bands\10\Region=3
Bands\10\Num=17
Bands\10\BSR=3
Bands\10\Start=7000000
Bands\10\End=7200000
Bands\10\Range=11
Bands\10\MemoryGroup=-1
Bands\10\Name=80m
Bands\10\Name=40m
Bands\10\Bytes=5
Bands\10\Color=#ffaaffff
Bands\11\Num=20
Bands\11\BSR=1
Bands\11\Start=1800000
Bands\11\End=2000000
Bands\11\Range=2
Bands\10\Color=#ffaa5500
Bands\11\Region=
Bands\11\Num=18
Bands\11\BSR=0
Bands\11\Start=5250000
Bands\11\End=5450000
Bands\11\Range=0
Bands\11\MemoryGroup=-1
Bands\11\Name=160m
Bands\11\Name=60m
Bands\11\Bytes=5
Bands\11\Color=#ffffff00
Bands\12\Num=21
Bands\12\BSR=0
Bands\12\Start=493000
Bands\12\End=595000
Bands\12\Range=8
Bands\11\Color=#ffaaaaff
Bands\12\Region=1
Bands\12\Num=19
Bands\12\BSR=2
Bands\12\Start=3500000
Bands\12\End=3800000
Bands\12\Range=6
Bands\12\MemoryGroup=-1
Bands\12\Name=630m
Bands\12\Name=80m
Bands\12\Bytes=5
Bands\12\Color=#ffaaff7f
Bands\13\Num=22
Bands\13\BSR=0
Bands\13\Start=135000
Bands\13\End=138000
Bands\13\Range=0
Bands\12\Color=#ffaaffff
Bands\13\Region=2
Bands\13\Num=19
Bands\13\BSR=2
Bands\13\Start=3500000
Bands\13\End=4000000
Bands\13\Range=6
Bands\13\MemoryGroup=-1
Bands\13\Name=2200m
Bands\13\Name=80m
Bands\13\Bytes=5
Bands\13\Color=#ff5555ff
Bands\14\Num=23
Bands\14\BSR=11
Bands\14\Start=10000
Bands\14\End=30000000
Bands\14\Range=1.6
Bands\13\Color=#ffaaffff
Bands\14\Region=3
Bands\14\Num=19
Bands\14\BSR=2
Bands\14\Start=3500000
Bands\14\End=3900000
Bands\14\Range=6
Bands\14\MemoryGroup=-1
Bands\14\Name=Gen
Bands\14\Name=80m
Bands\14\Bytes=5
Bands\14\Color=#00000000
Bands\size=14
Bands\14\Color=#ffaaffff
Bands\15\Region=
Bands\15\Num=20
Bands\15\BSR=1
Bands\15\Start=1800000
Bands\15\End=2000000
Bands\15\Range=2
Bands\15\MemoryGroup=-1
Bands\15\Name=160m
Bands\15\Bytes=5
Bands\15\Color=#ffffff00
Bands\16\Region=
Bands\16\Num=21
Bands\16\BSR=0
Bands\16\Start=493000
Bands\16\End=595000
Bands\16\Range=8
Bands\16\MemoryGroup=-1
Bands\16\Name=630m
Bands\16\Bytes=5
Bands\16\Color=#ffaaff7f
Bands\17\Region=
Bands\17\Num=22
Bands\17\BSR=0
Bands\17\Start=135000
Bands\17\End=138000
Bands\17\Range=0
Bands\17\MemoryGroup=-1
Bands\17\Name=2200m
Bands\17\Bytes=5
Bands\17\Color=#ff5555ff
Bands\18\Region=
Bands\18\Num=23
Bands\18\BSR=11
Bands\18\Start=10000
Bands\18\End=30000000
Bands\18\Range=1.6
Bands\18\MemoryGroup=-1
Bands\18\Name=Gen
Bands\18\Bytes=5
Bands\18\Color=#00000000
Bands\size=18
Modes\1\Num=0
Modes\1\Reg=0
Modes\1\Min=50

128
rigs/IC-905.rig
Wyświetl plik

@ -872,6 +872,7 @@ Inputs\6\Num=12
Inputs\6\Reg=2
Inputs\6\Name=M/A
Inputs\size=6
Bands\1\Region=
Bands\1\Num=0
Bands\1\BSR=6
Bands\1\Start=10000000000
@ -881,52 +882,117 @@ Bands\1\MemoryGroup=-1
Bands\1\Name=3 cm
Bands\1\Bytes=6
Bands\1\Color=#ffffff00
Bands\2\Region=1
Bands\2\Num=1
Bands\2\BSR=5
Bands\2\Start=5650000000
Bands\2\End=5925000000
Bands\2\Range=5925
Bands\2\End=5850000000
Bands\2\Range=5850
Bands\2\MemoryGroup=-1
Bands\2\Name=6 cm
Bands\2\Bytes=5
Bands\2\Color=#ffff55ff
Bands\3\Num=3
Bands\3\BSR=4
Bands\3\Start=2400000000
Bands\3\End=2450000000
Bands\3\Range=2450
Bands\3\Region=2
Bands\3\Num=1
Bands\3\BSR=5
Bands\3\Start=5650000000
Bands\3\End=5925000000
Bands\3\Range=5925
Bands\3\MemoryGroup=-1
Bands\3\Name=13 cm
Bands\3\Name=6 cm
Bands\3\Bytes=5
Bands\3\Color=#ff55ffff
Bands\4\Num=4
Bands\4\BSR=3
Bands\4\Start=1240000000
Bands\4\End=1300000000
Bands\4\Range=1300
Bands\3\Color=#ffff55ff
Bands\4\Region=3
Bands\4\Num=1
Bands\4\BSR=5
Bands\4\Start=5650000000
Bands\4\End=5925000000
Bands\4\Range=5925
Bands\4\MemoryGroup=-1
Bands\4\Name=23 cm
Bands\4\Name=6 cm
Bands\4\Bytes=5
Bands\4\Color=#ffff0000
Bands\5\Num=5
Bands\5\BSR=2
Bands\5\Start=430000000
Bands\5\End=440000000
Bands\5\Range=440
Bands\4\Color=#ffff55ff
Bands\5\Region=
Bands\5\Num=3
Bands\5\BSR=4
Bands\5\Start=2400000000
Bands\5\End=2450000000
Bands\5\Range=2450
Bands\5\MemoryGroup=-1
Bands\5\Name=70 cm
Bands\5\Name=13 cm
Bands\5\Bytes=5
Bands\5\Color=#ff00ff00
Bands\6\Num=6
Bands\6\BSR=1
Bands\6\Start=144000000
Bands\6\End=146000000
Bands\6\Range=146
Bands\5\Color=#ff55ffff
Bands\6\Region=
Bands\6\Num=4
Bands\6\BSR=3
Bands\6\Start=1240000000
Bands\6\End=1300000000
Bands\6\Range=1300
Bands\6\MemoryGroup=-1
Bands\6\Name=2 m
Bands\6\Name=23 cm
Bands\6\Bytes=5
Bands\6\Color=#ff0000ff
Bands\size=6
Bands\6\Color=#ffff0000
Bands\7\Region=1
Bands\7\Num=5
Bands\7\BSR=2
Bands\7\Start=430000000
Bands\7\End=440000000
Bands\7\Range=440
Bands\7\MemoryGroup=-1
Bands\7\Name=70 cm
Bands\7\Bytes=5
Bands\7\Color=#ff00ff00
Bands\8\Region=2
Bands\8\Num=5
Bands\8\BSR=2
Bands\8\Start=420000000
Bands\8\End=450000000
Bands\8\Range=450
Bands\8\MemoryGroup=-1
Bands\8\Name=70 cm
Bands\8\Bytes=5
Bands\8\Color=#ff00ff00
Bands\9\Region=3
Bands\9\Num=5
Bands\9\BSR=2
Bands\9\Start=430000000
Bands\9\End=440000000
Bands\9\Range=440
Bands\9\MemoryGroup=-1
Bands\9\Name=70 cm
Bands\9\Bytes=5
Bands\9\Color=#ff00ff00
Bands\10\Region=1
Bands\10\Num=6
Bands\10\BSR=1
Bands\10\Start=144000000
Bands\10\End=146000000
Bands\10\Range=146
Bands\10\MemoryGroup=-1
Bands\10\Name=2 m
Bands\10\Bytes=5
Bands\10\Color=#ff0000ff
Bands\11\Region=2
Bands\11\Num=6
Bands\11\BSR=1
Bands\11\Start=144000000
Bands\11\End=148000000
Bands\11\Range=148
Bands\11\MemoryGroup=-1
Bands\11\Name=2 m
Bands\11\Bytes=5
Bands\11\Color=#ff0000ff
Bands\12\Region=3
Bands\12\Num=6
Bands\12\BSR=1
Bands\12\Start=144000000
Bands\12\End=148000000
Bands\12\Range=148
Bands\12\MemoryGroup=-1
Bands\12\Name=2 m
Bands\12\Bytes=5
Bands\12\Color=#ff0000ff
Bands\size=12
Modes\1\Num=0
Modes\1\Reg=0
Modes\1\Min=50

65
rigs/IC-9700.rig
Wyświetl plik

@ -1035,6 +1035,7 @@ Inputs\6\Num=5
Inputs\6\Reg=5
Inputs\6\Name=LAN
Inputs\size=6
Bands\1\Region=
Bands\1\Num=4
Bands\1\BSR=3
Bands\1\Start=1240000000
@ -1044,25 +1045,67 @@ Bands\1\MemoryGroup=3
Bands\1\Name=23cm
Bands\1\Bytes=5
Bands\1\Color=#ffff0000
Bands\2\Region=1
Bands\2\Num=5
Bands\2\BSR=2
Bands\2\Start=430000000
Bands\2\End=450000000
Bands\2\Range=450
Bands\2\End=440000000
Bands\2\Range=440
Bands\2\MemoryGroup=2
Bands\2\Name=70cm
Bands\2\Bytes=5
Bands\2\Color=#ff00ff00
Bands\3\Num=6
Bands\3\BSR=1
Bands\3\Start=144000000
Bands\3\End=148000000
Bands\3\Range=148
Bands\3\MemoryGroup=1
Bands\3\Name=2m
Bands\3\Region=2
Bands\3\Num=5
Bands\3\BSR=2
Bands\3\Start=420000000
Bands\3\End=450000000
Bands\3\Range=450
Bands\3\MemoryGroup=2
Bands\3\Name=70cm
Bands\3\Bytes=5
Bands\3\Color=#ff0000ff
Bands\size=3
Bands\3\Color=#ff00ff00
Bands\4\Region=3
Bands\4\Num=5
Bands\4\BSR=2
Bands\4\Start=430000000
Bands\4\End=440000000
Bands\4\Range=440
Bands\4\MemoryGroup=2
Bands\4\Name=70cm
Bands\4\Bytes=5
Bands\4\Color=#ff00ff00
Bands\5\Region=1
Bands\5\Num=6
Bands\5\BSR=1
Bands\5\Start=144000000
Bands\5\End=146000000
Bands\5\Range=146
Bands\5\MemoryGroup=1
Bands\5\Name=2m
Bands\5\Bytes=5
Bands\5\Color=#ff0000ff
Bands\6\Region=2
Bands\6\Num=6
Bands\6\BSR=1
Bands\6\Start=144000000
Bands\6\End=148000000
Bands\6\Range=148
Bands\6\MemoryGroup=1
Bands\6\Name=2m
Bands\6\Bytes=5
Bands\6\Color=#ff0000ff
Bands\7\Region=3
Bands\7\Num=6
Bands\7\BSR=1
Bands\7\Start=144000000
Bands\7\End=148000000
Bands\7\Range=148
Bands\7\MemoryGroup=1
Bands\7\Name=2m
Bands\7\Bytes=5
Bands\7\Color=#ff0000ff
Bands\size=7
Modes\1\Num=0
Modes\1\Reg=0
Modes\1\Min=50

18
settingswidget.cpp
Wyświetl plik

@ -472,6 +472,13 @@ void settingswidget::updateIfPref(prefIfItem pif)
case if_frequencyUnits:
quietlyUpdateCombobox(ui->frequencyUnitsCombo, prefs->frequencyUnits);
break;
case if_region:
quietlyUpdateLineEdit(ui->regionTxt,prefs->region);
break;
case if_showBands:
qInfo() << "************* SHOWBANDS **********" << prefs->showBands;
quietlyUpdateCheckbox(ui->showBandsChk, prefs->showBands);
break;
default:
qWarning(logGui()) << "Did not understand if pref update item " << (int)pif;
break;
@ -1708,6 +1715,17 @@ void settingswidget::on_pttEnableChk_clicked(bool checked)
emit changedCtPref(ct_enablePTT);
}
void settingswidget::on_regionTxt_textChanged(QString text)
{
prefs->region = text;
emit changedIfPref(if_region);
}
void settingswidget::on_showBandsChk_clicked(bool checked)
{
prefs->showBands = checked;
emit changedIfPref(if_showBands);
}
void settingswidget::on_rigCreatorChk_clicked(bool checked)
{

3
settingswidget.h
Wyświetl plik

@ -129,6 +129,9 @@ private slots:
void on_underlayAverageBuffer_clicked(bool checked);
void on_underlayBufferSlider_valueChanged(int value);
void on_pttEnableChk_clicked(bool checked);
void on_regionTxt_textChanged(QString text);
void on_showBandsChk_clicked(bool checked);
void on_rigCreatorChk_clicked(bool checked);
void on_frequencyUnitsCombo_currentIndexChanged(int index);
void on_serialEnableBtn_clicked(bool checked);

34
settingswidget.ui
Wyświetl plik

@ -41,7 +41,7 @@
<item>
<widget class="QStackedWidget" name="settingsStack">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="radioAccess">
<layout class="QVBoxLayout" name="verticalLayout_21">
@ -831,6 +831,29 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_8">
<property name="text">
<string>Region:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="regionTxt">
<property name="maximumSize">
<size>
<width>35</width>
<height>16777215</height>
</size>
</property>
<property name="maxLength">
<number>32767</number>
</property>
<property name="placeholderText">
<string>1</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
@ -1023,6 +1046,13 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
</item>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showBandsChk">
<property name="text">
<string>Show Bands</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_27">
<property name="orientation">
@ -1297,7 +1327,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
<x>0</x>
<y>0</y>
<width>916</width>
<height>346</height>
<height>325</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">

116
spectrumscope.cpp
Wyświetl plik

@ -400,6 +400,25 @@ spectrumScope::spectrumScope(bool scope, uchar receiver, uchar vfo, QWidget *par
spectrumScope::~spectrumScope(){
QMutableVectorIterator<bandIndicator> it(bandIndicators);
while (it.hasNext())
{
auto band = it.next();
spectrum->removeItem(band.line);
spectrum->removeItem(band.text);
it.remove();
}
QMutableMapIterator<QString, spotData *> sp(clusterSpots);
while (sp.hasNext())
{
auto spot = sp.next();
spectrum->removeItem(spot.value()->text);
delete spot.value();
sp.remove();
}
if(colorMapData != Q_NULLPTR)
{
delete colorMapData;
@ -487,17 +506,12 @@ void spectrumScope::setRange(int floor, int ceiling)
configTop->blockSignals(false);
// Redraw band lines and eventually memory markers!
for (auto &line: bandLines)
for (auto &b: bandIndicators)
{
line->start->setCoords(line->start->coords().x(), spectrum->yAxis->range().upper-5);
line->end->setCoords(line->end->coords().x(), spectrum->yAxis->range().upper-5);
b.line->start->setCoords(b.line->start->coords().x(), spectrum->yAxis->range().upper-5);
b.line->end->setCoords(b.line->end->coords().x(), spectrum->yAxis->range().upper-5);
b.text->position->setCoords(b.text->position->coords().x(), spectrum->yAxis->range().upper-10);
}
for (auto &text: bandText)
{
text->position->setCoords(text->position->coords().x(), spectrum->yAxis->range().upper-10);
}
}
void spectrumScope::colorPreset(colorPrefsType *cp)
@ -1703,18 +1717,15 @@ void spectrumScope::receiveSpots(uchar receiver, QList<spotData> spots)
}
}
QMap<QString, spotData*>::iterator spot2 = clusterSpots.begin();
while (spot2 != clusterSpots.end()) {
if (spot2.value()->current == current) {
spectrum->removeItem(spot2.value()->text);
//qDebug(logCluster()) << "REMOVE:" << spot2.value()->dxcall;
delete spot2.value(); // Stop memory leak?
spot2 = clusterSpots.erase(spot2);
QMutableMapIterator<QString, spotData *> sp(clusterSpots);
while (sp.hasNext())
{
auto spot = sp.next();
if (spot.value()->current == current) {
spectrum->removeItem(spot.value()->text);
delete spot.value();
sp.remove();
}
else {
++spot2;
}
}
//qDebug(logCluster()) << "Processing took" << timer.nsecsElapsed() / 1000 << "us";
@ -1804,36 +1815,55 @@ void spectrumScope::setFrequency(freqt f, uchar vfo)
}
void spectrumScope::displaySettings(int numDigits, qint64 minf, qint64 maxf, int minStep,FctlUnit unit,std::vector<bandType>* bands)
void spectrumScope::setBandIndicators(bool show, QString region, std::vector<bandType>* bands)
{
for (uchar i=0;i<numVFO;i++)
freqDisplay[i]->setup(numDigits, minf, maxf, minStep, unit, bands);
this->currentRegion = region;
QMutableVectorIterator<bandIndicator> it(bandIndicators);
while (it.hasNext())
{
bandIndicator band = it.next();
spectrum->removeItem(band.line);
spectrum->removeItem(band.text);
it.remove();
}
// Step through the bands and add all indicators!
for (auto &band: *bands)
{
// Add band line to current scope!
QCPItemLine* b = new QCPItemLine(spectrum);
b->setHead(QCPLineEnding::esLineArrow);
b->setTail(QCPLineEnding::esLineArrow);
b->setVisible(true);
b->setPen(QPen(band.color));
b->start->setCoords(double(band.lowFreq/1000000.0), spectrum->yAxis->range().upper-5);
b->end->setCoords(double(band.highFreq/1000000.0), spectrum->yAxis->range().upper-5);
bandLines.append(b);
if (show) {
for (auto &band: *bands)
{
if (band.region == "" || band.region == region) {
// Add band line to current scope!
bandIndicator b;
b.line = new QCPItemLine(spectrum);
b.line->setHead(QCPLineEnding::esLineArrow);
b.line->setTail(QCPLineEnding::esLineArrow);
b.line->setVisible(true);
b.line->setPen(QPen(band.color));
b.line->start->setCoords(double(band.lowFreq/1000000.0), spectrum->yAxis->range().upper-5);
b.line->end->setCoords(double(band.highFreq/1000000.0), spectrum->yAxis->range().upper-5);
QCPItemText* n = new QCPItemText(spectrum);
n->setVisible(true);
n->setAntialiased(true);
n->setColor(band.color);
n->setFont(QFont(font().family(), 8));
n->setPositionAlignment(Qt::AlignTop);
n->setText(band.name);
n->position->setCoords(double(band.lowFreq/1000000.0), spectrum->yAxis->range().upper-10);
bandText.append(n);
b.text = new QCPItemText(spectrum);
b.text->setVisible(true);
b.text->setAntialiased(true);
b.text->setColor(band.color);
b.text->setFont(QFont(font().family(), 8));
b.text->setPositionAlignment(Qt::AlignTop);
b.text->setText(band.name);
b.text->position->setCoords(double(band.lowFreq/1000000.0), spectrum->yAxis->range().upper-10);
bandIndicators.append(b);
}
}
}
}
void spectrumScope::displaySettings(int numDigits, qint64 minf, qint64 maxf, int minStep,FctlUnit unit, std::vector<bandType>* bands)
{
// Delete all band indicators first
for (uchar i=0;i<numVFO;i++)
freqDisplay[i]->setup(numDigits, minf, maxf, minStep, unit, bands);
}
void spectrumScope::setUnit(FctlUnit unit)

9
spectrumscope.h
Wyświetl plik

@ -26,6 +26,10 @@ enum scopeTypes {
scopeNone
};
struct bandIndicator {
QCPItemLine* line;
QCPItemText* text;
};
class spectrumScope : public QGroupBox
{
@ -96,6 +100,7 @@ public:
void setHold(bool h);
void setSpeed(uchar s);
void displaySettings(int NumDigits, qint64 Minf, qint64 Maxf, int MinStep,FctlUnit unit,std::vector<bandType>* bands = Q_NULLPTR);
void setBandIndicators(bool show, QString region, std::vector<bandType>* bands);
void setUnit(FctlUnit unit);
void setRefLimits(int lower, int upper);
void setRef(int ref);
@ -234,8 +239,7 @@ private:
QByteArray spectrumPeaks;
QVector <double> spectrumPlasmaLine;
QVector <QByteArray> spectrumPlasma;
QVector<QCPItemLine *> bandLines;
QVector<QCPItemText *> bandText;
QVector<bandIndicator> bandIndicators;
unsigned int spectrumPlasmaSizeCurrent = 64;
unsigned int spectrumPlasmaSizeMax = 128;
unsigned int spectrumPlasmaPosition = 0;
@ -281,6 +285,7 @@ private:
bool isActive;
uchar numVFO=1;
bool hasScope=true;
QString currentRegion="1";
};
#endif // SPECTRUMSCOPE_H

2
tablewidget.cpp
Wyświetl plik

@ -39,6 +39,7 @@ void tableWidget::mouseReleaseEvent(QMouseEvent *event)
}
else if( selectedAction == clone )
{
this->setSortingEnabled(false);
int row=this->currentRow(); // This will be the new row with the old one as row+1
this->insertRow(this->currentRow());
for (int i=0;i<this->columnCount();i++)
@ -47,6 +48,7 @@ void tableWidget::mouseReleaseEvent(QMouseEvent *event)
this->model()->setData(this->model()->index(row,i),this->item(row+1,i)->text());
}
emit rowAdded(row);
this->setSortingEnabled(true);
}
else if( selectedAction == del )
{

29
wfmain.cpp
Wyświetl plik

@ -1556,6 +1556,8 @@ void wfmain::setDefPrefs()
defPrefs.meter2Type = meterNone;
defPrefs.meter3Type = meterNone;
defPrefs.compMeterReverse = false;
defPrefs.region = "1";
defPrefs.showBands = true;
defPrefs.tcpPort = 0;
defPrefs.tciPort = 50001;
@ -1636,6 +1638,9 @@ void wfmain::loadSettings()
prefs.clickDragTuningEnable = settings->value("ClickDragTuning", false).toBool();
prefs.rigCreatorEnable = settings->value("RigCreator",false).toBool();
prefs.region = settings->value("Region",defPrefs.region).toString();
prefs.showBands = settings->value("ShowBands",defPrefs.showBands).toBool();
ui->rigCreatorBtn->setEnabled(prefs.rigCreatorEnable);
prefs.frequencyUnits = settings->value("FrequencyUnits",3).toInt();
@ -2369,6 +2374,13 @@ void wfmain::extChangedIfPref(prefIfItem i)
receiver->setUnit((FctlUnit)prefs.frequencyUnits);
}
break;
case if_region:
case if_showBands:
foreach (auto receiver, receivers)
{
receiver->setBandIndicators(prefs.showBands, prefs.region, &rigCaps->bands);
}
break;
default:
qWarning(logSystem()) << "Did not understand if pref update in wfmain for item " << (int)i;
break;
@ -2817,6 +2829,8 @@ void wfmain::saveSettings()
settings->setValue("ClickDragTuning", prefs.clickDragTuningEnable);
settings->setValue("RigCreator",prefs.rigCreatorEnable);
settings->setValue("FrequencyUnits",prefs.frequencyUnits);
settings->setValue("Region",prefs.region);
settings->setValue("ShowBands",prefs.showBands);
settings->endGroup();
@ -3529,17 +3543,20 @@ void wfmain:: getInitialRigState()
quint64 end=0;
for (auto &band: rigCaps->bands)
{
if (start > band.lowFreq)
start = band.lowFreq;
if (end < band.highFreq)
end = band.highFreq;
if (band.region == "" || band.region == prefs.region) {
if (start > band.lowFreq)
start = band.lowFreq;
if (end < band.highFreq)
end = band.highFreq;
}
}
foreach (auto receiver, receivers)
{
receiver->enableScope(this->rigCaps->commands.contains(funcScopeMainMode));
//qInfo(logSystem()) << "Display Settings start:" << start << "end:" << end;
receiver->displaySettings(0, start, end, 1,(FctlUnit)prefs.frequencyUnits,&rigCaps->bands);
receiver->displaySettings(0, start, end, 1,(FctlUnit)prefs.frequencyUnits, &rigCaps->bands);
receiver->setBandIndicators(prefs.showBands, prefs.region, &rigCaps->bands);
}
}

1
wfmain.h
Wyświetl plik

@ -796,6 +796,7 @@ private:
quint64 subElapsed=0;
colorPrefsType* colorPrefs=Q_NULLPTR;
QString currentRegion = "1";
funcs getInputTypeCommand(inputTypes input);
#if defined (USB_CONTROLLER)