diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-01-14 12:59:52 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-01-14 12:59:52 +0200 |
| commit | f79a334b8aace6374633fd76f08032f07d8c1516 (patch) | |
| tree | 970b89879545e8f6d2339040293d4cc6da069b86 /Software/Visual_Studio | |
| parent | 7ac1bef92888719cc72bb34da1436b7c8b7ae242 (diff) | |
| download | Tango-f79a334b8aace6374633fd76f08032f07d8c1516.tar.gz Tango-f79a334b8aace6374633fd76f08032f07d8c1516.zip | |
Fixed issue where touch numeric textbox is rounding the volumes when moving from RGB/LAB to Volume.
Fixed issue where changing the job thread type does not invalidate the liquid factors!
Diffstat (limited to 'Software/Visual_Studio')
3 files changed, 11 insertions, 16 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs index c61d52592..3a2d64977 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs @@ -675,21 +675,10 @@ namespace Tango.PPC.Jobs.ViewModels protected virtual void OnRmlChanged(object sender, Rml rml) { - //There is no need for that. - - ////Replace all brush stops twine color catalogs. - //foreach (var stop in Job.Segments.SelectMany(x => x.BrushStops).Where(x => x.ColorCatalog != null && x.BrushColorSpace == BL.Enumerations.ColorSpaces.Twine).ToList()) - //{ - // var replacement = CatalogItems.SingleOrDefault(x => x.Name == stop.ColorCatalog.Name); - // stop.ColorCatalog = replacement; - //} - - ////Replace all brush stops coats color catalogs. - //foreach (var stop in Job.Segments.SelectMany(x => x.BrushStops).Where(x => x.ColorCatalog != null && x.BrushColorSpace == BL.Enumerations.ColorSpaces.Coats).ToList()) - //{ - // var replacement = CoatsCatalogItems.SingleOrDefault(x => x.Name == stop.ColorCatalog.Name); - // stop.ColorCatalog = replacement; - //} + foreach (var segment in Job.Segments) + { + SetSegmentLiquidVolumes(segment); + } GetLubricationLevel(); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index d72e75011..efc5f8179 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - <requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> + <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />--> </requestedPrivileges> </security> </trustInfo> diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs index ccb66d009..08edc4c6a 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs @@ -209,6 +209,8 @@ namespace Tango.Touch.Controls { if (_text_box != null && !_prevent_text_change) { + _prevent_text_change = true; + if (StringFormat != null) { _text_box.Text = Value.ToString(StringFormat); @@ -219,6 +221,8 @@ namespace Tango.Touch.Controls } _text_block.Text = _text_box.Text; + + _prevent_text_change = false; } if (Value != _lastValue) @@ -271,6 +275,8 @@ namespace Tango.Touch.Controls private void _text_box_TextChanged(object sender, TextChangedEventArgs e) { + if (_prevent_text_change) return; + double d = 0.0; if (double.TryParse(_text_box.Text, out d)) |