Marselchii/PIbd-21_SagirovM.M_Liner_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Marselchii:lab5
Branches Tags
Marselchii:main Marselchii:lab8 Marselchii:lab7 Marselchii:lab6 Marselchii:lab5 Marselchii:lab4 Marselchii:lab3 Marselchii:lab2 Marselchii:lab1
..
compare: Marselchii:lab3
Branches Tags
Marselchii:lab8 Marselchii:lab7 Marselchii:lab6 Marselchii:lab5 Marselchii:lab4 Marselchii:lab3 Marselchii:lab2 Marselchii:lab1 Marselchii:main

1 Commits
lab5 ... lab3

Author SHA1 Message Date
Marselchi
3e892c6021 Какой-то косяк, без малейшего понятия откуда это 2023-11-24 12:56:39 +04:00
14 changed files with 101 additions and 1019 deletions
Expand all files Collapse all files

17
Liner/Drawing/DrawingBigLiner.cs
View File

@@ -19,12 +19,12 @@ namespace Liner.Drawing
/// <param name="deck">Признак наличия доп палубы</param>
/// <param name="width">Ширина картинки</param>
/// <param name="height">Высота картинки</param>
public DrawingBigLiner(int speed, double weight, Color bottomColor, Color bodyColor, bool swimmingPool, bool deck, int width, int height)
: base(speed,weight,bodyColor,width,height,100,80)
public DrawingBigLiner(int speed, double weight, Color bodyColor, Color bottomColor, bool swimmingPool, bool deck, int width, int height)
: base(speed,weight,bodyColor,bottomColor,width,height,100,80)
{
if(EntityLiner!= null)
{
EntityLiner = new EntityBigLiner(speed, weight,bottomColor, bodyColor, deck, swimmingPool);
EntityLiner = new EntityBigLiner(speed, weight, bodyColor, bottomColor, deck, swimmingPool);
}
}
@@ -41,8 +41,8 @@ namespace Liner.Drawing
}
Pen pen = new(Color.Black);
Brush poolBrush = new SolidBrush(Color.Blue);
Brush bottomBrush = new SolidBrush(liner.BottomColor);
Brush deckBrush = new SolidBrush(liner.BodyColor);
Brush bottomBrush = new SolidBrush(EntityLiner.BottomColor);
Brush deckBrush = new SolidBrush(EntityLiner.BodyColor);
// палуба
Point[] firstDeck = {new Point(_startPosX + 30, _startPosY), new Point(_startPosX + 30 + 60, _startPosY),
new Point(_startPosX + 30 + 60, _startPosY + 20), new Point(_startPosX + 30, _startPosY + 20)};
@@ -76,12 +76,5 @@ namespace Liner.Drawing
g.DrawPolygon(pen, bottom);//рисуем нижний корпус
if (liner.SwimmingPool) { g.FillPolygon(poolBrush, pool); }//рисуем бассейн
}
/// <summary>
/// установка цвета большого лайнера
/// </summary>
public void SetAddColor(Color color)
{
(EntityLiner as EntityBigLiner).BodyColor = color;
}
}
}

16
Liner/Drawing/DrawingLiner.cs
View File

@@ -63,32 +63,32 @@ namespace Liner.Drawing
/// </summary>
/// <param name="speed">Скорость</param>
/// <param name="weight">Вес лайнера</param>
/// <param name="bottomColor">Основной цвет</param>
/// <param name="bodyColor">Основной цвет</param>
/// <param name="width">Ширина картинки</param>
/// <param name="height">Высота картинки</param>
public DrawingLiner(int speed, double weight, Color bottomColor, int width, int height)
public DrawingLiner(int speed, double weight, Color bodyColor, Color bottomColor, int width, int height)
{
_pictureWidth = width;
_pictureHeight = height;
EntityLiner = new EntityLiner(speed, weight, bottomColor);
EntityLiner = new EntityLiner(speed, weight, bodyColor, bottomColor);
}
/// <summary>
/// Конструктор
/// </summary>
/// <param name="speed">Скорость</param>
/// <param name="weight">Вес лайнера</param>
/// <param name="bottomColor">Основной цвет</param>
/// <param name="bodyColor">Основной цвет</param>
/// <param name="width">Ширина картинки</param>
/// <param name="height">Высота картинки</param>
/// <param name="linerWidth">Ширина прорисовки лайнера</param>
/// <param name="linerHeight">Высота прорисовки лайнера</param>
protected DrawingLiner(int speed, double weight, Color bottomColor, int width, int height,int linerWidth,int linerHeight)
protected DrawingLiner(int speed, double weight, Color bodyColor, Color bottomColor, int width, int height,int linerWidth,int linerHeight)
{
_linerHeight = linerHeight;
_linerWidth = linerWidth;
_pictureWidth = width;
_pictureHeight = height;
EntityLiner = new EntityLiner(speed, weight, bottomColor);
EntityLiner = new EntityLiner(speed, weight, bodyColor, bottomColor);
}
/// <summary>
/// Установка позиции
@@ -113,8 +113,8 @@ namespace Liner.Drawing
return;
}
Pen pen = new(Color.Black);
Brush bottomBrush = new SolidBrush(EntityLiner.BottomColor);
Brush deckBrush = new SolidBrush(Color.Black);//черная палуба по умолчанию
Brush bottomBrush = new SolidBrush(EntityLiner.BottomColor);
Brush deckBrush = new SolidBrush(EntityLiner.BodyColor);
// палуба
Point[] firstDeck = {new Point(_startPosX + 30, _startPosY), new Point(_startPosX + 30 + 60, _startPosY),
new Point(_startPosX + 30 + 60, _startPosY + 20), new Point(_startPosX + 30, _startPosY + 20)};

