From 56ee03aba6d6f27bccaf22be8160c4bb835e53ea Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Thu, 25 Nov 2021 18:47:54 +0200 Subject: Save RML Extensions parameters in excel file. --- .../Excel/ColorDataExcelModel.cs | 39 +++++++ .../Excel/ColorParametrsExcelModel.cs | 59 ++++++++++ .../Excel/TestResultsExcelModel.cs | 123 +++++++++++++++++++++ .../Excel/ThreadCharacteristicsExelModel.cs | 37 +++++++ .../Models/ColorDataExcelModel.cs | 39 ------- .../Models/ColorParametrsExcelModel.cs | 59 ---------- .../Models/TestResultsExcelModel.cs | 123 --------------------- .../Models/ThreadCharacteristicsExelModel.cs | 37 ------- .../Tango.MachineStudio.ThreadExtensions.csproj | 8 +- .../Templates/ExportRMLTemplate.xlsx | Bin 31132 -> 25478 bytes .../ViewModels/MainViewVM.cs | 8 +- .../ViewModels/TestResultsViewVM.cs | 29 ++--- 12 files changed, 282 insertions(+), 279 deletions(-) create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/ColorDataExcelModel.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/ColorParametrsExcelModel.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/TestResultsExcelModel.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/ThreadCharacteristicsExelModel.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorDataExcelModel.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorParametrsExcelModel.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/TestResultsExcelModel.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ThreadCharacteristicsExelModel.cs (limited to 'Software/Visual_Studio/MachineStudio') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/ColorDataExcelModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/ColorDataExcelModel.cs new file mode 100644 index 000000000..da7471e16 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/ColorDataExcelModel.cs @@ -0,0 +1,39 @@ +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 items, ref string errors) + { + items = null; + try + { + using (ExcelReader reader = new ExcelReader(fileName)) + { + items = reader.GetDataByIndex("Sheet1", 1); + } + } + catch (Exception ex) + { + errors = ex.Message; + } + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/ColorParametrsExcelModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/ColorParametrsExcelModel.cs new file mode 100644 index 000000000..72e31b3d7 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/ColorParametrsExcelModel.cs @@ -0,0 +1,59 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.MachineStudio.ThreadExtensions.Models +{ + public class ColorParametrsExcelModel + { + public String Thread_name { get; set; } + public String MachineNumber { get; set; } + public double White_point_L { get; set; } + public double White_point_a { get; set; } + public double White_point_B { get; set; } + public double Factor_100__C { get; set; } + public double Factor_100__Cyan_L { get; set; } + public double Factor_100__Cyan_A { get; set; } + public double Factor_100__Cyan_B { get; set; } + public double Factor_100__M { get; set; } + public double Factor_100__Magenta_L { get; set; } + public double Factor_100__Magenta_A { get; set; } + public double Factor_100__Magenta_B { get; set; } + + public double Factor_100__Y { get; set; } + public double Factor_100__Yellow_L { get; set; } + public double Factor_100__Yellow_A { get; set; } + public double Factor_100__Yellow_B { get; set; } + public double Factor_100_K { get; set; } + public double Factor_100__Key_L { get; set; } + public double Factor_100__Key_A { get; set; } + public double Factor_100__Key_B { get; set; } + public double Factor_200_C { get; set; } + public double Factor_200__Cyan_L { get; set; } + public double Factor_200__Cyan_A { get; set; } + public double Factor_200__Cyan_B { get; set; } + + public double Factor_200__Magenta { get; set; } + public double Factor_200__Magenta_L { get; set; } + public double Factor_200__Magenta_A { get; set; } + public double Factor_200__Magenta_B { get; set; } + + public double Factor_200__Yellow { get; set; } + public double Factor_200__Yellow_L { get; set; } + public double Factor_200__Yellow_A { get; set; } + public double Factor_200__Yellow_B { get; set; } + + public double Factor_200__Key { get; set; } + public double Factor_200__Key_L { get; set; } + public double Factor_200__Key_A { get; set; } + public double Factor_200__Key_B { get; set; } + + public int Min_Ink_Uptake_Zone1 { get; set; } + public int Min_Ink_Uptake_Zone2 { get; set; } + public int Max_Ink_Uptake_Zone1 { get; set; } + public int Max_ink_uptake__Zone2 { get; set; } + + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/TestResultsExcelModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/TestResultsExcelModel.cs new file mode 100644 index 000000000..58d48f62e --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/TestResultsExcelModel.cs @@ -0,0 +1,123 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.MachineStudio.ThreadExtensions.Models +{ + public class TestResultsExcelModel + { + public String Thread_name_test_results { get; set; } + public String Machine_number { get; set; } + public String Test_results_name__tab { get; set; } + + public int Dryer_temp { get; set; } + public int Dryer_flow { get; set; } + public int Tunnel_temp { get; set; } + public int Tunnel_flow { get; set; } + + public String Tension_in_head { get; set; } + public String Tension_after_dryer { get; set; } + public String Tension_in_winder { get; set; } + public String BTSR { get; set; } + public String Puller_tension { get; set; } + public String Winder_tension { get; set; } + + public double Rubbing_K_100___DE { get; set; } + public double Rubbing_K_100___GS { get; set; } + public double Rubbing_K_200___DE { get; set; } + public double Rubbing_K_200___GS { get; set; } + public double Rubbing_C_100___DE { get; set; } + public double Rubbing_C_100___GS { get; set; } + public double Rubbing_C_200___DE { get; set; } + public double Rubbing_C_200___GS { get; set; } + public double Rubbing_Y_100___DE { get; set; } + public double Rubbing_Y_100___GS { get; set; } + public double Rubbing_Y_200___DE { get; set; } + public double Rubbing_Y_200___GS { get; set; } + public double Rubbing_M_100___DE { get; set; } + public double Rubbing_M_100___GS { get; set; } + public double Rubbing_M_200___DE { get; set; } + public double Rubbing_M_200___GS { get; set; } + + public String Color_REF { get; set; } + public double Load__N_REF { get; set; } + public double STDEV_REF { get; set; } + public double REF_Strain { get; set; } + public double STDEV_Strain_REF { get; set; } + + public int Color_100_C { get; set; } + public String C_color_100_C { get; set; } + public double Load_N_100_C { get; set; } + public double STDEV_100_C { get; set; } + public double Change_100_C { get; set; } + public double Strain_100_C { get; set; } + public double STDEV_100_C_2 { get; set; } + public double Change_100_C_2 { get; set; } + + public int Color_100_K { get; set; } + public String C_color_100_K { get; set; } + public double Load__N_100_K { get; set; } + public double STDEV_100_K { get; set; } + public double Change__100_K { get; set; } + public double Strain_100_K { get; set; } + public double STDEV_100_K_2 { get; set; } + public double Change_100_K_2 { get; set; } + + public int Color_200_C { get; set; } + public String C_color_200_C { get; set; } + public double Load__N_200_C { get; set; } + public double STDEV_200_C { get; set; } + public double Change_200_C { get; set; } + public double Strain_200_C { get; set; } + public double STDEV_200_C_2 { get; set; } + public double Change_200_C_2 { get; set; } + + public int Color_200_K { get; set; } + public String C_color_200_K { get; set; } + public double Load__N_200_K { get; set; } + public double STDEV_200_K { get; set; } + public double Change_200_K { get; set; } + public double Strain_200_K { get; set; } + public double STDEV_200_K_2 { get; set; } + public double Change_200_K_2 { get; set; } + + public String Uniformity_Zone_1 { get; set; } + public String Uniformity_Zone_2 { get; set; } + + public double COF_REF { get; set; } + public double CV_REF { get; set; } + public double COF_Black { get; set; } + public double CV_Black { get; set; } + //for twine inly + public double lub_amount { get; set; } + + public String Comments { get; set; } + public String Conclusion { get; set; } + + public TestResultsExcelModel() + { + Comments = Conclusion = ""; + C_color_100_C = "Cyan"; + Color_100_C = 100; + Load__N_100_K = STDEV_100_K = Change__100_K = Strain_100_K = STDEV_100_K_2 = Change_100_K_2 = 0.0; + + C_color_200_C = "Cyan"; + Color_200_C = 200; + Load__N_200_C = STDEV_200_C = Change_200_C = Strain_200_C = STDEV_200_C_2 = Change_200_C_2 = 0.0; + + C_color_100_K = "Black"; + Color_100_K = 100; + Load__N_100_K = STDEV_100_K = Change__100_K = Strain_100_K = STDEV_100_K_2 = Change_100_K_2 = 0.0; + + C_color_200_K = "Black"; + Color_200_K = 200; + Load__N_200_K = STDEV_200_K = Change_200_K = Strain_200_K = STDEV_200_K_2 = Change_200_K_2 = 0.0; + + Color_REF = "REF"; + Load__N_REF = STDEV_REF = REF_Strain = STDEV_Strain_REF = 0; + } + + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/ThreadCharacteristicsExelModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/ThreadCharacteristicsExelModel.cs new file mode 100644 index 000000000..1f894d70b --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/ThreadCharacteristicsExelModel.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.MachineStudio.ThreadExtensions.Models +{ + public class ThreadCharacteristicsExcelModel + { + public String ThreadName { get; set; } + public String Manufacturer { get; set; } + public String Brand { get; set; } + public String Country { get; set; } + public String EndUse { get; set; } + public String Applications { get; set; } + public String IndustrySector { get; set; } + public String Material { get; set; } + public String Type { get; set; } + public String SubFamily { get; set; } + public String Family { get; set; } + public String Group { get; set; } + public String Texturing { get; set; } + public String Geometry { get; set; } + public String Color { get; set; } + public String GlossLevel { get; set; } + public double LinearDensity { get; set; } + public String Unit { get; set; } + public int Plies { get; set; } + public int FilamentCountPerPlie { get; set; } + public int LinearDensityCount { get; set; } + public int CountDen { get; set; } + public String FiberCount  { get; set; } + public int Twist { get; set; } + public String TwistDirection { get; set; } + } +} 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 items, ref string errors) - { - items = null; - try - { - using (ExcelReader reader = new ExcelReader(fileName)) - { - items = reader.GetDataByIndex("Sheet1", 1); - } - } - catch (Exception ex) - { - errors = ex.Message; - } - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorParametrsExcelModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorParametrsExcelModel.cs deleted file mode 100644 index b762c1042..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorParametrsExcelModel.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.MachineStudio.ThreadExtensions.Models -{ - public class ColorParametrsExcelModel - { - public String Thread_name { get; set; } - public String MachineNumber { get; set; } - public double White_point_L { get; set; } - public double White_point_a { get; set; } - public double White_point_B { get; set; } - public double Factor_100__C { get; set; } - public double Factor_100__Cyan_L { get; set; } - public double Factor_100__Cyan_A { get; set; } - public double Factor_100__Cyan_B { get; set; } - public double Factor_100__M { get; set; } - public double Factor_100__Magenta_L { get; set; } - public double Factor_100__Magenta_A { get; set; } - public double Factor_100__Magenta_B { get; set; } - - public double Factor_100__Y { get; set; } - public double Factor_100__Yellow_L { get; set; } - public double Factor_100__Yellow_A { get; set; } - public double Factor_100__Yellow_B { get; set; } - public double Factor_100_K { get; set; } - public double Factor_100__Key_L { get; set; } - public double Factor_100__Key_A { get; set; } - public double Factor_100__Key_B { get; set; } - public double Factor_200_C { get; set; } - public double Factor_200__Cyan_L { get; set; } - public double Factor_200__Cyan_A { get; set; } - public double Factor_200__Cyan_B { get; set; } - - public double Factor_200__Magenta { get; set; } - public double Factor_200__Magenta_L { get; set; } - public double Factor_200__Magenta_A { get; set; } - public double Factor_200__Magenta_B { get; set; } - - public double Factor_200__Yellow { get; set; } - public double Factor_200__Yellow_L { get; set; } - public double Factor_200__Yellow_A { get; set; } - public double Factor_200__Yellow_B { get; set; } - - public double Factor_200__Key { get; set; } - public double Factor_200__Key_L { get; set; } - public double Factor_200__Key_A { get; set; } - public double Factor_200__Key_B { get; set; } - - public int Min_Ink_Uptake_Zone1 { get; set; } - public int Min_Ink_Uptake_Zone2 { get; set; } - public int Max_Ink_Uptake_Zone1 { get; set; } - public int Max_ink_uptake__Zone2 { get; set; } - - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/TestResultsExcelModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/TestResultsExcelModel.cs deleted file mode 100644 index fbd142362..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/TestResultsExcelModel.cs +++ /dev/null @@ -1,123 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.MachineStudio.ThreadExtensions.Models -{ - public class TestResultsExcelModel - { - public String Thread_name_test_results { get; set; } - public String Machine_number { get; set; } - public String Test_results_name__tab { get; set; } - - public int Dryer_temp { get; set; } - public int Dryer_flow { get; set; } - public int Tunnel_temp { get; set; } - public int Tunnel_flow { get; set; } - - public String Tension_in_head { get; set; } - public String Tension_after_dryer { get; set; } - public String Tension_in_winder { get; set; } - public String BTSR { get; set; } - public String Puller_tension { get; set; } - public String Winder_tension { get; set; } - - public double Rubbing_K_100___DE { get; set; } - public double Rubbing_K_100___GS { get; set; } - public double Rubbing_K_200___DE { get; set; } - public double Rubbing_K_200___GS { get; set; } - public double Rubbing_C_100___DE { get; set; } - public double Rubbing_C_100___GS { get; set; } - public double Rubbing_C_200___DE { get; set; } - public double Rubbing_C_200___GS { get; set; } - public double Rubbing_Y_100___DE { get; set; } - public double Rubbing_Y_100___GS { get; set; } - public double Rubbing_Y_200___DE { get; set; } - public double Rubbing_Y_200___GS { get; set; } - public double Rubbing_M_100___DE { get; set; } - public double Rubbing_M_100___GS { get; set; } - public double Rubbing_M_200___DE { get; set; } - public double Rubbing_M_200___GS { get; set; } - - public String Color_REF { get; set; } - public double Load__N_REF { get; set; } - public double STDEV_REF { get; set; } - public double REF_Strain { get; set; } - public double STDEV_Strain_REF { get; set; } - - public String Color_100_C { get; set; } - public int C_color_100_C { get; set; } - public double Load_N_100_C { get; set; } - public double STDEV_100_C { get; set; } - public double Change_100_C { get; set; } - public double Strain_100_C { get; set; } - public double STDEV_100_C_2 { get; set; } - public double Change_100_C_2 { get; set; } - - public String Color_100_K { get; set; } - public int C_color_100_K { get; set; } - public double Load__N_100_K { get; set; } - public double STDEV_100_K { get; set; } - public double Change__100_K { get; set; } - public double Strain_100_K { get; set; } - public double STDEV_100_K_2 { get; set; } - public double Change_100_K_2 { get; set; } - - public String Color_200_C { get; set; } - public int C_color_200_C { get; set; } - public double Load__N_200_C { get; set; } - public double STDEV_200_C { get; set; } - public double Change_200_C { get; set; } - public double Strain_200_C { get; set; } - public double STDEV_200_C_2 { get; set; } - public double Change_200_C_2 { get; set; } - - public String Color_200_K { get; set; } - public int C_color_200_K { get; set; } - public double Load__N_200_K { get; set; } - public double STDEV_200_K { get; set; } - public double Change_200_K { get; set; } - public double Strain_200_K { get; set; } - public double STDEV_200_K_2 { get; set; } - public double Change_200_K_2 { get; set; } - - public String Uniformity_Zone_1 { get; set; } - public String Uniformity_Zone_2 { get; set; } - - public double COF_REF { get; set; } - public double CV_REF { get; set; } - public double COF_Black { get; set; } - public double CV_Black { get; set; } - //for twine inly - public double lub_amount { get; set; } - - public String Comments { get; set; } - public String Conclusion { get; set; } - - public TestResultsExcelModel() - { - Comments = Conclusion = ""; - Color_100_C = "Cyan"; - C_color_100_C = 100; - Load__N_100_K = STDEV_100_K = Change__100_K = Strain_100_K = STDEV_100_K_2 = Change_100_K_2 = 0.0; - - Color_200_C = "Cyan"; - C_color_200_C = 200; - Load__N_200_C = STDEV_200_C = Change_200_C = Strain_200_C = STDEV_200_C_2 = Change_200_C_2 = 0.0; - - Color_100_K = "Black"; - C_color_100_K = 100; - Load__N_100_K = STDEV_100_K = Change__100_K = Strain_100_K = STDEV_100_K_2 = Change_100_K_2 = 0.0; - - Color_200_K = "Black"; - C_color_200_K = 200; - Load__N_200_K = STDEV_200_K = Change_200_K = Strain_200_K = STDEV_200_K_2 = Change_200_K_2 = 0.0; - - Color_REF = "REF"; - Load__N_REF = STDEV_REF = REF_Strain = STDEV_Strain_REF = 0; - } - - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ThreadCharacteristicsExelModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ThreadCharacteristicsExelModel.cs deleted file mode 100644 index 1f894d70b..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ThreadCharacteristicsExelModel.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.MachineStudio.ThreadExtensions.Models -{ - public class ThreadCharacteristicsExcelModel - { - public String ThreadName { get; set; } - public String Manufacturer { get; set; } - public String Brand { get; set; } - public String Country { get; set; } - public String EndUse { get; set; } - public String Applications { get; set; } - public String IndustrySector { get; set; } - public String Material { get; set; } - public String Type { get; set; } - public String SubFamily { get; set; } - public String Family { get; set; } - public String Group { get; set; } - public String Texturing { get; set; } - public String Geometry { get; set; } - public String Color { get; set; } - public String GlossLevel { get; set; } - public double LinearDensity { get; set; } - public String Unit { get; set; } - public int Plies { get; set; } - public int FilamentCountPerPlie { get; set; } - public int LinearDensityCount { get; set; } - public int CountDen { get; set; } - public String FiberCount  { get; set; } - public int Twist { get; set; } - public String TwistDirection { get; set; } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj index 5199245a3..9ea43ad0b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj @@ -95,14 +95,14 @@ - - + + - - + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Templates/ExportRMLTemplate.xlsx b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Templates/ExportRMLTemplate.xlsx index e9bdd6151..19b6a0004 100644 Binary files a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Templates/ExportRMLTemplate.xlsx and b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Templates/ExportRMLTemplate.xlsx differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs index 6b95cf190..4802e0af1 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs @@ -1295,7 +1295,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels { ColorParametrsExcelModel colorParametrsExcelModel = new ColorParametrsExcelModel(); colorParametrsExcelModel.Thread_name = ActiveRML.Name; - colorParametrsExcelModel.MachineNumber = machine.SerialNumber; + colorParametrsExcelModel.MachineNumber = machine.SerialNumber.ToString(); colorParametrsExcelModel.White_point_L = ActiveRML.WhitePointL; colorParametrsExcelModel.White_point_a = ActiveRML.WhitePointA; colorParametrsExcelModel.White_point_B = ActiveRML.WhitePointB; @@ -1305,10 +1305,10 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels TestResultsViewVM.LoadTestResultsExcel(testResultsExcelModelList, machine.Guid, machine.SerialNumber); } - } - writer.WriteData(colorParametrsExcelList, "Color parameters",2); - writer.WriteData(testResultsExcelModelList, "Machine tests results", 2); + + writer.WriteData(colorParametrsExcelList, "Color parameters"); + writer.WriteData(testResultsExcelModelList.OrderBy(x => x.Machine_number), "Machine tests results"); writer.Dispose(); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs index f7823a77c..c1fb4497f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs @@ -441,20 +441,20 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels testResultsExcelModel.Puller_tension = testresult.PullerTensionMin == null ? "" : testresult.PullerTensionMin.ToString(); testResultsExcelModel.Winder_tension = testresult.ExitTensionMin == null ? "" : testresult.ExitTensionMin.ToString(); - foreach( var tensileResult in testresult.TensileResults) + foreach (var tensileResult in testresult.TensileResults) { - if(tensileResult.TestResultColor == TestResultColors.CYAN) + if (tensileResult.TestResultColor == TestResultColors.CYAN) { - if(tensileResult.ColorPercent == 100) + if (tensileResult.ColorPercent == 100) { testResultsExcelModel.Load_N_100_C = tensileResult.MaxLoad == null ? 0 : (double)tensileResult.MaxLoad; testResultsExcelModel.STDEV_100_C = tensileResult.StdevMaxLoad == null ? 0 : (double)tensileResult.StdevMaxLoad; - testResultsExcelModel.Change_100_C = tensileResult.PercentChangeLoad == null ? 0 : (double)tensileResult.PercentChangeLoad; + testResultsExcelModel.Change_100_C = tensileResult.PercentChangeLoad == null ? 0 : (double)tensileResult.PercentChangeLoad; testResultsExcelModel.Strain_100_C = tensileResult.StrainMaxLoad == null ? 0 : (double)tensileResult.StrainMaxLoad; testResultsExcelModel.STDEV_100_C_2 = tensileResult.StdevStrainMaxLoad == null ? 0 : (double)tensileResult.StdevStrainMaxLoad; testResultsExcelModel.Change_100_C_2 = tensileResult.PercentChangeStrain == null ? 0 : (double)tensileResult.PercentChangeStrain; } - else if(tensileResult.ColorPercent == 200) + else if (tensileResult.ColorPercent == 200) { testResultsExcelModel.Load__N_200_C = tensileResult.MaxLoad == null ? 0 : (double)tensileResult.MaxLoad; testResultsExcelModel.STDEV_200_C = tensileResult.StdevMaxLoad == null ? 0 : (double)tensileResult.StdevMaxLoad; @@ -464,7 +464,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels testResultsExcelModel.Change_200_C_2 = tensileResult.PercentChangeStrain == null ? 0 : (double)tensileResult.PercentChangeStrain; } } - else if(tensileResult.TestResultColor == TestResultColors.BLACK) + else if (tensileResult.TestResultColor == TestResultColors.BLACK) { if (tensileResult.ColorPercent == 100) { @@ -484,18 +484,18 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels testResultsExcelModel.STDEV_200_K_2 = tensileResult.StdevStrainMaxLoad == null ? 0 : (double)tensileResult.StdevStrainMaxLoad; testResultsExcelModel.Change_200_K_2 = tensileResult.PercentChangeStrain == null ? 0 : (double)tensileResult.PercentChangeStrain; } - + } else if (tensileResult.IsWhiteColor) { testResultsExcelModel.Load__N_REF = tensileResult.MaxLoad == null ? 0 : (double)tensileResult.MaxLoad; testResultsExcelModel.STDEV_REF = tensileResult.StdevMaxLoad == null ? 0 : (double)tensileResult.StdevMaxLoad; - testResultsExcelModel.REF_Strain = tensileResult.StdevStrainMaxLoad == null ? 0 : (double)tensileResult.StdevStrainMaxLoad; - testResultsExcelModel.STDEV_Strain_REF = tensileResult.PercentChangeStrain == null ? 0 : (double)tensileResult.PercentChangeStrain; + testResultsExcelModel.STDEV_Strain_REF = tensileResult.StdevStrainMaxLoad == null ? 0 : (double)tensileResult.StdevStrainMaxLoad; + testResultsExcelModel.REF_Strain = tensileResult.StrainMaxLoad == null ? 0 : (double)tensileResult.StrainMaxLoad; } } - + foreach (var rubbingresult in testresult.RubbingResults) { if (rubbingresult.TestResultColor == TestResultColors.CYAN) @@ -527,9 +527,12 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels testResultsExcelModel.Rubbing_K_200___GS = rubbingresult.Gs200 == null ? 0.0 : (double)rubbingresult.Gs200; } } - - testResultsExcelModel.Uniformity_Zone_1 = testresult.SeverityZone1Min == null ? "" : testresult.SeverityZone1Min.ToString() + "-" + testresult.SeverityZone1Max == null ? "" : testresult.SeverityZone1Max.ToString(); - testResultsExcelModel.Uniformity_Zone_2 = testresult.SeverityZone2Min == null ? "" : testresult.SeverityZone2Min.ToString() + "-" + testresult.SeverityZone2Max == null ? "" : testresult.SeverityZone2Max.ToString(); + string minZone = testresult.SeverityZone1Min == null ? "" : ((double)testresult.SeverityZone1Min).ToString(); + string maxZone = testresult.SeverityZone1Max == null ? "" : ((double)testresult.SeverityZone1Max).ToString(); + testResultsExcelModel.Uniformity_Zone_1 = $"{minZone} - {maxZone}"; + minZone = testresult.SeverityZone2Min == null ? "" : ((double)testresult.SeverityZone2Min).ToString(); + maxZone = testresult.SeverityZone2Max == null ? "" : ((double)testresult.SeverityZone2Max).ToString(); + testResultsExcelModel.Uniformity_Zone_2 = $"{minZone} - {maxZone}"; testResultsExcelModel.COF_REF = testresult.RefCof == null ? 0.0 : (double)testresult.RefCof; testResultsExcelModel.CV_REF = 0.0; -- cgit v1.3.1