merge

1 files changed, 0 insertions, 58 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
index 600104095..e69ac516e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
@@ -19,8 +19,6 @@
         <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter"></converters:BooleanToVisibilityInverseConverter>
         <converters:BooleanInverseConverter x:Key="BooleanInverseConverter"></converters:BooleanInverseConverter>
         <converters:ByteArrayToFileSizeConverter x:Key="ByteArrayToFileSizeConverter" />
-        <converters:GenericMessageProtocolToStringConverter x:Key="GenericMessageProtocolToStringConverter" />
-        <converters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter" />
     </UserControl.Resources>
 
     <Grid>
@@ -34,10 +32,6 @@
                 <StackPanel Orientation="Horizontal" Margin="10">
                     <ContentControl Content="{Binding ApplicationManager.ConnectedMachine}">
                         <ContentControl.Resources>
-                            <DataTemplate DataType="{x:Type integration:ExternalBridgeSignalRClient}">
-                                <Image Source="/Images/external-bridge-signalr.png" Width="48" Height="48" RenderOptions.BitmapScalingMode="Fant"></Image>
-                            </DataTemplate>
-
                             <DataTemplate DataType="{x:Type integration:ExternalBridgeTcpClient}">
                                 <Image Source="/Images/external-bridge-tcp.png" Width="48" Height="48" RenderOptions.BitmapScalingMode="Fant"></Image>
                             </DataTemplate>
@@ -71,54 +65,6 @@
                 <Grid d:DataContext="{d:DesignInstance Type=integ:MachineOperator, IsDesignTimeCreatable=False}">
                     <ContentControl Content="{Binding ApplicationManager.ConnectedMachine}">
                         <ContentControl.Resources>
-
-                            <DataTemplate DataType="{x:Type integration:ExternalBridgeSignalRClient}">
-                                <controls:TableGrid RowHeight="22">
-                                    <TextBlock FontWeight="SemiBold" Text="Serial Number:" />
-                                    <TextBlock Text="{Binding SerialNumber}" />
-                                    <TextBlock FontWeight="SemiBold" Text="Name:" />
-                                    <TextBlock Text="{Binding Machine.Name}" />
-                                    <TextBlock FontWeight="SemiBold" Text="Organization:" />
-                                    <TextBlock Text="{Binding Machine.Organization.Name}" />
-                                    <TextBlock FontWeight="SemiBold" Text="Total Dye Time:" />
-                                    <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.TotalMachineWorkTime}" />
-                                    <TextBlock FontWeight="SemiBold" Text="Total Dye Meters:" />
-                                    <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.TotalMachineMeters}" />
-                                    <TextBlock FontWeight="SemiBold" Text="Embedded Software Version:" />
-                                    <TextBlock Text="{Binding DeviceInformation.Version}" />
-                                    <TextBlock FontWeight="SemiBold" Text="Address:" />
-                                    <TextBlock Text="{Binding Adapter.Address}" />
-                                    <TextBlock FontWeight="SemiBold" Text="Total Bytes Sent:" />
-                                    <TextBlock Text="{Binding Adapter.TotalBytesSent,Converter={StaticResource ByteArrayToFileSizeConverter},Mode=OneWay}" />
-                                    <TextBlock FontWeight="SemiBold" Text="Total Bytes Received:" />
-                                    <TextBlock Text="{Binding Adapter.TotalBytesReceived,Converter={StaticResource ByteArrayToFileSizeConverter},Mode=OneWay}" />
-                                    <TextBlock FontWeight="SemiBold" Text="Transfer Rate:" />
-                                    <TextBlock>
-                                        <Run Text="{Binding Adapter.TransferRate,Converter={StaticResource ByteArrayToFileSizeConverter},Mode=OneWay}"></Run>
-                                        <Run Text="/ sec"></Run>
-                                    </TextBlock>
-                                    <TextBlock FontWeight="SemiBold" Text="Compression:" />
-                                    <TextBlock Text="{Binding Adapter.EnableCompression,Mode=OneWay,Converter={StaticResource BooleanToYesNoConverter}}" />
-                                    <TextBlock FontWeight="SemiBold" Text="Generic Protocol:" />
-                                    <TextBlock Text="{Binding GenericProtocol,Mode=OneWay,Converter={StaticResource GenericMessageProtocolToStringConverter}}" />
-                                    <TextBlock FontWeight="SemiBold" Text="Diagnostics Frame Rate:" />
-                                    <TextBlock>
-                                        <Run Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.DiagnosticsFrameProvider.FrameRate,Mode=OneWay,IsAsync=True}"></Run>
-                                        <Run Text="/ sec"></Run>
-                                    </TextBlock>
-                                    <TextBlock FontWeight="SemiBold" Text="Enable Diagnostics:" />
-                                    <ToggleButton IsChecked="{Binding EnableDiagnostics}" HorizontalAlignment="Left"></ToggleButton>
-                                    <TextBlock FontWeight="SemiBold" Text="Enable Embedded Debug Logs:" />
-                                    <ToggleButton IsChecked="{Binding EnableEmbeddedDebugging}" HorizontalAlignment="Left"></ToggleButton>
-                                    <TextBlock FontWeight="SemiBold" Text="Enable KeepAlive:" />
-                                    <ToggleButton IsChecked="{Binding UseKeepAlive}" HorizontalAlignment="Left"></ToggleButton>
-                                    <TextBlock FontWeight="SemiBold" Text="Enable Events:" />
-                                    <ToggleButton IsChecked="{Binding EnableEventsNotification}" HorizontalAlignment="Left"></ToggleButton>
-                                    <TextBlock FontWeight="SemiBold" Text="Enable Application Logs:" />
-                                    <ToggleButton IsChecked="{Binding EnableApplicationLogs}" HorizontalAlignment="Left"></ToggleButton>
-                                </controls:TableGrid>
-                            </DataTemplate>
-
                             <DataTemplate DataType="{x:Type integration:ExternalBridgeTcpClient}">
                                 <controls:TableGrid RowHeight="22">
                                     <TextBlock FontWeight="SemiBold" Text="Serial Number:" />
@@ -144,10 +90,6 @@
                                         <Run Text="{Binding Adapter.TransferRate,Converter={StaticResource ByteArrayToFileSizeConverter},Mode=OneWay}"></Run>
                                         <Run Text="/ sec"></Run>
                                     </TextBlock>
-                                    <TextBlock FontWeight="SemiBold" Text="Compression:" />
-                                    <TextBlock Text="{Binding Adapter.EnableCompression,Mode=OneWay,Converter={StaticResource BooleanToYesNoConverter}}" />
-                                    <TextBlock FontWeight="SemiBold" Text="Generic Protocol:" />
-                                    <TextBlock Text="{Binding GenericProtocol,Mode=OneWay,Converter={StaticResource GenericMessageProtocolToStringConverter}}" />
                                     <TextBlock FontWeight="SemiBold" Text="Diagnostics Frame Rate:" />
                                     <TextBlock>
                                         <Run Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.DiagnosticsFrameProvider.FrameRate,Mode=OneWay,IsAsync=True}"></Run>