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

Fixed code changes used to resolve Braidwood Deviation Document printing that broke printing in other procedure sets of Braidwood, Catawba and McGuire and perhaps other places.

Browse Source
This commit is contained in:
Rich 2014-01-24 20:29:14 +00:00
parent 5607479e79
commit 911190352a
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1391,7 +1391,7 @@ namespace Volian.Print.Library
// if this is a Note or Caution off of a Note or Caution (Catawba EG/1A/CSAM/SACGR1 step 1) // if this is a Note or Caution off of a Note or Caution (Catawba EG/1A/CSAM/SACGR1 step 1)
// then indent it the length of its tab // then indent it the length of its tab
if (itemInfo.IsCaution || itemInfo.IsNote) if (itemInfo.IsCaution || itemInfo.IsNote)
XOffset += (itemInfo.FormatStepData.TabData.IdentPrint.Length - 1) * 6; XOffset += (itemInfo.FormatStepData.TabData.IdentPrint.Length -1) * 6;
else else
if (itemInfo.ActiveFormat.MyStepSectionLayoutData.DevNoteOrCautionTabOffset != null) if (itemInfo.ActiveFormat.MyStepSectionLayoutData.DevNoteOrCautionTabOffset != null)
XOffset = float.Parse(itemInfo.ActiveFormat.MyStepSectionLayoutData.DevNoteOrCautionTabOffset); XOffset = float.Parse(itemInfo.ActiveFormat.MyStepSectionLayoutData.DevNoteOrCautionTabOffset);
@ -2877,9 +2877,18 @@ namespace Volian.Print.Library
XOffset = MyTab.XOffset + tabWidth - MyTab.TabAlign; XOffset = MyTab.XOffset + tabWidth - MyTab.TabAlign;
} }
} }
else if (MyParent != null && itemInfo.ActiveFormat.MyStepSectionLayoutData.DevNoteOrCautionTabOffset != null) else if (MyParent != null)
{ {
if (myTab != null && itemInfo.IsSequential && formatInfo.PlantFormat.FormatData.SectData.UseMetaSections && formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.LeftJustifyList.Count > 0) if(itemInfo.ActiveFormat.MyStepSectionLayoutData.DevNoteOrCautionTabOffset != null)
{
if (MyTab != null)
{
MyTab.XOffset = float.Parse(itemInfo.ActiveFormat.MyStepSectionLayoutData.DevNoteOrCautionTabOffset);
XOffset = MyTab.XOffset + tabWidth - MyTab.TabAlign;
if (myTab.MyMacro != null && myTab.MyMacro.XOffset != 0) myTab.MyMacro.XOffset += tabWidth - myTab.TabAlign;
}
}
else if (myTab != null && itemInfo.IsSequential && formatInfo.PlantFormat.FormatData.SectData.UseMetaSections && formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.LeftJustifyList.Count > 0)
{ {
int indxLevels = itemInfo.PrintLevel + itemInfo.CurrentSectionLevel(); int indxLevels = itemInfo.PrintLevel + itemInfo.CurrentSectionLevel();
float tableftadj = GetLeftJustify(formatInfo, indxLevels); float tableftadj = GetLeftJustify(formatInfo, indxLevels);
@ -2901,19 +2910,12 @@ namespace Volian.Print.Library
//} //}
else // if no left justify, right align the tab else // if no left justify, right align the tab
{ {
if (MyTab != null) XOffset += tabWidth - (myTab == null ? 0 : myTab.TabAlign);
if (myTab != null)
{ {
MyTab.XOffset = float.Parse(itemInfo.ActiveFormat.MyStepSectionLayoutData.DevNoteOrCautionTabOffset); myTab.XOffset += tabWidth - myTab.TabAlign;
XOffset = MyTab.XOffset + tabWidth - MyTab.TabAlign;
if (myTab.MyMacro != null && myTab.MyMacro.XOffset != 0) myTab.MyMacro.XOffset += tabWidth - myTab.TabAlign; if (myTab.MyMacro != null && myTab.MyMacro.XOffset != 0) myTab.MyMacro.XOffset += tabWidth - myTab.TabAlign;
} }
else
XOffset += tabWidth - (myTab == null ? 0 : myTab.TabAlign);
//if (myTab != null)
//{
// myTab.XOffset += tabWidth - myTab.TabAlign;
// if (myTab.MyMacro != null && myTab.MyMacro.XOffset != 0) myTab.MyMacro.XOffset += tabWidth - myTab.TabAlign;
//}
} }
} }
// if format had a tab adjustment for step type, use it. MyTab.Offset is only set for FNP formats // if format had a tab adjustment for step type, use it. MyTab.Offset is only set for FNP formats