Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-09-09 08:53:20 +02:00
Code Issues Projects Releases Wiki Activity

2018-03-24 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Regularized code formatting for switch() statements in
	'rdlogedit/'.
This commit is contained in:
Fred Gleason 2018-03-24 16:52:26 -04:00
parent af0ac339a6
commit 2ed3bb6557
10 changed files with 1204 additions and 1222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -16737,3 +16737,6 @@
* Added a 'LogType' value to the 'RDNotification::Type
enumeration.
* Added support for notifications to rdlogedit(1).
2018-03-24 Fred Gleason <fredg@paravelsystems.com>
* Regularized code formatting for switch() statements in
'rdlogedit/'.

64
rdlogedit/edit_chain.cpp
View File

@ -179,22 +179,21 @@ EditChain::EditChain(RDLogLine *line,QWidget *parent)
}
timeChangedData(edit_time_edit->time());
switch(edit_logline->graceTime()) {
case -1:
edit_grace_group->setButton(1);
graceClickedData(1);
break;
case -1:
edit_grace_group->setButton(1);
graceClickedData(1);
break;
case 0:
edit_grace_group->setButton(0);
graceClickedData(0);
break;
case 0:
edit_grace_group->setButton(0);
graceClickedData(0);
break;
default:
edit_grace_group->setButton(2);
edit_grace_box->setTime(QTime().addMSecs(edit_logline->graceTime()));
//edit_grace_box->setValue(edit_logline->graceTime());
graceClickedData(2);
break;
default:
edit_grace_group->setButton(2);
edit_grace_box->setTime(QTime().addMSecs(edit_logline->graceTime()));
graceClickedData(2);
break;
}
edit_transtype_box->setCurrentItem(edit_logline->transType());
edit_label_edit->setText(edit_logline->markerLabel());
@ -257,17 +256,17 @@ void EditChain::timeToggledData(bool state)
void EditChain::graceClickedData(int id)
{
switch(id) {
case 0:
edit_grace_box->setDisabled(true);
break;
case 0:
edit_grace_box->setDisabled(true);
break;
case 1:
edit_grace_box->setDisabled(true);
break;
case 1:
edit_grace_box->setDisabled(true);
break;
case 2:
edit_grace_box->setEnabled(true);
break;
case 2:
edit_grace_box->setEnabled(true);
break;
}
}
@ -324,18 +323,17 @@ void EditChain::okData()
edit_logline->setTimeType(RDLogLine::Hard);
edit_logline->setStartTime(RDLogLine::Logged,edit_time_edit->time());
switch(edit_grace_group->selectedId()) {
case 0:
edit_logline->setGraceTime(0);
break;
case 0:
edit_logline->setGraceTime(0);
break;
case 1:
edit_logline->setGraceTime(-1);
break;
case 1:
edit_logline->setGraceTime(-1);
break;
case 2:
edit_logline->setGraceTime(QTime().msecsTo(edit_grace_box->time()));
//edit_logline->setGraceTime(edit_grace_box->value());
break;
case 2:
edit_logline->setGraceTime(QTime().msecsTo(edit_grace_box->time()));
break;
}
}
else {

598
rdlogedit/edit_log.cpp
View File

@ -797,55 +797,55 @@ void EditLog::insertMarkerButtonData()
id=item->text(13).toInt();
AddMeta *meta=new AddMeta(this);
switch((RDLogLine::Type)meta->exec()) {
case RDLogLine::Marker:
edit_log_event->insert(line,1);
edit_log_event->logLine(line)->setType(RDLogLine::Marker);
edit_marker=new EditMarker(edit_log_event->logLine(line),this);
ret=edit_marker->exec();
if(ret>=0) {
edit_log_event->refresh(line);
SetLogModified(true);
}
else {
edit_log_event->remove(line,1);
}
delete edit_marker;
break;
case RDLogLine::Marker:
edit_log_event->insert(line,1);
edit_log_event->logLine(line)->setType(RDLogLine::Marker);
edit_marker=new EditMarker(edit_log_event->logLine(line),this);
ret=edit_marker->exec();
if(ret>=0) {
edit_log_event->refresh(line);
SetLogModified(true);
}
else {
edit_log_event->remove(line,1);
}
delete edit_marker;
break;
case RDLogLine::Track:
edit_log_event->insert(line,1);
edit_log_event->logLine(line)->setType(RDLogLine::Track);
edit_log_event->logLine(line)->setTransType(RDLogLine::Segue);
edit_log_event->logLine(line)->setMarkerComment(tr("Voice Track"));
edit_track=new EditTrack(edit_log_event->logLine(line),this);
ret=edit_track->exec();
if(ret>=0) {
edit_log_event->refresh(line);
SetLogModified(true);
}
else {
edit_log_event->remove(line,1);
}
delete edit_track;
break;
case RDLogLine::Track:
edit_log_event->insert(line,1);
edit_log_event->logLine(line)->setType(RDLogLine::Track);
edit_log_event->logLine(line)->setTransType(RDLogLine::Segue);
edit_log_event->logLine(line)->setMarkerComment(tr("Voice Track"));
edit_track=new EditTrack(edit_log_event->logLine(line),this);
ret=edit_track->exec();
if(ret>=0) {
edit_log_event->refresh(line);
SetLogModified(true);
}
else {
edit_log_event->remove(line,1);
}
delete edit_track;
break;
case RDLogLine::Chain:
edit_log_event->insert(line,1);
edit_log_event->logLine(line)->setType(RDLogLine::Chain);
edit_chain=new EditChain(edit_log_event->logLine(line),this);
ret=edit_chain->exec();
if(ret>=0) {
edit_log_event->refresh(line);
SetLogModified(true);
}
else {
edit_log_event->remove(line,1);
}
delete edit_chain;
break;
case RDLogLine::Chain:
edit_log_event->insert(line,1);
edit_log_event->logLine(line)->setType(RDLogLine::Chain);
edit_chain=new EditChain(edit_log_event->logLine(line),this);
ret=edit_chain->exec();
if(ret>=0) {
edit_log_event->refresh(line);
SetLogModified(true);
}
else {
edit_log_event->remove(line,1);
}
delete edit_chain;
break;
default:
break;
default:
break;
}
RefreshList();
UpdateTracks();
@ -903,45 +903,45 @@ void EditLog::editButtonData()
return;
}
switch(edit_log_event->logLine(line)->type()) {
case RDLogLine::Cart:
case RDLogLine::Macro:
edit_cart=
new EditLogLine(edit_log_event->logLine(line),edit_filter,edit_group,
edit_schedcode,edit_service_box->currentText(),
&edit_group_list,edit_log_event,line,this);
if(edit_cart->exec()>=0) {
edit_log_event->refresh(item->text(14).toInt());
SetLogModified(true);
}
delete edit_cart;
break;
case RDLogLine::Cart:
case RDLogLine::Macro:
edit_cart=
new EditLogLine(edit_log_event->logLine(line),edit_filter,edit_group,
edit_schedcode,edit_service_box->currentText(),
&edit_group_list,edit_log_event,line,this);
if(edit_cart->exec()>=0) {
edit_log_event->refresh(item->text(14).toInt());
SetLogModified(true);
}
delete edit_cart;
break;
case RDLogLine::Marker:
edit_marker=new EditMarker(edit_log_event->logLine(line),this);
if(edit_marker->exec()>=0) {
SetLogModified(true);
}
delete edit_marker;
break;
case RDLogLine::Marker:
edit_marker=new EditMarker(edit_log_event->logLine(line),this);
if(edit_marker->exec()>=0) {
SetLogModified(true);
}
delete edit_marker;
break;
case RDLogLine::Track:
edit_track=new EditTrack(edit_log_event->logLine(line),this);
if(edit_track->exec()>=0) {
SetLogModified(true);
}
delete edit_track;
break;
case RDLogLine::Track:
edit_track=new EditTrack(edit_log_event->logLine(line),this);
if(edit_track->exec()>=0) {
SetLogModified(true);
}
delete edit_track;
break;
case RDLogLine::Chain:
edit_chain=new EditChain(edit_log_event->logLine(line),this);
if(edit_chain->exec()>=0) {
SetLogModified(true);
}
delete edit_chain;
break;
case RDLogLine::Chain:
edit_chain=new EditChain(edit_log_event->logLine(line),this);
if(edit_chain->exec()>=0) {
SetLogModified(true);
}
delete edit_chain;
break;
default:
break;
default:
break;
}
RefreshList();
SelectRecord(id);
@ -1252,23 +1252,23 @@ void EditLog::cancelData()
{
if(edit_changed) {
switch(QMessageBox::question(this,
tr("RDLogEdit"),
tr("The log has been modified.\nDo you want to save your changes?"),
tr("RDLogEdit"),
tr("The log has been modified.\nDo you want to save your changes?"),
QMessageBox::Yes,QMessageBox::No,
QMessageBox::Cancel)) {
case QMessageBox::Yes:
if(!ValidateSvc()) {
QMessageBox::warning(this,tr("Invalid Carts"),
tr("The log contains carts that are disabled\nfor the selected service!"));
case QMessageBox::Yes:
if(!ValidateSvc()) {
QMessageBox::warning(this,tr("Invalid Carts"),
tr("The log contains carts that are disabled\nfor the selected service!"));
return;
}
SaveLog();
break;
}
SaveLog();
break;
case QMessageBox::Cancel:
case QMessageBox::NoButton:
return;
break;
case QMessageBox::Cancel:
case QMessageBox::NoButton:
return;
break;
}
}
#ifndef WIN32
@ -1441,198 +1441,186 @@ void EditLog::RefreshLine(RDListViewItem *item)
edit_log_event->refresh(line);
RDLogLine *logline=edit_log_event->logLine(line);
switch(logline->timeType()) {
case RDLogLine::Hard:
item->setText(1,QString("T")+edit_log_event->
logLine(line)->startTime(RDLogLine::Logged).
toString("hh:mm:ss.zzz").left(10));
break;
case RDLogLine::Hard:
item->setText(1,QString("T")+edit_log_event->
logLine(line)->startTime(RDLogLine::Logged).
toString("hh:mm:ss.zzz").left(10));
break;
default:
if(logline->
startTime(RDLogLine::Predicted).isNull()) {
item->setText(1,edit_log_event->
blockStartTime(line).
toString("hh:mm:ss.zzz").left(10));
}
else {
item->setText(1,edit_log_event->
logLine(line)->startTime(RDLogLine::Predicted).
toString("hh:mm:ss.zzz").left(10));
}
/*
if(logline->
startTime(RDLogLine::Logged).isNull()) {
item->setText(1,edit_log_event->
blockStartTime(line).
toString("hh:mm:ss.zzz").left(10));
}
else {
item->setText(1,edit_log_event->
logLine(line)->startTime(RDLogLine::Logged).
toString("hh:mm:ss.zzz").left(10));
}
*/
break;
default:
if(logline->
startTime(RDLogLine::Predicted).isNull()) {
item->setText(1,edit_log_event->
blockStartTime(line).
toString("hh:mm:ss.zzz").left(10));
}
else {
item->setText(1,edit_log_event->
logLine(line)->startTime(RDLogLine::Predicted).
toString("hh:mm:ss.zzz").left(10));
}
break;
}
switch(logline->transType()) {
case RDLogLine::Play:
item->setText(2,tr("PLAY"));
item->setTextColor(2,item->textColor(1),QFont::Normal);
break;
case RDLogLine::Stop:
item->setText(2,tr("STOP"));
item->setTextColor(2,item->textColor(1),QFont::Normal);
break;
case RDLogLine::Segue:
item->setText(2,tr("SEGUE"));
if(logline->hasCustomTransition()) {
item->setTextColor(2,RD_CUSTOM_TRANSITION_COLOR,QFont::Bold);
}
else {
item->setTextColor(2,item->textColor(1),QFont::Normal);
}
break;
case RDLogLine::Play:
item->setText(2,tr("PLAY"));
item->setTextColor(2,item->textColor(1),QFont::Normal);
break;
default:
break;
case RDLogLine::Stop:
item->setText(2,tr("STOP"));
item->setTextColor(2,item->textColor(1),QFont::Normal);
break;
case RDLogLine::Segue:
item->setText(2,tr("SEGUE"));
if(logline->hasCustomTransition()) {
item->setTextColor(2,RD_CUSTOM_TRANSITION_COLOR,QFont::Bold);
}
else {
item->setTextColor(2,item->textColor(1),QFont::Normal);
}
break;
default:
break;
}
switch(logline->type()) {
case RDLogLine::Cart:
switch(logline->source()) {
case RDLogLine::Tracker:
item->setPixmap(0,*edit_track_cart_map);
break;
case RDLogLine::Cart:
switch(logline->source()) {
case RDLogLine::Tracker:
item->setPixmap(0,*edit_track_cart_map);
break;
default:
item->setPixmap(0,*edit_playout_map);
break;
}
item->setText(3,QString().
sprintf("%06u",logline->cartNumber()));
if(logline->title().isEmpty()) {
item->setText(4,"");
item->setText(5,tr("[cart not found]"));
}
else {
item->setText(4,logline->groupName());
item->setTextColor(4,logline->groupColor(),QFont::Bold);
if((logline->source()!=RDLogLine::Tracker)||
logline->originUser().isEmpty()||
(!logline->originDateTime().isValid())) {
item->setText(6,logline->title());
}
else {
item->setText(6,QString().
sprintf("%s -- %s %s",
(const char *)logline->title(),
(const char *)logline->originUser(),
(const char *)logline->originDateTime().
toString("M/d hh:mm")));
}
}
item->
setText(5,RDGetTimeLength(logline->forcedLength(),false,false));
item->setText(7,logline->artist());
item->setText(8,logline->client());
item->setText(9,logline->agency());
item->setText(12,logline->extData());
break;
default:
item->setPixmap(0,*edit_playout_map);
break;
}
item->setText(3,QString().
sprintf("%06u",logline->cartNumber()));
if(logline->title().isEmpty()) {
item->setText(4,"");
item->setText(5,tr("[cart not found]"));
}
else {
item->setText(4,logline->groupName());
item->setTextColor(4,logline->groupColor(),QFont::Bold);
if((logline->source()!=RDLogLine::Tracker)||
logline->originUser().isEmpty()||
(!logline->originDateTime().isValid())) {
item->setText(6,logline->title());
}
else {
item->setText(6,QString().
sprintf("%s -- %s %s",
(const char *)logline->title(),
(const char *)logline->originUser(),
(const char *)logline->originDateTime().
toString("M/d hh:mm")));
}
}
item->
setText(5,RDGetTimeLength(logline->forcedLength(),false,false));
item->setText(7,logline->artist());
item->setText(8,logline->client());
item->setText(9,logline->agency());
item->setText(12,logline->extData());
break;
case RDLogLine::Macro:
item->setPixmap(0,*edit_macro_map);
item->setText(3,QString().
sprintf("%06u",logline->cartNumber()));
if(logline->title().isEmpty()) {
item->setText(4,"");
item->setText(6,tr("[cart not found]"));
}
else {
item->setText(4,logline->groupName());
item->setTextColor(4,logline->groupColor(),QFont::Bold);
item->setText(6,logline->title());
}
item->
setText(5,RDGetTimeLength(logline->forcedLength(),false,false));
item->setText(7,logline->artist());
item->setText(8,logline->client());
item->setText(9,logline->agency());
item->setText(12,logline->extData());
break;
case RDLogLine::Macro:
item->setPixmap(0,*edit_macro_map);
item->setText(3,QString().
sprintf("%06u",logline->cartNumber()));
if(logline->title().isEmpty()) {
item->setText(4,"");
item->setText(6,tr("[cart not found]"));
}
else {
item->setText(4,logline->groupName());
item->setTextColor(4,logline->groupColor(),QFont::Bold);
item->setText(6,logline->title());
}
item->setText(5,RDGetTimeLength(logline->forcedLength(),false,false));
item->setText(7,logline->artist());
item->setText(8,logline->client());
item->setText(9,logline->agency());
item->setText(12,logline->extData());
break;
case RDLogLine::Marker:
item->setPixmap(0,*edit_notemarker_map);
item->setText(3,tr("MARKER"));
item->setText(4,"");
item->setText(6,RDTruncateAfterWord(edit_log_event->
logLine(line)->markerComment(),5,true));
item->setText(10,logline->markerLabel());
item->setText(12,logline->extData());
break;
case RDLogLine::Marker:
item->setPixmap(0,*edit_notemarker_map);
item->setText(3,tr("MARKER"));
item->setText(4,"");
item->setText(6,RDTruncateAfterWord(edit_log_event->
logLine(line)->markerComment(),5,true));
item->setText(10,logline->markerLabel());
item->setText(12,logline->extData());
break;
case RDLogLine::Track:
item->setPixmap(0,*edit_mic16_map);
item->setText(3,tr("TRACK"));
item->setText(4,"");
item->setText(6,RDTruncateAfterWord(edit_log_event->
logLine(line)->markerComment(),5,true));
item->setText(12,logline->extData());
break;
case RDLogLine::Track:
item->setPixmap(0,*edit_mic16_map);
item->setText(3,tr("TRACK"));
item->setText(4,"");
item->setText(6,RDTruncateAfterWord(edit_log_event->
logLine(line)->markerComment(),5,true));
item->setText(12,logline->extData());
break;
case RDLogLine::Chain:
item->setPixmap(0,*edit_chain_map);
item->setText(3,tr("LOG CHAIN"));
item->setText(4,"");
item->setText(6,logline->markerLabel());
item->setText(7,RDTruncateAfterWord(edit_log_event->
logLine(line)->markerComment(),5,true));
item->setText(12,logline->extData());
break;
case RDLogLine::Chain:
item->setPixmap(0,*edit_chain_map);
item->setText(3,tr("LOG CHAIN"));
item->setText(4,"");
item->setText(6,logline->markerLabel());
item->setText(7,RDTruncateAfterWord(edit_log_event->
logLine(line)->markerComment(),5,true));
item->setText(12,logline->extData());
break;
case RDLogLine::MusicLink:
item->setPixmap(0,*edit_music_map);
item->setText(3,tr("LINK"));
item->setText(4,"");
item->setText(6,tr("[music import]"));
item->setText(12,tr("Link Start")+": "+
logline->linkStartTime().toString("hh:mm:ss")+", "+
tr("Len")+": "+
RDGetTimeLength(logline->linkLength(),false,false));
break;
case RDLogLine::MusicLink:
item->setPixmap(0,*edit_music_map);
item->setText(3,tr("LINK"));
item->setText(4,"");
item->setText(6,tr("[music import]"));
item->setText(12,tr("Link Start")+": "+
logline->linkStartTime().toString("hh:mm:ss")+", "+
tr("Len")+": "+
RDGetTimeLength(logline->linkLength(),false,false));
break;
case RDLogLine::TrafficLink:
item->setPixmap(0,*edit_traffic_map);
item->setText(3,tr("LINK"));
item->setText(4,"");
item->setText(6,tr("[traffic import]"));
item->setText(12,tr("Link Start")+": "+
logline->linkStartTime().toString("hh:mm:ss")+", "+
tr("Len")+": "+
RDGetTimeLength(logline->linkLength(),false,false));
break;
case RDLogLine::TrafficLink:
item->setPixmap(0,*edit_traffic_map);
item->setText(3,tr("LINK"));
item->setText(4,"");
item->setText(6,tr("[traffic import]"));
item->setText(12,tr("Link Start")+": "+
logline->linkStartTime().toString("hh:mm:ss")+", "+
tr("Len")+": "+
RDGetTimeLength(logline->linkLength(),false,false));
break;
default:
break;
default:
break;
}
switch(logline->source()) {
case RDLogLine::Manual:
item->setText(11,tr("Manual"));
break;
case RDLogLine::Manual:
item->setText(11,tr("Manual"));
break;
case RDLogLine::Traffic:
item->setText(11,tr("Traffic"));
break;
case RDLogLine::Traffic:
item->setText(11,tr("Traffic"));
break;
case RDLogLine::Music:
item->setText(11,tr("Music"));
break;
case RDLogLine::Music:
item->setText(11,tr("Music"));
break;
case RDLogLine::Template:
item->setText(11,tr("RDLogManager"));
break;
case RDLogLine::Template:
item->setText(11,tr("RDLogManager"));
break;
case RDLogLine::Tracker:
item->setText(11,tr("Voice Tracker"));
break;
case RDLogLine::Tracker:
item->setText(11,tr("Voice Tracker"));
break;
}
item->setText(13,QString().sprintf("%d",logline->id()));
UpdateColor(item,logline);
@ -1707,50 +1695,50 @@ bool EditLog::UpdateColor(RDListViewItem *item,RDLogLine *logline)
QDateTime now=QDateTime(QDate::currentDate(),QTime::currentTime());
switch(logline->type()) {
case RDLogLine::Cart:
switch(logline->validity(now)) {
case RDCart::AlwaysValid:
if(edit_group_list.isGroupValid(item->text(4))||
item->text(4).isEmpty()) {
item->setBackgroundColor(palette().color(QPalette::Active,
QColorGroup::Base));
}
else {
item->setBackgroundColor(RD_CART_INVALID_SERVICE_COLOR);
ret=false;
}
break;
case RDLogLine::Cart:
switch(logline->validity(now)) {
case RDCart::AlwaysValid:
if(edit_group_list.isGroupValid(item->text(4))||
item->text(4).isEmpty()) {
item->setBackgroundColor(palette().color(QPalette::Active,
QColorGroup::Base));
}
else {
item->setBackgroundColor(RD_CART_INVALID_SERVICE_COLOR);
ret=false;
}
break;
case RDCart::ConditionallyValid:
item->setBackgroundColor(RD_CART_CONDITIONAL_COLOR);
break;
case RDCart::ConditionallyValid:
item->setBackgroundColor(RD_CART_CONDITIONAL_COLOR);
break;
case RDCart::FutureValid:
item->setBackgroundColor(RD_CART_FUTURE_COLOR);
break;
case RDCart::FutureValid:
item->setBackgroundColor(RD_CART_FUTURE_COLOR);
break;
case RDCart::EvergreenValid:
item->setBackgroundColor(RD_CART_EVERGREEN_COLOR);
break;
case RDCart::EvergreenValid:
item->setBackgroundColor(RD_CART_EVERGREEN_COLOR);
break;
case RDCart::NeverValid:
item->setBackgroundColor(RD_CART_ERROR_COLOR);
item->setText(6,tr("[INVALID CART]"));
break;
}
break;
case RDCart::NeverValid:
item->setBackgroundColor(RD_CART_ERROR_COLOR);
item->setText(6,tr("[INVALID CART]"));
break;
}
break;
default:
if(edit_group_list.isGroupValid(item->text(4))||
item->text(4).isEmpty()) {
item->setBackgroundColor(palette().color(QPalette::Active,
QColorGroup::Base));
}
else {
item->setBackgroundColor(RD_CART_INVALID_SERVICE_COLOR);
ret=false;
}
break;
default:
if(edit_group_list.isGroupValid(item->text(4))||
item->text(4).isEmpty()) {
item->setBackgroundColor(palette().color(QPalette::Active,
QColorGroup::Base));
}
else {
item->setBackgroundColor(RD_CART_INVALID_SERVICE_COLOR);
ret=false;
}
break;
}
return ret;
}

