diff --git a/PROMS/Formats/fmtall/FNPCASall.xml b/PROMS/Formats/fmtall/FNPCASall.xml index 8afc0ba9..59d52718 100644 Binary files a/PROMS/Formats/fmtall/FNPCASall.xml and b/PROMS/Formats/fmtall/FNPCASall.xml differ diff --git a/PROMS/Formats/fmtall/FNPDEVall.xml b/PROMS/Formats/fmtall/FNPDEVall.xml index 5ce54f99..2c1535cf 100644 Binary files a/PROMS/Formats/fmtall/FNPDEVall.xml and b/PROMS/Formats/fmtall/FNPDEVall.xml differ diff --git a/PROMS/Formats/fmtall/FNPEBKall.xml b/PROMS/Formats/fmtall/FNPEBKall.xml index 30d5ff99..d6e4a936 100644 Binary files a/PROMS/Formats/fmtall/FNPEBKall.xml and b/PROMS/Formats/fmtall/FNPEBKall.xml differ diff --git a/PROMS/Formats/fmtall/FNPSAM1all.xml b/PROMS/Formats/fmtall/FNPSAM1all.xml index 4198c0db..24fcb6c8 100644 Binary files a/PROMS/Formats/fmtall/FNPSAM1all.xml and b/PROMS/Formats/fmtall/FNPSAM1all.xml differ diff --git a/PROMS/Formats/fmtall/FNP_00all.xml b/PROMS/Formats/fmtall/FNP_00all.xml index 3ae14422..f0673344 100644 Binary files a/PROMS/Formats/fmtall/FNP_00all.xml and b/PROMS/Formats/fmtall/FNP_00all.xml differ diff --git a/PROMS/Formats/fmtall/FNP_01all.xml b/PROMS/Formats/fmtall/FNP_01all.xml index a8c6dda6..aade3378 100644 Binary files a/PROMS/Formats/fmtall/FNP_01all.xml and b/PROMS/Formats/fmtall/FNP_01all.xml differ diff --git a/PROMS/Formats/fmtall/FNPall.xml b/PROMS/Formats/fmtall/FNPall.xml index d3295de4..224c2f44 100644 Binary files a/PROMS/Formats/fmtall/FNPall.xml and b/PROMS/Formats/fmtall/FNPall.xml differ diff --git a/PROMS/Formats/fmtall/fnpnmpall.xml b/PROMS/Formats/fmtall/fnpnmpall.xml index 7912aa34..70bae078 100644 Binary files a/PROMS/Formats/fmtall/fnpnmpall.xml and b/PROMS/Formats/fmtall/fnpnmpall.xml differ diff --git a/PROMS/Formats/genmacall/fnp.svg b/PROMS/Formats/genmacall/fnp.svg index 5569203a..e7ac3ef8 100644 Binary files a/PROMS/Formats/genmacall/fnp.svg and b/PROMS/Formats/genmacall/fnp.svg differ diff --git a/PROMS/Formats/genmacall/fnpcas.svg b/PROMS/Formats/genmacall/fnpcas.svg index ec36c5a6..0e24bf2f 100644 Binary files a/PROMS/Formats/genmacall/fnpcas.svg and b/PROMS/Formats/genmacall/fnpcas.svg differ diff --git a/PROMS/Formats/genmacall/fnpnmp.svg b/PROMS/Formats/genmacall/fnpnmp.svg index e8a56701..b335d687 100644 Binary files a/PROMS/Formats/genmacall/fnpnmp.svg and b/PROMS/Formats/genmacall/fnpnmp.svg differ diff --git a/PROMS/Formats/genmacall/fnpsam1.svg b/PROMS/Formats/genmacall/fnpsam1.svg index 2f07dfbf..fb8602e1 100644 Binary files a/PROMS/Formats/genmacall/fnpsam1.svg and b/PROMS/Formats/genmacall/fnpsam1.svg differ diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index c8f153f4..74bf0c8c 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -1,15 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -//using System.Drawing; using System.Text.RegularExpressions; using System.IO; using iTextSharp.text.pdf; using iTextSharp.text; -using Itenso.Rtf; -using Itenso.Rtf.Parser; -using Itenso.Rtf.Interpreter; -using Itenso.Rtf.Support; using Volian.Controls.Library; using VEPROMS.CSLA.Library; using Volian.Base.Library; @@ -160,13 +155,44 @@ namespace Volian.Print.Library childItemInfo.SetHeader(childItemInfo.FormatStepData.TabData.Font, lastHeader); 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 (childItemInfo.FormatStepData != null && childItemInfo.FormatStepData.MatchUpRNO) { if (childItemInfo.MyParent != null && childItemInfo.MyParent.MyParent != null && !childItemInfo.MyParent.MyParent.IsHigh) { 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 @@ -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) public float AdjustForXBlankW1stLevSub = 0; // B2020-112 this & next line - public float AdjustForMatchUpRNO = 0; protected float _ContinueHeight = 0; public virtual float ContinueHeight { @@ -7170,11 +7195,6 @@ namespace Volian.Print.Library // //Console.WriteLine("Adjust Add extra Line (flag) = '{0}'", para); // 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))) this[stepLevel].Add(-(yLocation + adjust), para);