From 080f1697e97e13461ec6df4d31c8924d01257a1b Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Tue, 9 Apr 2019 01:47:48 +0300 Subject: MERGE --- .../Modules/MachineStudio.Dispensers/App.config | 26 ++++++++++++++++------ .../Tango.MachineStudio.ColorCapture/App.config | 26 ++++++++++++++++------ .../Models/CaptureConfig.cs | 7 ++++++ .../ViewModels/MainViewVM.cs | 12 ++++++++++ .../Views/MainView.xaml | 9 ++++++++ .../Tango.MachineStudio.ColorLab/app.config | 26 ++++++++++++++++------ .../Modules/Tango.MachineStudio.DB/App.config | 26 ++++++++++++++++------ .../Tango.MachineStudio.DataCapture/app.config | 24 +++++++++++++------- .../Tango.MachineStudio.Developer/app.config | 24 +++++++++++++------- .../app.config | 26 ++++++++++++++++------ .../Modules/Tango.MachineStudio.Logging/App.config | 24 +++++++++++++------- .../Tango.MachineStudio.MachineDesigner/app.config | 24 +++++++++++++------- .../Modules/Tango.MachineStudio.RML/App.config | 26 ++++++++++++++++------ .../Tango.MachineStudio.Statistics/App.config | 26 ++++++++++++++++------ .../Modules/Tango.MachineStudio.Storage/app.config | 26 ++++++++++++++++------ .../Modules/Tango.MachineStudio.Stubs/app.config | 26 ++++++++++++++++------ .../Tango.MachineStudio.Technician/app.config | 26 ++++++++++++++++------ .../Tango.MachineStudio.UsersAndRoles/app.config | 26 ++++++++++++++++------ .../Tango.MachineStudio.Common/app.config | 24 +++++++++++++------- .../Tango.MachineStudio.Publisher.CLI/App.config | 26 ++++++++++++++++------ .../Tango.MachineStudio.Publisher.UI/App.config | 24 +++++++++++++------- .../Tango.MachineStudio.UI/App.config | 26 ++++++++++++++++------ 22 files changed, 371 insertions(+), 139 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio') diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/App.config b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/App.config index 825aaae9e..8f13814dc 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/App.config +++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/App.config @@ -24,7 +24,7 @@ - + @@ -32,27 +32,27 @@ - + - + - + - + - + - + @@ -74,6 +74,18 @@ + + + + + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/App.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/App.config index 8b30e609b..bdee20423 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/App.config +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/App.config @@ -12,7 +12,7 @@ - + @@ -20,27 +20,27 @@ - + - + - + - + - + - + @@ -70,6 +70,18 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Models/CaptureConfig.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Models/CaptureConfig.cs index 9f54837cb..0b74f2b3f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Models/CaptureConfig.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Models/CaptureConfig.cs @@ -103,6 +103,13 @@ namespace Tango.MachineStudio.ColorCapture.Models set { _enableDoubleChecking = value; RaisePropertyChangedAuto(); } } + private bool _enforceBarcodeDetection; + public bool EnforceBarcodeDetection + { + get { return _enforceBarcodeDetection; } + set { _enforceBarcodeDetection = value; RaisePropertyChangedAuto(); } + } + public CaptureConfig() { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs index 21bb0baf0..5ea5747d5 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs @@ -140,6 +140,14 @@ namespace Tango.MachineStudio.ColorCapture.ViewModels set { _similarity = value; RaisePropertyChangedAuto(); } } + private String _barcode; + public String Barcode + { + get { return _barcode; } + set { _barcode = value; RaisePropertyChangedAuto(); } + } + + public RelayCommand ImportBenchmarksCommand { get; set; } public RelayCommand ExportBenchmarksCommand { get; set; } @@ -373,6 +381,7 @@ namespace Tango.MachineStudio.ColorCapture.ViewModels DetectedSource = null; CaptureDeltaEController.Clear(); Similarity = 0; + Barcode = String.Empty; } private void OnSelectedVideoDeviceChanged(CaptureDevice previousDevice, CaptureDevice newDevice) @@ -407,6 +416,7 @@ namespace Tango.MachineStudio.ColorCapture.ViewModels SimilarityTolerance = Config.SimilarityTolerance, HistogramMethod = Config.HistogramComparison, EnableDoubleChecking = Config.EnableDoubleChecking, + EnforceBarcodeDetection = Config.EnforceBarcodeDetection, }); if (result.Similarity > 0) @@ -442,6 +452,8 @@ namespace Tango.MachineStudio.ColorCapture.ViewModels CapturedColor = Color.FromArgb(255, (byte)result.ColorDetectionOutput.RawColor.R, (byte)result.ColorDetectionOutput.RawColor.G, (byte)result.ColorDetectionOutput.RawColor.B); ProcessedColor = Color.FromArgb(255, (byte)result.ColorDetectionOutput.ProcessedColor.R, (byte)result.ColorDetectionOutput.ProcessedColor.G, (byte)result.ColorDetectionOutput.ProcessedColor.B); + Barcode = result.Barcode; + //calculate delta E. Lab measureLab = new Lab(MeasureL, MeasureA, MeasureB); DeltaE = measureLab.Compare(new Rgb(ProcessedColor.R, ProcessedColor.G, ProcessedColor.B), GetDeltaEComparison()); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml index d6f4890d7..ba8e3f281 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml @@ -276,6 +276,11 @@ + + + Barcode: + + @@ -582,6 +587,7 @@ + Columns @@ -637,6 +643,9 @@ Double Checking + + Enforce Barcode Detection + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/app.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/app.config index 96b77fa8f..8d0c46fa1 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/app.config +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/app.config @@ -20,7 +20,7 @@ - + @@ -28,27 +28,27 @@ - + - + - + - + - + - + @@ -74,6 +74,18 @@ + + + + + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/App.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/App.config index 7d3d4b2ec..fdc15d046 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/App.config +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/App.config @@ -26,7 +26,7 @@ - + @@ -34,27 +34,27 @@ - + - + - + - + - + - + @@ -80,6 +80,18 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/app.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/app.config index fa31bbb95..ff251eb7d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/app.config +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/app.config @@ -20,7 +20,7 @@ - + @@ -28,31 +28,31 @@ - + - + - + - + - + - + - + @@ -78,6 +78,14 @@ + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/app.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/app.config index fa31bbb95..ff251eb7d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/app.config +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/app.config @@ -20,7 +20,7 @@ - + @@ -28,31 +28,31 @@ - + - + - + - + - + - + - + @@ -78,6 +78,14 @@ + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/app.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/app.config index 96b77fa8f..8d0c46fa1 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/app.config +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/app.config @@ -20,7 +20,7 @@ - + @@ -28,27 +28,27 @@ - + - + - + - + - + - + @@ -74,6 +74,18 @@ + + + + + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/App.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/App.config index f66a052ae..a8d9dbc13 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/App.config +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/App.config @@ -26,7 +26,7 @@ - + @@ -34,31 +34,31 @@ - + - + - + - + - + - + - + @@ -84,6 +84,14 @@ + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/app.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/app.config index fa31bbb95..ff251eb7d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/app.config +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/app.config @@ -20,7 +20,7 @@ - + @@ -28,31 +28,31 @@ - + - + - + - + - + - + - + @@ -78,6 +78,14 @@ + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/App.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/App.config index 1f0b571a1..f2c34ddba 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/App.config +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/App.config @@ -20,7 +20,7 @@ - + @@ -28,27 +28,27 @@ - + - + - + - + - + - + @@ -74,6 +74,18 @@ + + + + + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/App.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/App.config index 8ea5566ba..ed4582d5b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/App.config +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/App.config @@ -22,7 +22,7 @@ - + @@ -30,27 +30,27 @@ - + - + - + - + - + - + @@ -80,6 +80,18 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/app.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/app.config index 354aeba1d..b18dd5be9 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/app.config +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/app.config @@ -20,7 +20,7 @@ - + @@ -28,27 +28,27 @@ - + - + - + - + - + - + @@ -74,6 +74,18 @@ + + + + + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/app.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/app.config index 96b77fa8f..8d0c46fa1 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/app.config +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/app.config @@ -20,7 +20,7 @@ - + @@ -28,27 +28,27 @@ - + - + - + - + - + - + @@ -74,6 +74,18 @@ + + + + + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/app.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/app.config index 96b77fa8f..8d0c46fa1 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/app.config +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/app.config @@ -20,7 +20,7 @@ - + @@ -28,27 +28,27 @@ - + - + - + - + - + - + @@ -74,6 +74,18 @@ + + + + + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/app.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/app.config index 354aeba1d..b18dd5be9 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/app.config +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/app.config @@ -20,7 +20,7 @@ - + @@ -28,27 +28,27 @@ - + - + - + - + - + - + @@ -74,6 +74,18 @@ + + + + + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/app.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/app.config index fa31bbb95..ff251eb7d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/app.config +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/app.config @@ -20,7 +20,7 @@ - + @@ -28,31 +28,31 @@ - + - + - + - + - + - + - + @@ -78,6 +78,14 @@ + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher.CLI/App.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher.CLI/App.config index 25105196d..23efc27ea 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher.CLI/App.config +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher.CLI/App.config @@ -35,7 +35,7 @@ - + @@ -43,27 +43,27 @@ - + - + - + - + - + - + @@ -73,6 +73,18 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher.UI/App.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher.UI/App.config index 26a23dcd0..be86a48d9 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher.UI/App.config +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher.UI/App.config @@ -19,7 +19,7 @@ - + @@ -27,31 +27,31 @@ - + - + - + - + - + - + - + @@ -81,6 +81,14 @@ + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config index 36619a25b..6f86f99e9 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config @@ -86,7 +86,7 @@ - + @@ -94,27 +94,27 @@ - + - + - + - + - + - + @@ -140,6 +140,18 @@ + + + + + + + + + + + + \ No newline at end of file -- cgit v1.3.1