병합, SteeringView, BatteryConfigView Add

Dev/OHV/OHV.Module.Interactivity/MessageController.cs

@@ -33,6 +33,7 @@ namespace OHV.Module.Interactivity
             containerRegistry.RegisterDialog<InOutView , InOutViewModel>();
             containerRegistry.RegisterDialog<DriveServoView , DriveServoViewModel>();
             containerRegistry.RegisterDialog<LockServoView , LockServoViewModel>();
+            containerRegistry.RegisterDialog<BatteryConfigView , BatteryConfigViewModel>();
         }
 
         public void ShowNotificationView( string Message , bool isOK = true )
@@ -72,5 +73,10 @@ namespace OHV.Module.Interactivity
         {
             this.dialogService.ShowDialog( "DriveServoView" , new DialogParameters() , null );
         }
+
+        public void ShowBatteryPopupView( )
+        {
+            this.dialogService.ShowDialog( "BatteryConfigView" , new DialogParameters() , null );
+        }
     }
 }

Dev/OHV/OHV.Module.Interactivity/MessageController.cs.rej

@@ -0,0 +1,21 @@
+diff a/Dev/OHV/OHV.Module.Interactivity/MessageController.cs b/Dev/OHV/OHV.Module.Interactivity/MessageController.cs	(rejected hunks)
+@@ -64,14 +64,19 @@
+             this.dialogService.ShowDialog( "InOutView" , new DialogParameters() , null );
+         }
+ 
+         public void ShowLockPopupView( )
+         {
+             this.dialogService.ShowDialog( "LockServoView" , new DialogParameters() , null );
+         }
+ 
+         public void ShowDrivePopupView( )
+         {
+             this.dialogService.ShowDialog( "DriveServoView" , new DialogParameters() , null );
+         }
++
++        public void ShowBatteryPopupView()
++        {
++            this.dialogService.ShowDialog( "BatteryConfigView" , new DialogParameters() , null );
++        }
+     }
+ }

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

@@ -36,6 +36,9 @@
     <Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
+    <Reference Include="GSG.NET.WPF">
+      <HintPath>C:\Users\user\Desktop\새 폴더 (3)\OHV\Assambly\GSG.NET.WPF.dll</HintPath>
+    </Reference>
     <Reference Include="MaterialDesignColors, Version=1.2.2.920, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MaterialDesignColors.1.2.2\lib\net45\MaterialDesignColors.dll</HintPath>
     </Reference>
@@ -87,6 +90,9 @@
     <Compile Include="PopUp\BatteryConfigView.xaml.cs">
       <DependentUpon>BatteryConfigView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="PopUp\BatteryConfigViewModel.cs">
+      <DependentUpon>BatteryConfigView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="PopUp\CalcuratorView.xaml.cs">
       <DependentUpon>CalcuratorView.xaml</DependentUpon>
     </Compile>
@@ -123,6 +129,10 @@
     <Compile Include="PopUp\ServoConfigViewModel.cs">
       <DependentUpon>ServoConfigView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="PopUp\SteeringConfigView.xaml.cs">
+      <DependentUpon>SteeringConfigView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="PopUp\SteeringConfigViewModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -166,15 +176,15 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="PopUp\SteeringConfigView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\GSG\GSG\GSG.NET.WPF\GSG.NET.WPF.csproj">
-      <Project>{6b91fca2-0a26-41d5-8959-a6f27645dacd}</Project>
-      <Name>GSG.NET.WPF</Name>
-    </ProjectReference>
     <ProjectReference Include="..\OHV.Common\OHV.Common.csproj">
       <Project>{0d1f7fbc-bfb0-4ee4-852d-e2a8d62c5708}</Project>
       <Name>OHV.Common</Name>

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

