diff --git a/PROMS/Formats/fmtall/WCNTRNall.xml b/PROMS/Formats/fmtall/WCNTRNall.xml new file mode 100644 index 00000000..cda982c2 Binary files /dev/null and b/PROMS/Formats/fmtall/WCNTRNall.xml differ diff --git a/PROMS/Formats/genmacall/wcntrn.svg b/PROMS/Formats/genmacall/wcntrn.svg new file mode 100644 index 00000000..ed1cd8e7 Binary files /dev/null and b/PROMS/Formats/genmacall/wcntrn.svg differ diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index ef041215..00f75c33 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -745,6 +745,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SpecialCaseCalvertAlarm, "@SpecialCaseCalvertAlarm"); } } + private LazyLoad _WCNTraining; + public bool WCNTraining + { + get + { + return LazyLoad(ref _WCNTraining, "@WCNTraining"); + } + } private LazyLoad _HorizontalSubsteps; public bool HorizontalSubsteps { diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs index 7ad31f45..176692e0 100644 --- a/PROMS/Volian.Print.Library/Pagination.cs +++ b/PROMS/Volian.Print.Library/Pagination.cs @@ -69,6 +69,7 @@ namespace Volian.Print.Library // if parent was continuous & this is separate, need to paginate to get subsection on // its own page. This occurred in BGE/OI3 set/OI-7 procedure/10.0 Attachments. if (!(MyParent.MyItemInfo as SectionInfo).IsSeparatePagination()) return 1; + if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.WCNTraining && (MyItemInfo as SectionInfo).IsSeparatePagination()) return 1; if (MyItemInfo.MyPrevious != null) // add if statement to fix Westinghouse print issue 3-21-2014 return 1; } diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index 9044b773..4fd5cdf6 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -255,7 +255,7 @@ namespace Volian.Print.Library if ((MySection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DoubleBoxHLS) == E_DocStructStyle.DoubleBoxHLS) DrawHorizontal(writer.DirectContent, (float)MySection.MyDocStyle.Layout.LeftMargin, (float)MySection.MyDocStyle.Layout.PageWidth, (float)MySection.MyDocStyle.CenterLineYTop); //if (MySection.ColumnMode > 0 && onBlankPage == false) - if (MySection.ColumnMode > 0) + if (MySection.ColumnMode > 0 || MySection.ActiveFormat.PlantFormat.FormatData.PrintData.WCNTraining) DrawCenterLine(writer.DirectContent, MySection.MyDocStyle.Layout.LeftMargin + MySection.MyDocStyle.CenterLineX ?? 0, MySection.MyDocStyle.CenterLineYTop ?? 0, MySection.MyDocStyle.CenterLineYBottom ?? 0); } diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index c0a1b33f..d4c34246 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -1219,9 +1219,10 @@ namespace Volian.Print.Library { if (MyItemInfo.IsSection && MyItemInfo.MyPrevious == null && MyItemInfo.MyParent.IsSection && !MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseWestinghouse) { + // don't do the following for the WCN training format: // if parent was continuous & this is separate, don't reset document style to subsection (next page) type // this was putting incorrect pagelist item on parent section's page. This occurred in BGE/OI3 set/OI-7 procedure/10.0 Attachments. - if ((MyParent.MyItemInfo as SectionInfo).IsSeparatePagination() || !(MyItemInfo as SectionInfo).IsSeparatePagination()) + if (!MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.WCNTraining && (MyParent.MyItemInfo as SectionInfo).IsSeparatePagination() || !(MyItemInfo as SectionInfo).IsSeparatePagination()) { MyPageHelper.MySection = MyItemInfo as SectionInfo; MyPageHelper.ResetSvg(); @@ -4920,7 +4921,6 @@ namespace Volian.Print.Library && !(itemInfo.MyDocStyle.SpecialStepsFoldout && itemInfo.MyDocStyle.UseColSByLevel)) { int indxLevel = itemInfo.PrintLevel + itemInfo.CurrentSectionLevel(); - if (indxLevel > 1) Console.WriteLine("level={0} in: {1}", indxLevel, itemInfo.ShortPath); adjwidth += formatInfo.PlantFormat.FormatData.SectData.MetaSectionList[indxLevel % formatInfo.PlantFormat.FormatData.SectData.MetaSectionList.Count].WidSAdjByLevel ?? 0; ; float colsbylevel = (float)formatInfo.PlantFormat.FormatData.SectData.MetaSectionList[indxLevel % formatInfo.PlantFormat.FormatData.SectData.MetaSectionList.Count].ColSByLevel; float seclvlindent = colsbylevel - (float)formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.ColS;