From 94cc5c22aaaee013aa2d20cc2ee68dd9d149e22b Mon Sep 17 00:00:00 2001 From: Kathy Date: Thu, 7 Feb 2019 13:12:01 +0000 Subject: [PATCH] C2014-009: Allow for edit/print of Notes & Cautions off a sub-step in the right column of Condition Response table (Calvert personnel made update request) --- PROMS/Formats/fmtall/BGEALNall.xml | Bin 109368 -> 111478 bytes .../Volian.Controls.Library/StepTabRibbon.cs | 17 +++++++------ PROMS/Volian.Print.Library/vlnParagraph.cs | 23 +++++++++++++++--- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/PROMS/Formats/fmtall/BGEALNall.xml b/PROMS/Formats/fmtall/BGEALNall.xml index 0c87913b25b66244cdd839c9895f8501f4d010f4..9331ce1b17f70307d5fe30498377ce23070c8227 100644 GIT binary patch delta 800 zcmdmSjqTerwuUW?zqpu<7<8t;=3+GG)M4;r$Y&^FNS!`Wm{D?if;?lu_6}~wH_UjI zOm7fi6x%K#!1zT(G?*ckp@1Qgp$Le9<}f$`&8wJRt;nc6{T2r!pRg}jJeeVbArz=C z2xy=GbWTo2?ddhVj6T!-7#Z1k%YjNN8HyP~fOOL2hn%AP3JfT4x}zwgK8D~#PDV>< zC7?=u20I2`1};=R3<}c)Wf^6s|KVhmo9f3H#0pk3c_NGGbRi~2k?9+h7!6dNfsV~% zNMXnXIz1E2RscFN73h`%Fs~TMR+v7KgHc!#w>5!|jLMjfV`9{t4h+c`lP9r=Oh3fJ zC^bDGiIHde0v<*V48@KLjFQ|)KA!CO-*|h18lwX9kPcpNqJkHe0vSM2Nlqw(6617W PV*EySP@m9bENBD(qo 0; // 2016-128 don't enable if RO Path was not selected at the Working Draft node - // if in Calvert Alarms Condition/Response, disable insert of Cautions and Notes - if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm) - btnInsCaut.Enabled = btnInsNote.Enabled = btnCMInsCaution.Enabled = btnCMInsNote.Enabled = !MyItemInfo.IsInCalvertConditionResponse; + // C2014-009 Commented out to allow for inserting Note/Caution + //if in Calvert Alarms Condition/Response, disable insert of Cautions and Notes + //if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm) + //btnInsCaut.Enabled = btnInsNote.Enabled = btnCMInsCaution.Enabled = btnCMInsNote.Enabled = !MyItemInfo.IsInCalvertConditionResponse; _RibbonControl.Refresh(); // jsj- added this because Table Design ribbon tab grouping was not going away when not on a table step type } diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 053690d4..bbc38365 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -5065,7 +5065,12 @@ namespace Volian.Print.Library { if ((MyItemInfo.IsCaution || MyItemInfo.IsNote || MyItemInfo.MyParent.IsCaution || MyItemInfo.MyParent.IsNote) && !MyItemInfo.FormatStepData.SpaceIn && (MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) - && (MyItemInfo.NextItem == null || MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type)) return 0; + && (MyItemInfo.NextItem == null || MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type)) + { + // C2014-009: Don't add another blank line - print the calvert Condition/Response RNO Caution/Notes without it. + if (!(MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm && MyItemInfo.IsInRNO)) + return 0; + } if (everyNLines == 99 && MyItemInfo.NextItem == null) { if (MyItemInfo.Steps != null && MyItemInfo.Steps.Count > 0 && MyItemInfo.Steps[0].MyContent.Type == MyItemInfo.MyContent.Type) return 0; @@ -5364,6 +5369,8 @@ namespace Volian.Print.Library else xoff += (float)((bx.TxtStart + _MyBoxLeftAdj + XOffsetBox + (bx.TxtWidth / 2)) - (hdrWidth / 2)); // xoff starts as left margin } + else if (formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm && itemInfo.IsInRNO && (itemInfo.IsCaution || itemInfo.IsNote)) // C2014-009 + xoff = XOffset + (para.Width / 2) - (hdrWidth / 2); else if (formatInfo.MyStepSectionLayoutData.Separator.Location > 0) xoff = XOffset + AdjustToCharPosition((float)((para.Width - hdrWidth) / formatInfo.MyStepSectionLayoutData.Separator.Location), itemInfo.MyHeader.MyFont.CPI); else if (itemInfo.IsInRNO && itemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList[40].NumberWithLevel) @@ -6272,11 +6279,19 @@ namespace Volian.Print.Library Width = (float)formatInfo.MyStepSectionLayoutData.WidT + 1; else if (itemInfo.IsInRNO) { - if (MyItemInfo.FormatStepData.CenterOneLineAdjust) + if (MyItemInfo.FormatStepData.CenterOneLineAdjust) // C2014-009: Condition/Response adjust xoffset & width { int rnoOff = ToInt(formatInfo.MyStepSectionLayoutData.ColRTable, maxRNO); - XOffset = rnoOff + MyHighLevelParagraph.XOffset; - Width = MyParent.Width; + if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm) + { + XOffset = MyTopRNO.MyTab.XOffset + 7.2f; + Width = MyParent.Width + (MyParent.XOffset - XOffset); + } + else + { + XOffset = rnoOff + MyHighLevelParagraph.XOffset; + Width = MyParent.Width; + } } else Width = (MyParent.XOffset + MyParent.Width) - (XOffset + mycolT);