aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2020-09-07 11:33:53 +0300
committerAvi Levkovich <avi@twine-s.com>2020-09-07 11:33:53 +0300
commit1ea31678760a7005105fbda97edf9c93540a8b39 (patch)
treec9ab27f25b8e76d3d6ae8bd9278b8ca69a38acc5 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models
parent0d27aba5181800fb81d880e4dad16c547a0f95a2 (diff)
parent4a6dfa14bf1e7599e2b4196e71102f32f501941c (diff)
downloadTango-1ea31678760a7005105fbda97edf9c93540a8b39.tar.gz
Tango-1ea31678760a7005105fbda97edf9c93540a8b39.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;
}
}