2022-10-16 Fred Gleason <fredg@paravelsystems.com>

* Modified the 'Log Grids' dialog in rdlogmanager(1) to not display
	services with 'Bypass Grid Processing' set to 'Yes'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>

ChangeLog

@@ -23515,3 +23515,6 @@
 	* Fixed a regression in the 'Test Music Import' dialog that caused
 	the 'Imported Events' list to fail to be cleared when starting a
 	new test.
+2022-10-16 Fred Gleason <fredg@paravelsystems.com>
+	* Modified the 'Log Grids' dialog in rdlogmanager(1) to not display
+	services with 'Bypass Grid Processing' set to 'Yes'.

lib/rdlistsvcs.cpp

@@ -36,7 +36,7 @@ RDListSvcs::RDListSvcs(const QString &caption,QWidget *parent)
   // Services
   //
   edit_svc_view=new RDTableView(this);
-  edit_svc_model=new RDServiceListModel(false,this);
+  edit_svc_model=new RDServiceListModel(false,false,this);
   edit_svc_model->setFont(font());
   edit_svc_model->setPalette(palette());
   edit_svc_view->setModel(edit_svc_model);

lib/rdservicelistmodel.cpp

@@ -22,10 +22,12 @@
 #include "rdescape_string.h"
 #include "rdservicelistmodel.h"
 
-RDServiceListModel::RDServiceListModel(bool incl_none,QObject *parent)
+RDServiceListModel::RDServiceListModel(bool incl_none,bool exclude_bypass,
+				       QObject *parent)
   : QAbstractTableModel(parent)
 {
   d_include_none=incl_none;
+  d_exclude_bypass=exclude_bypass;
 
   //
   // Load Color Map
@@ -257,6 +259,9 @@ void RDServiceListModel::updateModel()
 
   RDSqlQuery *q=NULL;
   QString sql=sqlFields();
+  if(d_exclude_bypass) {
+    sql+="where `BYPASS_MODE`='N' ";
+  }
   sql+="order by NAME ";
   beginResetModel();
   d_texts.clear();

lib/rdservicelistmodel.h

@@ -42,7 +42,7 @@ class RDServiceListModel : public QAbstractTableModel
 {
   Q_OBJECT
  public:
-  RDServiceListModel(bool incl_none,QObject *parent);
+  RDServiceListModel(bool incl_none,bool exclude_bypass,QObject *parent);
   ~RDServiceListModel();
   QPalette palette();
   void setPalette(const QPalette &pal);
@@ -70,6 +70,7 @@ class RDServiceListModel : public QAbstractTableModel
   QFont d_font;
   QFont d_bold_font;
   bool d_include_none;
+  bool d_exclude_bypass;
   QList<QVariant> d_headers;
   QList<QVariant> d_alignments;
   QList<QList<QVariant> > d_texts;

rdadmin/add_svc.cpp

@@ -66,7 +66,7 @@ AddSvc::AddSvc(QString *svcname,QWidget *parent)
   //
   svc_exemplar_box=new QComboBox(this);
   svc_exemplar_box->setGeometry(155,36,sizeHint().width()-165,19);
-  svc_services_model=new RDServiceListModel(true,this);
+  svc_services_model=new RDServiceListModel(true,false,this);
   svc_services_model->setFont(defaultFont());
   svc_services_model->setPalette(palette());
   svc_exemplar_box->setModel(svc_services_model);

rdadmin/edit_cartslots.cpp

@@ -155,7 +155,7 @@ EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station,
   //
   edit_service_box=new QComboBox(this);
   edit_service_box->setGeometry(127,240,120,20);
-  edit_service_model=new RDServiceListModel(true,this);
+  edit_service_model=new RDServiceListModel(true,false,this);
   edit_service_model->setFont(defaultFont());
   edit_service_model->setPalette(palette());
   edit_service_box->setModel(edit_service_model);

rdadmin/edit_rdairplay.cpp

@@ -64,7 +64,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
   //
   // Models
   //
-  air_service_model=new RDServiceListModel(true,this);
+  air_service_model=new RDServiceListModel(true,false,this);
 
   //
   // Channel Assignments Section

rdadmin/edit_rdpanel.cpp

@@ -54,7 +54,7 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station,
   //
   // Models
   //
-  air_service_model=new RDServiceListModel(true,this);
+  air_service_model=new RDServiceListModel(true,false,this);
 
   //
   // Channel Assignments Section

rdadmin/list_svcs.cpp

@@ -80,7 +80,7 @@ ListSvcs::ListSvcs(QWidget *parent)
   list_title_label=new QLabel(tr("Services:"),this);
   list_title_label->setFont(labelFont());
   list_title_label->setGeometry(14,11,85,19);
-  list_services_model=new RDServiceListModel(false,this);
+  list_services_model=new RDServiceListModel(false,false,this);
   list_services_model->setFont(defaultFont());
   list_services_model->setPalette(palette());
   list_services_view->setModel(list_services_model);

rdlogmanager/list_grids.cpp

@@ -39,7 +39,7 @@ ListGrids::ListGrids(QWidget *parent)
   edit_grids_view=new RDTableView(this);
   edit_grids_view->
     setGeometry(10,10,sizeHint().width()-20,sizeHint().height()-80);
-  edit_grids_model=new RDServiceListModel(false,this);
+  edit_grids_model=new RDServiceListModel(false,true,this);
   edit_grids_model->setFont(font());
   edit_grids_model->setPalette(palette());
   edit_grids_view->setModel(edit_grids_model);

rdlogmanager/list_svcs.cpp

@@ -39,7 +39,7 @@ ListSvcs::ListSvcs(QWidget *parent)
   // Log List
   //
   list_log_view=new RDTableView(this);
-  list_log_model=new RDServiceListModel(false,this);
+  list_log_model=new RDServiceListModel(false,false,this);
   list_log_model->setFont(font());
   list_log_model->setPalette(palette());
   list_log_view->setModel(list_log_model);