From 3a6b1adc47da5f4a0e9239a80443d5a516a1f4db Mon Sep 17 00:00:00 2001 From: Kathy Ruffing Date: Wed, 30 Aug 2023 10:22:49 -0400 Subject: [PATCH 1/2] B2023-091: Vogtle Alarms pagination fix --- PROMS/Volian.Print.Library/vlnParagraph.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index f9d8f6f4..7d274bf9 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -7098,7 +7098,7 @@ namespace Volian.Print.Library //if (paraLoc.MyParagraph.MyItemInfo.MyPrevious == null) // First substep level = 0; else - level = AlarmPagination?3:1; // B2023-088 make it easier to break on a sequential for alarms + level = 1; // AlarmPagination?3:1; // B2023-091: backout B2023-088 make it easier to break on a sequential for alarms } else if (AlarmPagination && paraLoc.MyParagraph.MyItemInfo.IsSubStep) { -- 2.47.2 From 10821a478b5c182643853db6236a115fd247ffa7 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Wed, 30 Aug 2023 10:55:07 -0400 Subject: [PATCH 2/2] =?UTF-8?q?=20B2023-078=20=20When=20using=20the=20spli?= =?UTF-8?q?t=20screen=20PROMS=20was=20crashing=20when=20the=20user=20close?= =?UTF-8?q?d=20a=20procedure=20tab=20on=20the=20other=20split=20screen=20s?= =?UTF-8?q?ide=20which=20didn=E2=80=99t=20have=20the=20current=20editing?= =?UTF-8?q?=20focus.=20=20PROMS=20was=20trying=20to=20reposition=20to=20th?= =?UTF-8?q?e=20procedure=20tab=20that=20had=20editing=20focus,=20we=20were?= =?UTF-8?q?=20not=20taking=20into=20account=20that=20saved=20currently=20a?= =?UTF-8?q?ctive=20procedure=20tab=20could=20be=20in=20a=20different=20spl?= =?UTF-8?q?it=20screen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Volian.Controls.Library/DisplayTabControl.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/PROMS/Volian.Controls.Library/DisplayTabControl.cs b/PROMS/Volian.Controls.Library/DisplayTabControl.cs index 82f08177..90ed2439 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabControl.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabControl.cs @@ -827,7 +827,11 @@ namespace Volian.Controls.Library private DisplayTabItem FindRemainingTab(Bar myBar) { // C2023-004: Proms reverts to first tab rather than active tab/save last selected tab is and use to reset to it - if (LastSelectedDisplayTabItem != null && !_RemovedDisplayTabItems.Contains(LastSelectedDisplayTabItem)) + // B2023-078 Added the check for LastSelectedDisplayTabItem is in myBar. This fixes a crash issue where user has as split screen + // each with procedure tabs and closes a procedure tab in the split screen that does not currently have focus. + // that other screen has its own myBar list which does not contain the LastSelectedDisplayTabItem references. + // In that case we want to run through the foreach loop to find a tab in the currently active split screen side + if (LastSelectedDisplayTabItem != null && myBar.Items.Contains(LastSelectedDisplayTabItem) && !_RemovedDisplayTabItems.Contains(LastSelectedDisplayTabItem)) return LastSelectedDisplayTabItem; foreach (DisplayTabItem itm in myBar.Items) { -- 2.47.2