Pull Merge

Dev/OHV/OHV.Module.Interactivity/PopUp/DriveServoView.xaml

@@ -73,9 +73,9 @@
 
             <!--Position Data Grid View-->
             <Grid Grid.Row="0" Background="#FF606E83">
-                <ScrollViewer Background="#FF4B5663" Foreground="White">
-                    <StackPanel>
-                        <TextBlock Foreground="White">Drive Point List</TextBlock>
+                <!--<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Foreground="White">Drive Point List</TextBlock>-->
+                <DockPanel>
+                    <!--<ScrollViewer Background="#FF4B5663" Foreground="White">-->
                         <DataGrid ItemsSource="{Binding RouteList}" CanUserSortColumns="True" CanUserAddRows="False" AutoGenerateColumns="False" materialDesign:DataGridAssist.CellPadding="13 8 8 8" 
                                   materialDesign:DataGridAssist.ColumnHeaderPadding="8" Background="{x:Null}" Foreground="White" IsSynchronizedWithCurrentItem="True" SelectedItem="{Binding SelectedRoute, Mode=TwoWay}"
                                   >
@@ -116,8 +116,9 @@
                                 <DataGridCheckBoxColumn Header="UsePIO" Binding="{Binding UsePIO}" EditingElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnEditingStyle}"></DataGridCheckBoxColumn>
                             </DataGrid.Columns>
                         </DataGrid>
-                    </StackPanel>
-                </ScrollViewer>
+                    <!--</ScrollViewer>-->
+                </DockPanel>
+
             </Grid>
 
             <!--Axis  Grid View-->

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

@@ -169,6 +169,7 @@ namespace OHV.Module.Interactivity.PopUp
         private void UICallBackCommunication( GUIMessageEventArgs obj )
         {
             //Property 상태가 바뀔때 마다 표현만 하면 된다?
+
             if ( obj.Kind == GUIMessageEventArgs.eGUIMessageKind.ModelPropertyChange )
             {
                 if ( obj.MessageKey.Equals( MessageKey.Vehicle ) )
@@ -181,7 +182,6 @@ namespace OHV.Module.Interactivity.PopUp
                                 this.ChangeSteeringDirection( dir );
                             }
                             break;
-<<<<<<< HEAD
                         case "VehicleStateProperty":
                             {
                                 var v = CastTo<eVehicleState>.From<object>( obj.Args );
@@ -189,14 +189,23 @@ namespace OHV.Module.Interactivity.PopUp
                             }
                             break;
                         case "ObstacleStateProperty":
+                            {
+                                var reply = CastTo<eObstacleState>.From<object>( obj.Args );
+                                this.ChangeObstacleState( reply );
+                            }
                             break;
-=======
                         case "CurrentPosition":
                             {
                                 var v = CastTo<double>.From<object>(obj.Args);
+                                this.CurrentDrive = v;
                             }
                             break;
->>>>>>> 944428eda961c69237f00f4b0ce920edb41b0a2e
+                        case "CurrentTag":
+                            break;
+                        case "CurrentSpeed":
+                            break;
+                        case "CurrentTorque":
+                            break;
                         default:
                             break;
                     }
@@ -204,6 +213,11 @@ namespace OHV.Module.Interactivity.PopUp
             }
         }
 
+        private void ChangeObstacleState( eObstacleState reply )
+        {
+            
+        }
+
         private void ChagneVehicleState( eVehicleState v )
         {
             //TODO:[20/03/20 ys-hwang] Vehicle Manual Move 할때? 상태를 보고 해야?, 아니면 Manual 이니까???? 
@@ -530,7 +544,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)