diff --git a/.vs/PhysFormuler/v16/Server/sqlite3/storage.ide b/.vs/PhysFormuler/v16/Server/sqlite3/storage.ide index ced99a9..78ac8a3 100644 Binary files a/.vs/PhysFormuler/v16/Server/sqlite3/storage.ide and b/.vs/PhysFormuler/v16/Server/sqlite3/storage.ide differ diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index b404ad4..c1b0156 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -36,19 +36,14 @@ namespace PhysFormuler { if (box.Text != "") { - if (Convert.ToDouble(box.Text) != 0) + double number; + if (Double.TryParse(box.Text,out number)) { - return true; - } - else - { - return false; + return !double.IsNaN(number); } + else return false; } - else - { - return false; - } + else return false; } private void Update(string type) @@ -101,7 +96,7 @@ namespace PhysFormuler if(IsReady(U, type)) { Numbers.I = Numbers.U / Numbers.R; - I.Text = Math.Round(Numbers.I, 4).ToString(); + I.Text = Math.Round(Numbers.I, 4).ToString(); } if(IsReady(I, type)) { diff --git a/PhysFormuler.csproj.user b/PhysFormuler.csproj.user index 729e852..1bbb2f7 100644 --- a/PhysFormuler.csproj.user +++ b/PhysFormuler.csproj.user @@ -10,4 +10,7 @@ ru-RU false + + false + \ No newline at end of file