diff options
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions')
8 files changed, 42 insertions, 39 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorDataExcelModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/ColorDataExcelModel.cs index da7471e16..da7471e16 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorDataExcelModel.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/ColorDataExcelModel.cs diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorParametrsExcelModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/ColorParametrsExcelModel.cs index b762c1042..72e31b3d7 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorParametrsExcelModel.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/ColorParametrsExcelModel.cs @@ -49,11 +49,11 @@ namespace Tango.MachineStudio.ThreadExtensions.Models 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/Excel/TestResultsExcelModel.cs index fbd142362..58d48f62e 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/TestResultsExcelModel.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/TestResultsExcelModel.cs @@ -47,8 +47,8 @@ namespace Tango.MachineStudio.ThreadExtensions.Models 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 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; } @@ -56,8 +56,8 @@ namespace Tango.MachineStudio.ThreadExtensions.Models 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 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; } @@ -65,8 +65,8 @@ namespace Tango.MachineStudio.ThreadExtensions.Models 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 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; } @@ -74,8 +74,8 @@ namespace Tango.MachineStudio.ThreadExtensions.Models 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 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; } @@ -99,20 +99,20 @@ namespace Tango.MachineStudio.ThreadExtensions.Models public TestResultsExcelModel() { Comments = Conclusion = ""; - Color_100_C = "Cyan"; - C_color_100_C = 100; + 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; - Color_200_C = "Cyan"; - C_color_200_C = 200; + 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; - Color_100_K = "Black"; - C_color_100_K = 100; + 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; - Color_200_K = "Black"; - C_color_200_K = 200; + 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"; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ThreadCharacteristicsExelModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/ThreadCharacteristicsExelModel.cs index 1f894d70b..1f894d70b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ThreadCharacteristicsExelModel.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Excel/ThreadCharacteristicsExelModel.cs 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 @@ <Compile Include="Converters\ColorWithPercentToBrushConverter.cs" /> <Compile Include="Converters\ComboBoxVisibleConverter.cs" /> <Compile Include="Converters\NumericFieldConverter.cs" /> - <Compile Include="Models\ColorDataExcelModel.cs" /> - <Compile Include="Models\ColorParametrsExcelModel.cs" /> + <Compile Include="Excel\ColorDataExcelModel.cs" /> + <Compile Include="Excel\ColorParametrsExcelModel.cs" /> <Compile Include="Models\FactorTarget.cs" /> <Compile Include="Models\MachineModel.cs" /> <Compile Include="Models\PlotProperties.cs" /> <Compile Include="Models\RmlExtensionModel.cs" /> - <Compile Include="Models\TestResultsExcelModel.cs" /> - <Compile Include="Models\ThreadCharacteristicsExelModel.cs" /> + <Compile Include="Excel\TestResultsExcelModel.cs" /> + <Compile Include="Excel\ThreadCharacteristicsExelModel.cs" /> <Compile Include="ViewModelLocator.cs" /> <Compile Include="ViewModels\AddItemDialogVM.cs" /> <Compile Include="ViewModels\ColorParametersVewVM.cs" /> 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 Binary files differindex e9bdd6151..19b6a0004 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Templates/ExportRMLTemplate.xlsx +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Templates/ExportRMLTemplate.xlsx 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; |