Compare commits

..
Author SHA1 Message Date
jjenko 71a4aa313d F2026-029 Comanche Peak ERG and ABN format, The End Of Section was added back to the Abnormal Procedure Steps Two Column section style. 2026-11-09 11:12:16 -05:00
mschill f860ba367d Merge pull request 'B2026-093 Fixed a null reference error that happened when opening an alarm point page for the first time' (#836) from B2026-093_Vogtle_Alarms into Development
Looks good. Ready for QA.
2026-11-05 15:29:28 -05:00
jjenko 382b8d7434 B2026-093 Fixed a null reference error that happened when opening an alarm point page for the first time 2026-11-05 15:27:37 -05:00
jjenko 44bddbc95d Merge pull request 'F2026-027 In the Comanche Peak ERG and ABN format, removed the End of Section messages from the Abnormal section styles and move the bottom continue message up so that it does not run into the section number below it.' (#835) from F2026-027_ComPeak into Development
format only change.
Good for testing
2026-11-05 14:48:33 -05:00
jjenko eb246b1dbe F2026-027 In the Comanche Peak ERG and ABN format, removed the End of Section messages from the Abnormal section styles and move the bottom continue message up so that it does not run into the section number below it. 2026-11-05 14:50:20 -05:00
jjenko 93c6d32110 Merge pull request 'B2026-082 Fix Load Global Search' (#834) from B2026-082 into Development
good for testing
2026-11-03 08:36:22 -05:00
mschill 1a81c17ccd B2026-082 Fix Load Global Search 2026-11-03 08:13:56 -05:00
jjenko 9078e99741 Merge pull request 'B2026-090 Populate Step Properties Panel when PROMS restores saved display tabs' (#833) from B2026-090 into Development
good for testing phase
2026-10-29 14:15:03 -04:00
3 changed files with 5 additions and 4 deletions

No files matched your search

Binary file not shown.
@@ -3192,7 +3192,7 @@ namespace Volian.Controls.Library
{
int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText);
ItemInfo ii = ItemInfo.Get(itemID);
if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null && ii.ItemAnnotations.Count > 0) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
SearchResults.AddItemInfo(ii);
}
lbSrchResults.DataSource = SearchResults;
@@ -3214,7 +3214,7 @@ namespace Volian.Controls.Library
int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText);
ItemInfo ii = ItemInfo.Get(itemID);
// B2020-107: The following was needed to set the Step Path result type for annotations
if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null)
if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null && ii.ItemAnnotations.Count > 0)
{
ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
ii.SearchAnnotationID = ii.ItemAnnotations[0].AnnotationID;
@@ -3245,7 +3245,7 @@ namespace Volian.Controls.Library
{
int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText);
ItemInfo ii = ItemInfo.Get(itemID);
if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null && ii.ItemAnnotations.Count > 0) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
SearchResults.AddItemInfo(ii);
}
lbSrchResultsIncTrans.DataSource = SearchResults;
+2 -1
View File
@@ -3663,6 +3663,8 @@ namespace Volian.Controls.Library
TabLeft = 20;
if (!itemInfo.IsStep) // C2025-036 reduce un-needed processing - this will prevent duplicat calls that generate step tabs when loading a procedure
SetupHeader(itemInfo);
//B2026-093 move the setting of MyStepPanel to fix null reference error when the Alarm Point Table is first setup for the editor view
MyStepPanel = myStepPanel;
SetupAlarmTableView(itemInfo); // C2021-018 display alarm point table information in the step editor (if the format flag is set)
this.Paint -= new PaintEventHandler(EditItem_Paint);
this.Paint += new PaintEventHandler(EditItem_Paint);
@@ -3707,7 +3709,6 @@ namespace Volian.Controls.Library
if (myStepPanel.MyFont != null) ContentFont = TabFont = myStepPanel.MyFont;
}
if (expand) ShowExpanded();
MyStepPanel = myStepPanel;
if (itemInfo != null && !myStepPanel._LookupEditItems.ContainsKey(itemInfo.ItemID)) myStepPanel._LookupEditItems.Add(itemInfo.ItemID, this);
_MyChildRelation = myChildRelation;
if (myParentEditItem != null) RNOLevel = myParentEditItem.RNOLevel;