Hi All,
Joe, is there a compiled win version for testing after this bug fix ?
r3644 waterfall did not work for me with Flatten ticked in WinXP - just a
solid orange waterfall.
Cheers David GM6BIG
----- Original Message -----
From: <[email protected]>
To: <[email protected]>
Sent: Saturday, January 18, 2014 1:59 PM
Subject: [WSJT-SVN] r3648 - in branches/wsjtx: . lib
Author: k1jt
Date: 2014-01-18 14:59:19 +0100 (Sat, 18 Jan 2014)
New Revision: 3648
Modified:
branches/wsjtx/lib/Makefile.MinGW
branches/wsjtx/lib/Makefile.linux
branches/wsjtx/lib/flat3.f90
branches/wsjtx/lib/getpfx1.f90
branches/wsjtx/lib/packmsg.f90
branches/wsjtx/mainwindow.cpp
Log:
1. Corrected handling of compound callsigns: use JT65v1 encoding if
applicable, JT65v2 otherwise. Thanks to DL9RDZ!
2. Fix a bug in flat3.f90, evident on OSX systems. Thanks to G4KLA!
3. The Makefile now copy the jt9code executable into the destination
directory for to-be-packaged executables.
Modified: branches/wsjtx/lib/Makefile.MinGW
===================================================================
--- branches/wsjtx/lib/Makefile.MinGW 2014-01-18 12:42:21 UTC (rev 3647)
+++ branches/wsjtx/lib/Makefile.MinGW 2014-01-18 13:59:19 UTC (rev 3648)
@@ -72,6 +72,7 @@
OBJS4 = jt9code.o
jt9code.exe: $(OBJS4) libjt9.a
$(FC) -o jt9code.exe $(OBJS4) libjt9.a
+ cp jt9code.exe $(EXE_DIR)
OBJS5 = jt65.o
jt65.exe: $(OBJS5) libjt9.a
Modified: branches/wsjtx/lib/Makefile.linux
===================================================================
--- branches/wsjtx/lib/Makefile.linux 2014-01-18 12:42:21 UTC (rev 3647)
+++ branches/wsjtx/lib/Makefile.linux 2014-01-18 13:59:19 UTC (rev 3648)
@@ -62,6 +62,7 @@
OBJS4 = jt9code.o
jt9code: $(OBJS4) libjt9.a
$(FC) -o jt9code $(OBJS4) -L. -ljt9
+ cp jt9code $(EXE_DIR)
sync9.o: sync9.f90 jt9sync.f90
$(FC) $(FFLAGS) -c sync9.f90
Modified: branches/wsjtx/lib/flat3.f90
===================================================================
--- branches/wsjtx/lib/flat3.f90 2014-01-18 12:42:21 UTC (rev 3647)
+++ branches/wsjtx/lib/flat3.f90 2014-01-18 13:59:19 UTC (rev 3648)
@@ -4,7 +4,7 @@
parameter (NSMAX=6827)
real*4 s0(iz)
real*4 s(iz)
- real*4 ynoise,y4
+ real*4 ynoise,y4,db
real*8 x(NSMAX)
real*8 y(NSMAX)
Modified: branches/wsjtx/lib/getpfx1.f90
===================================================================
--- branches/wsjtx/lib/getpfx1.f90 2014-01-18 12:42:21 UTC (rev 3647)
+++ branches/wsjtx/lib/getpfx1.f90 2014-01-18 13:59:19 UTC (rev 3648)
@@ -13,7 +13,7 @@
if(iz.lt.0) iz=12
islash=index(callsign(1:iz),'/')
k=0
- if(k.eq.0) go to 10 !### Always use JT65v2
###
+! if(k.eq.0) go to 10 !Tnx to DL9RDZ for reminder:this was for tests
only!
c=' '
if(islash.gt.0 .and. islash.le.(iz-4)) then
! Add-on prefix
Modified: branches/wsjtx/lib/packmsg.f90
===================================================================
--- branches/wsjtx/lib/packmsg.f90 2014-01-18 12:42:21 UTC (rev 3647)
+++ branches/wsjtx/lib/packmsg.f90 2014-01-18 13:59:19 UTC (rev 3648)
@@ -60,7 +60,8 @@
c3=' '
if(ic.ge.ib+1) c3=msg(ib+1:ic)
if(c3.eq.'OOO ') c3=' ' !Strip out the OOO flag
- call getpfx1(c1,k1,junk)
+ call getpfx1(c1,k1,kk)
+ if(kk.ne.0) go to 10 !Tnx to DL9RDZ for reminding me!
call packcall(c1,nc1,text1)
call getpfx1(c2,k2,nv2)
call packcall(c2,nc2,text2)
Modified: branches/wsjtx/mainwindow.cpp
===================================================================
--- branches/wsjtx/mainwindow.cpp 2014-01-18 12:42:21 UTC (rev 3647)
+++ branches/wsjtx/mainwindow.cpp 2014-01-18 13:59:19 UTC (rev 3648)
@@ -1,4 +1,4 @@
-//--------------------------------------------------------------
MainWindow
+//-------------------------------------------------------------
MainWindow
#include "mainwindow.h"
#include "ui_mainwindow.h"
_______________________________________________
wsjt-svn mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/wsjt-svn
---
This email is free from viruses and malware because avast! Antivirus protection
is active.
http://www.avast.com
_______________________________________________
Wsjt-devel mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/wsjt-devel
