Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5e071bd35a | ||
|
|
77639318c6 | ||
|
|
1a890b11cb |
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.
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user