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

Various print format improvements

Browse Source 
Fix multiple note/caution bulletting
Improve check off lines (may need further improvement)
Fix multiple/note caution printing for Calvert Only
This commit is contained in:
Kathy Ruffing
2014-10-16 15:59:48 +00:00
parent ba6eff87f4
commit f6a471dde8
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

BIN
PROMS/Formats/genmacall/bgeoi.svg
View File

Binary file not shown.

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

@@ -218,7 +218,8 @@ namespace Volian.Print.Library
if (box != null) if (box != null)
{ {
box.Height = yoff - box.YOffset; // new height, with children box.Height = yoff - box.YOffset; // new height, with children
if (formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm) if (formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm ||
formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)
{ {
if (childItemInfo.MyHeader != null && childItemInfo.MyPrevious != null if (childItemInfo.MyHeader != null && childItemInfo.MyPrevious != null
&& ((childItemInfo.MyPrevious.IsCautionOrNotePart && childItemInfo.IsCautionOrNotePart) && ((childItemInfo.MyPrevious.IsCautionOrNotePart && childItemInfo.IsCautionOrNotePart)
@@ -3097,7 +3098,8 @@ namespace Volian.Print.Library
if (MyItemInfo.FormatStepData != null && MyItemInfo.FormatStepData.Prefix != null && MyItemInfo.FormatStepData.Suffix != null && MyItemInfo.FormatStepData.UseSmartTemplate) return 0; if (MyItemInfo.FormatStepData != null && MyItemInfo.FormatStepData.Prefix != null && MyItemInfo.FormatStepData.Suffix != null && MyItemInfo.FormatStepData.UseSmartTemplate) return 0;
int everyNLines = MyItemInfo.FormatStepData == null ? 1 : MyItemInfo.FormatStepData.StepLayoutData.EveryNLines ?? 1; int everyNLines = MyItemInfo.FormatStepData == null ? 1 : MyItemInfo.FormatStepData.StepLayoutData.EveryNLines ?? 1;
if (everyNLines == -99) return 0; if (everyNLines == -99) return 0;
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm) if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm ||
MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)
{ {
if ((MyItemInfo.IsCaution || MyItemInfo.IsNote || MyItemInfo.MyParent.IsCaution || MyItemInfo.MyParent.IsNote) && !MyItemInfo.FormatStepData.SpaceIn if ((MyItemInfo.IsCaution || MyItemInfo.IsNote || MyItemInfo.MyParent.IsCaution || MyItemInfo.MyParent.IsNote) && !MyItemInfo.FormatStepData.SpaceIn
&& (MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && (MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0)