62
rdlogedit/edit_logline.cpp
View File

@ -214,21 +214,21 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group,
}
timeChangedData(edit_time_edit->time());
switch(edit_logline->graceTime()) {
case -1:
edit_grace_group->setButton(1);
graceClickedData(1);
break;
case -1:
edit_grace_group->setButton(1);
graceClickedData(1);
break;
case 0:
edit_grace_group->setButton(0);
graceClickedData(0);
break;
case 0:
edit_grace_group->setButton(0);
graceClickedData(0);
break;
default:
edit_grace_group->setButton(2);
graceClickedData(2);
edit_grace_edit->setTime(QTime().addMSecs(edit_logline->graceTime()));
break;
default:
edit_grace_group->setButton(2);
graceClickedData(2);
edit_grace_edit->setTime(QTime().addMSecs(edit_logline->graceTime()));
break;
}
edit_transtype_box->setCurrentItem(edit_logline->transType());
if(edit_logline->segueStartPoint(RDLogLine::LogPointer)<0
@ -322,17 +322,17 @@ void EditLogLine::timeToggledData(bool state)
void EditLogLine::graceClickedData(int id)
{
switch(id) {
case 0:
edit_grace_edit->setDisabled(true);
break;
case 0:
edit_grace_edit->setDisabled(true);
break;
case 1:
edit_grace_edit->setDisabled(true);
break;
case 1:
edit_grace_edit->setDisabled(true);
break;
case 2:
edit_grace_edit->setEnabled(true);
break;
case 2:
edit_grace_edit->setEnabled(true);
break;
}
}
@ -364,17 +364,17 @@ void EditLogLine::okData()
edit_logline->setTimeType(RDLogLine::Hard);
edit_logline->setStartTime(RDLogLine::Logged,edit_time_edit->time());
switch(edit_grace_group->selectedId()) {
case 0:
edit_logline->setGraceTime(0);
break;
case 0:
edit_logline->setGraceTime(0);
break;
case 1:
edit_logline->setGraceTime(-1);
break;
case 1:
edit_logline->setGraceTime(-1);
break;
case 2:
edit_logline->setGraceTime(QTime().msecsTo(edit_grace_edit->time()));
break;
case 2:
edit_logline->setGraceTime(QTime().msecsTo(edit_grace_edit->time()));
break;
}
}
else {

64
rdlogedit/edit_marker.cpp
View File

@ -161,22 +161,21 @@ EditMarker::EditMarker(RDLogLine *line,QWidget *parent)
}
timeChangedData(edit_time_edit->time());
switch(edit_logline->graceTime()) {
case -1:
edit_grace_group->setButton(1);
graceClickedData(1);
break;
case -1:
edit_grace_group->setButton(1);
graceClickedData(1);
break;
case 0:
edit_grace_group->setButton(0);
graceClickedData(0);
break;
case 0:
edit_grace_group->setButton(0);
graceClickedData(0);
break;
default:
edit_grace_group->setButton(2);
edit_grace_box->setTime(QTime().addMSecs(edit_logline->graceTime()));
//edit_grace_box->setValue(edit_logline->graceTime());
graceClickedData(2);
break;
default:
edit_grace_group->setButton(2);
edit_grace_box->setTime(QTime().addMSecs(edit_logline->graceTime()));
graceClickedData(2);
break;
}
edit_transtype_box->setCurrentItem(edit_logline->transType());
edit_comment_edit->setText(edit_logline->markerComment());
@ -239,17 +238,17 @@ void EditMarker::timeToggledData(bool state)
void EditMarker::graceClickedData(int id)
{
switch(id) {
case 0:
edit_grace_box->setDisabled(true);
break;
case 0:
edit_grace_box->setDisabled(true);
break;
case 1:
edit_grace_box->setDisabled(true);
break;
case 1:
edit_grace_box->setDisabled(true);
break;
case 2:
edit_grace_box->setEnabled(true);
break;
case 2:
edit_grace_box->setEnabled(true);
break;
}
}
@ -274,18 +273,17 @@ void EditMarker::okData()
edit_logline->setTimeType(RDLogLine::Hard);
edit_logline->setStartTime(RDLogLine::Logged,edit_time_edit->time());
switch(edit_grace_group->selectedId()) {
case 0:
edit_logline->setGraceTime(0);
break;
case 0:
edit_logline->setGraceTime(0);
break;
case 1:
edit_logline->setGraceTime(-1);
break;
case 1:
edit_logline->setGraceTime(-1);
break;
case 2:
edit_logline->setGraceTime(QTime().msecsTo(edit_grace_box->time()));
//edit_logline->setGraceTime(edit_grace_box->value());
break;
case 2:
edit_logline->setGraceTime(QTime().msecsTo(edit_grace_box->time()));
break;
}
}
else {

64
rdlogedit/edit_track.cpp
View File

@ -151,22 +151,21 @@ EditTrack::EditTrack(RDLogLine *line,QWidget *parent)
}
timeChangedData(edit_time_edit->time());
switch(edit_logline->graceTime()) {
case -1:
edit_grace_group->setButton(1);
graceClickedData(1);
break;
case -1:
edit_grace_group->setButton(1);
graceClickedData(1);
break;
case 0:
edit_grace_group->setButton(0);
graceClickedData(0);
break;
case 0:
edit_grace_group->setButton(0);
graceClickedData(0);
break;
default:
edit_grace_group->setButton(2);
edit_grace_box->setTime(QTime().addMSecs(edit_logline->graceTime()));
//edit_grace_box->setValue(edit_logline->graceTime());
graceClickedData(2);
break;
default:
edit_grace_group->setButton(2);
edit_grace_box->setTime(QTime().addMSecs(edit_logline->graceTime()));
graceClickedData(2);
break;
}
edit_transtype_box->setCurrentItem(edit_logline->transType());
edit_comment_edit->setText(edit_logline->markerComment());
@ -228,17 +227,17 @@ void EditTrack::timeToggledData(bool state)
void EditTrack::graceClickedData(int id)
{
switch(id) {
case 0:
edit_grace_box->setDisabled(true);
break;
case 0:
edit_grace_box->setDisabled(true);
break;
case 1:
edit_grace_box->setDisabled(true);
break;
case 1:
edit_grace_box->setDisabled(true);
break;
case 2:
edit_grace_box->setEnabled(true);
break;
case 2:
edit_grace_box->setEnabled(true);
break;
}
}
@ -263,18 +262,17 @@ void EditTrack::okData()
edit_logline->setTimeType(RDLogLine::Hard);
edit_logline->setStartTime(RDLogLine::Logged,edit_time_edit->time());
switch(edit_grace_group->selectedId()) {
case 0:
edit_logline->setGraceTime(0);
break;
case 0:
edit_logline->setGraceTime(0);
break;
case 1:
edit_logline->setGraceTime(-1);
break;
case 1:
edit_logline->setGraceTime(-1);
break;
case 2:
edit_logline->setGraceTime(QTime().msecsTo(edit_grace_box->time()));
//edit_logline->setGraceTime(edit_grace_box->value());
break;
case 2:
edit_logline->setGraceTime(QTime().msecsTo(edit_grace_box->time()));
break;
}
}
else {

12
rdlogedit/import_track.cpp
View File

@ -184,12 +184,12 @@ void ImportTrack::cancelData()
void ImportTrack::keyPressEvent(QKeyEvent *e)
{
switch(e->key()) {
case Qt::Key_Escape:
cancelData();
break;
case Qt::Key_Escape:
cancelData();
break;
default:
QWidget::keyPressEvent(e);
break;
default:
QWidget::keyPressEvent(e);
break;
}
}

121
rdlogedit/list_reports.cpp
View File

@ -147,16 +147,16 @@ void ListReports::generateData()
QString report;
switch(list_reports_box->currentItem()) {
case 0: // Event Report
GenerateLogReport(&report);
break;
case 0: // Event Report
GenerateLogReport(&report);
break;
case 1: // XLoad Report
GenerateExceptionReport(&report,list_date_edit->date());
break;
case 1: // XLoad Report
GenerateExceptionReport(&report,list_date_edit->date());
break;
default:
return;
default:
return;
}
if(!report.isEmpty()) {
RDTextFile(report);
@ -241,65 +241,64 @@ void ListReports::GenerateLogReport(QString *report)
(const char *)RDLogLine::transText(logline->transType()).left(5));
switch(logline->type()) {
case RDLogLine::Cart:
case RDLogLine::Macro:
*report+=QString().sprintf("%06u ",logline->cartNumber());
*report+=QString().sprintf("%-10s ",
(const char *)logline->groupName());
*report+=QString().sprintf("%8s ",(const char *)
RDGetTimeLength(logline->forcedLength(),
false,false));
*report+=
QString().sprintf("%-33s ",
(const char *)logline->title().left(33));
*report+=
QString().sprintf("%-30s ",
(const char *)logline->artist().left(30));
break;
case RDLogLine::Cart:
case RDLogLine::Macro:
*report+=QString().sprintf("%06u ",logline->cartNumber());
*report+=QString().sprintf("%-10s ",
(const char *)logline->groupName());
*report+=QString().sprintf("%8s ",(const char *)
RDGetTimeLength(logline->forcedLength(),
false,false));
*report+=
QString().sprintf("%-33s ",
(const char *)logline->title().left(33));
*report+=
QString().sprintf("%-30s ",
(const char *)logline->artist().left(30));
break;
case RDLogLine::Marker:
case RDLogLine::Track:
*report+=" ";
*report+=" ";
*report+=" :00 ";
*report+=
QString().sprintf("%-30s ",
(const char *)logline->markerComment().left(30));
*report+=" ";
break;
case RDLogLine::Marker:
case RDLogLine::Track:
*report+=" ";
*report+=" ";
*report+=" :00 ";
*report+=
QString().sprintf("%-30s ",
(const char *)logline->markerComment().left(30));
*report+=" ";
break;
case RDLogLine::TrafficLink:
*report+=" ";
*report+=" ";
*report+=" :00 ";
*report+="Traffic Import ";
*report+=" ";
break;
case RDLogLine::TrafficLink:
*report+=" ";
*report+=" ";
*report+=" :00 ";
*report+="Traffic Import ";
*report+=" ";
break;
case RDLogLine::MusicLink:
*report+=" ";
*report+=" ";
*report+=" :00 ";
*report+="Music Import ";
*report+=" ";
break;
case RDLogLine::MusicLink:
*report+=" ";
*report+=" ";
*report+=" :00 ";
*report+="Music Import ";
*report+=" ";
break;
case RDLogLine::Chain:
*report+=" ";
*report+=" ";
*report+=" ";
*report+=
QString().sprintf("%-30s ",
(const char *)logline->markerLabel().left(30));
*report+=" ";
break;
break;
case RDLogLine::Chain:
*report+=" ";
*report+=" ";
*report+=" ";
*report+=
QString().sprintf("%-30s ",
(const char *)logline->markerLabel().left(30));
*report+=" ";
break;
case RDLogLine::OpenBracket:
case RDLogLine::CloseBracket:
case RDLogLine::UnknownType:
break;
case RDLogLine::OpenBracket:
case RDLogLine::CloseBracket:
case RDLogLine::UnknownType:
break;
}
//

27
rdlogedit/log_listview.cpp
View File

@ -87,23 +87,16 @@ void LogListView::contentsMousePressEvent(QMouseEvent *e)
QListView::contentsMousePressEvent(e);
log_menu_item=(RDListViewItem *)selectedItem();
switch(e->button()) {
case QMouseEvent::RightButton:
//log_menu->setGeometry(log_parent->geometry().x()+
// geometry().x()+e->pos().x()+2,
// log_parent->geometry().y()+
// geometry().y()+e->pos().y()+
// header()->geometry().height()+2,
// log_menu->sizeHint().width(),
// log_menu->sizeHint().height());
log_menu->setGeometry(e->globalX(),e->globalY(),
log_menu->sizeHint().width(),
log_menu->sizeHint().height());
case QMouseEvent::RightButton:
log_menu->setGeometry(e->globalX(),e->globalY(),
log_menu->sizeHint().width(),
log_menu->sizeHint().height());
log_menu->exec();
break;
log_menu->exec();
break;
default:
e->ignore();
break;
default:
e->ignore();
break;
}
}

1411
rdlogedit/voice_tracker.cpp
View File

File diff suppressed because it is too large Load Diff