aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2020-09-06 14:38:46 +0300
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2020-09-06 14:38:46 +0300
commit92b1cd2bd7f4f42d7613ba424ef568a3a476bd89 (patch)
treea9364f5316d6470067136cca74596878e2e7e53f /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models
parent751ec679b65431ab3ce13f1c5c58cb0891b2fdbe (diff)
downloadTango-92b1cd2bd7f4f42d7613ba424ef568a3a476bd89.tar.gz
Tango-92b1cd2bd7f4f42d7613ba424ef568a3a476bd89.zip
Color Calibration. Added Error notification to Linearization process. Clear graphs on start new process. Memory testing C++ code in debug.
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;
}
}