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/Views | |
| 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/Views')
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> |