aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-07-17 20:21:16 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-07-17 20:21:16 +0300
commit0f5d23b3a4d38e5a68436acf3a96822d59249f46 (patch)
treeb5d56df08bdcfa3651dc5dd893f474d40e4a9171 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels
parentc5a54597a0a02da5b3cf942fff95586a9dfe836d (diff)
downloadTango-0f5d23b3a4d38e5a68436acf3a96822d59249f46.tar.gz
Tango-0f5d23b3a4d38e5a68436acf3a96822d59249f46.zip
*1. Implement Real Progress on Machine Emulator.
*2. Add ParameterIgnore to Observable Entity validation props. *3. Block logging of similar continous job status events from embedded. (Add counter for embedded logs). *6. Make font size larger on Research module. *7. Open jobs on double click. *9. Add default sorting to job events. (NOT WORKING) *10. Add tool tips for job progress. *12. Test PPC Job Progress *13. Fix issue with inversed color conversion.
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.cs6
1 files changed, 5 insertions, 1 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 ab74fcca8..83ebde0e5 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
@@ -700,11 +700,15 @@ namespace Tango.MachineStudio.Developer.ViewModels
_colorConversionThread.Start();
}
+ #endregion
+
+ #region Color Conversion
+
private void ColorConversionThreadMethod()
{
while (true)
{
- if (IsVisible && ActiveJob != null)
+ if (IsVisible && ActiveJob != null && ActiveJob.Segments != null)
{
var stops = ActiveJob.Segments.SelectMany(x => x.BrushStops);