yacute/ISEbd-21_Chegodaev_A.Y._Cruiser_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lab5

Browse Source
This commit is contained in:
Александр Чегодаев 2023-12-14 01:25:12 +04:00
parent 8d8e031953
commit aeb998110e
16 changed files with 789 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cruiser/Cruiser/AbstractStrategy.cs
View File

@ -46,7 +46,7 @@ namespace ProjectCruiser.MovementStrategy
} }
MoveToTarget(); MoveToTarget();
} }
protected bool MoveLeft() => MoveTo(DirectionType.Left); protected bool MoveLeft() => MoveTo(DirectionType.Left);
protected bool MoveRight() => MoveTo(DirectionType.Right); protected bool MoveRight() => MoveTo(DirectionType.Right);

7
Cruiser/Cruiser/CruiserGenericCollection.cs
View File

@ -1,5 +1,6 @@
using ProjectCruiser.DrawningObjects; using ProjectCruiser.DrawningObjects;
using ProjectCruiser.MovementStrategy; using ProjectCruiser.MovementStrategy;
using ProjectCruiser.Generics;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -73,8 +74,8 @@ namespace ProjectCruiser
1; ++j) 1; ++j)
{ {
g.DrawLine(pen, i * _placeSizeWidth, j * g.DrawLine(pen, i * _placeSizeWidth, j *
_placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2 + 2, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j *
_placeSizeHeight); _placeSizeHeight);
} }
g.DrawLine(pen, i * _placeSizeWidth, 0, i * g.DrawLine(pen, i * _placeSizeWidth, 0, i *
_placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight); _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight);
@ -88,6 +89,8 @@ namespace ProjectCruiser
int i = 0; int i = 0;
foreach (var cruiser in _collection.GetCruiser()) foreach (var cruiser in _collection.GetCruiser())
{ {
cruiser._pictureHeight = _pictureHeight;
cruiser._pictureWidth = _pictureWidth;
_collection[i]?.SetPosition(Ix, Iy); _collection[i]?.SetPosition(Ix, Iy);
_collection[i]?.DrawTransport(g); _collection[i]?.DrawTransport(g);
Ix += _placeSizeWidth; Ix += _placeSizeWidth;

2
Cruiser/Cruiser/CruiserGenericStorage.cs
View File

@ -18,7 +18,7 @@ DrawningObjectCruiser>> _CruiserStorages;
private readonly int _pictureWidth; private readonly int _pictureWidth;
private readonly int _pictureHeight; private readonly int _pictureHeight;
public CruiserGenericStorage(int pictureWidth, int pictureHeight) public CruiserGenericStorage(int pictureWidth, int pictureHeight)
{ {
_CruiserStorages = new Dictionary<string, _CruiserStorages = new Dictionary<string,

8
Cruiser/Cruiser/DrawningCruiser.cs
View File

@ -15,9 +15,9 @@ namespace ProjectCruiser.DrawningObjects
{ {
public EntityCruiser? EntityCruiser { get; protected set; } public EntityCruiser? EntityCruiser { get; protected set; }
private int _pictureWidth; public int _pictureWidth;
private int _pictureHeight; public int _pictureHeight;
protected int _startPosX; protected int _startPosX;
@ -29,7 +29,7 @@ namespace ProjectCruiser.DrawningObjects
public DrawningCruiser(int speed, double weight, Color bodyColor, int public DrawningCruiser(int speed, double weight, Color bodyColor, int
width, int height) width, int height)
{ {
_pictureWidth = width; _pictureWidth = width;
_pictureHeight = height; _pictureHeight = height;
EntityCruiser = new EntityCruiser(speed, weight, bodyColor); EntityCruiser = new EntityCruiser(speed, weight, bodyColor);
@ -63,7 +63,7 @@ namespace ProjectCruiser.DrawningObjects
} }
public IMoveableObject GetMoveableObject => new DrawningObjectCruiser(this); public IMoveableObject GetMoveableObject => new DrawningObjectCruiser(this);
protected int PictureWidth protected int PictureWidth
{ {
get { return _pictureWidth; } get { return _pictureWidth; }

6
Cruiser/Cruiser/DrawningCruiserDou.cs
View File

@ -11,6 +11,7 @@ namespace ProjectCruiser.DrawningObjects
{ {
public class DrawningCruiserDou : DrawningCruiser public class DrawningCruiserDou : DrawningCruiser
{ {
public DrawningCruiserDou(int speed, double weight, Color bodyColor, Color public DrawningCruiserDou(int speed, double weight, Color bodyColor, Color
additionalColor, bool vert, bool rocket, int width, int height) : additionalColor, bool vert, bool rocket, int width, int height) :
base(speed, weight, bodyColor, width, height, 145, 45) base(speed, weight, bodyColor, width, height, 145, 45)
@ -29,6 +30,7 @@ namespace ProjectCruiser.DrawningObjects
return; return;
} }
Pen pen = new(Color.Black); Pen pen = new(Color.Black);
Brush additionalBrush = new SolidBrush(cruiserDou.AdditionalColor); Brush additionalBrush = new SolidBrush(cruiserDou.AdditionalColor);
Brush brBlack = new SolidBrush(Color.Black); Brush brBlack = new SolidBrush(Color.Black);
@ -40,7 +42,7 @@ namespace ProjectCruiser.DrawningObjects
g.FillEllipse(additionalBrush, _startPosX + 95, _startPosY + 15, 20, 20); g.FillEllipse(additionalBrush, _startPosX + 95, _startPosY + 15, 20, 20);
g.DrawEllipse(pen, _startPosX + 95, _startPosY + 15, 20, 20); g.DrawEllipse(pen, _startPosX + 95, _startPosY + 15, 20, 20);
} }
if (cruiserDou.Rocket) if (cruiserDou.Rocket)
{ {
g.DrawEllipse(pen, _startPosX + 8, _startPosY + 3, 15, 12); g.DrawEllipse(pen, _startPosX + 8, _startPosY + 3, 15, 12);
@ -49,9 +51,7 @@ namespace ProjectCruiser.DrawningObjects
g.FillEllipse(additionalBrush, _startPosX + 8, _startPosY + 18, 15, 12); g.FillEllipse(additionalBrush, _startPosX + 8, _startPosY + 18, 15, 12);
g.DrawEllipse(pen, _startPosX + 8, _startPosY + 33, 15, 12); g.DrawEllipse(pen, _startPosX + 8, _startPosY + 33, 15, 12);
g.FillEllipse(additionalBrush, _startPosX + 8, _startPosY + 33, 15, 12); g.FillEllipse(additionalBrush, _startPosX + 8, _startPosY + 33, 15, 12);
} }
} }
} }
} }

2
Cruiser/Cruiser/EntityCruiser.cs
View File

@ -12,7 +12,7 @@ namespace ProjectCruiser.Entities
public double Weight { get; private set; } public double Weight { get; private set; }
public Color BodyColor { get; private set; } public Color BodyColor { get; set; }
public double Step => (double)Speed * 100 / Weight; public double Step => (double)Speed * 100 / Weight;

3
Cruiser/Cruiser/EntityCruiserDou.cs
View File

@ -4,8 +4,7 @@ namespace ProjectCruiser.Entities
{ {
public class EntityCruiserDou : EntityCruiser public class EntityCruiserDou : EntityCruiser
{ {
public Color AdditionalColor { get; set; }
public Color AdditionalColor { get; private set; }
public bool Vert { get; private set; } public bool Vert { get; private set; }

217
Cruiser/Cruiser/FormCruiserCollection.Designer.cs generated
View File

@ -28,151 +28,150 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.groupBox1 = new System.Windows.Forms.GroupBox(); groupBox1 = new GroupBox();
this.groupBox2 = new System.Windows.Forms.GroupBox(); groupBox2 = new GroupBox();
this.listBoxStorage = new System.Windows.Forms.ListBox(); listBoxStorage = new ListBox();
this.textBoxStorageName = new System.Windows.Forms.MaskedTextBox(); textBoxStorageName = new TextBox();
this.ButtonAddObject = new System.Windows.Forms.Button(); ButtonAddObject = new Button();
this.ButtonDelObject = new System.Windows.Forms.Button(); ButtonDelObject = new Button();
this.maskedTextBoxNumber = new System.Windows.Forms.MaskedTextBox(); maskedTextBoxNumber = new MaskedTextBox();
this.ButtonRefreshCollection = new System.Windows.Forms.Button(); ButtonRefreshCollection = new Button();
this.ButtonRemoveCruiser = new System.Windows.Forms.Button(); ButtonRemoveCruiser = new Button();
this.buttonAddCruiser = new System.Windows.Forms.Button(); buttonAddCruiser = new Button();
this.pictureBoxCollection = new System.Windows.Forms.PictureBox(); pictureBoxCollection = new PictureBox();
this.groupBox1.SuspendLayout(); groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).BeginInit(); ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit();
this.SuspendLayout(); SuspendLayout();
// //
// groupBox1 // groupBox1
// //
this.groupBox1.Controls.Add(this.groupBox2); groupBox1.Controls.Add(groupBox2);
this.groupBox1.Controls.Add(this.maskedTextBoxNumber); groupBox1.Controls.Add(maskedTextBoxNumber);
this.groupBox1.Controls.Add(this.ButtonRefreshCollection); groupBox1.Controls.Add(ButtonRefreshCollection);
this.groupBox1.Controls.Add(this.ButtonRemoveCruiser); groupBox1.Controls.Add(ButtonRemoveCruiser);
this.groupBox1.Controls.Add(this.buttonAddCruiser); groupBox1.Controls.Add(buttonAddCruiser);
this.groupBox1.Location = new System.Drawing.Point(643, 12); groupBox1.Location = new Point(643, 12);
this.groupBox1.Name = "groupBox1"; groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(196, 436); groupBox1.Size = new Size(196, 436);
this.groupBox1.TabIndex = 0; groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false; groupBox1.TabStop = false;
this.groupBox1.Text = "Инструменты"; groupBox1.Text = "Инструменты";
// //
// groupBox2 // groupBox2
// //
this.groupBox2.Controls.Add(this.listBoxStorage); groupBox2.Controls.Add(listBoxStorage);
this.groupBox2.Controls.Add(this.textBoxStorageName); groupBox2.Controls.Add(textBoxStorageName);
this.groupBox2.Controls.Add(this.ButtonAddObject); groupBox2.Controls.Add(ButtonAddObject);
this.groupBox2.Controls.Add(this.ButtonDelObject); groupBox2.Controls.Add(ButtonDelObject);
this.groupBox2.Location = new System.Drawing.Point(9, 24); groupBox2.Location = new Point(9, 24);
this.groupBox2.Name = "groupBox2"; groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(179, 256); groupBox2.Size = new Size(179, 256);
this.groupBox2.TabIndex = 4; groupBox2.TabIndex = 4;
this.groupBox2.TabStop = false; groupBox2.TabStop = false;
this.groupBox2.Text = "Наборы"; groupBox2.Text = "Наборы";
// //
// listBoxStorage // listBoxStorage
// //
this.listBoxStorage.FormattingEnabled = true; listBoxStorage.FormattingEnabled = true;
this.listBoxStorage.ItemHeight = 15; listBoxStorage.ItemHeight = 15;
this.listBoxStorage.Location = new System.Drawing.Point(6, 93); listBoxStorage.Location = new Point(6, 93);
this.listBoxStorage.Name = "listBoxStorage"; listBoxStorage.Name = "listBoxStorage";
this.listBoxStorage.Size = new System.Drawing.Size(167, 109); listBoxStorage.Size = new Size(167, 109);
this.listBoxStorage.TabIndex = 5; listBoxStorage.TabIndex = 5;
listBoxStorage.SelectedIndexChanged += listBoxStorage_SelectedIndexChanged; listBoxStorage.SelectedIndexChanged += listBoxStorage_SelectedIndexChanged;
// //
// textBoxStorageName // textBoxStorageName
// //
this.textBoxStorageName.Font = new System.Drawing.Font("Lucida Sans Unicode", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); textBoxStorageName.Font = new Font("Lucida Sans Unicode", 9F, FontStyle.Regular, GraphicsUnit.Point);
this.textBoxStorageName.Location = new System.Drawing.Point(6, 22); textBoxStorageName.Location = new Point(6, 22);
this.textBoxStorageName.Name = "textBoxStorageName"; textBoxStorageName.Name = "textBoxStorageName";
this.textBoxStorageName.Size = new System.Drawing.Size(167, 26); textBoxStorageName.Size = new Size(167, 26);
this.textBoxStorageName.TabIndex = 4; textBoxStorageName.TabIndex = 4;
// //
// ButtonAddObject // ButtonAddObject
// //
this.ButtonAddObject.Location = new System.Drawing.Point(6, 54); ButtonAddObject.Location = new Point(6, 54);
this.ButtonAddObject.Name = "ButtonAddObject"; ButtonAddObject.Name = "ButtonAddObject";
this.ButtonAddObject.Size = new System.Drawing.Size(167, 33); ButtonAddObject.Size = new Size(167, 33);
this.ButtonAddObject.TabIndex = 3; ButtonAddObject.TabIndex = 3;
this.ButtonAddObject.Text = "Добавить набор"; ButtonAddObject.Text = "Добавить набор";
this.ButtonAddObject.UseVisualStyleBackColor = true; ButtonAddObject.UseVisualStyleBackColor = true;
this.ButtonAddObject.Click += new System.EventHandler(this.ButtonAddObject_Click); ButtonAddObject.Click += ButtonAddObject_Click;
// //
// ButtonDelObject // ButtonDelObject
// //
this.ButtonDelObject.Location = new System.Drawing.Point(6, 217); ButtonDelObject.Location = new Point(6, 217);
this.ButtonDelObject.Name = "ButtonDelObject"; ButtonDelObject.Name = "ButtonDelObject";
this.ButtonDelObject.Size = new System.Drawing.Size(167, 33); ButtonDelObject.Size = new Size(167, 33);
this.ButtonDelObject.TabIndex = 2; ButtonDelObject.TabIndex = 2;
this.ButtonDelObject.Text = "Удалить набор"; ButtonDelObject.Text = "Удалить набор";
this.ButtonDelObject.UseVisualStyleBackColor = true; ButtonDelObject.UseVisualStyleBackColor = true;
this.ButtonDelObject.Click += new System.EventHandler(this.ButtonDelObject_Click); ButtonDelObject.Click += ButtonDelObject_Click;
// //
// maskedTextBoxNumber // maskedTextBoxNumber
// //
this.maskedTextBoxNumber.Font = new System.Drawing.Font("Lucida Sans Unicode", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); maskedTextBoxNumber.Font = new Font("Lucida Sans Unicode", 9F, FontStyle.Regular, GraphicsUnit.Point);
this.maskedTextBoxNumber.Location = new System.Drawing.Point(34, 325); maskedTextBoxNumber.Location = new Point(34, 325);
this.maskedTextBoxNumber.Mask = "00"; maskedTextBoxNumber.Mask = "00";
this.maskedTextBoxNumber.Name = "maskedTextBoxNumber"; maskedTextBoxNumber.Name = "maskedTextBoxNumber";
this.maskedTextBoxNumber.Size = new System.Drawing.Size(130, 26); maskedTextBoxNumber.Size = new Size(130, 26);
this.maskedTextBoxNumber.TabIndex = 3; maskedTextBoxNumber.TabIndex = 3;
// //
// ButtonRefreshCollection // ButtonRefreshCollection
// //
this.ButtonRefreshCollection.Location = new System.Drawing.Point(6, 396); ButtonRefreshCollection.Location = new Point(6, 396);
this.ButtonRefreshCollection.Name = "ButtonRefreshCollection"; ButtonRefreshCollection.Name = "ButtonRefreshCollection";
this.ButtonRefreshCollection.Size = new System.Drawing.Size(184, 33); ButtonRefreshCollection.Size = new Size(184, 33);
this.ButtonRefreshCollection.TabIndex = 2; ButtonRefreshCollection.TabIndex = 2;
this.ButtonRefreshCollection.Text = "Обовить коллекцию"; ButtonRefreshCollection.Text = "Обовить коллекцию";
this.ButtonRefreshCollection.UseVisualStyleBackColor = true; ButtonRefreshCollection.UseVisualStyleBackColor = true;
this.ButtonRefreshCollection.Click += new System.EventHandler(this.ButtonRefreshCollection_Click); ButtonRefreshCollection.Click += ButtonRefreshCollection_Click;
// //
// ButtonRemoveCruiser // ButtonRemoveCruiser
// //
this.ButtonRemoveCruiser.Location = new System.Drawing.Point(6, 357); ButtonRemoveCruiser.Location = new Point(6, 357);
this.ButtonRemoveCruiser.Name = "ButtonRemoveCruiser"; ButtonRemoveCruiser.Name = "ButtonRemoveCruiser";
this.ButtonRemoveCruiser.Size = new System.Drawing.Size(184, 33); ButtonRemoveCruiser.Size = new Size(184, 33);
this.ButtonRemoveCruiser.TabIndex = 1; ButtonRemoveCruiser.TabIndex = 1;
this.ButtonRemoveCruiser.Text = "Удалить крейсер"; ButtonRemoveCruiser.Text = "Удалить крейсер";
this.ButtonRemoveCruiser.UseVisualStyleBackColor = true; ButtonRemoveCruiser.UseVisualStyleBackColor = true;
this.ButtonRemoveCruiser.Click += new System.EventHandler(this.ButtonRemoveCruiser_Click); ButtonRemoveCruiser.Click += ButtonRemoveCruiser_Click;
// //
// buttonAddCruiser // buttonAddCruiser
// //
this.buttonAddCruiser.Location = new System.Drawing.Point(6, 286); buttonAddCruiser.Location = new Point(6, 286);
this.buttonAddCruiser.Name = "buttonAddCruiser"; buttonAddCruiser.Name = "buttonAddCruiser";
this.buttonAddCruiser.Size = new System.Drawing.Size(184, 33); buttonAddCruiser.Size = new Size(184, 33);
this.buttonAddCruiser.TabIndex = 0; buttonAddCruiser.TabIndex = 0;
this.buttonAddCruiser.Text = "Добавить крейсер"; buttonAddCruiser.Text = "Добавить крейсер";
this.buttonAddCruiser.UseVisualStyleBackColor = true; buttonAddCruiser.UseVisualStyleBackColor = true;
this.buttonAddCruiser.Click += new System.EventHandler(this.buttonAddCruiser_Click); buttonAddCruiser.Click += buttonAddCruiser_Click;
// //
// pictureBoxCollection // pictureBoxCollection
// //
this.pictureBoxCollection.Location = new System.Drawing.Point(0, -1); pictureBoxCollection.Location = new Point(1, 4);
this.pictureBoxCollection.Name = "pictureBoxCollection"; pictureBoxCollection.Name = "pictureBoxCollection";
this.pictureBoxCollection.Size = new System.Drawing.Size(637, 449); pictureBoxCollection.Size = new Size(637, 449);
this.pictureBoxCollection.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; pictureBoxCollection.SizeMode = PictureBoxSizeMode.Zoom;
this.pictureBoxCollection.TabIndex = 1; pictureBoxCollection.TabIndex = 1;
this.pictureBoxCollection.TabStop = false; pictureBoxCollection.TabStop = false;
// //
// FormCruiserCollection // FormCruiserCollection
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); AutoScaleDimensions = new SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(851, 458); ClientSize = new Size(853, 460);
this.Controls.Add(this.pictureBoxCollection); Controls.Add(pictureBoxCollection);
this.Controls.Add(this.groupBox1); Controls.Add(groupBox1);
this.Name = "FormCruiserCollection"; Name = "FormCruiserCollection";
this.Text = "FormCruiserCollection"; Text = "FormCruiserCollection";
this.groupBox1.ResumeLayout(false); groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout(); groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false); groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout(); groupBox2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).EndInit(); ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).EndInit();
this.ResumeLayout(false); ResumeLayout(false);
} }
#endregion #endregion
@ -185,7 +184,7 @@
private PictureBox pictureBoxCollection; private PictureBox pictureBoxCollection;
private GroupBox groupBox2; private GroupBox groupBox2;
private ListBox listBoxStorage; private ListBox listBoxStorage;
private MaskedTextBox textBoxStorageName; private TextBox textBoxStorageName;
private Button ButtonAddObject; private Button ButtonAddObject;
private Button ButtonDelObject; private Button ButtonDelObject;
} }

