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

Allow for multi-line step designators

Browse Source
This commit is contained in:
John Jenko 2015-05-21 17:59:53 +00:00
parent 97225f61b8
commit 61507043d4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -283,7 +283,8 @@ namespace Volian.Print.Library
childItemInfo.IsCaution1 && childItemInfo.SameRowAsParent) childItemInfo.IsCaution1 && childItemInfo.SameRowAsParent)
{ {
// Save the Step Designator information // Save the Step Designator information
_StepDesignator = childItemInfo.DisplayText; // SameRowAsParentMultiLine currently used in Comanche Peak EOP and Flex formats - handles a hard return in the caution type
_StepDesignator = ((childItemInfo.SameRowAsParentMultiLines) ? childItemInfo.MulitLineStepDesignatorDisplayText : childItemInfo.DisplayText);
int typ = ((int)childItemInfo.MyContent.Type) % 10000; int typ = ((int)childItemInfo.MyContent.Type) % 10000;
_StepDesignatorColumn = formatInfo.PlantFormat.FormatData.StepDataList[typ].ColOverride; _StepDesignatorColumn = formatInfo.PlantFormat.FormatData.StepDataList[typ].ColOverride;
E_Style es = (E_Style)childItemInfo.FormatStepData.Font.Style; E_Style es = (E_Style)childItemInfo.FormatStepData.Font.Style;
@ -293,14 +294,14 @@ 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 && if (childItemInfo.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.ContActBoxOnSubSteps &&
box != null && box.MyBox != null && bxIndx == null) // point beach boxed substeps box != null && box.MyBox != null && bxIndx == null) // point beach boxed substeps
{ {
box.Height = yoff - box.YOffset - (1F * vlnPrintObject.SixLinesPerInch); box.Height = yoff - box.YOffset - (1F * vlnPrintObject.SixLinesPerInch);
box = null; box = null;
yoff += 1 * vlnPrintObject.SixLinesPerInch; yoff += 1 * vlnPrintObject.SixLinesPerInch;
} }
vlnParagraph para = new vlnParagraph(Parent, cb, childItemInfo, xoff, yoff, rnoLevel, maxRNO, formatInfo, null, null, yoffRight,true, pp); vlnParagraph para = new vlnParagraph(Parent, cb, childItemInfo, xoff, yoff, rnoLevel, maxRNO, formatInfo, null, null, yoffRight, true, pp);
// 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
// so this can be returned after the row is done. // so this can be returned after the row is done.
@ -330,7 +331,7 @@ namespace Volian.Print.Library
else if (!para.UseTemplateKeepOnCurLine(childItemInfo)) else if (!para.UseTemplateKeepOnCurLine(childItemInfo))
yoff = para.YBottomMost; yoff = para.YBottomMost;
// don't adjust YBottomost until after yoff is set for the RNO Separator // don't adjust YBottomost until after yoff is set for the RNO Separator
para.YBottomMost += para.YBottomMostAdjust; para.YBottomMost += para.YBottomMostAdjust;
if (box != null && childItemInfo.FormatStepData != null && childItemInfo.FormatStepData.BoxIt) if (box != null && childItemInfo.FormatStepData != null && childItemInfo.FormatStepData.BoxIt)
{ {
box.Height = yoff - box.YOffset - (1.1F * vlnPrintObject.SixLinesPerInch); box.Height = yoff - box.YOffset - (1.1F * vlnPrintObject.SixLinesPerInch);