From 0f5d23b3a4d38e5a68436acf3a96822d59249f46 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 17 Jul 2018 20:21:16 +0300 Subject: *1. Implement Real Progress on Machine Emulator. *2. Add ParameterIgnore to Observable Entity validation props. *3. Block logging of similar continous job status events from embedded. (Add counter for embedded logs). *6. Make font size larger on Research module. *7. Open jobs on double click. *9. Add default sorting to job events. (NOT WORKING) *10. Add tool tips for job progress. *12. Test PPC Job Progress *13. Fix issue with inversed color conversion. --- .../Converters/SegmentLengthToWidthConverter.cs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/SegmentLengthToWidthConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/SegmentLengthToWidthConverter.cs index 6157bf5fd..31208a4f4 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/SegmentLengthToWidthConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/SegmentLengthToWidthConverter.cs @@ -16,18 +16,17 @@ namespace Tango.MachineStudio.Developer.Converters { try { - if (values.Length == 4) + if (values.Length == 3) { - Job job = values[0] as Job; - - if (job != null && values[1] is double) + if (values[0] is double) { - double jobLength = System.Convert.ToDouble(values[1]); - double elementWidth = System.Convert.ToDouble(values[2]); - double segmentLength = System.Convert.ToDouble(values[3]); - double totalLength = job.Length; + double jobLength = System.Convert.ToDouble(values[0]); + double elementWidth = System.Convert.ToDouble(values[1]); + double segmentLength = System.Convert.ToDouble(values[2]); + + double result = (segmentLength / jobLength) * elementWidth; - return (segmentLength / totalLength) * elementWidth; + return double.IsInfinity(result) ? 0d : result; } else { -- cgit v1.3.1