diff --git a/.gitignore b/.gitignore index b8836a00..7cd64fe8 100644 --- a/.gitignore +++ b/.gitignore @@ -161,6 +161,15 @@ ClientBin/ *.pfx *.publishsettings node_modules/ +*.tlg +*.jdt +*.ahs +*.jlg +*.csv +*.ahf +*.rws +*.asd +*.ahh # RIA/Silverlight projects Generated_Code/ diff --git a/.vs/AxelSuite/DesignTimeBuild/.dtbcache.v2 b/.vs/AxelSuite/DesignTimeBuild/.dtbcache.v2 new file mode 100644 index 00000000..f9e44944 Binary files /dev/null and b/.vs/AxelSuite/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/AxelSuite/v16/Server/sqlite3/db.lock b/.vs/AxelSuite/v16/Server/sqlite3/db.lock new file mode 100644 index 00000000..e69de29b diff --git a/.vs/AxelSuite/v16/Server/sqlite3/storage.ide b/.vs/AxelSuite/v16/Server/sqlite3/storage.ide new file mode 100644 index 00000000..0523cf7f Binary files /dev/null and b/.vs/AxelSuite/v16/Server/sqlite3/storage.ide differ diff --git a/Axel-data/App.config b/Axel-data/App.config index 8e156463..d58ab5ac 100644 --- a/Axel-data/App.config +++ b/Axel-data/App.config @@ -1,6 +1,14 @@ - + + + + + + + + + \ No newline at end of file diff --git a/Axel-data/Axel-data.csproj b/Axel-data/Axel-data.csproj index df42ffa9..c669deb6 100644 --- a/Axel-data/Axel-data.csproj +++ b/Axel-data/Axel-data.csproj @@ -13,6 +13,7 @@ 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 + true AnyCPU @@ -37,24 +38,30 @@ dataProc2.ico - - - - - - - - - - False - C:\Program Files (x86)\Microsoft Visual Studio 12.0\Blend\Newtonsoft.Json.dll + + False + + + False + + + False + + + False + + + False + + + False + + + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - False - C:\Program Files (x86)\Microsoft Visual Studio 12.0\Data\system.threading.tasks.dataflow.dll - @@ -63,8 +70,9 @@ 4.0 - - ..\Utils\bin\UtilsLib.dll + + False + ..\..\Utils\bin\UtilsLib.dll @@ -75,12 +83,47 @@ MSBuild:Compile Designer + + DataPrimitives.cs + DataStackLib.cs + + OptionsType.cs + + + strobesUC.xaml.cs + strobesUC.xaml + + + graphTestUC.xaml + + + JoinOptimUC.xaml + + + QMfitUC.xaml + + + QuantVsMems.xaml + TmprCompUC.xaml + + strobesUC.xaml + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -93,6 +136,14 @@ MainWindow.xaml Code + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -117,6 +168,7 @@ ResXFileCodeGenerator Resources.Designer.cs + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/Axel-data/JoinOptimUC.xaml b/Axel-data/JoinOptimUC.xaml new file mode 100644 index 00000000..d4f212b3 --- /dev/null +++ b/Axel-data/JoinOptimUC.xaml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + +