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

B2023-040: WCN – And sub-steps pagination

Browse Source
This commit is contained in:
Kathy Ruffing 2023-04-13 14:51:06 +00:00
parent 9c3715b6ed
commit 0f35d403d2
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

@ -1440,6 +1440,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _AdjFirstSecDocStylesInPagination, "@AdjFirstSecDocStylesInPagination"); return LazyLoad(ref _AdjFirstSecDocStylesInPagination, "@AdjFirstSecDocStylesInPagination");
} }
} }
private LazyLoad<bool> _AdjustLargeImage;
public bool AdjustLargeImage
{
get
{
return LazyLoad(ref _AdjustLargeImage, "@AdjustLargeImage");
}
}
} }
#endregion #endregion
#region VersionIdText #region VersionIdText

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

@ -4181,6 +4181,10 @@ namespace Volian.Print.Library
Height = ic.Image_Height; Height = ic.Image_Height;
// B2022-041: extra whitespace after resized image. Make same adjustment here that gets made in ParagrphToPdf // B2022-041: extra whitespace after resized image. Make same adjustment here that gets made in ParagrphToPdf
// B2023-040: WCN pagination changed for And steps with large image after - add format flag for
// Barakah
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.AdjustLargeImage)
{
float mult = 1.0F; float mult = 1.0F;
if (Width > (vlnParagraph.wMax - 12)) mult = (vlnParagraph.wMax - 24) / Width; if (Width > (vlnParagraph.wMax - 12)) mult = (vlnParagraph.wMax - 24) / Width;
if (Height > (vlnParagraph.hMax - 36)) mult = Math.Min(mult, (vlnParagraph.hMax - 36) / Height); if (Height > (vlnParagraph.hMax - 36)) mult = Math.Min(mult, (vlnParagraph.hMax - 36) / Height);
@ -4190,6 +4194,7 @@ namespace Volian.Print.Library
Height = Height * mult; Height = Height * mult;
} }
} }
}
yoff = AdjustLocIfLongerRNO(itemInfo, yoff, yoffRightParent); yoff = AdjustLocIfLongerRNO(itemInfo, yoff, yoffRightParent);
bool noborder = MyItemInfo.FormatStepData.Type.ToUpper().Contains("BORDERLESS"); bool noborder = MyItemInfo.FormatStepData.Type.ToUpper().Contains("BORDERLESS");
yoff += (Height + SixLinesPerInch); // B2019-059 only one extra line after a figure (does not matter if it has a border or not) yoff += (Height + SixLinesPerInch); // B2019-059 only one extra line after a figure (does not matter if it has a border or not)