Kristina/ISEbd-22_Musatkina_K._Y._Speedboat_Base
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

зафиксировать всё

Browse Source
This commit is contained in:
Учебный 2023-11-13 12:43:26 +04:00
parent 7fba21da0d
commit 2c4b38c0c3
3 changed files with 14 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningMotorBoat.cs
View File

@ -33,16 +33,16 @@ namespace ProjectBoat_bae.DrawningObjects
} }
Pen pen = new(Color.Black); Pen pen = new(Color.Black);
Brush additionalBrush = new SolidBrush(Boat.AdditionalColor); Brush additionalBrush = new SolidBrush(Boat.AdditionalColor);
Brush br = new SolidBrush(EntityBoat.BodyColor); Brush brr = new SolidBrush(EntityBoat.BodyColor);
Brush brRed = new SolidBrush(EntityBoat.BodyColor);
Brush brBlue = new SolidBrush(Color.LightBlue);
if (Boat.Body) if (Boat.Wing)
{ {
//вёсла //вёсла
g.FillRectangle(brRed, _startPosX + 35, _startPosY - 5, 5, 65); g.FillRectangle(additionalBrush, _startPosX + 35, _startPosY - 5, 5, 65);
g.FillRectangle(brRed, _startPosX + 28, _startPosY + 60, 12, 8); g.FillRectangle(additionalBrush, _startPosX + 28, _startPosY + 60, 12, 8);
g.FillRectangle(brRed, _startPosX + 28, _startPosY - 5, 12, 8); g.FillRectangle(additionalBrush, _startPosX + 28, _startPosY - 5, 12, 8);
//флаг
} }
base.DrawTransport(g); base.DrawTransport(g);
} }

18
ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.Designer.cs generated
View File

@ -30,7 +30,6 @@
{ {
pictureBoxObject = new PictureBox(); pictureBoxObject = new PictureBox();
groupBoxBoat = new GroupBox(); groupBoxBoat = new GroupBox();
checkBox1 = new CheckBox();
labelModifiedObject = new Label(); labelModifiedObject = new Label();
labelSimpleObject = new Label(); labelSimpleObject = new Label();
groupBoxColors = new GroupBox(); groupBoxColors = new GroupBox();
@ -72,7 +71,6 @@
// //
// groupBoxBoat // groupBoxBoat
// //
groupBoxBoat.Controls.Add(checkBox1);
groupBoxBoat.Controls.Add(labelModifiedObject); groupBoxBoat.Controls.Add(labelModifiedObject);
groupBoxBoat.Controls.Add(labelSimpleObject); groupBoxBoat.Controls.Add(labelSimpleObject);
groupBoxBoat.Controls.Add(groupBoxColors); groupBoxBoat.Controls.Add(groupBoxColors);
@ -89,16 +87,6 @@
groupBoxBoat.TabStop = false; groupBoxBoat.TabStop = false;
groupBoxBoat.Text = "Параметры"; groupBoxBoat.Text = "Параметры";
// //
// checkBox1
//
checkBox1.AutoSize = true;
checkBox1.Location = new Point(21, 236);
checkBox1.Name = "checkBox1";
checkBox1.Size = new Size(230, 29);
checkBox1.TabIndex = 12;
checkBox1.Text = "Признак наличия весел";
checkBox1.UseVisualStyleBackColor = true;
//
// labelModifiedObject // labelModifiedObject
// //
labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
@ -197,6 +185,7 @@
// //
// panelRed // panelRed
// //
panelRed.AllowDrop = true;
panelRed.BackColor = Color.FromArgb(192, 0, 0); panelRed.BackColor = Color.FromArgb(192, 0, 0);
panelRed.Location = new Point(17, 45); panelRed.Location = new Point(17, 45);
panelRed.Name = "panelRed"; panelRed.Name = "panelRed";
@ -285,6 +274,8 @@
LabelAdditionalColor.Size = new Size(93, 27); LabelAdditionalColor.Size = new Size(93, 27);
LabelAdditionalColor.TabIndex = 1; LabelAdditionalColor.TabIndex = 1;
LabelAdditionalColor.Text = "Доп. цвет"; LabelAdditionalColor.Text = "Доп. цвет";
LabelAdditionalColor.DragDrop += LabelAdditionalColor_DragDrop;
LabelAdditionalColor.DragEnter += LabelAdditionalColor_DragEnter;
// //
// LabelColor // LabelColor
// //
@ -296,6 +287,8 @@
LabelColor.Size = new Size(53, 27); LabelColor.Size = new Size(53, 27);
LabelColor.TabIndex = 0; LabelColor.TabIndex = 0;
LabelColor.Text = "Цвет"; LabelColor.Text = "Цвет";
LabelColor.DragDrop += LabelColor_DragDrop;
LabelColor.DragEnter += LabelColor_DragEnter;
// //
// buttonOk // buttonOk
// //
@ -365,6 +358,5 @@
private Label LabelAdditionalColor; private Label LabelAdditionalColor;
private Label LabelColor; private Label LabelColor;
private PictureBox pictureBox1; private PictureBox pictureBox1;
private CheckBox checkBox1;
} }
} }

25
ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs
View File

@ -83,28 +83,14 @@ namespace ProjectBoat_bae
// Действия при приеме перетаскиваемой информации // Действия при приеме перетаскиваемой информации
private void PanelObject_DragDrop(object sender, DragEventArgs e) private void PanelObject_DragDrop(object sender, DragEventArgs e)
{ {
//switch (e.Data?.GetData(DataFormats.Text).ToString())
//{
// case "labelSimpleObject":
// _boat = new Drawningboat((int)numericUpDownSpeed.Value,
// (int)numericUpDownWeight.Value, Color.White, pictureBoxObject.Width, pictureBoxObject.Height);
// break;
// case "labelModifiedObject":
// _boat = new DrawningMotorBoat((int)numericUpDownSpeed.Value,
// (int)numericUpDownWeight.Value, Color.White, Color.Black,
// checkBoxBoat.Checked, checkBoxBoat.Checked, pictureBoxObject.Width, pictureBoxObject.Height);
// break;
//}
//LabelColor.BackColor = Color.Empty;
//LabelAdditionalColor.BackColor = Color.Empty;
//DrawBoat();
switch (e.Data?.GetData(DataFormats.Text).ToString()) switch (e.Data?.GetData(DataFormats.Text).ToString())
{ {
case "labelSimpleObject": case "labelSimpleObject":
_boat = new Drawningboat((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, pictureBoxObject.Width, pictureBoxObject.Height); _boat = new Drawningboat((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, pictureBoxObject.Width, pictureBoxObject.Height);
break; break;
case "labelModifiedObject": case "labelModifiedObject":
_boat = new DrawningMotorBoat((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxBoat.Checked, checkBox1.Checked, pictureBoxObject.Width, pictureBoxObject.Height); _boat = new DrawningMotorBoat((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black,
checkBoxBoat.Checked, checkBoxBoat.Checked, pictureBoxObject.Width, pictureBoxObject.Height);
break; break;
} }
LabelColor.BackColor = Color.Empty; LabelColor.BackColor = Color.Empty;
@ -112,13 +98,6 @@ namespace ProjectBoat_bae
DrawBoat(); DrawBoat();
} }
//// Добавление установки
//private void buttonOk_Click(object sender, EventArgs e)
//{
// EventAddBoat?.Invoke(_boat);
// Close();
//}
// Отправляем цвет с панели // Отправляем цвет с панели
private void PanelColor_MouseDown(object sender, MouseEventArgs e) private void PanelColor_MouseDown(object sender, MouseEventArgs e)
{ {