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-02-01 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added 'RDGpioSlotsModel'.
	* Refactored the 'Livewire GPIO Source Assignments' dialog in
	rdadmin(1) to use the model-based API.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-02-01 14:08:39 -05:00
parent e25bec42a2
commit 0be2a7696b
26 changed files with 762 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
rdadmin/edit_matrix.cpp
View File

@@ -1068,8 +1068,9 @@ void EditMatrix::livewireButtonData()
void EditMatrix::livewireGpioButtonData()
{
ListLiveWireGpios *dialog=new ListLiveWireGpios(edit_matrix,
edit_gpis_box->value()/RD_LIVEWIRE_GPIO_BUNDLE_SIZE,this);
AddGpioSlots();
ListLiveWireGpios *dialog=
new ListLiveWireGpios(edit_matrix,edit_gpis_box->value(),this);
dialog->exec();
delete dialog;
}
@@ -1326,6 +1327,8 @@ bool EditMatrix::WriteMatrix()
AddEndpoints(RDMatrix::Output);
AddResources(RDMatrix::VguestTypeRelay);
AddResources(RDMatrix::VguestTypeDisplay);
AddGpioSlots();
PurgeGpioSlots();
//
// Update GPIO Tables
@@ -1544,8 +1547,8 @@ void EditMatrix::AddResources(RDMatrix::VguestType type) const
sql+=QString().sprintf("NUMBER=%d",i+1);
RDSqlQuery::apply(sql);
}
delete q;
}
delete q;
}
@@ -1610,3 +1613,40 @@ bool EditMatrix::ConfirmPruneResources(RDMatrix::VguestType type)
delete q;
return true;
}
void EditMatrix::AddGpioSlots()
{
if(edit_matrix->type()==RDMatrix::LiveWireMcastGpio) {
int bundle_end=edit_gpis_box->value()/5;
for(int i=0;i<bundle_end;i++) {
QString sql=QString("select ")+
"ID "+ // 00
"from LIVEWIRE_GPIO_SLOTS where "+
"STATION_NAME=\""+RDEscapeString(edit_matrix->station())+"\" && "+
QString().sprintf("MATRIX=%d && ",edit_matrix->matrix())+
QString().sprintf("SLOT=%d",i);
RDSqlQuery *q=new RDSqlQuery(sql);
if(!q->first()) {
sql=QString("insert into LIVEWIRE_GPIO_SLOTS set ")+
"STATION_NAME=\""+RDEscapeString(edit_matrix->station())+"\","+
QString().sprintf("MATRIX=%d,",edit_matrix->matrix())+
QString().sprintf("SLOT=%d",i);
RDSqlQuery::apply(sql);
}
delete q;
}
}
}
void EditMatrix::PurgeGpioSlots()
{
if(edit_matrix->type()==RDMatrix::LiveWireMcastGpio) {
QString sql=QString("delete from LIVEWIRE_GPIO_SLOTS where ")+
"STATION_NAME=\""+RDEscapeString(edit_matrix->station())+"\" && "+
QString().sprintf("MATRIX=%d && ",edit_matrix->matrix())+
QString().sprintf("SLOT>=%d",edit_gpis_box->value()/5);
RDSqlQuery::apply(sql);
}
}