Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Handle nulls for selected values

Browse Source
This commit is contained in:
Rich 2009-03-28 22:16:58 +00:00
parent 612b043186
commit c09a44a14f
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -41,7 +41,12 @@ namespace VEPROMS
{ {
_SelectedStepTabPanel = value; _SelectedStepTabPanel = value;
if (value == null) // DSO Tab Panel if (value == null) // DSO Tab Panel
SelectedDVI = tc.SelectedDisplayTabItem.MyItemInfo.MyActiveParent.ActiveParent as DocVersionInfo; {
if (tc.SelectedDisplayTabItem != null)
SelectedDVI = tc.SelectedDisplayTabItem.MyItemInfo.MyActiveParent.ActiveParent as DocVersionInfo;
else
SelectedDVI = null;
}
else // Step Tab Panel else // Step Tab Panel
SelectedDVI = value.MyStepPanel.MyProcedureItemInfo.MyProcedure.MyActiveParent as DocVersionInfo; SelectedDVI = value.MyStepPanel.MyProcedureItemInfo.MyProcedure.MyActiveParent as DocVersionInfo;
} }
@ -918,7 +923,8 @@ namespace VEPROMS
displayTags.MyRTB = args.MyStepItem.MyStepRTB; displayTags.MyRTB = args.MyStepItem.MyStepRTB;
displayRO.ProgressBar = bottomProgBar; displayRO.ProgressBar = bottomProgBar;
} }
SelectedStepTabPanel = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; if(tc.SelectedDisplayTabItem != null)
SelectedStepTabPanel = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel;
} }
ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem); ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem);
AnnotationPanelView(); AnnotationPanelView();
@ -1182,15 +1188,18 @@ namespace VEPROMS
private void InitiateSearch(bool searchFocus) private void InitiateSearch(bool searchFocus)
{ {
if (displaySearch1.Mydocversion == null)//!displaySearch1.OpenDocFromSearch) if (toolsPanel.Expanded)
{ {
if (SelectedDVI != null) if (displaySearch1.Mydocversion == null)//!displaySearch1.OpenDocFromSearch)
{ {
displaySearch1.Mydocversion = SelectedDVI; if (SelectedDVI != null)
displaySearch1.advTreeStepTypesFillIn(); {
} displaySearch1.Mydocversion = SelectedDVI;
displaySearch1.advTreeProcSetsFillIn(searchFocus); displaySearch1.advTreeStepTypesFillIn();
} }
displaySearch1.advTreeProcSetsFillIn(searchFocus);
}
}
} }
private void toolsPanel_ExpandedChanged(object sender, ExpandedChangeEventArgs e) private void toolsPanel_ExpandedChanged(object sender, ExpandedChangeEventArgs e)