Use property to initialize (prevent null reference)

Added sup info pdf print to supinfo print enum
Use sup info pdf print from enum
fixed typo and use sup info pdf print from enum
B2017-136: Support section titles in proc step sections that have SAMG facing page supplemental info
This commit is contained in:
2017-07-10 12:10:58 +00:00
parent f204e513de
commit 92dfcf47ed
5 changed files with 49 additions and 35 deletions

View File

@@ -1621,8 +1621,7 @@ namespace Volian.Print.Library
ItemInfo myItemInfo = section as ItemInfo;
if (SupInfoPrintType == E_SupInfoPrintType.DoPageBreaks)
{
if (section.StepSectPageBreaksForSupInfo == null) section.StepSectPageBreaksForSupInfo = new List<int>();
else section.StepSectPageBreaksForSupInfo.Clear();
section.StepSectPageBreaksForSupInfo.Clear();
section.StepSectPageBreaks.Clear();
}
// 792: 72 * 11 inches - TopRow - Top is high value
@@ -1743,18 +1742,20 @@ namespace Volian.Print.Library
string SupInfoPdfName = Volian.Base.Library.VlnSettings.TemporaryFolder + @"\SupInfo" + vlnParagraph.MyItemInfo.ItemID.ToString() + @".pdf";
PdfContentByte cb = OpenDoc(SupInfoPdfName, PageSize.LETTER);
if (cb == null) return;
VlnSvgPageHelper myPageHealper = new VlnSvgPageHelper(vlnParagraph.MyItemInfo as SectionInfo, this, null, 0);
cb.PdfWriter.PageEvent = myPageHealper;
myPageHealper.AllowAllWatermarks = AllowAllWatermarks;
myPageHealper.MyPdfWriter = cb.PdfWriter;
myPageHealper.CreatingFoldoutPage = false;
myPageHealper.CreatingSupInfoPage = true;
myPageHealper.MyPdfContentByte = cb;
myPageHealper.ChangeBarDefinition = MyChangeBarDefinition;
VlnSvgPageHelper myPageHelper = new VlnSvgPageHelper(vlnParagraph.MyItemInfo as SectionInfo, this, null, 0);
cb.PdfWriter.PageEvent = myPageHelper;
myPageHelper.AllowAllWatermarks = AllowAllWatermarks;
myPageHelper.MyPdfWriter = cb.PdfWriter;
myPageHelper.CreatingFoldoutPage = false;
myPageHelper.CreatingSupInfoPage = true;
myPageHelper.MyPdfContentByte = cb;
myPageHelper.ChangeBarDefinition = MyChangeBarDefinition;
float yPageStart = yTopMargin;
vlnParagraph._yPageStartForSupInfo = yTopMargin;
SupInfoAjustGroupings(vlnParagraph,cb);
SupInfoPrintType = E_SupInfoPrintType.SupInfoPdfPrint;
vlnParagraph.ToPdf(cb, yPageStart, ref yTopMargin, ref yBottomMargin);
SupInfoPrintType = E_SupInfoPrintType.Merge;
try
{
cb.PdfDocument.Close();