Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed initialization of the Print Section Number and Title

Browse Source 
Fixed the logic that determines the column mode of a section
Logic to support the {HLSTEXT} token
This commit is contained in:
John Jenko
2013-06-10 19:53:02 +00:00
parent df121e54a9
commit f963dfc03c
4 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PROMS/Volian.Print.Library/Pagination.cs
View File

@@ -135,6 +135,8 @@ namespace Volian.Print.Library
return 0; // Don't Paginate (page break) on a Step Section if it's first thing on page
}
if (!MyItemInfo.IsHigh) return 0; // Don't Paginate on a Substep level
MyPageHelper.HLSText = MyItemInfo.DisplayText; // save the High Level Step Text
//Console.WriteLine("{0} Paginate", MyPageHelper.HLSText);
StepConfig sc1 = MyItemInfo.MyConfig as StepConfig;
ManualPageBreak = MyPageHelper.OriginalPageBreak ? (sc1 == null ? false : sc1.Step_ManualPagebreak) :
sc1 == null ? false : sc1.Step_NewManualPagebreak;

10
PROMS/Volian.Print.Library/PromsPrinter.cs
View File

@@ -381,11 +381,15 @@ namespace Volian.Print.Library
// Set up Helper for the particular Section
if (_MyHelper == null)
{
cb.PdfWriter.PageEvent = _MyHelper = new VlnSvgPageHelper(mySection, this);
string hlsText = "";
if (mySection.IsStepSection && mySection.Steps.Count > 0)
hlsText = mySection.Steps[0].DisplayText; // save the High level step text for use in the page list
cb.PdfWriter.PageEvent = _MyHelper = new VlnSvgPageHelper(mySection, this, hlsText);
_MyHelper.AllowAllWatermarks = AllowAllWatermarks;
_MyHelper.MyPdfWriter = cb.PdfWriter;
_MyHelper.CreatingFoldoutPage = doingFoldout;
_MyHelper.MyPdfContentByte = cb;
if (!mySection.IsStepSection) _MyHelper.PageBookmarks.Add((ItemInfo)mySection, ((mySection.DisplayNumber ?? "") == "" ? "" : mySection.DisplayNumber + " - ") + mySection.DisplayText, null);
if (DebugOutput)
{
@@ -418,7 +422,9 @@ namespace Volian.Print.Library
}
else
{
_MyHelper.DidFirstPageDocStyle = false;
//Console.WriteLine("'{0}' PromsPrinter", mySection.DisplayText);
if (mySection.SectionConfig.Section_Pagination == SectionConfig.SectionPagination.Separate)
_MyHelper.DidFirstPageDocStyle = false;
if (!mySection.IsStepSection) _MyHelper.PageBookmarks.Add((ItemInfo)mySection, ((mySection.DisplayNumber ?? "") == "" ? "" : mySection.DisplayNumber + " - ") + mySection.DisplayText, null);
_MyHelper.MySection = mySection;
OnStatusChanged("After Set Svg", PromsPrinterStatusType.SetSVG);