From 06944c6503e99dc80f09b577135622ecfa40b81e Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 26 May 2015 13:59:39 +0000 Subject: [PATCH] =?UTF-8?q?Initial=20Wolf=20Creek=20Training=20Format=20In?= =?UTF-8?q?itial=20Wolf=20Creek=20Training=20macros=20Added=20WCNTraining?= =?UTF-8?q?=20flag=20Use=20WCNTraining=20flag=20to=20always=20paginate=20o?= =?UTF-8?q?n=20subsection=20Don=E2=80=99t=20do=20docstyle=20reset=20if=20i?= =?UTF-8?q?n=20WCNTraining=20format=20Do=20centerline=20if=20in=20WCNTrain?= =?UTF-8?q?ing=20format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/WCNTRNall.xml | Bin 0 -> 45694 bytes PROMS/Formats/genmacall/wcntrn.svg | Bin 0 -> 2506 bytes .../VEPROMS.CSLA.Library/Format/PlantFormat.cs | 8 ++++++++ PROMS/Volian.Print.Library/Pagination.cs | 1 + PROMS/Volian.Print.Library/VlnSvgPageHelper.cs | 2 +- PROMS/Volian.Print.Library/vlnParagraph.cs | 4 ++-- 6 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 PROMS/Formats/fmtall/WCNTRNall.xml create mode 100644 PROMS/Formats/genmacall/wcntrn.svg diff --git a/PROMS/Formats/fmtall/WCNTRNall.xml b/PROMS/Formats/fmtall/WCNTRNall.xml new file mode 100644 index 0000000000000000000000000000000000000000..cda982c2f20b48f32d1daf089a198ae3ac1de087 GIT binary patch literal 45694 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 N-Xf#5_x}TZ`~wLqVs8Kd literal 0 HcmV?d00001 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;