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

Added Print/HorizontalSubstep flag (default to false). Was in 16bit to flag footnotes for BGEVL (in addition to NotesToFootnotes

Browse Source 
Set HorizontalSubstep flag to true (for Note type as footnote)
Added property ‘IsFootnote’; for Calvert formats: don’t bullet a single note/caution
Added HorizontalSubstep flag
Use ‘IsFootnote’ property to determine if a note is a footnote.
This commit is contained in:
Kathy Ruffing 2014-11-06 14:30:40 +00:00
parent 32ddfbbce0
commit 235b6f7472
5 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/BASEall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BGEVLall.xml
View File

Binary file not shown.

16
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -1226,6 +1226,18 @@ namespace VEPROMS.CSLA.Library
return IsType("Note"); return IsType("Note");
} }
} }
public bool IsFootnote
{
get
{
if (!ActiveFormat.PlantFormat.FormatData.ProcData.NotesToFootnotes) return false;
if (!IsStep) return false;
// BGEVL had notes as footnotes, and also had HorizontalSubsteps flag
if (ActiveFormat.PlantFormat.FormatData.PrintData.HorizontalSubsteps && IsType("Note")) return true;
if (IsType("Note2")) return true; // BGEEOP had note2's as footnotes
return false;
}
}
public bool IsTable public bool IsTable
{ {
get get
@ -3396,7 +3408,9 @@ namespace VEPROMS.CSLA.Library
} }
if (!this.FormatStepData.SeparateBox) if (!this.FormatStepData.SeparateBox)
{ {
if (tbformat == nextTbFormat || tbformat == prevTbFormat) // For calvert formats, if all tabs are null or empty, then don't add a bullet in.
bool allnull = ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && (tbformat == null || tbformat == "") && (nextTbFormat == null || tbformat == "") && (prevTbFormat == null || prevTbFormat == "");
if (!allnull && (tbformat == nextTbFormat || tbformat == prevTbFormat))
{ {
tbformat = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.IdentB; tbformat = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.IdentB;
TabToIdentBAdjustFont(); TabToIdentBAdjustFont();

8
PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
View File

@ -729,6 +729,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _SpecialCaseCalvertAlarm, "@SpecialCaseCalvertAlarm"); return LazyLoad(ref _SpecialCaseCalvertAlarm, "@SpecialCaseCalvertAlarm");
} }
} }
private LazyLoad<bool> _HorizontalSubsteps;
public bool HorizontalSubsteps
{
get
{
return LazyLoad(ref _HorizontalSubsteps, "@HorizontalSubsteps");
}
}
private LazyLoad<bool> _SpecialStepsFoldout; private LazyLoad<bool> _SpecialStepsFoldout;
public bool SpecialStepsFoldout public bool SpecialStepsFoldout
{ {

7
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@ -80,7 +80,7 @@ namespace Volian.Print.Library
{ {
if(pp != null) pp.OnStatusChanged((iChildItemInfo.DisplayNumber ?? "") == "" ? iChildItemInfo.DisplayText : iChildItemInfo.DisplayNumber, PromsPrinterStatusType.LoadVlnParagraph); if(pp != null) pp.OnStatusChanged((iChildItemInfo.DisplayNumber ?? "") == "" ? iChildItemInfo.DisplayText : iChildItemInfo.DisplayNumber, PromsPrinterStatusType.LoadVlnParagraph);
if (iChildItemInfo.IsNote && iChildItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.NotesToFootnotes) if (iChildItemInfo.IsFootnote)
{ {
vlnParagraph para = new vlnParagraph(Parent, cb, iChildItemInfo, xoff, yoff, rnoLevel, maxRNO, formatInfo, null, null, yoffRight, true, iChildItemInfo.IsSection ? pp :null); vlnParagraph para = new vlnParagraph(Parent, cb, iChildItemInfo, xoff, yoff, rnoLevel, maxRNO, formatInfo, null, null, yoffRight, true, iChildItemInfo.IsSection ? pp :null);
continue; // don't add it, vlnParagraph adds this item to the footnote vlntext list in ToPdf. continue; // don't add it, vlnParagraph adds this item to the footnote vlntext list in ToPdf.
@ -2104,10 +2104,9 @@ namespace Volian.Print.Library
Suffix = suffix; Suffix = suffix;
MyItemInfo = itemInfo; MyItemInfo = itemInfo;
MyContentByte = cb; MyContentByte = cb;
if (itemInfo.IsNote && itemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.NotesToFootnotes) if (itemInfo.IsFootnote)
{ {
// notestofootnoteshls may need to be a list, a hls can have more than one note // notestofootnoteshls is a list, a hls can have more than one note
// should it be list of vlntext.
if (MyPageHelper.NotesToFootNotesHLS.ContainsKey(itemInfo.MyHLS.ItemID)) if (MyPageHelper.NotesToFootNotesHLS.ContainsKey(itemInfo.MyHLS.ItemID))
MyPageHelper.NotesToFootNotesHLS[itemInfo.MyHLS.ItemID].Add(itemInfo.ItemID); MyPageHelper.NotesToFootNotesHLS[itemInfo.MyHLS.ItemID].Add(itemInfo.ItemID);
else else