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

1. Correct annoying bug producing infinite "Error rigOpen -1" messages: must

Browse Source 
do a rig->Close() if user has done "Test CAT Control" and then hit "Cancel".

2. Remove the "0%" part of Rx noise label; exchange positions of "Rx
Noise" and "QSO Freq" on Status Bar.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3260 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-05-07 18:19:15 +00:00
parent e54cad0b40
commit ba75745350
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devsetup.cpp
View File

@ -284,6 +284,13 @@ void DevSetup::accept()
QDialog::accept(); QDialog::accept();
} }
//------------------------------------------------------- reject()
void DevSetup::reject()
{
if(m_bRigOpen) rig->close();
QDialog::reject();
}
void DevSetup::p4ReadFromStdout() //p4readFromStdout void DevSetup::p4ReadFromStdout() //p4readFromStdout
{ {
while(p4.canReadLine()) { while(p4.canReadLine()) {

1
devsetup.h
View File

@ -65,6 +65,7 @@ public:
public slots: public slots:
void accept(); void accept();
void reject();
void p4ReadFromStdout(); void p4ReadFromStdout();
void p4ReadFromStderr(); void p4ReadFromStderr();
void p4Error(); void p4Error();

12
mainwindow.cpp
View File

@ -572,8 +572,8 @@ void MainWindow::dataSink(int k)
if(ihsym <=0) return; if(ihsym <=0) return;
QString t; QString t;
m_pctZap=nzap*100.0/m_nsps; m_pctZap=nzap*100.0/m_nsps;
t.sprintf(" Rx noise: %5.1f %5.1f %% ",px,m_pctZap); t.sprintf(" Rx noise: %5.1f ",px);
lab3->setText(t); lab2->setText(t);
ui->xThermo->setValue((double)px); //Update thermometer ui->xThermo->setValue((double)px); //Update thermometer
if(m_monitoring || m_diskData) { if(m_monitoring || m_diskData) {
g_pWideGraph->dataSink2(s,red,df3,ihsym,m_diskData,lstrong); g_pWideGraph->dataSink2(s,red,df3,ihsym,m_diskData,lstrong);
@ -914,13 +914,13 @@ void MainWindow::createStatusBar() //createStatusBar
lab2 = new QLabel(""); lab2 = new QLabel("");
lab2->setAlignment(Qt::AlignHCenter); lab2->setAlignment(Qt::AlignHCenter);
lab2->setMinimumSize(QSize(90,18)); lab2->setMinimumSize(QSize(80,18));
lab2->setFrameStyle(QFrame::Panel | QFrame::Sunken); lab2->setFrameStyle(QFrame::Panel | QFrame::Sunken);
statusBar()->addWidget(lab2); statusBar()->addWidget(lab2);
lab3 = new QLabel(""); lab3 = new QLabel("");
lab3->setAlignment(Qt::AlignHCenter); lab3->setAlignment(Qt::AlignHCenter);
lab3->setMinimumSize(QSize(80,18)); lab3->setMinimumSize(QSize(90,18));
lab3->setFrameStyle(QFrame::Panel | QFrame::Sunken); lab3->setFrameStyle(QFrame::Panel | QFrame::Sunken);
statusBar()->addWidget(lab3); statusBar()->addWidget(lab3);
@ -932,7 +932,7 @@ void MainWindow::createStatusBar() //createStatusBar
lab5 = new QLabel(""); lab5 = new QLabel("");
lab5->setAlignment(Qt::AlignHCenter); lab5->setAlignment(Qt::AlignHCenter);
lab5->setMinimumSize(QSize(100,18)); lab5->setMinimumSize(QSize(150,18));
lab5->setFrameStyle(QFrame::Panel | QFrame::Sunken); lab5->setFrameStyle(QFrame::Panel | QFrame::Sunken);
statusBar()->addWidget(lab5); statusBar()->addWidget(lab5);
} }
@ -1668,7 +1668,7 @@ void MainWindow::guiUpdate()
ui->monitorButton->setStyleSheet(""); ui->monitorButton->setStyleSheet("");
} }
lab2->setText("QSO Freq: " + QString::number(g_pWideGraph->QSOfreq())); lab3->setText("QSO Freq: " + QString::number(g_pWideGraph->QSOfreq()));
if(m_startAnother) { if(m_startAnother) {
m_startAnother=false; m_startAnother=false;