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 diff --git a/PROMS/Baseline/frmBaseline.cs b/PROMS/Baseline/frmBaseline.cs index d404ac9b..f47f77cb 100644 --- a/PROMS/Baseline/frmBaseline.cs +++ b/PROMS/Baseline/frmBaseline.cs @@ -489,7 +489,7 @@ namespace Baseline string[] fileList = Directory.GetFiles(fi.DirectoryName, patern); // sort the list of file list Array.Sort((string[])fileList); - return fileList.First(); // the PDF file that we what should be top of the list then. + return fileList.FirstOrDefault(); // the PDF file that we what should be top of the list then. } /// diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 0f44b292..73889372 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..f6589524 --- /dev/null +++ b/PROMS/Volian.Base.Library/BaseLnSettings.cs @@ -0,0 +1,8 @@ + +namespace Volian.Base.Library +{ + public static class BaseLnSettings + { + public static bool blBaseLine { get; set; } = false; + } +} \ No newline at end of file diff --git a/PROMS/Volian.Base.Library/Volian.Base.Library.csproj b/PROMS/Volian.Base.Library/Volian.Base.Library.csproj index dc0e17c4..a643b023 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/GlobalSuppressions.cs b/PROMS/XYPlots/GlobalSuppressions.cs new file mode 100644 index 00000000..046248af --- /dev/null +++ b/PROMS/XYPlots/GlobalSuppressions.cs @@ -0,0 +1,8 @@ +// This file is used by Code Analysis to maintain SuppressMessage +// attributes that are applied to this project. +// Project-level suppressions either have no target or are given +// a specific target and scoped to a namespace, type, member, etc. + +using System.Diagnostics.CodeAnalysis; + +[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Not modifying Naming Styles")] diff --git a/PROMS/XYPlots/XYPlots.cs b/PROMS/XYPlots/XYPlots.cs index 9135f7fe..c66ed9f3 100644 --- a/PROMS/XYPlots/XYPlots.cs +++ b/PROMS/XYPlots/XYPlots.cs @@ -5,6 +5,7 @@ using System.Windows.Forms; using System.Text; using System.Drawing; using System.Text.RegularExpressions; +using Volian.Base.Library; using VG; namespace XYPlots @@ -237,9 +238,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) // 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 @@ -248,9 +252,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) // 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; @@ -264,8 +271,11 @@ namespace XYPlots } catch (Exception e) { - MessageBox.Show(e.Message, String.Format("Error Reading {0}", FileName)); - return false; + if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline. + { + MessageBox.Show(e.Message, String.Format("Error Reading {0}", FileName)); + return false; + } } try { @@ -273,8 +283,11 @@ namespace XYPlots } catch (Exception e) { - MessageBox.Show(e.Message, String.Format("Error Closing {0}", FileName)); - return false; + if (!BaseLnSettings.blBaseLine) // 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++) @@ -387,7 +400,7 @@ namespace XYPlots char retval; StringBuilder Lbuff = new StringBuilder(); retval = NextChar(); - if (retval != '"' && retval != '\x1C') // 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') @@ -1362,8 +1375,14 @@ namespace XYPlots CurPenWidth = (int)(pd * ConvertToTwips); } } - private void PrintStackError(string relation, int limit) => MessageBox.Show(String.Format("Position Stack Pointer {0} {1}", relation, limit.ToString()), "Print Stack Error"); - private void SavePosition() + private void PrintStackError(string relation, int limit) + { + 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"); + } + } + private void SavePosition() { if (stack >= MAX_XY_STACK) PrintStackError(">=", MAX_XY_STACK); SavedX[stack] = Position[X]; @@ -1570,8 +1589,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) // 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) { @@ -1822,7 +1844,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 @@ -1888,10 +1910,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..7b3edae8 100644 --- a/PROMS/XYPlots/XYPlots.csproj +++ b/PROMS/XYPlots/XYPlots.csproj @@ -161,6 +161,7 @@ frmXYPlot.cs + Code @@ -176,6 +177,10 @@ {52D74078-3822-410E-889B-464BD21AAB9E} VG + + {aeee9fd1-6892-45e2-a67e-418c06d46ff9} + Volian.Base.Library +