mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-21 11:31:51 -05:00
Remove setting of m_modeTx in WideGraph and Plotter. No need for it now.
This commit is contained in:
parent
57c4187b24
commit
a7ee9b29be
@ -1009,7 +1009,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
|
|||||||
|
|
||||||
m_fastGraph->setMode(m_mode);
|
m_fastGraph->setMode(m_mode);
|
||||||
m_wideGraph->setMode(m_mode);
|
m_wideGraph->setMode(m_mode);
|
||||||
m_wideGraph->setModeTx(m_modeTx);
|
|
||||||
|
|
||||||
connect (&minuteTimer, &QTimer::timeout, this, &MainWindow::on_the_minute);
|
connect (&minuteTimer, &QTimer::timeout, this, &MainWindow::on_the_minute);
|
||||||
minuteTimer.setSingleShot (true);
|
minuteTimer.setSingleShot (true);
|
||||||
@ -6084,7 +6083,6 @@ void MainWindow::on_actionFST4_triggered()
|
|||||||
setup_status_bar(false);
|
setup_status_bar(false);
|
||||||
ui->cbAutoSeq->setChecked(true);
|
ui->cbAutoSeq->setChecked(true);
|
||||||
m_wideGraph->setMode(m_mode);
|
m_wideGraph->setMode(m_mode);
|
||||||
m_wideGraph->setModeTx(m_modeTx);
|
|
||||||
m_wideGraph->setPeriod(m_TRperiod,6912);
|
m_wideGraph->setPeriod(m_TRperiod,6912);
|
||||||
m_wideGraph->setRxFreq(ui->RxFreqSpinBox->value());
|
m_wideGraph->setRxFreq(ui->RxFreqSpinBox->value());
|
||||||
m_wideGraph->setTol(ui->sbFtol->value());
|
m_wideGraph->setTol(ui->sbFtol->value());
|
||||||
@ -6122,7 +6120,6 @@ void MainWindow::on_actionFST4W_triggered()
|
|||||||
ui->WSPRfreqSpinBox->setMinimum(100);
|
ui->WSPRfreqSpinBox->setMinimum(100);
|
||||||
ui->WSPRfreqSpinBox->setMaximum(5000);
|
ui->WSPRfreqSpinBox->setMaximum(5000);
|
||||||
m_wideGraph->setMode(m_mode);
|
m_wideGraph->setMode(m_mode);
|
||||||
m_wideGraph->setModeTx(m_modeTx);
|
|
||||||
m_wideGraph->setPeriod(m_TRperiod,6912);
|
m_wideGraph->setPeriod(m_TRperiod,6912);
|
||||||
m_wideGraph->setTxFreq(ui->WSPRfreqSpinBox->value());
|
m_wideGraph->setTxFreq(ui->WSPRfreqSpinBox->value());
|
||||||
m_wideGraph->setRxFreq(ui->sbFST4W_RxFreq->value());
|
m_wideGraph->setRxFreq(ui->sbFST4W_RxFreq->value());
|
||||||
@ -6150,7 +6147,6 @@ void MainWindow::on_actionFT4_triggered()
|
|||||||
m_toneSpacing=12000.0/576.0;
|
m_toneSpacing=12000.0/576.0;
|
||||||
ui->actionFT4->setChecked(true);
|
ui->actionFT4->setChecked(true);
|
||||||
m_wideGraph->setMode(m_mode);
|
m_wideGraph->setMode(m_mode);
|
||||||
m_wideGraph->setModeTx(m_modeTx);
|
|
||||||
m_send_RR73=true;
|
m_send_RR73=true;
|
||||||
VHF_features_enabled(bVHF);
|
VHF_features_enabled(bVHF);
|
||||||
m_fastGraph->hide();
|
m_fastGraph->hide();
|
||||||
@ -6194,7 +6190,6 @@ void MainWindow::on_actionFT8_triggered()
|
|||||||
m_toneSpacing=0.0; //???
|
m_toneSpacing=0.0; //???
|
||||||
ui->actionFT8->setChecked(true); //???
|
ui->actionFT8->setChecked(true); //???
|
||||||
m_wideGraph->setMode(m_mode);
|
m_wideGraph->setMode(m_mode);
|
||||||
m_wideGraph->setModeTx(m_modeTx);
|
|
||||||
VHF_features_enabled(bVHF);
|
VHF_features_enabled(bVHF);
|
||||||
ui->cbAutoSeq->setChecked(true);
|
ui->cbAutoSeq->setChecked(true);
|
||||||
m_TRperiod=15.0;
|
m_TRperiod=15.0;
|
||||||
@ -6303,7 +6298,6 @@ void MainWindow::on_actionJT4_triggered()
|
|||||||
VHF_features_enabled(true);
|
VHF_features_enabled(true);
|
||||||
m_wideGraph->setPeriod(m_TRperiod,m_nsps);
|
m_wideGraph->setPeriod(m_TRperiod,m_nsps);
|
||||||
m_wideGraph->setMode(m_mode);
|
m_wideGraph->setMode(m_mode);
|
||||||
m_wideGraph->setModeTx(m_modeTx);
|
|
||||||
m_bFastMode=false;
|
m_bFastMode=false;
|
||||||
m_bFast9=false;
|
m_bFast9=false;
|
||||||
setup_status_bar (bVHF);
|
setup_status_bar (bVHF);
|
||||||
@ -6345,7 +6339,6 @@ void MainWindow::on_actionJT9_triggered()
|
|||||||
m_toneSpacing=0.0;
|
m_toneSpacing=0.0;
|
||||||
ui->actionJT9->setChecked(true);
|
ui->actionJT9->setChecked(true);
|
||||||
m_wideGraph->setMode(m_mode);
|
m_wideGraph->setMode(m_mode);
|
||||||
m_wideGraph->setModeTx(m_modeTx);
|
|
||||||
VHF_features_enabled(bVHF);
|
VHF_features_enabled(bVHF);
|
||||||
if(m_nSubMode>=4 and bVHF) {
|
if(m_nSubMode>=4 and bVHF) {
|
||||||
ui->cbFast9->setEnabled(true);
|
ui->cbFast9->setEnabled(true);
|
||||||
@ -6409,7 +6402,6 @@ void MainWindow::on_actionJT65_triggered()
|
|||||||
VHF_features_enabled(bVHF);
|
VHF_features_enabled(bVHF);
|
||||||
m_wideGraph->setPeriod(m_TRperiod,m_nsps);
|
m_wideGraph->setPeriod(m_TRperiod,m_nsps);
|
||||||
m_wideGraph->setMode(m_mode);
|
m_wideGraph->setMode(m_mode);
|
||||||
m_wideGraph->setModeTx(m_modeTx);
|
|
||||||
m_wideGraph->setRxFreq(ui->RxFreqSpinBox->value());
|
m_wideGraph->setRxFreq(ui->RxFreqSpinBox->value());
|
||||||
m_wideGraph->setTol(ui->sbFtol->value());
|
m_wideGraph->setTol(ui->sbFtol->value());
|
||||||
m_wideGraph->setTxFreq(ui->TxFreqSpinBox->value());
|
m_wideGraph->setTxFreq(ui->TxFreqSpinBox->value());
|
||||||
@ -6459,7 +6451,6 @@ void MainWindow::on_actionQ65_triggered()
|
|||||||
QString fname {QDir::toNativeSeparators(m_config.temp_dir().absoluteFilePath ("red.dat"))};
|
QString fname {QDir::toNativeSeparators(m_config.temp_dir().absoluteFilePath ("red.dat"))};
|
||||||
m_wideGraph->setRedFile(fname);
|
m_wideGraph->setRedFile(fname);
|
||||||
m_wideGraph->setMode(m_mode);
|
m_wideGraph->setMode(m_mode);
|
||||||
m_wideGraph->setModeTx(m_modeTx);
|
|
||||||
m_wideGraph->setPeriod(m_TRperiod,6912);
|
m_wideGraph->setPeriod(m_TRperiod,6912);
|
||||||
m_wideGraph->setTol(ui->sbFtol->value());
|
m_wideGraph->setTol(ui->sbFtol->value());
|
||||||
m_wideGraph->setRxFreq(ui->RxFreqSpinBox->value());
|
m_wideGraph->setRxFreq(ui->RxFreqSpinBox->value());
|
||||||
@ -6575,7 +6566,6 @@ void MainWindow::on_actionWSPR_triggered()
|
|||||||
ui->WSPRfreqSpinBox->setMaximum(1600);
|
ui->WSPRfreqSpinBox->setMaximum(1600);
|
||||||
m_wideGraph->setPeriod(m_TRperiod,m_nsps);
|
m_wideGraph->setPeriod(m_TRperiod,m_nsps);
|
||||||
m_wideGraph->setMode(m_mode);
|
m_wideGraph->setMode(m_mode);
|
||||||
m_wideGraph->setModeTx(m_modeTx);
|
|
||||||
m_bFastMode=false;
|
m_bFastMode=false;
|
||||||
m_bFast9=false;
|
m_bFast9=false;
|
||||||
ui->TxFreqSpinBox->setValue(ui->WSPRfreqSpinBox->value());
|
ui->TxFreqSpinBox->setValue(ui->WSPRfreqSpinBox->value());
|
||||||
@ -6602,7 +6592,6 @@ void MainWindow::on_actionEcho_triggered()
|
|||||||
m_modeTx="Echo";
|
m_modeTx="Echo";
|
||||||
setup_status_bar (true);
|
setup_status_bar (true);
|
||||||
m_wideGraph->setMode(m_mode);
|
m_wideGraph->setMode(m_mode);
|
||||||
m_wideGraph->setModeTx(m_modeTx);
|
|
||||||
ui->TxFreqSpinBox->setValue(1500);
|
ui->TxFreqSpinBox->setValue(1500);
|
||||||
ui->TxFreqSpinBox->setEnabled (false);
|
ui->TxFreqSpinBox->setEnabled (false);
|
||||||
if(!m_echoGraph->isVisible()) m_echoGraph->show();
|
if(!m_echoGraph->isVisible()) m_echoGraph->show();
|
||||||
|
@ -479,7 +479,7 @@ void CPlotter::DrawOverlay() //DrawOverlay()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(m_modeTx=="JT9" and m_nSubMode>0) { //JT9
|
if(m_mode=="JT9" and m_nSubMode>0) { //JT9
|
||||||
bw=8.0*12000.0/m_nsps;
|
bw=8.0*12000.0/m_nsps;
|
||||||
if(m_nSubMode==1) bw=2*bw; //B
|
if(m_nSubMode==1) bw=2*bw; //B
|
||||||
if(m_nSubMode==2) bw=4*bw; //C
|
if(m_nSubMode==2) bw=4*bw; //C
|
||||||
@ -500,7 +500,7 @@ void CPlotter::DrawOverlay() //DrawOverlay()
|
|||||||
float baud=12000.0/nsps;
|
float baud=12000.0/nsps;
|
||||||
bw=65.0*h*baud;
|
bw=65.0*h*baud;
|
||||||
}
|
}
|
||||||
if(m_modeTx=="JT65") { //JT65
|
if(m_mode=="JT65") { //JT65
|
||||||
bw=65.0*11025.0/4096.0;
|
bw=65.0*11025.0/4096.0;
|
||||||
if(m_nSubMode==1) bw=2*bw; //B
|
if(m_nSubMode==1) bw=2*bw; //B
|
||||||
if(m_nSubMode==2) bw=4*bw; //C
|
if(m_nSubMode==2) bw=4*bw; //C
|
||||||
@ -817,11 +817,6 @@ void CPlotter::setSubMode(int n) //setSubMode
|
|||||||
m_nSubMode=n;
|
m_nSubMode=n;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CPlotter::setModeTx(QString modeTx) //setModeTx
|
|
||||||
{
|
|
||||||
m_modeTx=modeTx;
|
|
||||||
}
|
|
||||||
|
|
||||||
int CPlotter::Fmax()
|
int CPlotter::Fmax()
|
||||||
{
|
{
|
||||||
return m_fMax;
|
return m_fMax;
|
||||||
|
@ -61,7 +61,6 @@ public:
|
|||||||
void setTxFreq(int n);
|
void setTxFreq(int n);
|
||||||
void setMode(QString mode);
|
void setMode(QString mode);
|
||||||
void setSubMode(int n);
|
void setSubMode(int n);
|
||||||
void setModeTx(QString modeTx);
|
|
||||||
void SetPercent2DScreen(int percent);
|
void SetPercent2DScreen(int percent);
|
||||||
int Fmax();
|
int Fmax();
|
||||||
void setDialFreq(double d);
|
void setDialFreq(double d);
|
||||||
@ -149,7 +148,6 @@ private:
|
|||||||
QString m_HDivText[483];
|
QString m_HDivText[483];
|
||||||
QString m_mode;
|
QString m_mode;
|
||||||
QString m_mode0;
|
QString m_mode0;
|
||||||
QString m_modeTx;
|
|
||||||
QString m_rxBand;
|
QString m_rxBand;
|
||||||
QString m_redFile;
|
QString m_redFile;
|
||||||
|
|
||||||
|
@ -305,13 +305,6 @@ void WideGraph::setSubMode(int n) //setSubMode
|
|||||||
ui->widePlot->DrawOverlay();
|
ui->widePlot->DrawOverlay();
|
||||||
ui->widePlot->update();
|
ui->widePlot->update();
|
||||||
}
|
}
|
||||||
void WideGraph::setModeTx(QString modeTx) //setModeTx
|
|
||||||
{
|
|
||||||
m_modeTx=modeTx;
|
|
||||||
ui->widePlot->setModeTx(modeTx);
|
|
||||||
ui->widePlot->DrawOverlay();
|
|
||||||
ui->widePlot->update();
|
|
||||||
}
|
|
||||||
|
|
||||||
void WideGraph::on_spec2dComboBox_currentIndexChanged(int index)
|
void WideGraph::on_spec2dComboBox_currentIndexChanged(int index)
|
||||||
{
|
{
|
||||||
|
@ -39,7 +39,6 @@ public:
|
|||||||
void setTxFreq(int n);
|
void setTxFreq(int n);
|
||||||
void setMode(QString mode);
|
void setMode(QString mode);
|
||||||
void setSubMode(int n);
|
void setSubMode(int n);
|
||||||
void setModeTx(QString modeTx);
|
|
||||||
bool flatten();
|
bool flatten();
|
||||||
bool useRef();
|
bool useRef();
|
||||||
void setTol(int n);
|
void setTol(int n);
|
||||||
@ -116,7 +115,6 @@ private:
|
|||||||
|
|
||||||
QString m_rxBand;
|
QString m_rxBand;
|
||||||
QString m_mode;
|
QString m_mode;
|
||||||
QString m_modeTx;
|
|
||||||
QString m_waterfallPalette;
|
QString m_waterfallPalette;
|
||||||
float m_swide[MAX_SCREENSIZE];
|
float m_swide[MAX_SCREENSIZE];
|
||||||
QString m_user_defined;
|
QString m_user_defined;
|
||||||
|
Loading…
Reference in New Issue
Block a user