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

Development #212

Merged
djankowski merged 23 commits from Development into master 2024-01-24 11:30:40 -05:00
Conversation 0 Commits 23 Files Changed 45 +10 -5
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8e4c42ac05 - Show all commits

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

Binary file not shown.

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

Binary file not shown.

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