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

C2024-017 Removed old (not implemented) format variables and settings from the format files and removed incomplete references to them in the C# code. Also added descriptions of the used format variables in the C# code that hooks the XML format files to the PROMS C# logic.

Browse Source
This commit is contained in:
John Jenko
2024-07-26 14:54:11 -04:00
parent 112edd1c8a
commit 7f899175d1
308 changed files with 1758 additions and 2539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1481,9 +1481,6 @@ namespace VEPROMS.CSLA.Library
int firstInc = item.ActiveFormat.MyStepSectionLayoutData.PaginateOnFirstSubstep ? 0 : 1;
ItemInfo parent = item.ActiveParent as ItemInfo;
// TODO: Format flag 'TreatAsSequential':
// The following needs to account for use of format flag 'TreatAsSequential' when doing
// formats that have it.
if (item.IsExactType("And") || item.IsExactType("Or") || item.IsExactType("ImplicitOr"))
level++;
//if (item.ParentAndOr)
@@ -3392,6 +3389,9 @@ namespace VEPROMS.CSLA.Library
return retval;
}
// used in some background document formats - all appear to be set on a Caution type.
// This will place the text of this type (caution) on the same row (of the page) and to the left of its parent.
// Is also used as a step designatior for Commanche Peak
public bool SameRowAsParent
{
get
@@ -4621,7 +4621,6 @@ namespace VEPROMS.CSLA.Library
tbformat = tbformat.Replace("{ROMAN}", roman);
tbformat = tbformat.Substring(0, tbformat.Length - ((roman.Length - 1) > 0 ? (roman.Length - 1) : 0));
}
if (ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.VirtualDotInHLSTab && tbformat.Contains("numeric") & ordinal > 9) _MyTab.AdjustTabSpace = true;
if (tbformat.Contains("{numeric}") && ((MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_AddDotZeroStdHLS) == E_DocStructStyle.DSS_AddDotZeroStdHLS) && MyContent.Type == 20002)
{
tbformat = tbformat.Replace("{numeric}", ordinal.ToString().PadLeft(2) + ".0");
@@ -4963,7 +4962,7 @@ namespace VEPROMS.CSLA.Library
&& (LastRNO != null) && LastRNO.IsHigh && LastRNO.HasChildren
&& LastRNO.FirstChild(E_FromType.Step) != null && LastRNO.FirstChild(E_FromType.Step).IsSequential)
{
level++; // 16bit has this: I didn't and mine worked most of time.
level++;
if (ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ImperfectStructurePlus4) level += 2;
if (ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ImperfectSubstep && !ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ImperfectStructurePlus4)
PrintBias = -1;
@@ -5891,12 +5890,6 @@ namespace VEPROMS.CSLA.Library
get { return _RemovedStyleUnderline; }
set { _RemovedStyleUnderline = value; }
}
private bool _AdjustTabSpace = false;
public bool AdjustTabSpace
{
get { return _AdjustTabSpace; }
set { _AdjustTabSpace = value; }
}
public Tab(VE_Font font)
{
MyFont = font;

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

@@ -962,7 +962,6 @@ namespace VEPROMS.CSLA.Library
return myReturn;
}
// TODO: For hlp: LowerCaseTranNumber - lower case substep numbers in transitions
private static bool AddTransitionProcNum(TransitionBuilder tb) // Coded for HLP
{
string retstr = tb._ToItem.MyProcedure.MyContent.Number;