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

F2016-061: Additional signoff types for VCBA & WST1 for SCANA’s maintenance department

Browse Source
This commit is contained in:
Kathy Ruffing 2017-01-24 16:00:06 +00:00
parent 41a135864f
commit 54765cea95
6 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/vcbaall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/wst1all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/vcba.svg
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/wst1.svg
View File

Binary file not shown.

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

@ -1646,6 +1646,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _CheckOffXtraLines, "@CheckOffXtraLines"); return LazyLoad(ref _CheckOffXtraLines, "@CheckOffXtraLines");
} }
} }
private LazyLoad<float?> _CheckOffNumberOfLines;
public float? CheckOffNumberOfLines
{
get
{
return LazyLoad(ref _CheckOffNumberOfLines, "@CheckOffNumberOfLines");
}
}
private LazyLoad<string> _MenuItem; private LazyLoad<string> _MenuItem;
public string MenuItem public string MenuItem
{ {

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

@ -3677,27 +3677,38 @@ namespace Volian.Print.Library
xloc_co = XOffset + (relX > 0 ? Width : 0) + relX; xloc_co = XOffset + (relX > 0 ? Width : 0) + relX;
} }
} }
// CheckOffXtraLines was introduced for the additional lines needed for the longer signoffs
// if xtraCheckOffLines is a negative number, start the checkoff on the same line // for VCBA (&WST1), for F2016-061.
// as text and adjust the y-offset after the checkoff by the amount of the absolute float checkOffNumberOfLines = (co.CheckOffNumberOfLines ?? 0);
// value of xtraCheckOffLines. if (checkOffNumberOfLines > 0)
// if xtraCheckOffLines is a positive number, start the checkoff xtraCheckOffLines - 1
// down from the text and adjust the y-offset after the checkoff by the amount
// of xtraCheckOffLines.
float xtraCheckOffLines = (co.CheckOffXtraLines ?? 0);
if (xtraCheckOffLines < 0)
{ {
xtraCheckOffLines = -xtraCheckOffLines; yForCheckoff += (2 * SixLinesPerInch);
xtraCheckOffLines *= SixLinesPerInch;
PartsRight.Add(new vlnMacro(xloc_co, yForCheckoff/* + xtraCheckOffLines */, co.Macro)); PartsRight.Add(new vlnMacro(xloc_co, yForCheckoff/* + xtraCheckOffLines */, co.Macro));
yoff += xtraCheckOffLines; yoff += ((checkOffNumberOfLines *= SixLinesPerInch) + (2 * SixLinesPerInch));
} }
else else
{ {
xtraCheckOffLines *= SixLinesPerInch; // if xtraCheckOffLines is a negative number, start the checkoff on the same line
xtraCheckOffLines -= ((xtraCheckOffLines>0)? SixLinesPerInch:0); // as text and adjust the y-offset after the checkoff by the amount of the absolute
PartsRight.Add(new vlnMacro(xloc_co, yForCheckoff + xtraCheckOffLines, co.Macro)); // value of xtraCheckOffLines.
yoff += (xtraCheckOffLines != 0) ? xtraCheckOffLines + SixLinesPerInch : 0; // if xtraCheckOffLines is a positive number, start the checkoff xtraCheckOffLines - 1
// down from the text and adjust the y-offset after the checkoff by the amount
// of xtraCheckOffLines.
float xtraCheckOffLines = (co.CheckOffXtraLines ?? 0);
if (xtraCheckOffLines < 0)
{
xtraCheckOffLines = -xtraCheckOffLines;
xtraCheckOffLines *= SixLinesPerInch;
PartsRight.Add(new vlnMacro(xloc_co, yForCheckoff/* + xtraCheckOffLines */, co.Macro));
yoff += xtraCheckOffLines;
}
else
{
xtraCheckOffLines *= SixLinesPerInch;
xtraCheckOffLines -= ((xtraCheckOffLines > 0) ? SixLinesPerInch : 0);
PartsRight.Add(new vlnMacro(xloc_co, yForCheckoff + xtraCheckOffLines, co.Macro));
yoff += (xtraCheckOffLines != 0) ? xtraCheckOffLines + SixLinesPerInch : 0;
}
} }
} }
} }