diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-12 14:47:26 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-12 14:47:26 +0300 |
| commit | 8adbe1c2004903c3e60e9347c4b0ee8d09cd2457 (patch) | |
| tree | 81678fa869286a02b3935b98ae7d696b9ec9c698 /Software/Visual_Studio/MachineStudio/Modules | |
| parent | 856a23723afcc9d48c0f019dc33a259ac6c279ed (diff) | |
| download | Tango-8adbe1c2004903c3e60e9347c4b0ee8d09cd2457.tar.gz Tango-8adbe1c2004903c3e60e9347c4b0ee8d09cd2457.zip | |
Temp
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules')
3 files changed, 5 insertions, 7 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 { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml index 585a0cb6b..fde7ff275 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml @@ -59,7 +59,6 @@ <localConverters:SegmentToBrushConverter x:Key="SegmentToBrushConverter" /> <localConverters:SegmentToBrushConverterMulti x:Key="SegmentToBrushConverterMulti" /> <localConverters:ObjectsNotEqualToBooleanConveter x:Key="ObjectsNotEqualToBooleanConveter" /> - <localConverters:JobProgressToPositionConverter x:Key="JobProgressToPositionConverter" /> <localConverters:BrushStopToOffsetValueConverter x:Key="BrushStopToOffsetValueConverter" /> <converters:StringEllipsisConverter x:Key="StringEllipsisConverter" /> <converters:NumberToFileSizeConverter x:Key="NumberToFileSizeConverter"/> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml index 14c4cd78a..3e76ccbd0 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml @@ -213,8 +213,8 @@ <Grid Canvas.Top="0"> <Canvas.Left> <MultiBinding Converter="{StaticResource JobProgressToPositionConverter}"> - <Binding Path="RunningJob" /> - <Binding Path="RunningJobStatus.Progress" /> + <Binding Path="RunningJobStatus.CurrentUnitTotalProgress" /> + <Binding Path="RunningJobStatus.CurrentUnitProgress" /> <Binding ElementName="jobProgressCanvas" Path="ActualWidth" /> </MultiBinding> </Canvas.Left> |