w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 04:11:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use 30 s intevals for "Age" units. Clean up labels when Message Avg window used for Fox Log.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8348 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-12-19 17:01:38 +00:00
parent e19c34d303
commit ac818337a6
6 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/decoder.f90
View File

@ -80,8 +80,8 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
params%mycall,params%mygrid,params%hiscall,params%hisgrid)
call timer('decft8 ',1)
if(nfox.gt.0) then
n15min=minval(n15fox(1:nfox))
n15max=maxval(n15fox(1:nfox))
n30min=minval(n30fox(1:nfox))
n30max=maxval(n30fox(1:nfox))
endif
j=0
rewind 19
@ -90,15 +90,15 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
rewind 19
else
do i=1,nfox
n=n15fox(i)
if(n15max-n15fox(i).le.4) then
n=n30fox(i)
if(n30max-n30fox(i).le.4) then
j=j+1
c2fox(j)=c2fox(i)
g2fox(j)=g2fox(i)
nsnrfox(j)=nsnrfox(i)
nfreqfox(j)=nfreqfox(i)
n15fox(j)=n
m=n15max-n
n30fox(j)=n
m=n30max-n
call azdist(params%mygrid,g2fox(j),0.d0,nAz,nEl,nDmiles,nDkm, &
nHotAz,nHotABetter)
write(19,1004) c2fox(j),g2fox(j),nsnrfox(j),nfreqfox(j),nDkm,m
@ -440,7 +440,7 @@ contains
real, intent(in) :: freq
character(len=32), intent(in) :: decoded
character c1*12,c2*6,g2*4,w*4
integer i0,i1,i2,i3,i4,i5,n15,nwrap
integer i0,i1,i2,i3,i4,i5,n30,nwrap
integer, intent(in) :: nap
real, intent(in) :: qual
character*2 annot
@ -460,7 +460,7 @@ contains
g2fox=' '
nsnrfox=-99
nfreqfox=-99
n15z=0
n30z=0
nwrap=0
nfox=0
first=.false.
@ -499,16 +499,16 @@ contains
b2=i3-i2.eq.1
if(b0 .and. (b1.or.b2) .and. nint(freq).ge.1000) then
n=params%nutc
n15=(3600*(n/10000) + 60*mod((n/100),100) + mod(n,100))/15
if(n15.lt.n15z) nwrap=nwrap+5760 !New UTC day, handle the wrap
n15z=n15
n15=n15+nwrap
n30=(3600*(n/10000) + 60*mod((n/100),100) + mod(n,100))/30
if(n30.lt.n30z) nwrap=nwrap+5760 !New UTC day, handle the wrap
n30z=n30
n30=n30+nwrap
nfox=nfox+1
c2fox(nfox)=c2
g2fox(nfox)=g2
nsnrfox(nfox)=snr
nfreqfox(nfox)=nint(freq)
n15fox(nfox)=n15
n30fox(nfox)=n30
endif
endif

4
lib/ft8_decode.f90
View File

@ -5,8 +5,8 @@ module ft8_decode
character*4 g2fox(MAXFOX)
integer nsnrfox(MAXFOX)
integer nfreqfox(MAXFOX)
integer n15fox(MAXFOX)
integer n15z
integer n30fox(MAXFOX)
integer n30z
integer nfox
type :: ft8_decoder

9
mainwindow.cpp
View File

@ -2295,6 +2295,12 @@ void MainWindow::on_actionAstronomical_data_toggled (bool checked)
}
}
void MainWindow::on_actionFox_Callers_triggered()
{
on_actionMessage_averaging_triggered();
m_msgAvgWidget->foxLogSetup();
}
void MainWindow::on_actionMessage_averaging_triggered()
{
if (!m_msgAvgWidget)
@ -4916,7 +4922,6 @@ void MainWindow::on_actionFT8_triggered()
ui->TxFreqSpinBox->setValue(300);
displayWidgets(nWidgets("11101000010011100001000010000010"));
ui->labDXped->setText("DXpedition: Fox");
on_actionMessage_averaging_triggered(); //###
}
if(m_config.bHound()) {
ui->txFirstCheckBox->setChecked(false);
@ -7406,7 +7411,7 @@ TxTimeout:
<< m_rptRcvd << m_lastBand;
QDateTime now {QDateTime::currentDateTimeUtc ()};
QString logLine=now.toString("yyyy-MM-dd hh:mm") + " " + m_hisCall +
" " + m_hisGrid + " " + m_rptSent + " " + m_rptRcvd + " " + m_lastBand;
" " + m_hisGrid + " " + m_rptSent + " " + m_rptRcvd + " " + m_lastBand;
if(m_msgAvgWidget->isVisible()) m_msgAvgWidget->displayAvg(logLine);
on_logQSOButton_clicked();
m_loggedByFox[m_hisCall] += (m_lastBand + " ");

1
mainwindow.h
View File

@ -240,6 +240,7 @@ private slots:
void stopTuneATU();
void auto_tx_mode(bool);
void on_actionMessage_averaging_triggered();
void on_actionFox_Callers_triggered();
void on_actionInclude_averaging_toggled (bool);
void on_actionInclude_correlation_toggled (bool);
void on_actionEnable_AP_DXcall_toggled (bool);

17
messageaveraging.cpp
View File

@ -14,10 +14,16 @@ MessageAveraging::MessageAveraging(QSettings * settings, QFont const& font, QWid
ui(new Ui::MessageAveraging)
{
ui->setupUi(this);
setWindowTitle (QApplication::applicationName () + " - " + tr ("Message Averaging"));
// setWindowTitle (QApplication::applicationName () + " - " + tr ("Message Averaging"));
ui->msgAvgPlainTextEdit->setReadOnly (true);
changeFont (font);
read_settings ();
if(m_title_.contains("Fox")) {
ui->header_label->setText(" Date Time Call Grid Sent Rcvd Band");
} else {
ui->header_label->setText(" UTC Sync DT Freq ");
}
setWindowTitle(m_title_);
}
MessageAveraging::~MessageAveraging()
@ -62,15 +68,24 @@ void MessageAveraging::read_settings ()
{
SettingsGroup group {settings_, "MessageAveraging"};
restoreGeometry (settings_->value ("window/geometry").toByteArray ());
m_title_=settings_->value("window/title","Message Averaging").toString();
}
void MessageAveraging::write_settings ()
{
SettingsGroup group {settings_, "MessageAveraging"};
settings_->setValue ("window/geometry", saveGeometry ());
settings_->setValue("window/title",m_title_);
}
void MessageAveraging::displayAvg(QString const& t)
{
ui->msgAvgPlainTextEdit->setPlainText(t);
}
void MessageAveraging::foxLogSetup()
{
m_title_=QApplication::applicationName () + " - Fox Log";
setWindowTitle(m_title_);
ui->header_label->setText(" Date Time Call Grid Sent Rcvd Band");
}

2
messageaveraging.h
View File

@ -17,6 +17,7 @@ public:
~MessageAveraging();
void displayAvg(QString const&);
void changeFont (QFont const&);
void foxLogSetup();
protected:
void closeEvent (QCloseEvent *) override;
@ -26,6 +27,7 @@ private:
void write_settings ();
void setContentFont (QFont const&);
QSettings * settings_;
QString m_title_;
QScopedPointer<Ui::MessageAveraging> ui;
};