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

If the plant format does not have PMode set, then it should default to 2 column mode. (according to 16-bit code)

Browse Source
This commit is contained in:
John Jenko 2012-01-11 13:51:14 +00:00
parent a2bb293028
commit edf7c15dbb
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs
View File

@ -435,16 +435,21 @@ namespace VEPROMS.CSLA.Library
// If there is no parent value, then use the volian default // If there is no parent value, then use the volian default
if (s == string.Empty) if (s == string.Empty)
{ {
int rval = 0;
if (MyFormat != null) if (MyFormat != null)
{ {
int rval = (int)MyFormat.MyStepSectionLayoutData.PMode; rval = (int)MyFormat.MyStepSectionLayoutData.PMode;
return (SectionColumnMode)rval;//SectionColumnMode.Two; //SectionColumnMode.Default;// default to volian default //int rval = (int)MyFormat.MyStepSectionLayoutData.PMode;
//return (SectionColumnMode)rval;//SectionColumnMode.Two; //SectionColumnMode.Default;// default to volian default
} }
else else
{ {
int rval = (int)MyDefaultFormat.MyStepSectionLayoutData.PMode; //int rval = (int)MyDefaultFormat.MyStepSectionLayoutData.PMode;
return (SectionColumnMode)rval; rval = (int)MyDefaultFormat.MyStepSectionLayoutData.PMode;
//return (SectionColumnMode)rval;
} }
if (rval == 0) rval = 2;
return (SectionColumnMode)rval;
} }
else else
return (SectionColumnMode)int.Parse(s); return (SectionColumnMode)int.Parse(s);
@ -472,7 +477,8 @@ namespace VEPROMS.CSLA.Library
} }
else else
rval =(int)MyFormat.MyStepSectionLayoutData.PMode; rval =(int)MyFormat.MyStepSectionLayoutData.PMode;
parval = ((SectionColumnMode)rval).ToString(); parval = ((rval > 0)?((SectionColumnMode)rval).ToString() : "2"); // if PMode is zero default to 2 column mode
//parval = ((SectionColumnMode)rval).ToString();
//parval = ((int)(SectionColumnMode.Default)).ToString(); //parval = ((int)(SectionColumnMode.Default)).ToString();
} }