merge alarm handling from remote

1 files changed, 61 insertions, 17 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
index 2af5c37ec..e2bf7792d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
@@ -60,6 +60,7 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Speech" />
@@ -84,6 +85,10 @@
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Authentication\AuthenticationLoginResult.cs" />
+    <Compile Include="Controls\MachineView.xaml.cs">
+      <DependentUpon>MachineView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\WpfGraphControl.cs" />
     <Compile Include="Converters\UserRoleToBooleanConverter.cs" />
     <Compile Include="Converters\UserRoleToVisibilityConverter.cs" />
     <Compile Include="Web\LoginRequest.cs" />
@@ -97,11 +102,7 @@
     <Compile Include="Controls\HiveComboControl.xaml.cs">
       <DependentUpon>HiveComboControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\IRealTimeGraph.cs" />
     <Compile Include="Controls\LoadingPanel.cs" />
-    <Compile Include="Controls\RealTimeGraphControl.xaml.cs">
-      <DependentUpon>RealTimeGraphControl.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Controls\TableGrid.cs" />
     <Compile Include="Converters\PermissionToVisibilityConverter.cs" />
     <None Include="Converters\SecondsToGraphPointsConverter.cs" />
@@ -155,6 +156,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Controls\MachineView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Controls\MdiContainerControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -170,10 +175,6 @@
     <Compile Include="Navigation\INavigationManager.cs" />
     <Compile Include="Navigation\NavigationView.cs" />
     <Compile Include="Notifications\INotificationProvider.cs" />
-    <Page Include="Controls\RealTimeGraphControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Resources\GradientOffsetSlider.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -216,16 +217,12 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\SideChains\RealTimeGraphEx\RealTimeGraphEx.csproj">
-      <Project>{b9ae25d6-be35-492f-9079-21a7f3e6f7cc}</Project>
-      <Name>RealTimeGraphEx</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\SideChains\RealTimeGraphX.WPF\RealTimeGraphX.WPF.csproj">
-      <Project>{99d233c5-fee7-418e-9c25-d4584cb52e28}</Project>
+    <ProjectReference Include="..\..\SideChains\RealTimeGraphX-master\RealTimeGraphX.WPF\RealTimeGraphX.WPF.csproj">
+      <Project>{6b9774f7-960d-438e-ad81-c6b9be328d50}</Project>
       <Name>RealTimeGraphX.WPF</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\SideChains\RealTimeGraphX\RealTimeGraphX.csproj">
-      <Project>{6d55a3b8-46d3-493a-a143-aebd2b98d683}</Project>
+    <ProjectReference Include="..\..\SideChains\RealTimeGraphX-master\RealTimeGraphX\RealTimeGraphX.csproj">
+      <Project>{f13a489c-80ee-4cd0-bdd4-92d959215646}</Project>
       <Name>RealTimeGraphX</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\SideChains\Tango.AutoComplete\Tango.AutoComplete.csproj">
@@ -328,7 +325,54 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Images\android.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\app.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\application-firmware.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\cartridge.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\dispenser.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\embedded-software.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\embedded.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\formula.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\hardware.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\injection.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\liquid.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\machine-full-fx.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\mid-tank.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\tablet.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\tank.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\ti-tm4c129x.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>