From f131b2573bfb617998927ea1072eb946b800d5e7 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 18 Dec 2018 17:59:41 +0200 Subject: PPC working on tablet ! --- .../Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs index 5ae5c531c..5a5df0d0f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs @@ -196,7 +196,14 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels MachinesProvider = new SuggestionProvider((filter) => { - return _db.Machines.Where(x => x.SerialNumber.StartsWith(filter)).ToList(); + try + { + return _db.Machines.Where(x => x.SerialNumber.StartsWith(filter)).ToList(); + } + catch + { + return new List(); + } }); } -- cgit v1.3.1 From fbf514c96a53c464019290da0412410989dfb3d1 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 19 Dec 2018 17:54:36 +0200 Subject: Improved RML Builder loading time.. --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 20578304 -> 20578304 bytes .../ViewModels/MainViewVM.cs | 2 +- .../ViewModels/MainViewVM.cs | 1 - .../Visual_Studio/Tango.BL/Builders/RmlBuilder.cs | 34 +++++++++------------ 5 files changed, 15 insertions(+), 22 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index c5ed078e6..29c02c4ab 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index 9f4498621..1c5b90031 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index 55ef56ce4..12f69ba7f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -1482,7 +1482,7 @@ namespace Tango.MachineStudio.Developer.ViewModels { LogManager.Log("Invalidating liquid factors, process parameters and process group history..."); - _selectedRML = new RmlBuilder(_activeJobDbContext).Set(SelectedRML).WithAllParametersGroup().WithCAT(SelectedMachine.Guid).WithCCT().WithLiquidFactors().WithMediaProperties().Build(); + _selectedRML = new RmlBuilder(_activeJobDbContext).Set(SelectedRML).WithAllParametersGroup().WithCAT(SelectedMachine.Guid).WithCCT().WithLiquidFactors().Build(); if (_selectedRML.Ccts.Count == 0) { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs index ef6fc816b..f8966b729 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs @@ -206,7 +206,6 @@ namespace Tango.MachineStudio.RML.ViewModels .Set(guid) .WithActiveParametersGroup() .WithLiquidFactors() - .WithMediaProperties() .BuildAsync(); if (ActiveRML.ProcessParametersTablesGroups.ToList().Count == 0) diff --git a/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs index a67a2cf7a..7b5d9b7ff 100644 --- a/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs +++ b/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs @@ -16,16 +16,24 @@ namespace Tango.BL.Builders } + protected override IQueryable OnSetQuery(IQueryable query) + { + return query. + Include(x => x.MediaMaterial). + Include(x => x.MediaColor). + Include(x => x.MediaPurpose). + Include(x => x.MediaCondition). + Include(x => x.LinearMassDensityUnit). + Include(x => x.FiberShape). + Include(x => x.FiberSynth); + } + public virtual RmlBuilder WithAllParametersGroup() { return AddStep(1, () => { - var groups = Context.ProcessParametersTablesGroups.Where(x => x.RmlGuid == Entity.Guid).ToList(); - - foreach (var group in groups) - { - Context.ProcessParametersTables.Where(x => x.ProcessParametersTablesGroupGuid == group.Guid).OrderBy(x => x.TableIndex).ToList(); - } + Context.ProcessParametersTablesGroups.Where(x => x.RmlGuid == Entity.Guid).ToList(); + Context.ProcessParametersTables.Where(x => x.ProcessParametersTablesGroup.RmlGuid == Entity.Guid).OrderBy(x => x.TableIndex).ToList(); }); } @@ -65,19 +73,5 @@ namespace Tango.BL.Builders Context.LiquidTypesRmls.Where(x => x.RmlGuid == Entity.Guid).Include(x => x.LiquidType).OrderBy(x => x.LiquidType.Code).ToList(); }); } - - public virtual RmlBuilder WithMediaProperties() - { - return AddStep(6, () => - { - Context.MediaMaterials.SingleOrDefault(x => x.Guid == Entity.MediaMaterialGuid); - Context.MediaColors.SingleOrDefault(x => x.Guid == Entity.MediaColorGuid); - Context.MediaPurposes.SingleOrDefault(x => x.Guid == Entity.MediaPurposeGuid); - Context.MediaConditions.SingleOrDefault(x => x.Guid == Entity.MediaConditionGuid); - Context.LinearMassDensityUnits.SingleOrDefault(x => x.Guid == Entity.LinearMassDensityUnitGuid); - Context.FiberShapes.SingleOrDefault(x => x.Guid == Entity.FiberShapeGuid); - Context.FiberSynths.SingleOrDefault(x => x.Guid == Entity.FiberSynthGuid); - }); - } } } -- cgit v1.3.1 From 59839a4cf53ce9ef07348926d9cf5f8e8d020c91 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 19 Dec 2018 18:08:24 +0200 Subject: Improved Job Builder speed. --- .../Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs | 9 ++++++++- Software/Visual_Studio/Tango.BL/Builders/JobBuilder.cs | 5 +---- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index 12f69ba7f..333a31802 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -1482,7 +1482,14 @@ namespace Tango.MachineStudio.Developer.ViewModels { LogManager.Log("Invalidating liquid factors, process parameters and process group history..."); - _selectedRML = new RmlBuilder(_activeJobDbContext).Set(SelectedRML).WithAllParametersGroup().WithCAT(SelectedMachine.Guid).WithCCT().WithLiquidFactors().Build(); + if (_selectedRML != ActiveJob.Rml) + { + _selectedRML = new RmlBuilder(_activeJobDbContext).Set(SelectedRML).WithAllParametersGroup().WithCAT(SelectedMachine.Guid).WithCCT().WithLiquidFactors().Build(); + } + else + { + _selectedRML = ActiveJob.Rml; + } if (_selectedRML.Ccts.Count == 0) { diff --git a/Software/Visual_Studio/Tango.BL/Builders/JobBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/JobBuilder.cs index da418a990..3b0d1b0e1 100644 --- a/Software/Visual_Studio/Tango.BL/Builders/JobBuilder.cs +++ b/Software/Visual_Studio/Tango.BL/Builders/JobBuilder.cs @@ -39,10 +39,7 @@ namespace Tango.BL.Builders { return AddStep(2, () => { - foreach (var segment in Entity.Segments.ToList()) - { - Context.BrushStops.Where(x => x.SegmentGuid == segment.Guid).Include(x => x.ColorSpace).Include(x => x.ColorCatalog).OrderBy(x => x.StopIndex).ToList(); - } + Context.BrushStops.Where(x => x.Segment.JobGuid == Entity.Guid).Include(x => x.ColorSpace).Include(x => x.ColorCatalog).OrderBy(x => x.StopIndex).ToList(); }); } -- cgit v1.3.1