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/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..e8635fc --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,76 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, sex characteristics, gender identity and expression, +level of experience, education, socio-economic status, nationality, personal +appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at admin@redguy.ru. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see +https://www.contributor-covenant.org/faq 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