From 87a42efc24990aa4e2b952428f4371a707ced332 Mon Sep 17 00:00:00 2001 From: Evgeny Redikultsev Date: Sat, 22 Oct 2022 20:00:15 +0500 Subject: [PATCH] Area calculations in viewer is added --- App.config | 2 +- FieldVisualizer/FieldVisualizer.csproj | 2 +- .../FieldViewerViewModel.cs | 69 ++++----- FiledVisualzerDemo/App.config | 6 +- ...rDemo.csproj => FieldVisualzerDemo.csproj} | 4 +- .../FiledVisualzerDemo_old.csproj | 118 ++++++++++++++++ .../Properties/Resources.Designer.cs | 68 ++++----- .../Properties/Settings.Designer.cs | 30 ++-- Libraries/LoaderCalculator.dll | Bin 56832 -> 56832 bytes Services/ResultViewers/ResultFuncFactory.cs | 2 + StructureHelper.csproj | 32 +++-- StructureHelper.sln | 2 +- .../StructureHelperCommon.csproj | 2 +- .../StructureHelperTests.csproj | 14 +- StructureHelperTests/app.config | 15 ++ StructureHelperTests/packages.config | 6 +- Windows/MainWindow/MainView.xaml | 131 ++++++++++-------- packages.config | 12 +- 18 files changed, 327 insertions(+), 188 deletions(-) rename FiledVisualzerDemo/{FiledVisualzerDemo.csproj => FieldVisualzerDemo.csproj} (96%) create mode 100644 FiledVisualzerDemo/FiledVisualzerDemo_old.csproj create mode 100644 StructureHelperTests/app.config diff --git a/App.config b/App.config index d089989..69b16fd 100644 --- a/App.config +++ b/App.config @@ -1,7 +1,7 @@ - + diff --git a/FieldVisualizer/FieldVisualizer.csproj b/FieldVisualizer/FieldVisualizer.csproj index f8cca6d..018e535 100644 --- a/FieldVisualizer/FieldVisualizer.csproj +++ b/FieldVisualizer/FieldVisualizer.csproj @@ -1,7 +1,7 @@ - net48 + net472 true Library diff --git a/FieldVisualizer/ViewModels/FieldViewerViewModels/FieldViewerViewModel.cs b/FieldVisualizer/ViewModels/FieldViewerViewModels/FieldViewerViewModel.cs index 0e588a1..a4a5efe 100644 --- a/FieldVisualizer/ViewModels/FieldViewerViewModels/FieldViewerViewModel.cs +++ b/FieldVisualizer/ViewModels/FieldViewerViewModels/FieldViewerViewModel.cs @@ -32,6 +32,18 @@ namespace FieldVisualizer.ViewModels.FieldViewerViewModels public ICommand ZoomOutCommand { get; } public ICommand ChangeColorMapCommand { get; } public ICommand SetUserColorsCommand { get; } + public ICommand SetCrossLineCommand + { + get + { + if (setCrossLineCommand == null) + { + setCrossLineCommand = new RelayCommand(SetCrossLine); + } + + return setCrossLineCommand; + } + } public IPrimitiveSet PrimitiveSet { get @@ -110,17 +122,19 @@ namespace FieldVisualizer.ViewModels.FieldViewerViewModels } } } - public double SumTotal { get; private set;} public double SumNeg { get; private set; } public double SumPos { get; private set; } - public Viewbox WorkPlaneBox { get; set; } public VerticalLegend Legend { get; set; } public Canvas WorkPlaneCanvas { get; set; } - public double ScrolWidth { get; set; } public double ScrolHeight { get; set; } + public double CrossLineX { get => crossLineX; set => SetProperty(ref crossLineX, value); } + public double CrossLineY { get => crossLineY; set => SetProperty(ref crossLineY, value); } + + public double SumAboveLine { get => sumAboveLine; set => SetProperty(ref sumAboveLine, value); } + public double SumUnderLine { get => sumUnderLine; set => SetProperty(ref sumUnderLine, value); } public string Error { get; } public string this[string columnName] @@ -132,6 +146,7 @@ namespace FieldVisualizer.ViewModels.FieldViewerViewModels } } + private ICommand setCrossLineCommand; private IPrimitiveSet primitiveSet; private double dX, dY; private ColorMapsTypes _ColorMapType; @@ -141,6 +156,10 @@ namespace FieldVisualizer.ViewModels.FieldViewerViewModels private IEnumerable _ValueColorRanges; private bool setMinValue; private bool setMaxValue; + private double crossLineX; + private double crossLineY; + private double sumAboveLine; + private double sumUnderLine; const int RangeNumber = 16; public FieldViewerViewModel() @@ -167,6 +186,12 @@ namespace FieldVisualizer.ViewModels.FieldViewerViewModels Legend.Refresh(); } } + public void Refresh() + { + SetMinValue = false; + SetMaxValue = false; + ColorRefresh(); + } private void ProcessPrimitives() { WorkPlaneCanvas.Children.Clear(); @@ -273,41 +298,11 @@ namespace FieldVisualizer.ViewModels.FieldViewerViewModels _ValueRanges = ValueRangeOperations.DivideValueRange(valueRange, RangeNumber); _ValueColorRanges = ColorOperations.GetValueColorRanges(valueRange, _ValueRanges, _ColorMap); } - - public void Refresh() - { - SetMinValue = false; - SetMaxValue = false; - ColorRefresh(); - } - - private double crossLineX; - private double crossLineY; - - public double CrossLineX { get => crossLineX; set => SetProperty(ref crossLineX, value); } - public double CrossLineY { get => crossLineY; set => SetProperty(ref crossLineY, value); } - - private ICommand setCrossLineCommand; - - public ICommand SetCrossLineCommand - { - get - { - if (setCrossLineCommand == null) - { - setCrossLineCommand = new RelayCommand(SetCrossLine); - } - - return setCrossLineCommand; - } - } - private void SetCrossLine(object commandParameter) { AddCrossLine(); AddSummaryInfoCrossLine(); } - private void AddCrossLine() { double width = WorkPlaneCanvas.ActualWidth; @@ -341,13 +336,6 @@ namespace FieldVisualizer.ViewModels.FieldViewerViewModels line.StrokeThickness = (width + heigth) / 100; WorkPlaneCanvas.Children.Add(line); } - - private double sumAboveLine; - private double sumUnderLine; - - public double SumAboveLine { get => sumAboveLine; set => SetProperty(ref sumAboveLine, value); } - public double SumUnderLine { get => sumUnderLine; set => SetProperty(ref sumUnderLine, value); } - private double GetPointOfCrossLine(double x) { double y; @@ -361,7 +349,6 @@ namespace FieldVisualizer.ViewModels.FieldViewerViewModels } return y; } - private void AddSummaryInfoCrossLine() { SumAboveLine = primitiveSet is null ? 0 : primitiveSet.ValuePrimitives.Where(x=>x.CenterY >= GetPointOfCrossLine(x.CenterX)).Sum(x => x.Value); diff --git a/FiledVisualzerDemo/App.config b/FiledVisualzerDemo/App.config index 193aecc..ecdcf8a 100644 --- a/FiledVisualzerDemo/App.config +++ b/FiledVisualzerDemo/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/FiledVisualzerDemo/FiledVisualzerDemo.csproj b/FiledVisualzerDemo/FieldVisualzerDemo.csproj similarity index 96% rename from FiledVisualzerDemo/FiledVisualzerDemo.csproj rename to FiledVisualzerDemo/FieldVisualzerDemo.csproj index 8ca95b2..e7df97a 100644 --- a/FiledVisualzerDemo/FiledVisualzerDemo.csproj +++ b/FiledVisualzerDemo/FieldVisualzerDemo.csproj @@ -8,10 +8,11 @@ WinExe FiledVisualzerDemo FiledVisualzerDemo - v4.8 + v4.7.2 512 true true + AnyCPU @@ -65,6 +66,7 @@ True Resources.resx + True SettingsSingleFileGenerator diff --git a/FiledVisualzerDemo/FiledVisualzerDemo_old.csproj b/FiledVisualzerDemo/FiledVisualzerDemo_old.csproj new file mode 100644 index 0000000..14cbccd --- /dev/null +++ b/FiledVisualzerDemo/FiledVisualzerDemo_old.csproj @@ -0,0 +1,118 @@ + + + + + Debug + AnyCPU + {C92A5F2E-567B-48C9-A524-5740DB03509D} + WinExe + FiledVisualzerDemo + FiledVisualzerDemo + v4.8 + 512 + false + true + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + Form + + + DemoForm.cs + + + + + DemoForm.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + Settings.settings + True + + + + + + + + {87064b50-3b7c-4a91-af4a-941c6f95d997} + FieldVisualizer + + + + + False + Microsoft .NET Framework 4.8 %28x86 и x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + + + \ No newline at end of file diff --git a/FiledVisualzerDemo/Properties/Resources.Designer.cs b/FiledVisualzerDemo/Properties/Resources.Designer.cs index d14e061..ee39bc7 100644 --- a/FiledVisualzerDemo/Properties/Resources.Designer.cs +++ b/FiledVisualzerDemo/Properties/Resources.Designer.cs @@ -1,69 +1,61 @@ //------------------------------------------------------------------------------ // -// Этот код создан программным средством. -// Версия среды выполнения: 4.0.30319.42000 +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 // -// Изменения в этом файле могут привести к неправильному поведению и будут утрачены, если -// код создан повторно. +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. // //------------------------------------------------------------------------------ -namespace FiledVisualzerDemo.Properties -{ - - +namespace FiledVisualzerDemo.Properties { + using System; + + /// - /// Класс ресурсов со строгим типом для поиска локализованных строк и пр. + /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. /// - // Этот класс был автоматически создан при помощи StronglyTypedResourceBuilder - // класс с помощью таких средств, как ResGen или Visual Studio. - // Для добавления или удаления члена измените файл .ResX, а затем перезапустите ResGen - // с параметром /str или заново постройте свой VS-проект. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + // Этот класс создан автоматически классом StronglyTypedResourceBuilder + // с помощью такого средства, как ResGen или Visual Studio. + // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen + // с параметром /str или перестройте свой проект VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + 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() - { + internal Resources() { } - + /// - /// Возврат кэшированного экземпляра ResourceManager, используемого этим классом. + /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FiledVisualzerDemo.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// - /// Переопределяет свойство CurrentUICulture текущего потока для всех - /// подстановки ресурсов с помощью этого класса ресурсов со строгим типом. + /// Перезаписывает свойство CurrentUICulture текущего потока для всех + /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/FiledVisualzerDemo/Properties/Settings.Designer.cs b/FiledVisualzerDemo/Properties/Settings.Designer.cs index 28cf90c..8365dff 100644 --- a/FiledVisualzerDemo/Properties/Settings.Designer.cs +++ b/FiledVisualzerDemo/Properties/Settings.Designer.cs @@ -1,28 +1,24 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. // //------------------------------------------------------------------------------ -namespace FiledVisualzerDemo.Properties -{ - - +namespace FiledVisualzerDemo.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 - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.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 - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/Libraries/LoaderCalculator.dll b/Libraries/LoaderCalculator.dll index c601fac04e713587ac6815b55a42dc41e2c4af80..75e5c75bf1ae40e0689c80794d54912fcae2ee69 100644 GIT binary patch delta 4843 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 a-E>}P1)M(L-!XV3CprCoyo%}}=Klj6(U-CS delta 4798 zcmY+|3sh8f9tZH>mtkh^RbdAb7#_wOrYt4%L6)R~&n!_`H~BXoRIbT=P|}3R-5SoatERqddp=xc~qE{v_g@5kL2P@BjXPzyG~= zW+-hlmA08)Tj4)=X=`&$RTKhi8mHq!7m#e;`5RG|E7tD;*9;`1x2p`!po>>X{frg= z`jMG-dV>6Zu%mlqN&K4jsAhNmnkvue#U6WswUKVI zMq5`}|3e2Kky)jENtA_}=%~^8*-9Ifyt|;ijnee5xmFktedT@B1X&1fAN(et= z-9r!&GkZIWOJ=jk@yHsu2Pkp;&p#wBuNp|E>?Eo!g$&MVLBBx@RW)1EX zEHy&Wpb^?Z%1kqQFf?Jjc9;&bdL>WQzM`1NjZE)jp|2@zxS_tmUs}GV8A?XCj!-U3 zmUM)kW0gneXh*4FxKkeJ)oY{k1YhB>IBtPICsoWD}5u>52> zO-of+sjahI6k5jGXzpqKf!45^%{HNRhSa@rhTc;0>h-pVEN7^mwaqqI=snh^@W(7? zX$Pw%e1y<$DJS1zowQGdHTH8+>DEq)OqVm2HJvqeQeu~EE}c9JNAMl_q-if~0EgXS%~-X;Q6_mLX5?)#nEJ%;(9*dNIhY zou_bCuvp(;D3;|A>-!7c@2SZi0q20byNH|WIt^vXEATp{v&y6Ev>WsUt2Vk`D2pZU z*PE1cHxu{kO?pPjxH@i8K4-GBTeO%ZE4xJ{PNuBvHdV4@Ww&W9D^1MaM{lquh}rw7 zjwP$ULk%oh^&M(v$*Kt-uw>PQPn3+Q0sAwues3P|ziz_--?GLhS8IMa%bJ^9D|DVE zPhr9pmOO~-AB+9+nPBbl`*vI0HOpS3I! z)B~xk?U7AdPYh>$5$O>cr({&t3*?H<88T)P@3Fzwss$j6waMRS4nU5vzt-gM7TGhL z#f0wG0+G*pFm$ibORhI_ZaPc49UX?sZbyeNfuFXC9&S+!S>5Oc~v04r9^Hv@Lo zAhD985XVXrD>(`eDj8=OjUinM)kkBzlXsmZuD~&v%z9p2fnzX>wI((}AB(41|B8J; zXyM%~bdWv{MXdFq8A5+ks?@fJ`OM?7jP-e#TN{sRV^1{1XX#I1!+2Lt-d~)X_;5Li zOl)DvNn~O>OHN`EcCq9nCSmX0OiW@j4zuJWCZj{isCo)c8ySX*t9c6gKOs9QvswBS zq&d5or)MEs$&0Gq7MhCFN@et8tkl3K)e@j6M5>kbO1#uXmORB&TxE?3mznJ;3DUb+_jAS;|leeILBHf?(Es#E}hb`CVA(M5= zR;A}6n|0pyx==3b)2Q`&9u_E7YVA?~6e{wppFbPUy}WUDOuha*4zmhk@`O4Ji8aX6 z7vi##(e!-8Ofq^Po1Tx|N?z6Ud<>AY72iW-)AKQkCEJ{jc`VuHd>nEz<%;CvxRTNJ zd^|P9I7NtP^9xwQ3Kfklz(ysnYI6bp&5~^{fQKd9T!;@@vdx9~j3wJ#go9J~i7oqF zgkv1aHZR6^EZOG8@Umo^U%~~JZ1YRF%93q<8F!S7Hopu_eRwdg@g-QmA0>u}B9`FA zERr7zy!tpX?au`)%r8FN|k+0=k%S@Nc7z#>Dq7S^UW;%(Op&%fYoRNIWw-$k=h1(jeU zy^BNLviEU}vs{tA56etBKjXNq2vn+|43TX`Mz?GmCU9mE**27S%UZC?$>Bdl*n*~R z;ZE%AmhD8a_>0Ni6Sg8kse+QkajnScmbGC5XQ{AI8;bsrE&YRDo#i>Xusp!h2>B-y z*PP<}J=MjRLh+u*S<{$mYnpcaR(ipOkqy^gG|h1wxa3LQzoq9xtJd$`LwGXNPfTZp zc=fs>UhQ&n#*g@RLHCGPvUt^stkxCM9&Za8-U5fGbNJtXvjt9Hlb7Zi+x|*F-gx>L zZWinExe StructureHelper StructureHelper - v4.8 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -43,35 +43,41 @@ False Libraries\LoaderCalculator.dll - - packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + True packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\Microsoft.Expression.Interactions.dll - - packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + + packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + True packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll + + packages\System.Diagnostics.DiagnosticSource.6.0.0\lib\net461\System.Diagnostics.DiagnosticSource.dll + True - - packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + True packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + True - - packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + True diff --git a/StructureHelper.sln b/StructureHelper.sln index c6db78e..9096489 100644 --- a/StructureHelper.sln +++ b/StructureHelper.sln @@ -16,7 +16,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StructureHelperCommon", "St EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FieldVisualizer", "FieldVisualizer\FieldVisualizer.csproj", "{87064B50-3B7C-4A91-AF4A-941C6F95D997}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiledVisualzerDemo", "FiledVisualzerDemo\FiledVisualzerDemo.csproj", "{C92A5F2E-567B-48C9-A524-5740DB03509D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FieldVisualzerDemo", "FiledVisualzerDemo\FieldVisualzerDemo.csproj", "{C92A5F2E-567B-48C9-A524-5740DB03509D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/StructureHelperCommon/StructureHelperCommon.csproj b/StructureHelperCommon/StructureHelperCommon.csproj index 568d6ad..fcc0973 100644 --- a/StructureHelperCommon/StructureHelperCommon.csproj +++ b/StructureHelperCommon/StructureHelperCommon.csproj @@ -9,7 +9,7 @@ Properties StructureHelperCommon StructureHelperCommon - v4.8 + v4.7.2 512 true diff --git a/StructureHelperTests/StructureHelperTests.csproj b/StructureHelperTests/StructureHelperTests.csproj index 641ea4e..9b42d11 100644 --- a/StructureHelperTests/StructureHelperTests.csproj +++ b/StructureHelperTests/StructureHelperTests.csproj @@ -10,7 +10,7 @@ Properties StructureHelperTests StructureHelperTests - v4.8 + v4.7.2 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 15.0 @@ -52,18 +52,21 @@ + - ..\packages\Castle.Core.5.0.0\lib\net462\Castle.Core.dll + ..\packages\Castle.Core.5.1.0\lib\net462\Castle.Core.dll + True ..\Libraries\LoaderCalculator.dll True - ..\packages\Moq.4.18.1\lib\net462\Moq.dll + ..\packages\Moq.4.18.2\lib\net462\Moq.dll + True ..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll @@ -72,8 +75,9 @@ - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + True ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/StructureHelperTests/app.config b/StructureHelperTests/app.config new file mode 100644 index 0000000..0075fb7 --- /dev/null +++ b/StructureHelperTests/app.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/StructureHelperTests/packages.config b/StructureHelperTests/packages.config index e3e465e..7c07542 100644 --- a/StructureHelperTests/packages.config +++ b/StructureHelperTests/packages.config @@ -1,9 +1,9 @@  - - + + - + \ No newline at end of file diff --git a/Windows/MainWindow/MainView.xaml b/Windows/MainWindow/MainView.xaml index f7e3644..197c77c 100644 --- a/Windows/MainWindow/MainView.xaml +++ b/Windows/MainWindow/MainView.xaml @@ -45,64 +45,81 @@