diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4a63b91 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +obj/ +bin/ +.vs/PhysFormuler/v16/Server/sqlite3/storage.ide diff --git a/.vs/PhysFormuler/v16/Server/sqlite3/storage.ide b/.vs/PhysFormuler/v16/Server/sqlite3/storage.ide new file mode 100644 index 0000000..ced99a9 Binary files /dev/null and b/.vs/PhysFormuler/v16/Server/sqlite3/storage.ide differ diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 261ea33..101ef19 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -77,21 +77,25 @@ namespace PhysFormuler { Numbers.I = Numbers.U / Numbers.R; I.Text = Math.Round(Numbers.I, 4).ToString(); + Logger.Items.Add(Numbers.U + "В / " + Numbers.R + "Ом = " + I.Text + "А"); } if (IsReady(I, type)) { Numbers.R = Numbers.U / Numbers.I; R.Text = Math.Round(Numbers.R, 4).ToString(); + Logger.Items.Add(Numbers.U + "В / " + Numbers.I + "А = " + R.Text + "Ом"); } if (IsReady(q, type)) { Numbers.A = Numbers.U * Numbers.q; A.Text = Math.Round(Numbers.A, 4).ToString(); + Logger.Items.Add(Numbers.U + "В * " + Numbers.q + "Кл = " + Numbers.A + "Дж"); } if (IsReady(A, type)) { Numbers.q = Numbers.A / Numbers.U; q.Text = Math.Round(Numbers.q, 4).ToString(); + Logger.Items.Add(Numbers.A + "Дж / " + Numbers.U + "В = " + Numbers.q + "Кл"); } } break; diff --git a/PhysFormuler v1.0.ico b/PhysFormuler v1.0.ico new file mode 100644 index 0000000..42d0f31 Binary files /dev/null and b/PhysFormuler v1.0.ico differ diff --git a/PhysFormuler.sln b/PhysFormuler.sln new file mode 100644 index 0000000..e4d47da --- /dev/null +++ b/PhysFormuler.sln @@ -0,0 +1,37 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29509.3 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhysFormuler", "PhysFormuler.csproj", "{4A18C2F6-550F-43B8-A794-A958E38BFBDC}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4A18C2F6-550F-43B8-A794-A958E38BFBDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4A18C2F6-550F-43B8-A794-A958E38BFBDC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4A18C2F6-550F-43B8-A794-A958E38BFBDC}.Debug|x64.ActiveCfg = Debug|x64 + {4A18C2F6-550F-43B8-A794-A958E38BFBDC}.Debug|x64.Build.0 = Debug|x64 + {4A18C2F6-550F-43B8-A794-A958E38BFBDC}.Debug|x86.ActiveCfg = Debug|x86 + {4A18C2F6-550F-43B8-A794-A958E38BFBDC}.Debug|x86.Build.0 = Debug|x86 + {4A18C2F6-550F-43B8-A794-A958E38BFBDC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4A18C2F6-550F-43B8-A794-A958E38BFBDC}.Release|Any CPU.Build.0 = Release|Any CPU + {4A18C2F6-550F-43B8-A794-A958E38BFBDC}.Release|x64.ActiveCfg = Release|x64 + {4A18C2F6-550F-43B8-A794-A958E38BFBDC}.Release|x64.Build.0 = Release|x64 + {4A18C2F6-550F-43B8-A794-A958E38BFBDC}.Release|x86.ActiveCfg = Release|x86 + {4A18C2F6-550F-43B8-A794-A958E38BFBDC}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {465A208E-5FE1-4E7B-B3D2-77E518F5AFC3} + EndGlobalSection +EndGlobal diff --git a/PhysFormuler_TemporaryKey.pfx b/PhysFormuler_TemporaryKey.pfx new file mode 100644 index 0000000..bc509ec Binary files /dev/null and b/PhysFormuler_TemporaryKey.pfx differ diff --git a/README.md b/README.md index e2f68ea..f7fe3af 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # PhysFormuler PhysFormuler is an application that will help you calculate physical quantities. -Flow process: Every 10 commmits: alpha -> beta
-After testing: beta -> master +Flow process: unstable -> master at stable version