From dbbeafb3886d2a73a597b4d556cc81ec500d5831 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 6 Dec 2022 16:29:22 -0500 Subject: [PATCH] 2022-12-06 Fred Gleason * Modified the 'Generate Log' dialog in rdlogmanager(1) to require the target service to be selected explicitly. Signed-off-by: Fred Gleason --- ChangeLog | 3 +++ lib/rdlog_line.cpp | 8 ++++++++ lib/rdlog_line.h | 1 + lib/rdlogmodel.cpp | 19 +++++++++++++++++-- 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8dbd826f..af5cb95b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23756,3 +23756,6 @@ 2022-12-06 Fred Gleason * Modified the 'Generate Log' dialog in rdlogmanager(1) to require the target service to be selected explicitly. +2022-12-06 Fred Gleason + * Fixed a regression in rdlogedit(1) that caused link parameters to + fail to appear in the 'Ext Data' column of the 'Edit Log' dialog. diff --git a/lib/rdlog_line.cpp b/lib/rdlog_line.cpp index bef844eb..0599f5b7 100644 --- a/lib/rdlog_line.cpp +++ b/lib/rdlog_line.cpp @@ -1393,6 +1393,14 @@ void RDLogLine::setExtData(const QString &data) } +QString RDLogLine::linkSummaryText() const +{ + return QObject::tr("Name")+": "+linkEventName()+", "+ + QObject::tr("Start")+": "+linkStartTime().toString("hh:mm:ss")+", "+ + QObject::tr("Len")+": "+RDGetTimeLength(linkLength(),false,false); +} + + QString RDLogLine::extEventId() const { return log_ext_event_id; diff --git a/lib/rdlog_line.h b/lib/rdlog_line.h index 92ed8d0d..87406fe8 100644 --- a/lib/rdlog_line.h +++ b/lib/rdlog_line.h @@ -209,6 +209,7 @@ class RDLogLine void setExtCartName(const QString &name); QString extData() const; void setExtData(const QString &data); + QString linkSummaryText() const; QString extEventId() const; void setExtEventId(const QString &id); QString extAnncType() const; diff --git a/lib/rdlogmodel.cpp b/lib/rdlogmodel.cpp index 0f9004b0..509892c4 100644 --- a/lib/rdlogmodel.cpp +++ b/lib/rdlogmodel.cpp @@ -1135,7 +1135,7 @@ int RDLogModel::LoadLines(const QString &logname,int id_offset,bool track_ptrs) "`CART`.`PUBLISHER`,"+ // 44 "`CART`.`COMPOSER`,"+ // 45 "`CART`.`USAGE_CODE`,"+ // 46 - "`CART`.`AVERAGE_SEGUE_LENGTH`,"+ // 47 + "`CART`.`AVERAGE_SEGUE_LENGTH`,"+ // 47 "`LOG_LINES`.`LINK_EVENT_NAME`,"+ // 48 "`LOG_LINES`.`LINK_START_TIME`,"+ // 49 "`LOG_LINES`.`LINK_LENGTH`,"+ // 50 @@ -1635,7 +1635,22 @@ QString RDLogModel::cellText(int col,int line,RDLogLine *ll) const return RDLogLine::sourceText(ll->source()); case 11: // Ext Data - return ll->extData(); + switch(ll->type()) { + case RDLogLine::MusicLink: + case RDLogLine::TrafficLink: + return ll->linkSummaryText(); + + case RDLogLine::Cart: + case RDLogLine::Marker: + case RDLogLine::Macro: + case RDLogLine::OpenBracket: + case RDLogLine::CloseBracket: + case RDLogLine::Chain: + case RDLogLine::Track: + case RDLogLine::UnknownType: + return ll->extData(); + } + break; case 12: // Line ID return QString::asprintf("%d",ll->id());