Changed code to correctly handle the location of check-offs and sign-offs.

This commit is contained in:
Rich 2013-07-16 18:12:37 +00:00
parent 12f492516f
commit 60fc6bbd18

View File

@ -620,8 +620,8 @@ namespace Volian.Print.Library
// if this document style has another style that is for pages other than first, we need to // if this document style has another style that is for pages other than first, we need to
// reset the document style off of this section AND reset docstyle values used. // reset the document style off of this section AND reset docstyle values used.
if ((MyItemInfo.MyActiveSection.MyDocStyle.StructureStyle.Where & E_DocStyleUse.UseOnFirstPage) > 0) if ((MyItemInfo.MyActiveSection.MyDocStyle.StructureStyle.Where & E_DocStyleUse.UseOnFirstPage) > 0)
{ {
float _PointsPerPage = 792; float _PointsPerPage = 792;
ItemInfo ii = (ItemInfo)MyItemInfo.MyActiveSection; ItemInfo ii = (ItemInfo)MyItemInfo.MyActiveSection;
int indx = (int)MyItemInfo.MyActiveSection.MyDocStyle.IndexOtherThanFirstPage; int indx = (int)MyItemInfo.MyActiveSection.MyDocStyle.IndexOtherThanFirstPage;
foreach (DocStyle ds in ii.ActiveFormat.PlantFormat.DocStyles.DocStyleList) foreach (DocStyle ds in ii.ActiveFormat.PlantFormat.DocStyles.DocStyleList)
@ -817,7 +817,7 @@ namespace Volian.Print.Library
DoCheckOffHeader(cb, MyItemInfo, yLocation, yTopMargin, yPageStart); DoCheckOffHeader(cb, MyItemInfo, yLocation, yTopMargin, yPageStart);
break; break;
} }
// If "doSectionTitleContinued" is true then print the section title with "(Continued)" appended to it // If "doSectionTitleContinued" is true then print the section title with "(Continued)" appended to it
// format must have ContinueSectinHeader format flag set to true // format must have ContinueSectinHeader format flag set to true
if (doSectionTitleContinued) if (doSectionTitleContinued)
@ -1361,7 +1361,7 @@ namespace Volian.Print.Library
//if (itemInfo.IsSection) //if (itemInfo.IsSection)
// Rtf = GetRtf(itemInfo, prefix, " (Continued)"); // Rtf = GetRtf(itemInfo, prefix, " (Continued)");
//else //else
Rtf = GetRtf(itemInfo, prefix, suffix); Rtf = GetRtf(itemInfo, prefix, suffix);
// Need the following with some modifications for WCNCKL format: // Need the following with some modifications for WCNCKL format:
if (Rtf.Contains("{Backspace}")) if (Rtf.Contains("{Backspace}"))
{ {
@ -1471,9 +1471,9 @@ namespace Volian.Print.Library
} }
else else
{ {
if (formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.XLocation != null) if (formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.XLocation != 0)
xloc_co += (float)formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.XLocation; xloc_co += (float)formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.XLocation;
if (formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.RelXLocation != null) else if (formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.RelXLocation != 0)
{ {
float relX = (float)formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.RelXLocation; float relX = (float)formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.RelXLocation;
xloc_co = XOffset + (relX > 0 ? Width : 0) + relX; xloc_co = XOffset + (relX > 0 ? Width : 0) + relX;