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

Align centerd tables with CheckOffs

Browse Source 
Fix PCPC Print Logic when the next step is not applicable
This commit is contained in:
Rich 2014-09-29 16:17:17 +00:00
parent b2aa854328
commit 033e5e9122
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@ -141,7 +141,7 @@ namespace Volian.Print.Library
{ {
if ((childItemInfo.IsCaution || childItemInfo.IsNote) && if ((childItemInfo.IsCaution || childItemInfo.IsNote) &&
childItemInfo.MyPrevious != null && childItemInfo.MyPrevious.MyContent.Type != childItemInfo.MyContent.Type && childItemInfo.MyPrevious != null && childItemInfo.MyPrevious.MyContent.Type != childItemInfo.MyContent.Type &&
childItemInfo.NextItemCount > 0 && childItemInfo.MyContent.Type == childItemInfo.GetNextItem().MyContent.Type) childItemInfo.NextItemCount > 0 && childItemInfo.GetNextItem()!= null && childItemInfo.MyContent.Type == childItemInfo.GetNextItem().MyContent.Type)
childItemInfo.SetupTags(); // added for V.C. Summer Transition caution in EOP-15.0 step 5.4 childItemInfo.SetupTags(); // added for V.C. Summer Transition caution in EOP-15.0 step 5.4
if (lastHeader != null) if (lastHeader != null)
{ {
@ -2923,14 +2923,13 @@ namespace Volian.Print.Library
float xUpperLimit = 0; float xUpperLimit = 0;
float pageWidth = ((float)itemInfo.MyActiveSection.MyDocStyle.Layout.PageWidth); float pageWidth = ((float)itemInfo.MyActiveSection.MyDocStyle.Layout.PageWidth);
float leftMargin = ((float)itemInfo.MyActiveSection.MyDocStyle.Layout.LeftMargin); //* (float)MyItemInfo.FormatStepData.Font.CPI / 12; float leftMargin = ((float)itemInfo.MyActiveSection.MyDocStyle.Layout.LeftMargin); //* (float)MyItemInfo.FormatStepData.Font.CPI / 12;
if (itemInfo.IsInRNO) if (itemInfo.IsInRNO)
// if in rno column, the upper limit is width of the page (right margin). Subtract off size of a character // if in rno column, the upper limit is width of the page (right margin). Subtract off size of a character
xUpperLimit = pageWidth - (72 / (float)MyItemInfo.FormatStepData.Font.CPI); xUpperLimit = pageWidth - (72 / (float)MyItemInfo.FormatStepData.Font.CPI);
else else
// in the following calculation, the hls width (hls1.Width) == rno column width, so xUpperLimit is // in the following calculation, the hls width (hls1.Width) == rno column width, so xUpperLimit is
// the around the right margin, i.e. 'hls xoffset' + 'location of rno (colR) * columnmode' + 'width of rno' // the around the right margin, i.e. 'hls xoffset' + 'location of rno (colR) * columnmode' + 'width of rno'
xUpperLimit = hls1.XOffset + hls1.Width + colR * itemInfo.ColumnMode; xUpperLimit = hls1.XOffset + hls1.Width + hls1.CheckOffWidth + colR * itemInfo.ColumnMode;
// If a table is within the alarm section and its parent is a template item is single column // If a table is within the alarm section and its parent is a template item is single column
// adjust the xoffset so that the table is centered around center of page // adjust the xoffset so that the table is centered around center of page
@ -3829,6 +3828,12 @@ namespace Volian.Print.Library
} }
return tableftadj; return tableftadj;
} }
private float _CheckOffWidth = 0;
public float CheckOffWidth
{
get { return _CheckOffWidth; }
set { _CheckOffWidth = value; }
}
public void AdjustWidth(ItemInfo itemInfo, int maxRNO, FormatInfo formatInfo, vlnTab myTab) public void AdjustWidth(ItemInfo itemInfo, int maxRNO, FormatInfo formatInfo, vlnTab myTab)
{ {
int? bxIndx = itemInfo.IsStep ? itemInfo.FormatStepData.StepLayoutData.STBoxindex : null; int? bxIndx = itemInfo.IsStep ? itemInfo.FormatStepData.StepLayoutData.STBoxindex : null;
@ -3883,6 +3888,7 @@ namespace Volian.Print.Library
CheckOffAdj = -((float)9 * 6); CheckOffAdj = -((float)9 * 6);
} }
float adjwidth = CheckOffAdj; float adjwidth = CheckOffAdj;
CheckOffWidth = -CheckOffAdj;
SectData sd = formatInfo.PlantFormat.FormatData.SectData; SectData sd = formatInfo.PlantFormat.FormatData.SectData;
if (sd.UseMetaSections) if (sd.UseMetaSections)
{ {