7
Liner/Entities/EntityBigLiner.cs
View File

@@ -17,10 +17,6 @@ namespace Liner.Entities
/// </summary>
public bool Deck { get; private set; }
/// <summary>
/// Доп цвет
/// </summary>
public Color BodyColor { get; set; }
/// <summary>
/// Конструктор с параметрами
/// </summary>
/// <param name="speed">Скорость</param>
@@ -29,11 +25,10 @@ namespace Liner.Entities
/// <param name="bottomColor">Дополнительный цвет</param>
/// <param name="deck">Признак наличия доп палубы</param>
/// <param name="swimmingPool">Признак наличия бассейна</param>
public EntityBigLiner(int speed, double weight, Color bottomColor,Color bodyColor,bool deck, bool swimmingPool) : base(speed, weight, bottomColor)
public EntityBigLiner(int speed, double weight, Color bodyColor, Color bottomColor,bool deck, bool swimmingPool) : base(speed, weight, bodyColor,bottomColor)
{
Deck = deck;
SwimmingPool = swimmingPool;
BodyColor = bodyColor;
}
}
}

12
Liner/Entities/EntityLiner.cs
View File

@@ -20,7 +20,11 @@ namespace Liner.Entities
/// <summary>
/// Основной цвет
/// </summary>
public Color BottomColor { get; set; }
public Color BodyColor { get; private set; }
/// <summary>
/// Доп цвет
/// </summary>
public Color BottomColor { get; private set; }
/// <summary>
/// Шаг
/// </summary>
@@ -30,11 +34,13 @@ namespace Liner.Entities
/// </summary>
/// <param name="speed">Скорость</param>
/// <param name="weight">Вес лайнера</param>
/// <param name="bottomColor">Основной цвет</param>
public EntityLiner(int speed, double weight, Color bottomColor)
/// <param name="bodyColor">Основной цвет</param>
/// <param name="bottomColor">Доп цвет</param>
public EntityLiner(int speed, double weight, Color bodyColor, Color bottomColor)
{
Speed = speed;
Weight = weight;
BodyColor = bodyColor;
BottomColor = bottomColor;
}
}

78
Liner/FormLinerCollection.Designer.cs generated
View File

