diff --git a/devsetup.ui b/devsetup.ui
index 469200ead..bd400cc0d 100644
--- a/devsetup.ui
+++ b/devsetup.ui
@@ -86,7 +86,7 @@
- K1JT
+
@@ -155,7 +155,7 @@
- FN20qi
+
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 2e488e2fd..7c5a282c8 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//---------------------------------------------------------------- MainWindow
+//--------------------------------------------------------------- MainWindow
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include "devsetup.h"
@@ -128,7 +128,7 @@ MainWindow::MainWindow(QWidget *parent) :
m_killAll=false;
m_widebandDecode=false;
m_ntx=1;
- m_myCall="K1JT";
+ m_myCall="";
m_myGrid="FN20qi";
m_appDir = QApplication::applicationDirPath();
m_saveDir="/users/joe/wsjtx/install/save";
@@ -231,11 +231,11 @@ MainWindow::MainWindow(QWidget *parent) :
m_monitoring=!m_monitorStartOFF; // Start with Monitoring ON/OFF
soundInThread.setMonitoring(m_monitoring);
m_diskData=false;
- g_pWideGraph->setTol(m_tol);
static int ntol[] = {1,2,5,10,20,50,100,200,500};
for (int i=0; i<10; i++) {
if(ntol[i]==m_tol) ui->tolSlider->setValue(i);
}
+ g_pWideGraph->setTol(m_tol);
// Create "m_worked", a dictionary of all calls in wsjtx.log
QFile f("wsjtx.log");
@@ -419,8 +419,8 @@ void MainWindow::readSettings()
m_saveSynced=ui->actionSave_synced->isChecked();
m_saveDecoded=ui->actionSave_decoded->isChecked();
m_saveAll=ui->actionSave_all->isChecked();
- m_ndepth=settings.value("NDepth",0).toInt();
- m_tol=settings.value("Tol",5).toInt();
+ m_ndepth=settings.value("NDepth",2).toInt();
+ m_tol=settings.value("Tol",500).toInt();
m_inGain=settings.value("InGain",0).toInt();
ui->inGain->setValue(m_inGain);
m_kb8rq=settings.value("KB8RQ",false).toBool();
@@ -1164,7 +1164,7 @@ void MainWindow::readFromStdout() //readFromStdout
QString bg="white";
if(t.indexOf(" CQ ")>0) bg="#66ff66"; //Light green
- if(t.indexOf(" "+m_myCall+" ")>0) bg="#ff6666"; //Light red
+ if(m_myCall!="" and t.indexOf(" "+m_myCall+" ")>0) bg="#ff6666"; //Light red
//ui->decodedTextBrowser->setTextBackgroundColor(bg);
//t=t.mid(0,n-2) + " ";
//ui->decodedTextBrowser->append(t);
diff --git a/mainwindow.ui b/mainwindow.ui
index 155f4ce65..6b58c7c91 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -7,7 +7,7 @@
0
0
680
- 598
+ 475
@@ -559,7 +559,7 @@ p, li { white-space: pre-wrap; }
- Tolerance: 50
+ Tolerance: 500
Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
@@ -580,6 +580,9 @@ p, li { white-space: pre-wrap; }
8
+
+ 8
+
Qt::Horizontal
diff --git a/widegraph.cpp b/widegraph.cpp
index 3b6250eea..db54d096a 100644
--- a/widegraph.cpp
+++ b/widegraph.cpp
@@ -30,24 +30,22 @@ WideGraph::WideGraph(QWidget *parent) :
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",1).toInt();
+ int n = settings.value("FreqSpan",2).toInt();
int w = settings.value("PlotWidth",1000).toInt();
ui->widePlot->m_w=w;
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",5).toInt();
ui->waterfallAvgSpinBox->setValue(m_waterfallAvg);
- ui->widePlot->m_bCurrent=settings.value("Current",true).toBool();
+ ui->widePlot->m_bCurrent=settings.value("Current",false).toBool();
ui->widePlot->m_bCumulative=settings.value("Cumulative",false).toBool();
- ui->widePlot->m_bJT9Sync=settings.value("JT9Sync",false).toBool();
+ ui->widePlot->m_bJT9Sync=settings.value("JT9Sync",true).toBool();
if(ui->widePlot->m_bCurrent) ui->spec2dComboBox->setCurrentIndex(0);
if(ui->widePlot->m_bCumulative) ui->spec2dComboBox->setCurrentIndex(1);
if(ui->widePlot->m_bJT9Sync) ui->spec2dComboBox->setCurrentIndex(2);
- int nbpp=settings.value("BinsPerPixel",1).toInt();
+ int nbpp=settings.value("BinsPerPixel",2).toInt();
ui->widePlot->setBinsPerPixel(nbpp);
- m_qsoFreq=settings.value("QSOfreq",1010).toInt();
+ m_qsoFreq=settings.value("QSOfreq",1500).toInt();
ui->widePlot->setFQSO(m_qsoFreq,true);
settings.endGroup();
}
diff --git a/widegraph.ui b/widegraph.ui
index 1df167d9c..cebcbb349 100644
--- a/widegraph.ui
+++ b/widegraph.ui
@@ -101,7 +101,7 @@
1
- 1
+ 2
diff --git a/wsjtx.iss b/wsjtx.iss
index 300a5c5f2..552674a7c 100644
--- a/wsjtx.iss
+++ b/wsjtx.iss
@@ -1,6 +1,6 @@
[Setup]
AppName=wsjtx
-AppVerName=wsjtx Version 0.8 r3110
+AppVerName=wsjtx Version 0.8 r3111
AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT
DefaultDirName=c:\wsjtx
DefaultGroupName=wsjtx
@@ -15,7 +15,7 @@ Source: "c:\Users\joe\wsjt\wsjtx_install\blue.dat"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\wsjtx_install\CALL3.TXT"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\wsjtx\WSJT-X_Users_Guide.pdf"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\QtSupport\*.dll"; DestDir: "{app}"; Flags: onlyifdoesntexist
-Source: "c:\Users\joe\wsjt\wsjtx_install\save\Samples\000000_0000.wav"; DestDir: "{app}\save\Samples";
+Source: "c:\Users\joe\wsjt\wsjtx_install\save\Samples\130228_2158.wav"; DestDir: "{app}\save\Samples";
[Icons]
Name: "{group}\wsjtx"; Filename: "{app}\wsjtx.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico