diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryCollection.Designer.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryCollection.Designer.cs index 3b4741f..2477cc5 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryCollection.Designer.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryCollection.Designer.cs @@ -85,7 +85,13 @@ panelCompanyTools.Name = "panelCompanyTools"; panelCompanyTools.Size = new Size(200, 213); panelCompanyTools.TabIndex = 9; - + // + // maskedTextBox + // + maskedTextBox.Location = new Point(0, 94); + maskedTextBox.Name = "maskedTextBox"; + maskedTextBox.Size = new Size(188, 23); + maskedTextBox.TabIndex = 0; // // buttonAddPropelledArtillery // diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryConfig.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryConfig.cs index 26e5682..e3db61d 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryConfig.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryConfig.cs @@ -174,8 +174,6 @@ public partial class FormPropelledArtilleryConfig : Form } } - - private void groupBoxColors_Enter(object sender, EventArgs e) { diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Program.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Program.cs index cbcab93..de7d298 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Program.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Program.cs @@ -1,20 +1,3 @@ -//namespace SelfPropelledArtilleryUnit -//{ -// internal static class Program -// { -// /// -// /// The main entry point for the application. -// /// -// [STAThread] -// static void Main() -// { -// // To customize application configuration such as set high DPI settings or default font, -// // see https://aka.ms/applicationconfiguration. -// ApplicationConfiguration.Initialize(); -// Application.Run(new FormPropelledArtilleryCollection()); -// } -// } -//} using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Serilog; diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit.cs index 4c755f4..7f883bc 100644 --- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit.cs +++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit.cs @@ -57,45 +57,6 @@ namespace SelfPropelledArtilleryUnit _drawningPropelledArtillery.DrawTransport(gr); pictureBoxSelfPropelledArtilleryUnit.Image = bmp; } - //private void CreateObject(string type) - //{ - // Random random = new(); - // switch (type) - // { - // case nameof(DrawningPropelledArtillery): - // _drawningPropelledArtillery = new DrawningPropelledArtillery(random.Next(100, 300), random.Next(1000, 3000), - // Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256))); - // break; - // case nameof(DrawningSelfPropelledArtilleryUnit): - // _drawningPropelledArtillery = new DrawningSelfPropelledArtilleryUnit(random.Next(100, 300), random.Next(1000, 3000), - // Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), - // Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), - // Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); - // break; - // default: - // return; - // } - - // _drawningPropelledArtillery.SetPictureSize(pictureBoxSelfPropelledArtilleryUnit.Width, pictureBoxSelfPropelledArtilleryUnit.Height); - // _drawningPropelledArtillery.SetPosition(random.Next(10, 100), random.Next(10, 100)); - // _strategy = null; - // comboBoxStrategy.Enabled = true; - // Draw(); - //} - - ///// - ///// Обработка нажатия кнопки "Создать самоходную арт.установку" - ///// - ///// - ///// - //private void buttonCreateSelfPropelledArtilleryUnit_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningSelfPropelledArtilleryUnit)); - - ///// - ///// Обработка нажатия кнопки "Создать бронированную машину" - ///// - ///// - ///// - //private void buttonCreatePropelledArtillery_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningPropelledArtillery)); private void ButtonMove_Click(object sender, EventArgs e) {