diff --git a/CMakeLists.txt b/CMakeLists.txt index 384f05faa..cd74059f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -949,7 +949,7 @@ if (Fortran_COMPILER_NAME MATCHES "gfortran.*") set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -isysroot ${CMAKE_OSX_SYSROOT}") endif (CMAKE_OSX_SYSROOT) - set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -fbounds-check -funroll-all-loops -fno-f2c ${General_FFLAGS}") + set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -funroll-all-loops -fno-f2c ${General_FFLAGS}") set (CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -fbounds-check -fno-f2c ${General_FFLAGS}") elseif (Fortran_COMPILER_NAME MATCHES "ifort.*") # ifort (untested) diff --git a/Versions.cmake b/Versions.cmake index bf77ff75e..11b2106d3 100644 --- a/Versions.cmake +++ b/Versions.cmake @@ -1,6 +1,6 @@ # Version number components set (WSJTX_VERSION_MAJOR 1) -set (WSJTX_VERSION_MINOR 8) -set (WSJTX_VERSION_PATCH 2) +set (WSJTX_VERSION_MINOR 7) +set (WSJTX_VERSION_PATCH 1) set (WSJTX_RC 0) # release candidate number, comment out or zero for development versions set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build diff --git a/mainwindow.cpp b/mainwindow.cpp index d985f8e12..5e513dc5d 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -7548,7 +7548,9 @@ void MainWindow::foxGenWaveform(int i,QString fm) foxcom_.i3bit[i]=0; if(fm.indexOf("<")>0) foxcom_.i3bit[i]=1; strncpy(&foxcom_.cmsg[i][0],fm.toLatin1(),40); //Copy this message into cmsg[i] - writeFoxQSO(" Tx: " + fm.trimmed()); + QString t; + t.sprintf(" Tx %d: ",i+1); + writeFoxQSO(t + fm.trimmed()); } void MainWindow::writeFoxQSO(QString msg) @@ -7557,7 +7559,7 @@ void MainWindow::writeFoxQSO(QString msg) if (f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append)) { QTextStream out(&f); out << QDateTime::currentDateTimeUtc().toString("yyyy-MM-dd hh:mm:ss") - << " " << qSetRealNumberPrecision (12) << (m_freqNominal/1.e6) << msg << endl; + << " " << fixed << qSetRealNumberPrecision (4) << (m_freqNominal/1.e6) << msg << endl; f.close(); } else { MessageBox::warning_message (this, tr("File Open Error"),