aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-07-12 14:47:26 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-07-12 14:47:26 +0300
commit8adbe1c2004903c3e60e9347c4b0ee8d09cd2457 (patch)
tree81678fa869286a02b3935b98ae7d696b9ec9c698 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views
parent856a23723afcc9d48c0f019dc33a259ac6c279ed (diff)
downloadTango-8adbe1c2004903c3e60e9347c4b0ee8d09cd2457.tar.gz
Tango-8adbe1c2004903c3e60e9347c4b0ee8d09cd2457.zip
Temp
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml1
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml4
2 files changed, 2 insertions, 3 deletions
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>