From 661bf3887d93df73686c3106ef0e66521088bd76 Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 12 Mar 2013 13:33:29 +0000 Subject: [PATCH] --- .../frmSectionProperties.cs | 4 ++++ .../VEPROMS.CSLA.Library/Format/DocStyles.cs | 12 +++++++++++ PROMS/Volian.Print.Library/PromsPrinter.cs | 3 ++- PROMS/Volian.Print.Library/vlnParagraph.cs | 20 +++++++++++++++--- PROMS/fmtxml/WST1all.xml | Bin 88904 -> 89216 bytes PROMS/fmtxml/WST2all.xml | Bin 76588 -> 79492 bytes PROMS/fmtxml/WSTALRall.xml | Bin 53988 -> 53988 bytes PROMS/fmtxml/WSTBCKall.xml | Bin 64974 -> 65454 bytes PROMS/fmtxml/wst2.svg | Bin 6770 -> 7002 bytes 9 files changed, 35 insertions(+), 4 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmSectionProperties.cs b/PROMS/VEPROMS User Interface/frmSectionProperties.cs index e26dd454..a2d106f9 100644 --- a/PROMS/VEPROMS User Interface/frmSectionProperties.cs +++ b/PROMS/VEPROMS User Interface/frmSectionProperties.cs @@ -292,6 +292,10 @@ namespace VEPROMS if ((pf.FormatData.PurchaseOptions & E_PurchaseOptions.AutoTableOfContents) == E_PurchaseOptions.AutoTableOfContents && _SectionConfig.MySection.MyContent.Text.ToUpper() != "TABLE OF CONTENTS") { ppCbIncTOC.Enabled = true; + if (_SectionConfig.MySection.MySectionInfo.MyDocStyle.IncludeInTOC) + ppCbIncTOC.Text = "Exclude from Table of Contents"; + else + ppCbIncTOC.Text = "Include in Table of Contents"; ppCbIncTOC.Checked = _SectionConfig.Section_TOC == "Y"; } if (!_SectionConfig.MySection.MySectionInfo.IsStepSection) diff --git a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs index 03ca6b21..3bd90ba5 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs @@ -106,6 +106,18 @@ namespace VEPROMS.CSLA.Library } } #endregion + #region IncludeInTOC + [Category("Miscellaneous")] + [Description("Include in Auto Table Of Contents")] + private LazyLoad _IncludeInTOC; + public bool IncludeInTOC + { + get + { + return LazyLoad(ref _IncludeInTOC, "@IncludeInTOC"); + } + } + #endregion #region UseCheckOffs [Category("Miscellaneous")] [Description("Section Uses Checkoffs")] diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs index ebc3d085..a29ce4ba 100644 --- a/PROMS/Volian.Print.Library/PromsPrinter.cs +++ b/PROMS/Volian.Print.Library/PromsPrinter.cs @@ -599,7 +599,8 @@ namespace Volian.Print.Library foreach (SectionInfo mySection in ii.Sections) { SectionConfig sc = mySection.MyConfig as SectionConfig; - if (sc != null && sc.Section_TOC == "Y") + if ((mySection.MyDocStyle != null && mySection.MyDocStyle.IncludeInTOC && (sc == null || sc.Section_TOC != "Y")) + || ((mySection.MyDocStyle == null || !mySection.MyDocStyle.IncludeInTOC) && (sc != null && sc.Section_TOC == "Y"))) { // need to do the section number, section title & page number. Page number // has to be put on at end after number of page is known, so use a Template. diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 8136c754..f7e37060 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -142,6 +142,8 @@ namespace Volian.Print.Library Processed = true; if (_PartsAbove != null && _PartsAbove.Count > 0) yPageStart = PartsAbove.ToPdf(cb, yPageStart, ref yTopMargin, ref yBottomMargin); if (MyItemInfo.IsHigh && MyItemInfo.MyDocStyle.SpecialStepsFoldout) yPageStart -= SixLinesPerInch; + //SHE if (MyItemInfo.IsHigh && !MyItemInfo.ActiveFormat.MyStepSectionLayoutData.DoSTExtraAtTop && (yPageStart - YTopMost == yTopMargin)) + //SHE yPageStart += ((MyItemInfo.FormatStepData == null) ? 0 : MyItemInfo.FormatStepData.StepLayoutData.STExtraSpace ?? 0); float yLocation = CalculateYOffset(yPageStart, yTopMargin); if (MyItemInfo.HasChangeBar && MyPageHelper.ChangeBarDefinition.MyChangeBarType != PrintChangeBar.Without) MyPageHelper.AddChangeBar(DoChangeBar(cb, MyItemInfo, MyPageHelper, XOffset, yLocation, MyPageHelper.MaxRNO, MyItemInfo.ActiveFormat), cbMess); float retval = yLocation; @@ -188,7 +190,8 @@ namespace Volian.Print.Library if (MyItemInfo.IsSection) { SectionConfig sc = MyItemInfo.MyConfig as SectionConfig; - if (sc != null && sc.Section_TOC == "Y") + if ((MyItemInfo.MyDocStyle != null && MyItemInfo.MyDocStyle.IncludeInTOC && (sc == null || sc.Section_TOC != "Y")) + || ((MyItemInfo.MyDocStyle == null || !MyItemInfo.MyDocStyle.IncludeInTOC) && (sc != null && sc.Section_TOC == "Y"))) { string tocKey = string.Format("TOC{0}", MyItemInfo.ItemID); if (MyPageHelper.MyTOCPageCounts.ContainsKey(tocKey)) @@ -1027,6 +1030,14 @@ namespace Volian.Print.Library mytab.XOffset += mytab.Width; XOffset = mytab.XOffset + mytab.Width; } + //SHE if this is the High Level RNO step (MyTopRNO) and we are numbering the RNO, adjust the xoffset to + //SHE include the HLS tab size. + //SHEif (!itemInfo.IsSection && itemInfo.FormatStepData.NumberHighLevel && itemInfo.IsRNOPart && itemInfo.ItemID == MyTopRNO.MyItemInfo.ItemID) + //SHE{ + //SHE float tadj = itemInfo.MyHLS.FormatStepData.TabData.RNOIdentPrint == null || itemInfo.MyHLS.FormatStepData.TabData.RNOIdentPrint == "" ? mytab.Text.Length * 6 : (itemInfo.MyHLS.FormatStepData.TabData.RNOIdentPrint.Length * 6); + //SHE mytab.XOffset += tadj; + //SHE XOffset = mytab.XOffset + (tadj + 6); // had to do this to get it to match 16 bit for SHE. + //SHE} AdjustWidth(itemInfo, maxRNO, formatInfo, mytab); AdjustXOffsetForTab(itemInfo, maxRNO, formatInfo, mytab, xMetaAdj); if (itemInfo.MyHeader != null && itemInfo.MyHeader.Text != null && !doSectTab) @@ -1228,7 +1239,6 @@ namespace Volian.Print.Library CheckOff co = itemInfo.GetCheckOffStep(); if (co != null) { - //float xloc_co = (float)formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.XLocation + (float)itemInfo.MyDocStyle.Layout.LeftMargin; float xloc_co = (float)itemInfo.MyDocStyle.Layout.LeftMargin; if (formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.XLocation != null) xloc_co += (float)formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.XLocation; @@ -1240,9 +1250,12 @@ namespace Volian.Print.Library { int cntspac = 0; xloc_co = mytab.XOffset; + // SHE commented out next two lines - may need to control this by format flag for (int c = 0; c < itemInfo.MyTab.CleanText.Length; c++) if (itemInfo.MyTab.CleanText[c] == ' ') cntspac++; xloc_co = xloc_co - (cntspac * 6); } + //SHE else + //SHE xloc_co = XOffset; //there's no tab - put checkoff at step's xoff. Macro should back up from step's x. } PartsRight.Add(new vlnMacro(xloc_co, yForCheckoff, co.Macro)); @@ -1484,6 +1497,7 @@ namespace Volian.Print.Library vlnParagraph hls1 = MyParent; while (hls1.MyParent != null && !hls1.MyItemInfo.IsHigh) hls1 = hls1.MyParent; float colR = float.Parse(formatInfo.MyStepSectionLayoutData.ColRTable.Split(",".ToCharArray())[itemInfo.ColumnMode]); + //SHE float xLowerLimit = hls1.PartsLeft != null && hls1.PartsLeft.Count > 0 ? hls1.PartsLeft[0].XOffset : hls1.XOffset; float xLowerLimit = hls1.XOffset; float xUpperLimit = hls1.XOffset + hls1.Width + colR * itemInfo.ColumnMode; float TableCenterPos = float.Parse(formatInfo.MyStepSectionLayoutData.TableCenterPos.Split(",".ToCharArray())[itemInfo.ColumnMode]); @@ -2042,7 +2056,7 @@ namespace Volian.Print.Library else if (itemInfo.IsRNOPart && (colOvrd > 0 || !((ItemInfo)itemInfo.ActiveParent).IsHigh)) { if (colOvrd > 0) - { + { XOffset = (int)colOvrd; if (!((ItemInfo)itemInfo.MyParent).IsHigh) { diff --git a/PROMS/fmtxml/WST1all.xml b/PROMS/fmtxml/WST1all.xml index d7884676b655333fe98ab01b0609e76429023ca2..9ed43587e9413d8d8adf202cbec04e22a611b86a 100644 GIT binary patch delta 669 zcmX@HjkRGX>xQ(ulLfBmOs;yQF?r8@g~_+>_Mr0bf%smNH{4$XrE{h);AiBREcH+W zCNSCI4acNMeo%e)p!B54Vow5~?7qngPi=r~z3CH#7p=37sdWSMmt zEGBO}QV*n!CmS9;%4`heE1q~L%nqtWz6LB^%i53n+tLD&x&4JQj;(FK{KHQj)n z(QNXDBO22uurodbGZt__85=mEj00Ry#szN1H9$2c5ZmvZEtt;Z%c!?KgqQJ#rlKc9 z9z!xi4nrwJ3PUObh!?`(&*02p%b>(i!cfFeI^Ex!QFb!hM1koCLK)SjPY7aEnZCi1 zQEB@=bH*!7MC#wZ!iv$3h0$UF~F-Pc?g8`y|bd>`aOj_DO) rj8WSs_%MnQ;ll0n{TP=r6KA~a_NX962ci{k2xaUdT5&)m;}1pv;cnFD delta 330 zcmZqJ$$DZN>xQ(uj24pxuV_!MdZaOV&wYi-x9;|!i`;{VcuwAMe+^g;#LAi8pvlNF zS?Zw%LTIwX8;(hj{NVcU!C8|gi#-W|^ZF($JhcJybf*{SF!D@4V8O^TeH{;@-Sk`b zj24>(p1qOT?C?B?WwXM`9W0X`$W6BZ$vx0#)S6uI5u$uMP3QV(R zRNFqooKcDyEVTWD6{8)?^a4-DHQRwk>ajvZ-CP+P*uc!`EIy2frZndyoHR6gO#2{>!k z^75@9xBFq_<{E;_wH bj?rtnof42}&}S6ezDJcYfp@x(8KVUNYdcL4 diff --git a/PROMS/fmtxml/WSTALRall.xml b/PROMS/fmtxml/WSTALRall.xml index afd161f02866cdaa932c0b59c4ccfbfbf3224b41..227390b9c5a296527450eb0184704cbf4f6bc212 100644 GIT binary patch delta 141 zcmaE|l=;b0<_)_xGn!1^xJ`TVxg8pl1-2S{9@d`hcT{8YghL9G*B$6V7dZ$K**f{dAqTMBQ!u%G@`T-N zldl}{gR8#>XHA;?>R14r*EjjyPL0VjCqx)cHXEJ@W>vXc!?nP>+vBr>D})uEb;p&n?D2~>~70#o47bTncG$-?`M`Fg$p#M#P(;=+ngdnN2Zoi_XHA;?>R14r*EjjyPL0VjCqx)6HXEJ@7uK}A^T+!g2>~L3O z@_|=8lM}RACLcH|vAJzq3Crdi=Z-N?j(Fw3Y{+0V+3~LW<^!*mF-?B=OKkI!x3`!l g@B6)G@|qJCo0C3$VF8Oy`5wVOIpJN`