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

C2025-023 Bringing branch up to date to resolve merge conflicts

Browse Source
This commit is contained in:
Matthew Schill
2025-06-20 14:33:58 -04:00
parent c45dbf1dac
commit a55ce75e2e
58 changed files with 1360 additions and 688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
View File

@@ -252,6 +252,14 @@ namespace Volian.Print.Library
get { return _CountInApplProcs; }
set { _CountInApplProcs = value; }
}
// C2025-033 Child (slave) being printed
private static int _PrintingChild = 0;
public static int PrintingChild
{
get { return _PrintingChild; }
set { _PrintingChild = value; }
}
//private bool _AddBlankPagesForDuplexPrinting = false;
//public bool AddBlankPagesForDuplexPrinting // Tells us if a the option to add a blank page is turn on (for procedures with duplex foldouts)
//{
@@ -1363,6 +1371,8 @@ i = 0;
foreach (VEPROMS.CSLA.Library.PageItem pageItem in pageStyle.PageItems)
{
if (pageItem.Token == null) continue; // can be null if token is dependent on PSI lookup!
// 2024-089 selectively print pagestyle item base on Child Procedure being printed
if (PrintingChild > 0 && pageItem.ChildNum > 0 && pageItem.ChildNum != PrintingChild) continue; // C2025-033 item should not be printed for this child
DidHLSText = false; // reset to false for this group of tokens.
//if (pageItem.Token.Contains("HLSTEXT"))
// Console.WriteLine("{0} - PageList Token", pageItem.Token);
@@ -1761,6 +1771,16 @@ i = 0;
case "[HEADER4]":
case "{HEADER5}":
case "[HEADER5]":
case "{HEADER6}":
case "[HEADER6]":
case "{HEADER7}":
case "[HEADER7]":
case "{HEADER8}":
case "[HEADER8]":
case "{HEADER9}":
case "[HEADER9]":
case "{HEADER10}":
case "[HEADER10]":
case "{BOX1}":
case "[BOX1]":
case "{BOX2}":
@@ -2099,7 +2119,12 @@ i = 0;
case "[UNITNUMBER]":
string unbr = MySection.MyDocVersion.DocVersionConfig.Unit_Number;
if (MySection.ActiveFormat.PlantFormat.FormatData.PrintData.PrintCommonForZeroUnit && unbr == "0")
plstr = "COMMON"; // for Comanche Peak, replace "Unit 0" with "COMMON"
{
if (String.IsNullOrEmpty(MySection.MyDocStyle.AltMultiUnitWording))
plstr = "COMMON"; // for Comanche Peak, replace "Unit 0" with "COMMON"
else
plstr = MySection.MyDocStyle.AltMultiUnitWording; // for Comanche Peak Abnormal, replace "Unit 0" with "UNIT 1 AND 2"
}
else
plstr = plstr.Replace(token, unbr);
break;

23
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@@ -4390,7 +4390,8 @@ namespace Volian.Print.Library
SectionConfig sch = MyItemInfo.MyConfig as SectionConfig;
if (sch != null && sch.Section_PrintHdr != "Y") doprint = false;
}
if (doprint && !UseTemplateKeepOnCurLine(itemInfo))
//C2025-021 Add logic to PROMS to support a special High Level Step type that is not printed.
if (doprint && !UseTemplateKeepOnCurLine(itemInfo) && !itemInfo.IsType("InvisibleHigh"))
{
float tyoff = yoff;
if (itemInfo.Steps != null)
@@ -5751,9 +5752,21 @@ namespace Volian.Print.Library
private StringBuilder _RtfSB = null;
public string GetRtf(ItemInfo itemInfo, string prefix, string suffix)
{
int profileDepth = ProfileTimer.Push(">>>> GetRtf");
int profileDepth = ProfileTimer.Push(">>>> GetRtf");
_RtfSB = new StringBuilder();
DisplayText vlntxt = new DisplayText(itemInfo, E_EditPrintMode.Print, E_ViewMode.View, true, E_FieldToEdit.StepText, false, prefix, suffix, MyPageHelper.MyPromsPrinter.RemoveTrailingHardReturnsAndSpaces != null);
//C2025-021 Add logic to PROMS to support a special High Level Step type that is not printed.
if (itemInfo.IsType("InvisibleHigh"))
{
System.Drawing.Font myHighFont = vlntxt.TextFont.WindowsFont;
_RtfSB.Append(AddFontTable(myHighFont));
_RtfSB.Append("}");
string rtfHigh = _RtfSB.ToString();
ProfileTimer.Pop(profileDepth);
return rtfHigh;
}
// C2021-010: Remove trailing returns/spaces & manual page breaks & allow save.
if (DisplayText.RemoveTrailingBlankID > 0 && !MyPageHelper.MyPromsPrinter.RemoveTrailingHardReturnsAndSpaces.Contains(itemInfo.ItemID)) MyPageHelper.MyPromsPrinter.RemoveTrailingHardReturnsAndSpaces.Add(DisplayText.RemoveTrailingBlankID);
System.Drawing.Font myFont = vlntxt.TextFont.WindowsFont;
@@ -6199,6 +6212,12 @@ namespace Volian.Print.Library
XOffset += (float)formatInfo.PlantFormat.FormatData.SectData.MetaSectionList[level].SecTitlePositionAdj;
XOffset -= xMetaAdj;
}
if (itemInfo.MyDocStyle.SectTitleOffsetOverride != null)
{
XOffset += (float)itemInfo.MyDocStyle.SectTitleOffsetOverride;
}
}
}
else if (formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Just == "PSCenter")

5
PROMS/Volian.Print.Library/vlnTab.cs
View File

@@ -69,7 +69,7 @@ namespace Volian.Print.Library
private string symblsStr = "\u25CF\u0394"; // string of possible symbol character in a tab
// add symbol characters as needed
// "\u25CF" - solid bullet
// \x0394 - delta
// \u0394 - delta
private System.Drawing.FontStyle GetSysFontStyle(VE_Font f)
{
@@ -267,7 +267,8 @@ namespace Volian.Print.Library
}
}
Rtf = GetRtf(origTab, vFont);
Rtf = Rtf.Replace("\u0394", @"\f1\u916?\f0 "); // delta 0x0394
Rtf = Rtf.Replace("\u0394", @"\f1\u916?\f0 "); // delta 0x0394
Rtf = Rtf.Replace("\u03BF", @"\f1\u959?\f0 "); // F2025-015 lowercase omicron check with hex value replace with RTF string
if (ScriptCaution)
{
Rtf = GetRtf("\u25CFCaution ", vFont);