w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-29 07:28:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Increased maximum length for JPLEPH path from 80 to 256 characters

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5555 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2015-06-08 17:45:11 +00:00
parent b63510ee2e
commit ef6325a73c
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
astro.cpp
View File

@ -103,11 +103,11 @@ void Astro::astroUpdate(QDateTime t, QString mygrid, QString hisgrid, qint64 fre
QDir writable = QStandardPaths::writableLocation (QStandardPaths::DataLocation); QDir writable = QStandardPaths::writableLocation (QStandardPaths::DataLocation);
QString AzElFileName = QDir::toNativeSeparators(writable.absoluteFilePath ("azel.dat")); QString AzElFileName = QDir::toNativeSeparators(writable.absoluteFilePath ("azel.dat"));
astrosub_(&nyear, &month, &nday, &uth, &freq8, mygrid.toLatin1(), astrosub_(&nyear, &month, &nday, &uth, &freq8, mygrid.toLatin1().constData(),
hisgrid.toLatin1(), &azsun, &elsun, &azmoon, &elmoon, hisgrid.toLatin1().constData(), &azsun, &elsun, &azmoon, &elmoon,
&azmoondx, &elmoondx, &ntsky, ndop, ndop00, &ramoon, &decmoon, &azmoondx, &elmoondx, &ntsky, ndop, ndop00, &ramoon, &decmoon,
&dgrd, &poloffset, &xnr, &techo, &width1, &width2, &bTx, &dgrd, &poloffset, &xnr, &techo, &width1, &width2, &bTx,
AzElFileName.toLatin1(), jpleph.toLatin1(), 6, 6, AzElFileName.toLatin1().constData(), jpleph.toLatin1().constData(), 6, 6,
AzElFileName.length(), jpleph.length()); AzElFileName.length(), jpleph.length());
QString message; QString message;

2
lib/astrosub.f90
View File

@ -6,7 +6,7 @@ subroutine astrosub(nyear,month,nday,uth8,freq8,mygrid,hisgrid, &
implicit real*8 (a-h,o-z) implicit real*8 (a-h,o-z)
character*6 mygrid,hisgrid,c1*1 character*6 mygrid,hisgrid,c1*1
character*6 AzElFileName*(*),jpleph*(*) character*6 AzElFileName*(*),jpleph*(*)
character*80 jpleph_file_name character*256 jpleph_file_name
logical*1 bTx logical*1 bTx
common/jplcom/jpleph_file_name common/jplcom/jpleph_file_name

9
lib/jplsubs.f
View File

@ -19,7 +19,7 @@ C *****************************************************************
C NAMFIL IS THE EXTERNAL NAME OF THE BINARY EPHEMERIS FILE C NAMFIL IS THE EXTERNAL NAME OF THE BINARY EPHEMERIS FILE
CHARACTER*80 NAMFIL CHARACTER*256 NAMFIL
c NAMFIL='JPLEPH' c NAMFIL='JPLEPH'
@ -76,7 +76,7 @@ C THE SUBROUTINE ALSO SETS THE VALUES OF NRECL, NRFILE, AND NAMFIL.
INTEGER NMAX INTEGER NMAX
PARAMETER (NMAX = 1000) PARAMETER (NMAX = 1000)
CHARACTER*6 TTL(14,3),CNAM(NMAX) CHARACTER*6 TTL(14,3),CNAM(NMAX)
CHARACTER*80 NAMFIL,jpleph_file_name CHARACTER*256 NAMFIL,jpleph_file_name
DIMENSION SS(3) DIMENSION SS(3)
INTEGER IPT(3,13) INTEGER IPT(3,13)
common/jplcom/jpleph_file_name common/jplcom/jpleph_file_name
@ -152,7 +152,7 @@ C
C THE SUBROUTINE SETS THE VALUES OF NRECL, KSIZE, NRFILE, AND NAMFIL. C THE SUBROUTINE SETS THE VALUES OF NRECL, KSIZE, NRFILE, AND NAMFIL.
SAVE SAVE
CHARACTER*80 NAMFIL,jpleph_file_name CHARACTER*256 NAMFIL,jpleph_file_name
common/jplcom/jpleph_file_name common/jplcom/jpleph_file_name
C ***************************************************************** C *****************************************************************
@ -272,7 +272,6 @@ C
INTEGER LIST(12),IPT(39),DENUM INTEGER LIST(12),IPT(39),DENUM
COMMON/EPHHDR/CVAL,SS,AU,EMRAT,DENUM,NCON,IPT COMMON/EPHHDR/CVAL,SS,AU,EMRAT,DENUM,NCON,IPT
COMMON/STCOMX/KM,BARY,PVSUN COMMON/STCOMX/KM,BARY,PVSUN
common/jplcom/jpleph_file_name
C INITIALIZE ET2 FOR 'STATE' AND SET UP COMPONENT COUNT C INITIALIZE ET2 FOR 'STATE' AND SET UP COMPONENT COUNT
C C
@ -695,7 +694,7 @@ C
DATA FIRST/.TRUE./ DATA FIRST/.TRUE./
CHARACTER*6 TTL(14,3),CNAM(NMAX) CHARACTER*6 TTL(14,3),CNAM(NMAX)
CHARACTER*80 NAMFIL CHARACTER*256 NAMFIL
LOGICAL KM,BARY LOGICAL KM,BARY