diff --git a/PROMS/Volian.Controls.Library/StepItem.cs b/PROMS/Volian.Controls.Library/StepItem.cs index 096b2c63..a22f24a0 100644 --- a/PROMS/Volian.Controls.Library/StepItem.cs +++ b/PROMS/Volian.Controls.Library/StepItem.cs @@ -30,6 +30,23 @@ namespace Volian.Controls.Library #endregion public partial class StepItem : UserControl { + //private static int _StepItemUnique = 0; + //private static int StepItemUnique + //{ + // get + // { + // if (_StepItemUnique == 3) + // Console.WriteLine("here"); + // return ++_StepItemUnique; + // } + //} + //private int _MyStepItemUnique = StepItemUnique; + + //public int MyStepItemUnique + //{ + // get {return _MyStepItemUnique; } + //} + #region Private Fields private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private StepPanel _MyStepPanel; diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 07b020a6..d15284e3 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -1042,16 +1042,15 @@ namespace Volian.Controls.Library MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlRight); // jump to RNO else if (deletedRNO) { - if (MyStepItem.NextDownStepItem.MyItemInfo.MyParent.ItemID == MyStepItem.MyID) - { - MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlDown); - InsertSiblingBeforeOrAfter("before"); - } - else - ShortCutContextMenu("InsSubStps"); + AddSubStep(); } else if (!deletedHLS) - CreateNewRNO(); + { + if (MyItemInfo.ColumnMode > 0) + CreateNewRNO(); + else + AddSubStep(); + } } } else if (MyItemInfo.IsRNOPart) @@ -1060,7 +1059,8 @@ namespace Volian.Controls.Library if (MyItemInfo.IsHigh) { if (MyStepItem.NextDownStepItem.MyItemInfo.MyParent.Equals(MyStepItem.MyItemInfo)) - { + //if (MyStepItem.NextDownStepItem.MyItemInfo.MyParent.ItemID == MyStepItem.MyItemInfo.ItemID) //.Equals(MyStepItem.MyItemInfo)) + { MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlDown); InsertSiblingBeforeOrAfter("before"); } @@ -1092,7 +1092,10 @@ namespace Volian.Controls.Library else if (MyStepItem.MyRNOStepItems != null && MyStepItem.MyRNOStepItems.Count > 0) MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlRight); // jump to RNO else - CreateNewRNO(); + if (MyItemInfo.ColumnMode > 0) + CreateNewRNO(); + else + InsertSiblingBeforeOrAfter("after"); } else if (MyItemInfo.IsCaution) { @@ -1122,6 +1125,17 @@ namespace Volian.Controls.Library } } + private void AddSubStep() + { + if (MyStepItem.NextDownStepItem.MyItemInfo.MyParent.ItemID == MyStepItem.MyID) + { + MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlDown); + InsertSiblingBeforeOrAfter("before"); + } + else + ShortCutContextMenu("InsSubStps"); + } + private void CreateNewRNO() { if (btnInsRNO.SubItems.Count > 1)