B2026 056 syntax problem in x/y plot #801

Merged
jjenko merged 8 commits from B2026-056-Syntax-problem-in-X/Y-plot into Development 2026-08-10 11:11:09 -04:00
6 changed files with 59 additions and 21 deletions
+1
View File
@@ -402,3 +402,4 @@ FodyWeavers.xsd
/fmtall
/genmacall
*AssemblyInfo.cs
/PROMS/Baseline/Baseline.sln
+2 -1
View File
@@ -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();
@@ -0,0 +1,8 @@
mschill marked this conversation as resolved Outdated
Outdated
Review

These usings appear to be unnecessary.

These usings appear to be unnecessary.
Review

These usings are here but appear to still be unnecessary - thus should be removed.

These usings are here but appear to still be unnecessary - thus should be removed.
namespace Volian.Base.Library
{
public static class BaseLnSettings
{
public static bool blBaseLine { get; set; } = false;
}
}
@@ -90,6 +90,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="BaseLnSettings.cs" />
<Compile Include="BigNum.cs" />
<Compile Include="ByteArrayCompare.cs" />
<Compile Include="DebugPrint.cs" />
+24 -1
View File
@@ -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
@@ -281,22 +282,28 @@ namespace XYPlots
private bool LoadBuff(string FileName)
{
if (!File.Exists(FileName))
{
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
{
XYPlotFile = File.OpenRead(FileName);
}
catch (Exception e)
{
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;
// initialize a byte array to read into
@@ -308,19 +315,25 @@ namespace XYPlots
bread = XYPlotFile.Read(bbuf, 0, blen);
}
catch (Exception e)
{
if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
{
MessageBox.Show(e.Message, String.Format("Error Reading {0}", FileName));
return false;
}
}
try
{
XYPlotFile.Close();
}
catch (Exception e)
{
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++)
{
@@ -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) // open double quote
MessageBox.Show("Double Quote not found", "Syntax problem in XY Plot");
retval = NextChar();
while (retval != 0 && retval != '\n')
@@ -1439,9 +1452,12 @@ namespace XYPlots
}
}
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);
@@ -1657,10 +1673,13 @@ namespace XYPlots
maximum[flag] = newmaximum;
}
private void err_exit(string msg, string msg2)
{
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)
{
XyBox cptr;
@@ -1991,12 +2010,16 @@ namespace XYPlots
AxisLabel[1] = getint();
break;
default:
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;
}
}
+4
View File
@@ -176,6 +176,10 @@
<Project>{52D74078-3822-410E-889B-464BD21AAB9E}</Project>
<Name>VG</Name>
</ProjectReference>
<ProjectReference Include="..\Volian.Base.Library\Volian.Base.Library.csproj">
<Project>{aeee9fd1-6892-45e2-a67e-418c06d46ff9}</Project>
<Name>Volian.Base.Library</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />