1 lab

DoubleDeckerBus.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34024.191
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DoubleDeckerBus", "DoubleDeckerBus.csproj", "{2AA7FB83-8FC3-451D-B277-158CCA4DAE44}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DoubleDeckerBus\DoubleDeckerBus", "DoubleDeckerBus\DoubleDeckerBus.csproj", "{2AA7FB83-8FC3-451D-B277-158CCA4DAE44}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

DoubleDeckerBus/DDBus.Designer.cs

@@ -0,0 +1,138 @@
+namespace DoubleDeckerBus
+{
+    partial class DDBus
+    {
+        /// <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()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DDBus));
+            this.pictureBoxBus = new System.Windows.Forms.PictureBox();
+            this.buttonCreate = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.buttonRight = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // pictureBoxBus
+            // 
+            this.pictureBoxBus.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBoxBus.Location = new System.Drawing.Point(0, 0);
+            this.pictureBoxBus.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.pictureBoxBus.Name = "pictureBoxBus";
+            this.pictureBoxBus.Size = new System.Drawing.Size(1010, 615);
+            this.pictureBoxBus.TabIndex = 1;
+            this.pictureBoxBus.TabStop = false;
+            // 
+            // buttonCreate
+            // 
+            this.buttonCreate.Location = new System.Drawing.Point(14, 541);
+            this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonCreate.Name = "buttonCreate";
+            this.buttonCreate.Size = new System.Drawing.Size(95, 57);
+            this.buttonCreate.TabIndex = 2;
+            this.buttonCreate.Text = "Создать";
+            this.buttonCreate.UseVisualStyleBackColor = true;
+            this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
+            // 
+            // buttonUp
+            // 
+            this.buttonUp.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("buttonUp.BackgroundImage")));
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonUp.Location = new System.Drawing.Point(896, 487);
+            this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(46, 53);
+            this.buttonUp.TabIndex = 3;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("buttonDown.BackgroundImage")));
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonDown.Location = new System.Drawing.Point(896, 548);
+            this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(46, 53);
+            this.buttonDown.TabIndex = 4;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonLeft
+            // 
+            this.buttonLeft.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("buttonLeft.BackgroundImage")));
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonLeft.Location = new System.Drawing.Point(843, 547);
+            this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(46, 53);
+            this.buttonLeft.TabIndex = 5;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonRight
+            // 
+            this.buttonRight.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("buttonRight.BackgroundImage")));
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonRight.Location = new System.Drawing.Point(949, 547);
+            this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(46, 53);
+            this.buttonRight.TabIndex = 6;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // DDBus
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1010, 615);
+            this.Controls.Add(this.buttonRight);
+            this.Controls.Add(this.buttonLeft);
+            this.Controls.Add(this.buttonDown);
+            this.Controls.Add(this.buttonUp);
+            this.Controls.Add(this.buttonCreate);
+            this.Controls.Add(this.pictureBoxBus);
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.Name = "DDBus";
+            this.Text = "Bus";
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private PictureBox pictureBoxBus;
+        private Button buttonCreate;
+        private Button buttonUp;
+        private Button buttonDown;
+        private Button buttonLeft;
+        private Button buttonRight;
+    }
+}

DoubleDeckerBus/DDBus.cs

