Compare commits

..
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;