Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-16 15:41:13 +02:00
Code Issues Projects Releases Wiki Activity

2022-09-17 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added type icons to the 'Source' and 'Destination' columns of
	the events list in rdcatch(1).
	* Removed the 'RSS Feed' column from the event list in rdcatch(1).
	* Consolidated the 'Start Date Offset' and 'End Date Offset'
	columns into a single 'Start/End Date' column in rdcatch(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2022-09-18 16:36:24 -04:00
parent 91245cab19
commit bc3afb352a
3 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -23330,3 +23330,6 @@
* Removed the 'RSS Feed' column from the event list in rdcatch(1).
* Consolidated the 'Start Date Offset' and 'End Date Offset'
columns into a single 'Start/End Date' column in rdcatch(1).
2022-09-18 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdcatch(1) that caused the current status
of events to fail to be indicated properly at startup.

47
rdcatch/recordlistmodel.cpp
View File

@@ -208,8 +208,10 @@ QVariant RecordListModel::data(const QModelIndex &index,int role) const
case Qt::BackgroundRole:
if(d_is_nexts.at(row)) {
printf("NEXT %d: %s\n",row,QColor(EVENT_NEXT_COLOR).name().toUtf8().constData());
return QColor(EVENT_NEXT_COLOR);
}
printf("DEFAULT %d: %s\n",row,d_back_colors.at(row).value<QColor>().name().toUtf8().constData());
return d_back_colors.at(row);
default:
@@ -334,15 +336,12 @@ void RecordListModel::setRecordStatus(unsigned rec_id,RDDeck::Status status)
void RecordListModel::channelCounts(int chan,int *waiting,int *active,
unsigned *rec_id)
{
/*
* FIXME: Do we still need this?
*
*waiting=0;
*active=0;
*rec_id=0;
for(int i=0;i<rowCount();i++) {
if(d_texts.at(i).at(21).toString().toInt()==chan) {
if(d_channels.at(i)==chan) {
switch(d_statuses.at(i)) {
case RDDeck::Waiting:
(*active)++;
@@ -361,7 +360,6 @@ void RecordListModel::channelCounts(int chan,int *waiting,int *active,
}
}
}
*/
}
@@ -383,6 +381,7 @@ QModelIndex RecordListModel::addRecord(unsigned id)
list.push_back(QVariant());
}
d_ids.insert(offset,id);
d_channels.insert(offset,-1);
d_types.insert(offset,RDRecording::Recording);
d_exit_codes.insert(offset,RDRecording::Ok);
d_text_colors.insert(offset,QVariant());
@@ -403,6 +402,7 @@ void RecordListModel::removeRecord(const QModelIndex &row)
beginRemoveRows(QModelIndex(),row.row(),row.row());
d_ids.removeAt(row.row());
d_channels.removeAt(row.row());
d_types.removeAt(row.row());
d_exit_codes.removeAt(row.row());
d_is_nexts.removeAt(row.row());
@@ -535,6 +535,7 @@ void RecordListModel::updateModel(const QString &filter_sql)
sql=sqlFields()+filter_sql;
beginResetModel();
d_ids.clear();
d_channels.clear();
d_types.clear();
d_exit_codes.clear();
d_is_nexts.clear();
@@ -546,6 +547,7 @@ void RecordListModel::updateModel(const QString &filter_sql)
q=new RDSqlQuery(sql);
while(q->next()) {
d_ids.push_back(0);
d_channels.push_back(-1);
d_types.push_back(RDRecording::Recording);
d_exit_codes.push_back(RDRecording::Ok);
d_text_colors.push_back(QVariant());
@@ -587,6 +589,7 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q)
// Event Values
//
d_ids[row]=q->value(0).toUInt();
d_channels[row]=q->value(29).toUInt();
d_types[row]=(RDRecording::Type)q->value(23).toUInt();
d_exit_codes[row]=(RDRecording::ExitCode)q->value(25).toUInt();
@@ -600,6 +603,16 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q)
d_text_colors[row]=QColor(EVENT_INACTIVE_TEXT_COLOR);
}
//
// Qt::BackgroundRole:
//
if(q->value(25).toInt()==0) {
d_back_colors[row]=QVariant();
}
else {
d_back_colors[row]=QColor(EVENT_ERROR_COLOR);
}
//
// Qt::DecorationType
//
@@ -626,7 +639,7 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q)
//
// Universal Attributes
//
texts[0]=q->value(1); // Description
texts[0]=q->value(1); // Description
if(q->value(7).toString()=="Y") { // Sun
texts[7]=tr("Su");
}
@@ -648,8 +661,10 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q)
if(q->value(13).toString()=="Y") { // Sat
texts[13]=tr("Sa");
}
texts[15]=q->value(26).toString(); // One Shot
texts[21]=q->value(0).toString(); // Id
texts[15]=q->value(26).toString(); // One Shot
texts[19]=q->value(41).toString(); // Error Status
texts[20]=QString::asprintf("%d",q->value(25).toInt()); // Error Code
texts[21]=q->value(0).toString(); // Id
//
// Type Specific Attributes
@@ -859,9 +874,7 @@ QString RecordListModel::sqlFields() const
"`FEEDS`.`UPLOAD_SAMPRATE`,"+ // 49
"`FEEDS`.`UPLOAD_BITRATE`,"+ // 50
"`FEEDS`.`UPLOAD_QUALITY`,"+ // 51
"`FEEDS`.`NORMALIZE_LEVEL`,"+ // 52
"`FEEDS`.`NORMALIZE_LEVEL`,"+ // 52
"`FEED_IMAGES`.`DATA` "+ // 53
"from `RECORDINGS` left join `CUTS` "+
"on (`RECORDINGS`.`CUT_NAME`=`CUTS`.`CUT_NAME`) left join `FEEDS` "+
@@ -932,7 +945,10 @@ void RecordListModel::UpdateStatus(int line)
RDRecording::ExitCode code=RDRecording::InternalError;
QString err_text=tr("Unknown");
/*
//
// Get Exit Code And Text
//
QString sql=QString("select ")+
"`RECORDINGS`.`EXIT_CODE`,"+ // 00
"`CUTS`.`ORIGIN_NAME`,"+ // 01
@@ -945,14 +961,9 @@ void RecordListModel::UpdateStatus(int line)
if(q->first()) {
code=(RDRecording::ExitCode)q->value(0).toInt();
err_text=q->value(3).toString();
d_texts[line][15]=q->value(1).toString()+" - "+q->value(2).toDateTime().
toString("M/dd/yyyy hh:mm:ss");
}
else {
d_texts[line][15]="";
}
delete q;
*/
//
// Exit Code/Text
//

1
rdcatch/recordlistmodel.h
View File

@@ -97,6 +97,7 @@ class RecordListModel : public QAbstractTableModel
QList<QVariant> d_alignments;
QList<QList<QVariant> > d_texts;
QList<unsigned> d_ids;
QList<int> d_channels;
QList<RDRecording::Type> d_types;
QList<RDRecording::ExitCode> d_exit_codes;
QList<QVariant> d_text_colors;