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 | 37 |
1 files changed, 26 insertions, 11 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 954500b60..6b95cf190 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 @@ -1255,8 +1255,8 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels // .Set(SelectedRMLExtension.RMLGuid) // .Build(); - List<ThreadCharacteristicsExelModel> threadCharacteristicsExelModels = new List<ThreadCharacteristicsExelModel>(); - ThreadCharacteristicsExelModel model = new ThreadCharacteristicsExelModel(); + List<ThreadCharacteristicsExcelModel> threadCharacteristicsExelModels = new List<ThreadCharacteristicsExcelModel>(); + ThreadCharacteristicsExcelModel model = new ThreadCharacteristicsExcelModel(); model.ThreadName = ActiveRML.Name; model.Manufacturer = ActiveRML.Manufacturer == null? "": ActiveRML.Manufacturer; model.Brand = ActiveRMLExtension.YarnBrand == null ? "": ActiveRMLExtension.YarnBrand.Name; @@ -1283,18 +1283,33 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels model.Twist = ActiveRMLExtension.TwistTpm; model.TwistDirection = ActiveRMLExtension.YarnTwistDirections.ToDescription(); threadCharacteristicsExelModels.Add(model); - writer.WriteData(threadCharacteristicsExelModels, "Thread characteristics"); - //List<ColorGroup> groups = ActiveCatalog.ColorCatalogsGroups.Select(x => new ColorGroup() - //{ - // GroupColor = x.Color, - // GroupName = x.Name, - // GroupIndex = x.GroupIndex, - //}).ToList(); + writer.WriteData(threadCharacteristicsExelModels, "Thread characteristics", 2); - //writer.WriteData(groups, "Groups"); + List<ColorParametrsExcelModel> colorParametrsExcelList = new List<ColorParametrsExcelModel>(); - //ActiveRMLExtension. + List<TestResultsExcelModel> testResultsExcelModelList = new List<TestResultsExcelModel>(); + foreach(var machine in Machines) + { + if (machine.HasRMLTest) + { + ColorParametrsExcelModel colorParametrsExcelModel = new ColorParametrsExcelModel(); + colorParametrsExcelModel.Thread_name = ActiveRML.Name; + colorParametrsExcelModel.MachineNumber = machine.SerialNumber; + colorParametrsExcelModel.White_point_L = ActiveRML.WhitePointL; + colorParametrsExcelModel.White_point_a = ActiveRML.WhitePointA; + colorParametrsExcelModel.White_point_B = ActiveRML.WhitePointB; + ColorParametersVewVM.WritetoExcel(colorParametrsExcelModel, machine.Guid); + + colorParametrsExcelList.Add(colorParametrsExcelModel); + + TestResultsViewVM.LoadTestResultsExcel(testResultsExcelModelList, machine.Guid, machine.SerialNumber); + } + + } + writer.WriteData(colorParametrsExcelList, "Color parameters",2); + writer.WriteData(testResultsExcelModelList, "Machine tests results", 2); + writer.Dispose(); InvokeUI(() => |