From da72612deab112b658deed912a14f2c72e8b9616 Mon Sep 17 00:00:00 2001 From: Avi Levkovich Date: Tue, 21 Jul 2020 13:53:08 +0300 Subject: mergr --- .../Tango.MachineStudio.RML/Models/ColorLinearizationModel.cs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models') 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 items) { - ExcelReader reader = new ExcelReader(fileName); - var items = reader.GetDataByIndex("Sheet1", 2); - foreach (var item in items) - { - } + items = reader.GetDataByIndex("Sheet1", 2); reader.Dispose(); } } -- cgit v1.3.1