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

VC Summer Unit 2 & 3 Single column format

Browse Source
This commit is contained in:
Kathy Ruffing 2016-06-14 13:52:50 +00:00
parent 98ef7abb29
commit 4ae5fdf980
6 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/vcb1all.xml Normal file
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/vcb1.svg Normal file
View File

Binary file not shown.

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

@ -838,7 +838,10 @@ namespace VEPROMS.CSLA.Library
int profileDepth = ProfileTimer.Push(">>>> itemInfo.MyTab.CleanText.Trim");
string thisTab = itemInfo.MyTab.CleanText.Trim();
ProfileTimer.Pop(profileDepth);
if (thisTab != null && thisTab != "" && !char.IsLetterOrDigit(thisTab[0])) return pTab;
//The following will include '(x)' where 'x' is stepnumber for VC Summer Unit 2 & 3 (vcb) Note & Caution tabs
bool vcbHeaderCheck = itemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.CombinedTabIncludeParenTabs &&
thisTab != null && thisTab != "" && thisTab.Length > 1 && char.IsLetterOrDigit(thisTab[1]);
if (thisTab != null && thisTab != "" && !char.IsLetterOrDigit(thisTab[0]) && !vcbHeaderCheck) return pTab;
if (itemInfo.FormatStepData.NumberWithLevel) pTab = itemInfo.MyHLS.MyTab.CleanText.Trim();
// if the parent tab ends with a alphanumeric and this tab is alphanumeric, add a '.' to separate them
bool ms = pTab != "" && char.IsLetterOrDigit(pTab.TrimEnd()[pTab.Length - 1]); // parent tab ends with alphanumeric
@ -3490,11 +3493,15 @@ namespace VEPROMS.CSLA.Library
bool doMeta = false;
if (sd.StepSectionLayoutData.TieTabToLevel && ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections)
{
// the DSS_SameXOFfSubsections was added for VC Summer Unit 2 & 3 (vcb format) so that all subsections are indented
// the same amount and this is also used for determining level for sequential tabbing, i.e. what seqfmt item to use for
// sequential level.
bool scttablev = ((MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_SameXOffSubsections) == E_DocStructStyle.DSS_SameXOffSubsections);
if (sd.StepSectionLayoutData.ShowSectionTitles
&& !MyDocStyle.CancelSectTitle
&& !(MyDocStyle.SpecialStepsFoldout && MyDocStyle.UseColSByLevel))
localPrintLevel = PrintLevel + ((ActiveFormat.PlantFormat.FormatData.Express && IsSequential) ? 0 : CurrentSectionLevel());
if (!ActiveFormat.PlantFormat.FormatData.Express) doMeta = true;
localPrintLevel = PrintLevel + (((ActiveFormat.PlantFormat.FormatData.Express && IsSequential) || scttablev) ? 0 : CurrentSectionLevel());
if (!ActiveFormat.PlantFormat.FormatData.Express && !scttablev) doMeta = true;
}
if (sd.StepSectionLayoutData.TieTabToLevel && ActiveFormat.PlantFormat.FormatData.SectData.CountSubSectionsForLevel)
if (SectionLevel() > 1)
@ -4096,6 +4103,12 @@ namespace VEPROMS.CSLA.Library
}
}
// For VS Summer Unit 2 & 3 (vcb formats) include step number in Note & Caution header
if (FormatStepData.TabData.IncludeStepNum && MyHeader != null && MyParent != null && MyParent.CombinedTab != null)
{
MyHeader.Text = MyHeader.Text + ((MyParent == null) ? "" : " Step " + MyParent.CombinedTab.TrimEnd(".".ToCharArray()));
MyHeader.CleanText = MyHeader.CleanText + ((MyParent == null) ? "" : " Step " + MyParent.CombinedTab.TrimEnd(".".ToCharArray()));
}
return tbformat;
}

1
PROMS/VEPROMS.CSLA.Library/Format/ENums.cs
View File

@ -171,6 +171,7 @@ namespace VEPROMS.CSLA.Library
DSS_PageListAddSectCont = 0x400000000, // for this section, add the top continue message when doing the ATTACHTITLECONT pagelist token (Calvert/Landscape word docs)
DSS_WordContentLandscaped = 0x800000000, // for this section, the word content is landscaped.
DSS_ChklstEditSize = 0x100000000, // Westinghouse checklist - edit window size
DSS_SameXOffSubsections = 0x2000000000, // print subsections at same offset as section & preceeding subsections,start HLS xoff at section text (not number)
};
public enum E_DocStyleUse : uint
{

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

@ -3608,6 +3608,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _LimitWidToPageWid, "@LimitWidToPageWid");
}
}
private LazyLoad<bool> _CombinedTabIncludeParenTabs;
public bool CombinedTabIncludeParenTabs
{
get
{
return LazyLoad(ref _CombinedTabIncludeParenTabs, "@CombinedTabIncludeParenTabs");
}
}
private VE_Font _ModifiedTextStyle;
public VE_Font ModifiedTextStyle
{
@ -5220,6 +5228,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _NoTabAlign, "TabData/@NoTabAlign");
}
}
private LazyLoad<bool> _IncludeStepNum;
public bool IncludeStepNum
{
get
{
return LazyLoad(ref _IncludeStepNum, "TabData/@IncludeStepNum");
}
}
private LazyLoad<string> _Justify;
public string Justify
{

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

@ -2967,6 +2967,8 @@ namespace Volian.Print.Library
offset += xMetaAdj;
itemInfo.MyTab.Text = itemInfo.MyTab.Text.TrimEnd(" ".ToCharArray());
itemInfo.MyTab.CleanText = itemInfo.MyTab.CleanText.TrimEnd(" ".ToCharArray());
if (((itemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_SameXOffSubsections) == E_DocStructStyle.DSS_SameXOffSubsections))
offset += (float)formatInfo.PlantFormat.FormatData.SectData.SectionNumber.Pos;
}
}
}
@ -4933,7 +4935,8 @@ namespace Volian.Print.Library
}
if (itemInfo.IsHigh)
{
if (formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm)
if (formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm ||
((itemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_SameXOffSubsections) == E_DocStructStyle.DSS_SameXOffSubsections))
{
// the HLS in the template prints the tab/step on the right edge of page. Don't
// do the other calculations to relocate it.