From 3fa52a1a861f8011658382e2b98b3d6f419e93fd Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 19 Jan 2017 15:00:17 +0000 Subject: [PATCH] Fix several formatting flaws. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@7538 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- CMakeLists.txt | 4 ++-- libm65/qra64c.f90 | 2 +- libm65/timer.f90 | 2 +- mainwindow.cpp | 2 +- mainwindow.ui | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 098a6d7ac..cd91b680c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,8 +115,8 @@ target_link_libraries (map65 m65impl ${fftw3f_LIBRARIES} ${CMAKE_CURRENT_SOURCE_ if (WIN32) target_link_libraries (map65) -# set_target_properties (map65 PROPERTIES LINK_FLAGS_RELEASE "${LINKER_FLAGS_RELEASE} ") - set_target_properties (map65 PROPERTIES LINK_FLAGS_RELEASE "${LINKER_FLAGS_RELEASE} -mwindows") + set_target_properties (map65 PROPERTIES LINK_FLAGS_RELEASE "${LINKER_FLAGS_RELEASE} ") +# set_target_properties (map65 PROPERTIES LINK_FLAGS_RELEASE "${LINKER_FLAGS_RELEASE} -mwindows") endif (WIN32) qt5_use_modules (map65 Widgets Multimedia OpenGL) diff --git a/libm65/qra64c.f90 b/libm65/qra64c.f90 index 802417ef9..95cb3305c 100644 --- a/libm65/qra64c.f90 +++ b/libm65/qra64c.f90 @@ -204,7 +204,7 @@ subroutine qra64c(cx,cy,nutc,nqd,ikhz,nfqso,ntol,xpol,mycall_12, & if(irc.ge.0) then write(*,1010) ikHz,nfreq,npol,nutc,dtx,nsnr,cmode(1:1),decoded, & irc,ntxpol,cp -1010 format('!',i3,i5,i4,i6.4,f5.1,i5,1x,a1,1x,a22,i2,i5,6x,a1) +1010 format('!',i3,i5,i4,i6.4,f5.1,i5,1x,a1,1x,a22,i2,5x,i5,1x,a1) nwrite_qra64=nwrite_qra64+1 freq=144.0 + 0.001*ikhz write(21,1014) freq,nfreq,dtx,npol,nsnr,nutc,decoded,cp, & diff --git a/libm65/timer.f90 b/libm65/timer.f90 index 4695d3a47..13825bed0 100644 --- a/libm65/timer.f90 +++ b/libm65/timer.f90 @@ -86,7 +86,7 @@ subroutine timer(dname,k) dutf=dut(i)/total sum=sum+dut(i) sumf=sumf+dutf - kk=nlevel(i) + kk=min(nlevel(i),8) sname=space(1:kk)//name(i)//space(1:8-kk) ename=space if(i.ge.2) ename=name(nparent(i)) diff --git a/mainwindow.cpp b/mainwindow.cpp index 3cc26360a..122bbe4eb 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1727,7 +1727,7 @@ void MainWindow::doubleClickOnCall(QString hiscall, bool ctrl) QString t1 = t.mid(0,i2); //contents up to text cursor int i1=t1.lastIndexOf("\n") + 1; QString t2 = t1.mid(i1,i2-i1); //selected line - int n = 60*t2.mid(13,2).toInt() + t2.mid(15,2).toInt(); + int n = 60*t2.mid(14,2).toInt() + t2.mid(16,2).toInt(); m_txFirst = ((n%2) == 1); ui->txFirstCheckBox->setChecked(m_txFirst); QString rpt=""; diff --git a/mainwindow.ui b/mainwindow.ui index 0679a7b8f..3ce9394f0 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -7,7 +7,7 @@ 0 0 635 - 477 + 497 @@ -59,7 +59,7 @@ - Freq DF Pol UTC DT dB + Freq DF Pol UTC DT dB RC DS TxPol