aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2020-07-21 14:47:23 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2020-07-21 14:47:23 +0300
commit3cfaaf4ff8ae7d821d8e99b6d9b3ade3b970b994 (patch)
tree3de0b3326af7592251d8db2396736a1841cd21e7 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models
parent3fd6182656336330c84643ee15e6231f62f6dc6d (diff)
parent9d4d99151f517c974c587ec008cba6aa152e4ea2 (diff)
downloadTango-3cfaaf4ff8ae7d821d8e99b6d9b3ade3b970b994.tar.gz
Tango-3cfaaf4ff8ae7d821d8e99b6d9b3ade3b970b994.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/_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.cs10
1 files changed, 3 insertions, 7 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 fe9ec7e37..8a24a9702 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
@@ -9,7 +9,7 @@ namespace Tango.MachineStudio.RML.Models
{
public class ColorLinearizationModel
{
- private class LinearizationDataItem
+ public class LinearizationDataItem
{
public double L { get; set; }
public double A { get; set; }
@@ -22,14 +22,10 @@ namespace Tango.MachineStudio.RML.Models
}
- public void GetDataFromFile(string fileName)
+ public void GetDataFromFile(string fileName, out List<LinearizationDataItem> items)
{
-
ExcelReader reader = new ExcelReader(fileName);
- var items = reader.GetDataByIndex<LinearizationDataItem>("Sheet1", 2);
- foreach (var item in items)
- {
- }
+ items = reader.GetDataByIndex<LinearizationDataItem>("Sheet1", 2);
reader.Dispose();
}
}