@@ -1,6 +1,6 @@
 namespace DoubleDeckerBus
 {
-    public partial class FormDoubleDeckerbus : Form
+    public partial class DDBus : Form
     {
         /// <summary>
         /// Поле-объект для прорисовки объекта
@@ -9,7 +9,7 @@ namespace DoubleDeckerBus
         /// <summary>
         /// Инициализация формы
         /// </summary>
-        public FormDoubleDeckerbus()
+        public DDBus()
         {
             InitializeComponent();
         }

DoubleDeckerBus/DDBus.resx

@@ -1,64 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<root>
-<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">

DoubleDeckerBus/DoubleDeckerBus.cs

@@ -25,11 +25,11 @@ namespace DoubleDeckerBus
         /// </summary>
         public Color AdditionalColor { get; private set; }
         /// <summary>
-        /// Признак (опция) наличия лестницы
+        /// Признак (опция) наличия антикрыла
         /// </summary>
         public bool Stairs { get; private set; }
         /// <summary>
-        /// Признак (опция) наличия второго этажа
+        /// Признак (опция) наличия гоночной полосы
         /// </summary>
         public bool SecondFloor { get; private set; }
         /// <summary>

DoubleDeckerBus/FormDoubleDeckerbus.Designer.cs

@@ -1,130 +0,0 @@
-namespace DoubleDeckerBus
-{
-    partial class FormDoubleDeckerbus
-    {
-        /// <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()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDoubleDeckerbus));
-            pictureBoxBus = new PictureBox();
-            buttonCreate = new Button();
-            buttonUp = new Button();
-            buttonDown = new Button();
-            buttonLeft = new Button();
-            buttonRight = new Button();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxBus).BeginInit();
-            SuspendLayout();
-            // 
-            // pictureBoxBus
-            // 
-            pictureBoxBus.Dock = DockStyle.Fill;
-            pictureBoxBus.Location = new Point(0, 0);
-            pictureBoxBus.Name = "pictureBoxBus";
-            pictureBoxBus.Size = new Size(884, 461);
-            pictureBoxBus.TabIndex = 1;
-            pictureBoxBus.TabStop = false;
-            // 
-            // buttonCreate
-            // 
-            buttonCreate.Location = new Point(12, 406);
-            buttonCreate.Name = "buttonCreate";
-            buttonCreate.Size = new Size(83, 43);
-            buttonCreate.TabIndex = 2;
-            buttonCreate.Text = "Создать";
-            buttonCreate.UseVisualStyleBackColor = true;
-            buttonCreate.Click += buttonCreate_Click;
-            // 
-            // buttonUp
-            // 
-            buttonUp.BackgroundImage = (Image)resources.GetObject("buttonUp.BackgroundImage");
-            buttonUp.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonUp.Location = new Point(784, 365);
-            buttonUp.Name = "buttonUp";
-            buttonUp.Size = new Size(40, 40);
-            buttonUp.TabIndex = 3;
-            buttonUp.UseVisualStyleBackColor = true;
-            buttonUp.Click += ButtonMove_Click;
-            // 
-            // buttonDown
-            // 
-            buttonDown.BackgroundImage = (Image)resources.GetObject("buttonDown.BackgroundImage");
-            buttonDown.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonDown.Location = new Point(784, 411);
-            buttonDown.Name = "buttonDown";
-            buttonDown.Size = new Size(40, 40);
-            buttonDown.TabIndex = 4;
-            buttonDown.UseVisualStyleBackColor = true;
-            buttonDown.Click += ButtonMove_Click;
-            // 
-            // buttonLeft
-            // 
-            buttonLeft.BackgroundImage = (Image)resources.GetObject("buttonLeft.BackgroundImage");
-            buttonLeft.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonLeft.Location = new Point(738, 410);
-            buttonLeft.Name = "buttonLeft";
-            buttonLeft.Size = new Size(40, 40);
-            buttonLeft.TabIndex = 5;
-            buttonLeft.UseVisualStyleBackColor = true;
-            buttonLeft.Click += ButtonMove_Click;
-            // 
-            // buttonRight
-            // 
-            buttonRight.BackgroundImage = (Image)resources.GetObject("buttonRight.BackgroundImage");
-            buttonRight.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonRight.Location = new Point(830, 410);
-            buttonRight.Name = "buttonRight";
-            buttonRight.Size = new Size(40, 40);
-            buttonRight.TabIndex = 6;
-            buttonRight.UseVisualStyleBackColor = true;
-            buttonRight.Click += ButtonMove_Click;
-            // 
-            // FormDoubleDeckerbus
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(884, 461);
-            Controls.Add(buttonRight);
-            Controls.Add(buttonLeft);
-            Controls.Add(buttonDown);
-            Controls.Add(buttonUp);
-            Controls.Add(buttonCreate);
-            Controls.Add(pictureBoxBus);
-            Name = "FormDoubleDeckerbus";
-            Text = "DoubleDeckerBus";
-            ((System.ComponentModel.ISupportInitialize)pictureBoxBus).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private PictureBox pictureBoxBus;
-        private Button buttonCreate;
-        private Button buttonUp;
-        private Button buttonDown;
-        private Button buttonLeft;
-        private Button buttonRight;
-    }
-}

DoubleDeckerBus/Program.cs

@@ -11,7 +11,7 @@ namespace DoubleDeckerBus
         static void Main()
         {
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormDoubleDeckerbus());
+            Application.Run(new DDBus());
         }
     }
 }