diff options
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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(); |