aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-09-06 15:24:57 +0300
committerShlomo Hecht <shlomo@twine-s.com>2020-09-06 15:24:57 +0300
commitb43ce966a42e7ac46732fd5171982c8408793bad (patch)
treed05cb3404067292b6c2688d2ab58523b347c6dfb /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models
parentdc3e9a8e3936f24d01d85652ff2fb9b8c320261c (diff)
parent962df8fcf2c247405c854c8262dc87194e226948 (diff)
downloadTango-b43ce966a42e7ac46732fd5171982c8408793bad.tar.gz
Tango-b43ce966a42e7ac46732fd5171982c8408793bad.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models/ColorLinearizationModel.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models/ColorLinearizationModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models/ColorLinearizationModel.cs
index f82c04bbc..23179b3f2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models/ColorLinearizationModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models/ColorLinearizationModel.cs
@@ -23,7 +23,7 @@ namespace Tango.MachineStudio.RML.Models
}
- public void GetDataFromFile(string fileName, out List<LinearizationDataItem> items)
+ public void GetDataFromFile(string fileName, out List<LinearizationDataItem> items, ref string errors)
{
items = null;
try
@@ -35,7 +35,7 @@ namespace Tango.MachineStudio.RML.Models
}
catch (Exception ex)
{
- Console.WriteLine($" Error in GetDataFromFile {fileName} exception: {ex.Message}" + Environment.NewLine);
+ errors = ex.Message;
}
}