@@ -29,24 +29,17 @@
private void InitializeComponent()
{
groupBoxTools = new GroupBox();
Storages = new GroupBox();
listBoxStorages = new ListBox();
buttonDeleteSet = new Button();
textBoxStorageName = new TextBox();
buttonAddStorage = new Button();
buttonRefreshCollection = new Button();
buttonDeleteLiner = new Button();
textBoxNumber = new TextBox();
buttonAddLiner = new Button();
pictureBoxCollection = new PictureBox();
groupBoxTools.SuspendLayout();
Storages.SuspendLayout();
((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit();
SuspendLayout();
//
// groupBoxTools
//
groupBoxTools.Controls.Add(Storages);
groupBoxTools.Controls.Add(buttonRefreshCollection);
groupBoxTools.Controls.Add(buttonDeleteLiner);
groupBoxTools.Controls.Add(textBoxNumber);
@@ -58,92 +51,42 @@
groupBoxTools.TabStop = false;
groupBoxTools.Text = "Tools";
//
// Storages
//
Storages.Controls.Add(listBoxStorages);
Storages.Controls.Add(buttonDeleteSet);
Storages.Controls.Add(textBoxStorageName);
Storages.Controls.Add(buttonAddStorage);
Storages.Location = new Point(7, 19);
Storages.Name = "Storages";
Storages.Size = new Size(200, 276);
Storages.TabIndex = 4;
Storages.TabStop = false;
Storages.Text = "Sets";
//
// listBoxStorages
//
listBoxStorages.FormattingEnabled = true;
listBoxStorages.ItemHeight = 15;
listBoxStorages.Location = new Point(6, 113);
listBoxStorages.Name = "listBoxStorages";
listBoxStorages.Size = new Size(187, 109);
listBoxStorages.TabIndex = 4;
listBoxStorages.SelectedIndexChanged += ListBoxObjects_SelectedIndexChanged;
//
// buttonDeleteSet
//
buttonDeleteSet.Location = new Point(10, 228);
buttonDeleteSet.Name = "buttonDeleteSet";
buttonDeleteSet.Size = new Size(184, 30);
buttonDeleteSet.TabIndex = 3;
buttonDeleteSet.Text = "Delete Set";
buttonDeleteSet.UseVisualStyleBackColor = true;
buttonDeleteSet.Click += ButtonRemoveObject_Click;
//
// textBoxStorageName
//
textBoxStorageName.Location = new Point(34, 39);
textBoxStorageName.Name = "textBoxStorageName";
textBoxStorageName.Size = new Size(139, 23);
textBoxStorageName.TabIndex = 2;
//
// buttonAddStorage
//
buttonAddStorage.Location = new Point(10, 68);
buttonAddStorage.Name = "buttonAddStorage";
buttonAddStorage.Size = new Size(184, 30);
buttonAddStorage.TabIndex = 1;
buttonAddStorage.Text = "Add Set";
buttonAddStorage.UseVisualStyleBackColor = true;
buttonAddStorage.Click += ButtonAddObject_Click;
//
// buttonRefreshCollection
//
buttonRefreshCollection.Location = new Point(11, 501);
buttonRefreshCollection.Location = new Point(11, 258);
buttonRefreshCollection.Name = "buttonRefreshCollection";
buttonRefreshCollection.Size = new Size(194, 40);
buttonRefreshCollection.TabIndex = 3;
buttonRefreshCollection.Text = "Refresh Collection";
buttonRefreshCollection.UseVisualStyleBackColor = true;
buttonRefreshCollection.Click += ButtonRefreshCollection_Click;
buttonRefreshCollection.Click += buttonRefreshCollection_Click;
//
// buttonDeleteLiner
//
buttonDeleteLiner.Location = new Point(11, 408);
buttonDeleteLiner.Location = new Point(11, 117);
buttonDeleteLiner.Name = "buttonDeleteLiner";
buttonDeleteLiner.Size = new Size(194, 40);
buttonDeleteLiner.TabIndex = 2;
buttonDeleteLiner.Text = "Delete Liner";
buttonDeleteLiner.UseVisualStyleBackColor = true;
buttonDeleteLiner.Click += ButtonRemoveLiner_Click;
buttonDeleteLiner.Click += buttonRemoveLiner_Click;
//
// textBoxNumber
//
textBoxNumber.Location = new Point(41, 368);
textBoxNumber.Location = new Point(41, 77);
textBoxNumber.Name = "textBoxNumber";
textBoxNumber.Size = new Size(139, 23);
textBoxNumber.TabIndex = 1;
//
// buttonAddLiner
//
buttonAddLiner.Location = new Point(11, 313);
buttonAddLiner.Location = new Point(11, 22);
buttonAddLiner.Name = "buttonAddLiner";
buttonAddLiner.Size = new Size(194, 40);
buttonAddLiner.TabIndex = 0;
buttonAddLiner.Text = "Add Liner";
buttonAddLiner.UseVisualStyleBackColor = true;
buttonAddLiner.Click += ButtonAddLiner_Click;
buttonAddLiner.Click += buttonAddLiner_Click;
//
// pictureBoxCollection
//
@@ -164,8 +107,6 @@
Text = "Liner Collection";
groupBoxTools.ResumeLayout(false);
groupBoxTools.PerformLayout();
Storages.ResumeLayout(false);
Storages.PerformLayout();
((System.ComponentModel.ISupportInitialize)pictureBoxCollection).EndInit();
ResumeLayout(false);
}
@@ -178,10 +119,5 @@
private Button buttonRefreshCollection;
private Button buttonDeleteLiner;
private PictureBox pictureBoxCollection;
private GroupBox Storages;
private ListBox listBoxStorages;
private Button buttonDeleteSet;
private TextBox textBoxStorageName;
private Button buttonAddStorage;
}
}

149
Liner/FormLinerCollection.cs
View File

