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

B2017-102: For figures, don’t add extra line for change bar lengths

Browse Source 
B2017-102: Add an offset for width to locate Change Bars on supplemental information
This commit is contained in:
Kathy Ruffing 2017-06-05 13:14:44 +00:00
parent b24c748d2f
commit 21223b9b1f
4 changed files with 15 additions and 3 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.

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

@ -812,6 +812,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _DoPrnDrvrAdjusts, "@DoPrnDrvrAdjusts"); return LazyLoad(ref _DoPrnDrvrAdjusts, "@DoPrnDrvrAdjusts");
} }
} }
private LazyLoad<int?> _SupInfoTabOff;
public int? SupInfoTabOff
{
get
{
return LazyLoad(ref _SupInfoTabOff, "@SupInfoTabOff");
}
}
private LazyLoad<string> _TopOfPageThing; private LazyLoad<string> _TopOfPageThing;
public string TopOfPageThing public string TopOfPageThing
{ {

2
PROMS/Volian.Print.Library/vlnChangeBar.cs
View File

@ -106,7 +106,7 @@ namespace Volian.Print.Library
Messages = new SortedDictionary<float, vlnChangeBarMessage>(); Messages = new SortedDictionary<float, vlnChangeBarMessage>();
// if there is an RNO separator, add the separator's height in too. // if there is an RNO separator, add the separator's height in too.
float scale = parent.MyItemInfo.IsRtfRaw ? 0.6f : 1; // use scale for equations (B2016-265) float scale = parent.MyItemInfo.IsRtfRaw ? 0.6f : 1; // use scale for equations (B2016-265)
Height = (scale * parent.Height) * MyPageHelper.YMultiplier + (parent.MyItemInfo.IsFigure?SixLinesPerInch:0); Height = (scale * parent.Height) * MyPageHelper.YMultiplier; // B2017-102, removed the extra line (was making changebar to long)
foreach (vlnPrintObject vpo in parent.PartsBelow) foreach (vlnPrintObject vpo in parent.PartsBelow)
{ {
if (vpo is vlnRNOSeparator) if (vpo is vlnRNOSeparator)

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

@ -5321,12 +5321,16 @@ namespace Volian.Print.Library
{ {
if (itemInfo.IsSupInfoPart) if (itemInfo.IsSupInfoPart)
{ {
XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + 54; // add in 3/4 inch (54) to allow for enough space for Note/Caution tab // The SupInfoTabOff was added to the base format during initial development to shift the tab over by 3/4 inch (54) to allow for enough space for Note/Caution tab
int sitabloc = itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SupInfoTabOff == null ? 0 : (int)itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SupInfoTabOff;
XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + sitabloc;
if (myTab != null) if (myTab != null)
{ {
myTab.XOffset = XOffset - ((myTab == null) ? 0 : myTab.Width) - 12; myTab.XOffset = XOffset - ((myTab == null) ? 0 : myTab.Width) - 12;
myTab.Width = 2.5f * myTab.Width; myTab.Width = 2.5f * myTab.Width;
} }
// 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);
return; return;
} }
float tabWidth = (myTab == null) ? 0 : myTab.Width; float tabWidth = (myTab == null) ? 0 : myTab.Width;
@ -5968,7 +5972,7 @@ namespace Volian.Print.Library
else if (MyParent.WidthNoLimit != 0) else if (MyParent.WidthNoLimit != 0)
Width = adjwidth + MyParent.WidthNoLimit - tabWidth + (myTab == null ? 0 : myTab.TabAlign); Width = adjwidth + MyParent.WidthNoLimit - tabWidth + (myTab == null ? 0 : myTab.TabAlign);
else if ((itemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd) else if ((itemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd)
Width = adjwidth + MyParent.Width - (MyTab!=null?MyTab.Width:0); Width = adjwidth + MyParent.Width - (MyTab != null ? MyTab.Width : 0);
else else
Width = adjwidth + MyParent.Width - tabWidth + (myTab == null ? 0 : myTab.TabAlign); Width = adjwidth + MyParent.Width - tabWidth + (myTab == null ? 0 : myTab.TabAlign);
} }