diff --git a/MAP65_Beta_Release.docx b/MAP65_Beta_Release.docx deleted file mode 100644 index acdc02773..000000000 Binary files a/MAP65_Beta_Release.docx and /dev/null differ diff --git a/WSJT-X_Quick_Start_Guide.docx b/WSJT-X_Quick_Start_Guide.docx index 2fb3ff9a0..b452ca037 100644 Binary files a/WSJT-X_Quick_Start_Guide.docx and b/WSJT-X_Quick_Start_Guide.docx differ diff --git a/lib/symspec.f90 b/lib/symspec.f90 index f8d8a81dc..b28c60bf9 100644 --- a/lib/symspec.f90 +++ b/lib/symspec.f90 @@ -114,7 +114,7 @@ subroutine symspec(k,ntrperiod,nsps,nb,nbslider,pxdb,s,red, & cx(i)=c0(ja+i+1) enddo - ihsym=ihsym+1 + if(ihsym.lt.184) ihsym=ihsym+1 cx(0:nfft3-1)=w3(1:nfft3)*cx(0:nfft3-1) !Apply window w3 call four2a(cx,nfft3,1,1,1) !Third forward FFT (X) diff --git a/mainwindow.cpp b/mainwindow.cpp index 9df9c5fcc..2df3f15b7 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//--------------------------------------------------------------- MainWindow +//---------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h" diff --git a/widegraph.cpp b/widegraph.cpp index a89e544bb..dd711bded 100644 --- a/widegraph.cpp +++ b/widegraph.cpp @@ -22,23 +22,23 @@ WideGraph::WideGraph(QWidget *parent) : //Restore user's settings QString inifile(QApplication::applicationDirPath()); - inifile += "/map65.ini"; + inifile += "/wsjtx.ini"; QSettings settings(inifile, QSettings::IniFormat); settings.beginGroup("WideGraph"); - ui->widePlot->setPlotZero(settings.value("PlotZero", 20).toInt()); + ui->widePlot->setPlotZero(settings.value("PlotZero", 0).toInt()); ui->widePlot->setPlotGain(settings.value("PlotGain", 0).toInt()); ui->zeroSpinBox->setValue(ui->widePlot->getPlotZero()); ui->gainSpinBox->setValue(ui->widePlot->getPlotGain()); - int n = settings.value("FreqSpan",60).toInt(); + int n = settings.value("FreqSpan",1).toInt(); int w = settings.value("PlotWidth",1000).toInt(); ui->freqSpanSpinBox->setValue(n); ui->widePlot->setNSpan(n); // int nbpp = n * 32768.0/(w*96.0) + 0.5; ui->widePlot->setBinsPerPixel(1); - m_waterfallAvg = settings.value("WaterfallAvg",10).toInt(); + m_waterfallAvg = settings.value("WaterfallAvg",5).toInt(); ui->waterfallAvgSpinBox->setValue(m_waterfallAvg); - m_dialFreq=settings.value("DialFreqMHz",473.000).toDouble(); + m_dialFreq=settings.value("DialFreqMHz",474.000).toDouble(); ui->fDialLineEdit->setText(QString::number(m_dialFreq)); ui->widePlot->m_bCurrent=settings.value("Current",true).toBool(); ui->widePlot->m_bCumulative=settings.value("Cumulative",false).toBool(); @@ -62,7 +62,7 @@ void WideGraph::saveSettings() { //Save user's settings QString inifile(QApplication::applicationDirPath()); - inifile += "/map65.ini"; + inifile += "/wsjtx.ini"; QSettings settings(inifile, QSettings::IniFormat); settings.beginGroup("WideGraph"); diff --git a/wsjtx.iss b/wsjtx.iss index e8b1be73f..525fb8a1b 100644 --- a/wsjtx.iss +++ b/wsjtx.iss @@ -1,6 +1,6 @@ [Setup] AppName=wsjtx -AppVerName=wsjtx Version 0.1 r2684 +AppVerName=wsjtx Version 0.1 r2692 AppCopyright=Copyright (C) 2001-2012 by Joe Taylor, K1JT DefaultDirName=c:\wsjtx DefaultGroupName=wsjtx @@ -10,6 +10,7 @@ Source: "c:\Users\joe\wsjt\wsjtx_install\wsjtx.exe"; DestDir: "{app}" Source: "c:\Users\joe\wsjt\wsjtx_install\wsjt.ico"; DestDir: "{app}" Source: "c:\Users\joe\wsjt\wsjtx_install\afmhot.dat"; DestDir: "{app}"; Source: "c:\Users\joe\wsjt\wsjtx_install\blue.dat"; DestDir: "{app}"; +Source: "c:\Users\joe\wsjt\wsjtx_install\WSJT-X_Quick_Start_Guide.pdf"; DestDir: "{app}"; Source: "c:\Users\joe\wsjt\QtSupport\*.dll"; DestDir: "{sys}"; Flags: onlyifdoesntexist Source: "c:\Users\joe\wsjt\wsjtx_install\save\000000_0000.wav"; DestDir: "{app}\save";