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

B2020-117 fix for multiple Notes, Cautions, and Warnings in the Calvert Cliffs Condition Response column, fixed the bullets printing on the text, also removed extra blank line between them

Browse Source
This commit is contained in:
John Jenko 2020-08-28 20:53:28 +00:00
parent 2e34568a37
commit 72355db893
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5111,6 +5111,12 @@ namespace Volian.Print.Library
if (!(MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm && MyItemInfo.IsInRNO)) if (!(MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm && MyItemInfo.IsInRNO))
return 0; return 0;
} }
//B2020-117 for multiple Calvert Condition/Response Cautions,Note, and Warnings, do add an extra blank line
// between them
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm &&
MyItemInfo.IsInRNO && (MyItemInfo.IsCaution || MyItemInfo.IsNote) &&
MyItemInfo != MyItemInfo.LastSibling)
return 0;
if (everyNLines == 99 && MyItemInfo.NextItem == null) if (everyNLines == 99 && MyItemInfo.NextItem == null)
{ {
if (MyItemInfo.Steps != null && MyItemInfo.Steps.Count > 0 && MyItemInfo.Steps[0].MyContent.Type == MyItemInfo.MyContent.Type) return 0; if (MyItemInfo.Steps != null && MyItemInfo.Steps.Count > 0 && MyItemInfo.Steps[0].MyContent.Type == MyItemInfo.MyContent.Type) return 0;
@ -6332,7 +6338,9 @@ namespace Volian.Print.Library
Width = (float)formatInfo.MyStepSectionLayoutData.WidT + 1; Width = (float)formatInfo.MyStepSectionLayoutData.WidT + 1;
else if (itemInfo.IsInRNO) else if (itemInfo.IsInRNO)
{ {
if (MyItemInfo.FormatStepData.CenterOneLineAdjust) // C2014-009: Condition/Response adjust xoffset & width // C2014-009: Condition/Response adjust xoffset & width
// B2020-117 add a check that there is only one Caution/Note/Warning
if (MyItemInfo.FormatStepData.CenterOneLineAdjust && MyItemInfo.FirstSibling == MyItemInfo.LastSibling)
{ {
int rnoOff = ToInt(formatInfo.MyStepSectionLayoutData.ColRTable, maxRNO); int rnoOff = ToInt(formatInfo.MyStepSectionLayoutData.ColRTable, maxRNO);
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm) if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm)
@ -6346,6 +6354,15 @@ namespace Volian.Print.Library
Width = MyParent.Width; Width = MyParent.Width;
} }
} }
// B2020-117 There are muliple Cautions, Notes, or Warnings in the Calvert Alarm Contition/Response
// Need to adjust the starting positon of the bulleted tab, text and width
else if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm)
{
XOffset = MyTopRNO.MyTab.XOffset + 7.2f;
this.MyTab.XOffset = XOffset;
XOffset += this.MyTab.Width;
Width = MyParent.Width + (MyParent.XOffset - XOffset);
}
else else
Width = (MyParent.XOffset + MyParent.Width) - (XOffset + mycolT); Width = (MyParent.XOffset + MyParent.Width) - (XOffset + mycolT);
} }