From 060bf98a1f53b79bede5da369e485ef832864bd7 Mon Sep 17 00:00:00 2001 From: Nikita Potapov <47923521+nikita-potapov@users.noreply.github.com> Date: Tue, 20 Sep 2022 22:16:44 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20.Net=20=D0=B4=D0=BE=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8?= =?UTF-8?q?=D0=B8=206,=20pictureBox=20=D1=80=D0=B0=D0=B7=D0=B2=D0=B5=D1=80?= =?UTF-8?q?=D0=BD=D1=83=D1=82=20=D0=BD=D0=B0=20=D0=B2=D1=81=D1=8E=20=D1=84?= =?UTF-8?q?=D0=BE=D1=80=D0=BC=D1=83,=20=D0=B0=20=D1=82=D0=B0=D0=BA=D0=B6?= =?UTF-8?q?=D0=B5=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D1=85=D0=B0=D1=80?= =?UTF-8?q?=D0=B0=D0=BA=D1=82=D0=B5=D1=80=D0=B8=D1=81=D1=82=D0=B8=D0=BA=20?= =?UTF-8?q?=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/arrow_down.png | Bin 363 -> 324 bytes .../Resources/arrow_down1.png | Bin 324 -> 0 bytes .../Resources/arrow_left.png | Bin 392 -> 342 bytes .../Resources/arrow_left1.png | Bin 342 -> 0 bytes .../Resources/arrow_right.png | Bin 380 -> 341 bytes .../Resources/arrow_right1.png | Bin 341 -> 0 bytes .../Resources/arrow_up.png | Bin 433 -> 357 bytes .../Resources/arrow_up1.png | Bin 357 -> 0 bytes .../Form.Designer.cs | 94 ++++++++++++------ .../Form.cs | 11 +- .../Form.resx | 65 +----------- 11 files changed, 74 insertions(+), 96 deletions(-) delete mode 100644 PIbd-21_Potapov_N.S._Catamaran_Base.backup/PIbd-21_Potapov_N.S._Catamaran_Base/Resources/arrow_down1.png delete mode 100644 PIbd-21_Potapov_N.S._Catamaran_Base.backup/PIbd-21_Potapov_N.S._Catamaran_Base/Resources/arrow_left1.png delete mode 100644 PIbd-21_Potapov_N.S._Catamaran_Base.backup/PIbd-21_Potapov_N.S._Catamaran_Base/Resources/arrow_right1.png delete mode 100644 PIbd-21_Potapov_N.S._Catamaran_Base.backup/PIbd-21_Potapov_N.S._Catamaran_Base/Resources/arrow_up1.png diff --git a/PIbd-21_Potapov_N.S._Catamaran_Base.backup/PIbd-21_Potapov_N.S._Catamaran_Base/Resources/arrow_down.png b/PIbd-21_Potapov_N.S._Catamaran_Base.backup/PIbd-21_Potapov_N.S._Catamaran_Base/Resources/arrow_down.png index e48734048012a5eccff8f88420a414ea1305f685..38027b7a6202a842df3ff4a8830b8d39c3330847 100644 GIT binary patch delta 277 zcmV+w0qXwi0>lE4IDY{4Nkldn4By*k_Am- zIZm~~n`^*$h@Z<6wP-|Uj$YNHwS%8_LW9@};=lFJDK@=h%Ks11@7764S_6wkQY?~U bk$eEB2aiO+jSfmT00000NkvXXu0mjf%0q@c delta 316 zcmV-C0mJ^p0_y^hIDY{hNklZf>=d5jpC-c>6;ph3I5UXDI2e|U~JSgXrRx7X=1s0>g zViZ`60*g^#F$ye3fyL;gSktCi9&gr~*?tT~dbRLIUeFY4J%7`&OzZXiUU|KJt+{(` z>MS$_Ktp6FDx=#5t38SrS?e>)YF{m1GK2}jN`7P@6N(SB}zO# z8Y`(}EEA1|`&J1|NxNIsor;n=kF~K`lgY1%h=p7-Ej|-g+L2k9OjzK4+B@vlG`Hnh zH!X;)SbdZ(jWx!m4Mbf=9lFKYC&Zq>cv`o+)pFPq@ShWXZbkf0B=iOW!marc*H2#n O0000Y~%wcZt>XqEW&IO3IEZSE1_x8#U56sO^x_3=d&p5rwV_(ca z-W&cKJ-S?jbS5oXqb++O>hs!`b8naIo;sy9{*nIs--kclc>A@)XI{y6u$rWaBHc?O zR1RBTj7@mavb$CNWu9uP=~9z*+wR^-`Ld?!Tt;c{*V;vgSyT6V#()2z`t5P;+`d^p zIx`iW)wI2njIx+?KAw_MJ0_&}d8UDP$C=zu8;+=T&zPfQIf>Ob$0oneD1J(kNIe!RAL_t(oh3(iq4#F@D1>hId8?Z8R{}VB?_6%W&R4P>LIR2}u zyr~P-Cp(QpO05;=%PkvloXL`8vLu--Nfwj0lv3J*)h=jIt<7YZlQvPy@+cLQEGH8* zEI$*5S$os^cp7288DV*wFtBgYCQ)aJO-@#=fI77ZSYajrrGIl=7@F?yS9{PlF|tlA zJS*M=mX%@x&B`)?V7bl~HeE|TxK!w5ZJ%^l{<3l}0jO&2Wx)kwnwTZy*H((GYstsU zdPgA6U(BBWf2UEnVA{&Gz=CHDC%0d9u5>$6|F{0RD;!y ziB4l}ncnvY2xgVpTUn4=Fp)J{eVE9E)s2btNmQDtejmiP^nW;7S@{;3;E_AP(kBi} z#)V$Kbrsm^_Ik#P$Rm5Jr@KW7NpxqTU#t??^GnIl~8t*q#KkqMR$A-E@W_fzeg&{7BCn9x!OvD~4nv?yq88>q1wJdoO6 zzK_+?TMS1GjZxJ?ozin`2eNLPzKp$Qz4)t5@w=$$eGby4Trjt?2X9 zy3z%6PEJbMq%u>-Q*83~DM7cIuj*w4tUa4DW3pM`=}#J>Q*_jYO?2#q+ajwk|EiEm z+$Wh>Ion`E{zbLG^iE&Du(b_VTR9>U)fko*$4Jb2_ddM(f|=naKV2K`do0tYCNZ5o zWz?9k^PHGjthe2ckQXVr^GhQBZ7R}dT#@xQ^&o5VtQo40uZMN5$v%1fbd|g5iMyp| zvWo9@t(o~oLPAY={?p9JsYfOqJ>{bm@oE2ln^{kPhAXeT?D;kQzW=hlQiYRZzbJ9q lu}c3JiY>mYRt52h-EEF35&N6puLA}YgQu&X%Q~loCIFY(i^>21 diff --git a/PIbd-21_Potapov_N.S._Catamaran_Base.backup/PIbd-21_Potapov_N.S._Catamaran_Base/Resources/arrow_right.png b/PIbd-21_Potapov_N.S._Catamaran_Base.backup/PIbd-21_Potapov_N.S._Catamaran_Base/Resources/arrow_right.png index e8b6ca07d3a8c8e6ed0b8cfa430168f6cd3238b8..51d32561e8724bda04a1175f832064bf1d3c3573 100644 GIT binary patch delta 293 zcmV+=0owlj0@VVLIe!O9L_t(oh3%NJ4#O}AM4{>*bnV#x|Dujv`wi|;$%>)~`G6yq z;+s677r=K(w6!Ml>2@~2u@)Ahg@tHRtb0}=RsA1Q94Eh9oiCzEhe*MSH;mP-AQ^Fp z5wd)&@AK8qZZb-@;$#+sxLzHL{`?+E#by@qc;u^I$YpxV)ohMd5>z z)ny_?RvOjgWM{rX7-ZF0gO|D*YikyU&K#oQVWn8(zFLO`d3_NUnm-j-j!YbiYDhZ^ za4-qGTRtYCV!4^b{@90V?Is>!5>mH^rXFZvAzE07CdK*z{0e8XtBvan00000NkvXXu0mjfqDYD3 delta 332 zcmV-S0ki(q0{jAyIe#umL_t(oh3%P34#OY}L~)cGbem=Ff1)nC%^A`~B#Nj57>{vP zF{^$e^kPrUh|qbS;rFz71Mr$y68$?C5fKq;HE^|1WcVgR%4X#)C7Ge+HDq|KW835B zZZeZ+2R!vOFg1l@WEYb-}w)EXiqmFIwvl_UGS%toTY=5*GU3n{B%B~C140^^ zDi3|1CRR5h2dtLOadZ>!%#gg5OTP#`DxRw*OHD0X*Vr?KT zQk3D7*v%B|uthXX!Dv7K}CN*#G~cj$Qi=?oi2!q6qnbBbMTu zJfRoBcS*FhCiCfbHo&nK7NUiPXi}_uRv}gWA5t7AzgwLzqDhBH!HPGG)vX{IaflJJ ze5~*D)z5A+O1I)<7M3E)B_r-ugpBK3ZZb8pq8Hj$cj)nX_w!&hRk*yPXGP(IlGSA* zL{=Kr<78*PK^SD!Sc8|k8f$A7hRz(K;bEm%fef=ptsJXYxFez=PhcPsM1EUe%VC|L2uxXh2FlslAm n6LWQ$A*N_yAzE07CdK*z{0e8XtBvan00000NkvXXu0mjf*Y}Uz diff --git a/PIbd-21_Potapov_N.S._Catamaran_Base.backup/PIbd-21_Potapov_N.S._Catamaran_Base/Resources/arrow_up.png b/PIbd-21_Potapov_N.S._Catamaran_Base.backup/PIbd-21_Potapov_N.S._Catamaran_Base/Resources/arrow_up.png index d20dff5183361599cf9c1c3bb68402ce37c92ac6..febc5484ca330e7f9b1e487e0002ca61586ea53f 100644 GIT binary patch delta 281 zcmV+!0p|X(1LXpcReu2bNklct<6-b$C09}-Z4cMVvPiG znV;3n{eC=k^erfJzUAv#8_<1y=_v3C@T}H>sZ>AXUNe|=Y=4sCGK^(0NkJLFvYVuc z%*sMdl3QkC`Am{ecFu~JB!}#T6*oz!Yr!UB;Y#e{In@7<1S0aPqV1a+Tl8dZKhL%O^5g<@c4L6+J8h?a~2l@r%7^F*l`ti zFPKG-2qTK(G_|bPLxTwQHE}IS>88s-wg}yA;Spr@aeqy!2(3NBDM;+Vm=*f^g@58K z@7k)wR9j!Z(L}+qFiXgp7^@t1+I&vaQ&{3y+fm?+15s@fps&F$a{NgMOO=!K)`X|p2lbS_@!BPhUq$U#P8psqumH!T13q~SL9U8F*A4fiT>&t zZDo=3J#xAJi4{3AwaStO4u3Z7Pnx>*uCM;%mw#icc6QJ1aDljNVrxmD*tgGDf85=~ wKWpg`Uzb^*x8MGzopr0N#C+OaK4? diff --git a/PIbd-21_Potapov_N.S._Catamaran_Base/PIbd-21_Potapov_N.S._Catamaran_Base/Form.Designer.cs b/PIbd-21_Potapov_N.S._Catamaran_Base/PIbd-21_Potapov_N.S._Catamaran_Base/Form.Designer.cs index 78f0aaa..890a43c 100644 --- a/PIbd-21_Potapov_N.S._Catamaran_Base/PIbd-21_Potapov_N.S._Catamaran_Base/Form.Designer.cs +++ b/PIbd-21_Potapov_N.S._Catamaran_Base/PIbd-21_Potapov_N.S._Catamaran_Base/Form.Designer.cs @@ -29,41 +29,62 @@ namespace PIbd_21_Potapov_N.S._Catamaran_Base /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); this.btn_new = new System.Windows.Forms.Button(); this.statusStrip = new System.Windows.Forms.StatusStrip(); + this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelColor = new System.Windows.Forms.ToolStripStatusLabel(); this.groupBox = new System.Windows.Forms.GroupBox(); this.btn_up = new System.Windows.Forms.Button(); this.btn_down = new System.Windows.Forms.Button(); this.btn_left = new System.Windows.Forms.Button(); this.btn_right = new System.Windows.Forms.Button(); this.pictureBox = new System.Windows.Forms.PictureBox(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.statusStrip.SuspendLayout(); this.groupBox.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); this.SuspendLayout(); // // btn_new // - this.btn_new.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.btn_new.Location = new System.Drawing.Point(12, 606); + this.btn_new.Location = new System.Drawing.Point(12, 327); this.btn_new.Name = "btn_new"; - this.btn_new.Size = new System.Drawing.Size(75, 47); - this.btn_new.TabIndex = 5; - this.btn_new.Text = "new"; - this.btn_new.UseVisualStyleBackColor = true; + this.btn_new.Size = new System.Drawing.Size(75, 60); + this.btn_new.TabIndex = 10; + this.btn_new.Text = "New"; this.btn_new.Click += new System.EventHandler(this.btn_new_Click); // // statusStrip // this.statusStrip.ImageScalingSize = new System.Drawing.Size(20, 20); - this.statusStrip.Location = new System.Drawing.Point(0, 656); + this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelColor}); + this.statusStrip.Location = new System.Drawing.Point(0, 395); this.statusStrip.Name = "statusStrip"; - this.statusStrip.Size = new System.Drawing.Size(1074, 22); + this.statusStrip.Size = new System.Drawing.Size(1074, 24); this.statusStrip.TabIndex = 8; this.statusStrip.Text = "statusStrip"; // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(75, 19); + this.toolStripStatusLabelSpeed.Text = "Скорость: "; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(37, 19); + this.toolStripStatusLabelWeight.Text = "Вес: "; + // + // toolStripStatusLabelColor + // + this.toolStripStatusLabelColor.Name = "toolStripStatusLabelColor"; + this.toolStripStatusLabelColor.Size = new System.Drawing.Size(46, 19); + this.toolStripStatusLabelColor.Text = "Цвет: "; + // // groupBox // this.groupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); @@ -71,75 +92,90 @@ namespace PIbd_21_Potapov_N.S._Catamaran_Base this.groupBox.Controls.Add(this.btn_down); this.groupBox.Controls.Add(this.btn_left); this.groupBox.Controls.Add(this.btn_right); - this.groupBox.Location = new System.Drawing.Point(902, 531); + this.groupBox.Location = new System.Drawing.Point(923, 309); + this.groupBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.groupBox.Name = "groupBox"; - this.groupBox.Size = new System.Drawing.Size(172, 108); + this.groupBox.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.groupBox.Size = new System.Drawing.Size(139, 84); this.groupBox.TabIndex = 9; this.groupBox.TabStop = false; // // btn_up // + this.btn_up.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.btn_up.Image = global::PIbd_21_Potapov_N.S._Catamaran_Base.Properties.Resources.arrow_up1; - this.btn_up.Location = new System.Drawing.Point(59, 0); + this.btn_up.Location = new System.Drawing.Point(51, 0); + this.btn_up.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_up.Name = "btn_up"; - this.btn_up.Size = new System.Drawing.Size(55, 55); + this.btn_up.Size = new System.Drawing.Size(40, 38); this.btn_up.TabIndex = 1; this.btn_up.UseVisualStyleBackColor = true; this.btn_up.Click += new System.EventHandler(this.btn_move_Click); // // btn_down // + this.btn_down.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.btn_down.Image = global::PIbd_21_Potapov_N.S._Catamaran_Base.Properties.Resources.arrow_down1; - this.btn_down.Location = new System.Drawing.Point(59, 56); + this.btn_down.Location = new System.Drawing.Point(51, 40); + this.btn_down.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_down.Name = "btn_down"; - this.btn_down.Size = new System.Drawing.Size(55, 55); + this.btn_down.Size = new System.Drawing.Size(40, 38); this.btn_down.TabIndex = 2; + this.btn_down.Text = " "; this.btn_down.UseVisualStyleBackColor = true; this.btn_down.Click += new System.EventHandler(this.btn_move_Click); // // btn_left // + this.btn_left.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.btn_left.Image = global::PIbd_21_Potapov_N.S._Catamaran_Base.Properties.Resources.arrow_left1; - this.btn_left.Location = new System.Drawing.Point(3, 56); + this.btn_left.Location = new System.Drawing.Point(5, 40); + this.btn_left.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_left.Name = "btn_left"; - this.btn_left.Size = new System.Drawing.Size(55, 55); + this.btn_left.Size = new System.Drawing.Size(40, 38); this.btn_left.TabIndex = 3; this.btn_left.UseVisualStyleBackColor = true; this.btn_left.Click += new System.EventHandler(this.btn_move_Click); // // btn_right // + this.btn_right.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.btn_right.Image = global::PIbd_21_Potapov_N.S._Catamaran_Base.Properties.Resources.arrow_right1; - this.btn_right.Location = new System.Drawing.Point(115, 56); + this.btn_right.Location = new System.Drawing.Point(97, 42); + this.btn_right.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_right.Name = "btn_right"; - this.btn_right.Size = new System.Drawing.Size(55, 55); + this.btn_right.Size = new System.Drawing.Size(40, 38); this.btn_right.TabIndex = 4; this.btn_right.UseVisualStyleBackColor = true; this.btn_right.Click += new System.EventHandler(this.btn_move_Click); // // pictureBox // - this.pictureBox.Location = new System.Drawing.Point(-1, 1); + this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBox.Location = new System.Drawing.Point(0, 0); + this.pictureBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pictureBox.Name = "pictureBox"; - this.pictureBox.Size = new System.Drawing.Size(1063, 524); + this.pictureBox.Size = new System.Drawing.Size(1074, 419); this.pictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.pictureBox.TabIndex = 0; this.pictureBox.TabStop = false; // // Form // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 19F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1074, 678); + this.ClientSize = new System.Drawing.Size(1074, 419); this.Controls.Add(this.groupBox); - this.Controls.Add(this.statusStrip); this.Controls.Add(this.btn_new); + this.Controls.Add(this.statusStrip); this.Controls.Add(this.pictureBox); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "Form"; this.Text = "CatamaranTest"; + this.statusStrip.ResumeLayout(false); + this.statusStrip.PerformLayout(); this.groupBox.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -155,7 +191,9 @@ namespace PIbd_21_Potapov_N.S._Catamaran_Base private System.Windows.Forms.Button btn_new; private System.Windows.Forms.StatusStrip statusStrip; private System.Windows.Forms.GroupBox groupBox; - private System.Windows.Forms.BindingSource bindingSource1; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelSpeed; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelWeight; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelColor; } } diff --git a/PIbd-21_Potapov_N.S._Catamaran_Base/PIbd-21_Potapov_N.S._Catamaran_Base/Form.cs b/PIbd-21_Potapov_N.S._Catamaran_Base/PIbd-21_Potapov_N.S._Catamaran_Base/Form.cs index d62e114..d1103b3 100644 --- a/PIbd-21_Potapov_N.S._Catamaran_Base/PIbd-21_Potapov_N.S._Catamaran_Base/Form.cs +++ b/PIbd-21_Potapov_N.S._Catamaran_Base/PIbd-21_Potapov_N.S._Catamaran_Base/Form.cs @@ -22,10 +22,14 @@ namespace PIbd_21_Potapov_N.S._Catamaran_Base private void btn_new_Click(object sender, EventArgs e) { - catamaranDrawObj = new DrawCatamaran(); - catamaranDrawObj.Init(80.0f, Color.Black, Directions.Right, 20); - catamaranDrawObj.SetPosition(20, 50, pictureBox.Width, pictureBox.Height); + Random rnd = new Random(); + catamaranDrawObj = new DrawCatamaran(); + catamaranDrawObj.Init(rnd.Next(50, 100), Color.FromArgb(rnd.Next(0, 255), rnd.Next(0, 255), rnd.Next(0, 255)), Directions.Right, 20); + catamaranDrawObj.SetPosition(rnd.Next(10, 50), rnd.Next(10, 50), pictureBox.Width, pictureBox.Height); + toolStripStatusLabelSpeed.Text = $"Скорость: {catamaranDrawObj.Catamaran.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {catamaranDrawObj.Catamaran.Weight}"; + toolStripStatusLabelColor.Text = $"Цвет: {catamaranDrawObj.Catamaran.EntityColor.Name}"; RedrawCatamaran(); } @@ -87,6 +91,5 @@ namespace PIbd_21_Potapov_N.S._Catamaran_Base } - } } diff --git a/PIbd-21_Potapov_N.S._Catamaran_Base/PIbd-21_Potapov_N.S._Catamaran_Base/Form.resx b/PIbd-21_Potapov_N.S._Catamaran_Base/PIbd-21_Potapov_N.S._Catamaran_Base/Form.resx index 32e093f..2c0949d 100644 --- a/PIbd-21_Potapov_N.S._Catamaran_Base/PIbd-21_Potapov_N.S._Catamaran_Base/Form.resx +++ b/PIbd-21_Potapov_N.S._Catamaran_Base/PIbd-21_Potapov_N.S._Catamaran_Base/Form.resx @@ -1,64 +1,4 @@ - - - + @@ -120,7 +60,4 @@ 17, 17 - - 141, 20 - \ No newline at end of file