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

Added a flag for the box around continuous action substeps

Browse Source 
fix for Point Beach continuous action substeps
This commit is contained in:
John Jenko 2014-06-09 18:18:04 +00:00
parent 316aee183a
commit b1cd9ea1a3
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
View File

@ -3258,6 +3258,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _DiffContActBox, "@DiffContActBox"); return LazyLoad(ref _DiffContActBox, "@DiffContActBox");
} }
} }
private LazyLoad<bool> _ContActBoxOnSubSteps;
public bool ContActBoxOnSubSteps
{
get
{
return LazyLoad(ref _ContActBoxOnSubSteps, "@ContActBoxOnSubSteps");
}
}
private LazyLoad<int?> _SecColHdrforActPMode; private LazyLoad<int?> _SecColHdrforActPMode;
public int? SecColHdrforActPMode public int? SecColHdrforActPMode
{ {

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

@ -71,6 +71,7 @@ namespace Volian.Print.Library
const string BoxAsteriskWithSides2 = " *. *.*.*. . . *.*. . *. . "; // ip3 const string BoxAsteriskWithSides2 = " *. *.*.*. . . *.*. . *. . "; // ip3
const string BoxAsteriskWithSides3 = "*.*.*.*.*.*.*.*.*.*.*.*"; //byr const string BoxAsteriskWithSides3 = "*.*.*.*.*.*.*.*.*.*.*.*"; //byr
const string BoxAsteriskWithSides4 = "*.*.*.*.*.*.*.*. .*. . "; // wep2 const string BoxAsteriskWithSides4 = "*.*.*.*.*.*.*.*. .*. . "; // wep2
const string BoxAsteriskWithSides5 = "*.*.*.*. . .*.*. .*.*.*"; // WEP2 (Point Beach)
const string BoxAsteriskTopBottom = "*.*.*. . . .*.*. .*. . "; // fnp const string BoxAsteriskTopBottom = "*.*.*. . . .*.*. .*. . "; // fnp
const string BoxLineTopBottom = "\x2500.\x2500.\x2500. . . .\x2500.\x2500. .\x2500. . "; // fnp const string BoxLineTopBottom = "\x2500.\x2500.\x2500. . . .\x2500.\x2500. .\x2500. . "; // fnp
const string BoxAsteriskTopBotton2 = " .*. . . . . . . .*. . "; // Robinson (CPL) const string BoxAsteriskTopBotton2 = " .*. . . . . . . .*. . "; // Robinson (CPL)
@ -172,6 +173,7 @@ namespace Volian.Print.Library
case BoxAsteriskWithSides2: case BoxAsteriskWithSides2:
case BoxAsteriskWithSides3: case BoxAsteriskWithSides3:
case BoxAsteriskWithSides4: case BoxAsteriskWithSides4:
case BoxAsteriskWithSides5:
DrawAsteriskTopBottom(cb, yPageStart, yTopMargin, yBottomMargin, ref top, ref bottom, left, MyBox.Font); DrawAsteriskTopBottom(cb, yPageStart, yTopMargin, yBottomMargin, ref top, ref bottom, left, MyBox.Font);
DrawAsteriskSide(cb, yPageStart, yTopMargin, yBottomMargin, top, bottom, left, right, MyBox.Font); DrawAsteriskSide(cb, yPageStart, yTopMargin, yBottomMargin, top, bottom, left, right, MyBox.Font);
break; break;

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

@ -78,7 +78,6 @@ namespace Volian.Print.Library
maxRNO = (iChildItemInfo as SectionInfo).ColumnMode; maxRNO = (iChildItemInfo as SectionInfo).ColumnMode;
ItemInfo childItemInfo = iChildItemInfo; ItemInfo childItemInfo = iChildItemInfo;
int? bxIndx = childItemInfo.FormatStepData == null ? -1 : childItemInfo.FormatStepData.StepLayoutData.STBoxindex; int? bxIndx = childItemInfo.FormatStepData == null ? -1 : childItemInfo.FormatStepData.StepLayoutData.STBoxindex;
// if the Caution or Note is not boxed, then use ColT to set the starting column of the Note or Caution // if the Caution or Note is not boxed, then use ColT to set the starting column of the Note or Caution
if (((bxIndx ?? -1) == -1) && (childItemInfo.IsCaution || childItemInfo.IsNote) && !childItemInfo.IsInRNO && if (((bxIndx ?? -1) == -1) && (childItemInfo.IsCaution || childItemInfo.IsNote) && !childItemInfo.IsInRNO &&
!childItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.Dev_Format && !childItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.Dev_Format &&
@ -220,6 +219,13 @@ namespace Volian.Print.Library
{ {
if (childItemInfo is SectionInfo) formatInfo = (childItemInfo as SectionInfo).LocalFormat ?? formatInfo; if (childItemInfo is SectionInfo) formatInfo = (childItemInfo as SectionInfo).LocalFormat ?? formatInfo;
if (rnoLevel < maxRNO && childItemInfo.RNOs != null) yoff = Math.Max(yoff, yoffRight); if (rnoLevel < maxRNO && childItemInfo.RNOs != null) yoff = Math.Max(yoff, yoffRight);
if (childItemInfo.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.ContActBoxOnSubSteps &&
box != null && box.MyBox != null && bxIndx == null) // point beach boxed substeps
{
box.Height = yoff - box.YOffset - (1F * vlnPrintObject.SixLinesPerInch);
box = null;
yoff += 1 * vlnPrintObject.SixLinesPerInch;
}
vlnParagraph para = new vlnParagraph(Parent, cb, childItemInfo, xoff, yoff, rnoLevel, maxRNO, formatInfo, null, null, yoffRight); vlnParagraph para = new vlnParagraph(Parent, cb, childItemInfo, xoff, yoff, rnoLevel, maxRNO, formatInfo, null, null, yoffRight);
// if doing the component list (FNP), keep track of the bottom most columns' data // if doing the component list (FNP), keep track of the bottom most columns' data
@ -3130,7 +3136,6 @@ namespace Volian.Print.Library
XOffset = MyParent.MyParent.XOffset; XOffset = MyParent.MyParent.XOffset;
return; return;
} }
if (itemInfo.IsHigh) if (itemInfo.IsHigh)
{ {
float x = 0; float x = 0;
@ -3200,7 +3205,9 @@ namespace Volian.Print.Library
if (myTab != null) myTab.XOffset = XOffset + tabOffset; if (myTab != null) myTab.XOffset = XOffset + tabOffset;
return; return;
} }
else if (bxIndx != null) // put in for Point Beach (wep2) we don't want to do this if we are processing a boxed substep (cont. action substep)
else if (bxIndx != null && (itemInfo.IsCaution || itemInfo.IsNote ||
!itemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.ContActBoxOnSubSteps))
{ {
Box bx = formatInfo.PlantFormat.FormatData.BoxList[(int)bxIndx]; Box bx = formatInfo.PlantFormat.FormatData.BoxList[(int)bxIndx];
if (bx == null) if (bx == null)