From d7258ca7aa5d85ca42869c905693e318b4b9314e Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 23 May 2012 15:17:45 +0000 Subject: [PATCH] Update map65.iss. Couple of tweaks to GUI forms. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2466 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- devsetup.ui | 6 +++--- libm65/map65a.f90 | 2 +- mainwindow.cpp | 2 -- mainwindow.ui | 2 +- map65.iss | 28 ++++++++++++++-------------- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/devsetup.ui b/devsetup.ui index cf5d80577..acc9e7e25 100644 --- a/devsetup.ui +++ b/devsetup.ui @@ -502,10 +502,10 @@ - -90 + -180 - 90 + 180 10 @@ -922,7 +922,7 @@ Si570 - + 70 diff --git a/libm65/map65a.f90 b/libm65/map65a.f90 index b9e848271..1de290ca1 100644 --- a/libm65/map65a.f90 +++ b/libm65/map65a.f90 @@ -300,7 +300,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & if(ndphi.eq.0) then write(*,1010) nkHz,ndf,npol,nutc,dt,nsync2, & decoded,nkv,nqual,ntxpol,cp -1010 format('!',i3,i5,i4,i5.4,f5.1,i4,2x,a22,i5,i4,i5,1x,a1) +1010 format('!',i3,i5,i4,i5.4,f5.1,i4,2x,a22,i4,i5,i5,1x,a1) else if(iloop.ge.1) qphi(iloop)=sig(k,10) write(*,1010) nkHz,ndf,npol,nutc,dt,nsync2, & diff --git a/mainwindow.cpp b/mainwindow.cpp index 9bda2d4c1..d81741043 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -19,11 +19,9 @@ bool btxok; //True if OK to transmit double outputLatency; //Latency in seconds qint16 id[4*60*96000]; - Astro* g_pAstro = NULL; WideGraph* g_pWideGraph = NULL; Messages* g_pMessages = NULL; - BandMap* g_pBandMap = NULL; QSharedMemory mem_m65("mem_m65"); diff --git a/mainwindow.ui b/mainwindow.ui index 335f77955..0a3b6c481 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -53,7 +53,7 @@ - Freq DF Pol UTC DT dB KV DS TxPol + Freq DF Pol UTC DT dB KV DS TxPol diff --git a/map65.iss b/map65.iss index 5d5c5f7f2..c09445c7d 100644 --- a/map65.iss +++ b/map65.iss @@ -1,26 +1,26 @@ [Setup] AppName=MAP65 -AppVerName=MAP65 Version 2.3.0 r631 +AppVerName=MAP65 Version 2.3.0 r2465 AppCopyright=Copyright (C) 2001-2012 by Joe Taylor, K1JT DefaultDirName=c:\MAP65 DefaultGroupName=MAP65 [Files] -Source: "c:\Users\joe\map65\install\m65.exe"; DestDir: "{app}" -Source: "c:\Users\joe\map65\install\map65.exe"; DestDir: "{app}" -Source: "c:\Users\joe\map65\install\wsjt.ico"; DestDir: "{app}" -Source: "c:\Users\joe\map65\install\kvasd.exe"; DestDir: "{app}" -Source: "c:\Users\joe\map65\install\CALL3.TXT"; DestDir: "{app}"; Flags: onlyifdoesntexist -Source: "c:\Users\joe\map65\install\fftwf-wisdom.exe"; DestDir: "{app}"; Flags: onlyifdoesntexist -Source: "c:\Users\joe\map65\install\wisdom1.bat"; DestDir: "{app}"; -Source: "c:\Users\joe\map65\install\wisdom2.bat"; DestDir: "{app}"; -Source: "c:\Users\joe\map65\install\afmhot.dat"; DestDir: "{app}"; -Source: "c:\Users\joe\map65\install\blue.dat"; DestDir: "{app}"; -Source: "c:\Users\joe\map65\install\qthid.exe"; DestDir: "{app}"; +Source: "c:\Users\joe\wsjt\map65_install\m65.exe"; DestDir: "{app}" +Source: "c:\Users\joe\wsjt\map65_install\map65.exe"; DestDir: "{app}" +Source: "c:\Users\joe\wsjt\map65_install\wsjt.ico"; DestDir: "{app}" +Source: "c:\Users\joe\wsjt\map65_install\kvasd.exe"; DestDir: "{app}" +Source: "c:\Users\joe\wsjt\map65_install\CALL3.TXT"; DestDir: "{app}"; Flags: onlyifdoesntexist +Source: "c:\Users\joe\wsjt\map65_install\fftwf-wisdom.exe"; DestDir: "{app}"; Flags: onlyifdoesntexist +Source: "c:\Users\joe\wsjt\map65_install\wisdom1.bat"; DestDir: "{app}"; +Source: "c:\Users\joe\wsjt\map65_install\wisdom2.bat"; DestDir: "{app}"; +Source: "c:\Users\joe\wsjt\map65_install\afmhot.dat"; DestDir: "{app}"; +Source: "c:\Users\joe\wsjt\map65_install\blue.dat"; DestDir: "{app}"; +Source: "c:\Users\joe\wsjt\map65_install\qthid.exe"; DestDir: "{app}"; -Source: "c:\Users\joe\map65\QtSupport\*.dll"; DestDir: "{sys}"; Flags: onlyifdoesntexist +Source: "c:\Users\joe\wsjt\QtSupport\*.dll"; DestDir: "{sys}"; Flags: onlyifdoesntexist -Source: "c:\Users\joe\map65\install\save\dummy"; DestDir: "{app}\save"; +Source: "c:\Users\joe\wsjt\map65_install\save\dummy"; DestDir: "{app}\save"; [Icons] Name: "{group}\MAP65"; Filename: "{app}\map65.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico