This commit is contained in:
parent
959c2e7d16
commit
430396e0d0
@ -280,12 +280,12 @@ namespace VEPROMS.CSLA.Library
|
|||||||
{
|
{
|
||||||
if (MyFormat != null)
|
if (MyFormat != null)
|
||||||
{
|
{
|
||||||
bool rval = MyFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.BreakOnSections;
|
bool rval = MyFormat.MyStepSectionLayoutData.BreakOnSections;
|
||||||
return (rval) ? SectionPagination.Separate : SectionPagination.Continuous;// default to volian default
|
return (rval) ? SectionPagination.Separate : SectionPagination.Continuous;// default to volian default
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
bool rval = MyDefaultFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.BreakOnSections;
|
bool rval = MyDefaultFormat.MyStepSectionLayoutData.BreakOnSections;
|
||||||
return (rval) ? SectionPagination.Separate : SectionPagination.Continuous;// default to volian default
|
return (rval) ? SectionPagination.Separate : SectionPagination.Continuous;// default to volian default
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -301,7 +301,7 @@ namespace VEPROMS.CSLA.Library
|
|||||||
|
|
||||||
if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default
|
if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default
|
||||||
{
|
{
|
||||||
bool rval = MyFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.BreakOnSections;
|
bool rval = MyFormat.MyStepSectionLayoutData.BreakOnSections;
|
||||||
parval = (rval) ? ((int)(SectionPagination.Separate)).ToString() : ((int)(SectionPagination.Continuous)).ToString();
|
parval = (rval) ? ((int)(SectionPagination.Separate)).ToString() : ((int)(SectionPagination.Continuous)).ToString();
|
||||||
//parval = ((int)(SectionPagination.Default)).ToString();
|
//parval = ((int)(SectionPagination.Default)).ToString();
|
||||||
}
|
}
|
||||||
@ -434,12 +434,12 @@ namespace VEPROMS.CSLA.Library
|
|||||||
{
|
{
|
||||||
if (MyFormat != null)
|
if (MyFormat != null)
|
||||||
{
|
{
|
||||||
int rval = (int)MyFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.PMode;
|
int rval = (int)MyFormat.MyStepSectionLayoutData.PMode;
|
||||||
return (SectionColumnMode)rval;//SectionColumnMode.Two; //SectionColumnMode.Default;// default to volian default
|
return (SectionColumnMode)rval;//SectionColumnMode.Two; //SectionColumnMode.Default;// default to volian default
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
int rval = (int)MyDefaultFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.PMode;
|
int rval = (int)MyDefaultFormat.MyStepSectionLayoutData.PMode;
|
||||||
return (SectionColumnMode)rval;
|
return (SectionColumnMode)rval;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -460,7 +460,7 @@ namespace VEPROMS.CSLA.Library
|
|||||||
|
|
||||||
if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default
|
if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default
|
||||||
{
|
{
|
||||||
int rval = (int)MyFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.PMode;
|
int rval = (int)MyFormat.MyStepSectionLayoutData.PMode;
|
||||||
parval = ((SectionColumnMode)rval).ToString();
|
parval = ((SectionColumnMode)rval).ToString();
|
||||||
//parval = ((int)(SectionColumnMode.Default)).ToString();
|
//parval = ((int)(SectionColumnMode.Default)).ToString();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user