diff --git a/lib/decoder.f90 b/lib/decoder.f90
index db50ca5fa..98706df89 100644
--- a/lib/decoder.f90
+++ b/lib/decoder.f90
@@ -18,20 +18,10 @@ subroutine decoder(ss,c0)
common/npar/nutc,ndiskdat,ntrperiod,nfqso,newdat,npts8,nfa,nfb,ntol, &
kin,nzhsym,nsave,nagain,ndepth,nrxlog,nfsample,datetime
common/tracer/limtrace,lu
- logical first
- data first/.true./
save
call timer('decoder ',0)
- if(first) then
- limtrace=0
- lu=12
- open(12,file='timer.out',status='unknown')
- open(14,file='wsjtx_rx.log',status='unknown',position='append')
- first=.false.
- endif
-
ntrMinutes=ntrperiod/60
newdat=1
nsynced=0
diff --git a/lib/jt9a.F90 b/lib/jt9a.F90
index d61bbc5f3..7685e7c76 100644
--- a/lib/jt9a.F90
+++ b/lib/jt9a.F90
@@ -19,6 +19,8 @@ subroutine jt9a
call getcwd(cwd)
! call ftninit(trim(cwd))
+ open(12,file='timer.out',status='unknown')
+ open(14,file='wsjtx_rx.log',status='unknown',position='append')
limtrace=0
lu=12
@@ -88,15 +90,15 @@ subroutine jt9c(ss,savg,c0,id2,nparams0)
call flush(6)
if(iand(nrxlog,1).ne.0) then
-! write(21,1000) datetime(:17)
-!1000 format(/'UTC Date: 'a17/78('-'))
-! flush(21)
+ write(14,1000) datetime(:17)
+1000 format(/'UTC Date: 'a17/78('-'))
+ flush(14)
endif
-! if(iand(nrxlog,2).ne.0) rewind 21
+ if(iand(nrxlog,2).ne.0) rewind 14
! if(iand(nrxlog,4).ne.0) rewind 26
nstandalone=0
- if(sum(nparams).ne.0) call decoder(ss,c0,ntrperiod,ndepth,nrxlog)
+ if(sum(nparams).ne.0) call decoder(ss,c0)
return
end subroutine jt9c
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 0565fd17c..fa5c02e7b 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/mainwindow.ui b/mainwindow.ui
index 65fe83246..ad447cebc 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1622,7 +1622,7 @@ p, li { white-space: pre-wrap; }
true
- false
+ true
Save synced
@@ -1633,7 +1633,7 @@ p, li { white-space: pre-wrap; }
true
- false
+ true
Save decoded
diff --git a/widegraph.cpp b/widegraph.cpp
index 6c27918aa..2e7b77c74 100644
--- a/widegraph.cpp
+++ b/widegraph.cpp
@@ -39,7 +39,7 @@ WideGraph::WideGraph(QWidget *parent) :
ui->widePlot->setBinsPerPixel(1);
m_waterfallAvg = settings.value("WaterfallAvg",5).toInt();
ui->waterfallAvgSpinBox->setValue(m_waterfallAvg);
- m_dialFreq=settings.value("DialFreqMHz",474.000).toDouble();
+ m_dialFreq=settings.value("DialFreqkHz",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();
@@ -73,7 +73,7 @@ void WideGraph::saveSettings()
settings.setValue("PlotWidth",ui->widePlot->plotWidth());
settings.setValue("FreqSpan",ui->freqSpanSpinBox->value());
settings.setValue("WaterfallAvg",ui->waterfallAvgSpinBox->value());
- settings.setValue("DialFreqMHz",m_dialFreq);
+ settings.setValue("DialFreqkHz",m_dialFreq);
settings.setValue("Current",ui->widePlot->m_bCurrent);
settings.setValue("Cumulative",ui->widePlot->m_bCumulative);
settings.setValue("JT9Sync",ui->widePlot->m_bJT9Sync);
@@ -237,15 +237,16 @@ void WideGraph::on_fDialLineEdit_editingFinished()
m_dialFreq=ui->fDialLineEdit->text().toDouble();
}
-void WideGraph::initIQplus()
-{
-}
-
double WideGraph::fGreen()
{
return ui->widePlot->fGreen();
}
+double WideGraph::dialFreq()
+{
+ return m_dialFreq;
+}
+
void WideGraph::setPeriod(int ntrperiod, int nsps)
{
m_TRperiod=ntrperiod;
diff --git a/widegraph.h b/widegraph.h
index f1e7c015c..13cbd8cf8 100644
--- a/widegraph.h
+++ b/widegraph.h
@@ -14,8 +14,6 @@ public:
explicit WideGraph(QWidget *parent = 0);
~WideGraph();
- double m_dialFreq;
-
void dataSink2(float s[], float red[], float df3, int ihsym,
int ndiskdata, uchar lstrong[]);
void setQSOfreq(int n);
@@ -32,6 +30,7 @@ public:
void setPeriod(int ntrperiod, int nsps);
void setTxFreq(int n);
double fGreen();
+ double dialFreq();
qint32 m_qsoFreq;
@@ -41,7 +40,6 @@ signals:
public slots:
void wideFreezeDecode(int n);
- void initIQplus();
protected:
virtual void keyPressEvent( QKeyEvent *e );
@@ -65,6 +63,8 @@ private:
qint32 m_nsps;
qint32 m_ntr0;
+ double m_dialFreq;
+
Ui::WideGraph *ui;
};
diff --git a/widegraph.ui b/widegraph.ui
index c70fc7b16..b005cd705 100644
--- a/widegraph.ui
+++ b/widegraph.ui
@@ -326,7 +326,7 @@
true
- USB Dial Freq (kHz)
+ Dial Freq (kHz)