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

B2016-273: checkoff/signoff for embedded images

Browse Source 
B2016-272: centered tables print too far to right
This commit is contained in:
Kathy Ruffing 2016-12-05 13:55:57 +00:00
parent 10508fef5f
commit a9bd84ad5f
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PROMS/Volian.Controls.Library/EditItem.cs
View File

@ -3100,6 +3100,14 @@ namespace Volian.Controls.Library
else else
location = new PointF(rr.MyStepRTB.Left + rr.MyStepRTB.Width + 2, rr.MyStepRTB.Top); 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 else
{ {
RTBItem ri = this as RTBItem; RTBItem ri = this as RTBItem;

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

@ -4316,7 +4316,7 @@ namespace Volian.Print.Library
} }
private void CalculateXOffsetGridOrFigure(ItemInfo itemInfo, int maxRNO, FormatInfo formatInfo) 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"); bool aerTableOrFigure = itemInfo.FormatStepData.Type.Contains("AER");
vlnParagraph hls1 = MyParent; vlnParagraph hls1 = MyParent;
if (!formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm) if (!formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm)
@ -5536,7 +5536,14 @@ namespace Volian.Print.Library
Width = (MyParent.XOffset + MyParent.Width) - (XOffset + mycolT); Width = (MyParent.XOffset + MyParent.Width) - (XOffset + mycolT);
} }
else 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; Width = (float)formatInfo.MyStepSectionLayoutData.WidT - 6 - mycolT;
}
XOffset += mycolT; // adjust caution/note text position XOffset += mycolT; // adjust caution/note text position
if (PartsLeft != null && PartsLeft.Count > 0)// adjust tab position if (PartsLeft != null && PartsLeft.Count > 0)// adjust tab position
{ {