From 7dbd32ddcf6611dec88ef56336b364110b019571 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 26 Mar 2019 12:54:09 +0200 Subject: A lot of work !!!! --- .../MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index 8440c88b2..eff1f2521 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("4.0.10.0")] +[assembly: AssemblyVersion("4.0.11.0")] [assembly: ComVisible(false)] \ No newline at end of file -- cgit v1.3.1 From 364c6860f48a13928c528dd3379957825bb9a398 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 27 Mar 2019 19:33:07 +0200 Subject: Started working on machine studio color capture module. --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 22675456 -> 22675456 bytes .../Tango.MachineStudio.ColorCapture/App.config | 2 + .../ColorLabModule.cs | 63 ++++++++ .../Images/colorcapture_module.png | Bin 0 -> 706 bytes .../Images/video-frame.png | Bin 0 -> 97254 bytes .../Properties/AssemblyInfo.cs | 19 +++ .../Properties/Resources.Designer.cs | 62 ++++++++ .../Properties/Resources.resx | 117 +++++++++++++++ .../Properties/Settings.Designer.cs | 30 ++++ .../Properties/Settings.settings | 7 + .../Tango.MachineStudio.ColorCapture.csproj | 160 +++++++++++++++++++++ .../Themes/Generic.xaml | 6 + .../ViewModelLocator.cs | 29 ++++ .../ViewModels/MainViewVM.cs | 86 +++++++++++ .../Views/MainView.xaml | 107 ++++++++++++++ .../Views/MainView.xaml.cs | 28 ++++ .../packages.config | 10 ++ .../ViewModels/MainViewVM.cs | 5 + .../Tango.MachineStudio.UI.csproj | 6 +- Software/Visual_Studio/Tango.sln | 43 ++++++ 21 files changed, 779 insertions(+), 1 deletion(-) create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/App.config create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ColorLabModule.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Images/colorcapture_module.png create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Images/video-frame.png create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/AssemblyInfo.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/Resources.Designer.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/Resources.resx create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/Settings.Designer.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/Settings.settings create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Tango.MachineStudio.ColorCapture.csproj create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Themes/Generic.xaml create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModelLocator.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/packages.config (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 55910d3b8..0e7ec2a9f 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index 60aa13ab2..1a9be8f13 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/App.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/App.config new file mode 100644 index 000000000..a6a2b7fa9 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/App.config @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ColorLabModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ColorLabModule.cs new file mode 100644 index 000000000..ef616daca --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ColorLabModule.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Media.Imaging; +using Tango.BL.Enumerations; +using Tango.MachineStudio.ColorCapture.Views; +using Tango.MachineStudio.Common; +using Tango.SharedUI.Helpers; + +namespace Tango.MachineStudio.ColorCapture +{ + [StudioModule(15)] + public class ColorLabModule : StudioModuleBase + { + public override string Name + { + get + { + return "Color Capture"; + } + } + + public override string Description + { + get + { + return "Exposes Twine's color calibration technology through a real-time video capturing engine."; + } + } + + public override BitmapSource Image + { + get + { + return ResourceHelper.GetImageFromResources("Images/colorcapture_module.png"); + } + } + + public override Type MainViewType + { + get + { + return typeof(MainView); + } + } + + public override Permissions Permission + { + get + { + return Permissions.RunColorLabModule; + } + } + + public override void Dispose() + { + + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Images/colorcapture_module.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Images/colorcapture_module.png new file mode 100644 index 000000000..b6b8b53be Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Images/colorcapture_module.png differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Images/video-frame.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Images/video-frame.png new file mode 100644 index 000000000..9c29dc438 Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Images/video-frame.png differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..b86e2231d --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +[assembly: AssemblyTitle("Tango - Machine Studio Color Capture Module")] +[assembly: AssemblyVersion("2.0.12.1608")] + +[assembly: ComVisible(false)] + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/Resources.Designer.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/Resources.Designer.cs new file mode 100644 index 000000000..80918eb2e --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/Resources.Designer.cs @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.MachineStudio.ColorCapture.Properties { + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if ((resourceMan == null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tango.MachineStudio.ColorCapture.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/Resources.resx b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/Resources.resx new file mode 100644 index 000000000..af7dbebba --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/Settings.Designer.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/Settings.Designer.cs new file mode 100644 index 000000000..fccfa223f --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.MachineStudio.ColorCapture.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/Settings.settings b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/Settings.settings new file mode 100644 index 000000000..033d7a5e9 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Tango.MachineStudio.ColorCapture.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Tango.MachineStudio.ColorCapture.csproj new file mode 100644 index 000000000..2422cec2a --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Tango.MachineStudio.ColorCapture.csproj @@ -0,0 +1,160 @@ + + + + + Debug + AnyCPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF} + library + Tango.MachineStudio.ColorCapture + Tango.MachineStudio.ColorCapture + v4.6.1 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + + + true + full + false + ..\..\..\Build\Machine Studio\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + ..\..\..\Build\Machine Studio\Release\ + TRACE + prompt + 4 + + + + ..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + + + ..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + + + ..\..\..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll + + + ..\..\..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll + + + ..\..\..\packages\MaterialDesignColors.1.1.2\lib\net45\MaterialDesignColors.dll + + + ..\..\..\packages\MaterialDesignThemes.2.3.1.953\lib\net45\MaterialDesignThemes.Wpf.dll + + + ..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll + + + + + + + ..\..\..\packages\MahApps.Metro.1.5.0\lib\net45\System.Windows.Interactivity.dll + + + + + + + + + 4.0 + + + + + + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + + + GlobalVersionInfo.cs + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + + MainView.xaml + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + {f441feee-322a-4943-b566-110e12fd3b72} + Tango.BL + + + {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} + Tango.Core + + + {e4927038-348d-4295-aaf4-861c58cb3943} + Tango.PMR + + + {d8f1ad85-526a-4f50-b6dc-d437af63d8d8} + Tango.Settings + + + {8491d07b-c1f6-4b62-a412-41b9fd2d6538} + Tango.SharedUI + + + {9652f972-2bd1-4283-99cb-fc6240434c17} + Tango.Video + + + {f209fae8-73f9-441b-97f4-0844a0279390} + Tango.TCC.BL + + + {cb0b0aa2-bb24-4bca-a720-45e397684e12} + Tango.MachineStudio.Common + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Themes/Generic.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Themes/Generic.xaml new file mode 100644 index 000000000..968c541b3 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Themes/Generic.xaml @@ -0,0 +1,6 @@ + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModelLocator.cs new file mode 100644 index 000000000..75cb5fad6 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModelLocator.cs @@ -0,0 +1,29 @@ +using Tango.Core.DI; +using Tango.MachineStudio.ColorCapture.ViewModels; +using Tango.MachineStudio.ColorCapture.Views; + +namespace Tango.MachineStudio.ColorCapture +{ + /// + /// This class contains static references to all the view models in the + /// application and provides an entry point for the bindings. + /// + public static class ViewModelLocator + { + /// + /// Initializes a new instance of the ViewModelLocator class. + /// + static ViewModelLocator() + { + TangoIOC.Default.Register(); + } + + public static MainViewVM MainViewVM + { + get + { + return TangoIOC.Default.GetInstance(); + } + } + } +} \ No newline at end of file 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 new file mode 100644 index 000000000..298b862fb --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs @@ -0,0 +1,86 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Media; +using Tango.Core.Commands; +using Tango.MachineStudio.Common; +using Tango.MachineStudio.Common.Notifications; +using Tango.MachineStudio.Common.Video; +using Tango.Video.DirectCapture; + +namespace Tango.MachineStudio.ColorCapture.ViewModels +{ + public class MainViewVM : StudioViewModel + { + private INotificationProvider _notification; + + public IVideoCaptureProvider VideoProvider { get; set; } + + private CaptureDevice _selectedVideoDevice; + public CaptureDevice SelectedVideoDevice + { + get { return _selectedVideoDevice; } + set + { + var oldValue = _selectedVideoDevice; + _selectedVideoDevice = value; + RaisePropertyChangedAuto(); + OnSelectedVideoDeviceChanged(oldValue, _selectedVideoDevice); + } + } + + public RelayCommand ToggleCameraCommand { get; set; } + + public MainViewVM(IVideoCaptureProvider videoProvider, INotificationProvider notificationProvider) + { + _notification = notificationProvider; + VideoProvider = videoProvider; + SelectedVideoDevice = videoProvider.AvailableCaptureDevices.FirstOrDefault(); + ToggleCameraCommand = new RelayCommand(ToggleCamera); + } + + private void ToggleCamera() + { + if (SelectedVideoDevice != null) + { + if (SelectedVideoDevice.IsStarted) + { + SelectedVideoDevice.Stop(); + } + else + { + SelectedVideoDevice.Start(); + } + } + } + + private void OnSelectedVideoDeviceChanged(CaptureDevice previousDevice, CaptureDevice newDevice) + { + if (previousDevice != null) + { + previousDevice.FrameReceived -= OnVideoFrameReceived; + } + + if (newDevice != null) + { + newDevice.RaiseFrameReceivedEvent = true; + newDevice.FrameReceived += OnVideoFrameReceived; + } + } + + private void OnVideoFrameReceived(object sender, Video.DirectShow.EventArguments.FrameReceivedEventArgs args) + { + Bitmap bmp = args.BitmapSource.ConvertFormat(PixelFormats.Rgb24).ToGDIBitmap(); + + bmp.Dispose(); + } + + public override void OnApplicationReady() + { + + } + } +} 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 new file mode 100644 index 000000000..cd619d0a0 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + Selected Capture Device + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 000000000..4f890bfe1 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Tango.MachineStudio.ColorCapture.Views +{ + /// + /// Interaction logic for MainView.xaml + /// + public partial class MainView : UserControl + { + public MainView() + { + InitializeComponent(); + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/packages.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/packages.config new file mode 100644 index 000000000..37e4dd902 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/packages.config @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs index 3d282367a..bbe5432e9 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs @@ -174,6 +174,11 @@ namespace Tango.MachineStudio.DataCapture.ViewModels #region Constructors + public MainViewVM() + { + + } + /// /// Initializes a new instance of the class. /// diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj index 0051c3883..8d9255926 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj @@ -424,6 +424,10 @@ {f69da3a8-f823-461e-87cf-a9275abc0b15} Tango.MachineStudio.Dispensers + + {1b87ca53-50bd-4c48-a8c7-fbb9f1419aff} + Tango.MachineStudio.ColorCapture + {4d183aca-552b-4135-ae81-7c5a8e5fc3b1} Tango.MachineStudio.ColorLab @@ -610,7 +614,7 @@ copy /Y "$(SolutionDir)Referenced Assemblies\Microsoft.WITDataStore32.dll" "$(Ta - + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index 04e437fca..efdf1c2ce 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -283,6 +283,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.TCC.OpenCV.DLL", "TCC EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tango.TCC.LoadTestLib", "TCC\Tango.TCC.LoadTestLib\Tango.TCC.LoadTestLib.vcxproj", "{DD19A7B3-E4B0-444E-98D4-D1C346442E63}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.MachineStudio.ColorCapture", "MachineStudio\Modules\Tango.MachineStudio.ColorCapture\Tango.MachineStudio.ColorCapture.csproj", "{1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution AppVeyor|Any CPU = AppVeyor|Any CPU @@ -5021,6 +5023,46 @@ Global {DD19A7B3-E4B0-444E-98D4-D1C346442E63}.Release|x64.Build.0 = Release|x64 {DD19A7B3-E4B0-444E-98D4-D1C346442E63}.Release|x86.ActiveCfg = Release|Win32 {DD19A7B3-E4B0-444E-98D4-D1C346442E63}.Release|x86.Build.0 = Release|Win32 + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.AppVeyor|Any CPU.Build.0 = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.AppVeyor|ARM.ActiveCfg = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.AppVeyor|ARM.Build.0 = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.AppVeyor|ARM64.ActiveCfg = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.AppVeyor|ARM64.Build.0 = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.AppVeyor|x64.ActiveCfg = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.AppVeyor|x64.Build.0 = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.AppVeyor|x86.ActiveCfg = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.AppVeyor|x86.Build.0 = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Debug|ARM.ActiveCfg = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Debug|ARM.Build.0 = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Debug|ARM64.Build.0 = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Debug|x64.ActiveCfg = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Debug|x64.Build.0 = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Debug|x86.ActiveCfg = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Debug|x86.Build.0 = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.DefaultBuild|Any CPU.ActiveCfg = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.DefaultBuild|Any CPU.Build.0 = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.DefaultBuild|ARM.ActiveCfg = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.DefaultBuild|ARM.Build.0 = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.DefaultBuild|ARM64.ActiveCfg = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.DefaultBuild|ARM64.Build.0 = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.DefaultBuild|x64.ActiveCfg = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.DefaultBuild|x64.Build.0 = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.DefaultBuild|x86.ActiveCfg = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.DefaultBuild|x86.Build.0 = Debug|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Release|Any CPU.Build.0 = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Release|ARM.ActiveCfg = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Release|ARM.Build.0 = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Release|ARM64.ActiveCfg = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Release|ARM64.Build.0 = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Release|x64.ActiveCfg = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Release|x64.Build.0 = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Release|x86.ActiveCfg = Release|Any CPU + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -5110,6 +5152,7 @@ Global {09B2CCD8-9EEE-4837-A6BC-B5AF3DF0557E} = {DA2B8F5D-AE3C-4E78-AEEB-FC17D0582690} {5D0D4053-CAB3-4A4A-929E-37A76483BC22} = {DA2B8F5D-AE3C-4E78-AEEB-FC17D0582690} {DD19A7B3-E4B0-444E-98D4-D1C346442E63} = {DA2B8F5D-AE3C-4E78-AEEB-FC17D0582690} + {1B87CA53-50BD-4C48-A8C7-FBB9F1419AFF} = {B2AF4F3F-2828-47C3-8F3E-A0EA0BD66FF8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution BuildVersion_UseGlobalSettings = False -- cgit v1.3.1