mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-05-23 18:02:29 -04:00
Decode button now does nothing in MSK144 mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7189 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
bf068fc6fd
commit
d80f128a8a
@ -2100,11 +2100,15 @@ void MainWindow::on_actionSpecial_mouse_commands_triggered()
|
|||||||
|
|
||||||
void MainWindow::on_DecodeButton_clicked (bool /* checked */) //Decode request
|
void MainWindow::on_DecodeButton_clicked (bool /* checked */) //Decode request
|
||||||
{
|
{
|
||||||
if(!m_mode.startsWith ("WSPR") && !m_decoderBusy) {
|
if(m_mode=="MSK144") {
|
||||||
dec_data.params.newdat=0;
|
ui->DecodeButton->setChecked(false);
|
||||||
dec_data.params.nagain=1;
|
} else {
|
||||||
m_blankLine=false; // don't insert the separator again
|
if(!m_mode.startsWith ("WSPR") && !m_decoderBusy) {
|
||||||
decode();
|
dec_data.params.newdat=0;
|
||||||
|
dec_data.params.nagain=1;
|
||||||
|
m_blankLine=false; // don't insert the separator again
|
||||||
|
decode();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2560,34 +2564,7 @@ void MainWindow::on_EraseButton_clicked() //Erase
|
|||||||
|
|
||||||
void MainWindow::decodeBusy(bool b) //decodeBusy()
|
void MainWindow::decodeBusy(bool b) //decodeBusy()
|
||||||
{
|
{
|
||||||
/* ### Temporarily(?) disable the long-decode progress bar.
|
if (!b) m_optimizingProgress.reset ();
|
||||||
bool showProgress = false;
|
|
||||||
if (b && m_firstDecode < 65 && ("JT65" == m_mode || "JT9+JT65" == m_mode))
|
|
||||||
{
|
|
||||||
m_firstDecode += 65;
|
|
||||||
if ("JT9+JT65" == m_mode) m_firstDecode = 65 + 9;
|
|
||||||
showProgress = true;
|
|
||||||
}
|
|
||||||
if (b && m_firstDecode != 9 && m_firstDecode != 65 + 9 &&
|
|
||||||
("JT9" == m_mode))
|
|
||||||
{
|
|
||||||
m_firstDecode += 9;
|
|
||||||
showProgress = true;
|
|
||||||
}
|
|
||||||
if (showProgress)
|
|
||||||
{
|
|
||||||
// this sequence is needed to create an indeterminate progress
|
|
||||||
// bar
|
|
||||||
m_optimizingProgress.setRange (0, 1);
|
|
||||||
m_optimizingProgress.setValue (0);
|
|
||||||
m_optimizingProgress.setRange (0, 0);
|
|
||||||
}
|
|
||||||
### */
|
|
||||||
if (!b)
|
|
||||||
{
|
|
||||||
m_optimizingProgress.reset ();
|
|
||||||
}
|
|
||||||
|
|
||||||
m_decoderBusy=b;
|
m_decoderBusy=b;
|
||||||
ui->DecodeButton->setEnabled(!b);
|
ui->DecodeButton->setEnabled(!b);
|
||||||
ui->actionOpen->setEnabled(!b);
|
ui->actionOpen->setEnabled(!b);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user