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

Browse Source
This commit is contained in:
Kathy Ruffing
2012-04-30 13:56:15 +00:00
parent 679fe5860c
commit 8e52c75e6b
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@@ -2081,7 +2081,7 @@ namespace VEPROMS.CSLA.Library
_MyTab.Text = ""; _MyTab.Text = "";
_MyTab.CleanText = ""; _MyTab.CleanText = "";
return; return;
} }
int stepType = (int)(MyContent.Type % 10000); int stepType = (int)(MyContent.Type % 10000);
string tbformat = IsInRNO ? FormatStepData.TabData.RNOIdentPrint : FormatStepData.TabData.IdentPrint; string tbformat = IsInRNO ? FormatStepData.TabData.RNOIdentPrint : FormatStepData.TabData.IdentPrint;
// rno gets parent tab // rno gets parent tab
@@ -2128,7 +2128,13 @@ namespace VEPROMS.CSLA.Library
string tbtoken = seqtabs[localPrintLevel % seqtabs.Count].TabToken; // seqstart in 16bit, number/letter string tbtoken = seqtabs[localPrintLevel % seqtabs.Count].TabToken; // seqstart in 16bit, number/letter
tbformat = tbformat.Replace("{seq}", tbtoken); tbformat = tbformat.Replace("{seq}", tbtoken);
} }
else
// reset the print level if it's not a sequential type. The code was setting printlevel
// to a -1 for equipment lists, and if the step type was changed to a sequential, it kept the
// -1 (the printlevel property calculates the value only if the current value == 0,
// so that when the above code ran to reset the tab, it would crash because the
// printlevel was not recalculated.
PrintLevel = 0;
// If token includes 'Wpar', the parent tab prefix's the tab. // If token includes 'Wpar', the parent tab prefix's the tab.
if (localPrintLevel > 0 && (tbformat.IndexOf("{numericWpar}") > -1 || tbformat.IndexOf("{alphaWpar}") > -1 || tbformat.IndexOf("{ALPHAWpar}") > -1)) if (localPrintLevel > 0 && (tbformat.IndexOf("{numericWpar}") > -1 || tbformat.IndexOf("{alphaWpar}") > -1 || tbformat.IndexOf("{ALPHAWpar}") > -1))
{ {