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

Merge branch 'ui-enhance'

merge-requests/5/head
Roeland Jansen 2021-07-20 08:07:28 +02:00
rodzic b8ab1b966d 274cc65dbf
commit 886ca86a90
7 zmienionych plików z 195 dodań i 50 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

146
meter.cpp
Wyświetl plik

@ -36,6 +36,9 @@ meter::meter(QWidget *parent) : QWidget(parent)
lowTextColor.setNamedColor("#eff0f1");
lowLineColor = lowTextColor;
avgLevels.resize(averageBalisticLength, 0);
peakLevels.resize(peakBalisticLength, 0);
}
void meter::setMeterType(meterKind type)
@ -45,7 +48,13 @@ void meter::setMeterType(meterKind type)
meterType = type;
// clear average and peak vectors:
avgLevels.clear();
peakLevels.clear();
avgLevels.resize(averageBalisticLength, 0);
peakLevels.resize(peakBalisticLength, 0);
peakPosition = 0;
avgPosition = 0;
// re-draw scale:
}
@ -81,7 +90,13 @@ void meter::paintEvent(QPaintEvent *)
peakRedLevel = 100; // SWR 2.5
drawScaleSWR(&painter);
break;
case meterCenter:
peakRedLevel = 256; // No need for red here
drawScaleCenter(&painter);
break;
default:
peakRedLevel = 200;
drawScaleRaw(&painter);
break;
}
@ -89,25 +104,82 @@ void meter::paintEvent(QPaintEvent *)
// Draws a bar from start to value.
painter.setPen(currentColor);
painter.setBrush(currentColor);
// X, Y, Width, Height
painter.drawRect(mXstart,mYstart,current,barHeight);
// Average:
painter.setPen(averageColor);
painter.setBrush(averageColor);
painter.drawRect(mXstart+average-1,mYstart,1,barHeight); // bar is 1 pixel wide, height = meter start?
// Peak:
painter.setPen(peakColor);
painter.setBrush(peakColor);
if(peak > peakRedLevel)
if(meterType == meterCenter)
{
painter.setBrush(Qt::red);
painter.setPen(Qt::red);
painter.drawRect(mXstart+128,mYstart,current-128,barHeight);
// Average:
painter.setPen(averageColor);
painter.setBrush(averageColor);
painter.drawRect(mXstart+average-1,mYstart,1,barHeight); // bar is 1 pixel wide, height = meter start?
// Peak:
painter.setPen(peakColor);
painter.setBrush(peakColor);
if((peak > 191) || (peak < 63))
{
painter.setBrush(Qt::red);
painter.setPen(Qt::red);
}
painter.drawRect(mXstart+peak-1,mYstart,1,barHeight);
} else {
// X, Y, Width, Height
painter.drawRect(mXstart,mYstart,current,barHeight);
// Average:
painter.setPen(averageColor);
painter.setBrush(averageColor);
painter.drawRect(mXstart+average-1,mYstart,1,barHeight); // bar is 1 pixel wide, height = meter start?
// Peak:
painter.setPen(peakColor);
painter.setBrush(peakColor);
if(peak > peakRedLevel)
{
painter.setBrush(Qt::red);
painter.setPen(Qt::red);
}
painter.drawRect(mXstart+peak-1,mYstart,2,barHeight);
}
painter.drawRect(mXstart+peak-1,mYstart,2,barHeight);
}
void meter::setLevel(int current)
{
this->current = current;
avgLevels[(avgPosition++)%averageBalisticLength] = current;
peakLevels[(peakPosition++)%peakBalisticLength] = current;
// TODO: only average up to clamp(position, size) that way we don't average in
// zeros for the first couple of seconds. We might have to not use the accumulate function
// if we want to specify positions.
int sum=0;
for(unsigned int i=0; i < (unsigned int)std::min(avgPosition, (int)avgLevels.size()); i++)
{
sum += avgLevels.at(i);
}
this->average = sum / std::min(avgPosition, (int)avgLevels.size());
// this->average = std::accumulate(avgLevels.begin(), std::min(avgLevels.begin() + avgPosition, avgLevels.begin()+avgLevels.size())) / averageBalisticLength;
// this->peak = std::max_element(peakLevels.begin(), peakLevels.end());
this->peak = 0;
for(unsigned int i=0; i < peakLevels.size(); i++)
{
if( peakLevels.at(i) > this->peak)
this->peak = peakLevels.at(i);
}
this->update();
}
void meter::setLevels(int current, int peak, int average)
@ -115,6 +187,7 @@ void meter::setLevels(int current, int peak, int average)
this->current = current;
this->peak = peak;
this->average = average;
this->update();
}
@ -126,6 +199,51 @@ void meter::updateDrawing(int num)
// The drawScale functions draw the numbers and number unerline for each type of meter
void meter::drawScaleRaw(QPainter *qp)
{
qp->setPen(lowTextColor);
qp->setFont(QFont("Arial", fontSize));
int i=mXstart;
for(; i<mXstart+256; i+=20)
{
qp->drawText(i,scaleTextYstart, QString("%1").arg(i) );
}
// Now the lines:
qp->setPen(lowLineColor);
// Line: X1, Y1 -->to--> X2, Y2
qp->drawLine(mXstart,scaleLineYstart,peakRedLevel+mXstart,scaleLineYstart);
qp->setPen(Qt::red);
qp->drawLine(peakRedLevel+mXstart,scaleLineYstart,255+mXstart,scaleLineYstart);
}
void meter::drawScaleCenter(QPainter *qp)
{
// No known units
qp->setPen(lowLineColor);
qp->drawText(60+mXstart,scaleTextYstart, QString("-"));
qp->setPen(Qt::green);
// Attempt to draw the zero at the actual center
qp->drawText(128-2+mXstart,scaleTextYstart, QString("0"));
qp->setPen(lowLineColor);
qp->drawText(195+mXstart,scaleTextYstart, QString("+"));
qp->setPen(lowLineColor);
qp->drawLine(mXstart,scaleLineYstart,128-32+mXstart,scaleLineYstart);
qp->setPen(Qt::green);
qp->drawLine(128-32+mXstart,scaleLineYstart,128+32+mXstart,scaleLineYstart);
qp->setPen(lowLineColor);
qp->drawLine(128+32+mXstart,scaleLineYstart,255+mXstart,scaleLineYstart);
}
void meter::drawScalePo(QPainter *qp)
{
//From the manual: "0000=0% to 0143=50% to 0213=100%"

15
meter.h
Wyświetl plik

@ -3,6 +3,9 @@
#include <QWidget>
#include <QPainter>
#include <vector>
#include <algorithm>
#include <numeric>
#include "rigcommander.h" // for meter types
@ -19,6 +22,7 @@ public slots:
void updateDrawing(int num);
void setLevels(int current, int peak, int average);
void setLevel(int current);
void setMeterType(meterKind type);
meterKind getMeterType();
@ -32,6 +36,15 @@ private:
int peak = 0;
int average = 0;
int averageBalisticLength = 30;
int peakBalisticLength = 30;
int avgPosition=0;
int peakPosition=0;
std::vector<unsigned char> avgLevels;
std::vector<unsigned char> peakLevels;
int peakRedLevel=0;
int mXstart = 10; // Starting point for S=0.
@ -43,12 +56,14 @@ private:
int widgetWindowHeight = mYstart + barHeight + 10; // height of drawing canvis.
void drawScaleS(QPainter *qp);
void drawScaleCenter(QPainter *qp);
void drawScalePo(QPainter *qp);
void drawScaleRxdB(QPainter *qp);
void drawScaleALC(QPainter *qp);
void drawScaleSWR(QPainter *qp);
void drawScaleVd(QPainter *qp);
void drawScaleId(QPainter *qp);
void drawScaleRaw(QPainter *qp);
QColor currentColor;
QColor averageColor;

14
rigcommander.cpp
Wyświetl plik

@ -1389,6 +1389,11 @@ void rigCommander::parseLevels()
emit haveMeter(meterS, level);
rigState.sMeter = level;
break;
case '\x04':
// Center (IC-R8600)
emit haveMeter(meterCenter, level);
rigState.sMeter = level;
break;
case '\x11':
// RF-Power meter
emit haveMeter(meterPower, level);
@ -1917,6 +1922,9 @@ void rigCommander::getMeters(meterKind meter)
case meterS:
getSMeter();
break;
case meterCenter:
getCenterMeter();
break;
case meterSWR:
getSWRMeter();
break;
@ -1946,6 +1954,12 @@ void rigCommander::getSMeter()
prepDataAndSend(payload);
}
void rigCommander::getCenterMeter()
{
QByteArray payload("\x15\x04");
prepDataAndSend(payload);
}
void rigCommander::getRFPowerMeter()
{
QByteArray payload("\x15\x11");

2
rigcommander.h
Wyświetl plik

@ -21,6 +21,7 @@
enum meterKind {
meterNone=0,
meterS,
meterCenter,
meterSWR,
meterPower,
meterALC,
@ -224,6 +225,7 @@ public slots:
// Meters:
void getSMeter();
void getCenterMeter();
void getRFPowerMeter();
void getSWRMeter();
void getALCMeter();

64
wfmain.cpp
Wyświetl plik

@ -667,6 +667,7 @@ void wfmain::setupMainUI()
ui->meter2selectionCombo->addItem("Compression", meterComp);
ui->meter2selectionCombo->addItem("Voltage", meterVoltage);
ui->meter2selectionCombo->addItem("Current", meterCurrent);
ui->meter2selectionCombo->addItem("Center", meterCenter);
ui->meter2Widget->hide();
// Future ideas:
@ -2559,6 +2560,10 @@ void wfmain::doCmd(cmds cmd)
if(!amTransmitting)
emit getMeters(meterS);
break;
case cmdGetCenterMeter:
if(!amTransmitting)
emit getMeters(meterCenter);
break;
case cmdGetPowerMeter:
if(amTransmitting)
emit getMeters(meterPower);
@ -4534,42 +4539,22 @@ void wfmain::receiveLANGain(unsigned char level)
void wfmain::receiveMeter(meterKind inMeter, unsigned char level)
{
unsigned int peak = 0;
unsigned int sum=0;
unsigned int average=0;
switch(inMeter)
{
case meterS:
SMeterReadings[(smeterPos++)%SMeterReadings.length()] = level;
for(int i=0; i < SMeterReadings.length(); i++)
{
if((unsigned char)SMeterReadings.at(i) > peak)
peak = (unsigned char)SMeterReadings.at(i);
sum += (unsigned char)SMeterReadings.at(i);
}
average = sum / SMeterReadings.length();
ui->meterSPoWidget->setMeterType(meterS);
ui->meterSPoWidget->setLevels(level, peak, average);
ui->meterSPoWidget->setLevel(level);
ui->meterSPoWidget->repaint();
break;
case meterPower:
powerMeterReadings[(powerMeterPos++)%powerMeterReadings.length()] = level;
for(int i=0; i < powerMeterReadings.length(); i++)
{
if((unsigned char)powerMeterReadings.at(i) > peak)
peak = (unsigned char)powerMeterReadings.at(i);
sum += (unsigned char)powerMeterReadings.at(i);
}
average = sum / powerMeterReadings.length();
ui->meterSPoWidget->setMeterType(meterPower);
ui->meterSPoWidget->setLevels(level, peak, average);
ui->meterSPoWidget->setLevel(level);
ui->meterSPoWidget->update();
break;
default:
if(ui->meter2Widget->getMeterType() == inMeter)
{
ui->meter2Widget->setLevels(level, level, level);
ui->meter2Widget->setLevel(level);
}
break;
}
@ -5170,6 +5155,9 @@ wfmain::cmds wfmain::meterKindToMeterCommand(meterKind m)
case meterS:
c = cmdGetSMeter;
break;
case meterCenter:
c = cmdGetCenterMeter;
break;
case meterPower:
c = cmdGetPowerMeter;
break;
@ -5231,17 +5219,25 @@ void wfmain::on_debugBtn_clicked()
//setRadioTimeDatePrep();
//wf->setInteraction(QCP::iRangeZoom, true);
//wf->setInteraction(QCP::iRangeDrag, true);
bool ok = false;
unsigned char level = (unsigned char) QInputDialog::getInt(this, "wfview simulated radio level", "Raw level (0-255)", 128, 1, 255, 1, &ok );
if(ok)
{
int peak = level*1.5;
if(peak > 255)
peak = 255;
int average = peak / 2;
ui->meterSPoWidget->setMeterType(meterALC);
ui->meterSPoWidget->setLevels(level, peak, average);
ui->meterSPoWidget->update();
// debug the fast queue:
qDebug(logSystem()) << "Size of fast command queue: " << periodicCmdQueue.size();
for (auto it = periodicCmdQueue.cbegin(); it != periodicCmdQueue.cend(); ++it) {
qDebug(logSystem()) << *it ;
}
// bool ok = false;
// unsigned char level = (unsigned char) QInputDialog::getInt(this, "wfview simulated radio level", "Raw level (0-255)", 128, 1, 255, 1, &ok );
// if(ok)
// {
// int peak = level*1.5;
// if(peak > 255)
// peak = 255;
// int average = peak / 2;
// ui->meterSPoWidget->setMeterType(meterALC);
// ui->meterSPoWidget->setLevels(level, peak, average);
// ui->meterSPoWidget->update();
// }
}

2
wfmain.h
Wyświetl plik

@ -606,7 +606,7 @@ private:
cmdGetSql, cmdSetSql, cmdGetATUStatus, cmdSetATU, cmdStartATU, cmdGetSpectrumMode, cmdGetSpectrumSpan, cmdScopeCenterMode, cmdScopeFixedMode, cmdGetPTT, cmdSetPTT,
cmdGetTxPower, cmdSetTxPower, cmdGetMicGain, cmdSetMicGain, cmdSetModLevel, cmdGetSpectrumRefLevel, cmdGetDuplexMode, cmdGetModInput, cmdGetModDataInput,
cmdGetCurrentModLevel, cmdStartRegularPolling, cmdStopRegularPolling, cmdQueNormalSpeed,
cmdGetVdMeter, cmdGetIdMeter, cmdGetSMeter, cmdGetPowerMeter, cmdGetSWRMeter, cmdGetALCMeter, cmdGetCompMeter, cmdGetTxRxMeter,
cmdGetVdMeter, cmdGetIdMeter, cmdGetSMeter, cmdGetCenterMeter, cmdGetPowerMeter, cmdGetSWRMeter, cmdGetALCMeter, cmdGetCompMeter, cmdGetTxRxMeter,
cmdGetTone, cmdGetTSQL, cmdGetDTCS, cmdGetRptAccessMode, cmdGetPreamp, cmdGetAttenuator, cmdGetAntenna,
cmdSetTime, cmdSetDate, cmdSetUTCOffset};

2
wfmain.ui
Wyświetl plik

@ -18,7 +18,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>3</number>
<number>1</number>
</property>
<widget class="QWidget" name="mainTab">
<attribute name="title">