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

Remove symbol chars from HLS tab

Browse Source 
Added Font property
NullBox, StepTypeColOverride, StepTypeWidthOverride
This commit is contained in:
John Jenko 2011-11-21 20:50:40 +00:00
parent 52aa2ca5de
commit 1244cc52a4
3 changed files with 80 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
View File

@ -598,7 +598,7 @@ namespace VEPROMS.CSLA.Library
// add hls tab.
if (pitem.IsHigh)
{
string hlsTab = StepInfo.Get(pitem.ItemID).MyTab.CleanText;
string hlsTab = StepInfo.Get(pitem.ItemID).MyTab.CleanTextNoSymbols;
if (!hasDelim)
foreach (string rmvDelim in DelimList) hlsTab = hlsTab.Replace(rmvDelim, "");
hlsTab = hlsTab.Trim(" ".ToCharArray());
@ -610,6 +610,7 @@ namespace VEPROMS.CSLA.Library
sret = sret.Trim(" .)".ToCharArray());
return sret;
}
private static bool AddStepNumber(TransitionBuilder tb)
{
// If we're on a step put out the step number.
@ -620,7 +621,8 @@ namespace VEPROMS.CSLA.Library
{
// check for transition that goes to a procedure step section with title of 'Procedure steps' followed
// by ', Step'. This should output as 'Procedure step xyz' rather than 'Procedure steps, step xyz'
if (!tb._TransFormat.Contains("{Last Step}") && tb.Prefix != null && tb.Prefix.ToUpper().Contains(", STEP") && tb.ToString().ToUpper().EndsWith("PROCEDURE STEPS"))
// TODO: NEED TO USE A FORMAT VARIABLE TO CONTROL THE FOLLOWING
if (tb._ToItem.ActiveFormat.Name.StartsWith("HLP") && !tb._TransFormat.Contains("{Last Step}") && tb.Prefix != null && tb.Prefix.ToUpper().Contains(", STEP") && tb.ToString().ToUpper().EndsWith("PROCEDURE STEPS"))
{
tb.Remove(tb.Length - 15, 15); // remove "procedure steps"
tb.Append("procedure Step");

26
PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs
View File

@ -356,6 +356,19 @@ namespace VEPROMS.CSLA.Library
{
public Top(XmlNode xmlNode) : base(xmlNode) { }
public Top() : base() { }
#region Font
private VE_Font _Font;
[Category("Font")]
[DisplayName("Font")]
[Description("Font")]
public VE_Font Font
{
get
{
return (_Font == null) ? _Font = new VE_Font(XmlNode) : _Font;
}
}
#endregion
#region Margin
private LazyLoad<float?> _Margin;
[Category("Continue Msg")]
@ -403,6 +416,19 @@ namespace VEPROMS.CSLA.Library
{
public Bottom(XmlNode xmlNode) : base(xmlNode) { }
public Bottom() : base() { }
#region Font
private VE_Font _Font;
[Category("Font")]
[DisplayName("Font")]
[Description("Font")]
public VE_Font Font
{
get
{
return (_Font == null) ? _Font = new VE_Font(XmlNode) : _Font;
}
}
#endregion
#region Margin
private LazyLoad<float?> _Margin;
[Category("Continue Msg")]

56
PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
View File

@ -86,6 +86,7 @@ namespace VEPROMS.CSLA.Library
{
if (_WindowsFont == null)
{
//FontStyle style = (Family == "Cornet")?FontStyle.Italic : FontStyle.Regular;
FontStyle style = FontStyle.Regular;
if (Style != E_Style.None)
{
@ -2833,6 +2834,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _OnlySingleColumn, "@OnlySingleColumn");
}
}
private LazyLoad<bool> _NullBox;
public bool NullBox
{
get
{
return LazyLoad(ref _NullBox, "@NullBox");
}
}
}
#endregion
#region TopOfPage
@ -3369,14 +3378,49 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _Inactive, "@Inactive");
}
}
private LazyLoad<string> _StepTypeColOverride;
public string StepTypeColOverride
{
get
{
//private LazyLoad<string> _StepTypeColOverride;
//public string StepTypeColOverride
//{
// get
// {
// return LazyLoad(ref _StepTypeColOverride, "@StepTypeColOverride");
// }
//}
private LazyLoad<float?> _StepTypeColOverride;
public float? StepTypeColOverride
{
get
{
return LazyLoad(ref _StepTypeColOverride, "@StepTypeColOverride");
}
}
}
private LazyLoad<float?> _StepTypeColOverrideEdit;
public float? StepTypeColOverrideEdit
{
get
{
return LazyLoad(ref _StepTypeColOverrideEdit, "@StepTypeColOverrideEdit");
}
}
private LazyLoad<float?> _StepTypeWidthOverride;
public float? StepTypeWidthOverride
{
get
{
return LazyLoad(ref _StepTypeWidthOverride, "@StepTypeWidthOverride");
}
}
private LazyLoad<float?> _StepTypeWidthOverrideEdit;
public float? StepTypeWidthOverrideEdit
{
get
{
return LazyLoad(ref _StepTypeWidthOverrideEdit, "@StepTypeWidthOverrideEdit");
}
}
private LazyLoad<string> _Sep;
public string Sep