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

Merge branch 'Development' into C2024-001-Quick-Print-In-ribbon

Browse Source
This commit is contained in:
Paul Larsen 2024-01-11 12:42:06 -05:00
commit 4afac4b3df
5 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

9
PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs
View File

@ -202,6 +202,15 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _TextColor, "@TextColor");
}
}
// F2023-112 Vogtle Units 3 & Backgrounds - trim the ending "-B" from the procedure number (used in title box of page header)
private LazyLoad<string> _TrimEnding;
public string TrimEnding
{
get
{
return LazyLoad(ref _TrimEnding, "@TrimEnding");
}
}
#endregion
#region Override ToString
public override string ToString()

6
PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
View File

@ -1934,8 +1934,6 @@ i = 0;
else
eopnum = section.MyProcedure.DisplayNumber;// B2021-066: found and fixed during proc pc/pc work
}
}
// B2022-066 the "{PREDELIMEOPNUM}" token was not being processed because there was a space after the "{"
if (token.Equals("{PREDELIMEOPNUM}"))
@ -1947,6 +1945,10 @@ i = 0;
if (idx < eopnum.Length)
eopnum = eopnum.Substring(0, idx);
}
if (pageItem.TrimEnding != null)
eopnum = eopnum.TrimEnd(pageItem.TrimEnding.ToCharArray());
plstr = plstr.Replace(token, eopnum);
//svgGroup.Add(PageItemToSvgText(pageItem, pageItem.Token.Replace(token, eopnum)));
//svgGroup.Add(PageItemToSvgText(pageItem, pageItem.Token.Replace(token, section.MyProcedure.MyContent.Number)));

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

@ -6612,7 +6612,7 @@ namespace Volian.Print.Library
int? bxIndx = itemInfo.IsStep ? itemInfo.FormatStepData.StepLayoutData.STBoxindex : null;
float? widOvrd = 0;
float xwid = 0;
if (itemInfo.IsStep && itemInfo.MyHLS != null && UseTemplateWidthOrXOff(itemInfo) && (xwid = GetWidthOrStartFromTemplate(itemInfo, formatInfo, true)) > 0)
if (itemInfo.IsStep && itemInfo.MyHLS != null && UseTemplateWidthOrXOff(itemInfo) && (xwid = GetWidthOrStartFromTemplate(itemInfo, formatInfo, true)) > 0)
widOvrd = xwid;
else
widOvrd = itemInfo.FormatStepData == null ? null : itemInfo.FormatStepData.WidthOverride == null ? null :
@ -6671,10 +6671,15 @@ namespace Volian.Print.Library
}
if ((widOvrd ?? 0) != 0)
{
Width = (float)widOvrd;
// if there's a box, we may need to do an adjustment on the width, if the tab data was changed
// so don't return.
if (bxIndx == null) return;
//F2023-112 Vogtle Units 3 & 4 Backgrounds. Don't use override width of paragraph when it's off of TitleWithTextRight
// We need to allow the code to calculate the width of that paragraph for this case (later in this function)
if (!(itemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.Vogtle3and4BackgroundFormat && itemInfo.MyParent.FormatStepData != null && itemInfo.MyParent.FormatStepData.Type == "TitleWithTextRight"))
{
Width = (float)widOvrd;
// if there's a box, we may need to do an adjustment on the width, if the tab data was changed
// so don't return.
if (bxIndx == null) return;
}
}
float tabWidth = (myTab == null) ? 0 : myTab.Width;
if (itemInfo.IsHigh)