w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Contest log to the "fox log" window.

This commit is contained in:
Joe Taylor 2018-10-02 12:14:17 -04:00
parent 29862476c6
commit cc7d424078
5 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mainwindow.cpp
View File

@ -1199,6 +1199,8 @@ void MainWindow::setContestType()
if(m_config.bEU_VHF_Contest()) m_nContest=EU_VHF; if(m_config.bEU_VHF_Contest()) m_nContest=EU_VHF;
if(m_config.bFieldDay()) m_nContest=FIELD_DAY; if(m_config.bFieldDay()) m_nContest=FIELD_DAY;
if(m_config.bRTTYroundup()) m_nContest=RTTY; if(m_config.bRTTYroundup()) m_nContest=RTTY;
if(m_config.bFox()) m_nContest=FOX;
if(m_config.bHound()) m_nContest=HOUND;
} }
void MainWindow::set_application_font (QFont const& font) void MainWindow::set_application_font (QFont const& font)
@ -2388,7 +2390,7 @@ void MainWindow::on_actionAstronomical_data_toggled (bool checked)
void MainWindow::on_actionFox_Log_triggered() void MainWindow::on_actionFox_Log_triggered()
{ {
on_actionMessage_averaging_triggered(); on_actionMessage_averaging_triggered();
m_msgAvgWidget->foxLogSetup(); m_msgAvgWidget->foxLogSetup(m_nContest);
} }
void MainWindow::on_actionColors_triggered() void MainWindow::on_actionColors_triggered()
@ -3753,7 +3755,7 @@ void MainWindow::guiUpdate()
//Once per second: //Once per second:
if(nsec != m_sec0) { if(nsec != m_sec0) {
// qDebug() << "OneSec:" << m_config.autoLog(); qDebug() << "OneSec:" << m_nContest;
if(m_freqNominal!=0 and m_freqNominal<50000000 and m_config.enable_VHF_features()) { if(m_freqNominal!=0 and m_freqNominal<50000000 and m_config.enable_VHF_features()) {
if(!m_bVHFwarned) vhfWarning(); if(!m_bVHFwarned) vhfWarning();

4
mainwindow.h
View File

@ -518,7 +518,9 @@ private:
NA_VHF, NA_VHF,
EU_VHF, EU_VHF,
FIELD_DAY, FIELD_DAY,
RTTY RTTY,
FOX,
HOUND
} m_nContest; //Contest type } m_nContest; //Contest type
enum {CALL, GRID, DXCC, MULT}; enum {CALL, GRID, DXCC, MULT};

5
mainwindow.ui
View File

@ -3304,6 +3304,11 @@ QPushButton[state=&quot;ok&quot;] {
<string>Color highlighting scheme</string> <string>Color highlighting scheme</string>
</property> </property>
</action> </action>
<action name="actionContest_Log">
<property name="text">
<string>Contest Log</string>
</property>
</action>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<customwidgets> <customwidgets>

18
messageaveraging.cpp
View File

@ -88,9 +88,23 @@ void MessageAveraging::displayAvg(QString const& t)
ui->msgAvgPlainTextEdit->setPlainText(t); ui->msgAvgPlainTextEdit->setPlainText(t);
} }
void MessageAveraging::foxLogSetup() void MessageAveraging::foxLogSetup(int nContest)
{ {
m_title_=QApplication::applicationName () + " - Fox Log"; if(nContest==5) {
m_title_=QApplication::applicationName () + " - Fox Log";
setWindowTitle(m_title_);
ui->header_label->setText(" Date Time Call Grid Sent Rcvd Band");
}
if(nContest>0 and nContest<5) {
m_title_=QApplication::applicationName () + " - Contest Log";
setWindowTitle(m_title_);
ui->header_label->setText(" Date Time Call Grid Sent Rcvd Band");
}
}
void MessageAveraging::contestLogSetup()
{
m_title_=QApplication::applicationName () + " - Contest Log";
setWindowTitle(m_title_); setWindowTitle(m_title_);
ui->header_label->setText(" Date Time Call Grid Sent Rcvd Band"); ui->header_label->setText(" Date Time Call Grid Sent Rcvd Band");
} }

3
messageaveraging.h
View File

@ -17,7 +17,8 @@ public:
~MessageAveraging(); ~MessageAveraging();
void displayAvg(QString const&); void displayAvg(QString const&);
void changeFont (QFont const&); void changeFont (QFont const&);
void foxLogSetup(); void foxLogSetup(int nContest);
void contestLogSetup();
void foxLabCallers(int n); void foxLabCallers(int n);
void foxLabQueued(int n); void foxLabQueued(int n);
void foxLabRate(int n); void foxLabRate(int n);