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

Declared the format variable TabPtsPerChar as a “float?” so that it can have a null value

Browse Source 
Fixed the RTF commands for the OR, AND, THEN, and WHEN replacewords
Added logic so that TabPtsPerChar is not added to a format if the value is NULL
This commit is contained in:
John Jenko 2014-07-15 20:29:50 +00:00
parent e6b45641cd
commit f32971b8d4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PROMS/fmtxml/FmtFileToXml.cs
View File

@ -755,7 +755,7 @@ public struct StepSectionLayout
public Int16 HLSWidthOVRD;
public Int16 SubPaginationWght;
public Int16 TextTitleAdjustment;
public float TabPtsPerChar; // added for BGE
public float? TabPtsPerChar; // added for BGE
public string TableCenterPos; // string array with floats.
public string LowerLimitDivisor; // pagination - should it be in print? - 16bit: quoted float
public string NonLinkedStepNumber;
@ -4466,7 +4466,7 @@ namespace fmtxml
if (success)
{
PushStepLists(subdata.StepData);
DoStepInheritance(ref subdata.StepData,fname);
DoStepInheritance(ref subdata.StepData, fname);
AddPlantSpecificOverrideInheritance(fmtName, ref subdata);
PopStepLists();
}

6
PROMS/fmtxml/PlantSpecific_WolfCreak.cs
View File

@ -17,10 +17,10 @@ namespace fmtxml
// replace words
fmtdata.SectData.ReplaceStrData[0].ReplaceWith = @"\b \ul IF\ulnone \b0 ";
fmtdata.SectData.ReplaceStrData[2].ReplaceWith = @"\par}\b \ul THEN\ulnone \b0 ";
fmtdata.SectData.ReplaceStrData[2].ReplaceWith = @"{\par}\b \ul THEN\ulnone \b0 ";
fmtdata.SectData.ReplaceStrData[3].ReplaceWith = @"\b \ul WHEN\ulnone \b0 ";
fmtdata.SectData.ReplaceStrData[4].ReplaceWith = @"\par}\b \ul AND\ulnone \b0 ";
fmtdata.SectData.ReplaceStrData[5].ReplaceWith = @"\par}\b \ul OR\ulnone \b0 ";
fmtdata.SectData.ReplaceStrData[4].ReplaceWith = @"{\par}\b \ul AND\ulnone \b0 ";
fmtdata.SectData.ReplaceStrData[5].ReplaceWith = @"{\par}\b \ul OR\ulnone \b0 ";
}
private void AddWCN2Fmt(ref FormatData fmtdata)
{

BIN
PROMS/fmtxml/TranslateFMT.XSL
View File

Binary file not shown.