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

Support transitions to sections

Browse Source
This commit is contained in:
Rich 2016-07-07 12:48:00 +00:00
parent c95527574f
commit 960e09f9fb
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2599,7 +2599,7 @@ namespace VEPROMS.CSLA.Library
font = new VE_Font(hdrFont.Family, (int)hdrFont.Size, es, (float)hdrFont.CPI); font = new VE_Font(hdrFont.Family, (int)hdrFont.Size, es, (float)hdrFont.CPI);
} }
else else
font = format.PlantFormat.FormatData.SectData.SectionHeader.Font; font = format.PlantFormat.FormatData.SectData.SectionHeader.Font;
break; break;
case 2: // step types case 2: // step types
int typindx = type - 20000; // what to do for other types rather than steps int typindx = type - 20000; // what to do for other types rather than steps
@ -3433,6 +3433,12 @@ namespace VEPROMS.CSLA.Library
} }
protected void SetTabText() protected void SetTabText()
{ {
if (IsSection) // B2016-160 Support transitions to sections
{
_MyTab.Text = DisplayNumber;
_MyTab.CleanText = DisplayNumber;
return;
}
string cltext = null; string cltext = null;
int stepType = (int)(MyContent.Type % 10000); int stepType = (int)(MyContent.Type % 10000);
string tbformat; string tbformat;
@ -3470,7 +3476,7 @@ namespace VEPROMS.CSLA.Library
string tb = (LinkedOrdinal==null)? "NA" : LinkedOrdinal.ToString(); string tb = (LinkedOrdinal==null)? "NA" : LinkedOrdinal.ToString();
tbformat = tbformat.Replace("{LNK C/N Num}", tb); tbformat = tbformat.Replace("{LNK C/N Num}", tb);
if ((ActiveParent as ItemInfo).LinkedTab != null) if ((ActiveParent as ItemInfo).LinkedTab != null)
tbformat = tbformat.Replace("{LNK Step Num}", (ActiveParent as ItemInfo).LinkedTab.Trim(" .".ToCharArray())); //(ActiveParent as ItemInfo).Ordinal.ToString()); tbformat = tbformat.Replace("{LNK Step Num}", (ActiveParent as ItemInfo).LinkedTab.Trim(" .".ToCharArray())); //(ActiveParent as ItemInfo).Ordinal.ToString());
tbformat = tbformat.TrimStart(" ".ToCharArray()); tbformat = tbformat.TrimStart(" ".ToCharArray());
} }
if (tbformat.Contains("{LNK Step Num}")) if (tbformat.Contains("{LNK Step Num}"))
@ -6926,9 +6932,12 @@ namespace VEPROMS.CSLA.Library
public override void SetupTags() public override void SetupTags()
{ {
_TagsSetup = true; _TagsSetup = true;
_MyTab = new Tab(AdjustForTextSubFollowsTextStyle(FormatStepData.TabData.Font)); // B2016-160 Support transitions to sections
MyHeader = new MetaTag(FormatStepData.TabData.Font); VE_Font fnt = new VE_Font("Arial", 10, E_Style.None, 10);
MyFooter = new MetaTag(FormatStepData.TabData.Font); if (FormatStepData != null) fnt = FormatStepData.TabData.Font;
_MyTab = new Tab(AdjustForTextSubFollowsTextStyle(fnt));
MyHeader = new MetaTag(fnt);
MyFooter = new MetaTag(fnt);
SetTabText(); SetTabText();
} }

4
PROMS/Volian.Print.Library/PDFReport.cs
View File

@ -832,8 +832,8 @@ namespace Volian.Print.Library
DelimList.Add(c.ToString()); DelimList.Add(c.ToString());
} }
} }
// B2016-160 Support transitions to sections
while (!pitem.IsHigh) while (!pitem.IsSection && !pitem.IsHigh)
{ {
StepInfo stpinfo = StepInfo.Get(pitem.ItemID); StepInfo stpinfo = StepInfo.Get(pitem.ItemID);
string thisTab = stpinfo.MyTab.CleanText; //StepInfo.Get(pitem.ItemID).MyTab.CleanText; string thisTab = stpinfo.MyTab.CleanText; //StepInfo.Get(pitem.ItemID).MyTab.CleanText;