From faf209f9464dad5bc47bb5e015047aad40cdcb0b Mon Sep 17 00:00:00 2001 From: KhasanovAMdev Date: Sun, 18 Jan 2026 14:42:32 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D1=87=D1=82=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=20?= =?UTF-8?q?db?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/limits.db | Bin 0 -> 16384 bytes Pages/Results.cshtml | 9 +++------ Pages/Results.cshtml.cs | 34 ++++++++++++++++++++++++++++++---- Program.cs | 5 ----- TestApp.csproj | 1 + 5 files changed, 34 insertions(+), 15 deletions(-) create mode 100644 Data/limits.db diff --git a/Data/limits.db b/Data/limits.db new file mode 100644 index 0000000000000000000000000000000000000000..8f30234c46f532e160393ac60d62396a8d9776b1 GIT binary patch literal 16384 zcmeI3YitzP8HRUe_A-~9-SuZ1+hD`mV6ZV@%q0mSfDJZa@CDyOTtZv}3plYcHp{&< z8k9&SRg|F;P8?8pwbZSLyG)_rP! zUADn>>N?x&oX(!Xj%^+N%Xo8pZtT$E{MPBoi8_Z*@5=V{4rY6Xy1Hg}4o==-SNquL zL@uA3{wHS^cHjBj+<1OejiTs^gOlUA>Cq$mb9damtG~0mt$#SXvtzgcL9%T_gT0+S zocsLJ+p?^GPnNpwvHxXD-5ouHjc(&EGhWfuWDFNn@yF7UW4Wp0Irh%0Ms8X~Yw8m_ z8;8H|X(}&Un>9+LpbX7W* z`Y?4pbv1P<^-}7o)Y;Ub)Ie%eswq{GvizI=b^oe=$$!y*(m(Cz{62q!-{_b7M)GFz zSIM6zUrl~1`PJmfDEzcSkozmq#n3mi0&LnswRwq4f>xaqFnH$J%POSp35#=AX>#<`wf*^PA=cGjEQV zJIu9a*7S_O7&nYx7_YPJf9XZRU3SFemtoj%I+shHDgDa1wG^zCF#STwGbdM5utq}v z<@5{FEflPlFxlh3Jl;gXDhb^Wl063+DQJ< zD~h0|9+4u5nCL~05%w}9dWXEjABt&-1X0!-$cC1fJLS%2Nq`;IA zsqW+KhJ?s|PdNqrdtWn88ysc5AAN5n(W3>1gW!W#_m?Guj`8JmPBPfYHPV+PgN%`S zIx87m4A;>a$)I9j0iBi%CVFb4xzeq1s**ilW7 zNCpS(bLrtC#tvF5X-qOW;8{N`865DWACe3X)|Amf$&h(P3FV4d)_Q+gh7Ksk+wd~J zg7!-WFT4)+Nd_FSh_RRTb7+rb z@WKwhAQ`-{gJH?wh3|z2B!icx4DBvr?4cn|_e*A;u(I_j8Y(bs!xgWWLCN5X*UNxp zaK-mWzhrR5_eY;(aMfKyyCj3FZS$yCGPr81q8`cMYC{Ee7cq9VuAI6ggDbv2c1i|U zt4e8yWN^jnrBgDvYE0AiBF3&3r)ZmGaI?s#t&$nH%oDXq>L@U5!xcYE+9iW4UN2iD zgDZYmZk7zL_*vN|8C|Osy=;;UuGq`QBF3)PmeB^u;EKK6CmCF^m-Ujt6|bRt zC4(zoFYAgJyISbeJ(9r{d%0UOxLM$3!q#YWYs9v3YraRSG8#`Cw_t@=hH8vpu)X?a#C$EWNc-1DXFpu1}l6QsjdhHEBqu;RS^tUc(tge z2nH*>GE`9v8C$9IN%cf9SXtnas)=Br^Sw;i5<@E?tMN!xL}R`2G}7{XtA+@Mv^?Lc zAc7$+&$sG_A>*_yrKIX17}D~5t9A&6v`aIj${`ri@-stqLolS}`Bv31WSo}gTQx(l z+i6uX1Vh>yFBA5{Fm1@HT~ehm@{zF~DR_QVCkz><;D7B@B?LnXo*&f+!H|OIM-@Ua zq~N<*^+7PC;Q3K?Fl3w}nF^bMAbkrjE+~2YJp%F9gjqnz>x9icqFO=f?;%QPgOuLjBc)z2^(NIx{y^lr0QSf zV&n?0%Co529~iF6>r<7#knvS{HO32fG8nGPX;t+D!&R%COxXOwtA?!7DdE~@gr5=* bL@v&pSi+@Gp_%j2T=@(W=kZa-txD$~-%{MT literal 0 HcmV?d00001 diff --git a/Pages/Results.cshtml b/Pages/Results.cshtml index 3d158d8..ff2a90b 100644 --- a/Pages/Results.cshtml +++ b/Pages/Results.cshtml @@ -23,9 +23,7 @@ th, td, form, - h2, - h3, - img { + h2 { border: 1px solid #ddd; padding: 8px; text-align: center; @@ -38,7 +36,6 @@ -

Расчет размеров поковки

@@ -191,10 +188,10 @@

-

Результат без пробы

+

Результат без пробы

Результат без пробы


-

Результат с пробой

+

Результат с пробой

Результат с пробой

diff --git a/Pages/Results.cshtml.cs b/Pages/Results.cshtml.cs index 4cbe0b0..a0108a4 100644 --- a/Pages/Results.cshtml.cs +++ b/Pages/Results.cshtml.cs @@ -1,10 +1,9 @@ -using Microsoft.AspNetCore.Mvc; +using Microsoft.Data.Sqlite; using Microsoft.AspNetCore.Mvc.RazorPages; using System.Drawing; -using System.Drawing.Drawing2D; using System.Drawing.Imaging; using System.Drawing.Text; -using System.IO; + public class ResultsModel : PageModel { @@ -205,6 +204,33 @@ public class ResultsModel : PageModel ResultImage("Result_WithBlank", mDisk_nom_2_O, mDisk_max_2_O, _dd, d_BilletWithBlank, limit6, _H, H_BilletWithBlank, _D, D_BilletWithBlank, limit4); } + + public (int Delta, int Tolerance) SearchLimit(double D, double H) + { + using var connection = new SqliteConnection("Data Source=tolerances.db"); + connection.Open(); + + var command = connection.CreateCommand(); + command.CommandText = @" + SELECT Delta, Tolerance + FROM Tolerances + WHERE @height > HeightFrom + AND @height <= HeightTo + AND @diameter > DiameterFrom + AND @diameter <= DiameterTo + LIMIT 1"; + + command.Parameters.AddWithValue("@height", H); + command.Parameters.AddWithValue("@diameter", D); + + using var reader = command.ExecuteReader(); + if (reader.Read()) + { + return (reader.GetInt32(0), reader.GetInt32(1)); + } + return (-1, -1); + } +/* private (int, int) SearchLimit(double D, double H) { // Диапазоны высоты H @@ -291,7 +317,7 @@ public class ResultsModel : PageModel return limits[hIndex, dIndex]; } - +*/ private string ResultImage(string imageName, double weightNom, double weightMax, double d, double d_Billet, double limit5, double H, double H_Billet, double D, double D_Billet, double limit3) { diff --git a/Program.cs b/Program.cs index b8ba155..f04de3f 100644 --- a/Program.cs +++ b/Program.cs @@ -7,11 +7,6 @@ builder.Services.AddRazorPages(options => options.Conventions.ConfigureFilter(new IgnoreAntiforgeryTokenAttribute()); }); -builder.WebHost.ConfigureKestrel(serverOptions => -{ - serverOptions.ListenAnyIP(5146); -}); - var app = builder.Build(); app.MapRazorPages(); app.UseStaticFiles(); diff --git a/TestApp.csproj b/TestApp.csproj index bd45387..ca7037f 100644 --- a/TestApp.csproj +++ b/TestApp.csproj @@ -7,6 +7,7 @@ +