From 523c90e3b015ceb10f4e9eed9d73e23eaf851bcd Mon Sep 17 00:00:00 2001 From: RedGuy Date: Thu, 14 Nov 2019 20:44:39 +0300 Subject: [PATCH] Refactor and bugfix --- MainWindow.xaml.cs | 195 ++++++++++-------- obj/Debug/App.g.cs | 2 +- obj/Debug/App.g.i.cs | 2 +- obj/Debug/MainWindow.baml | Bin 4532 -> 4677 bytes obj/Debug/MainWindow.g.cs | 13 +- obj/Debug/MainWindow.g.i.cs | 13 +- .../PhysFormuler.csproj.FileListAbsolute.txt | 15 ++ obj/Debug/PhysFormuler.g.resources | Bin 4760 -> 4905 bytes obj/Debug/PhysFormuler_MarkupCompile.i.lref | 4 - obj/Debug/PhysFormuler_MarkupCompile.lref | 2 +- obj/Release/App.g.cs | 2 +- obj/Release/App.g.i.cs | 2 +- obj/Release/MainWindow.baml | Bin 3187 -> 0 bytes obj/Release/MainWindow.g.cs | 2 +- obj/Release/MainWindow.g.i.cs | 2 +- obj/Release/PhysFormuler_MarkupCompile.lref | 2 +- 16 files changed, 160 insertions(+), 96 deletions(-) delete mode 100644 obj/Debug/PhysFormuler_MarkupCompile.i.lref delete mode 100644 obj/Release/MainWindow.baml diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 10e18bc..90bfcb2 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -16,6 +16,11 @@ using System.Threading; namespace PhysFormuler { + public static class Numbers + { + public static float I, U, R, q, A, S, p, l, t; + } + /// /// Логика взаимодействия для MainWindow.xaml /// @@ -26,13 +31,6 @@ namespace PhysFormuler InitializeComponent(); } - private void Log(string s) - { - Console.WriteLine(s); - Logger.Items.Add(s); - Thread.Sleep(100); - } - private bool IsReady(TextBox box,string type) { if(type != "T") @@ -64,234 +62,267 @@ namespace PhysFormuler private void Update(string type) { - try - { switch (type) { case "U": - if (IsReady(U,type)) + if (!Math.Round(Numbers.U, 4).Equals(U.Text) && IsReady(U, type)) Numbers.U = (float)Convert.ToDouble(U.Text); + if (!Math.Round(Numbers.R, 4).Equals(R.Text) && IsReady(R, type)) Numbers.R = (float)Convert.ToDouble(R.Text); + if (!Math.Round(Numbers.I, 4).Equals(I.Text) && IsReady(I, type)) Numbers.I = (float)Convert.ToDouble(I.Text); + if (!Math.Round(Numbers.q, 4).Equals(q.Text) && IsReady(q, type)) Numbers.q = (float)Convert.ToDouble(q.Text); + if (!Math.Round(Numbers.A, 4).Equals(A.Text) && IsReady(A, type)) Numbers.A = (float)Convert.ToDouble(A.Text); + if (IsReady(U,type)) { if (IsReady(R, type)) { - I.Text = Math.Round(Convert.ToDouble(U.Text) / Convert.ToDouble(R.Text),4).ToString(); - Log(U.Text + " В / " + R.Text + " Ом = " + I.Text + " А"); + Numbers.I = Numbers.U / Numbers.R; + I.Text = Math.Round(Numbers.I, 4).ToString(); } if (IsReady(I, type)) { - R.Text = Math.Round(Convert.ToDouble(U.Text) / Convert.ToDouble(I.Text),4).ToString(); - Log(U.Text + " В / " + I.Text + " А = " + R.Text + " Ом"); + Numbers.R = Numbers.U / Numbers.I; + R.Text = Math.Round(Numbers.R, 4).ToString(); } if (IsReady(q, type)) { - A.Text = Math.Round(Convert.ToDouble(U.Text) * Convert.ToDouble(q.Text),4).ToString(); - Log(U.Text + " В * " + q.Text + " Кл = " + A.Text + " А"); + Numbers.A = Numbers.U * Numbers.q; + A.Text = Math.Round(Numbers.A, 4).ToString(); } if (IsReady(A, type)) { - q.Text = Math.Round(Convert.ToDouble(A.Text) / Convert.ToDouble(U.Text),4).ToString(); - Log(A.Text + " А / " + U.Text + " В = " + q.Text + " Кл"); + Numbers.q = Numbers.A / Numbers.U; + q.Text = Math.Round(Numbers.q, 4).ToString(); } } break; case "R": - if(IsReady(R, type)) + if (!Math.Round(Numbers.U, 4).Equals(U.Text) && IsReady(U, type)) Numbers.U = (float)Convert.ToDouble(U.Text); + if (!Math.Round(Numbers.R, 4).Equals(R.Text) && IsReady(R, type)) Numbers.R = (float)Convert.ToDouble(R.Text); + if (!Math.Round(Numbers.I, 4).Equals(I.Text) && IsReady(I, type)) Numbers.I = (float)Convert.ToDouble(I.Text); + if (!Math.Round(Numbers.S, 4).Equals(S.Text) && IsReady(S, type)) Numbers.S = (float)Convert.ToDouble(S.Text); + if (!Math.Round(Numbers.p, 4).Equals(p.Text) && IsReady(p, type)) Numbers.p = (float)Convert.ToDouble(p.Text); + if (!Math.Round(Numbers.l, 4).Equals(l.Text) && IsReady(l, type)) Numbers.l = (float)Convert.ToDouble(l.Text); + if (IsReady(R, type)) { if(IsReady(U, type)) { - I.Text = Math.Round(Convert.ToDouble(U.Text) / Convert.ToDouble(R.Text),4).ToString(); - Log(U.Text + " В / " + R.Text + " Ом = " + I.Text + " А"); + Numbers.I = Numbers.U / Numbers.R; + I.Text = Math.Round(Numbers.I, 4).ToString(); } if(IsReady(I, type)) { - U.Text = Math.Round(Convert.ToDouble(I.Text) * Convert.ToDouble(R.Text),4).ToString(); - Log(I.Text + " А * " + R.Text + " Ом = " + U.Text + " В"); + Numbers.U = Numbers.I * Numbers.R; + U.Text = Math.Round(Numbers.U, 4).ToString(); } if(IsReady(S,type)) { if(IsReady(p,type)) { - l.Text = Math.Round(Convert.ToDouble(R.Text) * Convert.ToDouble(S.Text) / Convert.ToDouble(p.Text),4).ToString(); - Log(R.Text + " Ом * " + S.Text +" мм^2 / " + p.Text + " Ом*м = " + l.Text + " м"); + Numbers.l = Numbers.R * Numbers.S / Numbers.p; + l.Text = Math.Round(Numbers.l, 4).ToString(); } if(IsReady(l,type)) { - p.Text = Math.Round(Convert.ToDouble(R.Text) * Convert.ToDouble(S.Text) / Convert.ToDouble(l.Text),4).ToString(); - Log(R.Text + " Ом * " + S.Text + " мм^2 / " + l.Text + " м = " + p.Text + " Ом*м"); + Numbers.p = Numbers.R * Numbers.S / Numbers.l; + p.Text = Math.Round(Numbers.p, 4).ToString(); } } if(IsReady(p,type)) { if(IsReady(l,type)) { - S.Text = Math.Round(Convert.ToDouble(p.Text) * Convert.ToDouble(l.Text) / Convert.ToDouble(R.Text),4).ToString(); - Log(p.Text + " Ом*м * " + l.Text + " м / " + R.Text + " Ом = " + S.Text + " мм^2"); + Numbers.S = Numbers.p * Numbers.l / Numbers.R; + S.Text = Math.Round(Numbers.S, 4).ToString(); } } } break; case "I": - if(IsReady(I, type)) + if (!Math.Round(Numbers.I, 4).Equals(I.Text) && IsReady(I, type)) Numbers.I = (float)Convert.ToDouble(I.Text); + if (!Math.Round(Numbers.R, 4).Equals(R.Text) && IsReady(R, type)) Numbers.R = (float)Convert.ToDouble(R.Text); + if (!Math.Round(Numbers.U, 4).Equals(U.Text) && IsReady(U, type)) Numbers.U = (float)Convert.ToDouble(U.Text); + if (!Math.Round(Numbers.q, 4).Equals(q.Text) && IsReady(q, type)) Numbers.q = (float)Convert.ToDouble(q.Text); + if (!Math.Round(Numbers.t, 4).Equals(t.Text) && IsReady(t, type)) Numbers.t = (float)Convert.ToDouble(t.Text); + if (IsReady(I, type)) { if (IsReady(R, type)) { - U.Text = Math.Round(Convert.ToDouble(I.Text) * Convert.ToDouble(R.Text),4).ToString(); - Log(I.Text + " А * " + R.Text + " Ом = " + U.Text + " В"); + Numbers.U = Numbers.I * Numbers.R; + U.Text = Math.Round(Numbers.U, 4).ToString(); } if (IsReady(U, type)) { - R.Text = Math.Round(Convert.ToDouble(U.Text) / Convert.ToDouble(I.Text),4).ToString(); - Log(U.Text + " В / " + I.Text + " А = " + R.Text + " Ом"); + Numbers.R = Numbers.U / Numbers.I; + R.Text = Math.Round(Numbers.R, 4).ToString(); } if(IsReady(q, type)) { - t.Text = Math.Round(Convert.ToDouble(q.Text) / Convert.ToDouble(I.Text),4).ToString(); - Log(q.Text + " Кл / " + I.Text + " А = " + t.Text + " Сек"); + Numbers.t = Numbers.q / Numbers.I; + t.Text = Math.Round(Numbers.t, 4).ToString(); } if(IsReady(t, type)) { - q.Text = Math.Round(Convert.ToDouble(I.Text) * Convert.ToDouble(t.Text),4).ToString(); - Log(I.Text + " А * " + t.Text + " Сек = " + q.Text + " Кл"); + Numbers.q = Numbers.I * Numbers.t; + q.Text = Math.Round(Numbers.q, 4).ToString(); } } break; case "q": - if(IsReady(q, type)) + if (!Math.Round(Numbers.U, 4).Equals(U.Text) && IsReady(U, type)) Numbers.U = (float)Convert.ToDouble(U.Text); + if (!Math.Round(Numbers.q, 4).Equals(q.Text) && IsReady(q, type)) Numbers.q = (float)Convert.ToDouble(q.Text); + if (!Math.Round(Numbers.I, 4).Equals(I.Text) && IsReady(I, type)) Numbers.I = (float)Convert.ToDouble(I.Text); + if (!Math.Round(Numbers.t, 4).Equals(t.Text) && IsReady(t, type)) Numbers.t = (float)Convert.ToDouble(t.Text); + if (!Math.Round(Numbers.A, 4).Equals(A.Text) && IsReady(A, type)) Numbers.A = (float)Convert.ToDouble(A.Text); + if (IsReady(q, type)) { if(IsReady(U, type)) { - A.Text = Math.Round(Convert.ToDouble(U.Text) * Convert.ToDouble(q.Text),4).ToString(); - Log(U.Text + " В * " + q.Text + " Кл = " + A.Text + " Дж"); + Numbers.A = Numbers.U * Numbers.q; + A.Text = Math.Round(Numbers.A, 4).ToString(); } if(IsReady(I, type)) { - t.Text = Math.Round(Convert.ToDouble(q.Text) / Convert.ToDouble(I.Text),4).ToString(); - Log(q.Text + " Кл / " + I.Text + " А = " + t.Text + " Сек"); + Numbers.t = Numbers.q / Numbers.I; + t.Text = Math.Round(Numbers.t, 4).ToString(); } if(IsReady(t, type)) { - I.Text = Math.Round(Convert.ToDouble(q.Text) / Convert.ToDouble(t.Text),4).ToString(); - Log(q.Text + " Кл / " + t.Text + " Сек = " + I.Text + " А"); + Numbers.I = Numbers.q / Numbers.t; + I.Text = Math.Round(Numbers.I, 4).ToString(); } if(IsReady(A, type)) { - U.Text = Math.Round(Convert.ToDouble(A.Text) * Convert.ToDouble(q.Text),4).ToString(); - Log(A.Text + " Дж * " + q.Text + " Кл = " + U.Text + " В"); + Numbers.U = Numbers.A * Numbers.q; + U.Text = Math.Round(Numbers.U, 4).ToString(); } } break; case "A": - if(IsReady(A, type)) + if (!Math.Round(Numbers.A, 4).Equals(A.Text) && IsReady(A, type)) Numbers.A = (float)Convert.ToDouble(A.Text); + if (!Math.Round(Numbers.U, 4).Equals(U.Text) && IsReady(U, type)) Numbers.U = (float)Convert.ToDouble(U.Text); + if (!Math.Round(Numbers.q, 4).Equals(q.Text) && IsReady(q, type)) Numbers.q = (float)Convert.ToDouble(q.Text); + if (IsReady(A, type)) { if(IsReady(U, type)) { - q.Text = Math.Round(Convert.ToDouble(A.Text) / Convert.ToDouble(U.Text),4).ToString(); - Log(A.Text + " Дж / " + U.Text + " В = " + q.Text + " Кл"); + Numbers.q = Numbers.A / Numbers.U; + q.Text = Math.Round(Numbers.q, 4).ToString(); } if(IsReady(q, type)) { - U.Text = Math.Round(Convert.ToDouble(A.Text) * Convert.ToDouble(q.Text),4).ToString(); - Log(A.Text + " Дж * " + q.Text + " Кл = " + U.Text + " В"); + Numbers.U = Numbers.A * Numbers.q; + U.Text = Math.Round(Numbers.U, 4).ToString(); } } break; case "t": - if(IsReady(t, type)) + if (!Math.Round(Numbers.I, 4).Equals(I.Text) && IsReady(I, type)) Numbers.I = (float)Convert.ToDouble(I.Text); + if (!Math.Round(Numbers.t, 4).Equals(t.Text) && IsReady(t, type)) Numbers.t = (float)Convert.ToDouble(t.Text); + if (!Math.Round(Numbers.q, 4).Equals(q.Text) && IsReady(q, type)) Numbers.q = (float)Convert.ToDouble(q.Text); + if (IsReady(t, type)) { if(IsReady(I, type)) { - q.Text = Math.Round(Convert.ToDouble(I.Text) * Convert.ToDouble(t.Text),4).ToString(); - Log(I.Text + " А * " + t.Text + " Сек = " + q.Text + " Кл"); + Numbers.q = Numbers.I * Numbers.t; + q.Text = Math.Round(Numbers.q, 4).ToString(); } if(IsReady(q, type)) { - I.Text = Math.Round(Convert.ToDouble(q.Text) / Convert.ToDouble(t.Text),4).ToString(); - Log(q.Text + " Кл / " + t.Text + " Сек = " + I.Text + " А"); + Numbers.I = Numbers.q / Numbers.t; + I.Text = Math.Round(Numbers.I, 4).ToString(); } } break; case "p": - if(IsReady(p,type)) + if (!Math.Round(Numbers.p, 4).Equals(p.Text) && IsReady(p, type)) Numbers.p = (float)Convert.ToDouble(p.Text); + if (!Math.Round(Numbers.l, 4).Equals(l.Text) && IsReady(l, type)) Numbers.l = (float)Convert.ToDouble(l.Text); + if (!Math.Round(Numbers.S, 4).Equals(S.Text) && IsReady(S, type)) Numbers.S = (float)Convert.ToDouble(S.Text); + if (!Math.Round(Numbers.R, 4).Equals(R.Text) && IsReady(R, type)) Numbers.R = (float)Convert.ToDouble(R.Text); + if (IsReady(p,type)) { if(IsReady(l,type)) { if(IsReady(S,type)) { - R.Text = Math.Round(Convert.ToDouble(p.Text) * Convert.ToDouble(l.Text) / Convert.ToDouble(S.Text),4).ToString(); - Log(p.Text + " Кл * " + l.Text + " м / " + S.Text + " мм^2 = " + R.Text + " Ом"); + Numbers.R = Numbers.p * Numbers.l / Numbers.S; + R.Text = Math.Round(Numbers.R, 4).ToString(); } if(IsReady(R,type)) { - S.Text = Math.Round(Convert.ToDouble(p.Text) * Convert.ToDouble(l.Text) / Convert.ToDouble(R.Text),4).ToString(); - Log(p.Text + " Кл * " + l.Text + " м / " + R.Text + " Ом = " + S.Text + " мм^2"); + Numbers.S = Numbers.p * Numbers.l / Numbers.R; + S.Text = Math.Round(Numbers.S, 4).ToString(); } } if(IsReady(R,type)) { if(IsReady(S,type)) { - l.Text = Math.Round(Convert.ToDouble(R.Text) * Convert.ToDouble(S.Text) / Convert.ToDouble(p.Text),4).ToString(); - Log(R.Text + " Ом * " + S.Text + " мм^2 / " + p.Text + " Кл = " + l.Text + " м"); + Numbers.l = Numbers.R * Numbers.S / Numbers.p; + l.Text = Math.Round(Numbers.l, 4).ToString(); } } } break; case "l": - if(IsReady(l,type)) + if (!Math.Round(Numbers.p, 4).Equals(p.Text) && IsReady(p, type)) Numbers.p = (float)Convert.ToDouble(p.Text); + if (!Math.Round(Numbers.l, 4).Equals(l.Text) && IsReady(l, type)) Numbers.l = (float)Convert.ToDouble(l.Text); + if (!Math.Round(Numbers.S, 4).Equals(S.Text) && IsReady(S, type)) Numbers.S = (float)Convert.ToDouble(S.Text); + if (!Math.Round(Numbers.R, 4).Equals(R.Text) && IsReady(R, type)) Numbers.R = (float)Convert.ToDouble(R.Text); + if (IsReady(l,type)) { if(IsReady(p,type)) { if(IsReady(S,type)) { - R.Text = Math.Round(Convert.ToDouble(p.Text) * Convert.ToDouble(l.Text) / Convert.ToDouble(S.Text),4).ToString(); - Log(p.Text + " Кл * " + l.Text + " м / " + S.Text + " мм^2 = " + R.Text + " Ом"); + Numbers.R = Numbers.p * Numbers.l / Numbers.S; + R.Text = Math.Round(Numbers.R, 4).ToString(); } if(IsReady(R,type)) { - S.Text = Math.Round(Convert.ToDouble(p.Text) * Convert.ToDouble(l.Text) / Convert.ToDouble(R.Text),4).ToString(); - Log(p.Text + " Кл * " + l.Text + " м / " + R.Text + " Ом = " + S.Text + " мм^2"); + Numbers.S = Numbers.p * Numbers.l / Numbers.R; + S.Text = Math.Round(Numbers.S, 4).ToString(); } } if(IsReady(R,type)) { if(IsReady(S,type)) { - p.Text = Math.Round(Convert.ToDouble(R.Text) * Convert.ToDouble(S.Text) / Convert.ToDouble(l.Text),4).ToString(); - Log(R.Text + " Ом * " + S.Text + " мм^2 / " + l.Text + " м = " + p.Text + " Кл"); + Numbers.p = Numbers.R * Numbers.S / Numbers.l; + p.Text = Math.Round(Numbers.p, 4).ToString(); } } } break; case "S": - if(IsReady(S,type)) + if (!Math.Round(Numbers.p, 4).Equals(p.Text) && IsReady(p, type)) Numbers.p = (float)Convert.ToDouble(p.Text); + if (!Math.Round(Numbers.l, 4).Equals(l.Text) && IsReady(l, type)) Numbers.l = (float)Convert.ToDouble(l.Text); + if (!Math.Round(Numbers.S, 4).Equals(S.Text) && IsReady(S, type)) Numbers.S = (float)Convert.ToDouble(S.Text); + if (!Math.Round(Numbers.R, 4).Equals(R.Text) && IsReady(R, type)) Numbers.R = (float)Convert.ToDouble(R.Text); + if (IsReady(S,type)) { if(IsReady(p,type)) { if(IsReady(l,type)) { - R.Text = Math.Round(Convert.ToDouble(p.Text) * Convert.ToDouble(l.Text) / Convert.ToDouble(S.Text),4).ToString(); - Log(p.Text + " Кл * " + l.Text + " м / " + S.Text + " мм^2 = " + R.Text + " Ом"); + Numbers.R = Numbers.p * Numbers.l / Numbers.S; + R.Text = Math.Round(Numbers.R, 4).ToString(); } if(IsReady(R,type)) { - l.Text = Math.Round(Convert.ToDouble(R.Text) * Convert.ToDouble(S.Text) / Convert.ToDouble(p.Text),4).ToString(); - Log(R.Text + " Ом * " + S.Text + " мм^2 / " + p.Text + " Кл = " + l.Text + " м"); + Numbers.l = Numbers.R * Numbers.S / Numbers.p; + l.Text = Math.Round(Numbers.l, 4).ToString(); } } if(IsReady(R,type)) { if(IsReady(l,type)) { - p.Text = Math.Round(Convert.ToDouble(R.Text) * Convert.ToDouble(S.Text) / Convert.ToDouble(l.Text),4).ToString(); - Log(R.Text + " Ом * " + S.Text + " мм^2 / " + l.Text + " м = " + p.Text + " Кл"); + Numbers.p = Numbers.R * Numbers.S / Numbers.l; + p.Text = Math.Round(Numbers.p, 4).ToString(); } } } break; } - } catch - { - - } } private void TC(object sender, TextChangedEventArgs e) diff --git a/obj/Debug/App.g.cs b/obj/Debug/App.g.cs index 022a3f4..9cf5292 100644 --- a/obj/Debug/App.g.cs +++ b/obj/Debug/App.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BC7C2D608DE8DFDBE203A54118EB5EE369C484E3" +#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "207B856E591731B90719928E80E005EA9BC4B229A156467084A5BA966B3C05AF" //------------------------------------------------------------------------------ // // Этот код создан программой. diff --git a/obj/Debug/App.g.i.cs b/obj/Debug/App.g.i.cs index 022a3f4..9cf5292 100644 --- a/obj/Debug/App.g.i.cs +++ b/obj/Debug/App.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BC7C2D608DE8DFDBE203A54118EB5EE369C484E3" +#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "207B856E591731B90719928E80E005EA9BC4B229A156467084A5BA966B3C05AF" //------------------------------------------------------------------------------ // // Этот код создан программой. diff --git a/obj/Debug/MainWindow.baml b/obj/Debug/MainWindow.baml index 0836fb5499f56f993c5b19a2a46b1d67bd144880..5ecfba979187f215a6824a6fe24d82c59ccdfe7b 100644 GIT binary patch delta 160 zcmdm@d{kw_d_gnj?tcuX?hFhJTtKYL4J1r~7!2gOSs1$iF|+t3=BBFfurRRsOR?#O*mEws7i(N;(umCQ_Cg)%xpnif%E^l3=MRQObv8^u<);$7g*7W|I8uz l1-Adq;=tVF|C!Cr%z%2zfLs<9Q%@kp4q}>ulrsY{69D+hB&`4d delta 29 gcmX@AvPF5rd_hqbQx66P26iB3G4%wJ%s|Wp0Ap?hMF0Q* diff --git a/obj/Debug/MainWindow.g.cs b/obj/Debug/MainWindow.g.cs index 68c3509..1bc4452 100644 --- a/obj/Debug/MainWindow.g.cs +++ b/obj/Debug/MainWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CC0A0916C214BEC2ABB76527EE89F66AC08038FC" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C940A7EC1C1F318B915586DB854312BE5B4E31302B1570EA55356EFCBCA6ED7F" //------------------------------------------------------------------------------ // // Этот код создан программой. @@ -120,6 +120,14 @@ namespace PhysFormuler { #line default #line hidden + + #line 71 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.ListBox Logger; + + #line default + #line hidden + private bool _contentLoaded; /// @@ -240,6 +248,9 @@ namespace PhysFormuler { #line default #line hidden return; + case 11: + this.Logger = ((System.Windows.Controls.ListBox)(target)); + return; } this._contentLoaded = true; } diff --git a/obj/Debug/MainWindow.g.i.cs b/obj/Debug/MainWindow.g.i.cs index 68c3509..1bc4452 100644 --- a/obj/Debug/MainWindow.g.i.cs +++ b/obj/Debug/MainWindow.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CC0A0916C214BEC2ABB76527EE89F66AC08038FC" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C940A7EC1C1F318B915586DB854312BE5B4E31302B1570EA55356EFCBCA6ED7F" //------------------------------------------------------------------------------ // // Этот код создан программой. @@ -120,6 +120,14 @@ namespace PhysFormuler { #line default #line hidden + + #line 71 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.ListBox Logger; + + #line default + #line hidden + private bool _contentLoaded; /// @@ -240,6 +248,9 @@ namespace PhysFormuler { #line default #line hidden return; + case 11: + this.Logger = ((System.Windows.Controls.ListBox)(target)); + return; } this._contentLoaded = true; } diff --git a/obj/Debug/PhysFormuler.csproj.FileListAbsolute.txt b/obj/Debug/PhysFormuler.csproj.FileListAbsolute.txt index 89e6bc3..a19a6ef 100644 --- a/obj/Debug/PhysFormuler.csproj.FileListAbsolute.txt +++ b/obj/Debug/PhysFormuler.csproj.FileListAbsolute.txt @@ -13,3 +13,18 @@ C:\Users\Илья\Source\Repos\Dev_PhysFormuler\PhysFormuler\obj\Debug\PhysFormu C:\Users\Илья\Source\Repos\Dev_PhysFormuler\PhysFormuler\obj\Debug\PhysFormuler.csproj.CoreCompileInputs.cache C:\Users\Илья\Source\Repos\Dev_PhysFormuler\PhysFormuler\obj\Debug\PhysFormuler.exe C:\Users\Илья\Source\Repos\Dev_PhysFormuler\PhysFormuler\obj\Debug\PhysFormuler.pdb +C:\Users\Илья\Source\Repos\PhysFormuler\bin\Debug\PhysFormuler.exe.config +C:\Users\Илья\Source\Repos\PhysFormuler\bin\Debug\PhysFormuler.exe +C:\Users\Илья\Source\Repos\PhysFormuler\bin\Debug\PhysFormuler.pdb +C:\Users\Илья\Source\Repos\PhysFormuler\obj\Debug\PhysFormuler.csprojAssemblyReference.cache +C:\Users\Илья\Source\Repos\PhysFormuler\obj\Debug\MainWindow.g.cs +C:\Users\Илья\Source\Repos\PhysFormuler\obj\Debug\App.g.cs +C:\Users\Илья\Source\Repos\PhysFormuler\obj\Debug\PhysFormuler_MarkupCompile.cache +C:\Users\Илья\Source\Repos\PhysFormuler\obj\Debug\PhysFormuler_MarkupCompile.lref +C:\Users\Илья\Source\Repos\PhysFormuler\obj\Debug\MainWindow.baml +C:\Users\Илья\Source\Repos\PhysFormuler\obj\Debug\PhysFormuler.g.resources +C:\Users\Илья\Source\Repos\PhysFormuler\obj\Debug\PhysFormuler.Properties.Resources.resources +C:\Users\Илья\Source\Repos\PhysFormuler\obj\Debug\PhysFormuler.csproj.GenerateResource.cache +C:\Users\Илья\Source\Repos\PhysFormuler\obj\Debug\PhysFormuler.csproj.CoreCompileInputs.cache +C:\Users\Илья\Source\Repos\PhysFormuler\obj\Debug\PhysFormuler.exe +C:\Users\Илья\Source\Repos\PhysFormuler\obj\Debug\PhysFormuler.pdb diff --git a/obj/Debug/PhysFormuler.g.resources b/obj/Debug/PhysFormuler.g.resources index 0fe913604a55ebdf0491a02d196bcd9b3f9b59f0..1e067d432729984a578bfa252662d2e8ad25a60a 100644 GIT binary patch delta 166 zcmbQCx>9Yz1149YjgJ-znlX3(V=#4RU|`?^VqI<^VG6`xAkWRh(EX2@#V;{8RfUIz zfz2mBJw3H(=3i6y$%;I}u}VNyDx4SpGaH&(F8OC>3*ri#|IcM;pkriepaX=3f6ctW ricb7z4#_XD{cjcr<{tmgY;I--)KdoJvapzX0x5P7(-fqf8HkwxgLfwl delta 35 mcmZ3fHbZs71Ewv48y_tc6lF2>U|?Wi2VxdePaw$*#7qFcc?T^3 diff --git a/obj/Debug/PhysFormuler_MarkupCompile.i.lref b/obj/Debug/PhysFormuler_MarkupCompile.i.lref deleted file mode 100644 index 8b264cb..0000000 --- a/obj/Debug/PhysFormuler_MarkupCompile.i.lref +++ /dev/null @@ -1,4 +0,0 @@ - - -FC:\Users\Илья\Source\Repos\Dev_PhysFormuler\PhysFormuler\MainWindow.xaml;; - diff --git a/obj/Debug/PhysFormuler_MarkupCompile.lref b/obj/Debug/PhysFormuler_MarkupCompile.lref index 8b264cb..d434d47 100644 --- a/obj/Debug/PhysFormuler_MarkupCompile.lref +++ b/obj/Debug/PhysFormuler_MarkupCompile.lref @@ -1,4 +1,4 @@  -FC:\Users\Илья\Source\Repos\Dev_PhysFormuler\PhysFormuler\MainWindow.xaml;; +FC:\Users\Илья\Source\Repos\PhysFormuler\MainWindow.xaml;; diff --git a/obj/Release/App.g.cs b/obj/Release/App.g.cs index 022a3f4..9cf5292 100644 --- a/obj/Release/App.g.cs +++ b/obj/Release/App.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BC7C2D608DE8DFDBE203A54118EB5EE369C484E3" +#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "207B856E591731B90719928E80E005EA9BC4B229A156467084A5BA966B3C05AF" //------------------------------------------------------------------------------ // // Этот код создан программой. diff --git a/obj/Release/App.g.i.cs b/obj/Release/App.g.i.cs index 022a3f4..9cf5292 100644 --- a/obj/Release/App.g.i.cs +++ b/obj/Release/App.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BC7C2D608DE8DFDBE203A54118EB5EE369C484E3" +#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "207B856E591731B90719928E80E005EA9BC4B229A156467084A5BA966B3C05AF" //------------------------------------------------------------------------------ // // Этот код создан программой. diff --git a/obj/Release/MainWindow.baml b/obj/Release/MainWindow.baml deleted file mode 100644 index c7a1b26fdeae1220d46e1f82dbb319a38d11cf57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3187 zcmb`J+fUn89LG;$hr6`0A$3~0WK(ug332QsCZUQnnyOP<${5hW!!*qa1|ob3wj;t@ zX&b}aA#@wf zpsQ#c_7iaSMfK-F1U{($BZN{@%j@QK-B9z2Yy|zE%7&TMwIm-3(=F&vMKVoUO)Kk3*H>Hlf(H!@KpfD; zTCC7*DXYz8wFP~RfouJrdC~loA)B&hNfw0Tx&hMGbYtZlz!5&Z7>UP3X(1v;r%*?W^N@hsSW(?ib7p+i6SGl#U zwpieVa9HFDlB#gInwT-jix|YB{%IeYEXO`H4>z4dZ)48;#yo}K{{dr>uR_!Jp=Uv8 zYAP3~3fcr*T9LH{DlcBMz)i23xzezLo|CnLsw_eqNtPMXjU`T%jFo(D1frCK5=v*4 zthMe$s%EL6Pth}y(xiE6ZcbDR_$ABz*m9@`p@Bo>o6TB^9Jqi`*KxJ~a2V*c2@{Ql zpBx1`{~=5~3`e07VY~!|h6%HAh(;jN|Hc_ zO}s(`7J2P}bn@XKd|_KX9D2hGcBp4oE?9Ghl*?tcr9hV#vGfG&I{ziitnM6vcV3|0 zza~SkGiZ>Y?rV}IrF6{#<8}ry^TgBZ^MpSkYzN%LGEa|C;QbPL8$ZTHylX$S?{RlH z{1e{9&+WVRBm6hs#`|~&Z`ZRrh>=)uw2XMnz&dihAlH#NU2oPXG0Io$Unr+3`_Fif zo96IuAOWax(Y^=7f8yQK*)JTBE*{t;@zdey_;TQHG>0D*T7?gk$RPd(@8Rco+rG=) zpb~Zfd(#gJiuf7ctS4~E#l-34tV_OHZ&wYwvjDBENUP`{l*l{yNBcg|7V$o}%Hi+v zrc*InemJ1`dyV+L2c(+@o)1?lyRmG1F2B`;Ux@QTzGeQw5_vNP_3;cO?BgxY;_zcA zoo&2lKdN_5V-^jI)pl%zZgZi>>+MbiJrZp-=$A_*fWL#DEINVT;l?@qE41n#PRXBD zHPx_3+-|E*jB>ZOy9#ETD2NHi6Y0g%=d5-eE|GWfw-D$}yk+0FH)z~{r%^Ar0IeMO z8!p$A&~YP1&m1=$u7F&<*@+a0u~t(sRU$Vr%$v(Fa&jD`VGHPCZbA_i@wVUIfZeGx z$Y1^&#!?Y%=tw=$-ql2j?qq35RHv&`IYTFnQzFPG#8zcqERkMNsBlnjyTG~+TSHFD zv{CTpHe&;AmrFa-lvWU2wdZ~aq)H?SCA9asz|C;@7dn&dubdKl2w|rgq4O1fUpi^} z3m0jk=&AE?YwUPenZTbiXCEA)k#0~n)Xky?N0p~}4~yC+^ra=)sFzA#4ER_Ap6Qjz UE5uHWKIffbR1}{au`KKT4_8{iTmS$7 diff --git a/obj/Release/MainWindow.g.cs b/obj/Release/MainWindow.g.cs index 8610cde..1bc4452 100644 --- a/obj/Release/MainWindow.g.cs +++ b/obj/Release/MainWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "7753B25EBBD66BE430FC2FD0B52EBF5B1AD812A8" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C940A7EC1C1F318B915586DB854312BE5B4E31302B1570EA55356EFCBCA6ED7F" //------------------------------------------------------------------------------ // // Этот код создан программой. diff --git a/obj/Release/MainWindow.g.i.cs b/obj/Release/MainWindow.g.i.cs index 8610cde..1bc4452 100644 --- a/obj/Release/MainWindow.g.i.cs +++ b/obj/Release/MainWindow.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "7753B25EBBD66BE430FC2FD0B52EBF5B1AD812A8" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C940A7EC1C1F318B915586DB854312BE5B4E31302B1570EA55356EFCBCA6ED7F" //------------------------------------------------------------------------------ // // Этот код создан программой. diff --git a/obj/Release/PhysFormuler_MarkupCompile.lref b/obj/Release/PhysFormuler_MarkupCompile.lref index 8b264cb..d434d47 100644 --- a/obj/Release/PhysFormuler_MarkupCompile.lref +++ b/obj/Release/PhysFormuler_MarkupCompile.lref @@ -1,4 +1,4 @@  -FC:\Users\Илья\Source\Repos\Dev_PhysFormuler\PhysFormuler\MainWindow.xaml;; +FC:\Users\Илья\Source\Repos\PhysFormuler\MainWindow.xaml;;