diff options
| author | Mirta <mirta@twine-s.com> | 2021-01-24 08:52:13 +0200 |
|---|---|---|
| committer | Mirta <mirta@twine-s.com> | 2021-01-24 08:52:13 +0200 |
| commit | d6ad9018bda7442cda04869edebc68a1539dbfe0 (patch) | |
| tree | a0ee58f8ab216332a7c2eefeb8695b1b90621752 | |
| parent | 9aa45ed8258c7b5200cba90d94cc049cf59dc78d (diff) | |
| download | Tango-d6ad9018bda7442cda04869edebc68a1539dbfe0.tar.gz Tango-d6ad9018bda7442cda04869edebc68a1539dbfe0.zip | |
change in calib
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 2dd880fca..b5e313d56 100644 --- a/.gitignore +++ b/.gitignore @@ -317,3 +317,5 @@ __pycache__/ /Software/PMR/Messages/.metadata /Software/Visual_Studio/.tfignore.txt /Software/Visual_Studio/.nuget/NuGet.config +/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter_Jan24_21.cpp +/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter_Jan24_21.h diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs index 95de19f42..bed43d44b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs @@ -228,7 +228,7 @@ namespace Tango.MachineStudio.RML.ViewModels }); return; } - else if (!(vm.CalibrationPoints.First().X == 0 && vm.CalibrationPoints.First().Y == 0 && vm.CalibrationPoints.Last().X == 100 && vm.CalibrationPoints.Last().Y == 100)) + else if (!(vm.CalibrationPoints.First().X == 0 && vm.CalibrationPoints.First().Y == 0 && vm.CalibrationPoints.Last().X >= 100 && vm.CalibrationPoints.Last().Y >= 100)) { InvokeUI(() => { |