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

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

Browse Source 
* Added 'RDVguestResourceListModel'.
	* Refactored the 'vGuest Switches'/'vGuest Displays' dialogs 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-01-31 11:04:24 -05:00
parent 34317146b7
commit f9234e4391
25 changed files with 1064 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

293
rdadmin/list_vguest_resources.cpp
View File

@@ -2,7 +2,7 @@
//
// List vGuest Resources.
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,18 +18,13 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qdialog.h>
#include <qstring.h>
#include <q3textedit.h>
#include <qpainter.h>
#include <qmessagebox.h>
#include <QMessageBox>
#include <rd.h>
#include <rddb.h>
#include <rdescape_string.h>
#include "edit_user.h"
#include "edit_vguest_resource.h"
#include "list_vguest_resources.h"
ListVguestResources::ListVguestResources(RDMatrix *matrix,
@@ -37,8 +32,6 @@ ListVguestResources::ListVguestResources(RDMatrix *matrix,
QWidget *parent)
: RDDialog(parent)
{
setModal(true);
QString sql;
QString str;
@@ -52,46 +45,35 @@ ListVguestResources::ListVguestResources(RDMatrix *matrix,
setMinimumSize(sizeHint());
//
// Resources List Box
// Dialogs
//
list_list_view=new Q3ListView(this);
list_title_label=new QLabel(list_list_view,list_table,this);
list_title_label->setFont(labelFont());
list_list_view->setAllColumnsShowFocus(true);
list_list_view->setItemMargin(5);
switch(list_type) {
case RDMatrix::VguestTypeRelay:
setWindowTitle("RDAdmin - "+tr("vGuest Switches"));
list_list_view->addColumn(tr("GPIO LINE"));
break;
list_edit_resource_dialog=new EditVguestResource(this);
switch(type) {
case RDMatrix::VguestTypeDisplay:
setWindowTitle("RDAdmin - "+tr("vGuest Displays"));
list_list_view->addColumn(tr("DISPLAY"));
break;
}
list_list_view->setColumnAlignment(0,Qt::AlignHCenter);
list_list_view->addColumn(tr("ENGINE (Hex)"));
list_list_view->setColumnAlignment(1,Qt::AlignHCenter);
list_list_view->addColumn(tr("DEVICE (Hex)"));
list_list_view->setColumnAlignment(2,Qt::AlignHCenter);
switch(list_type) {
case RDMatrix::VguestTypeRelay:
list_list_view->addColumn(tr("SURFACE (Hex)"));
list_list_view->setColumnAlignment(3,Qt::AlignHCenter);
list_list_view->addColumn(tr("BUS/RELAY (Hex)"));
list_list_view->setColumnAlignment(4,Qt::AlignHCenter);
break;
case RDMatrix::VguestTypeDisplay:
list_list_view->addColumn(tr("SURFACE (Hex)"));
list_list_view->setColumnAlignment(3,Qt::AlignHCenter);
case RDMatrix::VguestTypeRelay:
setWindowTitle("RDAdmin - "+tr("vGuest Switches"));
break;
}
connect(list_list_view,
SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)),
this,
SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int)));
//
// Resources List Box
//
list_list_view=new RDTableView(this);
list_list_model=new RDVguestResourceListModel(list_matrix,type,this);
list_list_model->setFont(defaultFont());
list_list_model->setPalette(palette());
list_list_view->setModel(list_list_model);
list_title_label=new QLabel(list_list_view,list_table,this);
list_title_label->setFont(labelFont());
connect(list_list_view,SIGNAL(doubleClicked(const QModelIndex &)),
this,SLOT(doubleClickedData(const QModelIndex &)));
connect(list_list_model,SIGNAL(modelReset()),
list_list_view,SLOT(resizeColumnsToContents()));
list_list_view->resizeColumnsToContents();
//
// Edit Button
@@ -102,26 +84,18 @@ ListVguestResources::ListVguestResources(RDMatrix *matrix,
connect(list_edit_button,SIGNAL(clicked()),this,SLOT(editData()));
//
// Ok Button
// Close Button
//
list_ok_button=new QPushButton(this);
list_ok_button->setDefault(true);
list_ok_button->setFont(buttonFont());
list_ok_button->setText(tr("&OK"));
connect(list_ok_button,SIGNAL(clicked()),this,SLOT(okData()));
list_close_button=new QPushButton(this);
list_close_button->setFont(buttonFont());
list_close_button->setText(tr("&Close"));
connect(list_close_button,SIGNAL(clicked()),this,SLOT(closeData()));
}
//
// Cancel Button
//
list_cancel_button=new QPushButton(this);
list_cancel_button->setFont(buttonFont());
list_cancel_button->setText(tr("&Cancel"));
connect(list_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
//
// Load Values
//
RefreshList();
ListVguestResources::~ListVguestResources()
{
delete list_edit_resource_dialog;
}
@@ -139,155 +113,28 @@ QSizePolicy ListVguestResources::sizePolicy() const
void ListVguestResources::editData()
{
int engine_num=-1;
int device_num=-1;
int surface_num=-1;
int relay_num=-1;
QModelIndexList rows=list_list_view->selectionModel()->selectedRows();
Q3ListViewItem *item=list_list_view->selectedItem();
if(item==NULL) {
if(rows.size()!=1) {
return;
}
if(!item->text(1).isEmpty()) {
engine_num=item->text(1).toInt(NULL,16);
}
if(!item->text(2).isEmpty()) {
device_num=item->text(2).toInt(NULL,16);
}
if(!item->text(3).isEmpty()) {
surface_num=item->text(3).toInt(NULL,16);
}
switch(list_type) {
case RDMatrix::VguestTypeRelay:
if(!item->text(4).isEmpty()) {
relay_num=item->text(4).toInt(NULL,16);
}
break;
case RDMatrix::VguestTypeDisplay:
break;
}
EditVguestResource *dialog=
new EditVguestResource(list_type,&engine_num,&device_num,&surface_num,
&relay_num,this);
if(dialog->exec()==0) {
if(engine_num>=0) {
item->setText(1,QString().sprintf("%04X",engine_num));
}
else {
item->setText(1,"");
}
if(device_num>=0) {
item->setText(2,QString().sprintf("%04X",device_num));
}
else {
item->setText(2,"");
}
if(surface_num>=0) {
item->setText(3,QString().sprintf("%04X",surface_num));
}
else {
item->setText(3,"");
}
switch(list_type) {
case RDMatrix::VguestTypeRelay:
if(relay_num>=0) {
item->setText(4,QString().sprintf("%04X",relay_num));
}
else {
item->setText(4,"");
}
break;
case RDMatrix::VguestTypeDisplay:
break;
}
if(list_edit_resource_dialog->
exec(list_type,list_list_model->resourceId(rows.first()))) {
list_list_model->refresh(rows.first());
}
delete dialog;
}
void ListVguestResources::doubleClickedData(Q3ListViewItem *item,
const QPoint &pt,int col)
void ListVguestResources::doubleClickedData(const QModelIndex &index)
{
editData();
}
void ListVguestResources::okData()
void ListVguestResources::closeData()
{
QString sql;
RDSqlQuery *q;
int engine_num=-1;
int device_num=-1;
int surface_num=-1;
int relay_num=-1;
Q3ListViewItem *item=list_list_view->firstChild();
while(item!=NULL) {
engine_num=-1;
device_num=-1;
surface_num=-1;
relay_num=-1;
if(!item->text(1).isEmpty()) {
engine_num=item->text(1).toInt(NULL,16);
}
if(!item->text(2).isEmpty()) {
device_num=item->text(2).toInt(NULL,16);
}
if(!item->text(3).isEmpty()) {
surface_num=item->text(3).toInt(NULL,16);
}
switch(list_type) {
case RDMatrix::VguestTypeRelay:
if(!item->text(4).isEmpty()) {
relay_num=item->text(4).toInt(NULL,16);
}
break;
case RDMatrix::VguestTypeDisplay:
break;
}
sql=QString("select ID from VGUEST_RESOURCES where ")+
"(STATION_NAME=\""+RDEscapeString(list_matrix->station())+"\")&&"+
QString().sprintf("(MATRIX_NUM=%d)&&",list_matrix->matrix())+
QString().sprintf("(VGUEST_TYPE=%d)&&",list_type)+
QString().sprintf("(NUMBER=%d)",item->text(0).toInt());
q=new RDSqlQuery(sql);
if(q->first()) {
sql=QString("update VGUEST_RESOURCES set ")+
QString().sprintf("ENGINE_NUM=%d,",engine_num)+
QString().sprintf("DEVICE_NUM=%d,",device_num)+
QString().sprintf("SURFACE_NUM=%d,",surface_num)+
QString().sprintf("RELAY_NUM=%d where ",relay_num)+
"(STATION_NAME=\""+RDEscapeString(list_matrix->station())+"\")&&"+
QString().sprintf("(MATRIX_NUM=%d)&&",list_matrix->matrix())+
QString().sprintf("(VGUEST_TYPE=%d)&&",list_type)+
QString().sprintf("(NUMBER=%d)",item->text(0).toInt());
}
else {
sql=QString("insert into VGUEST_RESOURCES set ")+
"STATION_NAME=\""+RDEscapeString(list_matrix->station())+"\","+
QString().sprintf("MATRIX_NUM=%d,",list_matrix->matrix())+
QString().sprintf("VGUEST_TYPE=%d,",list_type)+
QString().sprintf("NUMBER=%d,",item->text(0).toInt())+
QString().sprintf("ENGINE_NUM=%d,",engine_num)+
QString().sprintf("DEVICE_NUM=%d,",device_num)+
QString().sprintf("SURFACE_NUM=%d,",surface_num)+
QString().sprintf("RELAY_NUM=%d",relay_num);
}
delete q;
q=new RDSqlQuery(sql);
delete q;
item=item->nextSibling();
}
done(0);
}
void ListVguestResources::cancelData()
{
done(-1);
done(true);
}
@@ -296,63 +143,5 @@ void ListVguestResources::resizeEvent(QResizeEvent *e)
list_title_label->setGeometry(14,5,85,19);
list_list_view->setGeometry(10,24,size().width()-20,size().height()-94);
list_edit_button->setGeometry(10,size().height()-60,80,50);
list_ok_button->setGeometry(size().width()-180,size().height()-60,80,50);
list_cancel_button->setGeometry(size().width()-90,size().height()-60,80,50);
}
void ListVguestResources::RefreshList()
{
QString sql;
RDSqlQuery *q;
Q3ListViewItem *item;
int n=1;
sql=QString("select ")+
"NUMBER,"+ // 00
"ENGINE_NUM,"+ // 01
"DEVICE_NUM,"+ // 02
"SURFACE_NUM,"+ // 03
"RELAY_NUM,"+ // 04
"BUSS_NUM "+ // 05
"from VGUEST_RESOURCES where "+
"(STATION_NAME=\""+RDEscapeString(list_matrix->station())+"\")&&"+
QString().sprintf("(MATRIX_NUM=%d)&&",list_matrix->matrix())+
QString().sprintf("(VGUEST_TYPE=%d) ",list_type)+
"order by NUMBER";
q=new RDSqlQuery(sql);
list_list_view->clear();
while(q->next()) {
while(q->value(0).toInt()>n) {
item=new Q3ListViewItem(list_list_view);
item->setText(0,QString().sprintf("%03d",n++));
}
item=new Q3ListViewItem(list_list_view);
item->setText(0,QString().sprintf("%03d",q->value(0).toInt()));
if(q->value(1).toInt()>=0) {
item->setText(1,QString().sprintf("%04X",q->value(1).toInt()));
}
if(q->value(2).toInt()>=0) {
item->setText(2,QString().sprintf("%04X",q->value(2).toInt()));
}
if(q->value(3).toInt()>=0) {
item->setText(3,QString().sprintf("%04X",q->value(3).toInt()));
}
switch(list_type) {
case RDMatrix::VguestTypeRelay:
if(q->value(4).toInt()>=0) {
item->setText(4,QString().sprintf("%04X",q->value(4).toInt()));
}
break;
case RDMatrix::VguestTypeDisplay:
break;
}
n++;
}
for(int i=n;i<(list_size+1);i++) {
item=new Q3ListViewItem(list_list_view);
item->setText(0,QString().sprintf("%03d",i));
}
delete q;
list_close_button->setGeometry(size().width()-90,size().height()-60,80,50);
}