Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-25 14:50:11 +01:00
Code Issues Projects Releases Wiki Activity

2017-10-19 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in the 'Edit Switch Event' dialog in rdcatch(1) that
	would cause the matrix dropdown to be empty if the first host in the
	'Location' list had no matrices defined.
This commit is contained in:
Fred Gleason
2017-10-19 22:17:22 -04:00
parent e35adb6ef6
commit 24c93bfec1
2 changed files with 62 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -16191,3 +16191,7 @@
2017-10-19 Fred Gleason <fredg@paravelsystems.com> 2017-10-19 Fred Gleason <fredg@paravelsystems.com>
* Updated 'NEWS'. * Updated 'NEWS'.
* Incremented the package version to 2.17.0int01. * Incremented the package version to 2.17.0int01.
2017-10-19 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in the 'Edit Switch Event' dialog in rdcatch(1) that
would cause the matrix dropdown to be empty if the first host in the
'Location' list had no matrices defined.

104
rdcatch/edit_switchevent.cpp
View File

@@ -32,6 +32,7 @@
#include <rd.h> #include <rd.h>
#include <rdcart_dialog.h> #include <rdcart_dialog.h>
#include <rdcut_path.h> #include <rdcut_path.h>
#include <rdescape_string.h>
#include <rdtextvalidator.h> #include <rdtextvalidator.h>
#include <edit_switchevent.h> #include <edit_switchevent.h>
@@ -97,6 +98,8 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
label->setGeometry(125,10,70,23); label->setGeometry(125,10,70,23);
label->setFont(label_font); label->setFont(label_font);
label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix);
connect(edit_station_box,SIGNAL(activated(const QString &)),
this,SLOT(activateStationData(const QString &)));
// //
// Start Time // Start Time
@@ -122,7 +125,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
// //
// Switch Matrix // Switch Matrix
// //
edit_matrix_box=new QComboBox(this); edit_matrix_box=new QComboBox(this,"matrix");
edit_matrix_box->setGeometry(120,70,sizeHint().width()-130,20); edit_matrix_box->setGeometry(120,70,sizeHint().width()-130,20);
label=new QLabel(edit_matrix_box,tr("Switch Matrix:"),this); label=new QLabel(edit_matrix_box,tr("Switch Matrix:"),this);
label->setGeometry(10,70,105,20); label->setGeometry(10,70,105,20);
@@ -134,7 +137,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
// //
// Switch Input // Switch Input
// //
edit_input_box=new QComboBox(this); edit_input_box=new QComboBox(this,"input");
edit_input_box->setGeometry(120,100,sizeHint().width()-130,20); edit_input_box->setGeometry(120,100,sizeHint().width()-130,20);
label=new QLabel(edit_input_box,tr("Switch Input:"),this); label=new QLabel(edit_input_box,tr("Switch Input:"),this);
label->setGeometry(10,100,105,20); label->setGeometry(10,100,105,20);
@@ -148,7 +151,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
// //
// Switch Output // Switch Output
// //
edit_output_box=new QComboBox(this); edit_output_box=new QComboBox(this,"output");
edit_output_box->setGeometry(120,155,sizeHint().width()-130,20); edit_output_box->setGeometry(120,155,sizeHint().width()-130,20);
label=new QLabel(edit_output_box,tr("Switch Output:"),this); label=new QLabel(edit_output_box,tr("Switch Output:"),this);
label->setGeometry(10,155,105,20); label->setGeometry(10,155,105,20);
@@ -336,10 +339,14 @@ QSizePolicy EditSwitchEvent::sizePolicy() const
void EditSwitchEvent::activateStationData(const QString &str) void EditSwitchEvent::activateStationData(const QString &str)
{ {
QString sql=QString().sprintf("select NAME,MATRIX from MATRICES where \ QString sql=QString("select ")+
(STATION_NAME=\"%s\")&&(INPUTS>0)&&\ "NAME,"+
(OUTPUTS>0) order by NAME", "MATRIX "+
(const char *)str); "from MATRICES where "+
"(STATION_NAME=\""+RDEscapeString(str)+"\")&&"+
"(INPUTS>0)&&"
"(OUTPUTS>0) "+
"order by NAME";
edit_matrix_box->clear(); edit_matrix_box->clear();
RDSqlQuery *q=new RDSqlQuery(sql); RDSqlQuery *q=new RDSqlQuery(sql);
int matrix=edit_recording->channel(); int matrix=edit_recording->channel();
@@ -363,11 +370,13 @@ void EditSwitchEvent::activateMatrixData(const QString &str)
delete edit_matrix; delete edit_matrix;
} }
edit_matrix=new RDMatrix(edit_station_box->currentText(),GetMatrix()); edit_matrix=new RDMatrix(edit_station_box->currentText(),GetMatrix());
QString sql=QString().sprintf("select NAME,NUMBER from INPUTS where \ QString sql=QString("select ")+
(STATION_NAME=\"%s\")&&(MATRIX=%d) \ "NAME,"
order by NAME", "NUMBER "+
(const char *)edit_station_box->currentText(), "from INPUTS where "+
GetMatrix()); "(STATION_NAME=\""+RDEscapeString(edit_station_box->currentText())+"\")&&"+
QString().sprintf("(MATRIX=%d) ",GetMatrix())+
"order by NAME";
edit_input_box->clear(); edit_input_box->clear();
edit_input_box->insertItem(tr("--OFF--")); edit_input_box->insertItem(tr("--OFF--"));
int input=edit_recording->switchSource(); int input=edit_recording->switchSource();
@@ -389,11 +398,13 @@ void EditSwitchEvent::activateMatrixData(const QString &str)
} }
delete q; delete q;
sql=QString().sprintf("select NAME,NUMBER from OUTPUTS where \ sql=QString("select ")+
(STATION_NAME=\"%s\")&&(MATRIX=%d) \ "NAME,"+
order by NAME", "NUMBER "+
(const char *)edit_station_box->currentText(), "from OUTPUTS where "+
GetMatrix()); "(STATION_NAME=\""+RDEscapeString(edit_station_box->currentText())+"\")&&"+
QString().sprintf("(MATRIX=%d) ",GetMatrix())+
"order by NAME";
edit_output_box->clear(); edit_output_box->clear();
int output=edit_recording->switchDestination(); int output=edit_recording->switchDestination();
if((outputs=edit_matrix->outputs())>0) { if((outputs=edit_matrix->outputs())>0) {
@@ -441,7 +452,7 @@ void EditSwitchEvent::inputChangedData(int value)
void EditSwitchEvent::outputChangedData(int value) void EditSwitchEvent::outputChangedData(int value)
{ {
if(value>0) { if((value>0)&&(edit_output_box->count()>0)) {
edit_output_box->setCurrentText(edit_matrix->outputName(value)); edit_output_box->setCurrentText(edit_matrix->outputName(value));
} }
} }
@@ -538,11 +549,13 @@ int EditSwitchEvent::GetMatrix()
{ {
int matrix=-1; int matrix=-1;
QString sql=QString().sprintf("select MATRIX from MATRICES where \ QString sql=QString("select ")+
(STATION_NAME=\"%s\")&&(NAME=\"%s\")&&\ "MATRIX "+
(INPUTS>0)&&(OUTPUTS>0)", "from MATRICES where "+
(const char *)edit_station_box->currentText(), "(STATION_NAME=\""+RDEscapeString(edit_station_box->currentText())+"\")&&"
(const char *)edit_matrix_box->currentText()); "(NAME=\""+RDEscapeString(edit_matrix_box->currentText())+"\")&&"+
"(INPUTS>0)&&"+
"(OUTPUTS>0)";
RDSqlQuery *q=new RDSqlQuery(sql); RDSqlQuery *q=new RDSqlQuery(sql);
if(q->first()) { if(q->first()) {
matrix=q->value(0).toInt(); matrix=q->value(0).toInt();
@@ -556,12 +569,12 @@ int EditSwitchEvent::GetSource()
{ {
int input=0; int input=0;
QString sql=QString().sprintf("select NUMBER from INPUTS where \ QString sql=QString("select ")+
(STATION_NAME=\"%s\")&&(MATRIX=%d)&&\ "NUMBER "+
(NAME=\"%s\")", "from INPUTS where "+
(const char *)edit_station_box->currentText(), "(STATION_NAME=\""+RDEscapeString(edit_station_box->currentText())+"\")&&"+
GetMatrix(), QString().sprintf("(MATRIX=%d)&&",GetMatrix())+
(const char *)edit_input_box->currentText()); "(NAME=\""+RDEscapeString(edit_input_box->currentText())+"\")";
RDSqlQuery *q=new RDSqlQuery(sql); RDSqlQuery *q=new RDSqlQuery(sql);
if(q->first()) { if(q->first()) {
input=q->value(0).toInt(); input=q->value(0).toInt();
@@ -575,12 +588,12 @@ int EditSwitchEvent::GetDestination()
{ {
int output=-1; int output=-1;
QString sql=QString().sprintf("select NUMBER from OUTPUTS where \ QString sql=QString("select ")+
(STATION_NAME=\"%s\")&&(MATRIX=%d)&&\ "NUMBER "+
(NAME=\"%s\")", "from OUTPUTS where "+
(const char *)edit_station_box->currentText(), "(STATION_NAME=\""+RDEscapeString(edit_station_box->currentText())+"\")&&"+
GetMatrix(), QString().sprintf("(MATRIX=%d)&&",GetMatrix())+
(const char *)edit_output_box->currentText()); "(NAME=\""+RDEscapeString(edit_output_box->currentText())+"\")";
RDSqlQuery *q=new RDSqlQuery(sql); RDSqlQuery *q=new RDSqlQuery(sql);
if(q->first()) { if(q->first()) {
output=q->value(0).toInt(); output=q->value(0).toInt();
@@ -592,17 +605,16 @@ int EditSwitchEvent::GetDestination()
bool EditSwitchEvent::CheckEvent(bool include_myself) bool EditSwitchEvent::CheckEvent(bool include_myself)
{ {
QString sql= QString sql=QString("select ")+
QString().sprintf("select ID from RECORDINGS \ "ID "+
where (STATION_NAME=\"%s\")&&\ "from RECORDINGS where "+
(TYPE=%d)&&(START_TIME=\"%s\")&&\ "(STATION_NAME=\""+RDEscapeString(edit_station_box->currentText())+"\")&&"+
(CHANNEL=%d)&&(SWITCH_INPUT=%d)&&\ QString().sprintf("(TYPE=%d)&&",RDRecording::SwitchEvent)+
(SWITCH_OUTPUT=%d)", "(START_TIME=\""+
(const char *)edit_station_box->currentText(), RDEscapeString(edit_starttime_edit->time().toString("hh:mm:ss"))+"\")&&"+
RDRecording::SwitchEvent, QString().sprintf("(CHANNEL=%d)&&",GetMatrix())+
(const char *)edit_starttime_edit->time(). QString().sprintf("(SWITCH_INPUT=%d)&&",GetSource())+
toString("hh:mm:ss"),GetMatrix(),GetSource(), QString().sprintf("(SWITCH_OUTPUT=%d)",GetDestination());
GetDestination());
if(edit_sun_button->isChecked()) { if(edit_sun_button->isChecked()) {
sql+="&&(SUN=\"Y\")"; sql+="&&(SUN=\"Y\")";
} }