Re-arrange labels on status bar.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/jtms3@2492 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-07-05 19:37:59 +00:00
parent 06391ebd90
commit 2e73fffc38

View File

@ -423,7 +423,7 @@ void MainWindow::dataSink(int k)
if(px<0.0) px=0.0; if(px<0.0) px=0.0;
QString t; QString t;
t.sprintf(" Rx noise: %5.1f ",px); t.sprintf(" Rx noise: %5.1f ",px);
lab4->setText(t); lab2->setText(t);
ui->xThermo->setValue((double)px); //Update the bargraphs ui->xThermo->setValue((double)px); //Update the bargraphs
/* /*
@ -666,18 +666,19 @@ void MainWindow::createStatusBar() //createStatusBar
lab1->setFrameStyle(QFrame::Panel | QFrame::Sunken); lab1->setFrameStyle(QFrame::Panel | QFrame::Sunken);
statusBar()->addWidget(lab1); statusBar()->addWidget(lab1);
lab2 = new QLabel("QSO freq: 125"); lab2 = new QLabel("");
lab2->setAlignment(Qt::AlignHCenter); lab2->setAlignment(Qt::AlignHCenter);
lab2->setMinimumSize(QSize(90,10)); lab2->setMinimumSize(QSize(90,10));
lab2->setFrameStyle(QFrame::Panel | QFrame::Sunken); lab2->setFrameStyle(QFrame::Panel | QFrame::Sunken);
statusBar()->addWidget(lab2); statusBar()->addWidget(lab2);
lab3 = new QLabel("QSO DF: 0"); lab3 = new QLabel("Freeze DF: 0");
lab3->setAlignment(Qt::AlignHCenter); lab3->setAlignment(Qt::AlignHCenter);
lab3->setMinimumSize(QSize(80,10)); lab3->setMinimumSize(QSize(80,10));
lab3->setFrameStyle(QFrame::Panel | QFrame::Sunken); lab3->setFrameStyle(QFrame::Panel | QFrame::Sunken);
statusBar()->addWidget(lab3); statusBar()->addWidget(lab3);
/*
lab4 = new QLabel(""); lab4 = new QLabel("");
lab4->setAlignment(Qt::AlignHCenter); lab4->setAlignment(Qt::AlignHCenter);
lab4->setMinimumSize(QSize(80,10)); lab4->setMinimumSize(QSize(80,10));
@ -689,6 +690,7 @@ void MainWindow::createStatusBar() //createStatusBar
lab5->setMinimumSize(QSize(50,10)); lab5->setMinimumSize(QSize(50,10));
lab5->setFrameStyle(QFrame::Panel | QFrame::Sunken); lab5->setFrameStyle(QFrame::Panel | QFrame::Sunken);
statusBar()->addWidget(lab5); statusBar()->addWidget(lab5);
*/
} }
void MainWindow::on_tolSpinBox_valueChanged(int i) //tolSpinBox void MainWindow::on_tolSpinBox_valueChanged(int i) //tolSpinBox
@ -1244,8 +1246,7 @@ void MainWindow::guiUpdate()
ui->monitorButton->setStyleSheet(""); ui->monitorButton->setStyleSheet("");
} }
lab2->setText("QSO Freq: " + QString::number(g_pWideGraph->QSOfreq())); lab3->setText("Freeze DF: " + QString::number(g_pWideGraph->DF()));
lab3->setText("QSO DF: " + QString::number(g_pWideGraph->DF()));
if(m_startAnother) { if(m_startAnother) {
m_startAnother=false; m_startAnother=false;
@ -1296,7 +1297,7 @@ void MainWindow::guiUpdate()
ui->labUTC->setText(utc); ui->labUTC->setText(utc);
if((!m_monitoring and !m_diskData) or (khsym==m_hsym0)) { if((!m_monitoring and !m_diskData) or (khsym==m_hsym0)) {
ui->xThermo->setValue(0.0); // Set Rx level to 20 ui->xThermo->setValue(0.0); // Set Rx level to 20
lab4->setText(" Rx noise: 0.0 "); lab2->setText(" Rx noise: 0.0 ");
} }
m_hsym0=khsym; m_hsym0=khsym;
m_sec0=nsec; m_sec0=nsec;