aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy.mail.net@gmail.com>2019-05-20 08:15:01 +0300
committerRoy Ben Shabat <Roy.mail.net@gmail.com>2019-05-20 08:15:01 +0300
commitae50a86800fc05bb34b09e2574ed71116be91045 (patch)
tree5413d05d4bd4f7921a19e8cde8c059190e2469c0 /Software/Visual_Studio/MachineStudio/Modules
parent5f6a459aab9a781dc143d8a6eb214408ead6906d (diff)
downloadTango-ae50a86800fc05bb34b09e2574ed71116be91045.tar.gz
Tango-ae50a86800fc05bb34b09e2574ed71116be91045.zip
Added measure as emulated RGB on color capture module.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs6
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs2
2 files changed, 6 insertions, 2 deletions
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 2cf3ed63f..05f66143a 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
@@ -770,6 +770,12 @@ namespace Tango.MachineStudio.ColorCapture.ViewModels
View.SetCardSource(EmulatedImage);
});
+ Rgb rgb = new Rgb(EmulatedR, EmulatedG, EmulatedB);
+ Lab lab = rgb.To<Lab>();
+ MeasureL = lab.L;
+ MeasureA = lab.A;
+ MeasureB = lab.B;
+
PerformDetection(bitmapContainer.ToBitmapSource());
bitmapContainer.Dispose();
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs
index 2759b44dc..87fff47a9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs
@@ -102,8 +102,6 @@ namespace Tango.MachineStudio.ColorCapture.Views
g.CopyFromScreen((int)location.X, (int)location.Y, 0, 0, bmp.Size);
}
- bmp.Save("D:\\Test\\ttt.bmp");
-
using (MemoryStream ms = new MemoryStream())
{
bmp.Save(ms, System.Drawing.Imaging.ImageFormat.Bmp);