diff --git a/Axel-boss/Axel-boss.sln b/Axel-boss/Axel-boss.sln index 79fb853f..6657665c 100644 --- a/Axel-boss/Axel-boss.sln +++ b/Axel-boss/Axel-boss.sln @@ -1,44 +1,44 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Axel-boss", "Axel-boss\Axel-boss.csproj", "{9FDC67B7-A355-4D9D-83CD-187E9FE0D6E5}" - ProjectSection(ProjectDependencies) = postProject - {1FB4D7AD-D169-4B68-A11A-C398186F3C4C} = {1FB4D7AD-D169-4B68-A11A-C398186F3C4C} - {C8285DB3-DE2F-4B3B-B79A-454B4C4C2828} = {C8285DB3-DE2F-4B3B-B79A-454B4C4C2828} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "scanUC", "scanUC\scanUC\scanUC.csproj", "{1FB4D7AD-D169-4B68-A11A-C398186F3C4C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AxelChart", "..\AxelChart\AxelChart\AxelChart.csproj", "{C8285DB3-DE2F-4B3B-B79A-454B4C4C2828}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UtilsLib", "..\Utils\UtilsLib.csproj", "{A377A708-96B9-4569-BC22-0187D647611E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9FDC67B7-A355-4D9D-83CD-187E9FE0D6E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FDC67B7-A355-4D9D-83CD-187E9FE0D6E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FDC67B7-A355-4D9D-83CD-187E9FE0D6E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FDC67B7-A355-4D9D-83CD-187E9FE0D6E5}.Release|Any CPU.Build.0 = Release|Any CPU - {1FB4D7AD-D169-4B68-A11A-C398186F3C4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FB4D7AD-D169-4B68-A11A-C398186F3C4C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FB4D7AD-D169-4B68-A11A-C398186F3C4C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FB4D7AD-D169-4B68-A11A-C398186F3C4C}.Release|Any CPU.Build.0 = Release|Any CPU - {C8285DB3-DE2F-4B3B-B79A-454B4C4C2828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8285DB3-DE2F-4B3B-B79A-454B4C4C2828}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8285DB3-DE2F-4B3B-B79A-454B4C4C2828}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8285DB3-DE2F-4B3B-B79A-454B4C4C2828}.Release|Any CPU.Build.0 = Release|Any CPU - {A377A708-96B9-4569-BC22-0187D647611E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A377A708-96B9-4569-BC22-0187D647611E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A377A708-96B9-4569-BC22-0187D647611E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A377A708-96B9-4569-BC22-0187D647611E}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Axel-boss", "Axel-boss\Axel-boss.csproj", "{9FDC67B7-A355-4D9D-83CD-187E9FE0D6E5}" + ProjectSection(ProjectDependencies) = postProject + {1FB4D7AD-D169-4B68-A11A-C398186F3C4C} = {1FB4D7AD-D169-4B68-A11A-C398186F3C4C} + {C8285DB3-DE2F-4B3B-B79A-454B4C4C2828} = {C8285DB3-DE2F-4B3B-B79A-454B4C4C2828} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "scanUC", "scanUC\scanUC\scanUC.csproj", "{1FB4D7AD-D169-4B68-A11A-C398186F3C4C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AxelChart", "..\AxelChart\AxelChart\AxelChart.csproj", "{C8285DB3-DE2F-4B3B-B79A-454B4C4C2828}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UtilsLib", "..\Utils\UtilsLib.csproj", "{A377A708-96B9-4569-BC22-0187D647611E}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9FDC67B7-A355-4D9D-83CD-187E9FE0D6E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9FDC67B7-A355-4D9D-83CD-187E9FE0D6E5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9FDC67B7-A355-4D9D-83CD-187E9FE0D6E5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9FDC67B7-A355-4D9D-83CD-187E9FE0D6E5}.Release|Any CPU.Build.0 = Release|Any CPU + {1FB4D7AD-D169-4B68-A11A-C398186F3C4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1FB4D7AD-D169-4B68-A11A-C398186F3C4C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1FB4D7AD-D169-4B68-A11A-C398186F3C4C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1FB4D7AD-D169-4B68-A11A-C398186F3C4C}.Release|Any CPU.Build.0 = Release|Any CPU + {C8285DB3-DE2F-4B3B-B79A-454B4C4C2828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C8285DB3-DE2F-4B3B-B79A-454B4C4C2828}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C8285DB3-DE2F-4B3B-B79A-454B4C4C2828}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C8285DB3-DE2F-4B3B-B79A-454B4C4C2828}.Release|Any CPU.Build.0 = Release|Any CPU + {A377A708-96B9-4569-BC22-0187D647611E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A377A708-96B9-4569-BC22-0187D647611E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A377A708-96B9-4569-BC22-0187D647611E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A377A708-96B9-4569-BC22-0187D647611E}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Axel-boss/Axel-boss/App.xaml b/Axel-boss/Axel-boss/App.xaml index d6ba35ce..b74e8828 100644 --- a/Axel-boss/Axel-boss/App.xaml +++ b/Axel-boss/Axel-boss/App.xaml @@ -1,8 +1,8 @@ - - - - - + + + + + diff --git a/Axel-boss/Axel-boss/App.xaml.cs b/Axel-boss/Axel-boss/App.xaml.cs index ecca81d2..b550892b 100644 --- a/Axel-boss/Axel-boss/App.xaml.cs +++ b/Axel-boss/Axel-boss/App.xaml.cs @@ -1,17 +1,17 @@ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Data; -using System.Linq; -using System.Windows; -using System.Windows.Threading; - -namespace Axel_boss -{ - /// - /// Interaction logic for App.xaml - /// - public partial class App : Application - { - } -} +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Windows; +using System.Windows.Threading; + +namespace Axel_boss +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + } +} diff --git a/Axel-boss/Axel-boss/AssemblyInfo.cs b/Axel-boss/Axel-boss/AssemblyInfo.cs index 2a042312..c95fec84 100644 --- a/Axel-boss/Axel-boss/AssemblyInfo.cs +++ b/Axel-boss/Axel-boss/AssemblyInfo.cs @@ -1,55 +1,55 @@ -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Windows; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Axel_boss")] -[assembly: AssemblyDescription("Data acquisition and acceleration math for MEMS and Axel-track")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Teodor Krastev for Imperial College, London, UK")] -[assembly: AssemblyProduct("Axel_boss")] -[assembly: AssemblyCopyright("Teodor Krastev for Imperial College, London, UK")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US english -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - - -[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) -)] - - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.0.0")] -[assembly: AssemblyFileVersion("1.3.0.0")] +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Axel_boss")] +[assembly: AssemblyDescription("Data acquisition and acceleration math for MEMS and Axel-track")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Teodor Krastev for Imperial College, London, UK")] +[assembly: AssemblyProduct("Axel_boss")] +[assembly: AssemblyCopyright("Teodor Krastev for Imperial College, London, UK")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +//In order to begin building localizable applications, set +//CultureYouAreCodingWith in your .csproj file +//inside a . For example, if you are using US english +//in your source files, set the to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[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) +)] + + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.3.0.0")] +[assembly: AssemblyFileVersion("1.3.0.0")] diff --git a/Axel-boss/Axel-boss/Axel-boss.csproj b/Axel-boss/Axel-boss/Axel-boss.csproj index bcaf8f57..2c00662b 100644 --- a/Axel-boss/Axel-boss/Axel-boss.csproj +++ b/Axel-boss/Axel-boss/Axel-boss.csproj @@ -1,179 +1,180 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {9FDC67B7-A355-4D9D-83CD-187E9FE0D6E5} - WinExe - Properties - Axel_boss - Axel-boss - v4.5 - - - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - x86 - true - full - false - bin\ - DEBUG;TRACE - prompt - 4 - false - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - speed1.ico - - - - ..\AxelChart\AxelChart\bin\Debug\AxelChart.dll - - - - - - - - - False - bin\NationalInstruments.DAQmx.dll - - - False - - - - - - - - False - bin\Newtonsoft.Json.dll - - - False - bin\scanUC.dll - - - - - - - - - - 4.0 - - - ..\Utils\bin\Debug\UtilsLib.dll - - - - - - - - MSBuild:Compile - Designer - - - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - MainWindow.xaml - Code - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - - - - False - Microsoft .NET Framework 4.5 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {9FDC67B7-A355-4D9D-83CD-187E9FE0D6E5} + WinExe + Properties + Axel_boss + Axel-boss + v4.5 + + + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + x86 + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + false + true + + + x86 + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + false + + + speed1.ico + + + + ..\AxelChart\AxelChart\bin\Debug\AxelChart.dll + + + + + + + + + False + bin\NationalInstruments.DAQmx.dll + + + False + + + + + + + + False + bin\Newtonsoft.Json.dll + + + False + bin\scanUC.dll + + + + + + + + + + 4.0 + + + ..\Utils\bin\Debug\UtilsLib.dll + + + + + + + + MSBuild:Compile + Designer + + + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + MainWindow.xaml + Code + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + + + False + Microsoft .NET Framework 4.5 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + + \ No newline at end of file diff --git a/Axel-boss/Axel-boss/Axel-boss.csproj.user b/Axel-boss/Axel-boss/Axel-boss.csproj.user index be7881fc..4a9dac53 100644 --- a/Axel-boss/Axel-boss/Axel-boss.csproj.user +++ b/Axel-boss/Axel-boss/Axel-boss.csproj.user @@ -1,13 +1,13 @@ - - - - publish\ - - - - - - en-US - false - + + + + publish\ + + + + + + en-US + false + \ No newline at end of file diff --git a/Axel-boss/Axel-boss/Class2.cs b/Axel-boss/Axel-boss/Class2.cs index f4b35374..d555ecb0 100644 --- a/Axel-boss/Axel-boss/Class2.cs +++ b/Axel-boss/Axel-boss/Class2.cs @@ -1,8 +1,8 @@ -using System; - -public class Class1 -{ - public Class1() - { - } -} +using System; + +public class Class1 +{ + public Class1() + { + } +} diff --git a/Axel-boss/Axel-boss/MainWindow.xaml b/Axel-boss/Axel-boss/MainWindow.xaml index 9aa6ad70..9f9f001d 100644 --- a/Axel-boss/Axel-boss/MainWindow.xaml +++ b/Axel-boss/Axel-boss/MainWindow.xaml @@ -1,124 +1,116 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -