Merge pull request #6 from RedGuys/beta

removing Beta
This commit is contained in:
Ilya 2020-04-15 09:40:46 +03:00 committed by GitHub
commit 2d887aab2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 45 additions and 2 deletions

3
.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
obj/
bin/
.vs/PhysFormuler/v16/Server/sqlite3/storage.ide

Binary file not shown.

View File

@ -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;

BIN
PhysFormuler v1.0.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

37
PhysFormuler.sln Normal file
View File

@ -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

Binary file not shown.

View File

@ -1,5 +1,4 @@
# PhysFormuler
PhysFormuler is an application that will help you calculate physical quantities.
Flow process: Every 10 commmits: alpha -> beta<br>
After testing: beta -> master
Flow process: unstable -> master at stable version