w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-21 11:31:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove more vestiges of JT9+JT65 mode.

Browse Source
This commit is contained in:
Joe Taylor 2021-07-19 09:26:25 -04:00
parent f74ad900ab
commit 8e64184183
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
widgets/plotter.cpp
View File

@ -530,9 +530,8 @@ void CPlotter::DrawOverlay() //DrawOverlay()
int yh=5; int yh=5;
int yTxTop=12; int yTxTop=12;
int yRxBottom=yTxTop + 2*yh + 4; int yRxBottom=yTxTop + 2*yh + 4;
if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65" if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="Q65" or m_mode=="FT8"
or m_mode=="Q65" or m_mode=="FT8" or m_mode=="FT4" or m_mode=="FT4" or m_mode.startsWith("FST4")) {
or m_mode.startsWith("FST4")) {
if(m_mode=="FST4" and !m_bSingleDecode) { if(m_mode=="FST4" and !m_bSingleDecode) {
x1=XfromFreq(m_nfa); x1=XfromFreq(m_nfa);
@ -580,9 +579,8 @@ void CPlotter::DrawOverlay() //DrawOverlay()
} }
} }
if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65" or if(m_mode=="JT9" or m_mode=="JT65" or m_mode.mid(0,4)=="WSPR" or m_mode=="Q65"
m_mode.mid(0,4)=="WSPR" or m_mode=="Q65" or m_mode=="FT8" or m_mode=="FT8" or m_mode=="FT4" or m_mode.startsWith("FST4")) {
or m_mode=="FT4" or m_mode.startsWith("FST4")) {
painter0.setPen(penRed); painter0.setPen(penRed);
x1=XfromFreq(m_txFreq); x1=XfromFreq(m_txFreq);
x2=XfromFreq(m_txFreq+bw); x2=XfromFreq(m_txFreq+bw);
@ -597,15 +595,6 @@ void CPlotter::DrawOverlay() //DrawOverlay()
painter0.drawLine(x2,yTxTop,x2,yTxTop+yh); painter0.drawLine(x2,yTxTop,x2,yTxTop+yh);
} }
if(m_mode=="JT9+JT65") {
QPen pen2(Qt::blue, 3); //Mark the JT65 | JT9 divider
painter0.setPen(pen2);
x1=XfromFreq(m_fMin);
if(x1<2) x1=2;
x2=x1+30;
painter0.drawLine(x1,8,x1,28);
}
if(m_dialFreq>10.13 and m_dialFreq< 10.15 and m_mode.mid(0,4)!="WSPR") { if(m_dialFreq>10.13 and m_dialFreq< 10.15 and m_mode.mid(0,4)!="WSPR") {
float f1=1.0e6*(10.1401 - m_dialFreq); float f1=1.0e6*(10.1401 - m_dialFreq);
float f2=f1+200.0; float f2=f1+200.0;

4
widgets/widegraph.cpp
View File

@ -292,7 +292,7 @@ void WideGraph::setTxFreq(int n) //setTxFreq
void WideGraph::setMode(QString mode) //setMode void WideGraph::setMode(QString mode) //setMode
{ {
m_mode=mode; m_mode=mode;
ui->fSplitSpinBox->setEnabled(m_mode=="JT9+JT65" or m_mode.startsWith("FST4")); ui->fSplitSpinBox->setEnabled(m_mode.startsWith("FST4"));
ui->widePlot->setMode(mode); ui->widePlot->setMode(mode);
ui->widePlot->DrawOverlay(); ui->widePlot->DrawOverlay();
ui->widePlot->update(); ui->widePlot->update();
@ -363,7 +363,7 @@ void WideGraph::setRxBand (QString const& band)
else else
{ {
ui->fSplitSpinBox->setValue (m_fMinPerBand.value (band, 2500).toUInt ()); ui->fSplitSpinBox->setValue (m_fMinPerBand.value (band, 2500).toUInt ());
ui->fSplitSpinBox->setEnabled (m_mode=="JT9+JT65" or m_mode.startsWith("FST4")); ui->fSplitSpinBox->setEnabled (m_mode.startsWith("FST4"));
} }
ui->widePlot->setRxBand(band); ui->widePlot->setRxBand(band);
setRxRange (); setRxRange ();