B2016-273: checkoff/signoff for embedded images

B2016-272: centered tables print too far to right
This commit is contained in:
2016-12-05 13:55:57 +00:00
parent 10508fef5f
commit a9bd84ad5f
2 changed files with 16 additions and 1 deletions

View File

@@ -4316,7 +4316,7 @@ namespace Volian.Print.Library
}
private void CalculateXOffsetGridOrFigure(ItemInfo itemInfo, int maxRNO, FormatInfo formatInfo)
{
float scale = itemInfo.IsRtfRaw ? 0.6f : 0;
float scale = itemInfo.IsRtfRaw ? 0.6f : 1.0f;
bool aerTableOrFigure = itemInfo.FormatStepData.Type.Contains("AER");
vlnParagraph hls1 = MyParent;
if (!formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm)
@@ -5536,7 +5536,14 @@ namespace Volian.Print.Library
Width = (MyParent.XOffset + MyParent.Width) - (XOffset + mycolT);
}
else
{
// B2016-269: if caution/note & not boxed, with tab adjust width based on xoffset of tab
// so text doesn't print out of right border. Commented out to check in another fix. Will be use
//if (!MyItemInfo.MyParent.IsHigh && MyTab!=null && MyTab.YOffset==YOffset)
// Width = (float)formatInfo.MyStepSectionLayoutData.WidT - MyTab.XOffset - mycolT;
//else
Width = (float)formatInfo.MyStepSectionLayoutData.WidT - 6 - mycolT;
}
XOffset += mycolT; // adjust caution/note text position
if (PartsLeft != null && PartsLeft.Count > 0)// adjust tab position
{