w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-31 13:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move ldpc temporary files into platform-independent location.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6991 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-08-03 19:04:21 +00:00
parent 2abb9dbe2a
commit ab8b6d0383
3 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/genmsk144.f90
View File

@ -52,14 +52,10 @@ subroutine genmsk144(msg0,ichk,msgsent,i4tone,itype,pchk_file,ldpc_msg)
i=index(pchk_file,".pchk") i=index(pchk_file,".pchk")
gen_file=pchk_file(1:i-1)//".gen" gen_file=pchk_file(1:i-1)//".gen"
i=index(ldpc_msg,'ldpc_msg') i=index(ldpc_msg,"ldpc_msg")
ldpc_cw=ldpc_msg(1:i-1)//"ldpc_cw" ldpc_cw=ldpc_msg(1:i-1)//"ldpc_cw"
fname1=trim(ldpc_msg) fname1=trim(ldpc_msg)
fname2=trim(ldpc_cw) fname2=trim(ldpc_cw)
! print*,'A ',fname1
! fname1="ldpc_msg"
! fname2="ldpc_cw"
! print*,'B ',fname2
! call init_ldpc(trim(pchk_file)//char(0),trim(gen_file)//char(0)) ! call init_ldpc(trim(pchk_file)//char(0),trim(gen_file)//char(0))
@ -136,17 +132,20 @@ subroutine genmsk144(msg0,ichk,msgsent,i4tone,itype,pchk_file,ldpc_msg)
! call ldpc_encode(msgbits,codeword) ! call ldpc_encode(msgbits,codeword)
open(19,file=fname1,status='unknown') ! print*,fname1
write(19,1010) msgbits ! print*,fname2
open(24,file=fname1,status='unknown')
write(24,1010) msgbits
1010 format(80i1) 1010 format(80i1)
close(19) close(24)
cmnd='./encode '//trim(pchk_file)//' '//trim(gen_file)//' ' & cmnd='encode "'//trim(pchk_file)//'" "'//trim(gen_file)//'" "' &
//trim(fname1)//' '//trim(fname2) //trim(fname1)//'" "'//trim(fname2)//'"'
call system(cmnd) call system(cmnd)
open(19,file=fname2,status='old') open(24,file=fname2,status='old')
read(19,1020) codeword read(24,1020) codeword
1020 format(128i1) 1020 format(128i1)
close(19) close(24)
!Create 144-bit channel vector: !Create 144-bit channel vector:
!8-bit sync word + 48 bits + 8-bit sync word + 80 bits !8-bit sync word + 48 bits + 8-bit sync word + 80 bits

16
lib/genmsk40.f90
View File

@ -65,17 +65,17 @@ subroutine genmsk40(msg,msgsent,ichk,itone,itype,pchk_file,fname1,fname2)
enddo enddo
! call ldpc_encode(message,codeword) ! call ldpc_encode(message,codeword)
open(19,file=fname1,status='unknown') open(24,file=fname1,status='unknown')
write(19,1010) message write(24,1010) message
1010 format(16i1) 1010 format(16i1)
close(19) close(24)
cmnd='./encode '//trim(pchk_file40)//' '//trim(gen_file40)//' ' & cmnd='encode "'//trim(pchk_file40)//'" "'//trim(gen_file40)//'" "' &
//trim(fname1)//' '//trim(fname2) //trim(fname1)//'" "'//trim(fname2)//'"'
call system(cmnd) call system(cmnd)
open(19,file=fname2,status='unknown') open(24,file=fname2,status='old')
read(19,1020) codeword read(24,1020) codeword
1020 format(32i1) 1020 format(32i1)
close(19) close(24)
cwstring=" " cwstring=" "
do i=1,32 do i=1,32

1
mainwindow.cpp
View File

@ -838,7 +838,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
} }
QString ldpcMsgFile = m_config.temp_dir().absoluteFilePath("ldpc_msg"); QString ldpcMsgFile = m_config.temp_dir().absoluteFilePath("ldpc_msg");
ldpcMsgFile = '"' + ldpcMsgFile + '"';
ba = ldpcMsgFile.toLocal8Bit(); ba = ldpcMsgFile.toLocal8Bit();
for(int i=0; i<512; i++) { for(int i=0; i<512; i++) {
m_ldpcMsgFile[i]=32; m_ldpcMsgFile[i]=32;