@@ -0,0 +1,30 @@
+diff a/Dev/OHV/OHV.Module.Interactivity/OHV.Module.Interactivity.csproj b/Dev/OHV/OHV.Module.Interactivity/OHV.Module.Interactivity.csproj	(rejected hunks)
+@@ -27,24 +27,28 @@
+   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+     <DebugType>pdbonly</DebugType>
+     <Optimize>true</Optimize>
+     <OutputPath>bin\Release\</OutputPath>
+     <DefineConstants>TRACE</DefineConstants>
+     <ErrorReport>prompt</ErrorReport>
+     <WarningLevel>4</WarningLevel>
+   </PropertyGroup>
+   <ItemGroup>
+     <Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+       <HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net45\CommonServiceLocator.dll</HintPath>
+     </Reference>
++    <Reference Include="GSG.NET.WPF, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
++      <SpecificVersion>False</SpecificVersion>
++      <HintPath>C:\Users\user\Desktop\새 폴더 (3)\OHV\Assambly\GSG.NET.WPF.dll</HintPath>
++    </Reference>
+     <Reference Include="MaterialDesignColors, Version=1.2.2.920, Culture=neutral, processorArchitecture=MSIL">
+       <HintPath>..\packages\MaterialDesignColors.1.2.2\lib\net45\MaterialDesignColors.dll</HintPath>
+     </Reference>
+     <Reference Include="MaterialDesignThemes.Wpf, Version=3.0.1.920, Culture=neutral, processorArchitecture=MSIL">
+       <HintPath>..\packages\MaterialDesignThemes.3.0.1\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
+     </Reference>
+     <Reference Include="PresentationCore" />
+     <Reference Include="PresentationFramework" />
+     <Reference Include="Prism, Version=7.2.0.1422, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
+       <HintPath>..\packages\Prism.Core.7.2.0.1422\lib\net45\Prism.dll</HintPath>
+     </Reference>
+     <Reference Include="Prism.Wpf, Version=7.2.0.1422, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">

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

@@ -50,22 +50,24 @@
                         <RowDefinition/>
                     </Grid.RowDefinitions>
 
-                    <Grid Grid.Row="0">
-                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
-                            <StackPanel Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center">
-                                <Button Content="Version" Margin="3" IsEnabled="False"/>
-                                <Button Content="LifeTime" Margin="3" IsEnabled="False"/>
-                            </StackPanel>
+                    <StackPanel Grid.Row="0" Orientation="Horizontal" 
+                                VerticalAlignment="Center" HorizontalAlignment="Left"
+                                Margin=" 25">
+                        <StackPanel Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center">
+                            <Button Content="Version" Margin="3" IsEnabled="False"/>
+                            <Button Content="LifeTime" Margin="3" IsEnabled="False"/>
+                        </StackPanel>
 
-                            <StackPanel Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center">
-                                <Button Content="1.0.0.01" Margin="3" Background="{x:Null}"/>
-                                <Button Content="yyyy-MM-dd" Margin="3" Background="{x:Null}"/>
-                            </StackPanel>
+                        <StackPanel Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center">
+                            <Button Content="1.0.0.01" Margin="3" Background="{x:Null}"/>
+                            <Button Content="yyyy-MM-dd" Margin="3" Background="{x:Null}"/>
                         </StackPanel>
-                    </Grid>
+                    </StackPanel>
                     
                     <!--Send Message Buttons-->
-                    <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
+                    <StackPanel Grid.Row="1" Orientation="Horizontal" 
+                                VerticalAlignment="Center" HorizontalAlignment="Left"
+                                Margin="25">
                         <Button Margin="5">
                             <StackPanel>
                                 <TextBlock Text="MSG1"/>
@@ -99,7 +101,13 @@
                 </Grid>
 
                 <Grid Grid.Row="1">
-
+                    <StackPanel VerticalAlignment="Top">
+                        <GroupBox
+                            Margin="30,0,20,0"
+                            Header="Data Receive" FontSize="15">
+                            <TextBox Text="{Binding BatteryReceive, FallbackValue=[Receive] : xxxxx}"/>
+                        </GroupBox>
+                    </StackPanel>
                 </Grid>
             </Grid>
         </Grid>

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

