diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-12-20 15:47:33 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-12-20 15:47:33 +0200 |
| commit | 5ab11fca7d8094678b1c675cf6a42011f7f2c3de (patch) | |
| tree | 9d1fc6c52f47d4d06421a31d22223640d34c3a42 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models | |
| parent | fd24c47e3c812d00e5d3889dd646ba9f3d834297 (diff) | |
| parent | ad251a8c9af9b1728cc53acfe672cee83949c71b (diff) | |
| download | Tango-5ab11fca7d8094678b1c675cf6a42011f7f2c3de.tar.gz Tango-5ab11fca7d8094678b1c675cf6a42011f7f2c3de.zip | |
Merged Thread Extensions Bugs branch.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models')
2 files changed, 2 insertions, 41 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorDataExcelModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorDataExcelModel.cs deleted file mode 100644 index da7471e16..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorDataExcelModel.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.Documents; - -namespace Tango.MachineStudio.ThreadExtensions.Models -{ - public class ColorDataExcelModel - { - public int NlCm { get; set; } - public double L { get; set; } - public double A { get; set; } - public double B { get; set; } - - public ColorDataExcelModel() - { - NlCm = 0; - L = A = B = 0.0; - } - - public static void GetDataFromFile(string fileName, out List<ColorDataExcelModel> items, ref string errors) - { - items = null; - try - { - using (ExcelReader reader = new ExcelReader(fileName)) - { - items = reader.GetDataByIndex<ColorDataExcelModel>("Sheet1", 1); - } - } - catch (Exception ex) - { - errors = ex.Message; - } - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/FactorTarget.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/FactorTarget.cs index 0cb2679fd..a9bc38f4c 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/FactorTarget.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/FactorTarget.cs @@ -10,10 +10,10 @@ namespace Tango.MachineStudio.ThreadExtensions.Models public static class FactorTarget { public static Dictionary<FactorColors, double> FACTOR100 = new Dictionary<FactorColors, double>() { - { FactorColors.CYAN, 51.95}, {FactorColors.MAGENTA, 47.47}, { FactorColors.YELLOW, 94.05}, {FactorColors.BLACK, 26.58}}; + { FactorColors.CYAN, 51.64}, {FactorColors.MAGENTA, 46.77}, { FactorColors.YELLOW, 90.3}, {FactorColors.BLACK, 31.61}}; public static Dictionary<FactorColors, double> FACTOR200 = new Dictionary<FactorColors, double>() { - { FactorColors.CYAN, 46.3}, {FactorColors.MAGENTA, 41.04}, { FactorColors.YELLOW, 97.78}, {FactorColors.BLACK, 21.01}}; + { FactorColors.CYAN, 42.26}, {FactorColors.MAGENTA, 42.1}, { FactorColors.YELLOW, 98.86}, {FactorColors.BLACK, 24}}; public static double GetFactor100(FactorColors color) { |