@@ -21,50 +21,35 @@ namespace Liner
/// <summary>
/// Набор объектов
/// </summary>
private readonly LinersGenericStorage _storage;
private readonly LinerGenericCollection<DrawingLiner, DrawingObjectLiner> _liners;
/// <summary>
/// Конструктор
/// </summary>
public FormLinerCollection()
{
InitializeComponent();
_storage = new LinersGenericStorage(pictureBoxCollection.Width, pictureBoxCollection.Height);
_liners = new LinerGenericCollection<DrawingLiner,
DrawingObjectLiner>(pictureBoxCollection.Width, pictureBoxCollection.Height);
}
/// <summary>
/// Добавление объекта в набор
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ButtonAddLiner_Click(object sender, EventArgs e)
private void buttonAddLiner_Click(object sender, EventArgs e)
{
if (listBoxStorages.SelectedIndex == -1)
MainScreen form = new();
if (form.ShowDialog() == DialogResult.OK)
{
return;
}
var formLinerConfig = new FormLinerConfig();
formLinerConfig.AddEvent(AddLiner);
formLinerConfig.Show();
}
private void AddLiner(DrawingLiner liner)
{
if (listBoxStorages.SelectedIndex == -1)
{
return;
}
var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
if (obj == null)
{
return;
}
if ((obj + liner) != -1)
{
MessageBox.Show("Объект добавлен");
pictureBoxCollection.Image = obj.ShowLiners();
}
else
{
MessageBox.Show("Не удалось добавить объект");
if (_liners + form.SelectedLiner != -1)
{
MessageBox.Show("Объект добавлен");
pictureBoxCollection.Image = _liners.ShowLiners();
}
else
{
MessageBox.Show("Не удалось добавить объект");
}
}
}
/// <summary>
@@ -72,37 +57,18 @@ namespace Liner
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ButtonRemoveLiner_Click(object sender, EventArgs e)
private void buttonRemoveLiner_Click(object sender, EventArgs e)
{
int pos;
if (listBoxStorages.SelectedIndex == -1)
{
return;
}
var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
if (obj == null)
{
return;
}
if (MessageBox.Show("Удалить объект?", "Удаление",
MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
{
return;
}
if (textBoxNumber.Text != "")
{
pos = Convert.ToInt32(textBoxNumber.Text);
}
else
{
MessageBox.Show("Не удалось удалить объект");
return;
}
pos = 0;
if (obj - pos)
int pos = Convert.ToInt32(textBoxNumber.Text);
if (_liners - pos)
{
MessageBox.Show("Объект удален");
pictureBoxCollection.Image = obj.ShowLiners();
pictureBoxCollection.Image = _liners.ShowLiners();
}
else
{
@@ -110,86 +76,13 @@ namespace Liner
}
}
/// <summary>
/// Добавление набора в коллекцию
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ButtonAddObject_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(textBoxStorageName.Text))
{
MessageBox.Show("Не все данные заполнены", "Ошибка",
MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
_storage.AddSet(textBoxStorageName.Text);
ReloadObjects();
}
/// <summary>
/// Выбор набора
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ListBoxObjects_SelectedIndexChanged(object sender, EventArgs e)
{
pictureBoxCollection.Image =
_storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowLiners();
}
/// <summary>
/// Удаление набора
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ButtonRemoveObject_Click(object sender, EventArgs e)
{
if (listBoxStorages.SelectedIndex == -1)
{
return;
}
if (MessageBox.Show($"Удалить объект {listBoxStorages.SelectedItem}?", "Удаление",
MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
_storage.DelSet(listBoxStorages.SelectedItem.ToString() ?? string.Empty);
ReloadObjects();
}
}
/// <summary>
/// Обновление рисунка по набору
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ButtonRefreshCollection_Click(object sender, EventArgs e)
private void buttonRefreshCollection_Click(object sender, EventArgs e)
{
if (listBoxStorages.SelectedIndex == -1)
{
return;
}
var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
if (obj == null)
{
return;
}
pictureBoxCollection.Image = obj.ShowLiners();
}
/// <summary>
/// Заполнение listBoxObjects
/// </summary>
private void ReloadObjects()
{
int index = listBoxStorages.SelectedIndex;
listBoxStorages.Items.Clear();
for (int i = 0; i < _storage.Keys.Count; i++)
{
listBoxStorages.Items.Add(_storage.Keys[i]);
}
if (listBoxStorages.Items.Count > 0 && (index == -1 || index >= listBoxStorages.Items.Count))
{
listBoxStorages.SelectedIndex = 0;
}
else if (listBoxStorages.Items.Count > 0 && index > -1 && index < listBoxStorages.Items.Count)
{
listBoxStorages.SelectedIndex = index;
}
pictureBoxCollection.Image = _liners.ShowLiners();
}
}
}

356
Liner/FormLinerConfig.Designer.cs generated
View File

@@ -1,356 +0,0 @@
namespace Liner
{
partial class FormLinerConfig
{
/// <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()
{
groupBoxParametrs = new GroupBox();
labelModifiedObject = new Label();
labelSimpleObject = new Label();
groupBoxColors = new GroupBox();
panelPurple = new Panel();
panelBlack = new Panel();
panelGray = new Panel();
panelWhite = new Panel();
panelYellow = new Panel();
panelBlue = new Panel();
panelGreen = new Panel();
panelRed = new Panel();
checkBoxDeck = new CheckBox();
checkBoxPool = new CheckBox();
numericUpDownWeight = new NumericUpDown();
numericUpDownSpeed = new NumericUpDown();
TextWeight = new Label();
TextSpeed = new Label();
panelObject = new Panel();
pictureBoxObject = new PictureBox();
labelAddColor = new Label();
labelMainColor = new Label();
buttonOk = new Button();
buttonCancel = new Button();
groupBoxParametrs.SuspendLayout();
groupBoxColors.SuspendLayout();
((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
panelObject.SuspendLayout();
((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
SuspendLayout();
//
// groupBoxParametrs
//
groupBoxParametrs.Controls.Add(labelModifiedObject);
groupBoxParametrs.Controls.Add(labelSimpleObject);
groupBoxParametrs.Controls.Add(groupBoxColors);
groupBoxParametrs.Controls.Add(checkBoxDeck);
groupBoxParametrs.Controls.Add(checkBoxPool);
groupBoxParametrs.Controls.Add(numericUpDownWeight);
groupBoxParametrs.Controls.Add(numericUpDownSpeed);
groupBoxParametrs.Controls.Add(TextWeight);
groupBoxParametrs.Controls.Add(TextSpeed);
groupBoxParametrs.Location = new Point(12, 12);
groupBoxParametrs.Name = "groupBoxParametrs";
groupBoxParametrs.Size = new Size(588, 307);
groupBoxParametrs.TabIndex = 0;
groupBoxParametrs.TabStop = false;
groupBoxParametrs.Text = "Parametrs";
//
// labelModifiedObject
//
labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
labelModifiedObject.Location = new Point(419, 241);
labelModifiedObject.Name = "labelModifiedObject";
labelModifiedObject.Size = new Size(120, 50);
labelModifiedObject.TabIndex = 8;
labelModifiedObject.Text = "Big";
labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
labelModifiedObject.MouseDown += LabelObject_MouseDown;
//
// labelSimpleObject
//
labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
labelSimpleObject.Location = new Point(278, 241);
labelSimpleObject.Name = "labelSimpleObject";
labelSimpleObject.Size = new Size(120, 50);
labelSimpleObject.TabIndex = 7;
labelSimpleObject.Text = "Small";
labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
labelSimpleObject.MouseDown += LabelObject_MouseDown;
//
// groupBoxColors
//
groupBoxColors.Controls.Add(panelPurple);
groupBoxColors.Controls.Add(panelBlack);
groupBoxColors.Controls.Add(panelGray);
groupBoxColors.Controls.Add(panelWhite);
groupBoxColors.Controls.Add(panelYellow);
groupBoxColors.Controls.Add(panelBlue);
groupBoxColors.Controls.Add(panelGreen);
groupBoxColors.Controls.Add(panelRed);
groupBoxColors.Location = new Point(244, 22);
groupBoxColors.Name = "groupBoxColors";
groupBoxColors.Size = new Size(338, 200);
groupBoxColors.TabIndex = 6;
groupBoxColors.TabStop = false;
groupBoxColors.Text = "Colors";
//
// panelPurple
//
panelPurple.BackColor = Color.Purple;
panelPurple.Location = new Point(248, 110);
panelPurple.Name = "panelPurple";
panelPurple.Size = new Size(57, 49);
panelPurple.TabIndex = 1;
//
// panelBlack
//
panelBlack.BackColor = Color.Black;
panelBlack.Location = new Point(175, 110);
panelBlack.Name = "panelBlack";
panelBlack.Size = new Size(57, 49);
panelBlack.TabIndex = 1;
//
// panelGray
//
panelGray.BackColor = Color.Gray;
panelGray.Location = new Point(97, 110);
panelGray.Name = "panelGray";
panelGray.Size = new Size(57, 49);
panelGray.TabIndex = 5;
//
// panelWhite
//
panelWhite.BackColor = Color.White;
panelWhite.Location = new Point(18, 110);
panelWhite.Name = "panelWhite";
panelWhite.Size = new Size(57, 49);
panelWhite.TabIndex = 4;
//
// panelYellow
//
panelYellow.BackColor = Color.Yellow;
panelYellow.Location = new Point(248, 22);
panelYellow.Name = "panelYellow";
panelYellow.Size = new Size(57, 49);
panelYellow.TabIndex = 3;
//
// panelBlue
//
panelBlue.BackColor = Color.Blue;
panelBlue.Location = new Point(175, 22);
panelBlue.Name = "panelBlue";
panelBlue.Size = new Size(57, 49);
panelBlue.TabIndex = 2;
//
// panelGreen
//
panelGreen.BackColor = Color.Green;
panelGreen.Location = new Point(97, 22);
panelGreen.Name = "panelGreen";
panelGreen.Size = new Size(57, 49);
panelGreen.TabIndex = 1;
//
// panelRed
//
panelRed.BackColor = Color.Red;
panelRed.Location = new Point(18, 22);
panelRed.Name = "panelRed";
panelRed.Size = new Size(57, 49);
panelRed.TabIndex = 0;
//
// checkBoxDeck
//
checkBoxDeck.AutoSize = true;
checkBoxDeck.Location = new Point(17, 162);
checkBoxDeck.Name = "checkBoxDeck";
checkBoxDeck.Size = new Size(110, 19);
checkBoxDeck.TabIndex = 5;
checkBoxDeck.Text = "Additional Deck";
checkBoxDeck.UseVisualStyleBackColor = true;
//
// checkBoxPool
//
checkBoxPool.AutoSize = true;
checkBoxPool.Location = new Point(17, 137);
checkBoxPool.Name = "checkBoxPool";
checkBoxPool.Size = new Size(110, 19);
checkBoxPool.TabIndex = 4;
checkBoxPool.Text = "Swimming pool";
checkBoxPool.UseVisualStyleBackColor = true;
//
// numericUpDownWeight
//
numericUpDownWeight.Location = new Point(81, 70);
numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
numericUpDownWeight.Name = "numericUpDownWeight";
numericUpDownWeight.Size = new Size(70, 23);
numericUpDownWeight.TabIndex = 3;
numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
//
// numericUpDownSpeed
//
numericUpDownSpeed.Location = new Point(81, 41);
numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
numericUpDownSpeed.Name = "numericUpDownSpeed";
numericUpDownSpeed.Size = new Size(70, 23);
numericUpDownSpeed.TabIndex = 2;
numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
//
// TextWeight
//
TextWeight.AutoSize = true;
TextWeight.Location = new Point(17, 73);
TextWeight.Name = "TextWeight";
TextWeight.Size = new Size(48, 15);
TextWeight.TabIndex = 1;
TextWeight.Text = "Weight:";
//
// TextSpeed
//
TextSpeed.AutoSize = true;
TextSpeed.Location = new Point(17, 43);
TextSpeed.Name = "TextSpeed";
TextSpeed.Size = new Size(42, 15);
TextSpeed.TabIndex = 0;
TextSpeed.Text = "Speed:";
//
// panelObject
//
panelObject.AllowDrop = true;
panelObject.Controls.Add(pictureBoxObject);
panelObject.Location = new Point(626, 56);
panelObject.Name = "panelObject";
panelObject.Size = new Size(325, 224);
panelObject.TabIndex = 1;
panelObject.DragDrop += PanelObject_DragDrop;
panelObject.DragEnter += PanelObject_DragEnter;
//
// pictureBoxObject
//
pictureBoxObject.Location = new Point(20, 6);
pictureBoxObject.Name = "pictureBoxObject";
pictureBoxObject.Size = new Size(292, 218);
pictureBoxObject.TabIndex = 11;
pictureBoxObject.TabStop = false;
//
// labelAddColor
//
labelAddColor.AllowDrop = true;
labelAddColor.BorderStyle = BorderStyle.FixedSingle;
labelAddColor.Location = new Point(801, 7);
labelAddColor.Name = "labelAddColor";
labelAddColor.Size = new Size(150, 46);
labelAddColor.TabIndex = 10;
labelAddColor.Text = "Additional Color";
labelAddColor.TextAlign = ContentAlignment.MiddleCenter;
labelAddColor.DragDrop += LabelColor_DragDrop;
labelAddColor.DragEnter += LabelColor_DragEnter;
//
// labelMainColor
//
labelMainColor.AllowDrop = true;
labelMainColor.BorderStyle = BorderStyle.FixedSingle;
labelMainColor.Location = new Point(626, 7);
labelMainColor.Name = "labelMainColor";
labelMainColor.Size = new Size(150, 46);
labelMainColor.TabIndex = 9;
labelMainColor.Text = "Main Color";
labelMainColor.TextAlign = ContentAlignment.MiddleCenter;
labelMainColor.DragDrop += LabelColor_DragDrop;
labelMainColor.DragEnter += LabelColor_DragEnter;
//
// buttonOk
//
buttonOk.Location = new Point(626, 290);
buttonOk.Name = "buttonOk";
buttonOk.Size = new Size(135, 29);
buttonOk.TabIndex = 2;
buttonOk.Text = "Add";
buttonOk.UseVisualStyleBackColor = true;
buttonOk.Click += ButtonOk_Click;
//
// buttonCancel
//
buttonCancel.Location = new Point(816, 290);
buttonCancel.Name = "buttonCancel";
buttonCancel.Size = new Size(135, 29);
buttonCancel.TabIndex = 3;
buttonCancel.Text = "Cancel";
buttonCancel.UseVisualStyleBackColor = true;
//
// FormLinerConfig
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(985, 331);
Controls.Add(buttonCancel);
Controls.Add(labelAddColor);
Controls.Add(buttonOk);
Controls.Add(panelObject);
Controls.Add(labelMainColor);
Controls.Add(groupBoxParametrs);
Name = "FormLinerConfig";
Text = "FormLinerConfig";
groupBoxParametrs.ResumeLayout(false);
groupBoxParametrs.PerformLayout();
groupBoxColors.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
panelObject.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
ResumeLayout(false);
}
#endregion
private GroupBox groupBoxParametrs;
private NumericUpDown numericUpDownWeight;
private NumericUpDown numericUpDownSpeed;
private Label TextWeight;
private Label TextSpeed;
private GroupBox groupBoxColors;
private Panel panelBlue;
private Panel panelGreen;
private Panel panelRed;
private CheckBox checkBoxDeck;
private CheckBox checkBoxPool;
private Panel panelPurple;
private Panel panelBlack;
private Panel panelGray;
private Panel panelWhite;
private Panel panelYellow;
private Label labelSimpleObject;
private Label labelModifiedObject;
private Panel panelObject;
private PictureBox pictureBoxObject;
private Label labelAddColor;
private Label labelMainColor;
private Button buttonOk;
private Button buttonCancel;
}
}

170
Liner/FormLinerConfig.cs
View File

@@ -1,170 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Reflection.Metadata.Ecma335;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using Liner.Drawing;
using Liner.Entities;
namespace Liner
{
/// <summary>
/// Форма создания объекта
/// </summary>
public partial class FormLinerConfig : Form
{
/// <summary>
/// Переменная-выбранная машина
/// </summary>
DrawingLiner? _liner = null;
/// <summary>
/// Событие
/// </summary>
private event Action<DrawingLiner>? EventAddLiner;
/// <summary>
/// Конструктор
/// </summary>
public FormLinerConfig()
{
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 += (s, a) => Close();
}
/// <summary>
/// Отрисовать лайнер
/// </summary>
private void DrawLiner()
{
Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
Graphics gr = Graphics.FromImage(bmp);
_liner?.SetPosition(15, 15);
_liner?.DrawTransport(gr);
pictureBoxObject.Image = bmp;
}
/// <summary>
/// Добавление события
/// </summary>
/// <param name="ev">Привязанный метод</param>
public void AddEvent(Action<DrawingLiner> ev)
{
if (EventAddLiner == null)
{
EventAddLiner = ev;
}
else
{
EventAddLiner += 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>
/// Передаем информацию при нажатии на Panel с цветом
/// </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);
}
/// <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":
_liner = new DrawingLiner((int)numericUpDownSpeed.Value,
(int)numericUpDownWeight.Value, Color.White, pictureBoxObject.Width,
pictureBoxObject.Height);
break;
case "labelModifiedObject":
_liner = new DrawingBigLiner((int)numericUpDownSpeed.Value,
(int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxPool.Checked,
checkBoxDeck.Checked, pictureBoxObject.Width, pictureBoxObject.Height);
break;
}
DrawLiner();
}
private void LabelColor_DragEnter(object sender, DragEventArgs e)
{
if (e.Data?.GetDataPresent(typeof(Color)) ?? false)
{
e.Effect = DragDropEffects.Copy;
}
else
{
e.Effect = DragDropEffects.None;
}
}
private void LabelColor_DragDrop(object sender, DragEventArgs e)
{
if (_liner == null)
{
return;
}
switch (((Label)sender).Name)
{
case "labelMainColor":
_liner.EntityLiner.BottomColor = (Color)e.Data.GetData(typeof(Color));
break;
case "labelAddColor":
if (!(_liner is DrawingBigLiner))
return;
(_liner as DrawingBigLiner).SetAddColor((Color)e.Data.GetData(typeof(Color)));
break;
}
DrawLiner();
}
/// <summary>
/// Добавление лайнера
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ButtonOk_Click(object sender, EventArgs e)
{
EventAddLiner?.Invoke(_liner);
Close();
}
}
}

120
Liner/FormLinerConfig.resx
View File

@@ -1,120 +0,0 @@
<?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>

15
Liner/Generics/LinerGenericCollection.cs
View File

@@ -72,7 +72,8 @@ namespace Liner.Generics
/// <returns></returns>
public static bool operator -(LinerGenericCollection<T, U> collect, int pos)
{
if (collect._collection[pos] != null)
T? obj = collect._collection.Get(pos);
if (obj != null)
{
collect._collection.Remove(pos);
return true;
@@ -86,7 +87,7 @@ namespace Liner.Generics
/// <returns></returns>
public U? GetU(int pos)
{
return (U?)_collection[pos]?.GetMoveableObject;
return (U?)_collection.Get(pos)?.GetMoveableObject;
}
/// <summary>
/// Вывод всего набора объектов
@@ -96,8 +97,8 @@ namespace Liner.Generics
{
Bitmap bmp = new(_pictureWidth, _pictureHeight);
Graphics gr = Graphics.FromImage(bmp);
DrawBackground(gr);
DrawObjects(gr);
DrawBackground(gr);
return bmp;
}
/// <summary>
@@ -123,12 +124,12 @@ namespace Liner.Generics
{
int iX = ((_pictureWidth / _placeSizeWidth) - 1) * _placeSizeWidth;
int iY = 0;
foreach (var liner in _collection.GetLiners())
for (int i = 0; i < _collection.Count; i++)
{
liner?.SetPosition(iX, iY);
liner?.DrawTransport(g);
_collection.Get(i)?.SetPosition(iX,iY);
_collection.Get(i)?.DrawTransport(g);
iX -= _placeSizeWidth;
if (iX < 0)
if(iX < 0)
{
iX = ((_pictureWidth / _placeSizeWidth) - 1) * _placeSizeWidth;
iY += _placeSizeHeight;

80
Liner/Generics/LinersGenericStorage.cs
View File

@@ -1,80 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Liner.Drawing;
using Liner.MovingStrategies;
namespace Liner.Generics
{
/// <summary>
/// Класс для хранения коллекции
/// </summary>
public class LinersGenericStorage
{
/// <summary>
/// Словарь (хранилище)
/// </summary>
readonly Dictionary<string, LinerGenericCollection<DrawingLiner, DrawingObjectLiner>> _linerStorages;
/// <summary>
/// Возвращение списка названий наборов
/// </summary>
public List<string> Keys => _linerStorages.Keys.ToList();
/// <summary>
/// Ширина окна отрисовки
/// </summary>
private readonly int _pictureWidth;
/// <summary>
/// Высота окна отрисовки
/// </summary>
private readonly int _pictureHeight;
/// <summary>
/// Конструктор
/// </summary>
/// <param name="pictureWidth"></param>
/// <param name="pictureHeight"></param>
public LinersGenericStorage(int pictureWidth, int pictureHeight)
{
_linerStorages = new Dictionary<string, LinerGenericCollection<DrawingLiner, DrawingObjectLiner>>();
_pictureWidth = pictureWidth;
_pictureHeight = pictureHeight;
}
/// <summary>
/// Добавление набора
/// </summary>
/// <param name="name">Название набора</param>
public void AddSet(string name)
{
if(_linerStorages.ContainsKey(name))
{
return;
}
_linerStorages.Add(name, new LinerGenericCollection<DrawingLiner, DrawingObjectLiner>(_pictureWidth,_pictureHeight));
}
/// <summary>
/// Удаление набора
/// </summary>
/// <param name="name">Название набора</param>
public void DelSet(string name)
{
if (_linerStorages.ContainsKey(name))
{
_linerStorages.Remove(name);
}
}
/// <summary>
/// Доступ к набору
/// </summary>
/// <param name="ind"></param>
/// <returns></returns>
public LinerGenericCollection<DrawingLiner, DrawingObjectLiner>? this[string ind]
{
get
{
if (_linerStorages.ContainsKey(ind)) { return _linerStorages[ind]; }
return null;
}
}
}
}

88
Liner/Generics/SetGeneric.cs
View File

@@ -16,23 +16,18 @@ namespace Liner.Generics
/// <summary>
/// Массив объектов, которые храним
/// </summary>
private readonly List<T?> _places;
private readonly T?[] _places;
/// <summary>
/// Количество объектов в массиве
/// </summary>
public int Count => _places.Capacity;
/// <summary>
/// Максимальное количество объектов в списке
/// </summary>
private readonly int _maxCount;
public int Count => _places.Length;
/// <summary>
/// Конструктор
/// </summary>
/// <param name="count"></param>
public SetGeneric(int count)
{
_maxCount = count;
_places = new List<T?>(count);
_places = new T?[count];
}
/// <summary>
/// Добавление объекта в набор
@@ -41,12 +36,22 @@ namespace Liner.Generics
/// <returns></returns>
public int Insert(T liner)
{
if (_places.Count + 1 <= _maxCount)
int nulli = 0;
while (_places[nulli] != null)
{
_places.Insert(0, liner);
return 0;
nulli++;
if(nulli == _places.Length)
{
return -1; // нет пустого места
}
}
return -1;
//сдвиг
for(int i = nulli; i > 0; i--)
{
_places[i] = _places[i - 1];
}
_places[0] = liner;
return 0;
}
/// <summary>
/// Добавление объекта в набор на конкретную позицию
@@ -56,12 +61,24 @@ namespace Liner.Generics
/// <returns></returns>
public int Insert(T liner, int position)
{
if (_places.Count + 1 <= _maxCount && _places.Count >= position)
if (position < 0 || position > _places.Length)
{
_places.Insert(position, liner);
return position;
return -1;
}
return -1;
if (_places[position] != null)
{
int nulli = position;
while (_places[nulli] != null)
{
nulli++;
if (nulli == _places.Length)
{
return -1; // нет пустого места
}
}
}
_places[position] = liner;
return position;
}
/// <summary>
/// Удаление объекта из набора с конкретной позиции
@@ -70,50 +87,25 @@ namespace Liner.Generics
/// <returns></returns>
public bool Remove(int position)
{
if(_places.Count > position && position >= 0)
if (position < 0 || position > _places.Length)
{
_places.RemoveAt(position);
return true;
return false;
}
return false;
_places[position] = null;
return true;
}
/// <summary>
/// Получение объекта из набора по позиции
/// </summary>
/// <param name="position"></param>
/// <returns></returns>
public T? this[int position]
public T? Get(int position)
{
get
if (position < 0 || position > _places.Length)
{
if (_places.Count > position && position >= 0)
{
return _places[position];
}
return null;
}
set
{
if(_places.Count + 1 <= _maxCount && position >= 0 && _places.Count > position)
{
_places[position] = value;
}
}
}
/// <summary>
/// Проход по списку
/// </summary>
/// <returns></returns>
public IEnumerable<T?> GetLiners(int? maxLiners = null)
{
for (int i = 0; i < _places.Count; ++i)
{
yield return _places[i];
if (maxLiners.HasValue && i == maxLiners.Value)
{
yield break;
}
}
return _places[position];
}
}
}

10
Liner/MainScreen.cs
View File

@@ -50,12 +50,8 @@ namespace Liner
Color mainColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
Color addColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
ColorDialog dialog = new();
if (dialog.ShowDialog() == DialogResult.OK)
{
addColor = dialog.Color;
}
_drawingLiner = new DrawingLiner(random.Next(100, 300),
random.Next(1000, 3000), mainColor,
random.Next(1000, 3000), mainColor, addColor,
pictureBoxLiner.Width, pictureBoxLiner.Height);
_drawingLiner.SetPosition(random.Next(10, 100), random.Next(10, 100));
Draw();
@@ -96,10 +92,6 @@ namespace Liner
{
addColor = dialog.Color;
}
if (dialog.ShowDialog() == DialogResult.OK)
{
mainColor = dialog.Color;
}
_drawingLiner = new DrawingBigLiner(random.Next(100, 300),
random.Next(1000, 3000), mainColor, addColor,
Convert.ToBoolean(random.Next(0, 2)),

2
Liner/Program.cs
View File

@@ -14,4 +14,4 @@ namespace Liner
Application.Run(new FormLinerCollection());
}
}
}
}