mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-11-03 13:30:52 -05:00 
			
		
		
		
	Change the label texts to "Single Period Decodes" and "Average Decodes" only if averaging is enabled.
This commit is contained in:
		
							parent
							
								
									630f0c34c3
								
							
						
					
					
						commit
						4f874b6507
					
				@ -2491,7 +2491,7 @@ void MainWindow::statusChanged()
 | 
				
			|||||||
                                 .arg (f.fileName ()).arg (f.errorString ()));
 | 
					                                 .arg (f.fileName ()).arg (f.errorString ()));
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  on_dxGridEntry_textChanged(m_hisGrid);
 | 
					  on_dxGridEntry_textChanged(m_hisGrid);
 | 
				
			||||||
  if(m_specOp!=SpecOp::HOUND) {
 | 
					  if (m_specOp!=SpecOp::HOUND) {
 | 
				
			||||||
      ui->txb2->setEnabled(true);
 | 
					      ui->txb2->setEnabled(true);
 | 
				
			||||||
      ui->txrb2->setEnabled(true);
 | 
					      ui->txrb2->setEnabled(true);
 | 
				
			||||||
      ui->txb4->setEnabled(true);
 | 
					      ui->txb4->setEnabled(true);
 | 
				
			||||||
@ -2502,6 +2502,15 @@ void MainWindow::statusChanged()
 | 
				
			|||||||
      ui->txrb6->setEnabled(true);
 | 
					      ui->txrb6->setEnabled(true);
 | 
				
			||||||
      ui->houndButton->setChecked(false);
 | 
					      ui->houndButton->setChecked(false);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					  if (m_mode=="Q65" or m_mode=="JT65") {
 | 
				
			||||||
 | 
					    if (ui->actionInclude_averaging->isVisible() && ui->actionInclude_averaging->isChecked()) {
 | 
				
			||||||
 | 
					      ui->lh_decodes_title_label->setText(tr ("Single-Period Decodes"));
 | 
				
			||||||
 | 
					      ui->rh_decodes_title_label->setText(tr ("Average Decodes"));
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					      ui->lh_decodes_title_label->setText(tr ("Band Activity"));
 | 
				
			||||||
 | 
					      ui->rh_decodes_title_label->setText(tr ("Rx Frequency"));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool MainWindow::eventFilter (QObject * object, QEvent * event)
 | 
					bool MainWindow::eventFilter (QObject * object, QEvent * event)
 | 
				
			||||||
@ -7220,11 +7229,9 @@ void MainWindow::on_actionJT65_triggered()
 | 
				
			|||||||
  ui->sbSubmode->setMaximum(2);
 | 
					  ui->sbSubmode->setMaximum(2);
 | 
				
			||||||
  if(bVHF) {
 | 
					  if(bVHF) {
 | 
				
			||||||
//    ui->sbSubmode->setValue(m_nSubMode);
 | 
					//    ui->sbSubmode->setValue(m_nSubMode);
 | 
				
			||||||
      QTimer::singleShot (50, [=] {m_nSubMode=m_settings->value("SubMode_JT65",0).toInt();});
 | 
					    QTimer::singleShot (50, [=] {m_nSubMode=m_settings->value("SubMode_JT65",0).toInt();});
 | 
				
			||||||
      QTimer::singleShot (75, [=] {ui->sbSubmode->setValue(m_settings->value("SubMode_JT65",0).toInt());});
 | 
					    QTimer::singleShot (75, [=] {ui->sbSubmode->setValue(m_settings->value("SubMode_JT65",0).toInt());});
 | 
				
			||||||
      QTimer::singleShot (100, [=] {on_sbSubmode_valueChanged(m_nSubMode);});
 | 
					    QTimer::singleShot (100, [=] {on_sbSubmode_valueChanged(m_nSubMode);});
 | 
				
			||||||
      ui->lh_decodes_title_label->setText(tr ("Single-Period Decodes"));
 | 
					 | 
				
			||||||
    ui->rh_decodes_title_label->setText(tr ("Average Decodes"));
 | 
					 | 
				
			||||||
  } else {
 | 
					  } else {
 | 
				
			||||||
    ui->sbSubmode->setValue(0);
 | 
					    ui->sbSubmode->setValue(0);
 | 
				
			||||||
    ui->lh_decodes_title_label->setText(tr ("Band Activity"));
 | 
					    ui->lh_decodes_title_label->setText(tr ("Band Activity"));
 | 
				
			||||||
@ -7280,8 +7287,6 @@ void MainWindow::on_actionQ65_triggered()
 | 
				
			|||||||
  switch_mode (Modes::Q65);
 | 
					  switch_mode (Modes::Q65);
 | 
				
			||||||
//                         01234567890123456789012345678901234567
 | 
					//                         01234567890123456789012345678901234567
 | 
				
			||||||
  displayWidgets(nWidgets("11111101011011010011100000010000000011"));
 | 
					  displayWidgets(nWidgets("11111101011011010011100000010000000011"));
 | 
				
			||||||
  ui->lh_decodes_title_label->setText(tr ("Single-Period Decodes"));
 | 
					 | 
				
			||||||
  ui->rh_decodes_title_label->setText(tr ("Average Decodes"));
 | 
					 | 
				
			||||||
  ui->lh_decodes_headings_label->setText("UTC   dB   DT Freq    " + tr ("Message"));
 | 
					  ui->lh_decodes_headings_label->setText("UTC   dB   DT Freq    " + tr ("Message"));
 | 
				
			||||||
  ui->rh_decodes_headings_label->setText("UTC   dB   DT Freq    " + tr ("Message"));
 | 
					  ui->rh_decodes_headings_label->setText("UTC   dB   DT Freq    " + tr ("Message"));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -7655,6 +7660,7 @@ void MainWindow::on_actionDeepestDecode_toggled (bool checked)
 | 
				
			|||||||
void MainWindow::on_actionInclude_averaging_toggled (bool checked)
 | 
					void MainWindow::on_actionInclude_averaging_toggled (bool checked)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  m_ndepth ^= (-checked ^ m_ndepth) & 0x00000010;
 | 
					  m_ndepth ^= (-checked ^ m_ndepth) & 0x00000010;
 | 
				
			||||||
 | 
					  statusChanged();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void MainWindow::on_actionInclude_correlation_toggled (bool checked)
 | 
					void MainWindow::on_actionInclude_correlation_toggled (bool checked)
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user