Pull merge

Dev/OHV/OHV.Module.Interactivity/OHV.Module.Interactivity.csproj

@@ -42,6 +42,10 @@
     <Reference Include="FluentResults">
       <HintPath>..\Assambly\FluentResults.dll</HintPath>
     </Reference>
+    <Reference Include="GSG.NET, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Assambly\GSG.NET.dll</HintPath>
+    </Reference>
     <Reference Include="GSG.NET.WPF, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Assambly\GSG.NET.WPF.dll</HintPath>

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

@@ -17,7 +17,6 @@ using System.Windows.Media;
 
 namespace OHV.Module.Interactivity.PopUp
 {
-    //Todo: DataGrid Scroll 동작 수정 필요.
     public class DriveServoViewModel : BindableBase, IDialogAware
     {
         private DelegateCommand<string> _closeDialogCommand;
@@ -56,7 +55,7 @@ namespace OHV.Module.Interactivity.PopUp
         public double DriveTargetPos
         {
             get { return this._driveTargetPos; }
-            set { this.SetProperty(ref this._driveTargetPos, value); }
+            set { this.SetProperty(ref this._driveTargetPos , value); }
         }
 
         private double _currentDrive;
@@ -126,13 +125,6 @@ namespace OHV.Module.Interactivity.PopUp
             set { SetProperty(ref this._routeList, value); }
         }
 
-        private Route selectedRoute;
-        public Route SelectedRoute
-        {
-            get { return selectedRoute; }
-            set { SetProperty(ref this.selectedRoute, value); }
-        }
-
         public SqliteDAL.DAL.AxisPositionDataDAL axisPositionDataDal;
         SqliteManager sql;
         MessageController messageController;
@@ -140,11 +132,11 @@ namespace OHV.Module.Interactivity.PopUp
         public DriveServoViewModel(IEventAggregator _ea, SqliteManager _sql, MessageController _messageController)
         {
             this.eventAggregator = _ea;
-            this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Unsubscribe(DriveControlCallBack);
-            this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Subscribe(DriveControlCallBack, ThreadOption.UIThread);
+            this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Unsubscribe( DriveControlCallBack );
+            this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Subscribe( DriveControlCallBack , ThreadOption.UIThread );
 
-            this.eventAggregator.GetEvent<GUIMessagePubSubEvent>().Unsubscribe(UICallBackCommunication);
-            this.eventAggregator.GetEvent<GUIMessagePubSubEvent>().Subscribe(UICallBackCommunication, ThreadOption.UIThread);
+            this.eventAggregator.GetEvent<GUIMessagePubSubEvent>().Unsubscribe( UICallBackCommunication );
+            this.eventAggregator.GetEvent<GUIMessagePubSubEvent>().Subscribe( UICallBackCommunication , ThreadOption.UIThread );
 
             this.sql = _sql;
             this.RouteList = new ObservableCollection<Route>(sql.RouteDal.All);
@@ -173,18 +165,18 @@ namespace OHV.Module.Interactivity.PopUp
             this.JogCommand = new DelegateCommand<object>(ExecuteJogCommand);
         }
 
-        private void UICallBackCommunication(GUIMessageEventArgs obj)
+        private void UICallBackCommunication( GUIMessageEventArgs obj )
         {
-            if ( obj.Kind == GUIMessageEventArgs.eGUIMessageKind.ModelPropertyChange)
+            if ( obj.Kind == GUIMessageEventArgs.eGUIMessageKind.ModelPropertyChange )
             {
-                if (obj.MessageKey.Equals(MessageKey.Vehicle))
+                if ( obj.MessageKey.Equals( MessageKey.Vehicle ) )
                 {
-                    switch (obj.ModelPropertyName )
+                    switch ( obj.ModelPropertyName )
                     {
                         case "SteeringState":
                             {
-                                var dir = CastTo<eSteeringState>.From<object>(obj.Args);
-                                this.ChangeSteeringDirection(dir);
+                                var dir = CastTo<eSteeringState>.From<object>( obj.Args );
+                                this.ChangeSteeringDirection( dir );
                             }
                             break;
                         default:
@@ -194,13 +186,13 @@ namespace OHV.Module.Interactivity.PopUp
             }
         }
 
-        private void DriveControlCallBack(DriveControlEventArgs args)
+        private void DriveControlCallBack( DriveControlEventArgs args)
         {
             //TODO:[20/03/19 ys-hwang] Drive UI return msg popup
 
             if (args.EventDir == DriveControlEventArgs.eEventDir.ToFront)
             {
-                switch (args.ControlKind)
+                switch ( args.ControlKind )
                 {
                     case DriveControlEventArgs.eControlKind.MOVE:
                         ResponseMove(args);
@@ -208,19 +200,19 @@ namespace OHV.Module.Interactivity.PopUp
                     case DriveControlEventArgs.eControlKind.STOP:
                         break;
                     case DriveControlEventArgs.eControlKind.Steering:
-                        //if (args.Result.IsSuccess)
+                        //if ( args.Result.IsSuccess )
                         //{
                         //    var dir = args.Result.ToResult<DriveControlEventArgs.eMoveDir>().Value;
-                        //    this.ChangeSteeringDirection(dir == DriveControlEventArgs.eMoveDir.LEFT ? true : false);
+                        //    this.ChangeSteeringDirection( dir == DriveControlEventArgs.eMoveDir.LEFT ? true : false );
                         //}
-                        //break;
+                        break;
                     case DriveControlEventArgs.eControlKind.SteeringState:
-                        //if (args.Result.IsSuccess)
+                        //if ( args.Result.IsSuccess )
                         //{
                         //    var dir = args.Result.ToResult<DriveControlEventArgs.eMoveDir>().Value;
-                        //    this.ChangeSteeringDirection(dir == DriveControlEventArgs.eMoveDir.LEFT ? true : false);
+                        //    this.ChangeSteeringDirection( dir == DriveControlEventArgs.eMoveDir.LEFT ? true : false );
                         //}
-                        //break;
+                        break;
                     case DriveControlEventArgs.eControlKind.ReqCurrentPos:
                         this.CurrentDrive = args.CurrentPosition;
                         break;
@@ -264,15 +256,15 @@ namespace OHV.Module.Interactivity.PopUp
 
         void ChangeSteeringDirection(eSteeringState state)
         {
-            if (state == eSteeringState.Left)
+            if ( state == eSteeringState.Left )
             {
-                this.SteeringLeftBrushProperty = (System.Windows.Media.Brush)new System.Windows.Media.BrushConverter().ConvertFromString("#FF00FFD3");
+                this.SteeringLeftBrushProperty = ( System.Windows.Media.Brush )new System.Windows.Media.BrushConverter().ConvertFromString( "#FF00FFD3" );
                 this.SteeringRightBrushProperty = Brushes.Gray;
             }
-            else if (state == eSteeringState.Right)
+            else if ( state == eSteeringState.Right )
             {
                 this.SteeringLeftBrushProperty = Brushes.Gray;
-                this.SteeringRightBrushProperty = (System.Windows.Media.Brush)new System.Windows.Media.BrushConverter().ConvertFromString("#FF00FFD3");
+                this.SteeringRightBrushProperty = ( System.Windows.Media.Brush )new System.Windows.Media.BrushConverter().ConvertFromString( "#FF00FFD3" );
             }
             else
             {
@@ -290,12 +282,12 @@ namespace OHV.Module.Interactivity.PopUp
                 ControlKind = DriveControlEventArgs.eControlKind.JOG,
             };
 
-            if (obj.ToString().Equals("+"))
+            if ( obj.ToString().Equals( "+" ) )
                 msg.JogDir = DriveControlEventArgs.eJogMoveDir.Positive;
             else
                 msg.JogDir = DriveControlEventArgs.eJogMoveDir.Negative;
 
-            this.PublishEvent(msg);
+            this.PublishEvent( msg );
         }
 
         private void ExecuteJogVelPopupCommand()
@@ -344,47 +336,36 @@ namespace OHV.Module.Interactivity.PopUp
         }
 
         private void ExecutePositionSaveCommand()
-        {
+        { 
             this.messageController.ShowConfirmationPopupView("Save To Data ?", r =>
             {
-                if (r.Result == ButtonResult.OK)
-                {
-                    var ll = this.RouteList.ToList();
-                    ll.ForEach(x =>
-                    {
-                        var route = sql.RouteDal.GetK(x.Id);
-                        if (route == null) //DB 에 없다고 판단 추가
-                            sql.RouteDal.Add(x);
-                        else //Update
-                            sql.RouteDal.Update(x);
-                    });
-                    this.RefreshRouteList();
-                }
+              if (r.Result == ButtonResult.OK)
+              {
+                    //TODO:[20/03/18 ys-hwang] DB Table Update
+              }
             });
         }
 
         private void ExecutePositionDeleteCommand()
         {
-            this.messageController.ShowConfirmationPopupView("Select To Delete ?", r =>
-          {
-              if (r.Result == ButtonResult.OK)
-              {
-                  var deleteList = new List<Route>();
-
-                  foreach (var item in this.RouteList)
-                  {
-                      if (item.IsSelected)
-                          deleteList.Add(item);
-                  }
-                  deleteList.ForEach(x => { this.RouteList.Remove(x); });
-              }
-              this.RefreshRouteList();
-          });
+            this.messageController.ShowConfirmationPopupView( "Select To Delete ?" , r =>
+            {
+                if ( r.Result == ButtonResult.OK )
+                {
+                    var deleteList = new List<Route>();
+
+                    foreach ( var item in this.RouteList )
+                    {
+                        if ( item.IsSelected )
+                            deleteList.Add( item );
+                    }
+                    deleteList.ForEach( x => { this.RouteList.Remove( x ); } );
+                }
+            } );
         }
 
         private void ExecutePositionAddCommand()
         {
-<<<<<<< HEAD
             this.messageController.ShowConfirmationPopupView( "Position Add ?" , r =>
             {
                 if ( r.Result == ButtonResult.OK )
@@ -394,82 +375,72 @@ namespace OHV.Module.Interactivity.PopUp
                     this.messageController.ShowNotificationView( "Create Success" );
                 }
             } );
-=======
-            this.messageController.ShowConfirmationPopupView("Position Add ?", r =>
-          {
-              if (r.Result == ButtonResult.OK)
-              {
-                  this.RouteList.Add(new Route());
-              }
-          });
->>>>>>> f2b1b12e8c9f7450e1cbe9e6d15261074bce9945
         }
 
         private void ExecuteKeyInCommadn(object obj)
         {
             var numPad = new CalcuratorView();
-            var result = numPad.ShowDialog(this.DriveTargetPos);
+            var result = numPad.ShowDialog(this.DriveTargetPos );
             this.DriveTargetPos = result;
         }
 
         private void ExecuteOriginCommand()
         {
-            this.messageController.ShowConfirmationPopupView("Origin ?", r =>
-          {
-              if (r.Result == ButtonResult.OK)
-              {
+            this.messageController.ShowConfirmationPopupView( "Origin ?" , r =>
+            {
+                if ( r.Result == ButtonResult.OK )
+                {
                     //TODO: How to use
                 }
-          });
+            } );
         }
 
         private void ExecuteFaultResetCommand()
         {
             var msg = new DriveControlEventArgs
             {
-                EventDir = DriveControlEventArgs.eEventDir.ToBack,
-                ControlKind = DriveControlEventArgs.eControlKind.FaultReset,
+                EventDir = DriveControlEventArgs.eEventDir.ToBack ,
+                ControlKind = DriveControlEventArgs.eControlKind.FaultReset ,
             };
 
-            this.PublishEvent(msg);
+            this.PublishEvent( msg );
         }
 
         private void ExecuteServoOffCommand()
         {
             var msg = new DriveControlEventArgs
             {
-                EventDir = DriveControlEventArgs.eEventDir.ToBack,
-                ControlKind = DriveControlEventArgs.eControlKind.DriveOFF,
+                EventDir = DriveControlEventArgs.eEventDir.ToBack ,
+                ControlKind = DriveControlEventArgs.eControlKind.DriveOFF ,
             };
 
-            this.PublishEvent(msg);
+            this.PublishEvent( msg );
         }
 
         private void ExecuteServoOnCommand()
         {
             var msg = new DriveControlEventArgs
             {
-                EventDir = DriveControlEventArgs.eEventDir.ToBack,
-                ControlKind = DriveControlEventArgs.eControlKind.DriveON,
+                EventDir = DriveControlEventArgs.eEventDir.ToBack ,
+                ControlKind = DriveControlEventArgs.eControlKind.DriveON ,
             };
 
-            this.PublishEvent(msg);
+            this.PublishEvent( msg );
         }
 
         private void ExecuteCurrentToTargetCommand()
         {
-            this.messageController.ShowConfirmationPopupView("Current To Target ?", r =>
-          {
-              if (r.Result == ButtonResult.OK)
-              {
-                  this.DriveTargetPos = this.CurrentDrive;
-              }
-          });
+            this.messageController.ShowConfirmationPopupView( "Current To Target ?" , r =>
+            {
+                if ( r.Result == ButtonResult.OK )
+                {
+                    this.DriveTargetPos = this.CurrentDrive;
+                }
+            } );
         }
 
         private void ExecuteMoveToCommand()
         {
-<<<<<<< HEAD
             this.messageController.ShowConfirmationPopupView( "Move To Pos ?" , r =>
             {
                 if ( r.Result == ButtonResult.OK )
@@ -480,21 +451,10 @@ namespace OHV.Module.Interactivity.PopUp
                         ControlKind = DriveControlEventArgs.eControlKind.MOVE ,
                         //PositionTag = 
                     };
-=======
-            this.messageController.ShowConfirmationPopupView("Move To Pos ?", r =>
-          {
-              if (r.Result == ButtonResult.OK)
-              {
-                  var msg = new DriveControlEventArgs
-                  {
-                      EventDir = DriveControlEventArgs.eEventDir.ToBack,
-                      ControlKind = DriveControlEventArgs.eControlKind.MOVE,
-                  };
->>>>>>> f2b1b12e8c9f7450e1cbe9e6d15261074bce9945
-
-                  this.PublishEvent(msg);
-              }
-          });
+
+                    this.PublishEvent( msg );
+                }
+            } );
         }
 
         private void ExecuteSelectPosCommand(object obj)
@@ -504,12 +464,6 @@ namespace OHV.Module.Interactivity.PopUp
 
         #endregion
 
-        void RefreshRouteList()
-        {
-            this.RouteList.Clear();
-            this.RouteList.AddRange(sql.RouteDal.All);
-        }
-
         #region Dialog Function
         public bool CanCloseDialog()
         {
@@ -518,8 +472,8 @@ namespace OHV.Module.Interactivity.PopUp
 
         public void OnDialogClosed()
         {
-            this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Publish(new DriveControlEventArgs { EventDir = DriveControlEventArgs.eEventDir.ToBack, ControlKind = DriveControlEventArgs.eControlKind.ReqStopCurrentPos });
-            this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Unsubscribe(DriveControlCallBack);
+            this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Publish( new DriveControlEventArgs { EventDir = DriveControlEventArgs.eEventDir.ToBack , ControlKind = DriveControlEventArgs.eControlKind.ReqStopCurrentPos } );
+            this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Unsubscribe( DriveControlCallBack );
         }
 
         public void OnDialogOpened(IDialogParameters parameters)
@@ -531,7 +485,7 @@ namespace OHV.Module.Interactivity.PopUp
             };
             this.PublishEvent(msg);
 
-            this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Publish(new DriveControlEventArgs { EventDir = DriveControlEventArgs.eEventDir.ToBack, ControlKind = DriveControlEventArgs.eControlKind.ReqCurrentPos });
+            this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Publish( new DriveControlEventArgs { EventDir = DriveControlEventArgs.eEventDir.ToBack , ControlKind = DriveControlEventArgs.eControlKind.ReqCurrentPos } );
         }
 
         private void CloseDialog(string parameter)

Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs

@@ -179,7 +179,6 @@ namespace VehicleControlSystem.ControlLayer
 
             this.eventAggregator = ea;
 
-<<<<<<< HEAD
             /*Drive*/
             this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Unsubscribe( ReceiveDriveControlEvent );
             this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Subscribe( ReceiveDriveControlEvent );
@@ -209,10 +208,6 @@ namespace VehicleControlSystem.ControlLayer
                         break;
                 }
             }
-=======
-            this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Unsubscribe(ReceiveDriveControlEvent);
-            this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Subscribe(ReceiveDriveControlEvent);
->>>>>>> f2b1b12e8c9f7450e1cbe9e6d15261074bce9945
         }
 
         private void ReceiveDriveControlEvent(DriveControlEventArgs _args)
