Adjustment for Twine X4 and FSE Remote Desktop.

4 files changed, 46 insertions, 10 deletions

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Controls/RemoteDesktopControl.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Controls/RemoteDesktopControl.xaml
index 4e6959e5b..da3cb101c 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Controls/RemoteDesktopControl.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Controls/RemoteDesktopControl.xaml
@@ -32,7 +32,19 @@
                         <Border.Background>
                             <ImageBrush ImageSource="{StaticResource FSE_PPC_Back}" />
                         </Border.Background>
-                        <Border Width="{Binding RelativeSource={RelativeSource Self},Path=ActualHeight,Converter={StaticResource MathOperatorConverter},ConverterParameter='/1.6',FallbackValue=500,TargetNullValue=500}">
+                        <Border>
+                            <Border.Style>
+                                <Style TargetType="Border">
+                                    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource Self},Path=ActualHeight,Converter={StaticResource MathOperatorConverter},ConverterParameter='/1.6',FallbackValue=500,TargetNullValue=500}"></Setter>
+                                    <Setter Property="Height" Value="Auto"></Setter>
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding MachineProvider.MachineOperator.MachineType}" Value="Eureka">
+                                            <Setter Property="Width" Value="Auto"></Setter>
+                                            <Setter Property="Height" Value="{Binding RelativeSource={RelativeSource Self},Path=ActualWidth,Converter={StaticResource MathOperatorConverter},ConverterParameter='/1.7',FallbackValue=500,TargetNullValue=500}"></Setter>
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Border.Style>
                             <Grid>
                                 <Image x:Name="img" FocusVisualStyle="{x:Null}" Focusable="True" Source="{Binding Source}" RenderOptions.BitmapScalingMode="Fant" Stretch="Fill" Visibility="{Binding RemoteDesktopProvider.InSession,Converter={StaticResource BooleanToVisibilityConverter}}"></Image>
                                 <Rectangle x:Name="rectSnapshot" Fill="White" IsHitTestVisible="False" Opacity="0"></Rectangle>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/RemoteDesktopView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/RemoteDesktopView.xaml
index 833e3bd44..1560b759d 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/RemoteDesktopView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/RemoteDesktopView.xaml
@@ -16,18 +16,42 @@
     <Grid>
         <DockPanel IsEnabled="{Binding IsFree}">
             <Grid DockPanel.Dock="Right" IsEnabled="{Binding MachineProvider.IsPPCAvailable}">
+                <Grid.Style>
+                    <Style TargetType="Grid">
+                        <Setter Property="VerticalAlignment" Value="Stretch"></Setter>
+                        <Setter Property="Width" Value="Auto"></Setter>
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding MachineProvider.MachineOperator.MachineType}" Value="Eureka">
+                                <Setter Property="VerticalAlignment" Value="Top"></Setter>
+                                <Setter Property="Width" Value="490"></Setter>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </Grid.Style>
                 <Border>
-                    <localControls:RemoteDesktopControl 
-                        x:Name="remoteDesktopControl"
-                        win:WindowsManagerHelper.MinWidth="400"
-                        win:WindowsManagerHelper.MinHeight="640"
-                        win:WindowsManagerHelper.StartWidth="400"
-                        win:WindowsManagerHelper.StartHeight="640"
+                    <localControls:RemoteDesktopControl x:Name="remoteDesktopControl"
                         win:WindowsManagerHelper.LockAspectRatio="True"
                         win:WindowsManagerHelper.WindowTitle="{Binding MachineProvider.Machine.SerialNumber}"
                         win:WindowsManagerHelper.DisableMaximize="True"
                         win:WindowsManagerHelper.PreservePlaceHolder="True"
-                        win:WindowsManagerHelper.DisableResolutionServiceInjection="True"/>
+                        win:WindowsManagerHelper.DisableResolutionServiceInjection="True">
+                        <localControls:RemoteDesktopControl.Style>
+                            <Style TargetType="localControls:RemoteDesktopControl">
+                                <Setter Property="win:WindowsManagerHelper.MinWidth" Value="400"/>
+                                <Setter Property="win:WindowsManagerHelper.MinWidth" Value="640"/>
+                                <Setter Property="win:WindowsManagerHelper.StartWidth" Value="400"/>
+                                <Setter Property="win:WindowsManagerHelper.StartHeight" Value="640"/>
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding MachineProvider.MachineOperator.MachineType}" Value="Eureka">
+                                        <Setter Property="win:WindowsManagerHelper.MinWidth" Value="640"/>
+                                        <Setter Property="win:WindowsManagerHelper.MinHeight" Value="440"/>
+                                        <Setter Property="win:WindowsManagerHelper.StartWidth" Value="640"/>
+                                        <Setter Property="win:WindowsManagerHelper.StartHeight" Value="440"/>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </localControls:RemoteDesktopControl.Style> 
+                    </localControls:RemoteDesktopControl>
                 </Border>
             </Grid>
 
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/RemoteJob/DefaultRemoteJobProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/RemoteJob/DefaultRemoteJobProvider.cs
index 848159e0e..4c4d5430e 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/RemoteJob/DefaultRemoteJobProvider.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/RemoteJob/DefaultRemoteJobProvider.cs
@@ -89,7 +89,7 @@ namespace Tango.FSE.UI.RemoteJob
 
             if (stage == RemoteJobStage.Started && !IsRemoteJobRunning)
             {
-                _handler = new JobHandler(() => { }, response.Job.ToObservable(), null, response.ProcessParameters.ToObservable(), JobHandlerModes.SettingUp, MachineProvider.MachineOperator.MachineType);
+                _handler = new JobHandler(() => { }, response.Job.ToObservable(), null, response.ProcessParameters.ToObservable(), JobHandlerModes.SettingUp);
 
                 IsRemoteJobRunning = true;
                 RemoteJobStarted?.Invoke(this, new RemoteJobStartedEventArgs()
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobTile.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobTile.cs
index 682c8bfe5..650818c22 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobTile.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobTile.cs
@@ -67,7 +67,7 @@ namespace Tango.FSE.UI.Tiles.RemoteJob
             Job.AddSolidSegment(Color.FromRgb(70, 70, 70), 5);
             Job.AddSolidSegment(Colors.Gray, 5);
 
-            Handler = new JobHandler(() => { }, Job, null, new ProcessParametersTable() { DyeingSpeed = 50 }, JobHandlerModes.SettingUp, MachineProvider.MachineOperator.MachineType);
+            Handler = new JobHandler(() => { }, Job, null, new ProcessParametersTable() { DyeingSpeed = 50 }, JobHandlerModes.SettingUp);
             Handler.RaiseStatusReceived(new PMR.Printing.JobStatus()
             {
                 Message = "Ready",