If the plant format does not have PMode set, then it should default to 2 column mode. (according to 16-bit code)
This commit is contained in:
parent
a2bb293028
commit
edf7c15dbb
@ -435,16 +435,21 @@ namespace VEPROMS.CSLA.Library
|
||||
// If there is no parent value, then use the volian default
|
||||
if (s == string.Empty)
|
||||
{
|
||||
int rval = 0;
|
||||
if (MyFormat != null)
|
||||
{
|
||||
int rval = (int)MyFormat.MyStepSectionLayoutData.PMode;
|
||||
return (SectionColumnMode)rval;//SectionColumnMode.Two; //SectionColumnMode.Default;// default to volian default
|
||||
rval = (int)MyFormat.MyStepSectionLayoutData.PMode;
|
||||
//int rval = (int)MyFormat.MyStepSectionLayoutData.PMode;
|
||||
//return (SectionColumnMode)rval;//SectionColumnMode.Two; //SectionColumnMode.Default;// default to volian default
|
||||
}
|
||||
else
|
||||
{
|
||||
int rval = (int)MyDefaultFormat.MyStepSectionLayoutData.PMode;
|
||||
return (SectionColumnMode)rval;
|
||||
//int rval = (int)MyDefaultFormat.MyStepSectionLayoutData.PMode;
|
||||
rval = (int)MyDefaultFormat.MyStepSectionLayoutData.PMode;
|
||||
//return (SectionColumnMode)rval;
|
||||
}
|
||||
if (rval == 0) rval = 2;
|
||||
return (SectionColumnMode)rval;
|
||||
}
|
||||
else
|
||||
return (SectionColumnMode)int.Parse(s);
|
||||
@ -472,7 +477,8 @@ namespace VEPROMS.CSLA.Library
|
||||
}
|
||||
else
|
||||
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();
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user