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

Working on the occasional crashes (threading bug?) and on larger DT 

for use on the EME path.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2747 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-11-18 14:02:50 +00:00
parent 417198d451
commit 313afc1481
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
getfile.cpp
View File

@ -25,6 +25,7 @@ void getfile(QString fname, int ntrperiod)
if(fp != NULL) { if(fp != NULL) {
// Read (and ignore) a 44-byte WAV header; then read data // Read (and ignore) a 44-byte WAV header; then read data
fread(jt9com_.d2,1,44,fp); fread(jt9com_.d2,1,44,fp);
// fread(jt9com_.d2,2,30000,fp);
fread(jt9com_.d2,2,npts,fp); fread(jt9com_.d2,2,npts,fp);
fclose(fp); fclose(fp);
jt9com_.newdat=1; jt9com_.newdat=1;

11
mainwindow.cpp
View File

@ -874,6 +874,7 @@ void MainWindow::guiUpdate()
static bool btxok0=false; static bool btxok0=false;
static int nc0=1; static int nc0=1;
static int nc1=1; static int nc1=1;
static char message[29];
static char msgsent[29]; static char msgsent[29];
static int nsendingsh=0; static int nsendingsh=0;
int khsym=0; int khsym=0;
@ -922,7 +923,6 @@ void MainWindow::guiUpdate()
// Calculate Tx waveform when needed // Calculate Tx waveform when needed
if((iptt==1 && iptt0==0) || m_restart) { if((iptt==1 && iptt0==0) || m_restart) {
char message[29];
QByteArray ba; QByteArray ba;
if(m_ntx == 1) ba=ui->tx1->text().toLocal8Bit(); if(m_ntx == 1) ba=ui->tx1->text().toLocal8Bit();
if(m_ntx == 2) ba=ui->tx2->text().toLocal8Bit(); if(m_ntx == 2) ba=ui->tx2->text().toLocal8Bit();
@ -1033,11 +1033,14 @@ void MainWindow::guiUpdate()
} }
m_hsym0=khsym; m_hsym0=khsym;
m_sec0=nsec; m_sec0=nsec;
if(m_myCall=="K1JT") { if(m_myCall=="K1JT") {
char s[20]; char s[20];
double t1=soundInThread.samFacIn(); double t1=1.0;
//Better: use signals from sound threads?
// if(soundInThread.isRunning()) t1=soundInThread.samFacIn();
double t2=1.0; double t2=1.0;
if(soundOutThread.isRunning()) t2=soundOutThread.samFacOut(); // if(soundOutThread.isRunning()) t2=soundOutThread.samFacOut();
sprintf(s,"%6.4f %6.4f",t1,t2); sprintf(s,"%6.4f %6.4f",t1,t2);
lab5->setText(s); lab5->setText(s);
} }
@ -1051,10 +1054,8 @@ void MainWindow::ba2msg(QByteArray ba, char message[]) //ba2msg()
bool eom; bool eom;
eom=false; eom=false;
int iz=ba.length(); int iz=ba.length();
// qDebug() << ba << iz;
for(int i=0;i<iz+1; i++) { for(int i=0;i<iz+1; i++) {
if((int)ba[i] == 0) { if((int)ba[i] == 0) {
// qDebug() << i;
eom=true; eom=true;
} }
if(eom) { if(eom) {

2
wsjtx.pro
View File

@ -6,7 +6,7 @@
QT += core gui network QT += core gui network
CONFIG += qwt thread CONFIG += qwt thread
#CONFIG += console CONFIG += console release
TARGET = wsjtx TARGET = wsjtx
VERSION = 0.2 VERSION = 0.2