diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-09-07 09:36:58 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-09-07 09:36:58 +0300 |
| commit | 32594b7cff47dca3205bb35876085501a48b30ab (patch) | |
| tree | 8a431fd571ad2ac5a6c05118f16c299be7a80b41 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models | |
| parent | 424cc484e1b37b40d112b3412416d485e7e63b89 (diff) | |
| parent | 281bd2c6b8faf50f11d1aac3f5d61677f007ad3d (diff) | |
| download | Tango-32594b7cff47dca3205bb35876085501a48b30ab.tar.gz Tango-32594b7cff47dca3205bb35876085501a48b30ab.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.cs | 4 |
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; } } |