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

Improve location of centered NOTE, CAUTION & WARNING tabs

Browse Source 
Enclose special case Calvert Alarm blank line handling for Cautions/Notes in Calvert Alarm Flag
This commit is contained in:
Kathy Ruffing 2014-08-21 12:34:18 +00:00
parent 899e58cba0
commit 9362a5f6d8
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2890,11 +2890,14 @@ namespace Volian.Print.Library
if (MyItemInfo.FormatStepData != null && MyItemInfo.FormatStepData.Prefix != null && MyItemInfo.FormatStepData.Suffix != null && MyItemInfo.FormatStepData.UseSmartTemplate) return 0;
int everyNLines = MyItemInfo.FormatStepData == null ? 1 : MyItemInfo.FormatStepData.StepLayoutData.EveryNLines ?? 1;
if (everyNLines == -99) return 0;
if ((MyItemInfo.IsCaution || MyItemInfo.IsNote) && !MyItemInfo.FormatStepData.SpaceIn && MyItemInfo.GetNextItem() == null) return 0;
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm && everyNLines == 99 && MyItemInfo.GetNextItem() == null)
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm)
{
if (MyItemInfo.Steps != null && MyItemInfo.Steps.Count > 0 && MyItemInfo.Steps[0].MyContent.Type == MyItemInfo.MyContent.Type) return 0;
if (MyItemInfo.MyParent.GetNextItem() != null && MyItemInfo.MyParent.GetNextItem().MyContent.Type == MyItemInfo.MyContent.Type) return 0;
if ((MyItemInfo.IsCaution || MyItemInfo.IsNote) && !MyItemInfo.FormatStepData.SpaceIn && MyItemInfo.GetNextItem() == null) return 0;
if (everyNLines == 99 && MyItemInfo.GetNextItem() == null)
{
if (MyItemInfo.Steps != null && MyItemInfo.Steps.Count > 0 && MyItemInfo.Steps[0].MyContent.Type == MyItemInfo.MyContent.Type) return 0;
if (MyItemInfo.MyParent.GetNextItem() != null && MyItemInfo.MyParent.GetNextItem().MyContent.Type == MyItemInfo.MyContent.Type) return 0;
}
}
if (MyItemInfo.Ordinal % everyNLines == 0 || MyItemInfo.GetNextItem() == null) return SixLinesPerInch;
// Pagination issue to be used with yEndsWithBlankLine in Pagination code, but not checked in yet.

3
PROMS/fmtxml/PlantSpecific_Calvert.cs
View File

@ -54,6 +54,9 @@ namespace fmtxml
fmtdata.BoxData[1].TxtWidth = 130;
fmtdata.BoxData[1].BXMLS = null;
fmtdata.BoxData[1].BXMRS = null;
fmtdata.BoxData[2].TxtWidth = 428;
fmtdata.BoxData[3].TxtWidth = 428;
fmtdata.BoxData[4].TxtWidth = 428;
fmtdata.SectData.ReplaceStrData[10].ReplaceWord = @"(\[B\w*\])";
fmtdata.SectData.ReplaceStrData[10].ReplaceWith = @"\b $1\b0 ";