From a9bd84ad5ffb4aa42922da3ae6fd3872d973044b Mon Sep 17 00:00:00 2001 From: Kathy Date: Mon, 5 Dec 2016 13:55:57 +0000 Subject: [PATCH] B2016-273: checkoff/signoff for embedded images B2016-272: centered tables print too far to right --- PROMS/Volian.Controls.Library/EditItem.cs | 8 ++++++++ PROMS/Volian.Print.Library/vlnParagraph.cs | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index 4dfbf027..0f61b2c5 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -3100,6 +3100,14 @@ namespace Volian.Controls.Library else location = new PointF(rr.MyStepRTB.Left + rr.MyStepRTB.Width + 2, rr.MyStepRTB.Top); } + else if (this is ImageItem) + { + ImageItem ii = this as ImageItem; + if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.SkipSpaces) + location = new PointF(ii.MyPictureBox.Left - 50, ii.MyPictureBox.Top); + else + location = new PointF(ii.MyPictureBox.Left + ii.MyPictureBox.Width + 2, ii.MyPictureBox.Top); + } else { RTBItem ri = this as RTBItem; diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 478b4ed3..f88e3730 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -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 {