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

Fix issue with 2D spectrum selection in translated UIs

Browse Source 
For completeness  this fixes  the other  occurrence of  widget signals
with text  arguments that are  liable to misbehaviour  with translated
UIs.
This commit is contained in:
Bill Somerville 2020-06-03 17:43:27 +01:00
parent 8b8c2d54b7
commit 8833b56d91
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
widgets/mainwindow.cpp
View File

@ -812,7 +812,8 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
char const * const power[] = {"1 mW","2 mW","5 mW","10 mW","20 mW","50 mW","100 mW","200 mW","500 mW", char const * const power[] = {"1 mW","2 mW","5 mW","10 mW","20 mW","50 mW","100 mW","200 mW","500 mW",
"1 W","2 W","5 W","10 W","20 W","50 W","100 W","200 W","500 W","1 kW"}; "1 W","2 W","5 W","10 W","20 W","50 W","100 W","200 W","500 W","1 kW"};
for(auto i = 0u; i < sizeof power / sizeof power[0]; ++i) { //Initialize dBm values for(auto i = 0u; i < sizeof power / sizeof power[0]; ++i) { //Initialize dBm values
ui->TxPowerComboBox->addItem (QString {"%1 dBm %2"}.arg (int ((10. * i / 3.) + .5)).arg (power[i])); auto dBm = int ((10. * i / 3.) + .5);
ui->TxPowerComboBox->addItem (QString {"%1 dBm %2"}.arg (dBm).arg (power[i]), dBm);
} }
m_dateTimeRcvdRR73=QDateTime::currentDateTimeUtc(); m_dateTimeRcvdRR73=QDateTime::currentDateTimeUtc();
@ -7781,10 +7782,9 @@ void MainWindow::uploadResponse(QString response)
} }
} }
void MainWindow::on_TxPowerComboBox_currentIndexChanged(const QString &arg1) void MainWindow::on_TxPowerComboBox_currentIndexChanged(int index)
{ {
int i1=arg1.indexOf(" "); m_dBm = ui->TxPowerComboBox->itemData (index).toInt ();
m_dBm=arg1.mid(0,i1).toInt();
} }
void MainWindow::on_sbTxPercent_valueChanged(int n) void MainWindow::on_sbTxPercent_valueChanged(int n)

2
widgets/mainwindow.h
View File

@ -276,7 +276,7 @@ private slots:
void on_actionWSPR_triggered(); void on_actionWSPR_triggered();
void on_actionWSPR_LF_triggered(); void on_actionWSPR_LF_triggered();
void on_syncSpinBox_valueChanged(int n); void on_syncSpinBox_valueChanged(int n);
void on_TxPowerComboBox_currentIndexChanged(const QString &arg1); void on_TxPowerComboBox_currentIndexChanged(int);
void on_sbTxPercent_valueChanged(int n); void on_sbTxPercent_valueChanged(int n);
void on_cbUploadWSPR_Spots_toggled(bool b); void on_cbUploadWSPR_Spots_toggled(bool b);
void WSPR_config(bool b); void WSPR_config(bool b);

20
widgets/widegraph.cpp
View File

@ -315,22 +315,28 @@ void WideGraph::setModeTx(QString modeTx) //setModeTx
ui->widePlot->update(); ui->widePlot->update();
} }
//Current-Cumulative-Yellow void WideGraph::on_spec2dComboBox_currentIndexChanged(int index)
void WideGraph::on_spec2dComboBox_currentIndexChanged(const QString &arg1)
{ {
ui->widePlot->setCurrent(false); ui->widePlot->setCurrent(false);
ui->widePlot->setCumulative(false); ui->widePlot->setCumulative(false);
ui->widePlot->setLinearAvg(false); ui->widePlot->setLinearAvg(false);
ui->widePlot->setReference(false); ui->widePlot->setReference(false);
ui->smoSpinBox->setEnabled(false); ui->smoSpinBox->setEnabled(false);
if(arg1=="Current") ui->widePlot->setCurrent(true); switch (index)
if(arg1=="Cumulative") ui->widePlot->setCumulative(true); {
if(arg1=="Linear Avg") { case 0: // Current
ui->widePlot->setCurrent(true);
break;
case 1: // Cumulative
ui->widePlot->setCumulative(true);
break;
case 2: // Linear Avg
ui->widePlot->setLinearAvg(true); ui->widePlot->setLinearAvg(true);
ui->smoSpinBox->setEnabled(true); ui->smoSpinBox->setEnabled(true);
} break;
if(arg1=="Reference") { case 3: // Reference
ui->widePlot->setReference(true); ui->widePlot->setReference(true);
break;
} }
replot(); replot();
} }

2
widgets/widegraph.h
View File

@ -68,7 +68,7 @@ protected:
private slots: private slots:
void on_waterfallAvgSpinBox_valueChanged(int arg1); void on_waterfallAvgSpinBox_valueChanged(int arg1);
void on_bppSpinBox_valueChanged(int arg1); void on_bppSpinBox_valueChanged(int arg1);
void on_spec2dComboBox_currentIndexChanged(const QString &arg1); void on_spec2dComboBox_currentIndexChanged(int);
void on_fSplitSpinBox_valueChanged(int n); void on_fSplitSpinBox_valueChanged(int n);
void on_fStartSpinBox_valueChanged(int n); void on_fStartSpinBox_valueChanged(int n);
void on_paletteComboBox_activated(const QString &palette); void on_paletteComboBox_activated(const QString &palette);