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

Browse Source
This commit is contained in:
Kathy Ruffing 2012-03-06 17:19:30 +00:00
parent 67747c0984
commit 51352a687c
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
PROMS/Volian.Controls.Library/EditItem.cs
View File

@ -216,7 +216,7 @@ namespace Volian.Controls.Library
// see if change in subsections to be displayed, i.e. if the user made a change to editable data
// on the section properties form, we may have to display steps or remove steps. By design,
// steps are the first children from a section.
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections)
if (MyItemInfo.IsSection && MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections)
{
// find out what the editable flag is to determine if change.
bool showSteps = MyItemInfo.MyConfig is SectionConfig && (MyItemInfo.MyConfig as SectionConfig).SubSection_Edit == "Y";
@ -615,10 +615,7 @@ namespace Volian.Controls.Library
public void RemoveItemWithoutDelete()
{
BeingRemoved = true;
//MyStepPanel.SelectedEditItem = null; // Unselect the item to be deleted
int TopMostYBefore = TopMostEditItem.Top;
MyStepPanel._LookupEditItems.Remove(MyID);
EditItem newFocus = null;
int? TopMostParentY = (MyParentEditItem == null ? null : (int?)(MyParentEditItem.TopMostEditItem.Top));
@ -648,34 +645,19 @@ namespace Volian.Controls.Library
MyPreviousEditItem.MyNextEditItem = null;
newFocus = MyPreviousEditItem.BottomMostEditItem;
MyPreviousEditItem = null;
//Console.Write(",\"Previous\",");
}
else
{
newFocus = MyParentEditItem;
MyParentEditItem = null;
//Console.Write(",\"Parent\",");
}
//_MyTimer.ShowElapsedTimes("DeleteItem");
//KBR??return newFocus;
//EditItem newFocus = DeleteItem();
//if (newFocus == null) return;
////_MyTimer.ActiveProcess = "SetFocus";
//newFocus.SetFocus();
////_MyTimer.ActiveProcess = "Dispose";
//Dispose();
////_MyTimer.ActiveProcess = "SetAllTabs";
//newFocus.SetAllTabs();
////_MyTimer.ActiveProcess = "TopMostYAfter";
//int TopMostYAfter = newFocus.TopMostEditItem.Top;
//if (TopMostYAfter > TopMostYBefore)
// newFocus.TopMostEditItem.Top = TopMostYBefore;
////_MyTimer.ActiveProcess = "AdjustLocation";
//newFocus.AdjustLocation();
////newFocus.ShowTops("");
////_MyTimer.ShowElapsedTimes("RemoveItem");
Dispose();
if (newFocus != null)
{
newFocus.SetFocus();
newFocus.SetAllTabs();
newFocus.AdjustLocation();
}
}
public void RemoveItem()
{