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

C0218-022: If tab is too long, move text xoffset over for SAMG Supplemental Info (default flag to false)

Browse Source
This commit is contained in:
Kathy Ruffing 2018-07-20 15:22:27 +00:00
parent e5ac83ff10
commit a6a9305f7d
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

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

@ -854,6 +854,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _SupInfoIncludeParTab, "@SupInfoIncludeParTab"); return LazyLoad(ref _SupInfoIncludeParTab, "@SupInfoIncludeParTab");
} }
} }
private LazyLoad<bool> _SupInfoAdjustXOffForLongTab;
public bool SupInfoAdjustXOffForLongTab
{
get
{
return LazyLoad(ref _SupInfoAdjustXOffForLongTab, "@SupInfoAdjustXOffForLongTab");
}
}
private LazyLoad<string> _TopOfPageThing; private LazyLoad<string> _TopOfPageThing;
public string TopOfPageThing public string TopOfPageThing
{ {

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

@ -5588,7 +5588,10 @@ namespace Volian.Print.Library
myTab.XOffset = XOffset - ((myTab == null) ? 0 : myTab.Width) - 12; myTab.XOffset = XOffset - ((myTab == null) ? 0 : myTab.Width) - 12;
// B2017-253 - Limit the tab offset to 2 points inside the left margin // B2017-253 - Limit the tab offset to 2 points inside the left margin
myTab.XOffset = Math.Max(myTab.XOffset,itemInfo.MyDocStyle.Layout.LeftMargin ?? 72)+2; myTab.XOffset = Math.Max(myTab.XOffset,itemInfo.MyDocStyle.Layout.LeftMargin ?? 72)+2;
float mytbwidth = myTab.Width;
myTab.Width = 2.5f * myTab.Width; myTab.Width = 2.5f * myTab.Width;
// C2018-022: adjust xoffset of text by 12 if the tab would overwrite the text and the format flag is on:
if (itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SupInfoAdjustXOffForLongTab && myTab.XOffset + mytbwidth > XOffset) XOffset += 12;
} }
// B2017-102: need to set width here since using Xoffset because AdjustWidth is called before this adjustment. // B2017-102: need to set width here since using Xoffset because AdjustWidth is called before this adjustment.
Width = (float)itemInfo.MyDocStyle.Layout.PageWidth - XOffset - (sitabloc / 2); Width = (float)itemInfo.MyDocStyle.Layout.PageWidth - XOffset - (sitabloc / 2);