ISEbd-12_Osyagina_A.A._Simple_LabWork07 #7

Closed
Osyagina_Anna wants to merge 5 commits from LabWork07 into LabWork06
2 changed files with 13 additions and 25 deletions
Showing only changes of commit bd98017e3a - Show all commits

View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ProjectMotorboat.Entities;
namespace ProjectMotorboat.Entities;
public class EntityBoat
{
@ -30,12 +24,6 @@ public class EntityBoat
{
return new[] { nameof(EntityBoat), Speed.ToString(), Weight.ToString(), BodyColor.Name };
}
/// <summary>
/// Создание объекта из строки
/// </summary>
/// <param name="strs"></param>
/// <returns></returns>
public static EntityBoat? CreateEntityBoat(string[] strs)
{
if (strs.Length != 4 || strs[0] != nameof(EntityBoat))

View File

@ -66,9 +66,9 @@
groupBoxTools.Controls.Add(panelStorage);
groupBoxTools.Controls.Add(comboBoxSelectorCompany);
groupBoxTools.Dock = DockStyle.Right;
groupBoxTools.Location = new Point(1027, 28);
groupBoxTools.Location = new Point(1096, 28);
groupBoxTools.Name = "groupBoxTools";
groupBoxTools.Size = new Size(231, 718);
groupBoxTools.Size = new Size(231, 793);
groupBoxTools.TabIndex = 0;
groupBoxTools.TabStop = false;
groupBoxTools.Text = "Инструменты";
@ -82,15 +82,15 @@
panelCompanyTools.Controls.Add(buttonGoToCheck);
panelCompanyTools.Dock = DockStyle.Bottom;
panelCompanyTools.Enabled = false;
panelCompanyTools.Location = new Point(3, 390);
panelCompanyTools.Location = new Point(3, 486);
panelCompanyTools.Name = "panelCompanyTools";
panelCompanyTools.Size = new Size(225, 325);
panelCompanyTools.Size = new Size(225, 304);
panelCompanyTools.TabIndex = 7;
//
// buttonAddBoat
//
buttonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonAddBoat.Location = new Point(3, 3);
buttonAddBoat.Location = new Point(6, 7);
buttonAddBoat.Name = "buttonAddBoat";
buttonAddBoat.Size = new Size(219, 54);
buttonAddBoat.TabIndex = 1;
@ -100,7 +100,7 @@
//
// maskedTextBox
//
maskedTextBox.Location = new Point(3, 123);
maskedTextBox.Location = new Point(3, 67);
maskedTextBox.Mask = "00";
maskedTextBox.Name = "maskedTextBox";
maskedTextBox.Size = new Size(219, 27);
@ -110,7 +110,7 @@
// buttonRefresh
//
buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonRefresh.Location = new Point(3, 276);
buttonRefresh.Location = new Point(3, 220);
buttonRefresh.Name = "buttonRefresh";
buttonRefresh.Size = new Size(219, 54);
buttonRefresh.TabIndex = 6;
@ -121,7 +121,7 @@
// buttonDelBoat
//
buttonDelBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonDelBoat.Location = new Point(3, 156);
buttonDelBoat.Location = new Point(3, 100);
buttonDelBoat.Name = "buttonDelBoat";
buttonDelBoat.Size = new Size(222, 54);
buttonDelBoat.TabIndex = 4;
@ -132,7 +132,7 @@
// buttonGoToCheck
//
buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonGoToCheck.Location = new Point(3, 216);
buttonGoToCheck.Location = new Point(3, 160);
buttonGoToCheck.Name = "buttonGoToCheck";
buttonGoToCheck.Size = new Size(219, 54);
buttonGoToCheck.TabIndex = 5;
@ -248,7 +248,7 @@
pictureBox.Dock = DockStyle.Fill;
pictureBox.Location = new Point(0, 28);
pictureBox.Name = "pictureBox";
pictureBox.Size = new Size(1027, 718);
pictureBox.Size = new Size(1096, 793);
pictureBox.TabIndex = 1;
pictureBox.TabStop = false;
//
@ -258,7 +258,7 @@
menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
menuStrip.Location = new Point(0, 0);
menuStrip.Name = "menuStrip";
menuStrip.Size = new Size(1258, 28);
menuStrip.Size = new Size(1327, 28);
menuStrip.TabIndex = 2;
menuStrip.Text = "menuStrip";
//
@ -293,7 +293,7 @@
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(1258, 746);
ClientSize = new Size(1327, 821);
Controls.Add(pictureBox);
Controls.Add(groupBoxTools);
Controls.Add(menuStrip);