Removed the last annoying legs of the center/fixed two-mode system.

merge-requests/2/head
Elliott Liggett 2021-02-28 21:47:45 -08:00
rodzic 5a673e256c
commit 5577aebf8b
4 zmienionych plików z 0 dodań i 24 usunięć

Wyświetl plik

@ -407,18 +407,6 @@ void rigCommander::setScopeSpan(char span)
prepDataAndSend(payload);
}
void rigCommander::setSpectrumCenteredMode(bool centerEnable)
{
QByteArray specModePayload;
if(centerEnable)
{
specModePayload.setRawData("\x27\x14\x00\x00", 4);
} else {
specModePayload.setRawData("\x27\x14\x00\x01", 4);
}
prepDataAndSend(specModePayload);
}
void rigCommander::setSpectrumMode(spectrumMode spectMode)
{
QByteArray specModePayload;
@ -1985,7 +1973,6 @@ void rigCommander::parseWFData()
break;
case 0x14:
// fixed or center
//emit haveSpectrumFixedMode((bool)payloadIn[2]);
emit haveSpectrumMode(static_cast<spectrumMode>((unsigned char)payloadIn[3]));
// [1] 0x14
// [2] 0x00
@ -2262,7 +2249,6 @@ void rigCommander::parseSpectrum()
// 0x02 Scroll-C
// 0x03 Scroll-F
emit haveSpectrumMode(scopeMode);
emit haveSpectrumFixedMode(scopeMode==spectModeFixed);
oldScopeMode = scopeMode;
}

Wyświetl plik

@ -64,7 +64,6 @@ public slots:
void enableSpectrumDisplay();
void disableSpectrumDisplay();
void setSpectrumBounds(double startFreq, double endFreq, unsigned char edgeNumber);
void setSpectrumCenteredMode(bool centerEnable); // centered or band-wise
void setSpectrumMode(spectrumMode spectMode);
void getSpectrumCenterMode();
void getSpectrumMode();
@ -170,7 +169,6 @@ signals:
void haveBandStackReg(float freq, char mode, bool dataOn);
void haveSpectrumBounds();
void haveScopeSpan(char span);
void haveSpectrumFixedMode(bool fixedEnabled);
void haveSpectrumMode(spectrumMode spectmode);
void haveScopeEdge(char edge);
void haveSpectrumRefLevel(int level);

Wyświetl plik

@ -321,7 +321,6 @@ wfmain::wfmain(const QString serialPortCL, const QString hostCL, QWidget *parent
connect(this, SIGNAL(setModInput(rigInput, bool)), rig, SLOT(setModInput(rigInput,bool)));
connect(rig, SIGNAL(haveSpectrumData(QByteArray, double, double)), this, SLOT(receiveSpectrumData(QByteArray, double, double)));
connect(rig, SIGNAL(haveSpectrumFixedMode(bool)), this, SLOT(receiveSpectrumFixedMode(bool)));
connect(rig, SIGNAL(haveSpectrumMode(spectrumMode)), this, SLOT(receiveSpectrumMode(spectrumMode)));
connect(this, SIGNAL(setScopeMode(spectrumMode)), rig, SLOT(setSpectrumMode(spectrumMode)));
connect(this, SIGNAL(getScopeMode()), rig, SLOT(getScopeMode()));
@ -2011,12 +2010,6 @@ void wfmain::receiveSpectrumData(QByteArray spectrum, double startFreq, double e
}
}
void wfmain::receiveSpectrumFixedMode(bool isFixed)
{
qDebug() << __func__ << "Please remove this";
(void)isFixed;
}
void wfmain::receiveSpectrumMode(spectrumMode spectMode)
{
for(int i=0; i < ui->spectrumModeCombo->count(); i++)

Wyświetl plik

@ -155,7 +155,6 @@ private slots:
void receiveFreq(double);
void receiveMode(unsigned char mode, unsigned char filter);
void receiveSpectrumData(QByteArray spectrum, double startFreq, double endFreq);
void receiveSpectrumFixedMode(bool isFixed);
void receiveSpectrumMode(spectrumMode spectMode);
void receivePTTstatus(bool pttOn);
void receiveDataModeStatus(bool dataOn);