From 6c125d899745db68617565cb18ffbcacbcb3dc9e Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 6 Mar 2012 17:21:29 +0000 Subject: [PATCH] --- PROMS/Volian.Print.Library/vlnParagraph.cs | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 7ecdc496..405201aa 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -156,7 +156,11 @@ namespace Volian.Print.Library if (MyItemInfo.IsSection) { SectionConfig sch = MyItemInfo.MyConfig as SectionConfig; - if (sch != null && sch.Section_PrintHdr != "Y") doprint = false; + if (!(MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.ShowSectionTitles + && !MyItemInfo.MyDocStyle.CancelSectTitle + && !MyItemInfo.MyDocStyle.SpecialStepsFoldout) + && + ((sch != null && sch.Section_PrintHdr != "Y") || !MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections)) doprint = false; } if (MyItemInfo.MyContent.MyGrid != null) retval = DrawGrid(cb, ref yPageStart, yTopMargin, yBottomMargin, ref yLocation); @@ -913,7 +917,11 @@ namespace Volian.Print.Library if (itemInfo.IsSection) { SectionConfig sch = MyItemInfo.MyConfig as SectionConfig; - if (sch != null && sch.Section_PrintHdr != "Y") doprint = false; + if (!(MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.ShowSectionTitles + && !MyItemInfo.MyDocStyle.CancelSectTitle + && !MyItemInfo.MyDocStyle.SpecialStepsFoldout) + && + ((sch != null && sch.Section_PrintHdr != "Y") || !MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections)) doprint = false; } if (doprint && itemInfo.IsSection && !itemInfo.MyDocStyle.CancelSectTitle && itemInfo.MyTab.Text.ToUpper() != "FOLDOUT") { @@ -972,6 +980,7 @@ namespace Volian.Print.Library // there may be other places that double space, but this supports it for RNOs (the DoubleRNOspace flag) if (rnoLevel > maxRNO && itemInfo.FormatStepData.DoubleSpace) yoff = YOffset = yoff + SixLinesPerInch; } + if (itemInfo.ItemID == 191) Console.WriteLine("here"); AddMacros(itemInfo, mytab); if (mytab != null) { @@ -1045,15 +1054,16 @@ namespace Volian.Print.Library Width = GetTableWidth(cb, IParagraph, MyItemInfo.MyDocStyle.Layout.PageWidth); CalculateXOffset(itemInfo, maxRNO, formatInfo); } - bool printhdr = true; + bool printMetaHdr = false; if (itemInfo.Steps != null && itemInfo.IsSection && itemInfo.Sections != null && itemInfo.Sections.Count > 0) { SectionConfig sc = itemInfo.MyConfig as SectionConfig; - if (sc != null && sc.Section_PrintHdr != "Y") printhdr = false; + if ((sc != null && sc.Section_PrintHdr == "Y") && itemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections) printMetaHdr = true; } // Determine if section title is output if (!itemInfo.IsStepSection - || (printhdr && formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.ShowSectionTitles + || printMetaHdr || + (formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.ShowSectionTitles && !MyItemInfo.MyDocStyle.CancelSectTitle && !MyItemInfo.MyDocStyle.SpecialStepsFoldout)) {