Compare commits
No commits in common. "a51a6a2102e61374708844f5e090ceea4a231b23" and "c7de4f3d1d481671374b4f138f9bafb469f35bcd" have entirely different histories.
a51a6a2102
...
c7de4f3d1d
356
WarmlyShip/WarmlyShip/FormLinerConfig.Designer.cs
generated
356
WarmlyShip/WarmlyShip/FormLinerConfig.Designer.cs
generated
@ -1,356 +0,0 @@
|
|||||||
namespace WarmlyShip
|
|
||||||
{
|
|
||||||
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()
|
|
||||||
{
|
|
||||||
this.groupBoxConfig = new System.Windows.Forms.GroupBox();
|
|
||||||
this.labelModifiedObject = new System.Windows.Forms.Label();
|
|
||||||
this.labelSimpleObject = new System.Windows.Forms.Label();
|
|
||||||
this.groupBoxColors = new System.Windows.Forms.GroupBox();
|
|
||||||
this.panelPurple = new System.Windows.Forms.Panel();
|
|
||||||
this.panelBlack = new System.Windows.Forms.Panel();
|
|
||||||
this.panelGray = new System.Windows.Forms.Panel();
|
|
||||||
this.panelWhite = new System.Windows.Forms.Panel();
|
|
||||||
this.panelYellow = new System.Windows.Forms.Panel();
|
|
||||||
this.panelBlue = new System.Windows.Forms.Panel();
|
|
||||||
this.panelGreen = new System.Windows.Forms.Panel();
|
|
||||||
this.panelRed = new System.Windows.Forms.Panel();
|
|
||||||
this.checkBoxDopDeck = new System.Windows.Forms.CheckBox();
|
|
||||||
this.checkBoxSwimmingPool = new System.Windows.Forms.CheckBox();
|
|
||||||
this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown();
|
|
||||||
this.labelWeight = new System.Windows.Forms.Label();
|
|
||||||
this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown();
|
|
||||||
this.labelSpeed = new System.Windows.Forms.Label();
|
|
||||||
this.pictureBoxObject = new System.Windows.Forms.PictureBox();
|
|
||||||
this.panelObject = new System.Windows.Forms.Panel();
|
|
||||||
this.button2 = new System.Windows.Forms.Button();
|
|
||||||
this.button1 = new System.Windows.Forms.Button();
|
|
||||||
this.labelDopColor = new System.Windows.Forms.Label();
|
|
||||||
this.labelBaseColor = new System.Windows.Forms.Label();
|
|
||||||
this.groupBoxConfig.SuspendLayout();
|
|
||||||
this.groupBoxColors.SuspendLayout();
|
|
||||||
((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit();
|
|
||||||
((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit();
|
|
||||||
((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
|
|
||||||
this.panelObject.SuspendLayout();
|
|
||||||
this.SuspendLayout();
|
|
||||||
//
|
|
||||||
// groupBoxConfig
|
|
||||||
//
|
|
||||||
this.groupBoxConfig.Controls.Add(this.labelModifiedObject);
|
|
||||||
this.groupBoxConfig.Controls.Add(this.labelSimpleObject);
|
|
||||||
this.groupBoxConfig.Controls.Add(this.groupBoxColors);
|
|
||||||
this.groupBoxConfig.Controls.Add(this.checkBoxDopDeck);
|
|
||||||
this.groupBoxConfig.Controls.Add(this.checkBoxSwimmingPool);
|
|
||||||
this.groupBoxConfig.Controls.Add(this.numericUpDownWeight);
|
|
||||||
this.groupBoxConfig.Controls.Add(this.labelWeight);
|
|
||||||
this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed);
|
|
||||||
this.groupBoxConfig.Controls.Add(this.labelSpeed);
|
|
||||||
this.groupBoxConfig.Location = new System.Drawing.Point(12, 12);
|
|
||||||
this.groupBoxConfig.Name = "groupBoxConfig";
|
|
||||||
this.groupBoxConfig.Size = new System.Drawing.Size(522, 204);
|
|
||||||
this.groupBoxConfig.TabIndex = 0;
|
|
||||||
this.groupBoxConfig.TabStop = false;
|
|
||||||
this.groupBoxConfig.Text = "Параметры";
|
|
||||||
//
|
|
||||||
// labelModifiedObject
|
|
||||||
//
|
|
||||||
this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
|
||||||
this.labelModifiedObject.Location = new System.Drawing.Point(419, 148);
|
|
||||||
this.labelModifiedObject.Name = "labelModifiedObject";
|
|
||||||
this.labelModifiedObject.Size = new System.Drawing.Size(86, 33);
|
|
||||||
this.labelModifiedObject.TabIndex = 8;
|
|
||||||
this.labelModifiedObject.Text = "Продвинутый";
|
|
||||||
this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
|
||||||
this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
|
|
||||||
//
|
|
||||||
// labelSimpleObject
|
|
||||||
//
|
|
||||||
this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
|
||||||
this.labelSimpleObject.Location = new System.Drawing.Point(321, 148);
|
|
||||||
this.labelSimpleObject.Name = "labelSimpleObject";
|
|
||||||
this.labelSimpleObject.Size = new System.Drawing.Size(92, 33);
|
|
||||||
this.labelSimpleObject.TabIndex = 7;
|
|
||||||
this.labelSimpleObject.Text = "Простой";
|
|
||||||
this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
|
||||||
this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
|
|
||||||
//
|
|
||||||
// groupBoxColors
|
|
||||||
//
|
|
||||||
this.groupBoxColors.Controls.Add(this.panelPurple);
|
|
||||||
this.groupBoxColors.Controls.Add(this.panelBlack);
|
|
||||||
this.groupBoxColors.Controls.Add(this.panelGray);
|
|
||||||
this.groupBoxColors.Controls.Add(this.panelWhite);
|
|
||||||
this.groupBoxColors.Controls.Add(this.panelYellow);
|
|
||||||
this.groupBoxColors.Controls.Add(this.panelBlue);
|
|
||||||
this.groupBoxColors.Controls.Add(this.panelGreen);
|
|
||||||
this.groupBoxColors.Controls.Add(this.panelRed);
|
|
||||||
this.groupBoxColors.Location = new System.Drawing.Point(321, 22);
|
|
||||||
this.groupBoxColors.Name = "groupBoxColors";
|
|
||||||
this.groupBoxColors.Size = new System.Drawing.Size(192, 115);
|
|
||||||
this.groupBoxColors.TabIndex = 6;
|
|
||||||
this.groupBoxColors.TabStop = false;
|
|
||||||
this.groupBoxColors.Text = "Цвета";
|
|
||||||
//
|
|
||||||
// panelPurple
|
|
||||||
//
|
|
||||||
this.panelPurple.BackColor = System.Drawing.Color.Purple;
|
|
||||||
this.panelPurple.Location = new System.Drawing.Point(144, 63);
|
|
||||||
this.panelPurple.Name = "panelPurple";
|
|
||||||
this.panelPurple.Size = new System.Drawing.Size(40, 40);
|
|
||||||
this.panelPurple.TabIndex = 6;
|
|
||||||
this.panelPurple.MouseDown += new System.Windows.Forms.MouseEventHandler(this.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(40, 40);
|
|
||||||
this.panelBlack.TabIndex = 1;
|
|
||||||
this.panelBlack.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
|
|
||||||
//
|
|
||||||
// panelGray
|
|
||||||
//
|
|
||||||
this.panelGray.BackColor = System.Drawing.Color.Gray;
|
|
||||||
this.panelGray.Location = new System.Drawing.Point(52, 63);
|
|
||||||
this.panelGray.Name = "panelGray";
|
|
||||||
this.panelGray.Size = new System.Drawing.Size(40, 40);
|
|
||||||
this.panelGray.TabIndex = 5;
|
|
||||||
this.panelGray.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
|
|
||||||
//
|
|
||||||
// panelWhite
|
|
||||||
//
|
|
||||||
this.panelWhite.BackColor = System.Drawing.Color.White;
|
|
||||||
this.panelWhite.Location = new System.Drawing.Point(6, 63);
|
|
||||||
this.panelWhite.Name = "panelWhite";
|
|
||||||
this.panelWhite.Size = new System.Drawing.Size(40, 40);
|
|
||||||
this.panelWhite.TabIndex = 4;
|
|
||||||
this.panelWhite.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
|
|
||||||
//
|
|
||||||
// panelYellow
|
|
||||||
//
|
|
||||||
this.panelYellow.BackColor = System.Drawing.Color.Yellow;
|
|
||||||
this.panelYellow.Location = new System.Drawing.Point(144, 17);
|
|
||||||
this.panelYellow.Name = "panelYellow";
|
|
||||||
this.panelYellow.Size = new System.Drawing.Size(40, 40);
|
|
||||||
this.panelYellow.TabIndex = 3;
|
|
||||||
this.panelYellow.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
|
|
||||||
//
|
|
||||||
// panelBlue
|
|
||||||
//
|
|
||||||
this.panelBlue.BackColor = System.Drawing.Color.Blue;
|
|
||||||
this.panelBlue.Location = new System.Drawing.Point(98, 17);
|
|
||||||
this.panelBlue.Name = "panelBlue";
|
|
||||||
this.panelBlue.Size = new System.Drawing.Size(40, 40);
|
|
||||||
this.panelBlue.TabIndex = 2;
|
|
||||||
this.panelBlue.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
|
|
||||||
//
|
|
||||||
// panelGreen
|
|
||||||
//
|
|
||||||
this.panelGreen.BackColor = System.Drawing.Color.Green;
|
|
||||||
this.panelGreen.Location = new System.Drawing.Point(52, 17);
|
|
||||||
this.panelGreen.Name = "panelGreen";
|
|
||||||
this.panelGreen.Size = new System.Drawing.Size(40, 40);
|
|
||||||
this.panelGreen.TabIndex = 1;
|
|
||||||
this.panelGreen.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
|
|
||||||
//
|
|
||||||
// panelRed
|
|
||||||
//
|
|
||||||
this.panelRed.BackColor = System.Drawing.Color.Red;
|
|
||||||
this.panelRed.Location = new System.Drawing.Point(6, 17);
|
|
||||||
this.panelRed.Name = "panelRed";
|
|
||||||
this.panelRed.Size = new System.Drawing.Size(40, 40);
|
|
||||||
this.panelRed.TabIndex = 0;
|
|
||||||
this.panelRed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
|
|
||||||
//
|
|
||||||
// checkBoxDopDeck
|
|
||||||
//
|
|
||||||
this.checkBoxDopDeck.AutoSize = true;
|
|
||||||
this.checkBoxDopDeck.Location = new System.Drawing.Point(15, 144);
|
|
||||||
this.checkBoxDopDeck.Name = "checkBoxDopDeck";
|
|
||||||
this.checkBoxDopDeck.Size = new System.Drawing.Size(264, 19);
|
|
||||||
this.checkBoxDopDeck.TabIndex = 5;
|
|
||||||
this.checkBoxDopDeck.Text = "Признак наличия дополнительной палубы";
|
|
||||||
this.checkBoxDopDeck.UseVisualStyleBackColor = true;
|
|
||||||
//
|
|
||||||
// checkBoxSwimmingPool
|
|
||||||
//
|
|
||||||
this.checkBoxSwimmingPool.AutoSize = true;
|
|
||||||
this.checkBoxSwimmingPool.Location = new System.Drawing.Point(15, 109);
|
|
||||||
this.checkBoxSwimmingPool.Name = "checkBoxSwimmingPool";
|
|
||||||
this.checkBoxSwimmingPool.Size = new System.Drawing.Size(177, 19);
|
|
||||||
this.checkBoxSwimmingPool.TabIndex = 4;
|
|
||||||
this.checkBoxSwimmingPool.Text = "Признак наличия бассейна";
|
|
||||||
this.checkBoxSwimmingPool.UseVisualStyleBackColor = true;
|
|
||||||
//
|
|
||||||
// numericUpDownWeight
|
|
||||||
//
|
|
||||||
this.numericUpDownWeight.Location = new System.Drawing.Point(74, 64);
|
|
||||||
this.numericUpDownWeight.Name = "numericUpDownWeight";
|
|
||||||
this.numericUpDownWeight.Size = new System.Drawing.Size(120, 23);
|
|
||||||
this.numericUpDownWeight.TabIndex = 3;
|
|
||||||
//
|
|
||||||
// labelWeight
|
|
||||||
//
|
|
||||||
this.labelWeight.AutoSize = true;
|
|
||||||
this.labelWeight.Location = new System.Drawing.Point(15, 64);
|
|
||||||
this.labelWeight.Name = "labelWeight";
|
|
||||||
this.labelWeight.Size = new System.Drawing.Size(29, 15);
|
|
||||||
this.labelWeight.TabIndex = 2;
|
|
||||||
this.labelWeight.Text = "Вес:";
|
|
||||||
//
|
|
||||||
// numericUpDownSpeed
|
|
||||||
//
|
|
||||||
this.numericUpDownSpeed.Location = new System.Drawing.Point(74, 28);
|
|
||||||
this.numericUpDownSpeed.Name = "numericUpDownSpeed";
|
|
||||||
this.numericUpDownSpeed.Size = new System.Drawing.Size(120, 23);
|
|
||||||
this.numericUpDownSpeed.TabIndex = 1;
|
|
||||||
//
|
|
||||||
// labelSpeed
|
|
||||||
//
|
|
||||||
this.labelSpeed.AutoSize = true;
|
|
||||||
this.labelSpeed.Location = new System.Drawing.Point(6, 30);
|
|
||||||
this.labelSpeed.Name = "labelSpeed";
|
|
||||||
this.labelSpeed.Size = new System.Drawing.Size(62, 15);
|
|
||||||
this.labelSpeed.TabIndex = 0;
|
|
||||||
this.labelSpeed.Text = "Скорость:";
|
|
||||||
//
|
|
||||||
// pictureBoxObject
|
|
||||||
//
|
|
||||||
this.pictureBoxObject.Location = new System.Drawing.Point(14, 48);
|
|
||||||
this.pictureBoxObject.Name = "pictureBoxObject";
|
|
||||||
this.pictureBoxObject.Size = new System.Drawing.Size(192, 105);
|
|
||||||
this.pictureBoxObject.TabIndex = 1;
|
|
||||||
this.pictureBoxObject.TabStop = false;
|
|
||||||
//
|
|
||||||
// panelObject
|
|
||||||
//
|
|
||||||
this.panelObject.AllowDrop = true;
|
|
||||||
this.panelObject.Controls.Add(this.button2);
|
|
||||||
this.panelObject.Controls.Add(this.button1);
|
|
||||||
this.panelObject.Controls.Add(this.labelDopColor);
|
|
||||||
this.panelObject.Controls.Add(this.labelBaseColor);
|
|
||||||
this.panelObject.Controls.Add(this.pictureBoxObject);
|
|
||||||
this.panelObject.Location = new System.Drawing.Point(540, 12);
|
|
||||||
this.panelObject.Name = "panelObject";
|
|
||||||
this.panelObject.Size = new System.Drawing.Size(220, 204);
|
|
||||||
this.panelObject.TabIndex = 2;
|
|
||||||
this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop);
|
|
||||||
this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter);
|
|
||||||
this.panelObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
|
|
||||||
//
|
|
||||||
// button2
|
|
||||||
//
|
|
||||||
this.button2.Location = new System.Drawing.Point(112, 159);
|
|
||||||
this.button2.Name = "button2";
|
|
||||||
this.button2.Size = new System.Drawing.Size(75, 23);
|
|
||||||
this.button2.TabIndex = 5;
|
|
||||||
this.button2.Text = "Отмена";
|
|
||||||
this.button2.UseVisualStyleBackColor = true;
|
|
||||||
//
|
|
||||||
// button1
|
|
||||||
//
|
|
||||||
this.button1.Location = new System.Drawing.Point(31, 159);
|
|
||||||
this.button1.Name = "button1";
|
|
||||||
this.button1.Size = new System.Drawing.Size(75, 23);
|
|
||||||
this.button1.TabIndex = 4;
|
|
||||||
this.button1.Text = "Добавить";
|
|
||||||
this.button1.UseVisualStyleBackColor = true;
|
|
||||||
//
|
|
||||||
// labelDopColor
|
|
||||||
//
|
|
||||||
this.labelDopColor.AllowDrop = true;
|
|
||||||
this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
|
||||||
this.labelDopColor.Location = new System.Drawing.Point(114, 12);
|
|
||||||
this.labelDopColor.Name = "labelDopColor";
|
|
||||||
this.labelDopColor.Size = new System.Drawing.Size(92, 33);
|
|
||||||
this.labelDopColor.TabIndex = 3;
|
|
||||||
this.labelDopColor.Text = "Доп.цвет";
|
|
||||||
this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
|
||||||
//
|
|
||||||
// labelBaseColor
|
|
||||||
//
|
|
||||||
this.labelBaseColor.AllowDrop = true;
|
|
||||||
this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
|
||||||
this.labelBaseColor.Location = new System.Drawing.Point(14, 12);
|
|
||||||
this.labelBaseColor.Name = "labelBaseColor";
|
|
||||||
this.labelBaseColor.Size = new System.Drawing.Size(92, 33);
|
|
||||||
this.labelBaseColor.TabIndex = 2;
|
|
||||||
this.labelBaseColor.Text = "Цвет";
|
|
||||||
this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
|
||||||
this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter);
|
|
||||||
//
|
|
||||||
// FormLinerConfig
|
|
||||||
//
|
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
|
||||||
this.ClientSize = new System.Drawing.Size(800, 230);
|
|
||||||
this.Controls.Add(this.panelObject);
|
|
||||||
this.Controls.Add(this.groupBoxConfig);
|
|
||||||
this.Name = "FormLinerConfig";
|
|
||||||
this.Text = "Создание объекта";
|
|
||||||
this.groupBoxConfig.ResumeLayout(false);
|
|
||||||
this.groupBoxConfig.PerformLayout();
|
|
||||||
this.groupBoxColors.ResumeLayout(false);
|
|
||||||
((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit();
|
|
||||||
((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit();
|
|
||||||
((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit();
|
|
||||||
this.panelObject.ResumeLayout(false);
|
|
||||||
this.ResumeLayout(false);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
private GroupBox groupBoxConfig;
|
|
||||||
private Label labelWeight;
|
|
||||||
private NumericUpDown numericUpDownSpeed;
|
|
||||||
private Label labelSpeed;
|
|
||||||
private NumericUpDown numericUpDownWeight;
|
|
||||||
private CheckBox checkBoxDopDeck;
|
|
||||||
private CheckBox checkBoxSwimmingPool;
|
|
||||||
private GroupBox groupBoxColors;
|
|
||||||
private Panel panelPurple;
|
|
||||||
private Panel panelBlack;
|
|
||||||
private Panel panelGray;
|
|
||||||
private Panel panelWhite;
|
|
||||||
private Panel panelYellow;
|
|
||||||
private Panel panelBlue;
|
|
||||||
private Panel panelGreen;
|
|
||||||
private Panel panelRed;
|
|
||||||
private Label labelModifiedObject;
|
|
||||||
private Label labelSimpleObject;
|
|
||||||
private PictureBox pictureBoxObject;
|
|
||||||
private Panel panelObject;
|
|
||||||
private Label labelDopColor;
|
|
||||||
private Label labelBaseColor;
|
|
||||||
private Button button2;
|
|
||||||
private Button button1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,174 +0,0 @@
|
|||||||
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;
|
|
||||||
|
|
||||||
namespace WarmlyShip
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Форма создания объекта
|
|
||||||
/// </summary>
|
|
||||||
public partial class FormLinerConfig : Form
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Переменная-выбранная машина
|
|
||||||
/// </summary>
|
|
||||||
DrawningShip _ship = null;
|
|
||||||
/// <summary>
|
|
||||||
/// Событие
|
|
||||||
/// </summary>
|
|
||||||
private event ShipDelegate EventAddShip;
|
|
||||||
/// <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;
|
|
||||||
|
|
||||||
// TODO buttonCancel.Click with lambda
|
|
||||||
|
|
||||||
}
|
|
||||||
/// <summary>
|
|
||||||
/// Отрисовать машину
|
|
||||||
/// </summary>
|
|
||||||
private void DrawLiner()
|
|
||||||
{
|
|
||||||
Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
|
|
||||||
Graphics gr = Graphics.FromImage(bmp);
|
|
||||||
_ship?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height);
|
|
||||||
_ship?.DrawTransport(gr);
|
|
||||||
pictureBoxObject.Image = bmp;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Добавление события
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="ev"></param>
|
|
||||||
public void AddEvent(ShipDelegate ev)
|
|
||||||
{
|
|
||||||
if (EventAddShip == null)
|
|
||||||
{
|
|
||||||
EventAddShip = new ShipDelegate(ev);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
EventAddShip += 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"></par
|
|
||||||
private void PanelObject_DragEnter(object sender, DragEventArgs e)
|
|
||||||
{
|
|
||||||
if (e.Data.GetDataPresent(DataFormats.Text))
|
|
||||||
{
|
|
||||||
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":
|
|
||||||
_ship = new DrawningShip((int)numericUpDownSpeed.Value,
|
|
||||||
(int)numericUpDownWeight.Value, Color.White);
|
|
||||||
break;
|
|
||||||
case "labelModifiedObject":
|
|
||||||
_ship = new DrawningLiner((int)numericUpDownSpeed.Value,
|
|
||||||
(int)numericUpDownWeight.Value, Color.White, Color.Black,
|
|
||||||
checkBoxSwimmingPool.Checked, checkBoxDopDeck.Checked);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
DrawLiner();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Отправляем цвет с панели
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="sender"></param>
|
|
||||||
/// <param name="e"></param>
|
|
||||||
private void PanelColor_MouseDown(object sender, MouseEventArgs e)
|
|
||||||
{
|
|
||||||
(sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
|
|
||||||
}
|
|
||||||
/// <summary>
|
|
||||||
/// Проверка получаемой информации (ее типа на соответствие требуемому)
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="sender"></param>
|
|
||||||
/// <param name="e"></param>
|
|
||||||
private void LabelBaseColor_DragEnter(object sender, DragEventArgs e)
|
|
||||||
{
|
|
||||||
if (e.Data.GetDataPresent(typeof(Color)))
|
|
||||||
{
|
|
||||||
e.Effect = DragDropEffects.Copy;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
e.Effect = DragDropEffects.None;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/// <summary>
|
|
||||||
/// Принимаем основной цвет
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="sender"></param>
|
|
||||||
/// <param name="e"></param>
|
|
||||||
private void LabelBaseColor_DragDrop(object sender, DragEventArgs e)
|
|
||||||
{
|
|
||||||
// TODO Call method from object _car and set color
|
|
||||||
}
|
|
||||||
/// <summary>
|
|
||||||
/// Принимаем дополнительный цвет
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="sender"></param>
|
|
||||||
/// <param name="e"></param>
|
|
||||||
private void LabelDopColor_DragDrop(object sender, DragEventArgs e)
|
|
||||||
{
|
|
||||||
// TODO Call method from object _car if _car is DrawningSportCar and set dop color
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Добавление машины
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="sender"></param>
|
|
||||||
/// <param name="e"></param>
|
|
||||||
private void ButtonOk_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
EventAddShip?.Invoke(_ship);
|
|
||||||
Close();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,60 +0,0 @@
|
|||||||
<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>
|
|
||||||
@ -26,6 +26,13 @@ namespace WarmlyShip
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private readonly MapsCollection _mapsCollection;
|
private readonly MapsCollection _mapsCollection;
|
||||||
|
|
||||||
|
|
||||||
|
///// <summary>
|
||||||
|
///// Объект от класса карты с набором объектов
|
||||||
|
///// </summary>
|
||||||
|
//private MapWithSetWarmlyShipGeneric<DrawningObjectShip, AbstractMap> _mapWarmlyShipCollectionGeneric;
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Конструктор
|
/// Конструктор
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -89,6 +96,35 @@ namespace WarmlyShip
|
|||||||
pictureBox1.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
|
pictureBox1.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
///// <summary>
|
||||||
|
///// Выбор карты
|
||||||
|
///// </summary>
|
||||||
|
///// <param name="sender"></param>
|
||||||
|
///// <param name="e"></param>
|
||||||
|
//private void ComboBoxSelectorShip_SelectedIndexChanged(object sender, EventArgs e)
|
||||||
|
//{
|
||||||
|
// AbstractMap map = null;
|
||||||
|
// switch (comboBoxSelectorMap.Text)
|
||||||
|
// {
|
||||||
|
// case "Простая карта":
|
||||||
|
// map = new SimpleMap();
|
||||||
|
// break;
|
||||||
|
// case "Море":
|
||||||
|
// map = new MyMap();
|
||||||
|
// break;
|
||||||
|
// }
|
||||||
|
// if (map != null)
|
||||||
|
// {
|
||||||
|
// _mapWarmlyShipCollectionGeneric = new MapWithSetWarmlyShipGeneric<DrawningObjectShip, AbstractMap>(
|
||||||
|
// pictureBox1.Width, pictureBox1.Height, map);
|
||||||
|
// }
|
||||||
|
// else
|
||||||
|
// {
|
||||||
|
// _mapWarmlyShipCollectionGeneric = null;
|
||||||
|
// }
|
||||||
|
|
||||||
|
//}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Удаление карты
|
/// Удаление карты
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -113,9 +149,24 @@ namespace WarmlyShip
|
|||||||
/// <param name="e"></param>
|
/// <param name="e"></param>
|
||||||
private void ButtonAddShip_Click(object sender, EventArgs e)
|
private void ButtonAddShip_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var formCarConfig = new FormLinerConfig();
|
if (listBoxMaps.SelectedIndex == -1)
|
||||||
// TODO Call method AddEvent from formCarConfig
|
{
|
||||||
formCarConfig.Show();
|
return;
|
||||||
|
}
|
||||||
|
FormShip form = new();
|
||||||
|
if (form.ShowDialog() == DialogResult.OK)
|
||||||
|
{
|
||||||
|
DrawningObjectShip ship = new(form.SelectedShip);
|
||||||
|
if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + ship!=null)
|
||||||
|
{
|
||||||
|
MessageBox.Show("Объект добавлен");
|
||||||
|
pictureBox1.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
MessageBox.Show("Не удалось добавить объект");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,15 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace WarmlyShip
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Делегат для передачи объекта-автомобиля
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="ship"></param>
|
|
||||||
public delegate void ShipDelegate(DrawningShip Ship);
|
|
||||||
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user