chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added telephone icon for CQs. Added tooltip for last logged date

Browse Source
This commit is contained in:
Jordan Sherer 2019-03-23 21:19:24 -04:00
parent d8a16f4a42
commit ee48d8fd86
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mainwindow.cpp
View File

@ -4153,8 +4153,9 @@ void MainWindow::readFromStdout() //readFromStdout
// Only respond to HEARTBEATS...remember that CQ messages are "Alt" pings // Only respond to HEARTBEATS...remember that CQ messages are "Alt" pings
if(decodedtext.isHeartbeat()){ if(decodedtext.isHeartbeat()){
if(decodedtext.isAlt()){ if(decodedtext.isAlt()){
// this is a cq with a standard or compound call, ala "KN4CRD/P: CQCQCQ"
cd.cqTimestamp = DriftingDateTime::currentDateTimeUtc();
// this is a cq with a compound call, ala "KN4CRD/P: CQCQCQ"
// it is not processed elsewhere, so we need to just log it here. // it is not processed elsewhere, so we need to just log it here.
logCallActivity(cd, true); logCallActivity(cd, true);
@ -4457,6 +4458,9 @@ void MainWindow::logCallActivity(CallDetail d, bool spot){
if(!d.ackTimestamp.isValid() && old.ackTimestamp.isValid()){ if(!d.ackTimestamp.isValid() && old.ackTimestamp.isValid()){
d.ackTimestamp = old.ackTimestamp; d.ackTimestamp = old.ackTimestamp;
} }
if(!d.cqTimestamp.isValid() && old.cqTimestamp.isValid()){
d.cqTimestamp = old.cqTimestamp;
}
m_callActivity[d.call] = d; m_callActivity[d.call] = d;
} else { } else {
// create // create
@ -11239,7 +11243,8 @@ void MainWindow::displayCallActivity() {
// icon flags (flag -> star -> empty) // icon flags (flag -> star -> empty)
bool hasMessage = m_rxInboxCountCache.value(d.call, 0) > 0; bool hasMessage = m_rxInboxCountCache.value(d.call, 0) > 0;
bool hasAck = d.ackTimestamp.isValid(); bool hasCQ = d.cqTimestamp.isValid();
bool hasACK = d.ackTimestamp.isValid();
if (!isCallSelected && !hasMessage && callsignAging && d.utcTimestamp.secsTo(now) / 60 >= callsignAging) { if (!isCallSelected && !hasMessage && callsignAging && d.utcTimestamp.secsTo(now) / 60 >= callsignAging) {
continue; continue;
@ -11259,11 +11264,11 @@ void MainWindow::displayCallActivity() {
auto iconItem = new QTableWidgetItem(hasMessage ? "\u2691" : hasAck ? "\u2605" : ""); auto iconItem = new QTableWidgetItem(hasMessage ? "\u2691" : hasACK ? "\u2605" : hasCQ ? "\u260E" : "");
iconItem->setData(Qt::UserRole, QVariant((d.call))); iconItem->setData(Qt::UserRole, QVariant(d.call));
iconItem->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); iconItem->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
ui->tableWidgetCalls->setItem(row, col++, iconItem); ui->tableWidgetCalls->setItem(row, col++, iconItem);
if(hasMessage || hasAck){ if(hasMessage || hasACK || hasCQ){
showIconColumn = true; showIconColumn = true;
} }
@ -11272,7 +11277,11 @@ void MainWindow::displayCallActivity() {
displayItem->setToolTip(generateCallDetail(displayCall)); displayItem->setToolTip(generateCallDetail(displayCall));
ui->tableWidgetCalls->setItem(row, col++, displayItem); ui->tableWidgetCalls->setItem(row, col++, displayItem);
if(1){ //d.utcTimestamp.isValid()){ #if ONLY_SHOW_HEARD_CALLSIGNS
if(d.utcTimestamp.isValid()){
#else
if(true){
#endif
auto ageItem = new QTableWidgetItem(since(d.utcTimestamp)); auto ageItem = new QTableWidgetItem(since(d.utcTimestamp));
ageItem->setTextAlignment(Qt::AlignCenter | Qt::AlignVCenter); ageItem->setTextAlignment(Qt::AlignCenter | Qt::AlignVCenter);
ageItem->setToolTip(d.utcTimestamp.toString()); ageItem->setToolTip(d.utcTimestamp.toString());
@ -11312,6 +11321,12 @@ void MainWindow::displayCallActivity() {
m_logBook.findCallDetails(d.call, logDetailDate, logDetailName, logDetailComment); m_logBook.findCallDetails(d.call, logDetailDate, logDetailName, logDetailComment);
} }
if(!logDetailDate.isEmpty()){
auto lastLogged = QDate::fromString(logDetailDate, "yyyyMMdd");
workedBeforeItem->setToolTip(QString("Last Logged: %1").arg(lastLogged.toString()));
}
auto logNameItem = new QTableWidgetItem(logDetailName); auto logNameItem = new QTableWidgetItem(logDetailName);
logNameItem->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); logNameItem->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
ui->tableWidgetCalls->setItem(row, col++, logNameItem); ui->tableWidgetCalls->setItem(row, col++, logNameItem);

1
mainwindow.h
View File

@ -713,6 +713,7 @@ private:
QString through; QString through;
QString grid; QString grid;
int freq; int freq;
QDateTime cqTimestamp;
QDateTime ackTimestamp; QDateTime ackTimestamp;
QDateTime utcTimestamp; QDateTime utcTimestamp;
int snr; int snr;