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

Add UTC to WSPR Tx dividing line; add WSPR Rx dividing line when no decodes;

Browse Source 
increase ranges of Gaiz/Zero sliders on Echo Graph.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5605 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2015-06-13 14:24:54 +00:00
parent 2b671dbd2e
commit d64fb9826e
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
echograph.ui
View File

@ -118,10 +118,10 @@
<item> <item>
<widget class="QSlider" name="gainSlider"> <widget class="QSlider" name="gainSlider">
<property name="minimum"> <property name="minimum">
<number>-20</number> <number>-30</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>20</number> <number>30</number>
</property> </property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -154,7 +154,7 @@
<item> <item>
<widget class="QSlider" name="zeroSlider"> <widget class="QSlider" name="zeroSlider">
<property name="minimum"> <property name="minimum">
<number>-50</number> <number>-150</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>150</number> <number>150</number>

29
mainwindow.cpp
View File

@ -2147,7 +2147,8 @@ void MainWindow::guiUpdate()
if(m_auto and m_mode=="Echo" and m_bEchoTxOK) progressBar->setValue( if(m_auto and m_mode=="Echo" and m_bEchoTxOK) progressBar->setValue(
int(100*m_s6/6.0)); int(100*m_s6/6.0));
if(nsec != m_sec0) { //Once per second //Once per second:
if(nsec != m_sec0) {
if(m_mode!="Echo") { if(m_mode!="Echo") {
int ipct=0; int ipct=0;
if(m_monitoring or m_transmitting) ipct=int(100*m_nseq/txDuration); if(m_monitoring or m_transmitting) ipct=int(100*m_nseq/txDuration);
@ -2221,7 +2222,8 @@ void MainWindow::startTx2()
if (m_config.TX_messages ()) { if (m_config.TX_messages ()) {
t = " Transmitting " + m_mode + " ----------------------- " + t = " Transmitting " + m_mode + " ----------------------- " +
m_config.bands ()->find (m_dialFreq); m_config.bands ()->find (m_dialFreq);
ui->decodedTextBrowser->appendText(t.rightJustified (71, '-')); t=WSPR_hhmm(0) + ' ' + t.rightJustified (66, '-');
ui->decodedTextBrowser->appendText(t);
} }
QFile f {m_dataDir.absoluteFilePath ("ALL_WSPR.TXT")}; QFile f {m_dataDir.absoluteFilePath ("ALL_WSPR.TXT")};
@ -4099,7 +4101,15 @@ void MainWindow::p1ReadFromStdout() //p1readFromStdout
while(p1.canReadLine()) { while(p1.canReadLine()) {
QString t(p1.readLine()); QString t(p1.readLine());
if(t.indexOf("<DecodeFinished>") >= 0) { if(t.indexOf("<DecodeFinished>") >= 0) {
if(!m_diskData) WSPR_history(m_dialFreqRxWSPR, m_nWSPRdecodes); if(!m_diskData) {
WSPR_history(m_dialFreqRxWSPR, m_nWSPRdecodes);
if(m_nWSPRdecodes==0) {
t = " Receiving " + m_mode + " ----------------------- " +
m_config.bands ()->find (m_dialFreqRxWSPR);
t=WSPR_hhmm(-60) + ' ' + t.rightJustified (66, '-');
ui->decodedTextBrowser->appendText(t);
}
}
m_nWSPRdecodes=0; m_nWSPRdecodes=0;
ui->DecodeButton->setChecked (false); ui->DecodeButton->setChecked (false);
if(m_uploadSpots) { if(m_uploadSpots) {
@ -4188,13 +4198,20 @@ void MainWindow::p1ReadFromStdout() //p1readFromStdout
} }
} }
QString MainWindow::WSPR_hhmm(int n)
{
QDateTime t=QDateTime::currentDateTimeUtc().addSecs(n);
int m=t.toString("hhmm").toInt()/2;
QString t1;
t1.sprintf("%04d",2*m);
return t1;
}
void MainWindow::WSPR_history(Frequency dialFreq, int ndecodes) void MainWindow::WSPR_history(Frequency dialFreq, int ndecodes)
{ {
QDateTime t=QDateTime::currentDateTimeUtc().addSecs(-60); QDateTime t=QDateTime::currentDateTimeUtc().addSecs(-60);
QString t1=t.toString("yyMMdd"); QString t1=t.toString("yyMMdd");
QString t2=t.toString("hhmm"); QString t2=WSPR_hhmm(-60);
int n=t2.toInt()/2;
t2.sprintf("%04d",2*n);
QString t3; QString t3;
t3.sprintf("%13.6f",0.000001*dialFreq); t3.sprintf("%13.6f",0.000001*dialFreq);
if(ndecodes<0) { if(ndecodes<0) {

1
mainwindow.h
View File

@ -512,6 +512,7 @@ private:
void WSPR_scheduling (); void WSPR_scheduling ();
void astroCalculations (QDateTime const&, bool adjust); void astroCalculations (QDateTime const&, bool adjust);
void WSPR_history(Frequency dialFreq, int ndecodes); void WSPR_history(Frequency dialFreq, int ndecodes);
QString WSPR_hhmm(int n);
}; };
extern void getfile(QString fname, int ntrperiod); extern void getfile(QString fname, int ntrperiod);