From 70aa1f4024f224d82b3f5d810d14005770afafa1 Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Wed, 5 Aug 2026 17:23:13 -0400 Subject: [PATCH 1/5] B2026-056-Syntax-problem-in-XY-plot --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 919325b1..2d70bb0b 100644 --- a/.gitignore +++ b/.gitignore @@ -401,4 +401,5 @@ FodyWeavers.xsd /fmtall /genmacall -*AssemblyInfo.cs \ No newline at end of file +*AssemblyInfo.cs +/PROMS/Baseline/Baseline.sln From cd9eaaaba175a928f3203dc7a2504bad5d0b2e76 Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Wed, 5 Aug 2026 21:42:44 -0400 Subject: [PATCH 2/5] B2026-056-Syntac-problem-in-XY-Plot --- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 3 +- PROMS/Volian.Base.Library/BaseLnSettings.cs | 18 ++++++ .../Volian.Base.Library.csproj | 1 + PROMS/XYPlots/XYPlots.cs | 61 +++++++++++++------ PROMS/XYPlots/XYPlots.csproj | 4 ++ 5 files changed, 67 insertions(+), 20 deletions(-) create mode 100644 PROMS/Volian.Base.Library/BaseLnSettings.cs diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index c5a6f11d..facb6027 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -3578,6 +3578,7 @@ namespace VEPROMS { if (parameter.StartsWith("/P=")) { + BaseLnSettings.blBaseLine = true; MSWordToPDF.Automatic = true; PromsPrinter.BaselineTesting = true;// Set Baseline Testing property for PROMsPrinter string[] dvstrs = parameter.Substring(3).Split(",".ToCharArray()); @@ -3623,7 +3624,7 @@ namespace VEPROMS } ranAuto = true; } - + BaseLnSettings.blBaseLine = false; if (ranAuto) { this.Close(); diff --git a/PROMS/Volian.Base.Library/BaseLnSettings.cs b/PROMS/Volian.Base.Library/BaseLnSettings.cs new file mode 100644 index 00000000..ba4da28f --- /dev/null +++ b/PROMS/Volian.Base.Library/BaseLnSettings.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Volian.Base.Library +{ + public static class BaseLnSettings + { + private static bool _blBaseLine = false; + public static bool blBaseLine + { + get { return _blBaseLine; } + set { _blBaseLine = value; } + } + } +} diff --git a/PROMS/Volian.Base.Library/Volian.Base.Library.csproj b/PROMS/Volian.Base.Library/Volian.Base.Library.csproj index 525629a6..91c1a431 100644 --- a/PROMS/Volian.Base.Library/Volian.Base.Library.csproj +++ b/PROMS/Volian.Base.Library/Volian.Base.Library.csproj @@ -90,6 +90,7 @@ + diff --git a/PROMS/XYPlots/XYPlots.cs b/PROMS/XYPlots/XYPlots.cs index 8ac65c0d..85600fd5 100644 --- a/PROMS/XYPlots/XYPlots.cs +++ b/PROMS/XYPlots/XYPlots.cs @@ -6,6 +6,7 @@ using System.Windows.Forms; using System.Text; using System.Drawing; using System.Text.RegularExpressions; +using Volian.Base.Library; using VG; namespace XYPlots @@ -282,9 +283,12 @@ namespace XYPlots { if (!File.Exists(FileName)) { - // File does not exist, show error message - MessageBox.Show(String.Format("X/Y Plot File {0} Does Not Exist", FileName), "Error Opening X/Y Plot File"); - return false; + if (BaseLnSettings.blBaseLine == false) // B2026-056 suppress messages when running baseline. + { + // File does not exist, show error message + MessageBox.Show(String.Format("X/Y Plot File {0} Does Not Exist", FileName), "Error Opening X/Y Plot File"); + return false; + } } // Open the X/Y Plot file try @@ -293,9 +297,12 @@ namespace XYPlots } catch (Exception e) { - // cannot open the x/y plot file - MessageBox.Show(e.Message, String.Format("Error Opening {0} for Reading", FileName)); - return false; + if (BaseLnSettings.blBaseLine == false) // B2026-056 suppress messages when running baseline. + { + // cannot open the x/y plot file + MessageBox.Show(e.Message, String.Format("Error Opening {0} for Reading", FileName)); + return false; + } } int blen = (int)XYPlotFile.Length; int bread = 0; @@ -309,8 +316,11 @@ namespace XYPlots } catch (Exception e) { - MessageBox.Show(e.Message, String.Format("Error Reading {0}", FileName)); - return false; + if (BaseLnSettings.blBaseLine == false) // B2026-056 suppress messages when running baseline. + { + MessageBox.Show(e.Message, String.Format("Error Reading {0}", FileName)); + return false; + } } try { @@ -318,8 +328,11 @@ namespace XYPlots } catch (Exception e) { - MessageBox.Show(e.Message, String.Format("Error Closing {0}", FileName)); - return false; + if (BaseLnSettings.blBaseLine == false) // B2026-056 suppress messages when running baseline. + { + MessageBox.Show(e.Message, String.Format("Error Closing {0}", FileName)); + return false; + } } StringBuilder sb = new StringBuilder(); for (int i = 0; i < bbuf.Length; i++) @@ -446,7 +459,7 @@ namespace XYPlots char retval; StringBuilder Lbuff = new StringBuilder(); retval = NextChar(); - if (retval != '"' && retval != '\x1C') // open double quote + if (retval != '"' && retval != '\x1C' && BaseLnSettings.blBaseLine == false) // open double quote MessageBox.Show("Double Quote not found", "Syntax problem in XY Plot"); retval = NextChar(); while (retval != 0 && retval != '\n') @@ -1440,7 +1453,10 @@ namespace XYPlots } private void PrintStackError(string relation, int limit) { - MessageBox.Show(String.Format("Position Stack Pointer {0} {1}", relation, limit.ToString()), "Print Stack Error"); + if (BaseLnSettings.blBaseLine == false) // B2026-056 suppress messages when running baseline. + { + MessageBox.Show(String.Format("Position Stack Pointer {0} {1}", relation, limit.ToString()), "Print Stack Error"); + } } private void SavePosition() { @@ -1658,8 +1674,11 @@ namespace XYPlots } private void err_exit(string msg, string msg2) { - MessageBox.Show(msg + "\n" + msg2 + "\n\n This p=Process Will Terminate", "\n## ERROR ## - "); - Environment.Exit(255); + if (BaseLnSettings.blBaseLine == false) // B2026-056 suppress messages when running baseline. + { + MessageBox.Show(msg + "\n" + msg2 + "\n\n This p=Process Will Terminate", "\n## ERROR ## - "); + Environment.Exit(255); + } } private void FindBoxesinArea(int ptval, int flag) { @@ -1916,7 +1935,7 @@ namespace XYPlots { // MSWord enters left and right double-quotes when you press the double-quote key //B2017 - Replace left and right double-quotes with normal double-quotes - PlotCommands = PlotCommands.Replace('\u201C', '"').Replace('\u201D', '"'); + PlotCommands = PlotCommands.Replace('\u201C', '"').Replace('\u201D', '"'); LoadBuffFromString(PlotCommands); Setup(); //#if DEBUG @@ -1991,10 +2010,14 @@ namespace XYPlots AxisLabel[1] = getint(); break; default: - if (PrevCommand.Equals(null)) - MessageBox.Show("Check the first line of the X/Y Plot definition.", "Unrecognized Graph Command"); - else - MessageBox.Show(string.Format("Problem with the X/Y Plot Command after {0}", PrevCommand.ToString()), "Unrecognized Graph Command"); + if (BaseLnSettings.blBaseLine == false) // B2026-056 suppress messages when running baseline. + { + if (PrevCommand.Equals(null)) + MessageBox.Show("Check the first line of the X/Y Plot definition.", "Unrecognized Graph Command"); + else + MessageBox.Show(string.Format("Problem with the X/Y Plot Command after {0}", PrevCommand.ToString()), "Unrecognized Graph Command"); + break; + } break; } PrevCommand = Command; diff --git a/PROMS/XYPlots/XYPlots.csproj b/PROMS/XYPlots/XYPlots.csproj index 93469b8a..b94ba2be 100644 --- a/PROMS/XYPlots/XYPlots.csproj +++ b/PROMS/XYPlots/XYPlots.csproj @@ -176,6 +176,10 @@ {52D74078-3822-410E-889B-464BD21AAB9E} VG + + {aeee9fd1-6892-45e2-a67e-418c06d46ff9} + Volian.Base.Library + From 70f132540fc864b5442c3f27022e74ee9b0dee04 Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Fri, 7 Aug 2026 12:15:52 -0400 Subject: [PATCH 3/5] B2026-056-Syntax-problem-in-XY-plot --- PROMS/XYPlots/XYPlots.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/PROMS/XYPlots/XYPlots.cs b/PROMS/XYPlots/XYPlots.cs index 85600fd5..f9269c6c 100644 --- a/PROMS/XYPlots/XYPlots.cs +++ b/PROMS/XYPlots/XYPlots.cs @@ -283,7 +283,7 @@ namespace XYPlots { if (!File.Exists(FileName)) { - if (BaseLnSettings.blBaseLine == false) // B2026-056 suppress messages when running baseline. + if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline. { // File does not exist, show error message MessageBox.Show(String.Format("X/Y Plot File {0} Does Not Exist", FileName), "Error Opening X/Y Plot File"); @@ -297,7 +297,7 @@ namespace XYPlots } catch (Exception e) { - if (BaseLnSettings.blBaseLine == false) // B2026-056 suppress messages when running baseline. + if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline. { // cannot open the x/y plot file MessageBox.Show(e.Message, String.Format("Error Opening {0} for Reading", FileName)); @@ -316,7 +316,7 @@ namespace XYPlots } catch (Exception e) { - if (BaseLnSettings.blBaseLine == false) // B2026-056 suppress messages when running baseline. + if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline. { MessageBox.Show(e.Message, String.Format("Error Reading {0}", FileName)); return false; @@ -328,7 +328,7 @@ namespace XYPlots } catch (Exception e) { - if (BaseLnSettings.blBaseLine == false) // B2026-056 suppress messages when running baseline. + if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline. { MessageBox.Show(e.Message, String.Format("Error Closing {0}", FileName)); return false; @@ -459,7 +459,7 @@ namespace XYPlots char retval; StringBuilder Lbuff = new StringBuilder(); retval = NextChar(); - if (retval != '"' && retval != '\x1C' && BaseLnSettings.blBaseLine == false) // open double quote + if (retval != '"' && retval != '\x1C' && !BaseLnSettings.blBaseLine) // open double quote MessageBox.Show("Double Quote not found", "Syntax problem in XY Plot"); retval = NextChar(); while (retval != 0 && retval != '\n') @@ -1453,7 +1453,7 @@ namespace XYPlots } private void PrintStackError(string relation, int limit) { - if (BaseLnSettings.blBaseLine == false) // B2026-056 suppress messages when running baseline. + if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline. { MessageBox.Show(String.Format("Position Stack Pointer {0} {1}", relation, limit.ToString()), "Print Stack Error"); } @@ -1674,7 +1674,7 @@ namespace XYPlots } private void err_exit(string msg, string msg2) { - if (BaseLnSettings.blBaseLine == false) // B2026-056 suppress messages when running baseline. + if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline. { MessageBox.Show(msg + "\n" + msg2 + "\n\n This p=Process Will Terminate", "\n## ERROR ## - "); Environment.Exit(255); From 6a42800d2ce154f33b0794b4f8b131da2c1a8611 Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Sun, 9 Aug 2026 22:54:27 -0400 Subject: [PATCH 4/5] B2026-056-Syntax-problem-in-XY-Plot --- PROMS/Volian.Base.Library/BaseLnSettings.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/PROMS/Volian.Base.Library/BaseLnSettings.cs b/PROMS/Volian.Base.Library/BaseLnSettings.cs index ba4da28f..a7380cbf 100644 --- a/PROMS/Volian.Base.Library/BaseLnSettings.cs +++ b/PROMS/Volian.Base.Library/BaseLnSettings.cs @@ -8,11 +8,6 @@ namespace Volian.Base.Library { public static class BaseLnSettings { - private static bool _blBaseLine = false; - public static bool blBaseLine - { - get { return _blBaseLine; } - set { _blBaseLine = value; } - } + public static bool blBaseLine { get; set; } = false; } } From 30b34c3a50dc10e6575174ae132383c5519c88ea Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Mon, 10 Aug 2026 10:02:16 -0400 Subject: [PATCH 5/5] B2026-056-Syntax-problem-in-XY-Plot --- PROMS/Volian.Base.Library/BaseLnSettings.cs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/PROMS/Volian.Base.Library/BaseLnSettings.cs b/PROMS/Volian.Base.Library/BaseLnSettings.cs index a7380cbf..f6589524 100644 --- a/PROMS/Volian.Base.Library/BaseLnSettings.cs +++ b/PROMS/Volian.Base.Library/BaseLnSettings.cs @@ -1,13 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - + namespace Volian.Base.Library { public static class BaseLnSettings { public static bool blBaseLine { get; set; } = false; } -} +} \ No newline at end of file