@@ -272,12 +267,11 @@ namespace VehicleControlSystem.ControlLayer
             }
         }
 
-<<<<<<< HEAD
 
-        private void DriveControlEventPublish( DriveControlEventArgs args )
-=======
+
+        //private void DriveControlEventPublish( DriveControlEventArgs args ) { }
+
         private void DriveControlEventPublish(DriveControlEventArgs args)
->>>>>>> f2b1b12e8c9f7450e1cbe9e6d15261074bce9945
         {
             args.EventDir = DriveControlEventArgs.eEventDir.ToFront;
             this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Publish(args);
@@ -366,7 +360,6 @@ namespace VehicleControlSystem.ControlLayer
                 {
                     LockUtils.Wait(500);
 
-<<<<<<< HEAD
                      var msg = new DriveControlEventArgs
                      {
                          EventDir = DriveControlEventArgs.eEventDir.ToFront ,
@@ -375,16 +368,6 @@ namespace VehicleControlSystem.ControlLayer
                      };
                      
                      this.DriveControlEventPublish( msg );
-=======
-                    var msg = new DriveControlEventArgs
-                    {
-                        EventDir = DriveControlEventArgs.eEventDir.ToFront,
-                        ControlKind = DriveControlEventArgs.eControlKind.ReqCurrentPos,
-                         //CurrentPosition = drive.CurrentPosition,
-                     };
-
-                     //this.DriveControlEventPublish( msg );
->>>>>>> f2b1b12e8c9f7450e1cbe9e6d15261074bce9945
                  }
             });
 
@@ -412,11 +395,7 @@ namespace VehicleControlSystem.ControlLayer
 
             var msg = new DriveControlEventArgs
             {
-<<<<<<< HEAD
                 ControlKind = DriveControlEventArgs.eControlKind.DriveOFF
-=======
-
->>>>>>> f2b1b12e8c9f7450e1cbe9e6d15261074bce9945
             };
             msg.Result = Results.Ok("Drive On");