Added tables to movement logic

Improved table layout
This commit is contained in:
Rich
2009-12-18 18:36:37 +00:00
parent 3a4ab8c801
commit df34079386
2 changed files with 71 additions and 37 deletions

View File

@@ -18,9 +18,7 @@ namespace Volian.Controls.Library
/// Procedure Item Info - Top ItemInfo
/// </summary>
private ItemInfo _MyProcedureItemInfo;
/// <summary>
/// This is not correct. There should be a dictionary of Section Layouts
/// </summary>
// TODO: This is not correct. There should be a dictionary of Section Layouts
private StepSectionLayoutData _MyStepSectionLayoutData;
/// <summary>
/// Lookup Table to convert ItemInfo.ItemID to StepItem
@@ -642,6 +640,7 @@ namespace Volian.Controls.Library
if (ii.RNOs != null && ii.RNOLevel >= ii.ColumnMode) return BottomPart(ii.RNOs[0]);
if (ii.Sections != null) return BottomPart(ii.Sections[0].LastSibling);
if (ii.Steps != null) return BottomPart(ii.Steps[0].LastSibling);
if (ii.Tables != null) return BottomPart(ii.Tables[0].LastSibling);
return ii;
}
/// <summary>
@@ -721,6 +720,7 @@ namespace Volian.Controls.Library
// Subitems - go to top part of subitem
// (the lookAtSub prevented looping within a substep group at same level)
if (lookAtSub && ii.Steps != null) return TopPart(ii.Steps[0]);
if (lookAtSub && ii.Tables != null) return TopPart(ii.Tables[0]);
// RNOs: Use PMode (column)
if (lookAtRNO && ii.RNOs != null && ii.RNOLevel >= ii.ColumnMode) return TopPart(ii.RNOs[0]);
// Nextsibling - go to top part of sibling