From 784986f388735e129e008e73867d69025b05bdae Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 5 Aug 2020 12:45:34 +0000 Subject: [PATCH] B2020-101: Add format flag for table pagination B2020-101: Add format flag around code that was crashing during pagination around a large table --- PROMS/Formats/fmtall/BNPP1all.xml | Bin 194124 -> 194186 bytes PROMS/Formats/fmtall/BNPP2all.xml | Bin 188890 -> 188954 bytes PROMS/Formats/fmtall/BNPPalrall.xml | Bin 175496 -> 175560 bytes PROMS/Formats/fmtall/BNPPbckall.xml | Bin 156820 -> 156884 bytes PROMS/Formats/fmtall/BNPPcklall.xml | Bin 124498 -> 124562 bytes PROMS/Formats/fmtall/BNPPdevall.xml | Bin 43356 -> 43420 bytes PROMS/Formats/fmtall/BNPPgopall.xml | Bin 190840 -> 190904 bytes PROMS/Formats/fmtall/BNPPsamall.xml | Bin 170304 -> 170368 bytes .../Format/PlantFormat.cs | 8 ++++++++ PROMS/Volian.Print.Library/Pagination.cs | 4 +++- 10 files changed, 11 insertions(+), 1 deletion(-) diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml index c951249b2d7a919ca29bb14ce795e23f9a7d70af..69090c699c3f203257e3651a6391e5f5f8d209b6 100644 GIT binary patch delta 67 zcmX@}hP&%6_Xf5Q^#F!MhIEEh1}BChAeqRJ%>WVsvGW*87{VDcfn)|l$aKy>jGE07 QA?*?&jN2tbm`oM{0C%|&*8l(j delta 27 jcmeBr%YEhz_Xf6*>D$I_!^ diff --git a/PROMS/Formats/fmtall/BNPPalrall.xml b/PROMS/Formats/fmtall/BNPPalrall.xml index 6dc01b182bfe7a6bd341d407713e023e439031a3..6211148b780575dea0190c38b2a91f9de07c3c3a 100644 GIT binary patch delta 59 zcmeCU&2{27*M=0Y>AT9AxTeo}#>gcaz>vsL#E{C6$56r$&X5TtGZ;dqcfV!SY%cR^ OFY{vDUgpIllnelP(i4&Z delta 31 ncmX?co2%nC*M=0Y=>iKF`KB#pWNF^!)xOP(ar-teCZS{i)u{|f diff --git a/PROMS/Formats/fmtall/BNPPbckall.xml b/PROMS/Formats/fmtall/BNPPbckall.xml index a0ec3f4e7cc23b35b4685ac06f48a9cb910d9234..c60ee7f3a3a9d5f4c12081ae7855a45324d371af 100644 GIT binary patch delta 63 zcmbPolJm+*&J8DQraRqb6cPSYL>EXm$GHtE@jKKOC127LJA20 diff --git a/PROMS/Formats/fmtall/BNPPcklall.xml b/PROMS/Formats/fmtall/BNPPcklall.xml index 955d9a71638bc1799eb0a7c2c08f9e2f7ada9e50..26d1c29711fed751b541d595176393edebcb2561 100644 GIT binary patch delta 60 zcmca~hJDgm_6=DA)1NG56p;>KNMtBtNM*=lC}9X^$OMuZ3?V?VB!-;ni8C1GCp(C+ OG}j1huMuFpb`=0kHWH`+ delta 26 icmbPqmi^Kh_6=DA(<&JGCO3$%H184EzDI!Z+EoCRy9)dO diff --git a/PROMS/Formats/fmtall/BNPPdevall.xml b/PROMS/Formats/fmtall/BNPPdevall.xml index 2ec949a1e656756875455879808865366c6709c1..1edd55d6eb7c89e9c69e2173c4f566fe436fa213 100644 GIT binary patch delta 44 ycmca}iD}MdrVSj@lhb@eL<1NS8HyNE8S)rP7{VDcfn)|l$mEH>nwzDho%#SgKMfB6 delta 22 ecmbPpnd#0YrVSj@lXZf4CZ987+Z-kB)CT};DF~+k diff --git a/PROMS/Formats/fmtall/BNPPgopall.xml b/PROMS/Formats/fmtall/BNPPgopall.xml index a5cc39e4b0bd4f3ecf2d3ac6ee9a833be543b941..5a5da7fc2e5f0c070416977c35dd1af07de8bd13 100644 GIT binary patch delta 74 zcmexyiF?Oo?hOec>H!Ri4CxH13{DJ1Kr)dbn*k&OV&^fGFoZK?0?7=9km>P%7{w>~ X3rxNc#nD_A(q0zAxVt*&1_1vC62Slf delta 32 ocmZqJ%ynQB*M=Jg)6dOd _PageBreakParentWithTable; // B2020-101: Add format flag for table pagination + public bool PageBreakParentWithTable + { + get + { + return LazyLoad(ref _PageBreakParentWithTable, "@PageBreakParentWithTable"); + } + } private LazyLoad _UseHalfLines; public bool UseHalfLines { diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs index 7e59279c..08b19a32 100644 --- a/PROMS/Volian.Print.Library/Pagination.cs +++ b/PROMS/Volian.Print.Library/Pagination.cs @@ -1010,7 +1010,9 @@ namespace Volian.Print.Library // The following logic will walk up to each parent level to see try and get as many parent step levels on the same page // as the Table. // B2020-035 added a null reference check to fix printing crash - if (paraBreak != null && paraBreak.MyItemInfo.IsTable && paraBreak.MyParent.YSize < (yPageSize - (myTopMsgSpace + SixLinesPerInch) - myBottomMsgSpace)) + // B2020-101: Proms crashes when trying to keep table with parent when table is very large. Add format flag for Barakah, + // code was added for B2020-032 and only want it for Barakah + if (MyItemInfo.ActiveFormat.MyStepSectionLayoutData.PageBreakParentWithTable && paraBreak != null && paraBreak.MyItemInfo.IsTable && paraBreak.MyParent.YSize < (yPageSize - (myTopMsgSpace + SixLinesPerInch) - myBottomMsgSpace)) { vlnParagraph tparent = paraBreak.MyParent; while (!tparent.MyItemInfo.IsHigh && tparent.MyParent.YSize < (yPageSize - (myTopMsgSpace + SixLinesPerInch) - myBottomMsgSpace))