diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-08-21 09:17:46 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-08-21 09:17:46 +0300 |
| commit | 193f7f5e096751da747b0fe9d145bd43a02d7340 (patch) | |
| tree | ce0aa138252ca76426fbbc84e1753d7e410011a9 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels | |
| parent | 98493042a5dace2535dd4343c047eaf1bd784ae3 (diff) | |
| parent | f468145c16b5c677201327feeb4f207c21df0b0b (diff) | |
| download | Tango-193f7f5e096751da747b0fe9d145bd43a02d7340.tar.gz Tango-193f7f5e096751da747b0fe9d145bd43a02d7340.zip | |
merge after conflict
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index f54de0814..dace2ceac 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -738,6 +738,7 @@ namespace Tango.MachineStudio.Developer.ViewModels try { var output = TangoColorConverter.GetSuggestions(stop); + stop.Red = output.SingleCoordinates.Red; stop.Green = output.SingleCoordinates.Green; stop.Blue = output.SingleCoordinates.Blue; |