diff options
7 files changed, 69 insertions, 23 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", diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteDesktop/DefaultRemoteDesktopService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteDesktop/DefaultRemoteDesktopService.cs index 411fd5252..51c78e0f0 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteDesktop/DefaultRemoteDesktopService.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteDesktop/DefaultRemoteDesktopService.cs @@ -14,6 +14,7 @@ using Tango.Core.Threading; using Tango.Integration.ExternalBridge; using Tango.Logging; using Tango.PPC.Common.Application; +using Tango.PPC.Common.Build; using Tango.PPC.Common.ExternalBridge; using Tango.PPC.Common.OS; using Tango.PPC.Common.Printing; @@ -46,6 +47,7 @@ namespace Tango.PPC.Common.RemoteDesktop private bool _isMouseDown; private bool _ensureMouseDown; private ActionTimer _resetTimer; + private IBuildProvider _buildProvider; /// <summary> /// Gets or sets a value indicating whether this <see cref="IPPCService" /> is enabled. @@ -79,11 +81,12 @@ namespace Tango.PPC.Common.RemoteDesktop /// <param name="applicationManager">The application manager.</param> /// <param name="externalBridge">The external bridge.</param> /// <param name="osManager">The os manager.</param> - public DefaultRemoteDesktopService(IPPCApplicationManager applicationManager, IPPCExternalBridgeService externalBridge, IOperationSystemManager osManager, IPrintingManager printingManager) + public DefaultRemoteDesktopService(IPPCApplicationManager applicationManager, IPPCExternalBridgeService externalBridge, IOperationSystemManager osManager, IPrintingManager printingManager, IBuildProvider buildProvider) { _osManager = osManager; _appManager = applicationManager; _printingManager = printingManager; + _buildProvider = buildProvider; _jsonSettings = new JsonSerializerSettings() { @@ -110,10 +113,19 @@ namespace Tango.PPC.Common.RemoteDesktop private void ApplicationManager_ApplicationReady(object sender, EventArgs e) { - - var mainWindow = System.Windows.Application.Current.MainWindow; + if (_buildProvider.IsEureka) + { + _engine.CaptureRegion = new CaptureRegion() + { + Left = (int)mainWindow.Left, + Top = 0, + Width = 1920, + Height = 1080 + }; + } + if (mainWindow.WindowStyle != System.Windows.WindowStyle.None) { mainWindow.LocationChanged += (_, __) => @@ -325,7 +337,7 @@ namespace Tango.PPC.Common.RemoteDesktop MouseController.MouseEvent(flag); - _resetTimer.ResetReplace(() => + _resetTimer.ResetReplace(() => { _printingManager.PreventPrintingByRemoteDesktop = false; Debug.WriteLine("ALLOW PRINT"); @@ -468,7 +480,7 @@ namespace Tango.PPC.Common.RemoteDesktop } else { - _engine.EnableComparer = true; + _engine.EnableComparer = !_buildProvider.IsEureka; foreach (var client in _clients.ToList().Where(x => !x.InitialPacketSent)) { @@ -490,13 +502,13 @@ namespace Tango.PPC.Common.RemoteDesktop } } - if (e.Frame.DifferenceCount > 0) + if (e.Frame.DifferenceCount > 0 || _buildProvider.IsEureka) { RemoteDesktopPacket packet = null; Point mousePosition = new Point(System.Windows.Forms.Cursor.Position.X, System.Windows.Forms.Cursor.Position.Y); - if (!e.Frame.DifferenceAvailable) + if (!e.Frame.DifferenceAvailable || _buildProvider.IsEureka) { packet = new RemoteDesktopPacket() { diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs index d21dcc781..7aa491369 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs @@ -27,7 +27,6 @@ namespace Tango.Integration.Operation protected double _last_progress; protected const int PROGRESS_REPORT_RANGE_METERS = 5; protected bool loggedContinueMessage; - private MachineTypes _machineType; #region Events @@ -156,10 +155,9 @@ namespace Tango.Integration.Operation /// Initializes a new instance of the <see cref="JobHandler"/> class. /// </summary> /// <param name="cancelAction">The cancel action.</param> - public JobHandler(Action cancelAction, Job job, JobTicket jobTicket, ProcessParametersTable processParameters, JobHandlerModes mode, MachineTypes machineType) : this() + public JobHandler(Action cancelAction, Job job, JobTicket jobTicket, ProcessParametersTable processParameters, JobHandlerModes mode) : this() { _mode = mode; - _machineType = machineType; ProcessParameters = processParameters; Job = job; diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs index 92fc9cc1c..49e7c76e2 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs @@ -1801,7 +1801,7 @@ namespace Tango.Integration.Operation handler.CanCancel = true; LogManager.Log(ex, "Failed to cancel job."); } - }, job, jobTicket, processParameters, JobHandlingMode, MachineType); + }, job, jobTicket, processParameters, JobHandlingMode); handler.StatusChanged += (x, s) => { @@ -2729,7 +2729,7 @@ namespace Tango.Integration.Operation List<RequiredLiquid> requiredLiquids = null; //Validate liquid quantities - if (EnableJobLiquidQuantityValidation) + if (EnableJobLiquidQuantityValidation && MachineType == MachineTypes.TS1800) { if (!originalJob.Rml.UseColorLibGradients) //Validate liquid quantities when ColorLib generate gradient is disabled { @@ -2915,7 +2915,7 @@ namespace Tango.Integration.Operation handler.CanCancel = true; LogManager.Log(ex, "Failed to cancel job."); } - }, clonedJob, ticket, processParameters, JobHandlingMode, MachineType); + }, clonedJob, ticket, processParameters, JobHandlingMode); handler.StatusChanged += (x, s) => { |