diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-07-12 16:30:36 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-07-12 16:30:36 +0300 |
| commit | 04bc3b7e0070ed810ce2255f944f1caa87b03d52 (patch) | |
| tree | 1c6141cf42d9ce94cd837bda7bff05014049a09a /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters | |
| parent | 0de74a76e7002a1b960c3fa68f8b4cd530865e15 (diff) | |
| parent | bd695634133b6e5683b7aae50f8a1df96be54b1a (diff) | |
| download | Tango-04bc3b7e0070ed810ce2255f944f1caa87b03d52.tar.gz Tango-04bc3b7e0070ed810ce2255f944f1caa87b03d52.zip | |
merge conflicts
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/JobProgressToPositionConverter.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/JobProgressToPositionConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/JobProgressToPositionConverter.cs index f6d2c4f42..4212c6908 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/JobProgressToPositionConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/JobProgressToPositionConverter.cs @@ -15,14 +15,13 @@ namespace Tango.MachineStudio.Developer.Converters { try { - Job job = values[0] as Job; - - if (job != null) + if (values.Length == 3) { + double length = System.Convert.ToDouble(values[0]); double progress = System.Convert.ToDouble(values[1]); double parentElementWidth = System.Convert.ToDouble(values[2]); - return (progress / job.Length) * parentElementWidth; + return (progress / length) * parentElementWidth; } else { |