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

Specific changes to Byron/Braidwood fomat files

Browse Source 
Added default parameter to GetCombinedSlaveValue method and revised calls to method to utilize default parameter
Added code to convert xF8 to degree symbol
Revised CheckNoteCautionTab to handle when step format data calls for separate boxes for notes and cautions
Added BoxLeftAdj property to support Braidwood boxed items
This commit is contained in:
Rich
2014-01-17 16:10:22 +00:00
parent eff27f334e
commit 7793bd2397
5 changed files with 58 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3009,7 +3009,7 @@ namespace VEPROMS.CSLA.Library
// use of the MixCautionsAndNotes format flag - no bullet is used, if more that one replace the tab
// with a bullet. Also, if only one in group and tab text ends with 'S', remove it:
bool mixCandN = MixCautionNotesDiffType();
if ((MyPrevious == null && NextItem == null) || mixCandN)
if ((MyPrevious == null && NextItem == null) || mixCandN || FormatStepData.SeparateBox)
{
if (_MyHeader.CleanText.ToUpper().EndsWith("S"))
{
@@ -3039,8 +3039,11 @@ namespace VEPROMS.CSLA.Library
_MyHeader = null;
}
}
tbformat = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.IdentB;
TabToIdentBAdjustFont();
if (!this.FormatStepData.SeparateBox)
{
tbformat = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.IdentB;
TabToIdentBAdjustFont();
}
}
return tbformat;