Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

4 files changed, 53 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Modules/IStudioModuleLoader.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Modules/IStudioModuleLoader.cs
index cb9f1122f..1fd72c53a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Modules/IStudioModuleLoader.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Modules/IStudioModuleLoader.cs
@@ -23,6 +23,13 @@ namespace Tango.MachineStudio.Common.Modules
         ObservableCollection<IStudioModule> UserModules { get; }
 
         /// <summary>
+        /// Gets the studio module of type T if loaded.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        T GetStudioModule<T>() where T : IStudioModule;
+
+        /// <summary>
         /// Loads all available Machine Studio modules.
         /// </summary>
         void LoadModules();
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/INotificationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/INotificationProvider.cs
index 8161ce885..e1b6275bd 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/INotificationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/INotificationProvider.cs
@@ -21,6 +21,11 @@ namespace Tango.MachineStudio.Common.Notifications
         ObservableCollection<TaskItem> TaskItems { get; }
 
         /// <summary>
+        /// Gets the collection of active bar items.
+        /// </summary>
+        ObservableCollection<BarItem> BarItems { get; }
+
+        /// <summary>
         /// Gets the current displayed task item.
         /// </summary>
         TaskItem CurrentTaskItem { get; }
@@ -44,12 +49,32 @@ namespace Tango.MachineStudio.Common.Notifications
         TaskItem PushTaskItem(String message);
 
         /// <summary>
+        /// Creates and push a new bar item from the specified framework element.
+        /// </summary>
+        /// <param name="element">The element.</param>
+        /// <returns></returns>
+        BarItem PushBarItem(FrameworkElement element);
+
+        /// <summary>
+        /// Pushes the specified bar item.
+        /// </summary>
+        /// <param name="barItem">The bar item.</param>
+        /// <returns></returns>
+        BarItem PushBarItem(BarItem barItem);
+
+        /// <summary>
         /// Removed the specified task item from the queue.
         /// </summary>
         /// <param name="taskItem">The task item.</param>
         void PopTaskItem(TaskItem taskItem);
 
         /// <summary>
+        /// Removed the specified bar item.
+        /// </summary>
+        /// <param name="barItem">The bar item.</param>
+        void PopBarItem(BarItem barItem);
+
+        /// <summary>
         /// Creates a new instance of the specified View type and displays it as a modal dialog.
         /// </summary>
         /// <typeparam name="View">The type of the view.</typeparam>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs
index 33d6edb60..f03b250be 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs
@@ -15,3 +15,6 @@ using System.Windows;
                                       //(used if a resource is not found in the page,
                                       // app, or any theme specific resource dictionaries)
 )]
+
+//Friends With
+[assembly: InternalsVisibleTo("Tango.MachineStudio.UI")]
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 790c95cb5..ba4fbab84 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
@@ -83,7 +83,10 @@
     </Compile>
     <Compile Include="Controls\TableGrid.cs" />
     <Compile Include="Converters\SecondsToGraphPointsConverter.cs" />
+    <Compile Include="Diagnostics\DefaultDiagnosticsFrameProvider.cs" />
+    <Compile Include="Diagnostics\IDiagnosticsFrameProvider.cs" />
     <Compile Include="Helpers\GraphsHelper.cs" />
+    <Compile Include="Notifications\BarItem.cs" />
     <Compile Include="Notifications\DialogViewVM.cs" />
     <Compile Include="StudioApplication\IModuleRequestListener.cs" />
     <Compile Include="StudioApplication\IShutdownListener.cs" />
@@ -92,7 +95,10 @@
     <Compile Include="ExtensionMethods\IStudioMessageExtensions.cs" />
     <Compile Include="Messages\IStudioMessage.cs" />
     <Compile Include="Notifications\TaskItem.cs" />
+    <Compile Include="StudioModuleBase.cs" />
     <Compile Include="ValidationRules\Required.cs" />
+    <Compile Include="Video\DefaultVideoCaptureProvider.cs" />
+    <Compile Include="Video\IVideoCaptureProvider.cs" />
     <Page Include="Controls\HiveColorPickerControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -183,6 +189,10 @@
       <Project>{4206ac58-3b57-4699-8835-90bf6db01a61}</Project>
       <Name>Tango.Integration</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Tango.PMR\Tango.PMR.csproj">
+      <Project>{e4927038-348d-4295-aaf4-861c58cb3943}</Project>
+      <Name>Tango.PMR</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Tango.Settings\Tango.Settings.csproj">
       <Project>{d8f1ad85-526a-4f50-b6dc-d437af63d8d8}</Project>
       <Name>Tango.Settings</Name>
@@ -191,6 +201,14 @@
       <Project>{8491d07b-c1f6-4b62-a412-41b9fd2d6538}</Project>
       <Name>Tango.SharedUI</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Tango.Transport\Tango.Transport.csproj">
+      <Project>{74e700b0-1156-4126-be40-ee450d3c3026}</Project>
+      <Name>Tango.Transport</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Tango.Video\Tango.Video.csproj">
+      <Project>{9652f972-2bd1-4283-99cb-fc6240434c17}</Project>
+      <Name>Tango.Video</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file