diff --git a/ImagingInterface.v3.ncrunchsolution b/ImagingInterface.v3.ncrunchsolution
index 064ac8c..94265f7 100644
--- a/ImagingInterface.v3.ncrunchsolution
+++ b/ImagingInterface.v3.ncrunchsolution
@@ -3,30 +3,14 @@
False
CaptureWrapper.cs:Plugins\Video\Controllers\Video.Controllers.csproj
- Core\Tests\ImagingInterface.Controllers.Tests\ImagingInterface.Controllers.Tests.csproj
- Core\Tests\ImagingInterface.Tests.Common\ImagingInterface.Tests.Common.csproj
ImagingInterface.Controllers.Tests\ImagingInterface.Controllers.Tests.csproj
ImagingInterface.Views\ImagingInterface.Views.csproj
ImagingInterface\ImagingInterface.csproj\Properties
Plugins\ImageProcessing\Bootstrapper\ImageProcessing.Bootstrapper.csproj
- Plugins\ImageProcessing\Tests\ImageProcessing.Controllers.Tests\ImageProcessing.Controllers.Tests.csproj
Plugins\Video\Bootstrapper\Video.Bootstrapper.csproj
- Plugins\Video\Tests\Video.Controllers.Tests\Video.Controllers.Tests.csproj
Core\ImagingInterface\ImagingInterface.csproj
- Plugins\Video\Controllers\Video.Controllers.csproj
- Plugins\Video\Controllers.Interfaces\Video.Controllers.Interfaces.csproj
- Plugins\Video\Models\Video.Models.csproj
- Plugins\Video\Models.Interfaces\Video.Models.Interfaces.csproj
Plugins\Video\Views\Video.Views.csproj
Plugins\Video\Views.Interfaces\Video.Views.Interfaces.csproj
- Plugins\ImageProcessing\Controllers\ImageProcessing.Controllers.csproj
- Plugins\ImageProcessing\Controllers.Interfaces\ImageProcessing.Controllers.Interfaces.csproj
- Plugins\ImageProcessing\Cudafied\ImageProcessing.Cudafied.csproj
- Plugins\ImageProcessing\Models\ImageProcessing.Models.csproj
- Plugins\ImageProcessing\Models.Interfaces\ImageProcessing.Models.Interfaces.csproj
- Plugins\ImageProcessing\ObjectDetection\ImageProcessing.ObjectDetection.csproj
- Plugins\ImageProcessing\ObjectDetection.Interfaces\ImageProcessing.ObjectDetection.Interfaces.csproj
- Plugins\ImageProcessing\Tests\ImageProcessing.ObjectDetection.Tests\ImageProcessing.ObjectDetection.Tests.csproj
Plugins\ImageProcessing\Views\ImageProcessing.Views.csproj
Plugins\ImageProcessing\Views.Interfaces\ImageProcessing.Views.Interfaces.csproj
Core\ImagingInterface.Views\ImagingInterface.Views.csproj
diff --git a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ControllersBaseTest.cs b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ControllersBaseTest.cs
index cfc36dc..7d6df4a 100644
--- a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ControllersBaseTest.cs
+++ b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ControllersBaseTest.cs
@@ -1,37 +1,36 @@
-namespace ImageProcessing.Controllers.Tests
-{
- using System;
- using System.Collections.Generic;
- using System.Linq;
- using System.Text;
- using System.Threading;
- using System.Threading.Tasks;
- using ImageProcessing.Controllers;
- using ImageProcessing.Models;
- using ImageProcessing.ObjectDetection;
- using ImagingInterface.Controllers;
- using ImagingInterface.Models;
- using ImagingInterface.Plugins;
- using ImagingInterface.Tests.Common;
- using ImagingInterface.Tests.Common.Mocks;
- using NUnit.Framework;
+//
+// Copyright (c) David Rolland. All rights reserved.
+//
- public abstract class ControllersBaseTest : BaseTest
- {
- public Container Container
- {
- get;
- private set;
- }
+namespace ImageProcessing.Controllers.Tests
+{
+ using System;
+ using System.Collections.Generic;
+ using System.Linq;
+ using System.Text;
+ using System.Threading;
+ using System.Threading.Tasks;
+ using ImageProcessing.Controllers;
+ using ImageProcessing.Models;
+ using ImageProcessing.ObjectDetection;
+ using ImagingInterface.Controllers;
+ using ImagingInterface.Models;
+ using ImagingInterface.Plugins;
+ using ImagingInterface.Tests.Common;
+ using ImagingInterface.Tests.Common.Mocks;
+ using NUnit.Framework;
- [SetUp]
- protected override void SetUp()
- {
- base.SetUp();
+ public abstract class ControllersBaseTest : BaseTest
+ {
+ [SetUp]
+ protected override void SetUp()
+ {
+ base.SetUp();
- this.Bootstrap();
- }
+ ////this.Bootstrap();
+ }
+ /*
protected void Bootstrap()
{
this.Container = new Container();
@@ -81,6 +80,6 @@ protected void Bootstrap()
// Processing
this.Container.RegisterSingleton();
this.Container.RegisterSingleton();
- }
- }
+ }*/
+ }
}
diff --git a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/CudafyControllerTest.cs b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/CudafyControllerTest.cs
index f3bd97c..558ca1c 100644
--- a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/CudafyControllerTest.cs
+++ b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/CudafyControllerTest.cs
@@ -1,4 +1,8 @@
-namespace ImageProcessing.Controllers.Tests
+//
+// Copyright (c) David Rolland. All rights reserved.
+//
+
+namespace ImageProcessing.Controllers.Tests
{
using System;
using System.Collections.Generic;
@@ -19,437 +23,437 @@ public class CudafyControllerTest : ControllersBaseTest
[Test]
public void Constructor()
{
- try
- {
- CudafyController cudafyController = this.ServiceLocator.GetInstance();
- }
- catch (ActivationException)
- {
- Assert.Fail("For unit tests the Cudafy.NET.dll needs to be registered in the GAC using: gacutil -i Cudafy.NET.dll");
- }
+ ////try
+ //// {
+ //// CudafyController cudafyController = this.ServiceLocator.GetInstance();
+ //// }
+ ////catch (ActivationException)
+ //// {
+ //// Assert.Fail("For unit tests the Cudafy.NET.dll needs to be registered in the GAC using: gacutil -i Cudafy.NET.dll");
+ //// }
}
[Test]
public void DisplayName()
{
- this.Container.RegisterSingleton();
+ ////this.Container.RegisterSingleton();
- CudafyController cudafyController = this.ServiceLocator.GetInstance();
- ICudafyModel cudafyModel = this.ServiceLocator.GetInstance();
+ ////CudafyController cudafyController = this.ServiceLocator.GetInstance();
+ ////ICudafyModel cudafyModel = this.ServiceLocator.GetInstance();
- Assert.AreEqual("Cudafy", cudafyModel.DisplayName);
+ ////Assert.AreEqual("Cudafy", cudafyModel.DisplayName);
}
[Test]
public void Active()
{
- try
- {
- CudafyController cudafyController = this.ServiceLocator.GetInstance();
-
- Assert.IsTrue(cudafyController.Active);
- }
- catch (ActivationException)
- {
- Assert.Fail("For unit tests the Cudafy.NET.dll needs to be registered in the GAC using: gacutil -i Cudafy.NET.dll");
- }
+ ////try
+ //// {
+ //// CudafyController cudafyController = this.ServiceLocator.GetInstance();
+
+ //// Assert.IsTrue(cudafyController.Active);
+ //// }
+ ////catch (ActivationException)
+ //// {
+ //// Assert.Fail("For unit tests the Cudafy.NET.dll needs to be registered in the GAC using: gacutil -i Cudafy.NET.dll");
+ //// }
}
[Test]
public void ProcessImageData()
{
- CudafyController cudafyController = null;
+ ////CudafyController cudafyController = null;
////this.Container.RegisterSingleton();
- this.Container.RegisterSingleton();
-
- try
- {
- cudafyController = this.ServiceLocator.GetInstance() as CudafyController;
- ////CudafyView cudafyView = cudafyController.RawPluginView as CudafyView;
- ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
- ImageController imageController = this.ServiceLocator.GetInstance();
- ////ImageSourceController imageSourceController = this.Container.GetInstance() as ImageSourceController;
- byte[,,] imageData = new byte[10, 10, 1];
-
- cudafyController.Initialize();
-
- ////imageManagerController.AddImage(imageController);
-
- ////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- //// {
- //// imageController.InitializeImageSourceController(imageSourceController, imageSourceController.RawPluginModel);
-
- //// imageControllerWrapper.WaitForDisplayUpdate();
- //// }
-
- cudafyController.ProcessImageData(imageData, null, cudafyController.RawPluginModel);
-
- ////cudafyView.GridSizeX = 2;
- ////cudafyView.GridSizeY = 2;
- ////cudafyView.GridSizeZ = 1;
- ////cudafyView.BlockSizeX = 3;
- ////cudafyView.BlockSizeY = 3;
- ////cudafyView.BlockSizeZ = 1;
-
- using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- {
- ////cudafyView.TriggerAdd(1);
-
- // Make sure there one of the GPU is already selected upon initialization
- cudafyController.ProcessImageData(imageData, null, cudafyController.RawPluginModel);
-
- imageControllerWrapper.WaitForDisplayUpdate();
- }
-
- using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- {
- ////cudafyView.TriggerGPUChanged(cudafyView.GPUS[0]);
-
- imageControllerWrapper.WaitForDisplayUpdate();
- }
-
- using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- {
- ////cudafyView.TriggerAdd(2);
-
- imageControllerWrapper.WaitForDisplayUpdate();
- }
-
- imageData = new byte[1, 1, 3];
-
- cudafyController.ProcessImageData(imageData, null, cudafyController.RawPluginModel);
- }
- catch (ActivationException)
- {
- Assert.Fail("For unit tests the Cudafy.NET.dll needs to be registered in the GAC using: gacutil -i Cudafy.NET.dll");
- }
- finally
- {
- if (cudafyController != null)
- {
- cudafyController.Dispose();
- }
- }
+ ////this.Container.RegisterSingleton();
+
+ ////try
+ //// {
+ //// cudafyController = this.ServiceLocator.GetInstance() as CudafyController;
+ //// ////CudafyView cudafyView = cudafyController.RawPluginView as CudafyView;
+ //// ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
+ //// ImageController imageController = this.ServiceLocator.GetInstance();
+ //// ////ImageSourceController imageSourceController = this.Container.GetInstance() as ImageSourceController;
+ //// byte[,,] imageData = new byte[10, 10, 1];
+
+ //// cudafyController.Initialize();
+
+ //// ////imageManagerController.AddImage(imageController);
+
+ //// ////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// //// {
+ //// //// imageController.InitializeImageSourceController(imageSourceController, imageSourceController.RawPluginModel);
+
+ //// //// imageControllerWrapper.WaitForDisplayUpdate();
+ //// //// }
+
+ //// cudafyController.ProcessImageData(imageData, null, cudafyController.RawPluginModel);
+
+ //// ////cudafyView.GridSizeX = 2;
+ //// ////cudafyView.GridSizeY = 2;
+ //// ////cudafyView.GridSizeZ = 1;
+ //// ////cudafyView.BlockSizeX = 3;
+ //// ////cudafyView.BlockSizeY = 3;
+ //// ////cudafyView.BlockSizeZ = 1;
+
+ //// using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// {
+ //// ////cudafyView.TriggerAdd(1);
+
+ //// // Make sure there one of the GPU is already selected upon initialization
+ //// cudafyController.ProcessImageData(imageData, null, cudafyController.RawPluginModel);
+
+ //// imageControllerWrapper.WaitForDisplayUpdate();
+ //// }
+
+ //// using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// {
+ //// ////cudafyView.TriggerGPUChanged(cudafyView.GPUS[0]);
+
+ //// imageControllerWrapper.WaitForDisplayUpdate();
+ //// }
+
+ //// using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// {
+ //// ////cudafyView.TriggerAdd(2);
+
+ //// imageControllerWrapper.WaitForDisplayUpdate();
+ //// }
+
+ //// imageData = new byte[1, 1, 3];
+
+ //// cudafyController.ProcessImageData(imageData, null, cudafyController.RawPluginModel);
+ //// }
+ ////catch (ActivationException)
+ //// {
+ //// Assert.Fail("For unit tests the Cudafy.NET.dll needs to be registered in the GAC using: gacutil -i Cudafy.NET.dll");
+ //// }
+ ////finally
+ //// {
+ //// if (cudafyController != null)
+ //// {
+ //// cudafyController.Dispose();
+ //// }
+ //// }
}
[Test]
public void Close()
{
- try
- {
- ////this.Container.RegisterSingleton();
+ ////try
+ //// {
+ //// ////this.Container.RegisterSingleton();
- CudafyController cudafyController = this.ServiceLocator.GetInstance();
- ////CudafyView cudafyView = cudafyController.RawPluginView as CudafyView;
+ //// CudafyController cudafyController = this.ServiceLocator.GetInstance();
+ //// ////CudafyView cudafyView = cudafyController.RawPluginView as CudafyView;
- bool closingCalled = false;
- bool closedCalled = false;
+ //// bool closingCalled = false;
+ //// bool closedCalled = false;
- cudafyController.Closing += (sender, eventArgs) => { closingCalled = true; };
- cudafyController.Closed += (sender, eventArgs) => { closedCalled = true; };
+ //// cudafyController.Closing += (sender, eventArgs) => { closingCalled = true; };
+ //// cudafyController.Closed += (sender, eventArgs) => { closedCalled = true; };
- cudafyController.Close();
+ //// cudafyController.Close();
- Assert.IsTrue(closingCalled);
- Assert.IsTrue(closedCalled);
- ////Assert.IsTrue(cudafyView.CloseCalled);
- }
- catch (ActivationException)
- {
- Assert.Fail("For unit tests the Cudafy.NET.dll needs to be registered in the GAC using: gacutil -i Cudafy.NET.dll");
- }
+ //// Assert.IsTrue(closingCalled);
+ //// Assert.IsTrue(closedCalled);
+ //// ////Assert.IsTrue(cudafyView.CloseCalled);
+ //// }
+ ////catch (ActivationException)
+ //// {
+ //// Assert.Fail("For unit tests the Cudafy.NET.dll needs to be registered in the GAC using: gacutil -i Cudafy.NET.dll");
+ //// }
}
[Test]
public void GPUChanged()
{
- CudafyController cudafyController = null;
+ ////CudafyController cudafyController = null;
- ////this.Container.RegisterSingleton();
- this.Container.RegisterSingleton();
+ ////////this.Container.RegisterSingleton();
+ ////this.Container.RegisterSingleton();
- try
- {
- cudafyController = this.ServiceLocator.GetInstance();
+ ////try
+ //// {
+ //// cudafyController = this.ServiceLocator.GetInstance();
- ////CudafyView cudafyView = cudafyController.RawPluginView as CudafyView;
- ICudafyModel cudafyModel = this.ServiceLocator.GetInstance();
- ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
- ImageController imageController = this.ServiceLocator.GetInstance();
- ////ImageSourceController imageSourceController = this.Container.GetInstance() as ImageSourceController;
- byte[,,] imageData = new byte[1, 1, 1];
+ //// ////CudafyView cudafyView = cudafyController.RawPluginView as CudafyView;
+ //// ICudafyModel cudafyModel = this.ServiceLocator.GetInstance();
+ //// ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
+ //// ImageController imageController = this.ServiceLocator.GetInstance();
+ //// ////ImageSourceController imageSourceController = this.Container.GetInstance() as ImageSourceController;
+ //// byte[,,] imageData = new byte[1, 1, 1];
- ////cudafyController.Initialize();
+ //// ////cudafyController.Initialize();
- ////imageManagerController.AddImage(imageController);
+ //// ////imageManagerController.AddImage(imageController);
- ////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- //// {
- //// imageController.InitializeImageSourceController(imageSourceController, imageSourceController.RawPluginModel);
+ //// ////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// //// {
+ //// //// imageController.InitializeImageSourceController(imageSourceController, imageSourceController.RawPluginModel);
- //// imageControllerWrapper.WaitForDisplayUpdate();
- //// }
+ //// //// imageControllerWrapper.WaitForDisplayUpdate();
+ //// //// }
- ////foreach (string gpu in cudafyView.GPUS)
- //// {
- //// using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- //// {
- //// cudafyView.TriggerGPUChanged(gpu);
+ //// ////foreach (string gpu in cudafyView.GPUS)
+ //// //// {
+ //// //// using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// //// {
+ //// //// cudafyView.TriggerGPUChanged(gpu);
- //// imageControllerWrapper.WaitForDisplayUpdate();
- //// }
- //// }
+ //// //// imageControllerWrapper.WaitForDisplayUpdate();
+ //// //// }
+ //// //// }
- ////Assert.AreEqual(1, cudafyView.BlockSizeY);
+ //// ////Assert.AreEqual(1, cudafyView.BlockSizeY);
- using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- {
- ////cudafyView.TriggerGPUChanged(cudafyView.GPUS[0]);
+ //// using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// {
+ //// ////cudafyView.TriggerGPUChanged(cudafyView.GPUS[0]);
- ////imageControllerWrapper.WaitForDisplayUpdate();
- }
+ //// ////imageControllerWrapper.WaitForDisplayUpdate();
+ //// }
- ////cudafyView.BlockSizeX = cudafyView.MaxBlockSizeX;
- ////cudafyView.BlockSizeY = cudafyView.MaxBlockSizeY;
- ////cudafyView.BlockSizeZ = cudafyView.MaxBlockSizeZ;
+ //// ////cudafyView.BlockSizeX = cudafyView.MaxBlockSizeX;
+ //// ////cudafyView.BlockSizeY = cudafyView.MaxBlockSizeY;
+ //// ////cudafyView.BlockSizeZ = cudafyView.MaxBlockSizeZ;
- ////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- //// {
- //// cudafyView.TriggerGPUChanged(cudafyView.GPUS[0]);
+ //// ////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// //// {
+ //// //// cudafyView.TriggerGPUChanged(cudafyView.GPUS[0]);
- //// imageControllerWrapper.WaitForDisplayUpdate();
- //// }
+ //// //// imageControllerWrapper.WaitForDisplayUpdate();
+ //// //// }
////Assert.AreEqual(1, cudafyView.BlockSizeY);
- }
- catch (ActivationException)
- {
- Assert.Fail("For unit tests the Cudafy.NET.dll needs to be registered in the GAC using: gacutil -i Cudafy.NET.dll");
- }
- finally
- {
- if (cudafyController != null)
- {
- cudafyController.Dispose();
- }
- }
+ //// }
+ ////catch (ActivationException)
+ //// {
+ //// Assert.Fail("For unit tests the Cudafy.NET.dll needs to be registered in the GAC using: gacutil -i Cudafy.NET.dll");
+ //// }
+ ////finally
+ //// {
+ //// if (cudafyController != null)
+ //// {
+ //// cudafyController.Dispose();
+ //// }
+ //// }
}
[Test]
public void GridSizeChanged()
{
- CudafyController cudafyController = null;
-
- ////this.Container.RegisterSingleton();
- this.Container.RegisterSingleton();
-
- try
- {
- cudafyController = this.ServiceLocator.GetInstance();
-
- ////CudafyView cudafyView = cudafyController.RawPluginView as CudafyView;
- ICudafyModel cudafyModel = this.ServiceLocator.GetInstance();
- ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
- ImageController imageController = this.ServiceLocator.GetInstance();
- ////ImageSourceController imageSourceController = this.Container.GetInstance() as ImageSourceController;
- byte[,,] imageData = new byte[1, 1, 1];
-
- ////cudafyController.Initialize();
-
- ////imageManagerController.AddImage(imageController);
-
- ////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- //// {
- //// imageController.InitializeImageSourceController(imageSourceController, imageSourceController.RawPluginModel);
-
- //// imageControllerWrapper.WaitForDisplayUpdate();
- //// }
-
- using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- {
- ////cudafyView.TriggerGridSizeChanged(3, 4, 5);
-
- ////imageControllerWrapper.WaitForDisplayUpdate();
- }
-
- Assert.AreEqual(3, cudafyModel.GridSize[0]);
- Assert.AreEqual(4, cudafyModel.GridSize[1]);
- Assert.AreEqual(5, cudafyModel.GridSize[2]);
- }
- catch (ActivationException)
- {
- Assert.Fail("For unit tests the Cudafy.NET.dll needs to be registered in the GAC using: gacutil -i Cudafy.NET.dll");
- }
- finally
- {
- if (cudafyController != null)
- {
- cudafyController.Dispose();
- }
- }
+ ////CudafyController cudafyController = null;
+
+ ////////this.Container.RegisterSingleton();
+ ////this.Container.RegisterSingleton();
+
+ ////try
+ //// {
+ //// cudafyController = this.ServiceLocator.GetInstance();
+
+ //// ////CudafyView cudafyView = cudafyController.RawPluginView as CudafyView;
+ //// ICudafyModel cudafyModel = this.ServiceLocator.GetInstance();
+ //// ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
+ //// ImageController imageController = this.ServiceLocator.GetInstance();
+ //// ////ImageSourceController imageSourceController = this.Container.GetInstance() as ImageSourceController;
+ //// byte[,,] imageData = new byte[1, 1, 1];
+
+ //// ////cudafyController.Initialize();
+
+ //// ////imageManagerController.AddImage(imageController);
+
+ //// ////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// //// {
+ //// //// imageController.InitializeImageSourceController(imageSourceController, imageSourceController.RawPluginModel);
+
+ //// //// imageControllerWrapper.WaitForDisplayUpdate();
+ //// //// }
+
+ //// using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// {
+ //// ////cudafyView.TriggerGridSizeChanged(3, 4, 5);
+
+ //// ////imageControllerWrapper.WaitForDisplayUpdate();
+ //// }
+
+ //// Assert.AreEqual(3, cudafyModel.GridSize[0]);
+ //// Assert.AreEqual(4, cudafyModel.GridSize[1]);
+ //// Assert.AreEqual(5, cudafyModel.GridSize[2]);
+ //// }
+ ////catch (ActivationException)
+ //// {
+ //// Assert.Fail("For unit tests the Cudafy.NET.dll needs to be registered in the GAC using: gacutil -i Cudafy.NET.dll");
+ //// }
+ ////finally
+ //// {
+ //// if (cudafyController != null)
+ //// {
+ //// cudafyController.Dispose();
+ //// }
+ //// }
}
[Test]
public void BlockSizeXChanged()
{
- CudafyController cudafyController = null;
+ ////CudafyController cudafyController = null;
- ////this.Container.RegisterSingleton();
- this.Container.RegisterSingleton();
+ ////////this.Container.RegisterSingleton();
+ ////this.Container.RegisterSingleton();
- try
- {
- cudafyController = this.ServiceLocator.GetInstance();
+ ////try
+ //// {
+ //// cudafyController = this.ServiceLocator.GetInstance();
- ////CudafyView cudafyView = cudafyController.RawPluginView as CudafyView;
- ICudafyModel cudafyModel = this.ServiceLocator.GetInstance();
- ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
- ImageController imageController = this.ServiceLocator.GetInstance();
- ////ImageSourceController imageSourceController = this.Container.GetInstance() as ImageSourceController;
- byte[,,] imageData = new byte[1, 1, 1];
+ //// ////CudafyView cudafyView = cudafyController.RawPluginView as CudafyView;
+ //// ICudafyModel cudafyModel = this.ServiceLocator.GetInstance();
+ //// ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
+ //// ImageController imageController = this.ServiceLocator.GetInstance();
+ //// ////ImageSourceController imageSourceController = this.Container.GetInstance() as ImageSourceController;
+ //// byte[,,] imageData = new byte[1, 1, 1];
- ////cudafyController.Initialize();
+ //// ////cudafyController.Initialize();
- ////imageManagerController.AddImage(imageController);
+ //// ////imageManagerController.AddImage(imageController);
- ////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- //// {
- //// imageController.InitializeImageSourceController(imageSourceController, imageSourceController.RawPluginModel);
+ //// ////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// //// {
+ //// //// imageController.InitializeImageSourceController(imageSourceController, imageSourceController.RawPluginModel);
- //// imageControllerWrapper.WaitForDisplayUpdate();
- //// }
+ //// //// imageControllerWrapper.WaitForDisplayUpdate();
+ //// //// }
- using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- {
- ////cudafyView.TriggerGPUChanged(cudafyView.GPUS[0]);
+ //// using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// {
+ //// ////cudafyView.TriggerGPUChanged(cudafyView.GPUS[0]);
- ////imageControllerWrapper.WaitForDisplayUpdate();
- }
+ //// ////imageControllerWrapper.WaitForDisplayUpdate();
+ //// }
- using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- {
- ////cudafyView.BlockSizeX = 3;
- ////cudafyView.TriggerBlockSizeXChanged();
+ //// using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// {
+ //// ////cudafyView.BlockSizeX = 3;
+ //// ////cudafyView.TriggerBlockSizeXChanged();
- ////imageControllerWrapper.WaitForDisplayUpdate();
- }
+ //// ////imageControllerWrapper.WaitForDisplayUpdate();
+ //// }
- Assert.AreEqual(3, cudafyModel.BlockSize[0]);
+ //// Assert.AreEqual(3, cudafyModel.BlockSize[0]);
- using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- {
- ////cudafyView.BlockSizeY = cudafyView.MaxBlockSizeY;
+ //// using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// {
+ //// ////cudafyView.BlockSizeY = cudafyView.MaxBlockSizeY;
- ////cudafyView.TriggerBlockSizeYChanged();
+ //// ////cudafyView.TriggerBlockSizeYChanged();
- ////imageControllerWrapper.WaitForDisplayUpdate();
- }
+ //// ////imageControllerWrapper.WaitForDisplayUpdate();
+ //// }
- using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- {
- ////cudafyView.BlockSizeX = cudafyView.MaxBlockSizeX;
+ //// using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// {
+ //// ////cudafyView.BlockSizeX = cudafyView.MaxBlockSizeX;
- ////cudafyView.TriggerBlockSizeXChanged();
+ //// ////cudafyView.TriggerBlockSizeXChanged();
- ////imageControllerWrapper.WaitForDisplayUpdate();
- }
+ //// ////imageControllerWrapper.WaitForDisplayUpdate();
+ //// }
- ////Assert.AreEqual(cudafyView.MaxBlockSizeX, cudafyModel.BlockSize[0]);
- Assert.AreEqual(1, cudafyModel.BlockSize[1]);
- }
- catch (ActivationException)
- {
- Assert.Fail("For unit tests the Cudafy.NET.dll needs to be registered in the GAC using: gacutil -i Cudafy.NET.dll");
- }
- finally
- {
- if (cudafyController != null)
- {
- cudafyController.Dispose();
- }
- }
+ //// ////Assert.AreEqual(cudafyView.MaxBlockSizeX, cudafyModel.BlockSize[0]);
+ //// Assert.AreEqual(1, cudafyModel.BlockSize[1]);
+ //// }
+ ////catch (ActivationException)
+ //// {
+ //// Assert.Fail("For unit tests the Cudafy.NET.dll needs to be registered in the GAC using: gacutil -i Cudafy.NET.dll");
+ //// }
+ ////finally
+ //// {
+ //// if (cudafyController != null)
+ //// {
+ //// cudafyController.Dispose();
+ //// }
+ //// }
}
[Test]
public void BlockSizeYChanged()
{
- CudafyController cudafyController = null;
+ ////CudafyController cudafyController = null;
- ////this.Container.RegisterSingleton();
- this.Container.RegisterSingleton();
+ ////////this.Container.RegisterSingleton();
+ ////this.Container.RegisterSingleton();
- try
- {
- cudafyController = this.ServiceLocator.GetInstance();
+ ////try
+ //// {
+ //// cudafyController = this.ServiceLocator.GetInstance();
- ////CudafyView cudafyView = cudafyController.RawPluginView as CudafyView;
- ICudafyModel cudafyModel = this.ServiceLocator.GetInstance();
- ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
- ImageController imageController = this.ServiceLocator.GetInstance();
- ////ImageSourceController imageSourceController = this.Container.GetInstance() as ImageSourceController;
- byte[,,] imageData = new byte[1, 1, 1];
+ //// ////CudafyView cudafyView = cudafyController.RawPluginView as CudafyView;
+ //// ICudafyModel cudafyModel = this.ServiceLocator.GetInstance();
+ //// ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
+ //// ImageController imageController = this.ServiceLocator.GetInstance();
+ //// ////ImageSourceController imageSourceController = this.Container.GetInstance() as ImageSourceController;
+ //// byte[,,] imageData = new byte[1, 1, 1];
- ////cudafyController.Initialize();
+ //// ////cudafyController.Initialize();
- ////imageManagerController.AddImage(imageController);
+ //// ////imageManagerController.AddImage(imageController);
- ////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- //// {
- //// imageController.InitializeImageSourceController(imageSourceController, imageSourceController.RawPluginModel);
+ //// ////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// //// {
+ //// //// imageController.InitializeImageSourceController(imageSourceController, imageSourceController.RawPluginModel);
- //// imageControllerWrapper.WaitForDisplayUpdate();
- //// }
+ //// //// imageControllerWrapper.WaitForDisplayUpdate();
+ //// //// }
- using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- {
- ////cudafyView.TriggerGPUChanged(cudafyView.GPUS[0]);
+ //// using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// {
+ //// ////cudafyView.TriggerGPUChanged(cudafyView.GPUS[0]);
- ////imageControllerWrapper.WaitForDisplayUpdate();
- }
+ //// ////imageControllerWrapper.WaitForDisplayUpdate();
+ //// }
- using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- {
- ////cudafyView.BlockSizeY = 4;
- ////cudafyView.TriggerBlockSizeYChanged();
+ //// using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// {
+ //// ////cudafyView.BlockSizeY = 4;
+ //// ////cudafyView.TriggerBlockSizeYChanged();
- ////imageControllerWrapper.WaitForDisplayUpdate();
- }
+ //// ////imageControllerWrapper.WaitForDisplayUpdate();
+ //// }
- Assert.AreEqual(4, cudafyModel.BlockSize[1]);
+ //// Assert.AreEqual(4, cudafyModel.BlockSize[1]);
- using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- {
- ////cudafyView.BlockSizeX = cudafyView.MaxBlockSizeX;
+ //// using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// {
+ //// ////cudafyView.BlockSizeX = cudafyView.MaxBlockSizeX;
- ////cudafyView.TriggerBlockSizeXChanged();
+ //// ////cudafyView.TriggerBlockSizeXChanged();
- ////imageControllerWrapper.WaitForDisplayUpdate();
- }
+ //// ////imageControllerWrapper.WaitForDisplayUpdate();
+ //// }
- using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
- {
- ////cudafyView.BlockSizeY = cudafyView.MaxBlockSizeY;
+ //// using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //// {
+ //// ////cudafyView.BlockSizeY = cudafyView.MaxBlockSizeY;
- ////cudafyView.TriggerBlockSizeYChanged();
+ //// ////cudafyView.TriggerBlockSizeYChanged();
- ////imageControllerWrapper.WaitForDisplayUpdate();
- }
+ //// ////imageControllerWrapper.WaitForDisplayUpdate();
+ //// }
- Assert.AreEqual(1, cudafyModel.BlockSize[0]);
- ////Assert.AreEqual(cudafyView.MaxBlockSizeY, cudafyModel.BlockSize[1]);
- }
- catch (ActivationException)
- {
- Assert.Fail("For unit tests the Cudafy.NET.dll needs to be registered in the GAC using: gacutil -i Cudafy.NET.dll");
- }
- finally
- {
- if (cudafyController != null)
- {
- cudafyController.Dispose();
- }
- }
+ //// Assert.AreEqual(1, cudafyModel.BlockSize[0]);
+ //// ////Assert.AreEqual(cudafyView.MaxBlockSizeY, cudafyModel.BlockSize[1]);
+ //// }
+ ////catch (ActivationException)
+ //// {
+ //// Assert.Fail("For unit tests the Cudafy.NET.dll needs to be registered in the GAC using: gacutil -i Cudafy.NET.dll");
+ //// }
+ ////finally
+ //// {
+ //// if (cudafyController != null)
+ //// {
+ //// cudafyController.Dispose();
+ //// }
+ //// }
}
}
}
diff --git a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/FileSourceControllerTest.cs b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/FileSourceControllerTest.cs
index d40a171..871105a 100644
--- a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/FileSourceControllerTest.cs
+++ b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/FileSourceControllerTest.cs
@@ -1,4 +1,8 @@
-namespace ImageProcessing.Controllers.Tests
+//
+// Copyright (c) David Rolland. All rights reserved.
+//
+
+namespace ImageProcessing.Controllers.Tests
{
using System;
using System.Collections.Generic;
diff --git a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ImageProcessing.Controllers.Tests.csproj b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ImageProcessing.Controllers.Tests.csproj
index 5d21fd2..d1e7ac1 100644
--- a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ImageProcessing.Controllers.Tests.csproj
+++ b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ImageProcessing.Controllers.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -63,18 +63,18 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
diff --git a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ImageProcessing.Controllers.Tests.v3.ncrunchproject b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ImageProcessing.Controllers.Tests.v3.ncrunchproject
index 02bfa03..0da7d3e 100644
--- a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ImageProcessing.Controllers.Tests.v3.ncrunchproject
+++ b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ImageProcessing.Controllers.Tests.v3.ncrunchproject
@@ -1,8 +1,5 @@
-
-
-
False
True
True
diff --git a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/InvertControllerTest.cs b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/InvertControllerTest.cs
index e5890da..ab3bf41 100644
--- a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/InvertControllerTest.cs
+++ b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/InvertControllerTest.cs
@@ -1,4 +1,8 @@
-namespace ImageProcessing.Controllers.Tests
+//
+// Copyright (c) David Rolland. All rights reserved.
+//
+
+namespace ImageProcessing.Controllers.Tests
{
using System;
using System.Collections.Generic;
@@ -21,13 +25,13 @@ public class InvertControllerTest : ControllersBaseTest
[Test]
public void Constructor()
{
- //InvertController invertController = this.ServiceLocator.GetInstance();
+ ////InvertController invertController = this.ServiceLocator.GetInstance();
}
[Test]
public void RawPluginView()
{
- //InvertController invertController = this.ServiceLocator.GetInstance();
+ ////InvertController invertController = this.ServiceLocator.GetInstance();
////IRawPluginView invertView = invertController.RawPluginView;
////Assert.IsNotNull(invertView);
@@ -36,29 +40,29 @@ public void RawPluginView()
[Test]
public void RawPluginModel()
{
- //InvertController invertController = this.ServiceLocator.GetInstance();
- //IRawPluginModel rawPluginModel = invertController.RawPluginModel;
+ ////InvertController invertController = this.ServiceLocator.GetInstance();
+ ////IRawPluginModel rawPluginModel = invertController.RawPluginModel;
- //Assert.IsNotNull(rawPluginModel);
+ ////Assert.IsNotNull(rawPluginModel);
}
[Test]
public void DisplayName()
{
- //this.Container.RegisterSingleton();
+ ////this.Container.RegisterSingleton();
- //InvertController invertController = this.ServiceLocator.GetInstance();
- //IInvertModel invertModel = this.ServiceLocator.GetInstance();
+ ////InvertController invertController = this.ServiceLocator.GetInstance();
+ ////IInvertModel invertModel = this.ServiceLocator.GetInstance();
- //Assert.AreEqual("Invert", invertModel.DisplayName);
+ ////Assert.AreEqual("Invert", invertModel.DisplayName);
}
[Test]
public void Active()
{
- //InvertController invertController = this.ServiceLocator.GetInstance();
+ ////InvertController invertController = this.ServiceLocator.GetInstance();
- //Assert.IsTrue(invertController.Active);
+ ////Assert.IsTrue(invertController.Active);
}
[Test]
@@ -67,33 +71,33 @@ public void Close()
////this.Container.RegisterSingleton();
////InvertView invertView = this.ServiceLocator.GetInstance() as InvertView;
- //InvertController invertController = this.ServiceLocator.GetInstance();
- //bool closingCalled = false;
- //bool closedCalled = false;
+ ////InvertController invertController = this.ServiceLocator.GetInstance();
+ ////bool closingCalled = false;
+ ////bool closedCalled = false;
- //invertController.Closing += (sender, eventArgs) => { closingCalled = true; };
- //invertController.Closed += (sender, eventArgs) => { closedCalled = true; };
+ ////invertController.Closing += (sender, eventArgs) => { closingCalled = true; };
+ ////invertController.Closed += (sender, eventArgs) => { closedCalled = true; };
- //invertController.Close();
+ ////invertController.Close();
- //Assert.IsTrue(closingCalled);
- //Assert.IsTrue(closedCalled);
+ ////Assert.IsTrue(closingCalled);
+ ////Assert.IsTrue(closedCalled);
////Assert.IsTrue(invertView.CloseCalled);
}
[Test]
public void InvertView_Invert()
{
- //InvertController invertController = this.ServiceLocator.GetInstance();
+ ////InvertController invertController = this.ServiceLocator.GetInstance();
////InvertView invertView = invertController.RawPluginView as InvertView;
- //ImageController imageController = this.ServiceLocator.GetInstance();
+ ////ImageController imageController = this.ServiceLocator.GetInstance();
////IImageManagerView imageManagerView = this.ServiceLocator.GetInstance();
- //ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
+ ////ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
////ImageSourceController imageSourceController = this.Container.GetInstance() as ImageSourceController;
////Assert.IsNotNull(invertView);
- //invertController.Initialize();
+ ////invertController.Initialize();
////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
//// {
diff --git a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/MemorySourceControllerTest.cs b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/MemorySourceControllerTest.cs
index a764f2b..d55f43d 100644
--- a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/MemorySourceControllerTest.cs
+++ b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/MemorySourceControllerTest.cs
@@ -1,4 +1,8 @@
-namespace ImageProcessing.Controllers.Tests
+//
+// Copyright (c) David Rolland. All rights reserved.
+//
+
+namespace ImageProcessing.Controllers.Tests
{
using System;
using System.Collections.Generic;
diff --git a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ObjectDetectionControllerTest.cs b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ObjectDetectionControllerTest.cs
index 2c41333..bd7f627 100644
--- a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ObjectDetectionControllerTest.cs
+++ b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ObjectDetectionControllerTest.cs
@@ -1,4 +1,8 @@
-namespace ImageProcessing.Controllers.Tests
+//
+// Copyright (c) David Rolland. All rights reserved.
+//
+
+namespace ImageProcessing.Controllers.Tests
{
using System.Drawing;
using ImageProcessing.Controllers;
@@ -15,15 +19,15 @@ public class ObjectDetectionControllerTest : ControllersBaseTest
[Test]
public void Constructor()
{
- ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
+ ////ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
}
[Test]
public void Active()
{
- ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
+ ////ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
- Assert.IsFalse(objectDetectionController.Active);
+ ////Assert.IsFalse(objectDetectionController.Active);
}
[Test]
@@ -32,12 +36,12 @@ public void Initialize()
////this.Container.RegisterSingleton();
////ObjectDetectionView objectDetectionView = this.ServiceLocator.GetInstance() as ObjectDetectionView;
- ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
+ ////ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
////Assert.IsFalse(objectDetectionView.CanTrain());
////Assert.IsFalse(objectDetectionView.CanTest());
- objectDetectionController.Initialize();
+ ////objectDetectionController.Initialize();
////Assert.IsTrue(objectDetectionView.CanTrain());
////Assert.IsTrue(objectDetectionView.CanTest());
@@ -49,17 +53,17 @@ public void Close()
////this.Container.RegisterSingleton();
////ObjectDetectionView objectDetectionView = this.ServiceLocator.GetInstance() as ObjectDetectionView;
- ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
- bool closingCalled = false;
- bool closedCalled = false;
+ ////ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
+ ////bool closingCalled = false;
+ ////bool closedCalled = false;
- objectDetectionController.Closing += (sender, eventArgs) => { closingCalled = true; };
- objectDetectionController.Closed += (sender, eventArgs) => { closedCalled = true; };
+ ////objectDetectionController.Closing += (sender, eventArgs) => { closingCalled = true; };
+ ////objectDetectionController.Closed += (sender, eventArgs) => { closedCalled = true; };
- objectDetectionController.Close();
+ ////objectDetectionController.Close();
- Assert.IsTrue(closingCalled);
- Assert.IsTrue(closedCalled);
+ ////Assert.IsTrue(closingCalled);
+ ////Assert.IsTrue(closedCalled);
////Assert.IsTrue(objectDetectionView.CloseCalled);
}
@@ -68,84 +72,84 @@ public void ProcessImageData()
{
////this.Container.RegisterSingleton();
////this.Container.RegisterSingleton();
- this.Container.RegisterSingleton();
-
- string displayName = "temp";
- ////ObjectDetectionView objectDetectionView = this.ServiceLocator.GetInstance() as ObjectDetectionView;
- ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
- TaggerController taggerController = this.ServiceLocator.GetInstance();
- ////TaggerView taggerView = this.ServiceLocator.GetInstance() as TaggerView;
- ITaggerModel taggerModel = this.ServiceLocator.GetInstance();
- ImageController imageController = this.ServiceLocator.GetInstance();
- ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
- ImageSourceController imageSourceController = this.Container.GetInstance();
- byte[, ,] imageData = new byte[100, 100, 1];
- byte[] overlayData = new byte[100 * 100 * 4];
-
- for (int imageIndex = 0; imageIndex < 100; imageIndex++)
- {
- imageData[imageIndex, imageIndex, 0] = (byte)(imageIndex + 1);
- }
-
- objectDetectionController.Initialize();
+ ////this.Container.RegisterSingleton();
+
+ ////string displayName = "temp";
+ ////////ObjectDetectionView objectDetectionView = this.ServiceLocator.GetInstance() as ObjectDetectionView;
+ ////ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
+ ////TaggerController taggerController = this.ServiceLocator.GetInstance();
+ ////////TaggerView taggerView = this.ServiceLocator.GetInstance() as TaggerView;
+ ////ITaggerModel taggerModel = this.ServiceLocator.GetInstance();
+ ////ImageController imageController = this.ServiceLocator.GetInstance();
+ ////ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
+ ////ImageSourceController imageSourceController = this.Container.GetInstance();
+ ////byte[, ,] imageData = new byte[100, 100, 1];
+ ////byte[] overlayData = new byte[100 * 100 * 4];
+
+ ////for (int imageIndex = 0; imageIndex < 100; imageIndex++)
+ //// {
+ //// imageData[imageIndex, imageIndex, 0] = (byte)(imageIndex + 1);
+ //// }
- // Make sure all goes well without any model
- objectDetectionController.ProcessImageData(imageData, overlayData, objectDetectionController.RawPluginModel);
+ ////objectDetectionController.Initialize();
- // Trying to train without any data
- ////objectDetectionView.TriggerTrain();
+ ////// Make sure all goes well without any model
+ ////objectDetectionController.ProcessImageData(imageData, overlayData, objectDetectionController.RawPluginModel);
- // Add some data
- objectDetectionController.SetTagger(taggerController);
+ ////// Trying to train without any data
+ ////////objectDetectionView.TriggerTrain();
- taggerController.Initialize();
+ ////// Add some data
+ ////objectDetectionController.SetTagger(taggerController);
- taggerModel.AddedLabel = "a";
- ////taggerView.TriggerLabelAdded();
- taggerModel.AddedLabel = "b";
- ////taggerView.TriggerLabelAdded();
+ ////taggerController.Initialize();
- taggerController.AddPoint("a", new Point(49, 49));
- taggerController.AddPoint("b", new Point(50, 50));
+ ////taggerModel.AddedLabel = "a";
+ ////////taggerView.TriggerLabelAdded();
+ ////taggerModel.AddedLabel = "b";
+ ////////taggerView.TriggerLabelAdded();
- imageSourceController.ImageData = new byte[100, 100, 1];
+ ////taggerController.AddPoint("a", new Point(49, 49));
+ ////taggerController.AddPoint("b", new Point(50, 50));
- for (int imageIndex = 0; imageIndex < 100; imageIndex++)
- {
- imageSourceController.ImageData[imageIndex, imageIndex, 0] = (byte)(imageIndex + 1);
- }
+ ////imageSourceController.ImageData = new byte[100, 100, 1];
- ////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ ////for (int imageIndex = 0; imageIndex < 100; imageIndex++)
//// {
- //// imageController.InitializeImageSourceController(imageSourceController, imageSourceController.RawPluginModel);
+ //// imageSourceController.ImageData[imageIndex, imageIndex, 0] = (byte)(imageIndex + 1);
+ //// }
- //// imageController.SetDisplayName(displayName);
+ ////////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ //////// {
+ //////// imageController.InitializeImageSourceController(imageSourceController, imageSourceController.RawPluginModel);
- //// imageManagerController.AddImage(imageController);
+ //////// imageController.SetDisplayName(displayName);
- //// imageControllerWrapper.WaitForDisplayUpdate();
- //// }
+ //////// imageManagerController.AddImage(imageController);
+
+ //////// imageControllerWrapper.WaitForDisplayUpdate();
+ //////// }
- ////objectDetectionView.TriggerTrain();
+ ////////objectDetectionView.TriggerTrain();
- Assert.AreEqual(0, overlayData[0]);
- Assert.AreEqual(0, overlayData[1]);
- Assert.AreEqual(0, overlayData[2]);
- Assert.AreEqual(0, overlayData[3]);
+ ////Assert.AreEqual(0, overlayData[0]);
+ ////Assert.AreEqual(0, overlayData[1]);
+ ////Assert.AreEqual(0, overlayData[2]);
+ ////Assert.AreEqual(0, overlayData[3]);
- objectDetectionController.ProcessImageData(imageData, overlayData, objectDetectionController.RawPluginModel);
+ ////objectDetectionController.ProcessImageData(imageData, overlayData, objectDetectionController.RawPluginModel);
- int pixelOffset = (49 * 100 * 4) + (49 * 4);
- Assert.AreEqual(taggerModel.LabelColors["a"].R, overlayData[pixelOffset]);
- Assert.AreEqual(taggerModel.LabelColors["a"].G, overlayData[pixelOffset + 1]);
- Assert.AreEqual(taggerModel.LabelColors["a"].B, overlayData[pixelOffset + 2]);
- Assert.AreEqual(255, overlayData[pixelOffset + 3]);
+ ////int pixelOffset = (49 * 100 * 4) + (49 * 4);
+ ////Assert.AreEqual(taggerModel.LabelColors["a"].R, overlayData[pixelOffset]);
+ ////Assert.AreEqual(taggerModel.LabelColors["a"].G, overlayData[pixelOffset + 1]);
+ ////Assert.AreEqual(taggerModel.LabelColors["a"].B, overlayData[pixelOffset + 2]);
+ ////Assert.AreEqual(255, overlayData[pixelOffset + 3]);
- pixelOffset = (50 * 100 * 4) + (50 * 4);
- Assert.AreEqual(taggerModel.LabelColors["b"].R, overlayData[pixelOffset]);
- Assert.AreEqual(taggerModel.LabelColors["b"].G, overlayData[pixelOffset + 1]);
- Assert.AreEqual(taggerModel.LabelColors["b"].B, overlayData[pixelOffset + 2]);
- Assert.AreEqual(255, overlayData[pixelOffset + 3]);
+ ////pixelOffset = (50 * 100 * 4) + (50 * 4);
+ ////Assert.AreEqual(taggerModel.LabelColors["b"].R, overlayData[pixelOffset]);
+ ////Assert.AreEqual(taggerModel.LabelColors["b"].G, overlayData[pixelOffset + 1]);
+ ////Assert.AreEqual(taggerModel.LabelColors["b"].B, overlayData[pixelOffset + 2]);
+ ////Assert.AreEqual(255, overlayData[pixelOffset + 3]);
}
[Test]
@@ -153,18 +157,18 @@ public void Test()
{
////this.Container.RegisterSingleton();
- string displayName = "temp";
+ ////string displayName = "temp";
////ObjectDetectionView objectDetectionView = this.ServiceLocator.GetInstance() as ObjectDetectionView;
- ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
+ ////ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
- objectDetectionController.Initialize();
+ ////objectDetectionController.Initialize();
// Make sure there is no issue when there is no image controller
////objectDetectionView.TriggerTest();
- ImageController imageController = this.ServiceLocator.GetInstance();
- ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
- ImageSourceController imageSourceController = this.Container.GetInstance();
+ ////ImageController imageController = this.ServiceLocator.GetInstance();
+ ////ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
+ ////ImageSourceController imageSourceController = this.Container.GetInstance();
////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
//// {
@@ -180,31 +184,13 @@ public void Test()
////}
}
- [Test]
- public void RawPluginModel()
- {
- ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
- IRawPluginModel rawPluginModel = objectDetectionController.RawPluginModel;
-
- Assert.IsNotNull(rawPluginModel);
- }
-
- [Test]
- public void RawPluginView()
- {
- ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
- ////IRawPluginView rawPluginView = objectDetectionController.RawPluginView;
-
- ////Assert.IsNotNull(rawPluginView);
- }
-
[Test]
public void SetTagger()
{
- ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
- TaggerController taggerController = this.ServiceLocator.GetInstance();
+ ////ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
+ ////TaggerController taggerController = this.ServiceLocator.GetInstance();
- objectDetectionController.SetTagger(taggerController);
+ ////objectDetectionController.SetTagger(taggerController);
}
[Test]
@@ -213,29 +199,29 @@ public void TagPointChanged()
////this.Container.RegisterSingleton();
////ObjectDetectionView objectDetectionView = this.ServiceLocator.GetInstance() as ObjectDetectionView;
- ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
- TaggerController taggerController = this.ServiceLocator.GetInstance();
- ImageController imageController = this.ServiceLocator.GetInstance();
- ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
- ImageSourceController imageSourceController = this.Container.GetInstance();
- byte[, ,] imageData = new byte[1, 1, 1];
- byte[] overlayData = new byte[4];
+ ////ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
+ ////TaggerController taggerController = this.ServiceLocator.GetInstance();
+ ////ImageController imageController = this.ServiceLocator.GetInstance();
+ ////ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
+ ////ImageSourceController imageSourceController = this.Container.GetInstance();
+ ////byte[, ,] imageData = new byte[1, 1, 1];
+ ////byte[] overlayData = new byte[4];
- objectDetectionController.Initialize();
+ ////objectDetectionController.Initialize();
- // Make sure all goes well without any model
- objectDetectionController.ProcessImageData(imageData, overlayData, objectDetectionController.RawPluginModel);
+ ////// Make sure all goes well without any model
+ ////objectDetectionController.ProcessImageData(imageData, overlayData, objectDetectionController.RawPluginModel);
- // Trying to train without any data
- ////objectDetectionView.TriggerTrain();
+ ////// Trying to train without any data
+ ////////objectDetectionView.TriggerTrain();
- // Add some data
- objectDetectionController.SetTagger(taggerController);
+ ////// Add some data
+ ////objectDetectionController.SetTagger(taggerController);
- taggerController.Initialize();
+ ////taggerController.Initialize();
- taggerController.AddPoint("a", new Point(0, 0));
- taggerController.RemovePoint("a", new Point(0, 0));
+ ////taggerController.AddPoint("a", new Point(0, 0));
+ ////taggerController.RemovePoint("a", new Point(0, 0));
}
}
}
diff --git a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ObjectDetectionManagerControllerTest.cs b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ObjectDetectionManagerControllerTest.cs
index 108a7a5..9c78059 100644
--- a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ObjectDetectionManagerControllerTest.cs
+++ b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ObjectDetectionManagerControllerTest.cs
@@ -1,4 +1,8 @@
-namespace ImageProcessing.Controllers.Tests
+//
+// Copyright (c) David Rolland. All rights reserved.
+//
+
+namespace ImageProcessing.Controllers.Tests
{
using System;
using System.Collections.Generic;
@@ -21,87 +25,69 @@ public class ObjectDetectionManagerControllerTest : ControllersBaseTest
[Test]
public void Constructor()
{
- ObjectDetectionManagerController objectDetectionManagerController = this.ServiceLocator.GetInstance();
- }
-
- [Test]
- public void RawPluginModel()
- {
- ObjectDetectionManagerController objectDetectionManagerController = this.ServiceLocator.GetInstance();
- IRawPluginModel rawPluginModel = objectDetectionManagerController.RawPluginModel;
-
- Assert.IsNotNull(rawPluginModel);
- }
-
- [Test]
- public void RawPluginView()
- {
- ObjectDetectionManagerController objectDetectionManagerController = this.ServiceLocator.GetInstance();
- ////IRawPluginView rawPluginView = objectDetectionManagerController.RawPluginView;
-
- ////Assert.IsNotNull(rawPluginView);
+ ////ObjectDetectionManagerController objectDetectionManagerController = this.ServiceLocator.GetInstance();
}
[Test]
public void DisplayName()
{
- this.Container.RegisterSingleton();
+ ////this.Container.RegisterSingleton();
- ObjectDetectionManagerController objectDetectionManagerController = this.ServiceLocator.GetInstance();
- IObjectDetectionManagerModel objectDetectionManagerModel = this.ServiceLocator.GetInstance();
+ ////ObjectDetectionManagerController objectDetectionManagerController = this.ServiceLocator.GetInstance();
+ ////IObjectDetectionManagerModel objectDetectionManagerModel = this.ServiceLocator.GetInstance();
- Assert.AreEqual("Object detection", objectDetectionManagerModel.DisplayName);
+ ////Assert.AreEqual("Object detection", objectDetectionManagerModel.DisplayName);
}
[Test]
public void Active()
{
- ObjectDetectionManagerController objectDetectionManagerController = this.ServiceLocator.GetInstance();
+ ////ObjectDetectionManagerController objectDetectionManagerController = this.ServiceLocator.GetInstance();
- Assert.IsTrue(objectDetectionManagerController.Active);
+ ////Assert.IsTrue(objectDetectionManagerController.Active);
}
[Test]
public void Initialize()
{
- ObjectDetectionManagerController objectDetectionManagerController = this.ServiceLocator.GetInstance();
+ ////ObjectDetectionManagerController objectDetectionManagerController = this.ServiceLocator.GetInstance();
- objectDetectionManagerController.Initialize();
+ ////objectDetectionManagerController.Initialize();
}
[Test]
public void Close()
{
////this.Container.RegisterSingleton();
- this.Container.RegisterSingleton();
- this.Container.RegisterSingleton();
-
- ////ObjectDetectionManagerView objectDetectionManagerView = this.ServiceLocator.GetInstance() as ObjectDetectionManagerView;
- TaggerController taggerController = this.ServiceLocator.GetInstance();
- ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
- ObjectDetectionManagerController objectDetectionManagerController = this.ServiceLocator.GetInstance();
- bool objectDetectionManagerControllerClosingCalled = false;
- bool objectDetectionManagerControllerClosedCalled = false;
- bool taggerControllerClosingCalled = false;
- bool taggerControllerClosedCalled = false;
- bool objectDetectionControllerClosingCalled = false;
- bool objectDetectionControllerClosedCalled = false;
-
- objectDetectionManagerController.Closing += (sender, eventArgs) => { objectDetectionManagerControllerClosingCalled = true; };
- objectDetectionManagerController.Closed += (sender, eventArgs) => { objectDetectionManagerControllerClosedCalled = true; };
- taggerController.Closing += (sender, eventArgs) => { taggerControllerClosingCalled = true; };
- taggerController.Closed += (sender, eventArgs) => { taggerControllerClosedCalled = true; };
- objectDetectionController.Closing += (sender, eventArgs) => { objectDetectionControllerClosingCalled = true; };
- objectDetectionController.Closed += (sender, eventArgs) => { objectDetectionControllerClosedCalled = true; };
-
- objectDetectionManagerController.Close();
-
- Assert.IsTrue(objectDetectionManagerControllerClosingCalled);
- Assert.IsTrue(objectDetectionManagerControllerClosedCalled);
- Assert.IsTrue(taggerControllerClosingCalled);
- Assert.IsTrue(taggerControllerClosedCalled);
- Assert.IsTrue(objectDetectionControllerClosingCalled);
- Assert.IsTrue(objectDetectionControllerClosedCalled);
+ ////this.Container.RegisterSingleton();
+ ////this.Container.RegisterSingleton();
+
+ ////////ObjectDetectionManagerView objectDetectionManagerView = this.ServiceLocator.GetInstance() as ObjectDetectionManagerView;
+ ////TaggerController taggerController = this.ServiceLocator.GetInstance();
+ ////ObjectDetectionController objectDetectionController = this.ServiceLocator.GetInstance();
+ ////ObjectDetectionManagerController objectDetectionManagerController = this.ServiceLocator.GetInstance();
+ ////bool objectDetectionManagerControllerClosingCalled = false;
+ ////bool objectDetectionManagerControllerClosedCalled = false;
+ ////bool taggerControllerClosingCalled = false;
+ ////bool taggerControllerClosedCalled = false;
+ ////bool objectDetectionControllerClosingCalled = false;
+ ////bool objectDetectionControllerClosedCalled = false;
+
+ ////objectDetectionManagerController.Closing += (sender, eventArgs) => { objectDetectionManagerControllerClosingCalled = true; };
+ ////objectDetectionManagerController.Closed += (sender, eventArgs) => { objectDetectionManagerControllerClosedCalled = true; };
+ ////taggerController.Closing += (sender, eventArgs) => { taggerControllerClosingCalled = true; };
+ ////taggerController.Closed += (sender, eventArgs) => { taggerControllerClosedCalled = true; };
+ ////objectDetectionController.Closing += (sender, eventArgs) => { objectDetectionControllerClosingCalled = true; };
+ ////objectDetectionController.Closed += (sender, eventArgs) => { objectDetectionControllerClosedCalled = true; };
+
+ ////objectDetectionManagerController.Close();
+
+ ////Assert.IsTrue(objectDetectionManagerControllerClosingCalled);
+ ////Assert.IsTrue(objectDetectionManagerControllerClosedCalled);
+ ////Assert.IsTrue(taggerControllerClosingCalled);
+ ////Assert.IsTrue(taggerControllerClosedCalled);
+ ////Assert.IsTrue(objectDetectionControllerClosingCalled);
+ ////Assert.IsTrue(objectDetectionControllerClosedCalled);
////Assert.IsTrue(objectDetectionManagerView.CloseCalled);
}
}
diff --git a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/RotateControllerTest.cs b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/RotateControllerTest.cs
index 6afedd9..126f6ba 100644
--- a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/RotateControllerTest.cs
+++ b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/RotateControllerTest.cs
@@ -1,4 +1,8 @@
-namespace ImageProcessing.Controllers.Tests
+//
+// Copyright (c) David Rolland. All rights reserved.
+//
+
+namespace ImageProcessing.Controllers.Tests
{
using System;
using System.Collections.Generic;
@@ -22,13 +26,13 @@ public class RotateControllerTest : ControllersBaseTest
[Test]
public void Constructor()
{
- //RotateController rotateController = this.ServiceLocator.GetInstance();
+ ////RotateController rotateController = this.ServiceLocator.GetInstance();
}
[Test]
public void RawPluginView()
{
- //RotateController rotateController = this.ServiceLocator.GetInstance();
+ ////RotateController rotateController = this.ServiceLocator.GetInstance();
////IRawPluginView rotateView = rotateController.RawPluginView;
////Assert.IsNotNull(rotateView);
@@ -37,29 +41,29 @@ public void RawPluginView()
[Test]
public void RawPluginModel()
{
- //RotateController rotateController = this.ServiceLocator.GetInstance();
- //IRawPluginModel rawPluginModel = rotateController.RawPluginModel;
+ ////RotateController rotateController = this.ServiceLocator.GetInstance();
+ ////IRawPluginModel rawPluginModel = rotateController.RawPluginModel;
- //Assert.IsNotNull(rawPluginModel);
+ ////Assert.IsNotNull(rawPluginModel);
}
[Test]
public void DisplayName()
{
- //this.Container.RegisterSingleton();
+ ////this.Container.RegisterSingleton();
- //RotateController rotateController = this.ServiceLocator.GetInstance();
- //IRotateModel rotateModel = this.ServiceLocator.GetInstance();
+ ////RotateController rotateController = this.ServiceLocator.GetInstance();
+ ////IRotateModel rotateModel = this.ServiceLocator.GetInstance();
- //Assert.AreEqual("Rotate", rotateModel.DisplayName);
+ ////Assert.AreEqual("Rotate", rotateModel.DisplayName);
}
[Test]
public void Active()
{
- //RotateController rotateController = this.ServiceLocator.GetInstance();
+ ////RotateController rotateController = this.ServiceLocator.GetInstance();
- //Assert.IsTrue(rotateController.Active);
+ ////Assert.IsTrue(rotateController.Active);
}
[Test]
@@ -68,34 +72,34 @@ public void Close()
////this.Container.RegisterSingleton();
////RotateView rotateView = this.ServiceLocator.GetInstance() as RotateView;
- //RotateController rotateController = this.ServiceLocator.GetInstance();
- //bool closingCalled = false;
- //bool closedCalled = false;
+ ////RotateController rotateController = this.ServiceLocator.GetInstance();
+ ////bool closingCalled = false;
+ ////bool closedCalled = false;
- //rotateController.Closing += (sender, eventArgs) => { closingCalled = true; };
- //rotateController.Closed += (sender, eventArgs) => { closedCalled = true; };
+ ////rotateController.Closing += (sender, eventArgs) => { closingCalled = true; };
+ ////rotateController.Closed += (sender, eventArgs) => { closedCalled = true; };
- //rotateController.Close();
+ ////rotateController.Close();
- //Assert.IsTrue(closingCalled);
- //Assert.IsTrue(closedCalled);
+ ////Assert.IsTrue(closingCalled);
+ ////Assert.IsTrue(closedCalled);
////Assert.IsTrue(rotateView.CloseCalled);
}
[Test]
public void RotateView_Rotate()
{
- //RotateController rotateController = this.ServiceLocator.GetInstance();
+ ////RotateController rotateController = this.ServiceLocator.GetInstance();
////RotateView rotateView = rotateController.RawPluginView as RotateView;
- //ImageController imageController = this.ServiceLocator.GetInstance();
- //ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
- //ImageSourceController imageSourceController = this.Container.GetInstance();
+ ////ImageController imageController = this.ServiceLocator.GetInstance();
+ ////ImageManagerController imageManagerController = this.ServiceLocator.GetInstance();
+ ////ImageSourceController imageSourceController = this.Container.GetInstance();
////Assert.IsNotNull(rotateView);
- //rotateController.Initialize();
+ ////rotateController.Initialize();
- //using (UMat image = new UMat(1, 1, DepthType.Cv8U, 3))
+ ////using (UMat image = new UMat(1, 1, DepthType.Cv8U, 3))
{
////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
//// {
@@ -106,16 +110,16 @@ public void RotateView_Rotate()
//// imageControllerWrapper.WaitForDisplayUpdate();
//// }
- //using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ ////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
{
////rotateView.TriggerRotate(42.54);
////imageControllerWrapper.WaitForDisplayUpdate();
}
- //using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
+ ////using (ImageControllerWrapper imageControllerWrapper = new ImageControllerWrapper(imageController))
{
- //imageSourceController.ImageData = new byte[1, 1, 3];
+ ////imageSourceController.ImageData = new byte[1, 1, 3];
// Change the angle to make sur the rotate executes itself
////rotateView.TriggerRotate(90);
diff --git a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/TaggerControllerTest.cs b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/TaggerControllerTest.cs
index 2f77aa5..19c78f2 100644
--- a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/TaggerControllerTest.cs
+++ b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/TaggerControllerTest.cs
@@ -1,4 +1,8 @@
-namespace ImageProcessing.Controllers.Tests
+//
+// Copyright (c) David Rolland. All rights reserved.
+//
+
+namespace ImageProcessing.Controllers.Tests
{
using System;
using System.Collections.Generic;
@@ -21,13 +25,13 @@ public class TaggerControllerTest : ControllersBaseTest
[Test]
public void Constructor()
{
- //TaggerController taggerController = this.ServiceLocator.GetInstance();
+ ////TaggerController taggerController = this.ServiceLocator.GetInstance();
}
[Test]
public void RawPluginView()
{
- //TaggerController taggerController = this.ServiceLocator.GetInstance();
+ ////TaggerController taggerController = this.ServiceLocator.GetInstance();
////IRawPluginView rotateView = taggerController.RawPluginView;
////Assert.IsNotNull(rotateView);
@@ -36,29 +40,29 @@ public void RawPluginView()
[Test]
public void RawPluginModel()
{
- //TaggerController taggerController = this.ServiceLocator.GetInstance();
- //IRawPluginModel rawPluginModel = taggerController.RawPluginModel;
+ ////TaggerController taggerController = this.ServiceLocator.GetInstance();
+ ////IRawPluginModel rawPluginModel = taggerController.RawPluginModel;
- //Assert.IsNotNull(rawPluginModel);
+ ////Assert.IsNotNull(rawPluginModel);
}
[Test]
public void DisplayName()
{
- //this.Container.RegisterSingleton();
+ ////this.Container.RegisterSingleton();
- //TaggerController taggerController = this.ServiceLocator.GetInstance();
- //ITaggerModel taggerModel = this.ServiceLocator.GetInstance();
+ ////TaggerController taggerController = this.ServiceLocator.GetInstance();
+ ////ITaggerModel taggerModel = this.ServiceLocator.GetInstance();
- //Assert.AreEqual("Tagger", taggerModel.DisplayName);
+ ////Assert.AreEqual("Tagger", taggerModel.DisplayName);
}
[Test]
public void Active()
{
- //TaggerController taggerController = this.ServiceLocator.GetInstance();
+ ////TaggerController taggerController = this.ServiceLocator.GetInstance();
- //Assert.IsTrue(taggerController.Active);
+ ////Assert.IsTrue(taggerController.Active);
}
[Test]
@@ -67,166 +71,166 @@ public void Close()
////this.Container.RegisterSingleton();
////TaggerView taggerView = this.ServiceLocator.GetInstance() as TaggerView;
- //TaggerController taggerController = this.ServiceLocator.GetInstance();
- //bool closingCalled = false;
- //bool closedCalled = false;
+ ////TaggerController taggerController = this.ServiceLocator.GetInstance();
+ ////bool closingCalled = false;
+ ////bool closedCalled = false;
- //taggerController.Closing += (sender, eventArgs) => { closingCalled = true; };
- //taggerController.Closed += (sender, eventArgs) => { closedCalled = true; };
+ ////taggerController.Closing += (sender, eventArgs) => { closingCalled = true; };
+ ////taggerController.Closed += (sender, eventArgs) => { closedCalled = true; };
- //taggerController.Close();
+ ////taggerController.Close();
- //Assert.IsTrue(closingCalled);
- //Assert.IsTrue(closedCalled);
+ ////Assert.IsTrue(closingCalled);
+ ////Assert.IsTrue(closedCalled);
////Assert.IsTrue(taggerView.CloseCalled);
}
[Test]
public void ProcessImageData()
{
- //string displayName = Path.GetRandomFileName();
- //string directory = Path.GetTempPath() + "Tagger" + @"\";
+ ////string displayName = Path.GetRandomFileName();
+ ////string directory = Path.GetTempPath() + "Tagger" + @"\";
- //try
+ ////try
// {
// ////this.Container.RegisterSingleton();
// this.Container.RegisterSingleton();
- // TaggerController taggerController = this.ServiceLocator.GetInstance();
+ //// TaggerController taggerController = this.ServiceLocator.GetInstance();
// ITaggerModel taggerModel = this.ServiceLocator.GetInstance();
// ImageController imageController = this.ServiceLocator.GetInstance();
// ImageManagerController imageManagerController = this.ServiceLocator.GetInstance