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

2019-11-20 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Reindented switch statements in 'rdadmin/edit_matrix.cpp'.
This commit is contained in:
Fred Gleason 2019-11-20 15:27:12 -05:00
parent e625fd53f3
commit 2443c87a8d
2 changed files with 70 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -19248,3 +19248,5 @@
2019-11-20 Fred Gleason <fredg@paravelsystems.com> 2019-11-20 Fred Gleason <fredg@paravelsystems.com>
* Added interlocks to the 'Edit Switcher' and 'Edit Serial Ports' * Added interlocks to the 'Edit Switcher' and 'Edit Serial Ports'
dialogs in rdadmin(1) to prohibit use of a disabled serial device. dialogs in rdadmin(1) to prohibit use of a disabled serial device.
2019-11-20 Fred Gleason <fredg@paravelsystems.com>
* Reindented switch statements in 'rdadmin/edit_matrix.cpp'.

136
rdadmin/edit_matrix.cpp
View File

@ -544,22 +544,22 @@ EditMatrix::EditMatrix(RDMatrix *matrix,QWidget *parent)
edit_porttype2_box-> edit_porttype2_box->
setCurrentItem((int)edit_matrix->portType(RDMatrix::Backup)); setCurrentItem((int)edit_matrix->portType(RDMatrix::Backup));
switch((RDMatrix::PortType)edit_porttype_box->currentItem()) { switch((RDMatrix::PortType)edit_porttype_box->currentItem()) {
case RDMatrix::TtyPort: case RDMatrix::TtyPort:
edit_port_box->setCurrentItem(edit_matrix->port(RDMatrix::Primary)); edit_port_box->setCurrentItem(edit_matrix->port(RDMatrix::Primary));
edit_port2_box->setCurrentItem(edit_matrix->port(RDMatrix::Backup)); edit_port2_box->setCurrentItem(edit_matrix->port(RDMatrix::Backup));
break; break;
case RDMatrix::TcpPort: case RDMatrix::TcpPort:
edit_ipaddress_edit-> edit_ipaddress_edit->
setText(edit_matrix->ipAddress(RDMatrix::Primary).toString()); setText(edit_matrix->ipAddress(RDMatrix::Primary).toString());
edit_ipport_spin->setValue(edit_matrix->ipPort(RDMatrix::Primary)); edit_ipport_spin->setValue(edit_matrix->ipPort(RDMatrix::Primary));
edit_ipaddress2_edit-> edit_ipaddress2_edit->
setText(edit_matrix->ipAddress(RDMatrix::Backup).toString()); setText(edit_matrix->ipAddress(RDMatrix::Backup).toString());
edit_ipport2_spin->setValue(edit_matrix->ipPort(RDMatrix::Backup)); edit_ipport2_spin->setValue(edit_matrix->ipPort(RDMatrix::Backup));
break; break;
case RDMatrix::NoPort: case RDMatrix::NoPort:
break; break;
} }
edit_card_box->setValue(edit_matrix->card()); edit_card_box->setValue(edit_matrix->card());
edit_inputs_box->setValue(edit_matrix->inputs()); edit_inputs_box->setValue(edit_matrix->inputs());
@ -1192,27 +1192,27 @@ bool EditMatrix::WriteMatrix()
// Ensure Sane Values // Ensure Sane Values
// //
switch((RDMatrix::PortType)edit_porttype_box->currentItem()) { switch((RDMatrix::PortType)edit_porttype_box->currentItem()) {
case RDMatrix::TcpPort: case RDMatrix::TcpPort:
if(!addr.setAddress(edit_ipaddress_edit->text())) { if(!addr.setAddress(edit_ipaddress_edit->text())) {
QMessageBox::warning(this,"RDAdmin - "+tr("Invalid Address"), QMessageBox::warning(this,"RDAdmin - "+tr("Invalid Address"),
tr("The primary IP address is invalid!")); tr("The primary IP address is invalid!"));
return false; return false;
} }
break; break;
case RDMatrix::TtyPort: case RDMatrix::TtyPort:
tty=new RDTty(rda->station()->name(),edit_port_box->currentIndex()); tty=new RDTty(rda->station()->name(),edit_port_box->currentIndex());
if(!tty->active()) { if(!tty->active()) {
QMessageBox::information(this,"RDAdmin - "+tr("Error"), QMessageBox::information(this,"RDAdmin - "+tr("Error"),
tr("The primary serial device is not active!")); tr("The primary serial device is not active!"));
delete tty;
return false;
}
delete tty; delete tty;
break; return false;
}
delete tty;
break;
case RDMatrix::NoPort: case RDMatrix::NoPort:
break; break;
} }
if(RDMatrix::controlActive(type,RDMatrix::Backup,RDMatrix::PortTypeControl)) { if(RDMatrix::controlActive(type,RDMatrix::Backup,RDMatrix::PortTypeControl)) {
@ -1257,41 +1257,41 @@ bool EditMatrix::WriteMatrix()
} }
switch((RDMatrix::PortType)edit_porttype_box->currentItem()) { switch((RDMatrix::PortType)edit_porttype_box->currentItem()) {
case RDMatrix::TtyPort: case RDMatrix::TtyPort:
edit_matrix->setPortType(RDMatrix::Primary,RDMatrix::TtyPort); edit_matrix->setPortType(RDMatrix::Primary,RDMatrix::TtyPort);
edit_matrix->setPort(RDMatrix::Primary,edit_port_box->currentItem()); edit_matrix->setPort(RDMatrix::Primary,edit_port_box->currentItem());
edit_matrix->setIpAddress(RDMatrix::Primary,QHostAddress()); edit_matrix->setIpAddress(RDMatrix::Primary,QHostAddress());
edit_matrix->setIpPort(RDMatrix::Primary,0); edit_matrix->setIpPort(RDMatrix::Primary,0);
break; break;
case RDMatrix::TcpPort: case RDMatrix::TcpPort:
edit_matrix->setPortType(RDMatrix::Primary,RDMatrix::TcpPort); edit_matrix->setPortType(RDMatrix::Primary,RDMatrix::TcpPort);
edit_matrix->setPort(RDMatrix::Primary,-1); edit_matrix->setPort(RDMatrix::Primary,-1);
edit_matrix->setIpAddress(RDMatrix::Primary,addr); edit_matrix->setIpAddress(RDMatrix::Primary,addr);
edit_matrix->setIpPort(RDMatrix::Primary,edit_ipport_spin->value()); edit_matrix->setIpPort(RDMatrix::Primary,edit_ipport_spin->value());
break; break;
case RDMatrix::NoPort: case RDMatrix::NoPort:
break; break;
} }
switch((RDMatrix::PortType)edit_porttype2_box->currentItem()) { switch((RDMatrix::PortType)edit_porttype2_box->currentItem()) {
case RDMatrix::TtyPort: case RDMatrix::TtyPort:
edit_matrix->setPortType(RDMatrix::Backup,RDMatrix::TtyPort); edit_matrix->setPortType(RDMatrix::Backup,RDMatrix::TtyPort);
edit_matrix->setPort(RDMatrix::Backup,edit_port2_box->currentItem()); edit_matrix->setPort(RDMatrix::Backup,edit_port2_box->currentItem());
edit_matrix->setIpAddress(RDMatrix::Backup,QHostAddress()); edit_matrix->setIpAddress(RDMatrix::Backup,QHostAddress());
edit_matrix->setIpPort(RDMatrix::Backup,0); edit_matrix->setIpPort(RDMatrix::Backup,0);
break; break;
case RDMatrix::TcpPort: case RDMatrix::TcpPort:
edit_matrix->setPortType(RDMatrix::Backup,RDMatrix::TcpPort); edit_matrix->setPortType(RDMatrix::Backup,RDMatrix::TcpPort);
edit_matrix->setPort(RDMatrix::Backup,-1); edit_matrix->setPort(RDMatrix::Backup,-1);
edit_matrix->setIpAddress(RDMatrix::Backup,addr2); edit_matrix->setIpAddress(RDMatrix::Backup,addr2);
edit_matrix->setIpPort(RDMatrix::Backup,edit_ipport2_spin->value()); edit_matrix->setIpPort(RDMatrix::Backup,edit_ipport2_spin->value());
break; break;
case RDMatrix::NoPort: case RDMatrix::NoPort:
edit_matrix->setPortType(RDMatrix::Backup,RDMatrix::NoPort); edit_matrix->setPortType(RDMatrix::Backup,RDMatrix::NoPort);
break; break;
} }
if(edit_layer_box->currentItem()==0) { if(edit_layer_box->currentItem()==0) {
edit_matrix->setLayer('V'); edit_matrix->setLayer('V');
@ -1339,15 +1339,15 @@ void EditMatrix::WriteGpioTable(RDMatrix::GpioType type)
QString tablename; QString tablename;
int line_quan=0; int line_quan=0;
switch(type) { switch(type) {
case RDMatrix::GpioInput: case RDMatrix::GpioInput:
tablename="GPIS"; tablename="GPIS";
line_quan=edit_gpis_box->value(); line_quan=edit_gpis_box->value();
break; break;
case RDMatrix::GpioOutput: case RDMatrix::GpioOutput:
tablename="GPOS"; tablename="GPOS";
line_quan=edit_gpos_box->value(); line_quan=edit_gpos_box->value();
break; break;
} }
if(!RDMatrix::controlActive(edit_matrix->type(), if(!RDMatrix::controlActive(edit_matrix->type(),