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

2021-01-29 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed regressions in rdadmin(1) that caused data in the 'INPUTS'
	and 'OUTPUTS' table to fail to be kept in sync with data in the
	'MATRICES' table.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-01-29 12:09:23 -05:00
parent 0821eb7c27
commit 34317146b7
11 changed files with 483 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
rdadmin/edit_matrix.cpp
View File

@@ -45,8 +45,6 @@
EditMatrix::EditMatrix(RDMatrix *matrix,QWidget *parent)
: RDDialog(parent)
{
setModal(true);
QString str;
edit_matrix=matrix;
@@ -1164,6 +1162,12 @@ void EditMatrix::stopCart2Data()
void EditMatrix::okData()
{
if((!ConfirmPruneEndpoints(RDMatrix::Input))||
(!ConfirmPruneEndpoints(RDMatrix::Output))) {
return;
}
PruneEndpoints(RDMatrix::Input);
PruneEndpoints(RDMatrix::Output);
if(!WriteMatrix()) {
return;
}
@@ -1296,6 +1300,12 @@ bool EditMatrix::WriteMatrix()
edit_matrix->setLayer('@'+edit_layer_box->currentItem());
}
//
// Update Endpoints
//
AddEndpoints(RDMatrix::Input);
AddEndpoints(RDMatrix::Output);
//
// Update GPIO Tables
//
@@ -1376,3 +1386,103 @@ void EditMatrix::WriteGpioTable(RDMatrix::GpioType type)
delete q;
}
}
void EditMatrix::AddEndpoints(RDMatrix::Endpoint ep) const
{
//
// Ensure that we have endpoint entries for at least the number of
// endpoints specified in the corresponding 'Inputs'/'Outputs'
// control. If we have "excess" entries, don't touch them!
//
QString sql;
RDSqlQuery *q=NULL;
QString table="INPUTS";
int endpoint_quan=edit_inputs_box->value();
QString name=tr("Input");
if(ep==RDMatrix::Output) {
table="OUTPUTS";
endpoint_quan=edit_outputs_box->value();
name=tr("Output");
}
for(int i=0;i<endpoint_quan;i++) {
sql=QString("select ")+
"NUMBER "+ // 00
"from "+table+" where "+
"STATION_NAME=\""+RDEscapeString(edit_matrix->station())+"\" && "+
QString().sprintf("MATRIX=%d && ",edit_matrix->matrix())+
QString().sprintf("NUMBER=%d",i+1);
q=new RDSqlQuery(sql);
if(!q->first()) {
sql=QString("insert into ")+table+" set "+
"STATION_NAME=\""+RDEscapeString(edit_matrix->station())+"\","+
QString().sprintf("MATRIX=%d,",edit_matrix->matrix())+
QString().sprintf("NUMBER=%d,",i+1)+
"NAME=\""+RDEscapeString(name+QString().sprintf(" %03d",i+1))+"\"";
RDSqlQuery::apply(sql);
}
}
delete q;
}
void EditMatrix::PruneEndpoints(RDMatrix::Endpoint ep) const
{
QString sql;
QString table="INPUTS";
int endpoint_quan=edit_inputs_box->value();
if(ep==RDMatrix::Output) {
table="OUTPUTS";
endpoint_quan=edit_outputs_box->value();
}
sql=QString("delete from ")+table+" where "+
"STATION_NAME=\""+RDEscapeString(edit_matrix->station())+"\" && "+
QString().sprintf("MATRIX=%d && ",edit_matrix->matrix())+
QString().sprintf("NUMBER>%d",endpoint_quan);
RDSqlQuery::apply(sql);
}
bool EditMatrix::ConfirmPruneEndpoints(RDMatrix::Endpoint ep)
{
QString sql;
RDSqlQuery *q=NULL;
QString table="INPUTS";
int endpoint_quan=edit_inputs_box->value();
QString name=tr("Inputs");
if(ep==RDMatrix::Output) {
table="OUTPUTS";
endpoint_quan=edit_outputs_box->value();
name=tr("Outputs");
}
sql=QString("select ")+
"ID "+ // 00
"from "+table+" where "+
"STATION_NAME=\""+RDEscapeString(edit_matrix->station())+"\" && "+
QString().sprintf("MATRIX=%d && ",edit_matrix->matrix())+
QString().sprintf("NUMBER>%d",endpoint_quan);
q=new RDSqlQuery(sql);
if(q->first()) {
if(QMessageBox::warning(this,"RDAdmin - "+tr("Warning"),
tr("It appears that the")+" "+name+" "+
tr("control has been changed to a lower value.")+" "+
tr("This may result in configuration data for the \"orphaned\"")+" "+name+" "+tr("being deleted.")+"\n"+
"\n"+
tr("Continue?"),
QMessageBox::Yes,QMessageBox::No)!=QMessageBox::Yes) {
delete q;
return false;
}
}
else {
delete q;
return true;
}
delete q;
return true;
}