Compare commits
53
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5e071bd35a | ||
|
|
77639318c6 | ||
|
|
1a890b11cb | ||
|
|
795f21f04b | ||
|
|
c95e86c2a6 | ||
|
|
18d2aa3b51 | ||
|
|
7ba3ea8b13 | ||
|
|
30b34c3a50 | ||
|
|
6a42800d2c | ||
|
|
70f132540f | ||
|
|
cd9eaaaba1 | ||
|
|
70aa1f4024 | ||
|
|
1d634d96fe | ||
|
|
4eb5254d96 | ||
|
|
6c2eee0cbc | ||
|
|
3c5265cecf | ||
|
|
478d35890d | ||
|
|
1b9b63412c | ||
|
|
3bb8fff3a1 | ||
|
|
694bc0ead4 | ||
|
|
cfc324d31e | ||
|
|
43b63e2843 | ||
|
|
f2ec510a70 | ||
|
|
453edbb28e | ||
|
|
bc9407f52f | ||
|
|
954cc5918f | ||
|
|
4ef16e7856 | ||
|
|
1eb3c3e725 | ||
|
|
a89c2d3d22 | ||
|
|
914837a5a2 | ||
|
|
9643a71ba5 | ||
|
|
aa7e0528f8 | ||
|
|
57bd8d569e | ||
|
|
b49d8871a2 | ||
|
|
b90d419bc5 | ||
|
|
1f48d498e1 | ||
|
|
be744b40a3 | ||
|
|
780ce657ca | ||
|
|
464be0f803 | ||
|
|
58a6cb9a24 | ||
|
|
9bf7b2ffde | ||
|
|
cde1f28215 | ||
|
|
db198cb7d0 | ||
|
|
99fe567e78 | ||
|
|
2261c8f0f5 | ||
|
|
f93b16fc52 | ||
|
|
7c3a43749c | ||
|
|
ecec7b9f1a | ||
|
|
1aca7335f7 | ||
|
|
ba5aee6640 | ||
|
|
7a3a07b0da | ||
|
|
05ab48cdc5 | ||
|
|
fd51c209a3 |
@@ -402,3 +402,4 @@ FodyWeavers.xsd
|
|||||||
/fmtall
|
/fmtall
|
||||||
/genmacall
|
/genmacall
|
||||||
*AssemblyInfo.cs
|
*AssemblyInfo.cs
|
||||||
|
/PROMS/Baseline/Baseline.sln
|
||||||
|
|||||||
@@ -503,7 +503,7 @@ namespace Baseline
|
|||||||
string[] fileList = Directory.GetFiles(fi.DirectoryName, patern);
|
string[] fileList = Directory.GetFiles(fi.DirectoryName, patern);
|
||||||
// sort the list of file list
|
// sort the list of file list
|
||||||
Array.Sort((string[])fileList);
|
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.
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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();
|
||||||
|
|||||||
@@ -2163,9 +2163,13 @@ namespace VEPROMS.CSLA.Library
|
|||||||
// move past that text and try the Word Find function again.
|
// move past that text and try the Word Find function again.
|
||||||
// B2022-088: [JPR] Find Doc Ro button not working in Word Sections
|
// B2022-088: [JPR] Find Doc Ro button not working in Word Sections
|
||||||
// B2022-098: [JPR] ROs not being resolved in Word Sections
|
// B2022-098: [JPR] ROs not being resolved in Word Sections
|
||||||
|
// B2026-070: When there is a less-then sign (<) followed by a numeric value in a Word attachment (inside of a table), PROMS thinks the user put in an RO token will generate an RO not found error in the following table row who's text contains <U-Name>.
|
||||||
if (executeResult && !string.IsNullOrEmpty(sel.Text) && !sel.Text.StartsWith("<") && !sel.Text.EndsWith(">"))
|
if (executeResult && !string.IsNullOrEmpty(sel.Text) && !sel.Text.StartsWith("<") && !sel.Text.EndsWith(">"))
|
||||||
{
|
{
|
||||||
sel.MoveStart(LBWdUnits.wdCharacter, sel.Text.Length - 1);
|
int location = sel.Start + sel.Text.Length - 1; //do not do this inline - this needs captured before WholeStory
|
||||||
|
|
||||||
|
sel.WholeStory();
|
||||||
|
sel.MoveStart(LBWdUnits.wdCharacter, location);
|
||||||
tryagain = true;
|
tryagain = true;
|
||||||
}
|
}
|
||||||
} while (tryagain);
|
} while (tryagain);
|
||||||
|
|||||||
@@ -262,8 +262,10 @@ namespace VEPROMS.CSLA.Library
|
|||||||
if (dvi.DocVersionAssociations[0].MyROFst.ROFstID != newfstid)
|
if (dvi.DocVersionAssociations[0].MyROFst.ROFstID != newfstid)
|
||||||
{
|
{
|
||||||
dv.DocVersionAssociations[0].MyROFst = localROFst.GetJustROFst();
|
dv.DocVersionAssociations[0].MyROFst = localROFst.GetJustROFst();
|
||||||
SetAssociationLastCompleted(dv, DateTime.Now.ToString());
|
|
||||||
}
|
}
|
||||||
|
// B2026-066 moved this out of if statement above
|
||||||
|
// - was not resetting the datetime and thus not disabling the Update RO Values button and menu item
|
||||||
|
SetAssociationLastCompleted(dv, DateTime.Now.ToString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
|
||||||
|
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" />
|
||||||
|
|||||||
@@ -643,10 +643,9 @@ namespace Volian.Controls.Library
|
|||||||
if (_docVersionInfo != null && fstid != -1 && fstid != MyROFSTLookup.RofstID)
|
if (_docVersionInfo != null && fstid != -1 && fstid != MyROFSTLookup.RofstID)
|
||||||
{
|
{
|
||||||
string message = string.Empty;
|
string message = string.Empty;
|
||||||
if (_progressBar?.Text != "Cannot check-out Working Draft" && !MySessionInfo.CanCheckOutItem(_docVersionInfo.VersionID, CheckOutType.DocVersion, ref message))
|
if (_progressBar?.Text != "RO Check Paused - Other Users In Set" && !MySessionInfo.CanCheckOutItem(_docVersionInfo.VersionID, CheckOutType.DocVersion, ref message))
|
||||||
{
|
{
|
||||||
FlexibleMessageBox.Show(this, message, "Working Draft Has Items Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
FinalProgressBarMessage = "RO Check Paused - Other Users In Set";
|
||||||
FinalProgressBarMessage = "Cannot check-out Working Draft";
|
|
||||||
}
|
}
|
||||||
else if (!MySessionInfo.CanCheckOutItem(_docVersionInfo.VersionID, CheckOutType.DocVersion, ref message))
|
else if (!MySessionInfo.CanCheckOutItem(_docVersionInfo.VersionID, CheckOutType.DocVersion, ref message))
|
||||||
{
|
{
|
||||||
@@ -719,7 +718,7 @@ namespace Volian.Controls.Library
|
|||||||
if (tmpROID != null) ExpandNode(ROFSTLookup.FormatRoidKey(tmpROID, true));
|
if (tmpROID != null) ExpandNode(ROFSTLookup.FormatRoidKey(tmpROID, true));
|
||||||
|
|
||||||
//doc version would have updated (if needed) so reset flag
|
//doc version would have updated (if needed) so reset flag
|
||||||
if (_progressBar?.Text != "Cannot check-out Working Draft")
|
if (_progressBar?.Text != "RO Check Paused - Other Users In Set")
|
||||||
{
|
{
|
||||||
changedDocVersion = false;
|
changedDocVersion = false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2016,35 +2016,16 @@ namespace Volian.Controls.Library
|
|||||||
{
|
{
|
||||||
ReportTitle = string.Format("Search for '{0}'", TextSearchString);
|
ReportTitle = string.Format("Search for '{0}'", TextSearchString);
|
||||||
|
|
||||||
// C2020-009: Search - Allow search 'By Word'.
|
|
||||||
string byWordPrefix = string.Empty;
|
string byWordPrefix = string.Empty;
|
||||||
string byWordSuffix = string.Empty;
|
string byWordSuffix = string.Empty;
|
||||||
if (cbxByWord.Checked)
|
if (cbxByWord.Checked)
|
||||||
{
|
{
|
||||||
// Generate a prefix & suffix to be used in the sql query around the search string.
|
byWordPrefix = GetByWordSettings(TextSearchString, true);
|
||||||
// If the search string starts (prefix)/ends(suffix) with a number, then use an expression that
|
byWordSuffix = GetByWordSettings(TextSearchString, false);
|
||||||
// does not allow the preceding/following text to have a number, '.', letter or other rtf
|
|
||||||
// commands. If the search string starts/ends with a letter, then use an expression that does not
|
|
||||||
// find the preceding/following text that is text, i.e. a letter.
|
|
||||||
if (Regex.IsMatch(TextSearchString, @"^[\d\.]")) // starts with a number or '.' decimal pt
|
|
||||||
{
|
|
||||||
byWordPrefix = @"[^0-9a-zA-Z.vbpi:\\-]";
|
|
||||||
}
|
|
||||||
else if (Regex.IsMatch(TextSearchString, @"^[a-zA-Z]")) // starts with a letter
|
|
||||||
{
|
|
||||||
byWordPrefix = @"[^a-zA-Z]";
|
|
||||||
}
|
|
||||||
if (Regex.IsMatch(TextSearchString, @"[\d\.]$")) // ends with a number or decimal
|
|
||||||
{
|
|
||||||
byWordSuffix = @"[^0-9a-zA-Z.vbpi:\\-]";
|
|
||||||
}
|
|
||||||
else if (Regex.IsMatch(TextSearchString, @"[a-zA-Z]$")) // ends with a letter
|
|
||||||
{
|
|
||||||
byWordSuffix = @"[^a-zA-Z]";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SearchString = TextSearchString;
|
SearchString = TextSearchString;
|
||||||
// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
|
|
||||||
SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, TextSearchString /*.Replace(@"\",@"\u9586?")*/, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, cbxIncROTextSrch.Checked ? ItemSearchIncludeLinks.Value : ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, byWordPrefix, byWordSuffix);
|
SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, TextSearchString /*.Replace(@"\",@"\u9586?")*/, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, cbxIncROTextSrch.Checked ? ItemSearchIncludeLinks.Value : ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, byWordPrefix, byWordSuffix);
|
||||||
|
|
||||||
cmbResultsStyleIndex = 3; // display step text in results
|
cmbResultsStyleIndex = 3; // display step text in results
|
||||||
@@ -2078,8 +2059,8 @@ namespace Volian.Controls.Library
|
|||||||
|
|
||||||
if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked)
|
if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked)
|
||||||
{
|
{
|
||||||
// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
|
|
||||||
SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
|
SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, GetByWordSettings(ROSearchList, true), GetByWordSettings(ROSearchList, false));
|
||||||
cmbResultsStyleIndex = 3; // display step text in results
|
cmbResultsStyleIndex = 3; // display step text in results
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -2189,7 +2170,52 @@ namespace Volian.Controls.Library
|
|||||||
}
|
}
|
||||||
OnSearchComplete(new DisplaySearchEventArgs(TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks)));
|
OnSearchComplete(new DisplaySearchEventArgs(TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks)));
|
||||||
}
|
}
|
||||||
|
private string GetByWordSettings(string ss, bool checkstart)
|
||||||
|
{
|
||||||
|
|
||||||
|
// C2020-009: Search - Allow search 'By Word'.
|
||||||
|
|
||||||
|
// // Generate a prefix & suffix to be used in the sql query around the search string.
|
||||||
|
// // If the search string starts (prefix)/ends(suffix) with a number, then use an expression that
|
||||||
|
// // does not allow the preceding/following text to have a number, '.', letter or other rtf
|
||||||
|
// // commands. If the search string starts/ends with a letter, then use an expression that does not
|
||||||
|
// // find the preceding/following text that is text, i.e. a letter.
|
||||||
|
|
||||||
|
if (ss.Length > 0)
|
||||||
|
{
|
||||||
|
//checking start
|
||||||
|
if (checkstart)
|
||||||
|
{
|
||||||
|
// starts with a number or '.' decimal pt
|
||||||
|
if (char.IsNumber(ss, 0) || ss[0] == '.')
|
||||||
|
{
|
||||||
|
return @"[^0-9a-zA-Z.vbpi:\\-]";
|
||||||
|
}
|
||||||
|
// starts with a letter
|
||||||
|
else if (char.IsLetter(ss, 0))
|
||||||
|
{
|
||||||
|
return @"[^a-zA-Z]";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//checking end
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// ends with a number or '.' decimal pt
|
||||||
|
if (char.IsNumber(ss, ss.Length - 1) || ss[ss.Length - 1] == '.')
|
||||||
|
{
|
||||||
|
return @"[^0-9a-zA-Z.vbpi:\\-]";
|
||||||
|
}
|
||||||
|
// ends with a letter
|
||||||
|
else if (char.IsLetter(ss, ss.Length - 1))
|
||||||
|
{
|
||||||
|
return @"[^a-zA-Z]";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//default
|
||||||
|
return string.Empty;
|
||||||
|
}
|
||||||
private void ClearResults() // B2021-103 if no results when RNO only, clear results list. (moved from btnSearch_Click)
|
private void ClearResults() // B2021-103 if no results when RNO only, clear results list. (moved from btnSearch_Click)
|
||||||
{
|
{
|
||||||
if (tabSearchTypes.SelectedTab != tabSearchTypes.Tabs[4])
|
if (tabSearchTypes.SelectedTab != tabSearchTypes.Tabs[4])
|
||||||
|
|||||||
@@ -3684,15 +3684,14 @@ namespace Volian.Controls.Library
|
|||||||
{
|
{
|
||||||
ROFSTLookup myLookup = MySection.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MySection.MyDocVersion, null);
|
ROFSTLookup myLookup = MySection.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MySection.MyDocVersion, null);
|
||||||
|
|
||||||
string accpgid = accpageid;
|
|
||||||
|
|
||||||
//B2022-083: Support Conditional RO Values
|
//B2022-083: Support Conditional RO Values
|
||||||
ROFSTLookup.rochild roc = myLookup.GetROChildByAccPageID(string.Format("<{0}.{1}>", accpgid, multiid), MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
|
//C2026-047 first try the RO Lookup with the ascii dash character in the accpageid. If not found, try again with the unicode dash
|
||||||
|
ROFSTLookup.rochild roc = myLookup.GetROChildByAccPageID(string.Format("<{0}.{1}>", accpageid.Replace(@"\u8209?", "-"), multiid), MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
|
||||||
|
|
||||||
if (roc.value == null)
|
if (roc.value == null)
|
||||||
{
|
{
|
||||||
accpgid = accpgid.Replace(@"\u8209?", "-");
|
// try again but this time with the unicode dash
|
||||||
roc = myLookup.GetROChildByAccPageID(string.Format("<{0}.{1}>", accpgid, multiid), MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
|
roc = myLookup.GetROChildByAccPageID(string.Format("<{0}.{1}>", accpageid, multiid), MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!deflt.StartsWith("[") && !string.IsNullOrEmpty(roc.value) && roc.value.Trim().Length > 0) // don't return val if it's an empty or blank string - jsj 01-28-2019
|
if (!deflt.StartsWith("[") && !string.IsNullOrEmpty(roc.value) && roc.value.Trim().Length > 0) // don't return val if it's an empty or blank string - jsj 01-28-2019
|
||||||
|
|||||||
@@ -1660,13 +1660,13 @@ i = 0;
|
|||||||
{
|
{
|
||||||
ROFSTLookup myLookup = MySection.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MySection.MyDocVersion, overrideChild);
|
ROFSTLookup myLookup = MySection.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MySection.MyDocVersion, overrideChild);
|
||||||
|
|
||||||
string accpgid = accpageid;
|
//C2026-047 first try the RO Lookup with the ascii dash character in the accpageid. If not found, try again with the unicode dash
|
||||||
ROFSTLookup.rochild roc = myLookup.GetROChildByAccPageID("<" + accpgid + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
|
ROFSTLookup.rochild roc = myLookup.GetROChildByAccPageID("<" + accpageid.Replace(@"\u8209?", "-") + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
|
||||||
|
|
||||||
if (roc.value == null)
|
if (roc.value == null)
|
||||||
{
|
{
|
||||||
accpgid = accpgid.Replace(@"\u8209?", "-");
|
// try again but this time with the unicode dash
|
||||||
roc = myLookup.GetROChildByAccPageID("<" + accpgid + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
|
roc = myLookup.GetROChildByAccPageID("<" + accpageid + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!deflt.StartsWith("[") && !string.IsNullOrEmpty(roc.value) && roc.value.Trim().Length > 0) // don't return val if it's an empty or blank string - jsj 01-28-2019
|
if (!deflt.StartsWith("[") && !string.IsNullOrEmpty(roc.value) && roc.value.Trim().Length > 0) // don't return val if it's an empty or blank string - jsj 01-28-2019
|
||||||
|
|||||||
@@ -1,15 +1,10 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
//using System.Drawing;
|
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using iTextSharp.text.pdf;
|
using iTextSharp.text.pdf;
|
||||||
using iTextSharp.text;
|
using iTextSharp.text;
|
||||||
using Itenso.Rtf;
|
|
||||||
using Itenso.Rtf.Parser;
|
|
||||||
using Itenso.Rtf.Interpreter;
|
|
||||||
using Itenso.Rtf.Support;
|
|
||||||
using Volian.Controls.Library;
|
using Volian.Controls.Library;
|
||||||
using VEPROMS.CSLA.Library;
|
using VEPROMS.CSLA.Library;
|
||||||
using Volian.Base.Library;
|
using Volian.Base.Library;
|
||||||
@@ -160,13 +155,44 @@ namespace Volian.Print.Library
|
|||||||
childItemInfo.SetHeader(childItemInfo.FormatStepData.TabData.Font, lastHeader);
|
childItemInfo.SetHeader(childItemInfo.FormatStepData.TabData.Font, lastHeader);
|
||||||
lastHeader = null;
|
lastHeader = null;
|
||||||
}
|
}
|
||||||
|
// B2026-072 Caution/Note off of an RNO sub-step was printing on top of the parent AER sub-step text
|
||||||
|
// ex: Farley Unit 1 AOPs 1-AOP-1.0, Procedure Steps section, step 8.4.1
|
||||||
|
// if printing a Caution or Note type that is in the RNO column and we are a printing a two column section
|
||||||
|
if ((childItemInfo.IsCaution || childItemInfo.IsNote) && childItemInfo.IsInRNO && childItemInfo.ColumnMode>0)
|
||||||
|
{
|
||||||
|
// get the starting positon of the RNO column
|
||||||
|
float colR = float.Parse(formatInfo.MyStepSectionLayoutData.ColRTable.Split(",".ToCharArray())[childItemInfo.ColumnMode]);
|
||||||
|
// get the starting position of the Caution or Note
|
||||||
|
float startColOfCautionNote = xoff;
|
||||||
|
if (bxIndx != null)
|
||||||
|
{
|
||||||
|
// if it is a boxed Caution or Note, then get the starting colun of the box
|
||||||
|
Box bx = childItemInfo.ActiveFormat.PlantFormat.FormatData.BoxList[(int)bxIndx];
|
||||||
|
startColOfCautionNote = bx.Start??0;
|
||||||
|
}
|
||||||
|
// If the starting positon of Caution/Note is in the AER column, find the y position of the last text line of
|
||||||
|
// the AER parent to the RNO step.
|
||||||
|
if (startColOfCautionNote < colR)
|
||||||
|
{
|
||||||
|
vlnParagraph tparent = Parent;
|
||||||
|
while (tparent.MyItemInfo.IsInRNO) tparent = tparent.MyParent; // find the parent AER sub-step
|
||||||
|
if (tparent != Parent && tparent.MyItemInfo.IsInSubStep)
|
||||||
|
{
|
||||||
|
// add the height of the AER sub-step text to its starting yoffset
|
||||||
|
float tyoff = tparent.YOffset + tparent.Height;
|
||||||
|
// while the position in the AER column (tyoff) is greater then or equal to starting position
|
||||||
|
// of the Note or Caution, move down the page a line at time.
|
||||||
|
// SixLinesPerInch adjusts for when we are printing in compress mode.
|
||||||
|
while (tyoff >= yoff) yoff += vlnPrintObject.SixLinesPerInch;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
// if the format has MatchUpRNOCautNote, then add a line to yoff, if not at top of rno column.
|
// if the format has MatchUpRNOCautNote, then add a line to yoff, if not at top of rno column.
|
||||||
if (childItemInfo.FormatStepData != null && childItemInfo.FormatStepData.MatchUpRNO)
|
if (childItemInfo.FormatStepData != null && childItemInfo.FormatStepData.MatchUpRNO)
|
||||||
{
|
{
|
||||||
if (childItemInfo.MyParent != null && childItemInfo.MyParent.MyParent != null && !childItemInfo.MyParent.MyParent.IsHigh)
|
if (childItemInfo.MyParent != null && childItemInfo.MyParent.MyParent != null && !childItemInfo.MyParent.MyParent.IsHigh)
|
||||||
{
|
{
|
||||||
yoff += vlnPrintObject.SixLinesPerInch;
|
yoff += vlnPrintObject.SixLinesPerInch;
|
||||||
Parent.AdjustForMatchUpRNO = vlnPrintObject.SixLinesPerInch; // B2020-112
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// if this is a caution/note and it has a caution/note substep, do it before this caution/note, so that
|
// if this is a caution/note and it has a caution/note substep, do it before this caution/note, so that
|
||||||
@@ -1554,7 +1580,6 @@ namespace Volian.Print.Library
|
|||||||
}
|
}
|
||||||
private static bool DoSubs = true; // flag whether to print substeps (don't if doing continued checklist header)
|
private static bool DoSubs = true; // flag whether to print substeps (don't if doing continued checklist header)
|
||||||
public float AdjustForXBlankW1stLevSub = 0; // B2020-112 this & next line
|
public float AdjustForXBlankW1stLevSub = 0; // B2020-112 this & next line
|
||||||
public float AdjustForMatchUpRNO = 0;
|
|
||||||
protected float _ContinueHeight = 0;
|
protected float _ContinueHeight = 0;
|
||||||
public virtual float ContinueHeight
|
public virtual float ContinueHeight
|
||||||
{
|
{
|
||||||
@@ -7170,11 +7195,6 @@ namespace Volian.Print.Library
|
|||||||
// //Console.WriteLine("Adjust Add extra Line (flag) = '{0}'", para);
|
// //Console.WriteLine("Adjust Add extra Line (flag) = '{0}'", para);
|
||||||
// adjust -= para.MyParent.AdjustForXBlankW1stLevSub;
|
// adjust -= para.MyParent.AdjustForXBlankW1stLevSub;
|
||||||
//}
|
//}
|
||||||
//if (para.AdjustForMatchUpRNO != 0 && (para.ChildrenAbove == null || para.ChildrenAbove.Count == 0))
|
|
||||||
// adjust -= para.AdjustForMatchUpRNO;
|
|
||||||
//else if (para.MyParent.AdjustForMatchUpRNO != 0 && (para.MyParent.ChildrenAbove != null && para.MyParent.ChildrenAbove.Count > 0)
|
|
||||||
// && para.MyParent.ChildrenAbove[0] == para)
|
|
||||||
// adjust -= para.MyParent.AdjustForMatchUpRNO;
|
|
||||||
|
|
||||||
if (!this[stepLevel].ContainsKey(-(yLocation + adjust)))
|
if (!this[stepLevel].ContainsKey(-(yLocation + adjust)))
|
||||||
this[stepLevel].Add(-(yLocation + adjust), para);
|
this[stepLevel].Add(-(yLocation + adjust), para);
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -281,22 +282,28 @@ namespace XYPlots
|
|||||||
private bool LoadBuff(string FileName)
|
private bool LoadBuff(string FileName)
|
||||||
{
|
{
|
||||||
if (!File.Exists(FileName))
|
if (!File.Exists(FileName))
|
||||||
|
{
|
||||||
|
if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
|
||||||
{
|
{
|
||||||
// File does not exist, show error message
|
// 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");
|
MessageBox.Show(String.Format("X/Y Plot File {0} Does Not Exist", FileName), "Error Opening X/Y Plot File");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// Open the X/Y Plot file
|
// Open the X/Y Plot file
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
XYPlotFile = File.OpenRead(FileName);
|
XYPlotFile = File.OpenRead(FileName);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
|
||||||
{
|
{
|
||||||
// cannot open the x/y plot file
|
// cannot open the x/y plot file
|
||||||
MessageBox.Show(e.Message, String.Format("Error Opening {0} for Reading", FileName));
|
MessageBox.Show(e.Message, String.Format("Error Opening {0} for Reading", FileName));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
int blen = (int)XYPlotFile.Length;
|
int blen = (int)XYPlotFile.Length;
|
||||||
int bread = 0;
|
int bread = 0;
|
||||||
// initialize a byte array to read into
|
// initialize a byte array to read into
|
||||||
@@ -308,19 +315,25 @@ namespace XYPlots
|
|||||||
bread = XYPlotFile.Read(bbuf, 0, blen);
|
bread = XYPlotFile.Read(bbuf, 0, blen);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
|
||||||
{
|
{
|
||||||
MessageBox.Show(e.Message, String.Format("Error Reading {0}", FileName));
|
MessageBox.Show(e.Message, String.Format("Error Reading {0}", FileName));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
XYPlotFile.Close();
|
XYPlotFile.Close();
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
|
||||||
{
|
{
|
||||||
MessageBox.Show(e.Message, String.Format("Error Closing {0}", FileName));
|
MessageBox.Show(e.Message, String.Format("Error Closing {0}", FileName));
|
||||||
return false;
|
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')
|
||||||
@@ -1439,9 +1452,12 @@ namespace XYPlots
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
private void PrintStackError(string relation, int limit)
|
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");
|
MessageBox.Show(String.Format("Position Stack Pointer {0} {1}", relation, limit.ToString()), "Print Stack Error");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
private void SavePosition()
|
private void SavePosition()
|
||||||
{
|
{
|
||||||
if (stack >= MAX_XY_STACK) PrintStackError(">=", MAX_XY_STACK);
|
if (stack >= MAX_XY_STACK) PrintStackError(">=", MAX_XY_STACK);
|
||||||
@@ -1657,10 +1673,13 @@ namespace XYPlots
|
|||||||
maximum[flag] = newmaximum;
|
maximum[flag] = newmaximum;
|
||||||
}
|
}
|
||||||
private void err_exit(string msg, string msg2)
|
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 ## - ");
|
MessageBox.Show(msg + "\n" + msg2 + "\n\n This p=Process Will Terminate", "\n## ERROR ## - ");
|
||||||
Environment.Exit(255);
|
Environment.Exit(255);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
private void FindBoxesinArea(int ptval, int flag)
|
private void FindBoxesinArea(int ptval, int flag)
|
||||||
{
|
{
|
||||||
XyBox cptr;
|
XyBox cptr;
|
||||||
@@ -1991,12 +2010,16 @@ namespace XYPlots
|
|||||||
AxisLabel[1] = getint();
|
AxisLabel[1] = getint();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
if (BaseLnSettings.blBaseLine == false) // B2026-056 suppress messages when running baseline.
|
||||||
|
{
|
||||||
if (PrevCommand.Equals(null))
|
if (PrevCommand.Equals(null))
|
||||||
MessageBox.Show("Check the first line of the X/Y Plot definition.", "Unrecognized Graph Command");
|
MessageBox.Show("Check the first line of the X/Y Plot definition.", "Unrecognized Graph Command");
|
||||||
else
|
else
|
||||||
MessageBox.Show(string.Format("Problem with the X/Y Plot Command after {0}", PrevCommand.ToString()), "Unrecognized Graph Command");
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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\" />
|
||||||
|
|||||||
Reference in New Issue
Block a user