Volian/SourceCode
8
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

B2026-091 RO Editor - Change Default Prefix to take existing prefixes into account for Setpoint/Graphics DBs

Browse Source
This commit is contained in:
mschill committed 2026-10-22 07:30:36 -04:00
1 parent cb5bb715cf
commit 87e163af15
3 files changed
+72 -40
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/GroupDefFrm.cs
+6 -2
View File
@@ -127,12 +127,13 @@ namespace ROEditor
private string origPrefix;
private string origValue;
private int dbtype;
private bool IsNewGroup = false;
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.Container components = null;
public GroupDefFrm(VlnXmlElement pelem, RODB rodb, string gpname,int idbtype)
public GroupDefFrm(VlnXmlElement pelem, RODB rodb, string gpname,int idbtype, bool newgrp = false)
{
myrodb = rodb;
elem = pelem;
@@ -143,6 +144,7 @@ namespace ROEditor
//
InitializeComponent();
FillInData();
IsNewGroup = newgrp;
}
private string CvtUserFldToFld(string fldname)
@@ -655,10 +657,11 @@ namespace ROEditor
tmpn.FirstChild.Value = tmpstr2; //tmpn.FirstChild.Value.Replace(CvtUserFldToFld(origGroup), this.tbGroup.Text);
modified=true;
}
if ((elem.HasAttribute("AccPageIDPrefix")&&this.tbPrefix.Text != origPrefix) || this.tbPrefix.Modified==true)
if ((elem.HasAttribute("AccPageIDPrefix")&&(tbPrefix.Text != origPrefix || IsNewGroup)) || tbPrefix.Modified)
{
elem.SetAttribute("AccPageIDPrefix",this.tbPrefix.Text);
modified=true;
IsNewGroup = false;
if (myrodb.IsDuplicateAccPagePrefix(elem, tbPrefix.Text))
{
@@ -666,6 +669,7 @@ namespace ROEditor
elem.SetAttribute("AccPageIDPrefix", origPrefix);
modified = false;
MessageBox.Show($"The Prefix field used for the \"Accessory Pages Access\" values should be unique. The fields used in these values can be found under \"Properties\" of an RO Group. If these are not unique, you may have trouble utilizing these ROs within Word Sections in PROMS. Cannot save.", "Problem saving data");
DialogResult = DialogResult.Cancel;
return;
}
}
PROMS/ReferencedObjects/Exe/RefObj/ROEditor/GroupNewFrm.cs
+64 -38
View File
@@ -44,9 +44,7 @@
*********************************************************************************************/
using System;
using System.Drawing;
using System.Collections;
using System.ComponentModel;
using System.Windows.Forms;
using System.Xml;
using System.Text;
@@ -297,11 +295,11 @@ namespace ROEditor
return;
}
lastSavedGroup = this.tbGroup.Text;
int dbtype=-1;
int dbtype = -1;
if (this.rbbtnGraphics.Checked == true) dbtype = 1;
else if (this.rbbtnSetpoint.Checked == true) dbtype = 2;
else if (this.rbbtnUserDef.Checked == true) dbtype = 3;
if (dbtype<0)
if (dbtype < 0)
{
MessageBox.Show("Need to define type of group.");
return;
@@ -321,55 +319,55 @@ namespace ROEditor
return;
}
// for the given type, copy over the required fields.
success = myrodb.RODB_CopyFieldDefs("ROMaster",tbname,dbtype);
success = myrodb.RODB_CopyFieldDefs("ROMaster", tbname, dbtype);
if (success == false)
{
Cursor.Current = Cursors.Default;
return;
}
// create top level group node with input name.
nelem = (VlnXmlElement) elem.OwnerDocument.CreateElement("vlnGroup");
nelem = (VlnXmlElement)elem.OwnerDocument.CreateElement("vlnGroup");
nelem.InnerText = CvtUserFldToFld(this.tbGroup.Text);
nelem.SetAttribute("Table",tbname);
nelem.SetAttribute("Table", tbname);
nelem.SetAttribute("ParentID", "00000000");
string nrecid = myrodb.RODB_GetNextRecId(tbname);
nelem.SetAttribute("RecID", nrecid);
elem.AppendChild((XmlNode) nelem);
elem.AppendChild((XmlNode)nelem);
success = myrodb.RODB_InsertGroup(nelem);
Cursor.Current = Cursors.Default;
if (success == false) return;
nelem.SetAttribute("TreeNotData", "True");
nelem.SetAttribute("MenuTitle", this.tbGroup.Text);
nelem.SetAttribute("MasterRecID",toprecid);
nelem.SetAttribute("MasterRecID", toprecid);
nelem.SetAttribute("HasChild", "False");
// if this is a setpoint db or image db, get fields and find those fields needed
// to define ro & group. This is hardcoded, yuk.
if(dbtype == 1 || dbtype == 2)
if (dbtype == 1 || dbtype == 2)
{
ArrayList FieldList = myrodb.RODB_GetFields(nelem, (uint) RecordType.Schema);
string[] fldlist=null, grplist=null;
ArrayList FieldList = myrodb.RODB_GetFields(nelem, (uint)RecordType.Schema);
string[] fldlist = null, grplist = null;
ROField rof;
string curfld;
StringBuilder Inuse = new StringBuilder();
// Get list of inuse fields for the rro.
if (dbtype == 1)
fldlist = new string[] {"Name", "Image ID", "Image"};
fldlist = new string[] { "Name", "Image ID", "Image" };
else
fldlist = new string[] {"Setpoint ID", "Setpoint Value", "Associated System Component", "Applicability", "Revision", "Short Description",
"Description", "Key Assumptions", "Basis", "References"};
for (int i=0; i< fldlist.Length; i++)
for (int i = 0; i < fldlist.Length; i++)
{
curfld = fldlist[i];
for (int j=0; j<FieldList.Count; j++)
for (int j = 0; j < FieldList.Count; j++)
{
rof = (ROField) FieldList[j];
rof = (ROField)FieldList[j];
if (rof.GetFieldname == curfld)
{
if (i==fldlist.Length-1) // last one don't add ' '
if (i == fldlist.Length - 1) // last one don't add ' '
Inuse.Append(rof.GetRecID);
else
Inuse.Append(rof.GetRecID+" ");
Inuse.Append(rof.GetRecID + " ");
break;
}
}
@@ -377,51 +375,79 @@ namespace ROEditor
nelem.SetAttribute("FieldsInUse", Inuse.ToString());
// Get list of group inuse fields.
Inuse.Remove(0,Inuse.Length);
Inuse.Remove(0, Inuse.Length);
if (dbtype == 1)
grplist = new string[] {"Group"};
grplist = new string[] { "Group" };
else
grplist = new string[] {"Parameter"};
for (int i=0; i< grplist.Length; i++)
grplist = new string[] { "Parameter" };
for (int i = 0; i < grplist.Length; i++)
{
curfld = grplist[i];
for (int j=0; j<FieldList.Count; j++)
for (int j = 0; j < FieldList.Count; j++)
{
rof = (ROField) FieldList[j];
rof = (ROField)FieldList[j];
if (rof.GetFieldname == curfld)
{
if (i == grplist.Length-1) // last, don't add ' '
if (i == grplist.Length - 1) // last, don't add ' '
Inuse.Append(rof.GetRecID);
else
Inuse.Append(rof.GetRecID+" ");
Inuse.Append(rof.GetRecID + " ");
break;
}
}
}
nelem.SetAttribute("GroupFieldsInUse", Inuse.ToString());
string defaultPfix = "UD";
if (dbtype == 2) // Setpoint
{
nelem.SetAttribute("RetVal","<Setpoint__Value>");
nelem.SetAttribute("MenuItem","<Setpoint__Value,5,17> <Short__Description>");
nelem.SetAttribute("GroupMenuItem","<Parameter>");
nelem.SetAttribute("AccPageIDPrefix","SP2");
nelem.SetAttribute("AccPageID","<Setpoint__ID>");
nelem.SetAttribute("RetVal", "<Setpoint__Value>");
nelem.SetAttribute("MenuItem", "<Setpoint__Value,5,17> <Short__Description>");
nelem.SetAttribute("GroupMenuItem", "<Parameter>");
defaultPfix = "SP";
nelem.SetAttribute("AccPageIDPrefix", "SP2");
nelem.SetAttribute("AccPageID", "<Setpoint__ID>");
}
else if (dbtype == 1) // image
{
nelem.SetAttribute("RetVal","<Image>");
nelem.SetAttribute("MenuItem","<Name>");
nelem.SetAttribute("GroupMenuItem","<Group>");
nelem.SetAttribute("AccPageIDPrefix","IG2");
nelem.SetAttribute("AccPageID","<Image__ID>");
nelem.SetAttribute("RetVal", "<Image>");
nelem.SetAttribute("MenuItem", "<Name>");
nelem.SetAttribute("GroupMenuItem", "<Group>");
defaultPfix = "IG";
nelem.SetAttribute("AccPageIDPrefix", "IG2");
nelem.SetAttribute("AccPageID", "<Image__ID>");
}
//B2026-091 RO Editor - Change Default Prefix to take existing prefixes into account for Setpoint/Graphics DBs
//if duplicate prefix - then change it so it will be unique
int x = 2;
while (nelem.HasAttribute("AccPageIDPrefix") && myrodb.IsDuplicateAccPagePrefix(nelem, nelem.GetAttribute("AccPageIDPrefix")))
{
nelem.SetAttribute("AccPageIDPrefix", $"{defaultPfix}{x}");
x++;
}
success = myrodb.RODB_WriteRO(nelem);
if (success == false) return;
}
// now let the user specify the group name, etc to define the group.
GroupDefFrm grdef = new GroupDefFrm(nelem,myrodb,nelem.InnerText,dbtype);
grdef.ShowDialog();
DialogResult dlgrslt = DialogResult.OK;
using (GroupDefFrm grdef = new GroupDefFrm(nelem, myrodb, nelem.InnerText, dbtype, true))
{
dlgrslt = grdef.ShowDialog();
}
//If New Group and prefix would not be unique, remove the group
//needed because groups get autoadded with defaults
//before user has a chance to enter things like Acc Page Prefix
if (dlgrslt == DialogResult.Cancel)
{
XmlNode pn = nelem.ParentNode;
XmlNode nd = (XmlNode)nelem;
myrodb.RODB_DeleteGroup(nd, null, null);
pn.RemoveChild(nelem);
DialogResult = DialogResult.Cancel;
Close();
}
}
private void txtBox_KeyDown(object sender, KeyEventArgs e)
{
PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs
+2
View File
@@ -2117,6 +2117,8 @@ namespace RODBInterface
if (retele != null && tbl != ro.GetAttribute("Table") && retele.GetAttribute("AccPageIDPrefix").ToLower() == pfix.ToLower())
{
DBE.CommandDispose();
DBE.ReaderClose();
return true; //another table contains the prefix - return true
}
}