Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 31 insertions, 24 deletions

diff --git a/Software/Visual_Studio/Tango.UnitTesting/TCC/TCC_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/TCC/TCC_TST.cs
index 475bc68fd..ae5c66f6e 100644
--- a/Software/Visual_Studio/Tango.UnitTesting/TCC/TCC_TST.cs
+++ b/Software/Visual_Studio/Tango.UnitTesting/TCC/TCC_TST.cs
@@ -24,7 +24,7 @@ namespace Tango.UnitTesting.TCC
         [TestMethod]
         public void Detect()
         {
-            var original_bitmap = Directory.GetCurrentDirectory() + "\\TCC\\TCC Resources\\bitmap_ok.bmp";
+            var original_bitmap = Directory.GetCurrentDirectory() + "\\TCC\\TCC Resources\\bitmap.bmp";
 
             using (ColorDetector detector = new ColorDetector())
             {
@@ -35,43 +35,50 @@ namespace Tango.UnitTesting.TCC
                     Rows = 11,
                     TargetIndex = 99,
                     Bitmap = ByteString.CopyFrom(File.ReadAllBytes(original_bitmap)),
-                    DebugMode = true,
+                    RequestColorMatrix = true,
+                    RequestDebugImage = true,
                 };
 
                 var output = detector.Detect(input);
 
-                using (MemoryStream ms = new MemoryStream(output.DebugBitmap.ToArray()))
+                if (input.RequestDebugImage)
                 {
-                    var outputBitmap = TemporaryManager.Default.CreateFile(".bmp");
-                    outputBitmap.Persist = true;
-                    ms.Position = 0;
-                    Bitmap bmp = new Bitmap(ms);
-                    bmp.Save(outputBitmap);
-                    Process.Start(outputBitmap);
+                    using (MemoryStream ms = new MemoryStream(output.DebugBitmap.ToArray()))
+                    {
+                        var outputBitmap = TemporaryManager.Default.CreateFile(".bmp");
+                        outputBitmap.Persist = true;
+                        ms.Position = 0;
+                        Bitmap bmp = new Bitmap(ms);
+                        bmp.Save(outputBitmap);
+                        Process.Start(outputBitmap);
+                    }
                 }
 
-                using (Bitmap colorMatrixBmp = ColorDetector.DetectionOutputToImage(input, output, 300, 320))
+                if (input.RequestColorMatrix)
                 {
-                    var outputBitmap = TemporaryManager.Default.CreateFile(".bmp");
-                    outputBitmap.Persist = true;
-                    colorMatrixBmp.Save(outputBitmap);
-                    Process.Start(outputBitmap);
-                }
+                    using (Bitmap colorMatrixBmp = ColorDetector.DetectionOutputToImage(input, output, 300, 320))
+                    {
+                        var outputBitmap = TemporaryManager.Default.CreateFile(".bmp");
+                        outputBitmap.Persist = true;
+                        colorMatrixBmp.Save(outputBitmap);
+                        Process.Start(outputBitmap);
+                    }
 
-                var benchmarksCsvFile = TemporaryManager.Default.CreateFile(".csv");
-                benchmarksCsvFile.Persist = true;
+                    var benchmarksCsvFile = TemporaryManager.Default.CreateFile(".csv");
+                    benchmarksCsvFile.Persist = true;
 
-                using (CsvFile<DetectionColor> benchmarksRGB = new CsvFile<DetectionColor>(new CsvDestination(benchmarksCsvFile)))
-                {
-                    foreach (var color in output.ColorMatrix)
+                    using (CsvFile<DetectionColor> benchmarksRGB = new CsvFile<DetectionColor>(new CsvDestination(benchmarksCsvFile)))
                     {
-                        benchmarksRGB.Append(color);
+                        foreach (var color in output.ColorMatrix)
+                        {
+                            benchmarksRGB.Append(color);
+                        }
                     }
-                }
 
-                Helper.ShowInExplorer(benchmarksCsvFile);
+                    Helper.ShowInExplorer(benchmarksCsvFile);
 
-                Assert.IsTrue(output.Number == 15);
+                    Assert.IsTrue(output.Number == 15);
+                }
             }
         }