@@ -0,0 +1,86 @@
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace OHV.Module.Interactivity.PopUp
+{
+    public class BatteryConfigViewModel : BindableBase, IDialogAware
+    {
+        private DelegateCommand<string> _closeDialogCommand;
+        public DelegateCommand<string> CloseDialogCommand =>
+            _closeDialogCommand ?? ( _closeDialogCommand = new DelegateCommand<string>( CloseDialog ) );
+
+        private string _title = "BatteryConfigView";
+        public string Title
+        {
+            get { return this._title; }
+            set
+            {
+                this.SetProperty( ref this._title , value );
+            }
+        }
+
+        public event Action<IDialogResult> RequestClose;
+
+        public ICommand BatteryOpenCommand { get; set; }
+        public ICommand BatteryCloseCommand { get; set; }
+
+        IEventAggregator eventAggregator = null;
+        public BatteryConfigViewModel( IEventAggregator _ea )
+        {
+            this.eventAggregator = _ea;
+
+            this.BatteryOpenCommand = new DelegateCommand( ExecuteOpenCommand );
+            this.BatteryCloseCommand = new DelegateCommand( ExecuteCloseCommand );
+        }
+
+        private void ExecuteCloseCommand( )
+        {
+            //throw new NotImplementedException();
+        }
+
+        private void ExecuteOpenCommand( )
+        {
+            //throw new NotImplementedException();
+        }
+
+        #region Dialog
+        public bool CanCloseDialog( )
+        {
+            return true;
+        }
+
+        public void OnDialogClosed( )
+        {
+        }
+
+        public void OnDialogOpened( IDialogParameters parameters )
+        {
+        }
+
+        private void CloseDialog( string parameter )
+        {
+            ButtonResult result = ButtonResult.None;
+
+            if ( parameter?.ToLower() == "true" )
+                result = ButtonResult.OK;
+            else if ( parameter?.ToLower() == "false" )
+                result = ButtonResult.Cancel;
+
+            RaiseRequestClose( new DialogResult( result ) );
+        }
+
+        public virtual void RaiseRequestClose( IDialogResult dialogResult )
+        {
+            RequestClose?.Invoke( dialogResult );
+        }
+        #endregion
+    }
+}

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

@@ -15,7 +15,6 @@ namespace OHV.Module.Interactivity.PopUp
 {
     public class LockServoViewModel : BindableBase, IDialogAware
     {
-
         private DelegateCommand<string> _closeDialogCommand;
         public DelegateCommand<string> CloseDialogCommand =>
             _closeDialogCommand ?? (_closeDialogCommand = new DelegateCommand<string>(CloseDialog));
@@ -127,9 +126,6 @@ namespace OHV.Module.Interactivity.PopUp
             this.eventAggregator = ea;
             this.eventAggregator.GetEvent<AxisControlPubSubEvent>().Unsubscribe(UICallbackCommunication);
             this.eventAggregator.GetEvent<AxisControlPubSubEvent>().Subscribe(UICallbackCommunication, ThreadOption.UIThread);
-
-
-
         }
 
         private void ExecuteJogCommand(object obj)
@@ -146,7 +142,7 @@ namespace OHV.Module.Interactivity.PopUp
             else
                 msg.JogDir = AxisControlEventArgs.eJogMoveDir.Negative;
 
-            PublishEvent(msg);
+            this.PublishEvent(msg);
         }
 
         void PublishEvent(AxisControlEventArgs args)

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

@@ -0,0 +1,83 @@
+ <UserControl x:Class="OHV.Module.Interactivity.PopUp.SteeringConfigView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:OHV.Module.Interactivity.PopUp"
+             xmlns:prism="http://prismlibrary.com/"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             mc:Ignorable="d" 
+             Width="800"
+             Height="600"
+             Background="#455a64">
+
+    <prism:Dialog.WindowStyle>
+        <Style TargetType="Window">
+            <Setter Property="prism:Dialog.WindowStartupLocation" Value="CenterScreen" />
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="AllowsTransparency" Value="True"/>
+            <Setter Property="ResizeMode" Value="NoResize"/>
+            <Setter Property="WindowStyle" Value="None"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource BorderSolidNormal}"/>
+            <Setter Property="Template" Value="{DynamicResource WindowTemplateKey}"/>
+
+            <!--<Style.Triggers>
+                <Trigger Property="ResizeMode" Value="CanResizeWithGrip">
+                    <Setter Property="Template" Value="{StaticResource WindowTemplateKey}"/>
+                </Trigger>
+            </Style.Triggers>-->
+        </Style>
+    </prism:Dialog.WindowStyle>
+
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="130"/>
+        </Grid.ColumnDefinitions>
+
+        <Grid Grid.Column="0" Margin="15" Background="#37474f">
+            <StackPanel>
+                <Border Margin="15" HorizontalAlignment="Left" VerticalAlignment="Bottom"
+                        Height="250"
+                        Width="250">
+                    <!--<Border.Background>
+                        --><!--<ImageBrush ImageSource="HokuyoReader.png"/>--><!--
+                    </Border.Background>-->
+                </Border>
+            </StackPanel>
+        </Grid>
+
+        <Grid Grid.Column="1" Background="#263238">
+            <Border Margin="1" BorderBrush="#FF00FFD3" BorderThickness="2" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
+            <StackPanel>
+                <Button Margin="5" HorizontalAlignment="Stretch" Height="69" 
+                        BorderBrush="Gray" BorderThickness="2" 
+                        Command="{Binding SteeringConnectCommand}" CommandParameter="true">
+                    <StackPanel>
+                        <!--<materialDesign:PackIcon Kind="ExitToApp" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="42" Width="auto"/>-->
+                        <TextBlock Text="Connect" VerticalAlignment="Stretch" HorizontalAlignment="Center" />
+                    </StackPanel>
+                </Button>
+
+                <Button Margin="5" HorizontalAlignment="Stretch" Height="69" 
+                        BorderBrush="Gray" BorderThickness="2" 
+                        Command="{Binding SteeringDisConnectCommand}" CommandParameter="true">
+                    <StackPanel>
+                        <!--<materialDesign:PackIcon Kind="ExitToApp" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="42" Width="auto"/>-->
+                        <TextBlock Text="Disonnect" VerticalAlignment="Stretch" HorizontalAlignment="Center" />
+                    </StackPanel>
+                </Button>
+
+                <Button Margin="5,50" HorizontalAlignment="Stretch" Height="Auto" BorderBrush="Gray" BorderThickness="2" 
+                        Command="{Binding CloseDialogCommand}" CommandParameter="true">
+                    <StackPanel>
+                        <materialDesign:PackIcon Kind="ExitToApp" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="42" Width="auto"/>
+                        <TextBlock Text="Close" VerticalAlignment="Stretch" HorizontalAlignment="Center" />
+                    </StackPanel>
+                </Button>
+            </StackPanel>
+        </Grid>
+    </Grid>
+</UserControl>