34
Cruiser/Cruiser/FormCruiserCollection.cs
View File

@ -1,13 +1,7 @@
using ProjectCruiser.DrawningObjects; using ProjectCruiser.DrawningObjects;
using ProjectCruiser.Drawnings;
using ProjectCruiser.Generics;
using ProjectCruiser.MovementStrategy; using ProjectCruiser.MovementStrategy;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace ProjectCruiser namespace ProjectCruiser
@ -15,7 +9,7 @@ namespace ProjectCruiser
public partial class FormCruiserCollection : Form public partial class FormCruiserCollection : Form
{ {
private readonly CruiserGenericStorage _storage; private readonly CruiserGenericStorage _storage;
public FormCruiserCollection() public FormCruiserCollection()
{ {
InitializeComponent(); InitializeComponent();
@ -69,6 +63,7 @@ namespace ProjectCruiser
return; return;
} }
if (MessageBox.Show($"Удалить объект {listBoxStorage.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) if (MessageBox.Show($"Удалить объект {listBoxStorage.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{ {
_storage.DelSet(listBoxStorage.SelectedItem.ToString() _storage.DelSet(listBoxStorage.SelectedItem.ToString()
?? string.Empty); ?? string.Empty);
@ -76,22 +71,16 @@ namespace ProjectCruiser
} }
} }
private void buttonAddCruiser_Click(object sender, EventArgs e) private void AddCruiser(DrawningCruiser cruiser)
{ {
if (listBoxStorage.SelectedIndex == -1) if (listBoxStorage.SelectedIndex == -1)
{ {
return; return;
} }
var obj = _storage[listBoxStorage.SelectedItem.ToString() ?? var obj = _storage[listBoxStorage.SelectedItem.ToString() ?? string.Empty];
string.Empty]; if (obj != null)
if (obj == null)
{ {
return; if (obj + cruiser != 1)
}
FormCruiser form = new();
if (form.ShowDialog() == DialogResult.OK)
{
if (obj + form.SelectedCruiser > -1)
{ {
MessageBox.Show("Объект добавлен"); MessageBox.Show("Объект добавлен");
pictureBoxCollection.Image = obj.ShowCruiser(); pictureBoxCollection.Image = obj.ShowCruiser();
@ -103,6 +92,13 @@ namespace ProjectCruiser
} }
} }
private void buttonAddCruiser_Click(object sender, EventArgs e)
{
var formCruiserConfig = new FormCruiserConfig();
formCruiserConfig.Show();
formCruiserConfig.AddEvent(AddCruiser);
}
private void ButtonRemoveCruiser_Click(object sender, EventArgs e) private void ButtonRemoveCruiser_Click(object sender, EventArgs e)
{ {
if (listBoxStorage.SelectedIndex == -1) if (listBoxStorage.SelectedIndex == -1)

62
Cruiser/Cruiser/FormCruiserCollection.resx
View File

@ -1,4 +1,64 @@
<root> <?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">

371
Cruiser/Cruiser/FormCruiserConfig.Designer.cs generated Normal file
View File

@ -0,0 +1,371 @@
namespace ProjectCruiser
{
partial class FormCruiserConfig
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.labelModifiedObject = new System.Windows.Forms.Label();
this.labelSimpleObject = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.panelPurple = new System.Windows.Forms.Panel();
this.panelYellow = new System.Windows.Forms.Panel();
this.panelBlack = new System.Windows.Forms.Panel();
this.panelBlue = new System.Windows.Forms.Panel();
this.panelGray = new System.Windows.Forms.Panel();
this.panelGreen = new System.Windows.Forms.Panel();
this.panelWhite = new System.Windows.Forms.Panel();
this.panelRed = new System.Windows.Forms.Panel();
this.checkBoxBodyKit = new System.Windows.Forms.CheckBox();
this.checkBoxPushka = new System.Windows.Forms.CheckBox();
this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown();
this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.panelColor = new System.Windows.Forms.Panel();
this.labelDopColor = new System.Windows.Forms.Label();
this.labelBaseColor = new System.Windows.Forms.Label();
this.pictureBoxObject = new System.Windows.Forms.PictureBox();
this.ButtonOk = new System.Windows.Forms.Button();
this.buttonCancel = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit();
this.panelColor.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
this.SuspendLayout();
//
// groupBox1
//
this.groupBox1.Controls.Add(this.labelModifiedObject);
this.groupBox1.Controls.Add(this.labelSimpleObject);
this.groupBox1.Controls.Add(this.groupBox2);
this.groupBox1.Controls.Add(this.checkBoxBodyKit);
this.groupBox1.Controls.Add(this.checkBoxPushka);
this.groupBox1.Controls.Add(this.numericUpDownWeight);
this.groupBox1.Controls.Add(this.numericUpDownSpeed);
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Location = new System.Drawing.Point(12, 12);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(454, 228);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Параметры";
//
// labelModifiedObject
//
this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labelModifiedObject.Location = new System.Drawing.Point(361, 146);
this.labelModifiedObject.Name = "labelModifiedObject";
this.labelModifiedObject.Size = new System.Drawing.Size(87, 27);
this.labelModifiedObject.TabIndex = 8;
this.labelModifiedObject.Text = "Продвинутый";
this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
labelModifiedObject.MouseDown += LabelObject_MouseDown;
//
// labelSimpleObject
//
this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labelSimpleObject.Location = new System.Drawing.Point(263, 146);
this.labelSimpleObject.Name = "labelSimpleObject";
this.labelSimpleObject.Size = new System.Drawing.Size(87, 27);
this.labelSimpleObject.TabIndex = 7;
this.labelSimpleObject.Text = "Простой";
this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
labelSimpleObject.MouseDown += LabelObject_MouseDown;
//
// groupBox2
//
this.groupBox2.Controls.Add(this.panelPurple);
this.groupBox2.Controls.Add(this.panelYellow);
this.groupBox2.Controls.Add(this.panelBlack);
this.groupBox2.Controls.Add(this.panelBlue);
this.groupBox2.Controls.Add(this.panelGray);
this.groupBox2.Controls.Add(this.panelGreen);
this.groupBox2.Controls.Add(this.panelWhite);
this.groupBox2.Controls.Add(this.panelRed);
this.groupBox2.Location = new System.Drawing.Point(263, 32);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(185, 106);
this.groupBox2.TabIndex = 6;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Цвета";
//
// panelPurple
//
this.panelPurple.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.panelPurple.Location = new System.Drawing.Point(139, 63);
this.panelPurple.Name = "panelPurple";
this.panelPurple.Size = new System.Drawing.Size(35, 30);
this.panelPurple.TabIndex = 7;
this.panelPurple.MouseDown += panelColor_MouseDown;
//
// panelYellow
//
this.panelYellow.BackColor = System.Drawing.Color.Yellow;
this.panelYellow.Location = new System.Drawing.Point(139, 22);
this.panelYellow.Name = "panelYellow";
this.panelYellow.Size = new System.Drawing.Size(35, 30);
this.panelYellow.TabIndex = 3;
this.panelYellow.MouseDown += panelColor_MouseDown;
//
// panelBlack
//
this.panelBlack.BackColor = System.Drawing.Color.Black;
this.panelBlack.Location = new System.Drawing.Point(98, 63);
this.panelBlack.Name = "panelBlack";
this.panelBlack.Size = new System.Drawing.Size(35, 30);
this.panelBlack.TabIndex = 6;
this.panelBlack.MouseDown += panelColor_MouseDown;
//
// panelBlue
//
this.panelBlue.BackColor = System.Drawing.Color.Blue;
this.panelBlue.Location = new System.Drawing.Point(98, 22);
this.panelBlue.Name = "panelBlue";
this.panelBlue.Size = new System.Drawing.Size(35, 30);
this.panelBlue.TabIndex = 2;
this.panelBlue.MouseDown += panelColor_MouseDown;
//
// panelGray
//
this.panelGray.BackColor = System.Drawing.Color.Gray;
this.panelGray.Location = new System.Drawing.Point(57, 63);
this.panelGray.Name = "panelGray";
this.panelGray.Size = new System.Drawing.Size(35, 30);
this.panelGray.TabIndex = 5;
this.panelGray.MouseDown += panelColor_MouseDown;
//
// panelGreen
//
this.panelGreen.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.panelGreen.Location = new System.Drawing.Point(57, 22);
this.panelGreen.Name = "panelGreen";
this.panelGreen.Size = new System.Drawing.Size(35, 30);
this.panelGreen.TabIndex = 1;
this.panelGreen.MouseDown += panelColor_MouseDown;
//
// panelWhite
//
this.panelWhite.BackColor = System.Drawing.Color.White;
this.panelWhite.Location = new System.Drawing.Point(16, 63);
this.panelWhite.Name = "panelWhite";
this.panelWhite.Size = new System.Drawing.Size(35, 30);
this.panelWhite.TabIndex = 4;
this.panelWhite.MouseDown += panelColor_MouseDown;
//
// panelRed
//
this.panelRed.BackColor = System.Drawing.Color.Red;
this.panelRed.Location = new System.Drawing.Point(16, 22);
this.panelRed.Name = "panelRed";
this.panelRed.Size = new System.Drawing.Size(35, 30);
this.panelRed.TabIndex = 0;
this.panelRed.MouseDown += panelColor_MouseDown;
//
// checkBoxBodyKit
//
this.checkBoxBodyKit.AutoSize = true;
this.checkBoxBodyKit.Location = new System.Drawing.Point(10, 154);
this.checkBoxBodyKit.Name = "checkBoxBodyKit";
this.checkBoxBodyKit.Size = new System.Drawing.Size(256, 19);
this.checkBoxBodyKit.TabIndex = 5;
this.checkBoxBodyKit.Text = "Признак наличия вертолетной площадки";
this.checkBoxBodyKit.UseVisualStyleBackColor = true;
//
// checkBoxPushka
//
this.checkBoxPushka.AutoSize = true;
this.checkBoxPushka.Location = new System.Drawing.Point(10, 119);
this.checkBoxPushka.Name = "checkBoxPushka";
this.checkBoxPushka.Size = new System.Drawing.Size(227, 19);
this.checkBoxPushka.TabIndex = 4;
this.checkBoxPushka.Text = "Признак наличия отсека под ракеты";
this.checkBoxPushka.UseVisualStyleBackColor = true;
//
// numericUpDownWeight
//
this.numericUpDownWeight.Location = new System.Drawing.Point(76, 60);
this.numericUpDownWeight.Name = "numericUpDownWeight";
this.numericUpDownWeight.Size = new System.Drawing.Size(73, 23);
this.numericUpDownWeight.TabIndex = 3;
this.numericUpDownWeight.Value = new decimal(new int[] {
100,
0,
0,
0});
//
// numericUpDownSpeed
//
this.numericUpDownSpeed.Location = new System.Drawing.Point(76, 31);
this.numericUpDownSpeed.Name = "numericUpDownSpeed";
this.numericUpDownSpeed.Size = new System.Drawing.Size(73, 23);
this.numericUpDownSpeed.TabIndex = 2;
this.numericUpDownSpeed.Value = new decimal(new int[] {
100,
0,
0,
0});
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(10, 62);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(29, 15);
this.label2.TabIndex = 1;
this.label2.Text = "Вес:";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(10, 33);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(62, 15);
this.label1.TabIndex = 0;
this.label1.Text = "Скорость:";
//
// panelColor
//
this.panelColor.AllowDrop = true;
this.panelColor.Controls.Add(this.labelDopColor);
this.panelColor.Controls.Add(this.labelBaseColor);
this.panelColor.Controls.Add(this.pictureBoxObject);
this.panelColor.Location = new System.Drawing.Point(472, 12);
this.panelColor.Name = "panelColor";
this.panelColor.Size = new System.Drawing.Size(276, 184);
this.panelColor.TabIndex = 1;
this.panelColor.DragDrop += PanelObject_DragDrop;
this.panelColor.DragEnter += PanelObject_DragEnter;
//
// labelDopColor
//
this.labelDopColor.AllowDrop = true;
this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labelDopColor.Location = new System.Drawing.Point(164, 10);
this.labelDopColor.Name = "labelDopColor";
this.labelDopColor.Size = new System.Drawing.Size(100, 29);
this.labelDopColor.TabIndex = 2;
this.labelDopColor.Text = "Доп. цвет";
this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labelDopColor.DragDrop += LabelDopColor_DragDrop;
this.labelDopColor.DragEnter += LabelColor_DragEnter;
this.labelDopColor.MouseDown += LabelObject_MouseDown;
//
// labelBaseColor
//
this.labelBaseColor.AllowDrop = true;
this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labelBaseColor.Location = new System.Drawing.Point(12, 10);
this.labelBaseColor.Name = "labelBaseColor";
this.labelBaseColor.Size = new System.Drawing.Size(100, 29);
this.labelBaseColor.TabIndex = 2;
this.labelBaseColor.Text = "Цвет";
this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labelBaseColor.DragDrop += LabelBaseColor_DragDrop;
this.labelBaseColor.DragEnter += LabelColor_DragEnter;
this.labelBaseColor.MouseDown += LabelObject_MouseDown;
//
// pictureBoxObject
//
this.pictureBoxObject.Location = new System.Drawing.Point(12, 46);
this.pictureBoxObject.Name = "pictureBoxObject";
this.pictureBoxObject.Size = new System.Drawing.Size(252, 127);
this.pictureBoxObject.TabIndex = 0;
this.pictureBoxObject.TabStop = false;
//
// ButtonOk
//
this.ButtonOk.Location = new System.Drawing.Point(484, 208);
this.ButtonOk.Name = "ButtonOk";
this.ButtonOk.Size = new System.Drawing.Size(100, 32);
this.ButtonOk.TabIndex = 2;
this.ButtonOk.Text = "Добавить";
this.ButtonOk.UseVisualStyleBackColor = true;
this.ButtonOk.Click += ButtonOk_Click;
//
// buttonCancel
//
this.buttonCancel.Location = new System.Drawing.Point(636, 208);
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(100, 32);
this.buttonCancel.TabIndex = 3;
this.buttonCancel.Text = "Отмена";
this.buttonCancel.UseVisualStyleBackColor = true;
//
// FormCruiserConfig
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 252);
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.ButtonOk);
this.Controls.Add(this.panelColor);
this.Controls.Add(this.groupBox1);
this.Name = "FormCruiserConfig";
this.Text = "FormLincornConfig";
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit();
this.panelColor.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit();
this.ResumeLayout(false);
}
#endregion
private GroupBox groupBox1;
private NumericUpDown numericUpDownWeight;
private NumericUpDown numericUpDownSpeed;
private Label label2;
private Label label1;
private GroupBox groupBox2;
private CheckBox checkBoxBodyKit;
private CheckBox checkBoxPushka;
private Panel panelPurple;
private Panel panelYellow;
private Panel panelBlack;
private Panel panelBlue;
private Panel panelGray;
private Panel panelGreen;
private Panel panelWhite;
private Panel panelRed;
private Label labelSimpleObject;
private Label labelModifiedObject;
private Panel panelColor;
private PictureBox pictureBoxObject;
private Label labelDopColor;
private Label labelBaseColor;
private Button ButtonOk;
private Button buttonCancel;
}
}

150
Cruiser/Cruiser/FormCruiserConfig.cs Normal file
View File

@ -0,0 +1,150 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using ProjectCruiser.Drawnings;
using ProjectCruiser.Entities;
using ProjectCruiser;
using ProjectCruiser.DrawningObjects;
namespace ProjectCruiser
{
public partial class FormCruiserConfig : Form
{
DrawningCruiser? _cruiser = null;
private event Action<DrawningCruiser> EventAddCruiser;
public FormCruiserConfig()
{
InitializeComponent();
panelBlack.MouseDown += panelColor_MouseDown;
panelPurple.MouseDown += panelColor_MouseDown;
panelGray.MouseDown += panelColor_MouseDown;
panelGreen.MouseDown += panelColor_MouseDown;
panelRed.MouseDown += panelColor_MouseDown;
panelWhite.MouseDown += panelColor_MouseDown;
panelYellow.MouseDown += panelColor_MouseDown;
panelBlue.MouseDown += panelColor_MouseDown;
buttonCancel.Click += (sender, e) => Close();
}
private void DrawCruiser()
{
Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
Graphics gr = Graphics.FromImage(bmp);
_cruiser?.SetPosition(5, 5);
_cruiser?.DrawTransport(gr);
pictureBoxObject.Image = bmp;
}
public void AddEvent(Action<DrawningCruiser> ev)
{
if (EventAddCruiser == null)
{
EventAddCruiser = new Action<DrawningCruiser>(ev);
}
else
{
EventAddCruiser += ev;
}
}
private void LabelObject_MouseDown(object sender, MouseEventArgs e)
{
(sender as Label)?.DoDragDrop((sender as Label)?.Name, DragDropEffects.Move | DragDropEffects.Copy);
}
private void PanelObject_DragEnter(object sender, DragEventArgs e)
{
if (e.Data?.GetDataPresent(DataFormats.Text) ?? false)
{
e.Effect = DragDropEffects.Copy;
}
else
{
e.Effect = DragDropEffects.None;
}
}
private void PanelObject_DragDrop(object sender, DragEventArgs e)
{
switch (e.Data?.GetData(DataFormats.Text).ToString())
{
case "labelSimpleObject":
_cruiser = new DrawningCruiser((int)numericUpDownSpeed.Value,
(int)numericUpDownWeight.Value, Color.White, pictureBoxObject.Width,
pictureBoxObject.Height);
break;
case "labelModifiedObject":
_cruiser = new DrawningCruiserDou((int)numericUpDownSpeed.Value,
(int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxBodyKit.Checked,
checkBoxPushka.Checked, pictureBoxObject.Width, pictureBoxObject.Height);
break;
}
DrawCruiser();
}
private void panelColor_MouseDown(object sender, MouseEventArgs e)
{
(sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
}
private void LabelBaseColor_DragDrop(object sender, DragEventArgs e)
{
if (_cruiser != null)
{
if (e.Data.GetDataPresent(typeof(Color)))
{
_cruiser.EntityCruiser.BodyColor = (Color)e.Data.GetData(typeof(Color));
}
DrawCruiser();
}
}
private void LabelColor_DragEnter(object sender, DragEventArgs e)
{
if (_cruiser != null && _cruiser.EntityCruiser is EntityCruiserDou entityustabat)
{
labelDopColor.AllowDrop = true;
}
else
labelDopColor.AllowDrop = false;
if (e.Data.GetDataPresent(typeof(Color)))
{
e.Effect = DragDropEffects.Copy;
}
else
{
e.Effect = DragDropEffects.None;
}
}
private void LabelDopColor_DragDrop(object sender, DragEventArgs e)
{
if (_cruiser != null && _cruiser.EntityCruiser is EntityCruiserDou entitycruiserdou)
{
if (e.Data.GetDataPresent(typeof(Color)))
{
entitycruiserdou.AdditionalColor = (Color)e.Data.GetData(typeof(Color));
}
DrawCruiser();
}
}
private void ButtonOk_Click(object sender, EventArgs e)
{
EventAddCruiser?.Invoke(_cruiser);
Close();
}
}
}

60
Cruiser/Cruiser/FormCruiserConfig.resx Normal file
View File

@ -0,0 +1,60 @@
<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

2
Cruiser/Cruiser/IMoveableObject.cs
View File

@ -12,7 +12,7 @@ namespace ProjectCruiser.MovementStrategy
ObjectParameters? GetObjectPosition { get; } ObjectParameters? GetObjectPosition { get; }
int GetStep { get; } int GetStep { get; }
bool CheckCanMove(DirectionType direction); bool CheckCanMove(DirectionType direction);
void MoveObject(DirectionType direction); void MoveObject(DirectionType direction);

4
Cruiser/Cruiser/ObjectParameters.cs
View File

@ -6,15 +6,13 @@ using System.Threading.Tasks;
namespace ProjectCruiser.MovementStrategy namespace ProjectCruiser.MovementStrategy
{ {
/// <summary>
/// Параметры-координаты объекта
/// </summary>
public class ObjectParameters public class ObjectParameters
{ {
private readonly int _x; private readonly int _x;
private readonly int _y; private readonly int _y;
private readonly int _width; private readonly int _width;
private readonly int _height; private readonly int _height;
public int LeftBorder => _x; public int LeftBorder => _x;
public int TopBorder => _y; public int TopBorder => _y;

11
Cruiser/Cruiser/SetGeneric.cs
View File

@ -4,23 +4,24 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace ProjectCruiser namespace ProjectCruiser.Generics
{ {
internal class SetGeneric<T> internal class SetGeneric<T>
where T : class where T : class
{ {
private readonly List<T?> _places; private readonly List<T?> _places;
public int Count => _places.Count; public int Count => _places.Count;
private readonly int _maxCount; private readonly int _maxCount;
public SetGeneric(int count) public SetGeneric(int count)
{ {
_maxCount = count; _maxCount = count;
_places = new List<T?>(count); _places = new List<T?>(count);
} }
public int Insert(T cruiser) public int Insert(T cruiser)
{ {
return Insert(cruiser, 0); return Insert(cruiser, 0);
@ -28,18 +29,18 @@ namespace ProjectCruiser
public int Insert(T cruiser, int position) public int Insert(T cruiser, int position)
{ {
if (position < 0 || position >= _maxCount) if (position < 0 || position >= _maxCount)
return -1; return -1;
if (Count >= _maxCount) if (Count >= _maxCount)
return -1; return -1;
_places.Insert(position, cruiser); _places.Insert(position, cruiser);
return position; return position;
} }
public bool Remove(int position) public bool Remove(int position)
{ {
if ((position < 0) || (position > _maxCount)) return false; if ((position < 0) || (position > _maxCount)) return false;
_places.RemoveAt(position); _places.RemoveAt(position);
return true; return true;