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

C2014-009: Allow for edit/print of Notes & Cautions off a sub-step in the right column of Condition Response table (Calvert personnel made update request)

Browse Source
This commit is contained in:
Kathy Ruffing
2019-02-07 13:12:01 +00:00
parent 31033ae63f
commit 94cc5c22aa
3 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5065,7 +5065,12 @@ namespace Volian.Print.Library
{
if ((MyItemInfo.IsCaution || MyItemInfo.IsNote || MyItemInfo.MyParent.IsCaution || MyItemInfo.MyParent.IsNote) && !MyItemInfo.FormatStepData.SpaceIn
&& (MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0)
&& (MyItemInfo.NextItem == null || MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type)) return 0;
&& (MyItemInfo.NextItem == null || MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type))
{
// C2014-009: Don't add another blank line - print the calvert Condition/Response RNO Caution/Notes without it.
if (!(MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm && MyItemInfo.IsInRNO))
return 0;
}
if (everyNLines == 99 && MyItemInfo.NextItem == null)
{
if (MyItemInfo.Steps != null && MyItemInfo.Steps.Count > 0 && MyItemInfo.Steps[0].MyContent.Type == MyItemInfo.MyContent.Type) return 0;
@@ -5364,6 +5369,8 @@ namespace Volian.Print.Library
else
xoff += (float)((bx.TxtStart + _MyBoxLeftAdj + XOffsetBox + (bx.TxtWidth / 2)) - (hdrWidth / 2)); // xoff starts as left margin
}
else if (formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm && itemInfo.IsInRNO && (itemInfo.IsCaution || itemInfo.IsNote)) // C2014-009
xoff = XOffset + (para.Width / 2) - (hdrWidth / 2);
else if (formatInfo.MyStepSectionLayoutData.Separator.Location > 0)
xoff = XOffset + AdjustToCharPosition((float)((para.Width - hdrWidth) / formatInfo.MyStepSectionLayoutData.Separator.Location), itemInfo.MyHeader.MyFont.CPI);
else if (itemInfo.IsInRNO && itemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList[40].NumberWithLevel)
@@ -6272,11 +6279,19 @@ namespace Volian.Print.Library
Width = (float)formatInfo.MyStepSectionLayoutData.WidT + 1;
else if (itemInfo.IsInRNO)
{
if (MyItemInfo.FormatStepData.CenterOneLineAdjust)
if (MyItemInfo.FormatStepData.CenterOneLineAdjust) // C2014-009: Condition/Response adjust xoffset & width
{
int rnoOff = ToInt(formatInfo.MyStepSectionLayoutData.ColRTable, maxRNO);
XOffset = rnoOff + MyHighLevelParagraph.XOffset;
Width = MyParent.Width;
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm)
{
XOffset = MyTopRNO.MyTab.XOffset + 7.2f;
Width = MyParent.Width + (MyParent.XOffset - XOffset);
}
else
{
XOffset = rnoOff + MyHighLevelParagraph.XOffset;
Width = MyParent.Width;
}
}
else
Width = (MyParent.XOffset + MyParent.Width) - (XOffset + mycolT);