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

B2014-105: When in Calvert Alarm Condition Response table, print AER table in AER column

Browse Source 
B2014-105: When in Calvert Alarm Condition Response table, AER column allow insert of AER table
This commit is contained in:
Kathy Ruffing 2016-06-28 15:05:42 +00:00
parent 9b3e3a76cf
commit 76b39e3046
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PROMS/Volian.Controls.Library/StepTabRibbon.cs
View File

@ -1669,8 +1669,11 @@ namespace Volian.Controls.Library
{ {
// If there is only one 'table' type from format under the ribbon's table item, // If there is only one 'table' type from format under the ribbon's table item,
// eliminate that button and move up the RO & Text Table buttons. // eliminate that button and move up the RO & Text Table buttons.
// This is done for single column mode, or if in the calvertconditionresponse table (dual column) and in the rno column. Note
// the '&&' in if check because when in the calvertconditionresponse table, the section is in 'single column' mode even though
// the condition response table is dual column. This fixes B2014-105.
SectionConfig sc = (SectionConfig)MyItemInfo.ActiveSection.MyConfig; SectionConfig sc = (SectionConfig)MyItemInfo.ActiveSection.MyConfig;
if (sc.Section_ColumnMode == SectionConfig.SectionColumnMode.One) // single column step editor if (sc.Section_ColumnMode == SectionConfig.SectionColumnMode.One && (!MyItemInfo.IsInCalvertConditionResponse || MyItemInfo.IsInRNO)) // single column step editor
{ {
// setup the sub menus for the insert table ribbon button // setup the sub menus for the insert table ribbon button
btn.Tag = btn.SubItems[0].Tag; btn.Tag = btn.SubItems[0].Tag;

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

@ -4202,7 +4202,14 @@ namespace Volian.Print.Library
else if (itemInfo.RNOLevel != 0) // RNO else if (itemInfo.RNOLevel != 0) // RNO
XOffset = MyParent.XOffset + MyParent.Width / 2 - Width / 2; XOffset = MyParent.XOffset + MyParent.Width / 2 - Width / 2;
else if (aerTableOrFigure) else if (aerTableOrFigure)
XOffset = MyHighLevelParagraph.XOffset + MyHighLevelParagraph.Width / 2 - Width / 2; {
// if in the BGE alarm format and the hls is a Window (upper right corner when it prints), use the parent of the table
// to print in aer column (B2014-105)
if (MyItemInfo.IsInCalvertConditionResponse)
XOffset = hls1.XOffset + hls1.Width / 2 - Width / 2;
else
XOffset = MyHighLevelParagraph.XOffset + MyHighLevelParagraph.Width / 2 - Width / 2;
}
else // Centered Table or Figure else // Centered Table or Figure
{ {
// Determine center of hls // Determine center of hls