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
+2 -1
View File
@@ -401,4 +401,5 @@ FodyWeavers.xsd
/fmtall /fmtall
/genmacall /genmacall
*AssemblyInfo.cs *AssemblyInfo.cs
/PROMS/Baseline/Baseline.sln
+2 -1
View File
@@ -3578,6 +3578,7 @@ namespace VEPROMS
{ {
if (parameter.StartsWith("/P=")) if (parameter.StartsWith("/P="))
{ {
BaseLnSettings.blBaseLine = true;
MSWordToPDF.Automatic = true; MSWordToPDF.Automatic = true;
PromsPrinter.BaselineTesting = true;// Set Baseline Testing property for PROMsPrinter PromsPrinter.BaselineTesting = true;// Set Baseline Testing property for PROMsPrinter
string[] dvstrs = parameter.Substring(3).Split(",".ToCharArray()); string[] dvstrs = parameter.Substring(3).Split(",".ToCharArray());
@@ -3623,7 +3624,7 @@ namespace VEPROMS
} }
ranAuto = true; ranAuto = true;
} }
BaseLnSettings.blBaseLine = false;
if (ranAuto) if (ranAuto)
{ {
this.Close(); 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" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="BaseLnSettings.cs" />
<Compile Include="BigNum.cs" /> <Compile Include="BigNum.cs" />
<Compile Include="ByteArrayCompare.cs" /> <Compile Include="ByteArrayCompare.cs" />
<Compile Include="DebugPrint.cs" /> <Compile Include="DebugPrint.cs" />
+42 -19
View File
@@ -6,6 +6,7 @@ using System.Windows.Forms;
using System.Text; using System.Text;
using System.Drawing; using System.Drawing;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Volian.Base.Library;
using VG; using VG;
namespace XYPlots namespace XYPlots
@@ -282,9 +283,12 @@ namespace XYPlots
{ {
if (!File.Exists(FileName)) if (!File.Exists(FileName))
{ {
// File does not exist, show error message if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
MessageBox.Show(String.Format("X/Y Plot File {0} Does Not Exist", FileName), "Error Opening X/Y Plot File"); {
return false; // 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 // Open the X/Y Plot file
try try
@@ -293,9 +297,12 @@ namespace XYPlots
} }
catch (Exception e) catch (Exception e)
{ {
// cannot open the x/y plot file if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
MessageBox.Show(e.Message, String.Format("Error Opening {0} for Reading", FileName)); {
return false; // 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 blen = (int)XYPlotFile.Length;
int bread = 0; int bread = 0;
@@ -309,8 +316,11 @@ namespace XYPlots
} }
catch (Exception e) catch (Exception e)
{ {
MessageBox.Show(e.Message, String.Format("Error Reading {0}", FileName)); if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
return false; {
MessageBox.Show(e.Message, String.Format("Error Reading {0}", FileName));
return false;
}
} }
try try
{ {
@@ -318,8 +328,11 @@ namespace XYPlots
} }
catch (Exception e) catch (Exception e)
{ {
MessageBox.Show(e.Message, String.Format("Error Closing {0}", FileName)); if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
return false; {
MessageBox.Show(e.Message, String.Format("Error Closing {0}", FileName));
return false;
}
} }
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (int i = 0; i < bbuf.Length; i++) for (int i = 0; i < bbuf.Length; i++)
@@ -446,7 +459,7 @@ namespace XYPlots
char retval; char retval;
StringBuilder Lbuff = new StringBuilder(); StringBuilder Lbuff = new StringBuilder();
retval = NextChar(); 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"); MessageBox.Show("Double Quote not found", "Syntax problem in XY Plot");
retval = NextChar(); retval = NextChar();
while (retval != 0 && retval != '\n') while (retval != 0 && retval != '\n')
@@ -1440,7 +1453,10 @@ namespace XYPlots
} }
private void PrintStackError(string relation, int limit) 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) // 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() private void SavePosition()
{ {
@@ -1658,8 +1674,11 @@ namespace XYPlots
} }
private void err_exit(string msg, string msg2) private void err_exit(string msg, string msg2)
{ {
MessageBox.Show(msg + "\n" + msg2 + "\n\n This p=Process Will Terminate", "\n## ERROR ## - "); if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
Environment.Exit(255); {
MessageBox.Show(msg + "\n" + msg2 + "\n\n This p=Process Will Terminate", "\n## ERROR ## - ");
Environment.Exit(255);
}
} }
private void FindBoxesinArea(int ptval, int flag) 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 // 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 //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); LoadBuffFromString(PlotCommands);
Setup(); Setup();
//#if DEBUG //#if DEBUG
@@ -1991,10 +2010,14 @@ namespace XYPlots
AxisLabel[1] = getint(); AxisLabel[1] = getint();
break; break;
default: default:
if (PrevCommand.Equals(null)) if (BaseLnSettings.blBaseLine == false) // B2026-056 suppress messages when running baseline.
MessageBox.Show("Check the first line of the X/Y Plot definition.", "Unrecognized Graph Command"); {
else if (PrevCommand.Equals(null))
MessageBox.Show(string.Format("Problem with the X/Y Plot Command after {0}", PrevCommand.ToString()), "Unrecognized Graph Command"); 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; break;
} }
PrevCommand = Command; PrevCommand = Command;
+4
View File
@@ -176,6 +176,10 @@
<Project>{52D74078-3822-410E-889B-464BD21AAB9E}</Project> <Project>{52D74078-3822-410E-889B-464BD21AAB9E}</Project>
<Name>VG</Name> <Name>VG</Name>
</ProjectReference> </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>
<ItemGroup> <ItemGroup>
<Folder Include="Properties\" /> <Folder Include="Properties\" />