2017-12-16 Fred Gleason <fredg@paravelsystems.com>

* Added support for filepath wildcards in macro carts.
This commit is contained in:
Fred Gleason
2017-12-16 16:45:51 -05:00
parent 419640c9b2
commit e07cabc72f
30 changed files with 116 additions and 104 deletions

View File

@@ -112,10 +112,15 @@ MainWidget::MainWidget(QWidget *parent)
}
new RDDbHeartbeat(gpi_config->mysqlHeartbeatInterval(),this);
//
// RDStation
//
gpi_station=new RDStation(gpi_config->stationName());
//
// RIPC Connection
//
gpi_ripc=new RDRipc(gpi_config->stationName());
gpi_ripc=new RDRipc(gpi_station,gpi_config,this);
gpi_ripc->setIgnoreMask(true);
connect(gpi_ripc,SIGNAL(userChanged()),this,SLOT(userData()));
connect(gpi_ripc,SIGNAL(gpiStateChanged(int,int,bool)),
@@ -132,11 +137,6 @@ MainWidget::MainWidget(QWidget *parent)
this,SLOT(gpoCartChangedData(int,int,int,int)));
gpi_ripc->connectHost("localhost",RIPCD_TCP_PORT,gpi_config->password());
//
// RDStation
//
gpi_station=new RDStation(gpi_config->stationName());
//
// RDMatrix;
//