Dev/OHV/OHV.Module.Interactivity/PopUp/SteeringConfigView.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace OHV.Module.Interactivity.PopUp
+{
+    /// <summary>
+    /// SteeringConfigView.xaml에 대한 상호 작용 논리
+    /// </summary>
+    public partial class SteeringConfigView : UserControl
+    {
+        public SteeringConfigView( )
+        {
+            InitializeComponent();
+        }
+    }
+}

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

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OHV.Module.Interactivity.PopUp
+{
+    class SteeringConfigViewModel
+    {
+    }
+}

Dev/OHV/OHV.Module.MainViews/Views/UnitViewModel.cs

@@ -20,6 +20,7 @@ namespace OHV.Module.MainViews.Views
 
         public ICommand ServoConfigCommand { get; set; }
         public ICommand InoutPupup { get; set; }
+        public ICommand BatteryPopup { get; set; }
 
         public UnitViewModel( IEventAggregator _ea , VCSystem _vcSystem , MessageController _msgController )
         {
@@ -29,6 +30,12 @@ namespace OHV.Module.MainViews.Views
 
             this.ServoConfigCommand = new DelegateCommand( ExecuteServoConfigCommand );
             this.InoutPupup = new DelegateCommand( ExecuteInOutCommand );
+            this.BatteryPopup = new DelegateCommand( ExecuteBatteryCommand );
+        }
+
+        private void ExecuteBatteryCommand( )
+        {
+            this.msgController.ShowBatteryPopupView();
         }
 
         private void ExecuteInOutCommand( )

Dev/OHV/OHV.Vehicle/Logger.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Prism.Logging;
+using log4net;
+
+namespace OHV.Vehicle
+{
+    public class Log4NetLogger : ILoggerFacade
+    {
+        // Member variables
+        private readonly ILog m_Logger = LogManager.GetLogger(typeof(Log4NetLogger));
+
+        public void Log(string message, Category category, Priority priority)
+        {
+            switch (category)
+            {
+                case Category.Debug:
+                    m_Logger.Debug(message);
+                    break;
+                case Category.Warn:
+                    m_Logger.Warn(message);
+                    break;
+                case Category.Exception:
+                    m_Logger.Error(message);
+                    break;
+                case Category.Info:
+                    m_Logger.Info(message);
+                    break;
+            }
+        }
+
+    }
+}

Dev/OHV/OHV.Vehicle/OHV.Vehicle.csproj

@@ -147,6 +147,7 @@
       <DependentUpon>D_MainWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="Helpler\DeskTopInfo.cs" />
+    <Compile Include="Logger.cs" />
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>