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

Blank lines around Multiple Cautions/Notes

Browse Source 
Getting Template Item/compare text AND type (in code that only BGE Alarms uses)
Blank lines around Multiple Cautions/Notes; Don’t do alarm box if box ended on previous page (only occurred when break was on substep of non-boxed step).
This commit is contained in:
Kathy Ruffing
2014-08-05 12:51:19 +00:00
parent eba0e7ea55
commit c6122d5a95
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@@ -3650,7 +3650,8 @@ namespace VEPROMS.CSLA.Library
if (txt == null && formatData.Templates[indx].type == (MyContent.Type - 20001)) return indx;
// now see if we're on the topType, if so, look under this one for the step type
// that we're on, the TEXT ALSO NEEDS TO MATCH. If found return the index of it.
if (txt != null && formatData.Templates[indx].text!=null && (txt.Trim() == formatData.Templates[indx].text.Trim())) return indx;
if (txt != null && formatData.Templates[indx].text!=null && (txt.Trim() == formatData.Templates[indx].text.Trim())
&& ((MyContent.Type - 20001) == formatData.Templates[indx].type)) return indx;
indx++;
}
return -1; // didn't find this step type in the template width override list.

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

@@ -994,16 +994,19 @@ namespace Volian.Print.Library
{
// if the first step in box is what broke to next page, then
// don't print the box on this page, only print it on next page:
doAlarmBox = true;
if (MyItemInfo.MyPrevious == null)
MyPageHelper.AlarmYoffStart = 0;
else if (MyPageHelper.AlarmYoffEnd == 0)
{
// doThreeContinues flags when continue messages are printed in the
// bottom of the CONDITION/RESPONSE table columns.
doThreeContinues = MyItemInfo.StepLevel>1;
doThreeContinues = MyItemInfo.StepLevel > 1;
MyPageHelper.AlarmYoffEnd = CalculateYLocation(yLocation, yTopMargin);
}
doAlarmBox = true;
else if (MyPageHelper.AlarmYoffEnd > 0)
doAlarmBox = false;
}
}
}
@@ -1059,10 +1062,10 @@ namespace Volian.Print.Library
// For Calvert Alarms, if there was a page break and there is an box around the current
// step, need to add the header for the box, which is stored in a macro. Also set the
// 'AlarmYoffStart' value to where the vertical lines of the box start on this page.
if (doAlarmBox && MyItemInfo.StepLevel>1)
if (doAlarmBox && MyItemInfo.StepLevel > 1)
{
float alrmY = CalculateYOffset(yPageStart, yTopMargin);
PartsLeft.Add(new vlnMacro((float)docstyle.Layout.LeftMargin - 12, YOffset-(4*SixLinesPerInch), "H4")); // probably not the right paragraph?
PartsLeft.Add(new vlnMacro((float)docstyle.Layout.LeftMargin - 12, YOffset - (4 * SixLinesPerInch), "H4"));
MyPageHelper.AlarmYoffStart = alrmY - SixLinesPerInch;
yPageStart -= (4 * SixLinesPerInch);
}
@@ -2793,6 +2796,7 @@ namespace Volian.Print.Library
if (MyItemInfo.FormatStepData != null && MyItemInfo.FormatStepData.Prefix != null && MyItemInfo.FormatStepData.Suffix != null && MyItemInfo.FormatStepData.UseSmartTemplate) return 0;
int everyNLines = MyItemInfo.FormatStepData == null ? 1 : MyItemInfo.FormatStepData.StepLayoutData.EveryNLines ?? 1;
if (everyNLines == -99) return 0;
if ((MyItemInfo.IsCaution || MyItemInfo.IsNote) && !MyItemInfo.FormatStepData.SpaceIn && MyItemInfo.GetNextItem() == null) return 0;
if (MyItemInfo.Ordinal % everyNLines == 0 || MyItemInfo.GetNextItem() == null) return SixLinesPerInch;
// Pagination issue to be used with yEndsWithBlankLine in Pagination code, but not checked in yet.
//if (MyItemInfo.Ordinal % everyNLines == 0 || MyItemInfo.NextItem == null) return SixLinesPerInch;

8
PROMS/fmtxml/PlantSpecific_Calvert.cs
View File

@@ -23,15 +23,17 @@ namespace fmtxml
fmtdata.StepData[2].TabData.IdentEdit = "WINDOW ";
fmtdata.StepData[2].TabData.Ident = "WINDOW ";
fmtdata.StepData[2].UseOldTemplate = "True";
fmtdata.StepData[6].StepLayoutData.EveryNLines = "-99";
fmtdata.StepData[7].StepLayoutData.EveryNLines = "-99";
//fmtdata.StepData[6].StepLayoutData.EveryNLines = "-99";
//fmtdata.StepData[7].StepLayoutData.EveryNLines = "-99";
fmtdata.StepData[20].StepLayoutData.EveryNLines = "1";
fmtdata.StepData[22].StepLayoutData.EveryNLines = "-99";
//fmtdata.StepData[22].StepLayoutData.EveryNLines = "-99";
fmtdata.StepData[43].UseOldTemplate = "True";
fmtdata.StepData[14].StepLayoutData.EveryNLines = "-99";
fmtdata.StepData[31].StepLayoutData.EveryNLines = "-99"; // not sure if I need this - inheritance
fmtdata.StepData[20].StepPrintData.Justify = "Center";
fmtdata.StepData[20].OneLineBeforeTab = "True";
fmtdata.StepData[20].SpaceIn = "True";
fmtdata.StepData[20].StepLayoutData.EveryNLines = "1";
fmtdata.BoxData[1].TxtStart = 356;
fmtdata.BoxData[1].TxtWidth = 130;
fmtdata.BoxData[1].BXMLS = null;