Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
Conversation 6 Commits 8 Files Changed 6
+67 -20
5 changed files with 67 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cd9eaaaba1 - Show all commits
PROMS/VEPROMS User Interface/frmVEPROMS.cs
+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();
PROMS/Volian.Base.Library/BaseLnSettings.cs
+18
View File
@@ -0,0 +1,18 @@
using System;
mschill marked this conversation as resolved Outdated
mschill commented 2026-08-07 13:54:24 -04:00
Outdated
Review
Copy Link
Copy Source

These usings appear to be unnecessary.

These usings appear to be unnecessary.
mschill commented 2026-08-10 05:49:02 -04:00
Review
Copy Link
Copy Source

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.
Unnecessary_usings.jpg
72 KiB
Unnecessary_usings.jpg
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
mschill commented 2026-08-07 13:54:41 -04:00
Review
Copy Link
Copy Source

can this be an autoproperty?

can this be an autoproperty?
{
get { return _blBaseLine; }
set { _blBaseLine = value; }
}
}
}
PROMS/Volian.Base.Library/Volian.Base.Library.csproj
+1
View File
@@ -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" />
PROMS/XYPlots/XYPlots.cs
+42 -19
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
@@ -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;
PROMS/XYPlots/XYPlots.csproj
+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\" />