w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CAT control now reads and follows changes in radio Dial Frequency. 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3167 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-04-13 18:51:25 +00:00
parent 3e9c538bfa
commit 2277827bb3
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mainwindow.cpp
View File

@ -99,6 +99,9 @@ MainWindow::MainWindow(QSharedMemory *shdmem, QWidget *parent) :
connect(&proc_jt9, SIGNAL(readyReadStandardError()),
this, SLOT(readFromStderr()));
connect(&p3, SIGNAL(readyReadStandardOutput()),
this, SLOT(readFromP3()));
connect(&p3, SIGNAL(error(QProcess::ProcessError)),
this, SLOT(p3_error()));
@ -1171,6 +1174,7 @@ void MainWindow::p3_error() //jt9_error
msgBox(t);
}
}
void MainWindow::readFromStderr() //readFromStderr
{
QByteArray t=proc_jt9.readAllStandardError();
@ -1324,6 +1328,14 @@ void MainWindow::readFromStdout() //readFromStdout
}
}
void MainWindow::readFromP3() //readFromP3
{
QByteArray t=p3.readAllStandardOutput();
QString s=t;
double fMHz=s.toDouble()/1000000.0;
dialFreqChanged2(fMHz);
}
void MainWindow::killFile()
{
if(m_fname==m_fileToSave) {
@ -1582,7 +1594,13 @@ void MainWindow::guiUpdate()
m_hsym0=khsym;
m_sec0=nsec;
//###
m_cmnd=rig_command() + " f";
p3.start(m_cmnd);
p3.waitForFinished();
//###
}
iptt0=m_iptt;
btxok0=btxok;
} //End of GUIupdate

1
mainwindow.h
View File

@ -36,6 +36,7 @@ public slots:
void doubleClickOnCall2(bool shift, bool ctrl);
void readFromStdout();
void readFromStderr();
void readFromP3();
void jt9_error();
void p3_error();

3
wsjtx.iss
View File

@ -1,6 +1,6 @@
[Setup]
AppName=wsjtx
AppVerName=wsjtx Version 0.9 r3158
AppVerName=wsjtx Version 0.9 r3166
AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT
DefaultDirName=c:\wsjtx
DefaultGroupName=wsjtx
@ -13,7 +13,6 @@ Source: "c:\Users\joe\wsjt\wsjtx_install\wsjt.ico"; DestDir: "{app}"
Source: "c:\Users\joe\wsjt\wsjtx_install\afmhot.dat"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\wsjtx_install\blue.dat"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\wsjtx_install\CALL3.TXT"; DestDir: "{app}"; Flags: onlyifdoesntexist
Source: "c:\Users\joe\wsjt\wsjtx\WSJT-X_Users_Guide.pdf"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\QtSupport\*.dll"; DestDir: "{app}"; Flags: onlyifdoesntexist
Source: "c:\Users\joe\wsjt\wsjtx_install\save\Samples\130228_2158.wav"; DestDir: "{app}\save\Samples";