Pull Merge

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

@@ -123,6 +123,9 @@
     <Compile Include="PopUp\MapViewModel.cs">
       <DependentUpon>MapView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="PopUp\OpticalReadingConfigViewModel.cs">
+      <DependentUpon>OpticalReadingConfigView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="PopUp\ServoConfigView.xaml.cs">
       <DependentUpon>ServoConfigView.xaml</DependentUpon>
     </Compile>
@@ -131,6 +134,8 @@
     </Compile>
     <Compile Include="PopUp\SteeringConfigView.xaml.cs">
       <DependentUpon>SteeringConfigView.xaml</DependentUpon>
+    <Compile Include="PopUp\OpticalReadingConfigView.xaml.cs">
+      <DependentUpon>OpticalReadingConfigView.xaml</DependentUpon>
     </Compile>
     <Compile Include="PopUp\SteeringConfigViewModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -177,6 +182,7 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="PopUp\SteeringConfigView.xaml">
+    <Page Include="PopUp\OpticalReadingConfigView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

Dev/OHV/OHV.Vehicle/Concept/D_MainWindow.xaml

@@ -197,6 +197,11 @@
                                 </StackPanel>
                             </Button>
                             <Button Content="1TB" Margin="0,5,0,0" Background="{x:Null}"/>
+                            <Button Margin="0,5,0,0" Background="{x:Null}">
+                                <StackPanel>
+                                    <TextBlock Text="{Binding CDrive, StringFormat={}{0:0} GB}" HorizontalAlignment="Center"/>
+                                </StackPanel>
+                            </Button>
                         </StackPanel>
                     </StackPanel>
                 </Grid>

Dev/OHV/OHV.Vehicle/Concept/D_MainWindowViewModel.cs

@@ -53,6 +53,13 @@ namespace OHV.Vehicle.Concept
             set { this.SetProperty( ref this._ram , value ); }
         }
 
+        private double _cDrive;
+        public double CDrive
+        {
+            get { return this._cDrive; }
+            set { this.SetProperty( ref this._cDrive , value ); }
+        }
+
         DateTime _dateTime;
         public DateTime DateTime
         {