충돌병합

Dev/OHV/OHV.Module.Interactivity/PopUp/DriveServoViewModel.cs

@@ -85,6 +85,7 @@ namespace OHV.Module.Interactivity.PopUp
 
         public event Action<IDialogResult> RequestClose;
 
+        #region Commands
         public ICommand SelectAxisCommand { get; set; }
         public ICommand KeyInTargetPosCommand { get; set; }
         public ICommand SelectPosCommand { get; set; }
@@ -99,11 +100,11 @@ namespace OHV.Module.Interactivity.PopUp
         public ICommand PositionAddCommand { get; set; }
         public ICommand PositionDeleteCommand { get; set; }
         public ICommand PositionSaveCommand { get; set; }
-        public ICommand SteeringCWCommand { get; set; }
-        public ICommand SteeringCCWCommand { get; set; }
+        public ICommand SteeringMoveCommand { get; set; }
         public ICommand SelectedDirection { get; set; }
         public ICommand JogVelPopupCommand { get; set; }
-        public ICommand JogCommand { get; set; }
+        public ICommand JogCommand { get; set; } 
+        #endregion
 
         #region Brushes
         private Brush steeringLeftBrush = Brushes.Gray;
@@ -160,13 +161,28 @@ namespace OHV.Module.Interactivity.PopUp
             this.PositionSaveCommand = new DelegateCommand( ExecutePositionSaveCommand );
 
             this.SelectedDirection = new DelegateCommand<object>( ExecuteSelectedDirection );
-            this.SteeringCWCommand = new DelegateCommand<object>( ExecuteSteeringCWCommand );
-            this.SteeringCCWCommand = new DelegateCommand<object>( ExecuteSteeringCCWCommand );
+            this.SteeringMoveCommand = new DelegateCommand<object>( ExecuteSteeringMove );
 
             this.JogVelPopupCommand = new DelegateCommand( ExecuteJogVelPopupCommand );
             this.JogCommand = new DelegateCommand<object>( ExecuteJogCommand );
         }
 
+        private void ExecuteSteeringMove( object obj )
+        {
+            var msg = new DriveControlEventArgs
+            {
+                EventDir = DriveControlEventArgs.eEventDir.ToBack ,
+                ControlKind = DriveControlEventArgs.eControlKind.Steering ,
+            };
+
+            if ( obj.ToString().Equals( "CW" ) )
+                msg.MoveDir = DriveControlEventArgs.eMoveDir.LEFT;
+            else
+                msg.MoveDir = DriveControlEventArgs.eMoveDir.RIGHT;
+
+            this.PublishEvent( msg );
+        }
+
         private void UICallBackCommunication( GUIMessageEventArgs obj )
         {
             if ( obj.Kind == GUIMessageEventArgs.eGUIMessageKind.ModelPropertyChange )
@@ -175,6 +191,7 @@ namespace OHV.Module.Interactivity.PopUp
                 {
                     switch ( obj.ModelPropertyName )
                     {
+                        //변화될때 들어오는지 확인
                         case "SteeringState":
                             {
                                 var dir = CastTo<eSteeringState>.From<object>( obj.Args );
@@ -237,19 +254,17 @@ namespace OHV.Module.Interactivity.PopUp
             {
                 switch ( args.ControlKind )
                 {
-                    case DriveControlEventArgs.eControlKind.NONE:
-                        break;
                     case DriveControlEventArgs.eControlKind.MOVE:
                         ResponseMove( args );
                         break;
                     case DriveControlEventArgs.eControlKind.STOP:
                         break;
                     case DriveControlEventArgs.eControlKind.Steering:
+                        //response 주석 처리
                         if ( args.Result.IsSuccess )
                         {
                             var dir = args.Result.ToResult<eSteeringState>().Value;
                             this.ChangeSteeringDirection( dir );
-
                         }
                         break;
                     case DriveControlEventArgs.eControlKind.SteeringState:
@@ -370,37 +385,6 @@ namespace OHV.Module.Interactivity.PopUp
             this.SelectDirection = obj.ToString();
         }
 
-        private void ExecuteSteeringCCWCommand( object obj )
-        {
-            var msg = new DriveControlEventArgs
-            {
-                EventDir = DriveControlEventArgs.eEventDir.ToBack,
-                ControlKind = DriveControlEventArgs.eControlKind.Steering,
-            };
-
-            if ( obj.ToString().Equals( "CCW" ) )
-                msg.MoveDir = DriveControlEventArgs.eMoveDir.RIGHT;
-            else
-                msg.MoveDir = DriveControlEventArgs.eMoveDir.LEFT;
-
-            this.PublishEvent( msg );
-        }
-
-        private void ExecuteSteeringCWCommand( object obj )
-        {
-            var msg = new DriveControlEventArgs
-            {
-                EventDir = DriveControlEventArgs.eEventDir.ToBack,
-                ControlKind = DriveControlEventArgs.eControlKind.Steering,
-            };
-
-            if ( obj.ToString().Equals( "CW" ) )
-                msg.MoveDir = DriveControlEventArgs.eMoveDir.LEFT;
-            else
-                msg.MoveDir = DriveControlEventArgs.eMoveDir.RIGHT;
-
-            this.PublishEvent( msg );
-        }
 
         private void ExecutePositionSaveCommand()
         {