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

FNP Improvements

Browse Source
This commit is contained in:
Kathy Ruffing 2013-08-20 11:12:41 +00:00
parent 37269da828
commit 12ded2d9d9
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PROMS/fmtxml/AppendPlantSpecific.cs
View File

@ -131,6 +131,7 @@ namespace fmtxml
fmtdata.BoxData[1].End = 500; fmtdata.BoxData[1].End = 500;
fmtdata.BoxData[2].Start = -15; fmtdata.BoxData[2].Start = -15;
fmtdata.BoxData[2].End = 505; fmtdata.BoxData[2].End = 505;
fmtdata.StepData[40].AdjHighLevelTab = "-24";
} }
private void AddCAL2fmt(ref FormatData fmtdata) private void AddCAL2fmt(ref FormatData fmtdata)

4
PROMS/fmtxml/FmtFileToXml.cs
View File

@ -732,6 +732,7 @@ public struct StepSectionLayout
public float SingleColumnRNOIndent; public float SingleColumnRNOIndent;
public bool RNOWidthSameAsHighParent; public bool RNOWidthSameAsHighParent;
//end for VCSummer by jcb //end for VCSummer by jcb
/* Format flags moved to here.... */ /* Format flags moved to here.... */
public string Dev_Format; public string Dev_Format;
public string EnhancedShortFormDev; public string EnhancedShortFormDev;
@ -925,6 +926,7 @@ public struct Step
public string MixCautionsAndNotes; public string MixCautionsAndNotes;
public string NumberHighLevel; // NumberHighLevelRNO public string NumberHighLevel; // NumberHighLevelRNO
public string OffsetTab; public string OffsetTab;
public string AdjHighLevelTab; // Added for FNP - high level RNO
public string LeftJustifyBorderless; // LJBorderlessTable public string LeftJustifyBorderless; // LJBorderlessTable
public string StepNumIfOnlyOne; // NoStepNumIfOnlyOneStep public string StepNumIfOnlyOne; // NoStepNumIfOnlyOneStep
public string LJTabs; public string LJTabs;
@ -5312,6 +5314,7 @@ namespace fmtxml
private string StepPartMixCautionsAndNotes(Step stp) { return stp.MixCautionsAndNotes; } private string StepPartMixCautionsAndNotes(Step stp) { return stp.MixCautionsAndNotes; }
private string StepPartNumberHighLevel(Step stp) { return stp.NumberHighLevel; } private string StepPartNumberHighLevel(Step stp) { return stp.NumberHighLevel; }
private string StepPartOffsetTab(Step stp) { return stp.OffsetTab; } private string StepPartOffsetTab(Step stp) { return stp.OffsetTab; }
private string StepPartAdjHighLevelTab(Step stp) { return stp.AdjHighLevelTab; }
private string StepPartLeftJustifyBorderless(Step stp) { return stp.LeftJustifyBorderless; } private string StepPartLeftJustifyBorderless(Step stp) { return stp.LeftJustifyBorderless; }
private string StepPartStepNumIfOnlyOne(Step stp) { return stp.StepNumIfOnlyOne; } private string StepPartStepNumIfOnlyOne(Step stp) { return stp.StepNumIfOnlyOne; }
private string StepPartLJTabs(Step stp) { return stp.LJTabs; } private string StepPartLJTabs(Step stp) { return stp.LJTabs; }
@ -5551,6 +5554,7 @@ namespace fmtxml
if (CheckInheritedStr(new StepPartStr(StepPartMixCautionsAndNotes), step, dicParents)) step.MixCautionsAndNotes = null; if (CheckInheritedStr(new StepPartStr(StepPartMixCautionsAndNotes), step, dicParents)) step.MixCautionsAndNotes = null;
if (CheckInheritedStr(new StepPartStr(StepPartNumberHighLevel), step, dicParents)) step.NumberHighLevel = null; if (CheckInheritedStr(new StepPartStr(StepPartNumberHighLevel), step, dicParents)) step.NumberHighLevel = null;
if (CheckInheritedStr(new StepPartStr(StepPartOffsetTab), step, dicParents)) step.OffsetTab = null; if (CheckInheritedStr(new StepPartStr(StepPartOffsetTab), step, dicParents)) step.OffsetTab = null;
if (CheckInheritedStr(new StepPartStr(StepPartAdjHighLevelTab), step, dicParents)) step.AdjHighLevelTab = null;
if (CheckInheritedStr(new StepPartStr(StepPartLeftJustifyBorderless), step, dicParents)) step.LeftJustifyBorderless = null; if (CheckInheritedStr(new StepPartStr(StepPartLeftJustifyBorderless), step, dicParents)) step.LeftJustifyBorderless = null;
if (CheckInheritedStr(new StepPartStr(StepPartStepNumIfOnlyOne), step, dicParents)) step.StepNumIfOnlyOne = null; if (CheckInheritedStr(new StepPartStr(StepPartStepNumIfOnlyOne), step, dicParents)) step.StepNumIfOnlyOne = null;
if (CheckInheritedStr(new StepPartStr(StepPartLJTabs), step, dicParents)) step.LJTabs = null; if (CheckInheritedStr(new StepPartStr(StepPartLJTabs), step, dicParents)) step.LJTabs = null;

4
PROMS/fmtxml/FmtToXml.cs
View File

@ -236,7 +236,7 @@ public enum E_TabCheckOff : uint
public enum E_OldToNewSteps : uint public enum E_OldToNewSteps : uint
{ {
S0 = 1, S1 = 2, S2 = 4, E0 = 1048576, E1 = 2097152, E2 = 4194304, X0 = 67108864, X1 = 134217728, X2 = 268435456 S0 = 1, S1 = 2, S2 = 4, E0 = 1048576, E1 = 2097152, E2 = 4194304, X0 = 33554432, X1 = 67108864, X2 = 134217728
}; };
#endregion #endregion
#region TypeConverters #region TypeConverters
@ -506,7 +506,7 @@ namespace fmtxml
{ {
MyPath = path; MyPath = path;
fmtName = nm; fmtName = nm;
//if (!fmtName.ToUpper().StartsWith("RGESAM1") && fmtName.ToUpper() != "BASE") return; //if (!fmtName.ToUpper().StartsWith("FNP") && fmtName.ToUpper() != "BASE") return;
try try
{ {
// get the default base & plant files to use when figuring out inheritance. // get the default base & plant files to use when figuring out inheritance.

BIN
PROMS/fmtxml/TranslateFMT.XSL
View File

Binary file not shown.