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

* Fixed a bug in RDStation that caused RDPanel parameters to
	fail to be copied as part of the profile of a new host.
This commit is contained in:
Fred Gleason 2017-10-14 18:35:32 -04:00
parent 9fd776bc7a
commit 161753dbdd

View File

@ -1207,19 +1207,20 @@ bool RDStation::create(const QString &name,QString *err_msg,
delete q; delete q;
sql=QString("select ")+ sql=QString("select ")+
"INSTANCE,"+ "INSTANCE,"+ // 00
"CARD,"+ "CARD,"+ // 01
"PORT,"+ "PORT,"+ // 02
"START_RML,"+ "START_RML,"+ // 03
"STOP_RML,"+ "STOP_RML,"+ // 04
"START_GPI_MATRIX,"+ "GPIO_TYPE,"+ // 05
"START_GPI_LINE,"+ "START_GPI_MATRIX,"+ // 06
"START_GPO_MATRIX,"+ "START_GPI_LINE,"+ // 07
"START_GPO_LINE,"+ "START_GPO_MATRIX,"+ // 08
"STOP_GPI_MATRIX,"+ "START_GPO_LINE,"+ // 09
"STOP_GPI_LINE,"+ "STOP_GPI_MATRIX,"+ // 10
"STOP_GPO_MATRIX,"+ "STOP_GPI_LINE,"+ // 11
"STOP_GPO_LINE "+ "STOP_GPO_MATRIX,"+ // 12
"STOP_GPO_LINE "+ // 13
"from RDPANEL_CHANNELS where "+ "from RDPANEL_CHANNELS where "+
"STATION_NAME=\""+RDEscapeString(exemplar)+"\""; "STATION_NAME=\""+RDEscapeString(exemplar)+"\"";
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
@ -1231,14 +1232,15 @@ bool RDStation::create(const QString &name,QString *err_msg,
QString().sprintf("PORT=%d,",q->value(2).toInt())+ QString().sprintf("PORT=%d,",q->value(2).toInt())+
"START_RML=\""+RDEscapeString(q->value(3).toString())+"\","+ "START_RML=\""+RDEscapeString(q->value(3).toString())+"\","+
"STOP_RML=\""+RDEscapeString(q->value(4).toString())+"\","+ "STOP_RML=\""+RDEscapeString(q->value(4).toString())+"\","+
QString().sprintf("START_GPI_MATRIX=%d,",q->value(5).toInt())+ QString().sprintf("GPIO_TYPE=%d,",q->value(5).toInt())+
QString().sprintf("START_GPI_LINE=%d,",q->value(6).toInt())+ QString().sprintf("START_GPI_MATRIX=%d,",q->value(6).toInt())+
QString().sprintf("START_GPO_MATRIX=%d,",q->value(7).toInt())+ QString().sprintf("START_GPI_LINE=%d,",q->value(7).toInt())+
QString().sprintf("START_GPO_LINE=%d,",q->value(8).toInt())+ QString().sprintf("START_GPO_MATRIX=%d,",q->value(8).toInt())+
QString().sprintf("STOP_GPI_MATRIX=%d,",q->value(9).toInt())+ QString().sprintf("START_GPO_LINE=%d,",q->value(9).toInt())+
QString().sprintf("STOP_GPI_LINE=%d,",q->value(10).toInt())+ QString().sprintf("STOP_GPI_MATRIX=%d,",q->value(10).toInt())+
QString().sprintf("STOP_GPO_MATRIX=%d,",q->value(11).toInt())+ QString().sprintf("STOP_GPI_LINE=%d,",q->value(11).toInt())+
QString().sprintf("STOP_GPO_LINE=%d",q->value(12).toInt()); QString().sprintf("STOP_GPO_MATRIX=%d,",q->value(12).toInt())+
QString().sprintf("STOP_GPO_LINE=%d",q->value(13).toInt());
q1=new RDSqlQuery(sql); q1=new RDSqlQuery(sql);
delete q1; delete q1;
} }