From 2cf164c4458a3d0d8f7f994bc0aee2612c591f05 Mon Sep 17 00:00:00 2001 From: mschill Date: Thu, 31 Oct 2024 15:11:04 -0400 Subject: [PATCH 1/3] =?UTF-8?q?C2024-035=20RO=20Editor=20=E2=80=93=20Enhan?= =?UTF-8?q?cement=20to=20Handle=20renaming=20of=20Setpoint=20Value.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/ReferencedObjects/Exe/RefObj/ROEditor/RODefFrm.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/RODefFrm.cs b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/RODefFrm.cs index 8c2a5c57..9efa06a8 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/RODefFrm.cs +++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/RODefFrm.cs @@ -1251,6 +1251,9 @@ namespace ROEditor { tbMenuVal.Text = tbMenuVal.Text.Replace($"<{origname}>", $"<{newname}>"); tbRetVal.Text = tbRetVal.Text.Replace($"<{origname}>", $"<{newname}>"); + //CSM-C2024-035 This is needed for items like Setpoint Value that may have commas with field lengths in them + tbMenuVal.Text = tbMenuVal.Text.Replace($"<{origname},", $"<{newname},"); + tbRetVal.Text = tbRetVal.Text.Replace($"<{origname},", $"<{newname},"); } } else -- 2.47.2 From 0b12805d4a7b49920865077765aac2cb2a2c5a78 Mon Sep 17 00:00:00 2001 From: mschill Date: Thu, 31 Oct 2024 15:44:28 -0400 Subject: [PATCH 2/3] =?UTF-8?q?C2024-034=20RO=20Editor=20=E2=80=93=20Enhan?= =?UTF-8?q?cement=20for=20when=20=E2=80=9CStandard=20Fields=E2=80=9D=20are?= =?UTF-8?q?=20modified.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs index d80335e4..2a5d8c8b 100644 --- a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs +++ b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs @@ -2667,8 +2667,9 @@ namespace RODBInterface bool isused = RODB_CheckForStandardName(oldname); if (isused == true) { - MessageBox.Show("The field name is used to define new Setpoints or Graphics Database.\n The update will be for this local (database) group only.", "Field name modification."); + DialogResult result = MessageBox.Show($"The field name is used to define new Setpoints or Graphics Database.\n\n The update will be for this local (database) group only.\n\n Select OK to update local definition for all items in that table ({GetTopParentName(myelem)}).", "Field name modification.", MessageBoxButtons.OKCancel, MessageBoxIcon.Question); changegeneric = false; + if(result == DialogResult.Cancel) return false; } } -- 2.47.2 From b7b67cce690e04b8a0661f36a869cfe90a1b7bdf Mon Sep 17 00:00:00 2001 From: John Jenko Date: Fri, 1 Nov 2024 10:12:52 -0400 Subject: [PATCH 3/3] =?UTF-8?q?F2024-084=20-=20Adjusted=20tab=20spacing=20?= =?UTF-8?q?in=20Beaver=20Valley=E2=80=99s=20AOP=20format=20and=20added=20a?= =?UTF-8?q?=20space=20after=20the=20bullet=20in=20the=20Bulleted=20High-le?= =?UTF-8?q?vel=20step=20in=20the=20Beaver=20Valley=20SAMG=20format.=20=20F?= =?UTF-8?q?or=20the=20AOP=20format=20needed=20to=20remove=20the=20general?= =?UTF-8?q?=20tab=20format=20setting=20TabPtsPerChar=20(that=20affects=20a?= =?UTF-8?q?ll=20of=20the=20sub-step=20tab=20spacing)=20in=20order=20to=20h?= =?UTF-8?q?ave=20all=20of=20the=20AOP=20sub-step=20tab=20spacing=20the=20s?= =?UTF-8?q?ame=20as=20the=20EOP=20format.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/BVPSAOPall.xml | Bin 148524 -> 148484 bytes PROMS/Formats/fmtall/BVPSSAMGall.xml | Bin 126900 -> 126908 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/BVPSAOPall.xml b/PROMS/Formats/fmtall/BVPSAOPall.xml index b2beda6fac46ec43eb9d6f28d9e354cc66164ce9..eb9702ca637350962395bca32f1fe8059129ed69 100644 GIT binary patch delta 22 dcmZ3}!P(NmxuH(8d6{PWGEK(q%QTtVqyT9|2zvkk delta 60 zcmZqa;9S$exuH%|HH0CNA&DV?p@g9rNTxCrF*q}10L6+JY#Edo%o+3;Oc<1!t2NuJ NH5s>8Ych380RYER4le)z diff --git a/PROMS/Formats/fmtall/BVPSSAMGall.xml b/PROMS/Formats/fmtall/BVPSSAMGall.xml index cc6239ca7422fea4ccd1c8ac55c733c61ea0edc2..e9c68548032e18ce94af0bcf467d02ba640293ad 100644 GIT binary patch delta 30 mcmdmTpMB4L_6;rFlOF`JP2T4eGg(YPsQE+p_7B~RN0I^TEe_cL delta 34 scmV+-0Nww*-v_kc2e5>Tld?<_lMq7$lhQ&Ylj2ewgW`*~;)?;=V<4Uoi2wiq -- 2.47.2