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

- Add support to Caution/Note tabs for WCNBCK Pagelist items

Browse Source 
Improve Spacing of WCN Background pagelist items tabs
This commit is contained in:
Kathy Ruffing 2014-02-14 16:42:30 +00:00
parent 27c80cde33
commit bee1332737
3 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2746,7 +2746,15 @@ namespace VEPROMS.CSLA.Library
tbformat = tbformat.Replace("{numeric}", ordinal.ToString().PadLeft(2) + ".0");
tbformat = tbformat.Substring(0, tbformat.Length - 2);
}
tbformat = tbformat.Replace("{numeric}", trimTabStart ? ordinal.ToString() : FormatStepData.AtLeastTwoDigits ? ordinal.ToString().PadLeft(2,'0') : ordinal.ToString().PadLeft(2));
// if this is a wolf creek background, if the tbformat ends with a '.' don't add a space,
// otherwise add a space.
if (ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.WolfCreekBackgroundFormat && IsBackgroundStep())
{
string stpTab = (!tbformat.Contains(".")?" ":"") + ordinal.ToString();
tbformat = tbformat.Replace("{numeric}", stpTab);
}
else
tbformat = tbformat.Replace("{numeric}", trimTabStart ? ordinal.ToString() : FormatStepData.AtLeastTwoDigits ? ordinal.ToString().PadLeft(2,'0') : ordinal.ToString().PadLeft(2));
if (tbformate != null) tbformate = tbformate.Replace("{numeric}", trimTabStart ? ordinal.ToString() : FormatStepData.AtLeastTwoDigits ? ordinal.ToString().PadLeft(2, '0') : ordinal.ToString().PadLeft(2));
tbformat = tbformat.Replace("{numericWpar}", ordinal.ToString());
if (tbformat.Contains("{asterisk}"))
@ -2844,11 +2852,11 @@ namespace VEPROMS.CSLA.Library
}
// also see if there is the 'pagelist' string in this tab:
else if ((FormatStepData.TabData.Font.Style & E_Style.Underline) == E_Style.Underline)
// the reason that the underline commands were not included in format file is that the '\' character
// is used as a separator and the following code will not impact other formats
HighLevelStepTabPageList = @"\ul " + FormatStepData.TabData.IdentAltPrint.Substring(0, indxnewtab).Trim() + @"\ulnone " + tbformat;
// the reason that the underline commands were not included in format file is that the '\' character
// is used as a separator and the following code will not impact other formats
HighLevelStepTabPageList = @"\ul " + FormatStepData.TabData.IdentAltPrint.Substring(0, indxnewtab).Trim() + @"\ulnone " + (tbformat.StartsWith(" ")?"":" ") + tbformat;
else
HighLevelStepTabPageList = FormatStepData.TabData.IdentAltPrint.Substring(0, indxnewtab) + tbformat;
HighLevelStepTabPageList = FormatStepData.TabData.IdentAltPrint.Substring(0, indxnewtab) + tbformat;
_MyTab.AltPrintTab = newtab;
if (tbformate != null && tbformate != "") tbformat = tbformate;
}
@ -2867,7 +2875,15 @@ namespace VEPROMS.CSLA.Library
}
return false;
}
public bool IsBackgroundStep()
{
if (ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.WolfCreekBackgroundFormat)
{
if (IsHigh || IsCaution || IsNote) return true;
if (MyParent != null && MyParent.IsStep && MyParent.FormatStepData.Type.ToUpper() == "TITLEWITHTEXTBELOW" && FormatStepData.Type.ToUpper() != "IMPLICITOR") return true;
}
return false;
}
private bool InNote()
{
// walk up until procedure level and if finding a note type, return true, otherwise false.

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

@ -1344,16 +1344,6 @@ namespace Volian.Print.Library
foreach (vlnParagraph child in ChildrenBelow)
child.BuildLocationList(yTopMost, myLocations);
}
private bool IsBackgroundStep()
{
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.WolfCreekBackgroundFormat)
{
if (MyItemInfo.IsHigh || MyItemInfo.IsCaution || MyItemInfo.IsNote) return true;
if (MyItemInfo.MyParent != null && MyItemInfo.MyParent.IsStep && MyItemInfo.MyParent.FormatStepData.Type.ToUpper() == "TITLEWITHTEXTBELOW" && MyItemInfo.FormatStepData.Type.ToUpper() != "IMPLICITOR") return true;
}
return false;
}
private int COL_WID_ADJ = 6; // adjusts for incorrect use of WidSTable when breaking a line (it breaks 6 chars too short)
private bool IsTitleType(ItemInfo itm)
{
@ -1681,7 +1671,7 @@ namespace Volian.Print.Library
}
// For background formats, HLS's or Caution or any Notes have tab on line and then text
// on line below (with space in between)
if (IsBackgroundStep() && itemInfo.MyTab != null && itemInfo.MyTab.AltPrintTab != null && itemInfo.MyTab.AltPrintTab.Trim() != "")
if (itemInfo.IsBackgroundStep() && itemInfo.MyTab != null && itemInfo.MyTab.AltPrintTab != null && itemInfo.MyTab.AltPrintTab.Trim() != "")
yoff = YOffset = yoff + (2 * SixLinesPerInch);
float yForCheckoff = yoff; //0; - default checkoff row is same as FIRST line of text
@ -2768,7 +2758,7 @@ namespace Volian.Print.Library
}
int? bxIndx = itemInfo.FormatStepData.StepLayoutData.STBoxindex;
float? colOvrd = itemInfo.FormatStepData.ColOverride;
if (IsBackgroundStep())
if (itemInfo.IsBackgroundStep())
{
if (myTab != null) myTab.XOffset = XOffset;
XOffset += (itemInfo.FormatStepData.Font.CharsToTwips * 2); // indent 2 characters for background steps

5
PROMS/fmtxml/AppendPlantSpecific.cs
View File

@ -334,8 +334,13 @@ namespace fmtxml
fmtdata.ROData.UpRoImmAftrDashSpace = "True";
fmtdata.StepData[2].TabData.RNOIdent = @"\ul WOG ERG STEP:\ulnone ";
fmtdata.StepData[3].TabData.RNOIdent = @"\ul WOG ERG STEP:\ulnone ";
fmtdata.StepData[6].TabData.RNOIdent = @"\ul WOG ERG STEP:\ulnone ";
fmtdata.StepData[7].TabData.RNOIdent = @"\ul WOG ERG STEP:\ulnone ";
fmtdata.StepData[9].TabData.RNOIdent = @"\ul WOG ERG STEP:\ulnone ";
fmtdata.StepData[18].TabData.RNOIdent = @"\ul WOG ERG STEP:\ulnone ";
fmtdata.StepData[22].TabData.RNOIdent = @"\ul WOG ERG STEP:\ulnone ";
fmtdata.StepData[23].TabData.RNOIdent = @"\ul WOG ERG STEP:\ulnone ";
fmtdata.StepData[26].TabData.RNOIdent = @"\ul WOG ERG STEP:\ulnone ";
}
private void AddWCNOFBFmt(ref FormatData fmtdata)
{