This commit is contained in:
Kathy Ruffing 2012-05-08 13:06:22 +00:00
parent 00e634f4ed
commit 1c183dc7ae
3 changed files with 20 additions and 3 deletions

View File

@ -143,7 +143,13 @@ namespace Volian.Print.Library
get { return _MyChangeBarDefinition; }
set { _MyChangeBarDefinition = value; }
}
public PromsPrinter(ItemInfo myItem, string rev, string revDate, string watermark, bool debugOutput, string backgroundFolder,bool openPDF, bool overWrite, ChangeBarDefinition cbd, String pdfFile)
private bool _OriginalPageBreak; // use 16bit page breaks.
public bool OriginalPageBreak
{
get { return _OriginalPageBreak; }
set { _OriginalPageBreak = value; }
}
public PromsPrinter(ItemInfo myItem, string rev, string revDate, string watermark, bool debugOutput, bool origPgBrk, string backgroundFolder, bool openPDF, bool overWrite, ChangeBarDefinition cbd, String pdfFile)
{
_MyItem = myItem;
_Rev = rev;
@ -155,6 +161,7 @@ namespace Volian.Print.Library
_OverWrite = overWrite;
_MyChangeBarDefinition = cbd;
_PDFFile = pdfFile;
_OriginalPageBreak = origPgBrk;
}
public string Print(string pdfFolder)
{
@ -369,6 +376,7 @@ namespace Volian.Print.Library
_MyHelper.RevDate = _RevDate;
_MyHelper.Watermark = _Watermark;
_MyHelper.DoZoomOMatic = DebugOutput;
_MyHelper.OriginalPageBreak = OriginalPageBreak;
OnStatusChanged("After Set PageEvent", PromsPrinterStatusType.SetPageEvent);
}
else

View File

@ -308,6 +308,12 @@ namespace Volian.Print.Library
get { return _MyChangeBars; }
set { _MyChangeBars = value; }
}
private bool _OriginalPageBreak; // use 16bit page breaks.
public bool OriginalPageBreak
{
get { return _OriginalPageBreak; }
set { _OriginalPageBreak = value; }
}
public void AddChangeBar(vlnChangeBar vcb, string cbmess)
{
if (vcb == null) return;

View File

@ -588,7 +588,8 @@ namespace Volian.Print.Library
// flag SectionPageBreak is set to true to flag that a pagebreak should not be done
// on that first step.
StepConfig sc = firstChild.MyItemInfo.MyConfig as StepConfig;
ManualPageBreak = sc == null? false: sc.Step_ManualPagebreak;
ManualPageBreak = MyPageHelper.OriginalPageBreak ? (sc == null?false: sc.Step_ManualPagebreak):
sc == null? false: sc.Step_NewManualPagebreak;
if (ManualPageBreak)
{
SectionPageBreak = true;
@ -608,7 +609,9 @@ 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
ManualPageBreak = (MyItemInfo.MyConfig as StepConfig).Step_ManualPagebreak;
StepConfig sc1 = MyItemInfo.MyConfig as StepConfig;
ManualPageBreak = MyPageHelper.OriginalPageBreak ? (sc1 == null ? false : sc1.Step_ManualPagebreak) :
sc1 == null ? false : sc1.Step_NewManualPagebreak;
if (MyItemInfo.FirstSibling == MyItemInfo && ManualPageBreak)
{
// if parent/section used this pagebreak, skip it.