Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-12 14:47:44 +02:00
Code Issues Projects Releases Wiki Activity

2022-12-06 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Modified the 'Generate Log' dialog in rdlogmanager(1) to require the
	target service to be selected explicitly.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2022-12-06 16:29:22 -05:00
parent 822351931d
commit dbbeafb388
4 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -23756,3 +23756,6 @@
2022-12-06 Fred Gleason <fredg@paravelsystems.com> 2022-12-06 Fred Gleason <fredg@paravelsystems.com>
* Modified the 'Generate Log' dialog in rdlogmanager(1) to require the * Modified the 'Generate Log' dialog in rdlogmanager(1) to require the
target service to be selected explicitly. target service to be selected explicitly.
2022-12-06 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdlogedit(1) that caused link parameters to
fail to appear in the 'Ext Data' column of the 'Edit Log' dialog.

8
lib/rdlog_line.cpp
View File

@ -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 QString RDLogLine::extEventId() const
{ {
return log_ext_event_id; return log_ext_event_id;

1
lib/rdlog_line.h
View File

@ -209,6 +209,7 @@ class RDLogLine
void setExtCartName(const QString &name); void setExtCartName(const QString &name);
QString extData() const; QString extData() const;
void setExtData(const QString &data); void setExtData(const QString &data);
QString linkSummaryText() const;
QString extEventId() const; QString extEventId() const;
void setExtEventId(const QString &id); void setExtEventId(const QString &id);
QString extAnncType() const; QString extAnncType() const;

19
lib/rdlogmodel.cpp
View File

@ -1135,7 +1135,7 @@ int RDLogModel::LoadLines(const QString &logname,int id_offset,bool track_ptrs)
"`CART`.`PUBLISHER`,"+ // 44 "`CART`.`PUBLISHER`,"+ // 44
"`CART`.`COMPOSER`,"+ // 45 "`CART`.`COMPOSER`,"+ // 45
"`CART`.`USAGE_CODE`,"+ // 46 "`CART`.`USAGE_CODE`,"+ // 46
"`CART`.`AVERAGE_SEGUE_LENGTH`,"+ // 47 "`CART`.`AVERAGE_SEGUE_LENGTH`,"+ // 47
"`LOG_LINES`.`LINK_EVENT_NAME`,"+ // 48 "`LOG_LINES`.`LINK_EVENT_NAME`,"+ // 48
"`LOG_LINES`.`LINK_START_TIME`,"+ // 49 "`LOG_LINES`.`LINK_START_TIME`,"+ // 49
"`LOG_LINES`.`LINK_LENGTH`,"+ // 50 "`LOG_LINES`.`LINK_LENGTH`,"+ // 50
@ -1635,7 +1635,22 @@ QString RDLogModel::cellText(int col,int line,RDLogLine *ll) const
return RDLogLine::sourceText(ll->source()); return RDLogLine::sourceText(ll->source());
case 11: // Ext Data 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 case 12: // Line ID
return QString::asprintf("%d",ll->id()); return QString::asprintf("%d",ll->id());