lab5
This commit is contained in:
marusya
parent
9bee490bb3
commit
d91a5b612a
@ -19,7 +19,7 @@ namespace SelfPropelledArtilleryUnit.DrawningObjects
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Класс-сущность
|
/// Класс-сущность
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public EntityUsta? EntityUsta { get; protected set; }
|
public EntityUsta? EntityUsta_ { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Ширина окна
|
/// Ширина окна
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -58,7 +58,7 @@ namespace SelfPropelledArtilleryUnit.DrawningObjects
|
|||||||
// TODO: Продумать проверки
|
// TODO: Продумать проверки
|
||||||
_pictureWidth = width;
|
_pictureWidth = width;
|
||||||
_pictureHeight = height;
|
_pictureHeight = height;
|
||||||
EntityUsta = new EntityUsta(speed, weight, bodyColor);
|
EntityUsta_ = new EntityUsta(speed, weight, bodyColor);
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Конструктор
|
/// Конструктор
|
||||||
@ -83,8 +83,10 @@ namespace SelfPropelledArtilleryUnit.DrawningObjects
|
|||||||
_pictureHeight = height;
|
_pictureHeight = height;
|
||||||
_ustaWidth = ustaWidth;
|
_ustaWidth = ustaWidth;
|
||||||
_ustaHeight = ustaHeight;
|
_ustaHeight = ustaHeight;
|
||||||
EntityUsta = new EntityUsta(speed, weight, bodyColor);
|
EntityUsta_ = new EntityUsta(speed, weight, bodyColor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Установка позиции
|
/// Установка позиции
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -141,20 +143,20 @@ namespace SelfPropelledArtilleryUnit.DrawningObjects
|
|||||||
/// <returns>true - можно переместится по указанному направлению</returns>
|
/// <returns>true - можно переместится по указанному направлению</returns>
|
||||||
public virtual bool CanMove(DirectionType direction)
|
public virtual bool CanMove(DirectionType direction)
|
||||||
{
|
{
|
||||||
if (EntityUsta == null)
|
if (EntityUsta_ == null)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return direction switch
|
return direction switch
|
||||||
{
|
{
|
||||||
//влево
|
//влево
|
||||||
DirectionType.Left => _startPosX - EntityUsta.Step > 0,
|
DirectionType.Left => _startPosX - EntityUsta_.Step > 0,
|
||||||
//вверх
|
//вверх
|
||||||
DirectionType.Up => _startPosY - EntityUsta.Step > 7,
|
DirectionType.Up => _startPosY - EntityUsta_.Step > 7,
|
||||||
// вправо
|
// вправо
|
||||||
DirectionType.Right => _startPosX + EntityUsta.Step + _ustaWidth < _pictureWidth,// TODO: Продумать логику
|
DirectionType.Right => _startPosX + EntityUsta_.Step + _ustaWidth < _pictureWidth,// TODO: Продумать логику
|
||||||
//вниз
|
//вниз
|
||||||
DirectionType.Down => _startPosY + EntityUsta.Step + _ustaHeight < _pictureHeight,// TODO: Продумать логику
|
DirectionType.Down => _startPosY + EntityUsta_.Step + _ustaHeight < _pictureHeight,// TODO: Продумать логику
|
||||||
_ => false,
|
_ => false,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -165,37 +167,37 @@ namespace SelfPropelledArtilleryUnit.DrawningObjects
|
|||||||
public virtual void MoveTransport(DirectionType direction)
|
public virtual void MoveTransport(DirectionType direction)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (!CanMove(direction) || EntityUsta == null)
|
if (!CanMove(direction) || EntityUsta_ == null)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
switch (direction)
|
switch (direction)
|
||||||
{
|
{
|
||||||
case DirectionType.Left:
|
case DirectionType.Left:
|
||||||
_startPosX -= (int)EntityUsta.Step;
|
_startPosX -= (int)EntityUsta_.Step;
|
||||||
break;
|
break;
|
||||||
case DirectionType.Up:
|
case DirectionType.Up:
|
||||||
_startPosY -= (int)EntityUsta.Step;
|
_startPosY -= (int)EntityUsta_.Step;
|
||||||
break;
|
break;
|
||||||
case DirectionType.Right:
|
case DirectionType.Right:
|
||||||
_startPosX += (int)EntityUsta.Step;
|
_startPosX += (int)EntityUsta_.Step;
|
||||||
break;
|
break;
|
||||||
case DirectionType.Down:
|
case DirectionType.Down:
|
||||||
_startPosY += (int)EntityUsta.Step;
|
_startPosY += (int)EntityUsta_.Step;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual void DrawTransport(Graphics g)
|
public virtual void DrawTransport(Graphics g)
|
||||||
{
|
{
|
||||||
if (EntityUsta == null)
|
if (EntityUsta_ == null)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Pen pen = new(Color.Black);
|
Pen pen = new(Color.Black);
|
||||||
|
|
||||||
|
|
||||||
Brush BodyColor = new SolidBrush(EntityUsta.BodyColor);
|
Brush BodyColor = new SolidBrush(EntityUsta_.BodyColor);
|
||||||
|
|
||||||
//зеленый темнее
|
//зеленый темнее
|
||||||
int lineWidth = 10;
|
int lineWidth = 10;
|
||||||
@ -249,6 +251,10 @@ namespace SelfPropelledArtilleryUnit.DrawningObjects
|
|||||||
g.FillEllipse(pen3, _startPosX + 10, _startPosY + 52, 26, 26);
|
g.FillEllipse(pen3, _startPosX + 10, _startPosY + 52, 26, 26);
|
||||||
g.FillEllipse(pen3, _startPosX + 105, _startPosY + 52, 26, 26);
|
g.FillEllipse(pen3, _startPosX + 105, _startPosY + 52, 26, 26);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -29,9 +29,9 @@ namespace SelfPropelledArtilleryUnit.DrawningObjects
|
|||||||
additionalColor, bool bodyKit, bool pushka, int width, int height) :
|
additionalColor, bool bodyKit, bool pushka, int width, int height) :
|
||||||
base(speed, weight, bodyColor, width, height, 140, 90)
|
base(speed, weight, bodyColor, width, height, 140, 90)
|
||||||
{
|
{
|
||||||
if (EntityUsta != null)
|
if (EntityUsta_ != null)
|
||||||
{
|
{
|
||||||
EntityUsta = new EntityUstaBat(speed, weight, bodyColor,
|
EntityUsta_ = new EntityUstaBat(speed, weight, bodyColor,
|
||||||
additionalColor, bodyKit, pushka);
|
additionalColor, bodyKit, pushka);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -39,14 +39,14 @@ namespace SelfPropelledArtilleryUnit.DrawningObjects
|
|||||||
|
|
||||||
public override void DrawTransport(Graphics g)
|
public override void DrawTransport(Graphics g)
|
||||||
{
|
{
|
||||||
if (EntityUsta is not EntityUstaBat ustaBat)
|
if (EntityUsta_ is not EntityUstaBat ustaBat)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Pen pen = new(Color.Black);
|
Pen pen = new(Color.Black);
|
||||||
|
|
||||||
Brush additionalBrush = new SolidBrush(ustaBat.AdditionalColor);
|
Brush additionalBrush = new SolidBrush(ustaBat.AdditionalColor);
|
||||||
Brush BodyColor = new SolidBrush(EntityUsta.BodyColor);
|
Brush BodyColor = new SolidBrush(EntityUsta_.BodyColor);
|
||||||
|
|
||||||
//зеленый темнее
|
//зеленый темнее
|
||||||
Color color1 = Color.FromArgb(65, 72, 51);
|
Color color1 = Color.FromArgb(65, 72, 51);
|
||||||
|
|||||||
@ -22,7 +22,7 @@ namespace SelfPropelledArtilleryUnit.Entities
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Основной цвет
|
/// Основной цвет
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Color BodyColor { get; private set; }
|
public Color BodyColor { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Шаг перемещения установки
|
/// Шаг перемещения установки
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -39,6 +39,7 @@ namespace SelfPropelledArtilleryUnit.Entities
|
|||||||
Weight = weight;
|
Weight = weight;
|
||||||
BodyColor = bodyColor;
|
BodyColor = bodyColor;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@ namespace SelfPropelledArtilleryUnit.Entities
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Дополнительный цвет (для опциональных элементов)
|
/// Дополнительный цвет (для опциональных элементов)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Color AdditionalColor { get; private set; }
|
public Color AdditionalColor { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Признак (опция) наличия батареи
|
/// Признак (опция) наличия батареи
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@ -33,7 +33,7 @@ namespace SelfPropelledArtilleryUnit
|
|||||||
|
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// <EFBFBD>ועמה ןנמנטסמגךט לארטם<D798>
|
/// Метод прорисовки установки
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private void Draw()
|
private void Draw()
|
||||||
{
|
{
|
||||||
|
|||||||
@ -105,16 +105,17 @@ namespace SelfPropelledArtilleryUnit
|
|||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var obj = _storage[listBoxStorage.SelectedItem.ToString() ??
|
|
||||||
string.Empty];
|
var formSelfPropelledArtilleryUnitConfig = new FormSelfPropelledArtilleryUnitConfig();
|
||||||
if (obj == null)
|
|
||||||
|
formSelfPropelledArtilleryUnitConfig.AddEvent(usta =>
|
||||||
{
|
{
|
||||||
return;
|
if (listBoxStorage.SelectedIndex != -1)
|
||||||
}
|
|
||||||
FormSelfPropelledArtilleryUnit form = new();
|
|
||||||
if (form.ShowDialog() == DialogResult.OK)
|
|
||||||
{
|
{
|
||||||
if (obj + form.SelectedUsta > -1)
|
var obj = _storage[listBoxStorage.SelectedItem?.ToString() ?? string.Empty];
|
||||||
|
if (obj != null)
|
||||||
|
{
|
||||||
|
if (obj + usta != 1)
|
||||||
{
|
{
|
||||||
MessageBox.Show("Объект добавлен");
|
MessageBox.Show("Объект добавлен");
|
||||||
pictureBoxCollection.Image = obj.ShowUsta();
|
pictureBoxCollection.Image = obj.ShowUsta();
|
||||||
@ -125,6 +126,12 @@ namespace SelfPropelledArtilleryUnit
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
formSelfPropelledArtilleryUnitConfig.Show();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Удаление объекта из набора
|
/// Удаление объекта из набора
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
383
SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormSelfPropelledArtilleryUnitConfig.Designer.cs
generated
Normal file
383
SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormSelfPropelledArtilleryUnitConfig.Designer.cs
generated
Normal file
@ -0,0 +1,383 @@
|
|||||||
|
namespace SelfPropelledArtilleryUnit
|
||||||
|
{
|
||||||
|
partial class FormSelfPropelledArtilleryUnitConfig
|
||||||
|
{
|
||||||
|
/// <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()
|
||||||
|
{
|
||||||
|
groupBox1 = new GroupBox();
|
||||||
|
labelModifiedObject = new Label();
|
||||||
|
labelSimpleObject = new Label();
|
||||||
|
groupBox2 = new GroupBox();
|
||||||
|
panelPurple = new Panel();
|
||||||
|
panelYellow = new Panel();
|
||||||
|
panelBlack = new Panel();
|
||||||
|
panelBlue = new Panel();
|
||||||
|
panelGray = new Panel();
|
||||||
|
panelGreen = new Panel();
|
||||||
|
panelWhite = new Panel();
|
||||||
|
panelRed = new Panel();
|
||||||
|
checkBoxBodyKit = new CheckBox();
|
||||||
|
checkBoxPushka = new CheckBox();
|
||||||
|
numericUpDownWeight = new NumericUpDown();
|
||||||
|
numericUpDownSpeed = new NumericUpDown();
|
||||||
|
label2 = new Label();
|
||||||
|
label1 = new Label();
|
||||||
|
panelColor = new Panel();
|
||||||
|
labelDopColor = new Label();
|
||||||
|
labelBaseColor = new Label();
|
||||||
|
pictureBoxObject = new PictureBox();
|
||||||
|
ButtonOk = new Button();
|
||||||
|
buttonCancel = new Button();
|
||||||
|
groupBox1.SuspendLayout();
|
||||||
|
groupBox2.SuspendLayout();
|
||||||
|
((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
|
||||||
|
((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
|
||||||
|
panelColor.SuspendLayout();
|
||||||
|
((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
|
||||||
|
SuspendLayout();
|
||||||
|
//
|
||||||
|
// groupBox1
|
||||||
|
//
|
||||||
|
groupBox1.Controls.Add(labelModifiedObject);
|
||||||
|
groupBox1.Controls.Add(labelSimpleObject);
|
||||||
|
groupBox1.Controls.Add(groupBox2);
|
||||||
|
groupBox1.Controls.Add(checkBoxBodyKit);
|
||||||
|
groupBox1.Controls.Add(checkBoxPushka);
|
||||||
|
groupBox1.Controls.Add(numericUpDownWeight);
|
||||||
|
groupBox1.Controls.Add(numericUpDownSpeed);
|
||||||
|
groupBox1.Controls.Add(label2);
|
||||||
|
groupBox1.Controls.Add(label1);
|
||||||
|
groupBox1.Location = new Point(14, 16);
|
||||||
|
groupBox1.Margin = new Padding(3, 4, 3, 4);
|
||||||
|
groupBox1.Name = "groupBox1";
|
||||||
|
groupBox1.Padding = new Padding(3, 4, 3, 4);
|
||||||
|
groupBox1.Size = new Size(519, 304);
|
||||||
|
groupBox1.TabIndex = 0;
|
||||||
|
groupBox1.TabStop = false;
|
||||||
|
groupBox1.Text = "Параметры";
|
||||||
|
//
|
||||||
|
// labelModifiedObject
|
||||||
|
//
|
||||||
|
labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
|
||||||
|
labelModifiedObject.Location = new Point(358, 195);
|
||||||
|
labelModifiedObject.Name = "labelModifiedObject";
|
||||||
|
labelModifiedObject.Size = new Size(99, 35);
|
||||||
|
labelModifiedObject.TabIndex = 8;
|
||||||
|
labelModifiedObject.Text = "Продвинутый";
|
||||||
|
labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
|
||||||
|
labelModifiedObject.MouseDown += LabelObject_MouseDown;
|
||||||
|
//
|
||||||
|
// labelSimpleObject
|
||||||
|
//
|
||||||
|
labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
|
||||||
|
labelSimpleObject.Location = new Point(246, 195);
|
||||||
|
labelSimpleObject.Name = "labelSimpleObject";
|
||||||
|
labelSimpleObject.Size = new Size(99, 35);
|
||||||
|
labelSimpleObject.TabIndex = 7;
|
||||||
|
labelSimpleObject.Text = "Простой";
|
||||||
|
labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
|
||||||
|
labelSimpleObject.MouseDown += LabelObject_MouseDown;
|
||||||
|
//
|
||||||
|
// groupBox2
|
||||||
|
//
|
||||||
|
groupBox2.Controls.Add(panelPurple);
|
||||||
|
groupBox2.Controls.Add(panelYellow);
|
||||||
|
groupBox2.Controls.Add(panelBlack);
|
||||||
|
groupBox2.Controls.Add(panelBlue);
|
||||||
|
groupBox2.Controls.Add(panelGray);
|
||||||
|
groupBox2.Controls.Add(panelGreen);
|
||||||
|
groupBox2.Controls.Add(panelWhite);
|
||||||
|
groupBox2.Controls.Add(panelRed);
|
||||||
|
groupBox2.Location = new Point(246, 43);
|
||||||
|
groupBox2.Margin = new Padding(3, 4, 3, 4);
|
||||||
|
groupBox2.Name = "groupBox2";
|
||||||
|
groupBox2.Padding = new Padding(3, 4, 3, 4);
|
||||||
|
groupBox2.Size = new Size(211, 141);
|
||||||
|
groupBox2.TabIndex = 6;
|
||||||
|
groupBox2.TabStop = false;
|
||||||
|
groupBox2.Text = "Цвета";
|
||||||
|
//
|
||||||
|
// panelPurple
|
||||||
|
//
|
||||||
|
panelPurple.BackColor = Color.FromArgb(192, 0, 192);
|
||||||
|
panelPurple.Location = new Point(159, 84);
|
||||||
|
panelPurple.Margin = new Padding(3, 4, 3, 4);
|
||||||
|
panelPurple.Name = "panelPurple";
|
||||||
|
panelPurple.Size = new Size(40, 40);
|
||||||
|
panelPurple.TabIndex = 7;
|
||||||
|
panelPurple.MouseDown += panelColor_MouseDown;
|
||||||
|
//
|
||||||
|
// panelYellow
|
||||||
|
//
|
||||||
|
panelYellow.BackColor = Color.Yellow;
|
||||||
|
panelYellow.Location = new Point(159, 29);
|
||||||
|
panelYellow.Margin = new Padding(3, 4, 3, 4);
|
||||||
|
panelYellow.Name = "panelYellow";
|
||||||
|
panelYellow.Size = new Size(40, 40);
|
||||||
|
panelYellow.TabIndex = 3;
|
||||||
|
panelYellow.MouseDown += panelColor_MouseDown;
|
||||||
|
//
|
||||||
|
// panelBlack
|
||||||
|
//
|
||||||
|
panelBlack.BackColor = Color.Black;
|
||||||
|
panelBlack.Location = new Point(112, 84);
|
||||||
|
panelBlack.Margin = new Padding(3, 4, 3, 4);
|
||||||
|
panelBlack.Name = "panelBlack";
|
||||||
|
panelBlack.Size = new Size(40, 40);
|
||||||
|
panelBlack.TabIndex = 6;
|
||||||
|
panelBlack.MouseDown += panelColor_MouseDown;
|
||||||
|
//
|
||||||
|
// panelBlue
|
||||||
|
//
|
||||||
|
panelBlue.BackColor = Color.Blue;
|
||||||
|
panelBlue.Location = new Point(112, 29);
|
||||||
|
panelBlue.Margin = new Padding(3, 4, 3, 4);
|
||||||
|
panelBlue.Name = "panelBlue";
|
||||||
|
panelBlue.Size = new Size(40, 40);
|
||||||
|
panelBlue.TabIndex = 2;
|
||||||
|
panelBlue.MouseDown += panelColor_MouseDown;
|
||||||
|
//
|
||||||
|
// panelGray
|
||||||
|
//
|
||||||
|
panelGray.BackColor = Color.Gray;
|
||||||
|
panelGray.Location = new Point(65, 84);
|
||||||
|
panelGray.Margin = new Padding(3, 4, 3, 4);
|
||||||
|
panelGray.Name = "panelGray";
|
||||||
|
panelGray.Size = new Size(40, 40);
|
||||||
|
panelGray.TabIndex = 5;
|
||||||
|
panelGray.MouseDown += panelColor_MouseDown;
|
||||||
|
//
|
||||||
|
// panelGreen
|
||||||
|
//
|
||||||
|
panelGreen.BackColor = Color.FromArgb(0, 192, 0);
|
||||||
|
panelGreen.Location = new Point(65, 29);
|
||||||
|
panelGreen.Margin = new Padding(3, 4, 3, 4);
|
||||||
|
panelGreen.Name = "panelGreen";
|
||||||
|
panelGreen.Size = new Size(40, 40);
|
||||||
|
panelGreen.TabIndex = 1;
|
||||||
|
panelGreen.MouseDown += panelColor_MouseDown;
|
||||||
|
//
|
||||||
|
// panelWhite
|
||||||
|
//
|
||||||
|
panelWhite.BackColor = Color.White;
|
||||||
|
panelWhite.Location = new Point(18, 84);
|
||||||
|
panelWhite.Margin = new Padding(3, 4, 3, 4);
|
||||||
|
panelWhite.Name = "panelWhite";
|
||||||
|
panelWhite.Size = new Size(40, 40);
|
||||||
|
panelWhite.TabIndex = 4;
|
||||||
|
panelWhite.MouseDown += panelColor_MouseDown;
|
||||||
|
//
|
||||||
|
// panelRed
|
||||||
|
//
|
||||||
|
panelRed.BackColor = Color.Red;
|
||||||
|
panelRed.Location = new Point(18, 29);
|
||||||
|
panelRed.Margin = new Padding(3, 4, 3, 4);
|
||||||
|
panelRed.Name = "panelRed";
|
||||||
|
panelRed.Size = new Size(40, 40);
|
||||||
|
panelRed.TabIndex = 0;
|
||||||
|
panelRed.MouseDown += panelColor_MouseDown;
|
||||||
|
//
|
||||||
|
// checkBoxBodyKit
|
||||||
|
//
|
||||||
|
checkBoxBodyKit.AutoSize = true;
|
||||||
|
checkBoxBodyKit.Location = new Point(11, 205);
|
||||||
|
checkBoxBodyKit.Margin = new Padding(3, 4, 3, 4);
|
||||||
|
checkBoxBodyKit.Name = "checkBoxBodyKit";
|
||||||
|
checkBoxBodyKit.Size = new Size(215, 24);
|
||||||
|
checkBoxBodyKit.TabIndex = 5;
|
||||||
|
checkBoxBodyKit.Text = "Признак наличия батареи";
|
||||||
|
checkBoxBodyKit.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// checkBoxPushka
|
||||||
|
//
|
||||||
|
checkBoxPushka.AutoSize = true;
|
||||||
|
checkBoxPushka.Location = new Point(11, 159);
|
||||||
|
checkBoxPushka.Margin = new Padding(3, 4, 3, 4);
|
||||||
|
checkBoxPushka.Name = "checkBoxPushka";
|
||||||
|
checkBoxPushka.Size = new Size(202, 24);
|
||||||
|
checkBoxPushka.TabIndex = 4;
|
||||||
|
checkBoxPushka.Text = "Признак наличия пушки";
|
||||||
|
checkBoxPushka.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// numericUpDownWeight
|
||||||
|
//
|
||||||
|
numericUpDownWeight.Location = new Point(87, 80);
|
||||||
|
numericUpDownWeight.Margin = new Padding(3, 4, 3, 4);
|
||||||
|
numericUpDownWeight.Name = "numericUpDownWeight";
|
||||||
|
numericUpDownWeight.Size = new Size(83, 27);
|
||||||
|
numericUpDownWeight.TabIndex = 3;
|
||||||
|
numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
|
||||||
|
//
|
||||||
|
// numericUpDownSpeed
|
||||||
|
//
|
||||||
|
numericUpDownSpeed.Location = new Point(87, 41);
|
||||||
|
numericUpDownSpeed.Margin = new Padding(3, 4, 3, 4);
|
||||||
|
numericUpDownSpeed.Name = "numericUpDownSpeed";
|
||||||
|
numericUpDownSpeed.Size = new Size(83, 27);
|
||||||
|
numericUpDownSpeed.TabIndex = 2;
|
||||||
|
numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
|
||||||
|
//
|
||||||
|
// label2
|
||||||
|
//
|
||||||
|
label2.AutoSize = true;
|
||||||
|
label2.Location = new Point(11, 83);
|
||||||
|
label2.Name = "label2";
|
||||||
|
label2.Size = new Size(36, 20);
|
||||||
|
label2.TabIndex = 1;
|
||||||
|
label2.Text = "Вес:";
|
||||||
|
//
|
||||||
|
// label1
|
||||||
|
//
|
||||||
|
label1.AutoSize = true;
|
||||||
|
label1.Location = new Point(11, 44);
|
||||||
|
label1.Name = "label1";
|
||||||
|
label1.Size = new Size(76, 20);
|
||||||
|
label1.TabIndex = 0;
|
||||||
|
label1.Text = "Скорость:";
|
||||||
|
//
|
||||||
|
// panelColor
|
||||||
|
//
|
||||||
|
panelColor.AllowDrop = true;
|
||||||
|
panelColor.Controls.Add(labelDopColor);
|
||||||
|
panelColor.Controls.Add(labelBaseColor);
|
||||||
|
panelColor.Controls.Add(pictureBoxObject);
|
||||||
|
panelColor.Location = new Point(539, 16);
|
||||||
|
panelColor.Margin = new Padding(3, 4, 3, 4);
|
||||||
|
panelColor.Name = "panelColor";
|
||||||
|
panelColor.Size = new Size(315, 245);
|
||||||
|
panelColor.TabIndex = 1;
|
||||||
|
panelColor.DragDrop += PanelObject_DragDrop;
|
||||||
|
panelColor.DragEnter += PanelObject_DragEnter;
|
||||||
|
//
|
||||||
|
// labelDopColor
|
||||||
|
//
|
||||||
|
labelDopColor.AllowDrop = true;
|
||||||
|
labelDopColor.BorderStyle = BorderStyle.FixedSingle;
|
||||||
|
labelDopColor.Location = new Point(187, 13);
|
||||||
|
labelDopColor.Name = "labelDopColor";
|
||||||
|
labelDopColor.Size = new Size(114, 38);
|
||||||
|
labelDopColor.TabIndex = 2;
|
||||||
|
labelDopColor.Text = "Доп. цвет";
|
||||||
|
labelDopColor.TextAlign = ContentAlignment.MiddleCenter;
|
||||||
|
labelDopColor.DragDrop += LabelDopColor_DragDrop;
|
||||||
|
labelDopColor.DragEnter += LabelColor_DragEnter;
|
||||||
|
labelDopColor.MouseDown += LabelObject_MouseDown;
|
||||||
|
//
|
||||||
|
// labelBaseColor
|
||||||
|
//
|
||||||
|
labelBaseColor.AllowDrop = true;
|
||||||
|
labelBaseColor.BorderStyle = BorderStyle.FixedSingle;
|
||||||
|
labelBaseColor.Location = new Point(14, 13);
|
||||||
|
labelBaseColor.Name = "labelBaseColor";
|
||||||
|
labelBaseColor.Size = new Size(114, 38);
|
||||||
|
labelBaseColor.TabIndex = 2;
|
||||||
|
labelBaseColor.Text = "Цвет";
|
||||||
|
labelBaseColor.TextAlign = ContentAlignment.MiddleCenter;
|
||||||
|
labelBaseColor.DragDrop += LabelBaseColor_DragDrop;
|
||||||
|
labelBaseColor.DragEnter += LabelColor_DragEnter;
|
||||||
|
labelBaseColor.MouseDown += LabelObject_MouseDown;
|
||||||
|
//
|
||||||
|
// pictureBoxObject
|
||||||
|
//
|
||||||
|
pictureBoxObject.Location = new Point(14, 61);
|
||||||
|
pictureBoxObject.Margin = new Padding(3, 4, 3, 4);
|
||||||
|
pictureBoxObject.Name = "pictureBoxObject";
|
||||||
|
pictureBoxObject.Size = new Size(288, 169);
|
||||||
|
pictureBoxObject.TabIndex = 0;
|
||||||
|
pictureBoxObject.TabStop = false;
|
||||||
|
//
|
||||||
|
// ButtonOk
|
||||||
|
//
|
||||||
|
ButtonOk.Location = new Point(553, 277);
|
||||||
|
ButtonOk.Margin = new Padding(3, 4, 3, 4);
|
||||||
|
ButtonOk.Name = "ButtonOk";
|
||||||
|
ButtonOk.Size = new Size(114, 43);
|
||||||
|
ButtonOk.TabIndex = 2;
|
||||||
|
ButtonOk.Text = "Добавить";
|
||||||
|
ButtonOk.UseVisualStyleBackColor = true;
|
||||||
|
ButtonOk.Click += ButtonOk_Click;
|
||||||
|
//
|
||||||
|
// buttonCancel
|
||||||
|
//
|
||||||
|
buttonCancel.Location = new Point(727, 277);
|
||||||
|
buttonCancel.Margin = new Padding(3, 4, 3, 4);
|
||||||
|
buttonCancel.Name = "buttonCancel";
|
||||||
|
buttonCancel.Size = new Size(114, 43);
|
||||||
|
buttonCancel.TabIndex = 3;
|
||||||
|
buttonCancel.Text = "Отмена";
|
||||||
|
buttonCancel.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// FormSelfPropelledArtilleryUnitConfig
|
||||||
|
//
|
||||||
|
AutoScaleDimensions = new SizeF(8F, 20F);
|
||||||
|
AutoScaleMode = AutoScaleMode.Font;
|
||||||
|
ClientSize = new Size(914, 336);
|
||||||
|
Controls.Add(buttonCancel);
|
||||||
|
Controls.Add(ButtonOk);
|
||||||
|
Controls.Add(panelColor);
|
||||||
|
Controls.Add(groupBox1);
|
||||||
|
Margin = new Padding(3, 4, 3, 4);
|
||||||
|
Name = "FormSelfPropelledArtilleryUnitConfig";
|
||||||
|
Text = "FormSelfPropelledArtilleryUnitConfig";
|
||||||
|
groupBox1.ResumeLayout(false);
|
||||||
|
groupBox1.PerformLayout();
|
||||||
|
groupBox2.ResumeLayout(false);
|
||||||
|
((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
|
||||||
|
((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
|
||||||
|
panelColor.ResumeLayout(false);
|
||||||
|
((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,180 @@
|
|||||||
|
|
||||||
|
using SelfPropelledArtilleryUnit.Drawnings;
|
||||||
|
using SelfPropelledArtilleryUnit.Entities;
|
||||||
|
using SelfPropelledArtilleryUnit;
|
||||||
|
using SelfPropelledArtilleryUnit.DrawningObjects;
|
||||||
|
using static System.Windows.Forms.VisualStyles.VisualStyleElement.TrackBar;
|
||||||
|
|
||||||
|
namespace SelfPropelledArtilleryUnit
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Форма создания объекта
|
||||||
|
/// </summary>
|
||||||
|
public partial class FormSelfPropelledArtilleryUnitConfig : Form
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Переменная-выбранная установка
|
||||||
|
/// </summary>
|
||||||
|
DrawningUsta? _usta = null;
|
||||||
|
/// <summary>
|
||||||
|
/// Событие
|
||||||
|
/// </summary>
|
||||||
|
private event Action<DrawningUsta> EventAddUsta;
|
||||||
|
/// <summary>
|
||||||
|
/// Конструктор
|
||||||
|
/// </summary>
|
||||||
|
public FormSelfPropelledArtilleryUnitConfig()
|
||||||
|
{
|
||||||
|
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;
|
||||||
|
// TODO buttonCancel.Click with lambda
|
||||||
|
buttonCancel.Click += (sender, e) => Close();
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// Отрисовать установку
|
||||||
|
/// </summary>
|
||||||
|
private void DrawUsta()
|
||||||
|
{
|
||||||
|
Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
|
||||||
|
Graphics gr = Graphics.FromImage(bmp);
|
||||||
|
_usta?.SetPosition(5, 5);
|
||||||
|
_usta?.DrawTransport(gr);
|
||||||
|
pictureBoxObject.Image = bmp;
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// Добавление события
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ev">Привязанный метод</param>
|
||||||
|
public void AddEvent(Action<DrawningUsta> ev)
|
||||||
|
{
|
||||||
|
if (EventAddUsta == null)
|
||||||
|
{
|
||||||
|
EventAddUsta = new Action<DrawningUsta>(ev);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
EventAddUsta += ev;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// Передаем информацию при нажатии на Label
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="sender"></param>
|
||||||
|
/// <param name="e"></param>
|
||||||
|
private void LabelObject_MouseDown(object sender, MouseEventArgs e)
|
||||||
|
{
|
||||||
|
(sender as Label)?.DoDragDrop((sender as Label)?.Name, DragDropEffects.Move | DragDropEffects.Copy);
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// Проверка получаемой информации (ее типа на соответствие требуемому)
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="sender"></param>
|
||||||
|
/// <param name="e"></param>
|
||||||
|
private void PanelObject_DragEnter(object sender, DragEventArgs e)
|
||||||
|
{
|
||||||
|
if (e.Data?.GetDataPresent(DataFormats.Text) ?? false)
|
||||||
|
{
|
||||||
|
e.Effect = DragDropEffects.Copy;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
e.Effect = DragDropEffects.None;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// Действия при приеме перетаскиваемой информации
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="sender"></param>
|
||||||
|
/// <param name="e"></param>
|
||||||
|
private void PanelObject_DragDrop(object sender, DragEventArgs e)
|
||||||
|
{
|
||||||
|
switch (e.Data?.GetData(DataFormats.Text).ToString())
|
||||||
|
{
|
||||||
|
case "labelSimpleObject":
|
||||||
|
_usta = new DrawningUsta((int)numericUpDownSpeed.Value,
|
||||||
|
(int)numericUpDownWeight.Value, Color.White, pictureBoxObject.Width,
|
||||||
|
pictureBoxObject.Height);
|
||||||
|
break;
|
||||||
|
case "labelModifiedObject":
|
||||||
|
_usta = new DrawningUstaBat((int)numericUpDownSpeed.Value,
|
||||||
|
(int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxBodyKit.Checked,
|
||||||
|
checkBoxPushka.Checked, pictureBoxObject.Width, pictureBoxObject.Height);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
DrawUsta();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Отправляем цвет с панели
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="sender"></param>
|
||||||
|
/// <param name="e"></param>
|
||||||
|
private void panelColor_MouseDown(object sender, MouseEventArgs e)
|
||||||
|
{
|
||||||
|
(sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
|
||||||
|
}
|
||||||
|
// TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта)
|
||||||
|
private void LabelBaseColor_DragDrop(object sender, DragEventArgs e)
|
||||||
|
{
|
||||||
|
if (_usta != null)
|
||||||
|
{
|
||||||
|
if (e.Data.GetDataPresent(typeof(Color)))
|
||||||
|
{
|
||||||
|
_usta.EntityUsta_.BodyColor = (Color)e.Data.GetData(typeof(Color));
|
||||||
|
|
||||||
|
}
|
||||||
|
DrawUsta();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void LabelColor_DragEnter(object sender, DragEventArgs e)
|
||||||
|
{
|
||||||
|
if (_usta != null && _usta.EntityUsta_ is EntityUstaBat 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 (_usta != null && _usta.EntityUsta_ is EntityUstaBat entityustabat)
|
||||||
|
{
|
||||||
|
if (e.Data.GetDataPresent(typeof(Color)))
|
||||||
|
{
|
||||||
|
entityustabat.AdditionalColor = (Color)e.Data.GetData(typeof(Color));
|
||||||
|
|
||||||
|
}
|
||||||
|
DrawUsta();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// Добавление установки
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="sender"></param>
|
||||||
|
/// <param name="e"></param>
|
||||||
|
private void ButtonOk_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
EventAddUsta?.Invoke(_usta);
|
||||||
|
Close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,120 @@
|
|||||||
|
<?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: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>
|
||||||
@ -10,7 +10,7 @@ using SelfPropelledArtilleryUnit.Drawnings;
|
|||||||
namespace SelfPropelledArtilleryUnit.MovementStrategy
|
namespace SelfPropelledArtilleryUnit.MovementStrategy
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Реализация интерфейса IDrawningObject для работы с объектом DrawningUsta (паттерн Adapter)
|
/// Реализация интерфейса IDrawningObject для работы с объектом DrawningCar (паттерн Adapter)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class DrawningObjectUsta : IMoveableObject
|
public class DrawningObjectUsta : IMoveableObject
|
||||||
{
|
{
|
||||||
@ -23,7 +23,7 @@ namespace SelfPropelledArtilleryUnit.MovementStrategy
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
if (_drawningUsta == null || _drawningUsta.EntityUsta ==
|
if (_drawningUsta == null || _drawningUsta.EntityUsta_ ==
|
||||||
null)
|
null)
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
@ -32,7 +32,7 @@ namespace SelfPropelledArtilleryUnit.MovementStrategy
|
|||||||
_drawningUsta.GetPosY, _drawningUsta.GetWidth, _drawningUsta.GetHeight);
|
_drawningUsta.GetPosY, _drawningUsta.GetWidth, _drawningUsta.GetHeight);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public int GetStep => (int)(_drawningUsta?.EntityUsta?.Step ?? 0);
|
public int GetStep => (int)(_drawningUsta?.EntityUsta_?.Step ?? 0);
|
||||||
public bool CheckCanMove(DirectionType direction) =>
|
public bool CheckCanMove(DirectionType direction) =>
|
||||||
_drawningUsta?.CanMove(direction) ?? false;
|
_drawningUsta?.CanMove(direction) ?? false;
|
||||||
public void MoveObject(DirectionType direction) =>
|
public void MoveObject(DirectionType direction) =>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user