From 54765cea9595de2b52520410d62639527391774e Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 24 Jan 2017 16:00:06 +0000 Subject: [PATCH] =?UTF-8?q?F2016-061:=20Additional=20signoff=20types=20for?= =?UTF-8?q?=20VCBA=20&=20WST1=20for=20SCANA=E2=80=99s=20maintenance=20depa?= =?UTF-8?q?rtment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/vcbaall.xml | Bin 95326 -> 97512 bytes PROMS/Formats/fmtall/wst1all.xml | Bin 96654 -> 98626 bytes PROMS/Formats/genmacall/vcba.svg | Bin 13812 -> 23098 bytes PROMS/Formats/genmacall/wst1.svg | Bin 9020 -> 18378 bytes .../Format/PlantFormat.cs | 8 ++++ PROMS/Volian.Print.Library/vlnParagraph.cs | 43 +++++++++++------- 6 files changed, 35 insertions(+), 16 deletions(-) diff --git a/PROMS/Formats/fmtall/vcbaall.xml b/PROMS/Formats/fmtall/vcbaall.xml index 2aabc6fc4288b75a93df036bff88b9bfa07f60f4..3ecdc1ae86af354f5eaa98ad961e4dd08bc8c648 100644 GIT binary patch delta 701 zcma)4J5Rz;7(ETaIQk;Q6rnZI#X$>{$6yQ!gNY&!W8#Ql4Z(s^pR<#rxq~BrK_^H5 z0{#JJ{(_t5)*GWn3`5&5x96PioYM}5!Qp%GX=sYRz8tWyCN^TBKnhv$aIK5s{nV_1 zZRBB~h)cLQ!ZErc7YX^;H^Y7GC$tH%Y0hbun2yYc%Ge^fiY89b=G1`$M-ePR0&!(M z97rQA@!?(UqcD;Ymkd#ICPm(y(c+R3tI&dr8oFq~8_7(N8H#-~jXgTqp|3Xi9@eo4 zTUgN?gCzaXX=J4SQjwl7h;wjD^#V?buk)nKvpTOD6+D$FDg9BwRtmP?!9Fn_-ThUX ztvWc5hP8}%j_9i;St+-5cy~EB$dfzdv&z!X{P$Pf>`9E;oEjrvQsxtb)@OTJzwbk; z$<|~_gP*g58+oEs(<)Eq>o;H{EB`q>@ZHI_nw%O+Co`@)c9&JV{O%Th`YR&$+ofjR M^~{%^sl8S{0CNVH!~g&Q delta 26 icmaFyll9&U)(tNdC!dlOnJgtG)x1D!`vNUSk01cCg9|?Z diff --git a/PROMS/Formats/fmtall/wst1all.xml b/PROMS/Formats/fmtall/wst1all.xml index 2ba29c98165ffb49ec4ace5c6e046731df1901f3..5ea089bfb6faa1af4ea525f4a15e5dbee032cb2e 100644 GIT binary patch delta 649 zcma))KTE?<6va;nieo`Skq)hbla-p9Hj&s+(GG&vKP`frv9(e(tu$72a8OYsny8@` zB03`?dD10Jm`p?$QAVLBlV(QI#kd_+Eu@)_ake}zt3bXK9ur3rrM$&j9k=U<*O zGKDhr_@wTq;4+e!zL11si5EMTTIOJBUz6@0)m0*S3qMN~{hoY(K)ZeJ;oX!;kc^FUDQX8jLr>YvxvHp?1 NaTeqsg1mBTeFEFtp4I>W delta 22 ecmX@q#Mbwjb;BQr$yrT2&3iny@9|)4vj6~oY6?jJ diff --git a/PROMS/Formats/genmacall/vcba.svg b/PROMS/Formats/genmacall/vcba.svg index e676876060ba7e95817952024f2d8088a800e1dd..1152898aecc1f0b4237a3c07b4a11d0ae0b5cf7b 100644 GIT binary patch delta 1500 zcmb`H%TE(w6vb~dmW7Ia5>n#WQK_YA2HHB)hoDJ$m>2?DASQ+o1t|ovr933EQWH1E z=;p3X>R$j0RxXShmnLl4Xkubmvhok`+^-GLR%lGzbRN0$oqK=h-2PttuQGxPQq&0kViw5yKiuVPY!P^zO z#_yv&oQ#~~UGr(Mk9ugHZcrGGb^De)36&gFHu9=kK>CiJRK{gkrPCEX_vYu10!^WrZGo}dTD}& z(D_Xohx%nvbC~SWef-0G>&S?vK7iWCpfQ7)r_t2{`YNJ&5G?Ziy<68$oSn1Y5dR84 zXdQ#n2xV!EhG|@s6!8pbyk?MT0~w0J6@xb5i}(|#1pkccnp~GdQ&Lso7k$O$Q!NM2 zZ(Kp%kGlDztDm<*7mhj2qO_a_k`674I)4+ARs+fHu9xsDB~$`;R0dY7EJkq^GIO-R z_q%LPN6sP@e)d{kE`>^3ra~V6bxL>WVaI%jv(n-Rmm?ib7`no32N|^_qwN#$VwDy_ zt09x%8doWM(PYA8{e^NmY7ouS_~8X;k|#3(bDo5C>I?WfHq~KIIZzsh+p# z%CXx__zwLwl)vIg&K&lQBT16^6-fxXNeA)2ZonnnT}iPlq391zV0^<$_j RXPl$>m&!J9_w%lO{tr75NcvfRP06( zbRjOp-h~?#|ABQW3L@^@=)#4YBJPE@zd+A@9ovMoD{+xz^4^{E&i&4vd7u0I#JB9k zcsbnRcgdl{e87rnaT??|_GHf}-Jn}kqAHcCNENzCHl3yseCM%Vrdh1k=r}*MT<+E% z@T+jQ=90?`W{)-ijSm4!>!%F=wC+JO$#0D*{TvM|l?v6NTcoQ{y-qb~eDNiug8R%N zsKgsp{QV@l(DB0?IsDF;43Ee|2MP|a>Mwj5(X@t9c@3S+ z!tV@DEaA)wYDdsVk$cT7x*zbm7w71nzwX_&XPmNhp2n!4G~?)HRe#KP&5jVNgcmdx z;q4@@#Pe_6Qr_3CDXCHvjPN7gAKJacU2+=k;$MLrPallzP?eyx(w5(K>k^+aZJd*6 zWCYSK|FG_ZbV_mj-Wk}JN1xK|JU&I5^OCap%As~%v#MHVgC&@EEg2C60AvtI3t(RB z8UmK&=1?RAi#`E>by`5Sxse&C39&5u1bRDOwbp z2u{2tn+*1}QkNA;;SR-B3Nk4UuLLgebmVAoD7IyGP6LH0;*5Z7)+=6S@1PKH@binDE*glRvm3w{4Lt9CE!r@+d`(g zMumo?R5}skrO!ovWnQv6IS{q+uVnWAeV&>ydQZat$C#8UP@~?|cIcu)xH(>1>HQ _CheckOffNumberOfLines; + public float? CheckOffNumberOfLines + { + get + { + return LazyLoad(ref _CheckOffNumberOfLines, "@CheckOffNumberOfLines"); + } + } private LazyLoad _MenuItem; public string MenuItem { diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 4bd73793..d05baaa7 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -3677,27 +3677,38 @@ namespace Volian.Print.Library xloc_co = XOffset + (relX > 0 ? Width : 0) + relX; } } - - // if xtraCheckOffLines is a negative number, start the checkoff on the same line - // as text and adjust the y-offset after the checkoff by the amount of the absolute - // value of xtraCheckOffLines. - // if xtraCheckOffLines is a positive number, start the checkoff xtraCheckOffLines - 1 - // down from the text and adjust the y-offset after the checkoff by the amount - // of xtraCheckOffLines. - float xtraCheckOffLines = (co.CheckOffXtraLines ?? 0); - if (xtraCheckOffLines < 0) + // CheckOffXtraLines was introduced for the additional lines needed for the longer signoffs + // for VCBA (&WST1), for F2016-061. + float checkOffNumberOfLines = (co.CheckOffNumberOfLines ?? 0); + if (checkOffNumberOfLines > 0) { - xtraCheckOffLines = -xtraCheckOffLines; - xtraCheckOffLines *= SixLinesPerInch; + yForCheckoff += (2 * SixLinesPerInch); PartsRight.Add(new vlnMacro(xloc_co, yForCheckoff/* + xtraCheckOffLines */, co.Macro)); - yoff += xtraCheckOffLines; + yoff += ((checkOffNumberOfLines *= SixLinesPerInch) + (2 * SixLinesPerInch)); } else { - xtraCheckOffLines *= SixLinesPerInch; - xtraCheckOffLines -= ((xtraCheckOffLines>0)? SixLinesPerInch:0); - PartsRight.Add(new vlnMacro(xloc_co, yForCheckoff + xtraCheckOffLines, co.Macro)); - yoff += (xtraCheckOffLines != 0) ? xtraCheckOffLines + SixLinesPerInch : 0; + // if xtraCheckOffLines is a negative number, start the checkoff on the same line + // as text and adjust the y-offset after the checkoff by the amount of the absolute + // value of xtraCheckOffLines. + // if xtraCheckOffLines is a positive number, start the checkoff xtraCheckOffLines - 1 + // down from the text and adjust the y-offset after the checkoff by the amount + // of xtraCheckOffLines. + float xtraCheckOffLines = (co.CheckOffXtraLines ?? 0); + if (xtraCheckOffLines < 0) + { + xtraCheckOffLines = -xtraCheckOffLines; + xtraCheckOffLines *= SixLinesPerInch; + PartsRight.Add(new vlnMacro(xloc_co, yForCheckoff/* + xtraCheckOffLines */, co.Macro)); + yoff += xtraCheckOffLines; + } + else + { + xtraCheckOffLines *= SixLinesPerInch; + xtraCheckOffLines -= ((xtraCheckOffLines > 0) ? SixLinesPerInch : 0); + PartsRight.Add(new vlnMacro(xloc_co, yForCheckoff + xtraCheckOffLines, co.Macro)); + yoff += (xtraCheckOffLines != 0) ? xtraCheckOffLines + SixLinesPerInch : 0; + } } } }