Compare commits

..

5 Commits

10 changed files with 305 additions and 266 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -6097,10 +6097,9 @@ namespace VEPROMS.CSLA.Library
} }
private bool IsLowestLevelStep private bool IsLowestLevelStep
{ {
//F2025-015 added check for IsInCautionOrNote for sub-step inside Notes and Cautions
get get
{ {
return (!(IsCaution || IsNote || IsInCautionOrNote || IsTable || IsFigure || Steps != null || MyParent.IsCaution || MyParent.IsNote)); return (!(IsCaution || IsNote || IsTable || IsFigure || Steps != null || MyParent.IsCaution || MyParent.IsNote));
} }
} }
private bool RNOsHighHasCheckOff() private bool RNOsHighHasCheckOff()

File diff suppressed because it is too large Load Diff

View File

@@ -4390,7 +4390,8 @@ namespace Volian.Print.Library
SectionConfig sch = MyItemInfo.MyConfig as SectionConfig; SectionConfig sch = MyItemInfo.MyConfig as SectionConfig;
if (sch != null && sch.Section_PrintHdr != "Y") doprint = false; 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; float tyoff = yoff;
if (itemInfo.Steps != null) if (itemInfo.Steps != null)
@@ -5751,9 +5752,21 @@ namespace Volian.Print.Library
private StringBuilder _RtfSB = null; private StringBuilder _RtfSB = null;
public string GetRtf(ItemInfo itemInfo, string prefix, string suffix) public string GetRtf(ItemInfo itemInfo, string prefix, string suffix)
{ {
int profileDepth = ProfileTimer.Push(">>>> GetRtf"); int profileDepth = ProfileTimer.Push(">>>> GetRtf");
_RtfSB = new StringBuilder(); _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); 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. // 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); if (DisplayText.RemoveTrailingBlankID > 0 && !MyPageHelper.MyPromsPrinter.RemoveTrailingHardReturnsAndSpaces.Contains(itemInfo.ItemID)) MyPageHelper.MyPromsPrinter.RemoveTrailingHardReturnsAndSpaces.Add(DisplayText.RemoveTrailingBlankID);
System.Drawing.Font myFont = vlntxt.TextFont.WindowsFont; System.Drawing.Font myFont = vlntxt.TextFont.WindowsFont;

View File

@@ -69,7 +69,7 @@ namespace Volian.Print.Library
private string symblsStr = "\u25CF\u0394"; // string of possible symbol character in a tab private string symblsStr = "\u25CF\u0394"; // string of possible symbol character in a tab
// add symbol characters as needed // add symbol characters as needed
// "\u25CF" - solid bullet // "\u25CF" - solid bullet
// \u0394 - delta // \x0394 - delta
private System.Drawing.FontStyle GetSysFontStyle(VE_Font f) private System.Drawing.FontStyle GetSysFontStyle(VE_Font f)
{ {
@@ -267,8 +267,7 @@ namespace Volian.Print.Library
} }
} }
Rtf = GetRtf(origTab, vFont); 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) if (ScriptCaution)
{ {
Rtf = GetRtf("\u25CFCaution ", vFont); Rtf = GetRtf("\u25CFCaution ", vFont);