diff --git a/ConsoleApp1/ConsoleApp1.sln b/ConsoleApp1/ConsoleApp1.sln deleted file mode 100644 index 2ba4487..0000000 --- a/ConsoleApp1/ConsoleApp1.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.8.34525.116 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp1", "ConsoleApp1\ConsoleApp1.csproj", "{D8A4ACE0-0728-47AB-9F80-9EDA475782ED}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp2", "ConsoleApp2\ConsoleApp2.csproj", "{C1FC7C16-B9EC-4007-BD39-E6B47A89CE34}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D8A4ACE0-0728-47AB-9F80-9EDA475782ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8A4ACE0-0728-47AB-9F80-9EDA475782ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8A4ACE0-0728-47AB-9F80-9EDA475782ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8A4ACE0-0728-47AB-9F80-9EDA475782ED}.Release|Any CPU.Build.0 = Release|Any CPU - {C1FC7C16-B9EC-4007-BD39-E6B47A89CE34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1FC7C16-B9EC-4007-BD39-E6B47A89CE34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1FC7C16-B9EC-4007-BD39-E6B47A89CE34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1FC7C16-B9EC-4007-BD39-E6B47A89CE34}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {3368BA78-2800-49EC-9A71-865DC3C2F15F} - EndGlobalSection -EndGlobal diff --git a/ConsoleApp1/ConsoleApp1/ConsoleApp1.csproj b/ConsoleApp1/ConsoleApp1/ConsoleApp1.csproj deleted file mode 100644 index 2150e37..0000000 --- a/ConsoleApp1/ConsoleApp1/ConsoleApp1.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - Exe - net8.0 - enable - enable - - - diff --git a/ConsoleApp1/ConsoleApp1/Program.cs b/ConsoleApp1/ConsoleApp1/Program.cs deleted file mode 100644 index 16bb850..0000000 --- a/ConsoleApp1/ConsoleApp1/Program.cs +++ /dev/null @@ -1,68 +0,0 @@ -using System.Collections; -using System; - -// Класс компонента компьютера -public class ComputerComponent -{ - public string Name { get; set; } - public string Type { get; set; } - - public ComputerComponent(string name, string type) - { - Name = name; - Type = type; - } -} - -// АТД Очередь на основе массива -public class CustomQueue -{ - private ArrayList elements = new ArrayList(); - - public int Count { get { return elements.Count; } } - - public void Enqueue(ComputerComponent component) - { - elements.Add(component); - } - - public ComputerComponent Dequeue() - { - if (elements.Count == 0) - { - throw new InvalidOperationException("Queue is empty"); - } - - ComputerComponent component = (ComputerComponent)elements[0]; - elements.RemoveAt(0); - return component; - } - - public ComputerComponent Peek() - { - if (elements.Count == 0) - { - throw new InvalidOperationException("Queue is empty"); - } - - return (ComputerComponent)elements[0]; - } -} -class Program -{ - public static void Main(string[] args) - { - CustomQueue queue = new CustomQueue(); - - // Добавление компонентов в очередь - ComputerComponent cpu = new ComputerComponent("Intel Core i7", "CPU"); - ComputerComponent gpu = new ComputerComponent("Nvidia RTX 3080", "GPU"); - - queue.Enqueue(cpu); - queue.Enqueue(gpu); - - // Проверка совместимости компонентов в сборке - Console.WriteLine("Первый компонент в очереди: {0} ({1})", queue.Peek().Name, queue.Peek().Type); - Console.WriteLine("Извлечен компонент из очереди: {0} ({1})", queue.Dequeue().Name, queue.Dequeue().Type); - } -} diff --git a/ConsoleApp1/ConsoleApp2/ConsoleApp2.csproj b/ConsoleApp1/ConsoleApp2/ConsoleApp2.csproj deleted file mode 100644 index 2150e37..0000000 --- a/ConsoleApp1/ConsoleApp2/ConsoleApp2.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - Exe - net8.0 - enable - enable - - - diff --git a/ConsoleApp1/ConsoleApp2/Program.cs b/ConsoleApp1/ConsoleApp2/Program.cs deleted file mode 100644 index ae6071b..0000000 --- a/ConsoleApp1/ConsoleApp2/Program.cs +++ /dev/null @@ -1,113 +0,0 @@ -using System; - -// Реализация АТД Очередь -public class Queue -{ - private T[] elements; - private int front, rear, size, capacity; - - public Queue(int capacity) - { - this.capacity = capacity; - elements = new T[capacity]; - front = size = 0; - rear = capacity - 1; - } - - public void Enqueue(T item) - { - if (size == capacity) - throw new Exception("Queue is full"); - rear = (rear + 1) % capacity; - elements[rear] = item; - size++; - } - - public T Dequeue() - { - if (size == 0) - throw new Exception("Queue is empty"); - T item = elements[front]; - front = (front + 1) % capacity; - size--; - return item; - } - - // Реализация СД Массив - public static void SelectionSort(int[] array) - { - for (int i = 0; i < array.Length - 1; i++) - { - int minIndex = i; - for (int j = i + 1; j < array.Length; j++) - { - if (array[j] < array[minIndex]) - { - minIndex = j; - } - } - if (minIndex != i) - { - int temp = array[i]; - array[i] = array[minIndex]; - array[minIndex] = temp; - } - } - } - - // Быстрая сортировка - public static void QuickSort(int[] array, int left, int right) - { - if (left < right) - { - int pivot = Partition(array, left, right); - QuickSort(array, left, pivot - 1); - QuickSort(array, pivot + 1, right); - } - } - - private static int Partition(int[] array, int left, int right) - { - int pivot = array[right]; - int i = left - 1; - for (int j = left; j < right; j++) - { - if (array[j] < pivot) - { - i++; - int temp = array[i]; - array[i] = array[j]; - array[j] = temp; - } - } - int temp1 = array[i + 1]; - array[i + 1] = array[right]; - array[right] = temp1; - return i + 1; - } - - public static void Main() - { - int[] array = { 64, 34, 25, 12, 22, 11, 90 }; - - // Сортировка выбором - Console.WriteLine("Before selection sort:"); - foreach (var item in array) Console.Write(item + " "); - SelectionSort(array); - Console.WriteLine("\n\nAfter selection sort:"); - foreach (var item in array) Console.Write(item + " "); - - // Быстрая сортировка - Console.WriteLine("\n\nBefore quick sort:"); - foreach (var item in array) Console.Write(item + " "); - QuickSort(array, 0, array.Length - 1); - Console.WriteLine("\n\nAfter quick sort:"); - foreach (var item in array) Console.Write(item + " "); - - // Использование Очереди - Queue queue = new Queue(5); - queue.Enqueue(10); - queue.Enqueue(20); - queue.Dequeue(); - } -} \ No newline at end of file diff --git a/ProjectMotorboat/ProjectMotorboat/BoatDelegate.cs b/ProjectMotorboat/ProjectMotorboat/BoatDelegate.cs index d7c5e5d..dc0416c 100644 --- a/ProjectMotorboat/ProjectMotorboat/BoatDelegate.cs +++ b/ProjectMotorboat/ProjectMotorboat/BoatDelegate.cs @@ -1,10 +1,4 @@ using ProjectMotorboat.Drownings; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace ProjectMotorboat; public delegate void BoatDelegate(DrawningBoat car); \ No newline at end of file diff --git a/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/AbstractCompany.cs b/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/AbstractCompany.cs index 72defe7..c7ad6bf 100644 --- a/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/AbstractCompany.cs +++ b/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/AbstractCompany.cs @@ -1,5 +1,4 @@ -using ProjectMotorboat.CollectionGenericObjects; -using ProjectMotorboat.Drownings; +using ProjectMotorboat.Drownings; namespace ProjectMotorboat.CollectionGenericObjects; @@ -24,7 +23,7 @@ public abstract class AbstractCompany _pictureWidth = picWidth; _pictureHeight = picHeight; _collection = collection; - _collection.SetMaxCount = GetMaxCount; + _collection.MaxCount = GetMaxCount; } public static int operator +(AbstractCompany company, DrawningBoat boat) { diff --git a/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/CollectionType.cs b/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/CollectionType.cs index eb3ec09..5d33f5c 100644 --- a/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/CollectionType.cs +++ b/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/CollectionType.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - + namespace ProjectMotorboat.CollectionGenericObjects; public enum CollectionType diff --git a/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/HarborService.cs b/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/HarborService.cs index be39f68..92b0618 100644 --- a/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/HarborService.cs +++ b/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/HarborService.cs @@ -1,4 +1,4 @@ -using ProjectMotorboat.CollectionGenericObjects; + using ProjectMotorboat.Drownings; namespace ProjectMotorboat.CollectionGenericObjects; diff --git a/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/ICollectionGenericObjects.cs index eaf98c0..21b201c 100644 --- a/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/ICollectionGenericObjects.cs +++ b/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - + namespace ProjectMotorboat.CollectionGenericObjects; public interface ICollectionGenericObjects @@ -11,10 +6,12 @@ public interface ICollectionGenericObjects where T : class { int Count { get; } - int SetMaxCount { set; } + int MaxCount { get; set; } int Insert(T obj); int Insert(T obj, int position); T Remove(int position); T? Get(int position); + CollectionType GetCollectionType { get; } + IEnumerable GetItems(); } diff --git a/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/ListGenericObjects.cs b/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/ListGenericObjects.cs index 9310c0f..0a0c710 100644 --- a/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/ListGenericObjects.cs +++ b/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/ListGenericObjects.cs @@ -1,32 +1,32 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectMotorboat.CollectionGenericObjects; +namespace ProjectMotorboat.CollectionGenericObjects; public class ListGenericObjects : ICollectionGenericObjects where T : class { - /// - /// Список объектов, которые храним - /// private readonly List _collection; - /// - /// Максимально допустимое число объектов в списке - /// + public CollectionType GetCollectionType => CollectionType.List; + private int _maxCount; public int Count => _collection.Count; - public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } } + public int MaxCount + { + get + { + return Count; + } + set + { + if (value > 0) + { + _maxCount = value; + } + } + } - /// - /// Конструктор - /// public ListGenericObjects() { _collection = new(); @@ -34,15 +34,12 @@ where T : class public T? Get(int position) { - // TODO проверка позиции if (position >= Count || position < 0) return null; return _collection[position]; } public int Insert(T obj) { - // TODO проверка, что не превышено максимальное количество элементов - // TODO вставка в конец набора if (Count + 1 > _maxCount) return -1; _collection.Add(obj); return Count; @@ -50,9 +47,6 @@ where T : class public int Insert(T obj, int position) { - // TODO проверка, что не превышено максимальное количество элементов - // TODO проверка позиции - // TODO вставка по позиции if (Count + 1 > _maxCount) return -1; if (position < 0 || position > Count) return -1; _collection.Insert(position, obj); @@ -61,11 +55,17 @@ where T : class public T? Remove(int position) { - // TODO проверка позиции - // TODO удаление объекта из списка if (position < 0 || position > Count) return null; T? pos = _collection[position]; _collection.RemoveAt(position); return pos; } + + public IEnumerable GetItems() + { + for (int i = 0; i < Count; ++i) + { + yield return _collection[i]; + } + } } \ No newline at end of file diff --git a/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/MassiveGenericObjects.cs index 332d606..4eef7ae 100644 --- a/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/MassiveGenericObjects.cs @@ -2,16 +2,22 @@ public class MassiveGenericObjects : ICollectionGenericObjects where T : class { - + private T?[] _collection; + public int Count => _collection.Length; - public int SetMaxCount + + public int MaxCount { + get + { + return _collection.Length; + } set { if (value > 0) { - if (_collection.Length > 0) + if (Count > 0) { Array.Resize(ref _collection, value); } @@ -22,7 +28,9 @@ public class MassiveGenericObjects : ICollectionGenericObjects } } } - + + public CollectionType GetCollectionType => CollectionType.Massive; + public MassiveGenericObjects() { _collection = Array.Empty(); @@ -93,5 +101,15 @@ public class MassiveGenericObjects : ICollectionGenericObjects return obj; } + + public IEnumerable GetItems() + { + for (int i = 0; i < _collection.Length; ++i) + { + yield return _collection[i]; + } + } } + + diff --git a/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/StorageCollection.cs b/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/StorageCollection.cs index 4f3a336..5652781 100644 --- a/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/StorageCollection.cs @@ -1,16 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Linq; +using ProjectMotorboat.Drownings; using System.Text; -using System.Threading.Tasks; namespace ProjectMotorboat.CollectionGenericObjects; public class StorageCollection - where T : class + where T : DrawningBoat { - - readonly Dictionary> _storages; + + private Dictionary> _storages; public List Keys => _storages.Keys.ToList(); @@ -19,11 +16,10 @@ public class StorageCollection _storages = new Dictionary>(); } - + public void AddCollection(string name, CollectionType collectionType) { - // TODO проверка, что name не пустой и нет в словаре записи с таким ключом - // TODO Прописать логику для добавления + if (name == null || _storages.ContainsKey(name)) { return; } switch (collectionType) @@ -39,22 +35,137 @@ public class StorageCollection } } - + public void DelCollection(string name) { - // TODO Прописать логику для удаления коллекции + if (_storages.ContainsKey(name)) _storages.Remove(name); } - + public ICollectionGenericObjects? this[string name] { get { - // TODO Продумать логику получения объекта + if (name == null || !_storages.ContainsKey(name)) { return null; } return _storages[name]; } } -} \ No newline at end of file + + private readonly string _collectionKey = "CollectionsStorage"; + + private readonly string _separatorForKeyValue = "|"; + + private readonly string _separatorItems = ";"; + + + public bool SaveData(string filename) + { + if (_storages.Count == 0) + { + return false; + } + + if (File.Exists(filename)) + { + File.Delete(filename); + } + + using (StreamWriter writer = new StreamWriter(filename)) + { + writer.Write(_collectionKey); + foreach (KeyValuePair> value in _storages) + { + StringBuilder sb = new(); + sb.Append(Environment.NewLine); + + if (value.Value.Count == 0) + { + continue; + } + sb.Append(value.Key); + sb.Append(_separatorForKeyValue); + sb.Append(value.Value.GetCollectionType); + sb.Append(_separatorForKeyValue); + sb.Append(value.Value.MaxCount); + sb.Append(_separatorForKeyValue); + foreach (T? item in value.Value.GetItems()) + { + string data = item?.GetDataForSave() ?? string.Empty; + if (string.IsNullOrEmpty(data)) + { + continue; + } + sb.Append(data); + sb.Append(_separatorItems); + } + writer.Write(sb); + } + + } + + return true; + } + + + public bool LoadData(string filename) + { + if (!File.Exists(filename)) + { + return false; + } + using (StreamReader fs = File.OpenText(filename)) + { + string str = fs.ReadLine(); + if (str == null || str.Length == 0) + { + return false; + } + if (!str.StartsWith(_collectionKey)) + { + return false; + } + _storages.Clear(); + string strs = ""; + while ((strs = fs.ReadLine()) != null) + { + string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries); + if (record.Length != 4) + { + continue; + } + CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]); + ICollectionGenericObjects? collection = StorageCollection.CreateCollection(collectionType); + if (collection == null) + { + return false; + } + collection.MaxCount = Convert.ToInt32(record[2]); + string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries); + foreach (string elem in set) + { + if (elem?.CreateDrawningBoat() is T boat) + { + if (collection.Insert(boat) == -1) + { + return false; + } + } + } + _storages.Add(record[0], collection); + } + return true; + } + } + private static ICollectionGenericObjects? CreateCollection(CollectionType collectionType) + { + return collectionType switch + { + CollectionType.Massive => new MassiveGenericObjects(), + CollectionType.List => new ListGenericObjects(), + _ => null, + }; + } +} diff --git a/ProjectMotorboat/ProjectMotorboat/Drownings/DirectionType.cs b/ProjectMotorboat/ProjectMotorboat/Drownings/DirectionType.cs index 1741509..5ef15f9 100644 --- a/ProjectMotorboat/ProjectMotorboat/Drownings/DirectionType.cs +++ b/ProjectMotorboat/ProjectMotorboat/Drownings/DirectionType.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - + namespace ProjectMotorboat.Drownings { public enum DirectionType diff --git a/ProjectMotorboat/ProjectMotorboat/Drownings/DrawningBoat.cs b/ProjectMotorboat/ProjectMotorboat/Drownings/DrawningBoat.cs index 50db8a7..d117ab8 100644 --- a/ProjectMotorboat/ProjectMotorboat/Drownings/DrawningBoat.cs +++ b/ProjectMotorboat/ProjectMotorboat/Drownings/DrawningBoat.cs @@ -1,10 +1,4 @@ using ProjectMotorboat.Entities; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace ProjectMotorboat.Drownings; public class DrawningBoat @@ -51,6 +45,11 @@ public class DrawningBoat _drawningBoatHeight = drawningBoatHeight; } + + public DrawningBoat(EntityBoat ship) : this() + { + EntityBoat = new EntityBoat(ship.Speed, ship.Weight, ship.BodyColor); + } public bool SetPictureSize(int width, int height) { if (_drawningBoatWidth < width && _drawningBoatHeight < height) @@ -109,28 +108,28 @@ public class DrawningBoat } switch (direction) { - //влево + case DirectionType.Left: if (_startPosX.Value - EntityBoat.Step > 0) { _startPosX -= (int)EntityBoat.Step; } return true; - //вверх + case DirectionType.Up: if (_startPosY.Value - EntityBoat.Step > 0) { _startPosY -= (int)EntityBoat.Step; } return true; - // вправо + case DirectionType.Right: if (_startPosX.Value + EntityBoat.Step + _drawningBoatWidth < _pictureWidth) { _startPosX += (int)EntityBoat.Step; } return true; - //вниз + case DirectionType.Down: if (_startPosY.Value + EntityBoat.Step + _drawningBoatHeight < _pictureHeight) { @@ -150,7 +149,7 @@ public class DrawningBoat Pen pen = new(Color.Black); Brush mainBrush = new SolidBrush(EntityBoat.BodyColor); - // корпус + Point[] hull = new Point[] { new Point(_startPosX.Value + 5, _startPosY.Value + 0), @@ -162,7 +161,6 @@ public class DrawningBoat g.FillPolygon(mainBrush, hull); g.DrawPolygon(pen, hull); - // основная часть Brush blockBrush = new SolidBrush(EntityBoat.BodyColor); g.FillRectangle(blockBrush, _startPosX.Value + 20, _startPosY.Value + 15, 80, 40); g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 15, 80, 40); diff --git a/ProjectMotorboat/ProjectMotorboat/Drownings/DrawningMotorboat.cs b/ProjectMotorboat/ProjectMotorboat/Drownings/DrawningMotorboat.cs index 53a489e..a4c54fd 100644 --- a/ProjectMotorboat/ProjectMotorboat/Drownings/DrawningMotorboat.cs +++ b/ProjectMotorboat/ProjectMotorboat/Drownings/DrawningMotorboat.cs @@ -9,6 +9,12 @@ public class DrawningMotorboat : DrawningBoat EntityBoat = new EntityMotorboat(speed, weight, bodyColor, additionalColor, motor, glass); } + + public DrawningMotorboat(EntityMotorboat boat) : base(129, 80) + { + EntityBoat = new EntityMotorboat(boat.Speed, boat.Weight, boat.BodyColor, boat.AdditionalColor, boat.Motor, boat.Glass); + } + public override void DrawTransport(Graphics g) { if (EntityBoat == null || EntityBoat is not EntityMotorboat motorboat|| !_startPosX.HasValue || !_startPosY.HasValue) @@ -21,14 +27,14 @@ public class DrawningMotorboat : DrawningBoat base.DrawTransport(g); - // стекло впереди + if (motorboat.Glass) { Brush glassBrush = new SolidBrush(Color.LightBlue); g.FillEllipse(glassBrush, _startPosX.Value + 20, _startPosY.Value + 15, 100, 40); g.DrawEllipse(pen, _startPosX.Value + 20, _startPosY.Value + 15, 100, 40); } - // двигатель + if (motorboat.Motor) { Brush engineBrush = new diff --git a/ProjectMotorboat/ProjectMotorboat/Drownings/ExtentionDrawningBoat.cs b/ProjectMotorboat/ProjectMotorboat/Drownings/ExtentionDrawningBoat.cs new file mode 100644 index 0000000..4106627 --- /dev/null +++ b/ProjectMotorboat/ProjectMotorboat/Drownings/ExtentionDrawningBoat.cs @@ -0,0 +1,34 @@ +using ProjectMotorboat.Entities; + +namespace ProjectMotorboat.Drownings; +public static class ExtentionDrawningBoat +{ + private static readonly string _separatorForObject = ":"; + public static DrawningBoat? CreateDrawningBoat(this string info) + { + string[] strs = info.Split(_separatorForObject); + EntityBoat? boat = EntityMotorboat.CreateEntityMotorboat(strs); + if (boat != null) + { + return new DrawningMotorboat((EntityMotorboat)boat); + } + + boat = EntityBoat.CreateEntityBoat(strs); + if (boat != null) + { + return new DrawningBoat(boat); + } + return null; + } + public static string GetDataForSave(this DrawningBoat drawningBoat) + { + string[]? array = drawningBoat?.EntityBoat?.GetStringRepresentation(); + + if (array == null) + { + return string.Empty; + } + + return string.Join(_separatorForObject, array); + } +} diff --git a/ProjectMotorboat/ProjectMotorboat/Entities/EntityBoat.cs b/ProjectMotorboat/ProjectMotorboat/Entities/EntityBoat.cs index 73e61fe..d588e23 100644 --- a/ProjectMotorboat/ProjectMotorboat/Entities/EntityBoat.cs +++ b/ProjectMotorboat/ProjectMotorboat/Entities/EntityBoat.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectMotorboat.Entities; +namespace ProjectMotorboat.Entities; public class EntityBoat { @@ -26,4 +20,17 @@ public class EntityBoat Weight = weight; BodyColor = bodyColor; } + public virtual string[] GetStringRepresentation() + { + return new[] { nameof(EntityBoat), Speed.ToString(), Weight.ToString(), BodyColor.Name }; + } + public static EntityBoat? CreateEntityBoat(string[] strs) + { + if (strs.Length != 4 || strs[0] != nameof(EntityBoat)) + { + return null; + } + + return new EntityBoat(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3])); + } } diff --git a/ProjectMotorboat/ProjectMotorboat/Entities/EntityMotorboat.cs b/ProjectMotorboat/ProjectMotorboat/Entities/EntityMotorboat.cs index 3632655..ef508b3 100644 --- a/ProjectMotorboat/ProjectMotorboat/Entities/EntityMotorboat.cs +++ b/ProjectMotorboat/ProjectMotorboat/Entities/EntityMotorboat.cs @@ -20,4 +20,12 @@ public class EntityMotorboat : EntityBoat Motor = motor; Glass = glass; } + public static EntityMotorboat? CreateEntityMotorboat(string[] strs) + { + if (strs.Length != 8 || strs[0] != nameof(EntityMotorboat)) + { + return null; + } + return new EntityMotorboat(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]), Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6])); + } } diff --git a/ProjectMotorboat/ProjectMotorboat/FormBoatCollection.Designer.cs b/ProjectMotorboat/ProjectMotorboat/FormBoatCollection.Designer.cs index f0eb980..4936ba7 100644 --- a/ProjectMotorboat/ProjectMotorboat/FormBoatCollection.Designer.cs +++ b/ProjectMotorboat/ProjectMotorboat/FormBoatCollection.Designer.cs @@ -46,10 +46,17 @@ labelCollectionName = new Label(); comboBoxSelectorCompany = new ComboBox(); pictureBox = new PictureBox(); + menuStrip = new MenuStrip(); + файлToolStripMenuItem = new ToolStripMenuItem(); + saveToolStripMenuItem = new ToolStripMenuItem(); + loadToolStripMenuItem = new ToolStripMenuItem(); + saveFileDialog = new SaveFileDialog(); + openFileDialog = new OpenFileDialog(); groupBoxTools.SuspendLayout(); panelCompanyTools.SuspendLayout(); panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); + menuStrip.SuspendLayout(); SuspendLayout(); // // groupBoxTools @@ -59,9 +66,9 @@ groupBoxTools.Controls.Add(panelStorage); groupBoxTools.Controls.Add(comboBoxSelectorCompany); groupBoxTools.Dock = DockStyle.Right; - groupBoxTools.Location = new Point(1027, 0); + groupBoxTools.Location = new Point(1096, 28); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(231, 746); + groupBoxTools.Size = new Size(231, 793); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; @@ -75,15 +82,15 @@ panelCompanyTools.Controls.Add(buttonGoToCheck); panelCompanyTools.Dock = DockStyle.Bottom; panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 418); + panelCompanyTools.Location = new Point(3, 486); panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(225, 325); + panelCompanyTools.Size = new Size(225, 304); panelCompanyTools.TabIndex = 7; // // buttonAddBoat // buttonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddBoat.Location = new Point(3, 3); + buttonAddBoat.Location = new Point(6, 7); buttonAddBoat.Name = "buttonAddBoat"; buttonAddBoat.Size = new Size(219, 54); buttonAddBoat.TabIndex = 1; @@ -93,7 +100,7 @@ // // maskedTextBox // - maskedTextBox.Location = new Point(3, 123); + maskedTextBox.Location = new Point(3, 67); maskedTextBox.Mask = "00"; maskedTextBox.Name = "maskedTextBox"; maskedTextBox.Size = new Size(219, 27); @@ -103,7 +110,7 @@ // buttonRefresh // buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(3, 276); + buttonRefresh.Location = new Point(3, 220); buttonRefresh.Name = "buttonRefresh"; buttonRefresh.Size = new Size(219, 54); buttonRefresh.TabIndex = 6; @@ -114,7 +121,7 @@ // buttonDelBoat // buttonDelBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonDelBoat.Location = new Point(3, 156); + buttonDelBoat.Location = new Point(3, 100); buttonDelBoat.Name = "buttonDelBoat"; buttonDelBoat.Size = new Size(222, 54); buttonDelBoat.TabIndex = 4; @@ -125,7 +132,7 @@ // buttonGoToCheck // buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonGoToCheck.Location = new Point(3, 216); + buttonGoToCheck.Location = new Point(3, 160); buttonGoToCheck.Name = "buttonGoToCheck"; buttonGoToCheck.Size = new Size(219, 54); buttonGoToCheck.TabIndex = 5; @@ -239,19 +246,58 @@ // pictureBox // pictureBox.Dock = DockStyle.Fill; - pictureBox.Location = new Point(0, 0); + pictureBox.Location = new Point(0, 28); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(1027, 746); + pictureBox.Size = new Size(1096, 793); pictureBox.TabIndex = 1; pictureBox.TabStop = false; // + // menuStrip + // + menuStrip.ImageScalingSize = new Size(20, 20); + menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem }); + menuStrip.Location = new Point(0, 0); + menuStrip.Name = "menuStrip"; + menuStrip.Size = new Size(1327, 28); + menuStrip.TabIndex = 2; + menuStrip.Text = "menuStrip"; + // + // файлToolStripMenuItem + // + файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem }); + файлToolStripMenuItem.Name = "файлToolStripMenuItem"; + файлToolStripMenuItem.Size = new Size(59, 24); + файлToolStripMenuItem.Text = "Файл"; + // + // saveToolStripMenuItem + // + saveToolStripMenuItem.Name = "saveToolStripMenuItem"; + saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S; + saveToolStripMenuItem.Size = new Size(227, 26); + saveToolStripMenuItem.Text = "Сохранение"; + saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click; + // + // loadToolStripMenuItem + // + loadToolStripMenuItem.Name = "loadToolStripMenuItem"; + loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L; + loadToolStripMenuItem.Size = new Size(227, 26); + loadToolStripMenuItem.Text = "загрузка"; + loadToolStripMenuItem.Click += LoadToolStripMenuItem_Click; + // + // saveFileDialog + // + saveFileDialog.Filter = "txt file | *.txt"; + // // FormBoatCollection // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1258, 746); + ClientSize = new Size(1327, 821); Controls.Add(pictureBox); Controls.Add(groupBoxTools); + Controls.Add(menuStrip); + MainMenuStrip = menuStrip; Name = "FormBoatCollection"; Text = "Коллекция лодок"; groupBoxTools.ResumeLayout(false); @@ -260,7 +306,10 @@ panelStorage.ResumeLayout(false); panelStorage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); + menuStrip.ResumeLayout(false); + menuStrip.PerformLayout(); ResumeLayout(false); + PerformLayout(); } #endregion @@ -283,5 +332,11 @@ private Button buttonCollectionDel; private Button buttonCreateCompany; private Panel panelCompanyTools; + private MenuStrip menuStrip; + private ToolStripMenuItem файлToolStripMenuItem; + private ToolStripMenuItem saveToolStripMenuItem; + private ToolStripMenuItem loadToolStripMenuItem; + private SaveFileDialog saveFileDialog; + private OpenFileDialog openFileDialog; } } \ No newline at end of file diff --git a/ProjectMotorboat/ProjectMotorboat/FormBoatCollection.cs b/ProjectMotorboat/ProjectMotorboat/FormBoatCollection.cs index e894fa7..13dc2d2 100644 --- a/ProjectMotorboat/ProjectMotorboat/FormBoatCollection.cs +++ b/ProjectMotorboat/ProjectMotorboat/FormBoatCollection.cs @@ -2,47 +2,24 @@ using ProjectMotorboat.Drownings; namespace ProjectMotorboat; - -/// -/// Форма работы с компанией и ее коллекцией -/// public partial class FormBoatCollection : Form -{ +{ private readonly StorageCollection _storageCollection; - /// - /// Компания - /// private AbstractCompany? _company = null; - - /// - /// Конструктор - /// public FormBoatCollection() { InitializeComponent(); _storageCollection = new(); } - - /// - /// Выбор компании - /// - /// - /// private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e) { panelCompanyTools.Enabled = false; } - - /// - /// Добавление обычного автомобиля - /// - /// - /// private void ButtonAddBoat_Click(object sender, EventArgs e) { FormBoatConfig form = new(); - // TODO передать метод + form.AddEvent(SetBoat); form.Show(); @@ -66,18 +43,6 @@ public partial class FormBoatCollection : Form } - - - /// - /// Создание объекта класса-перемещения - /// - /// Тип создаваемого объекта - - /// - /// Удаление объекта - /// - /// - /// private void ButtonRemoveBoat_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null) @@ -102,11 +67,6 @@ public partial class FormBoatCollection : Form } } - /// - /// Передача объекта в другую форму - /// - /// - /// private void ButtonGoToCheck_Click(object sender, EventArgs e) { if (_company == null) @@ -138,11 +98,6 @@ public partial class FormBoatCollection : Form form.ShowDialog(); } - /// - /// Перерисовка коллекции - /// - /// - /// private void ButtonRefresh_Click(object sender, EventArgs e) { if (_company == null) @@ -228,4 +183,35 @@ public partial class FormBoatCollection : Form panelCompanyTools.Enabled = true; RerfreshListBoxItems(); } + + private void SaveToolStripMenuItem_Click(object sender, EventArgs e) + { + if (saveFileDialog.ShowDialog() == DialogResult.OK) + { + if (_storageCollection.SaveData(saveFileDialog.FileName)) + { + MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + else + { + MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void LoadToolStripMenuItem_Click(object sender, EventArgs e) + { + if (openFileDialog.ShowDialog() == DialogResult.OK) + { + if (_storageCollection.LoadData(openFileDialog.FileName)) + { + MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + RerfreshListBoxItems(); + } + else + { + MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } \ No newline at end of file diff --git a/ProjectMotorboat/ProjectMotorboat/FormBoatCollection.resx b/ProjectMotorboat/ProjectMotorboat/FormBoatCollection.resx index af32865..a4f11d6 100644 --- a/ProjectMotorboat/ProjectMotorboat/FormBoatCollection.resx +++ b/ProjectMotorboat/ProjectMotorboat/FormBoatCollection.resx @@ -117,4 +117,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 145, 17 + + + 310, 17 + + + 25 + \ No newline at end of file diff --git a/ProjectMotorboat/ProjectMotorboat/FormBoatConfig.cs b/ProjectMotorboat/ProjectMotorboat/FormBoatConfig.cs index e683676..8de01e3 100644 --- a/ProjectMotorboat/ProjectMotorboat/FormBoatConfig.cs +++ b/ProjectMotorboat/ProjectMotorboat/FormBoatConfig.cs @@ -1,14 +1,5 @@ using ProjectMotorboat.Drownings; using ProjectMotorboat.Entities; -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 ProjectMotorboat { @@ -16,7 +7,7 @@ namespace ProjectMotorboat { private DrawningBoat? _boat; - private event BoatDelegate? BoatDelegate; + private event Action? BoatDelegate; public FormBoatConfig() { InitializeComponent(); @@ -32,9 +23,16 @@ namespace ProjectMotorboat buttonCancel.Click += (sender, e) => Close(); } - public void AddEvent(BoatDelegate boatDelegate) + public void AddEvent(Action boatDelegate) { - BoatDelegate += boatDelegate; + if (BoatDelegate != null) + { + BoatDelegate = boatDelegate; + } + else + { + BoatDelegate += boatDelegate; + } } private void DrawObject() @@ -74,11 +72,11 @@ namespace ProjectMotorboat private void Panel_MouseDown(object? sender, MouseEventArgs e) { - // TODO отправка цвета в Drag&Drop + (sender as Control)?.DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); } - // Логика смены цветов: основного и дополнительного (для продвинутого объекта) + private void LabelBodyColor_DragEnter(object sender, DragEventArgs e) { if (e.Data?.GetDataPresent(typeof(Color)) ?? false) diff --git a/ProjectMotorboat/ProjectMotorboat/MovementStrategy/MoveToBorder.cs b/ProjectMotorboat/ProjectMotorboat/MovementStrategy/MoveToBorder.cs index 3da281d..9004dfc 100644 --- a/ProjectMotorboat/ProjectMotorboat/MovementStrategy/MoveToBorder.cs +++ b/ProjectMotorboat/ProjectMotorboat/MovementStrategy/MoveToBorder.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - + namespace ProjectMotorboat.MovementStrategy; public class MoveToBorder : AbstractStrategy { diff --git a/ProjectMotorboat/ProjectMotorboat/MovementStrategy/MoveToCenter.cs b/ProjectMotorboat/ProjectMotorboat/MovementStrategy/MoveToCenter.cs index 08b425a..7538fc1 100644 --- a/ProjectMotorboat/ProjectMotorboat/MovementStrategy/MoveToCenter.cs +++ b/ProjectMotorboat/ProjectMotorboat/MovementStrategy/MoveToCenter.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - + namespace ProjectMotorboat.MovementStrategy; public class MoveToCenter : AbstractStrategy { diff --git a/ProjectMotorboat/ProjectMotorboat/MovementStrategy/ObjectParameters.cs b/ProjectMotorboat/ProjectMotorboat/MovementStrategy/ObjectParameters.cs index 51bb02b..2393d1a 100644 --- a/ProjectMotorboat/ProjectMotorboat/MovementStrategy/ObjectParameters.cs +++ b/ProjectMotorboat/ProjectMotorboat/MovementStrategy/ObjectParameters.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - + namespace ProjectMotorboat.MovementStrategy; public class ObjectParameters diff --git a/ProjectMotorboat/ProjectMotorboat/MovementStrategy/StrategyStatus.cs b/ProjectMotorboat/ProjectMotorboat/MovementStrategy/StrategyStatus.cs index e4b58f8..94acac8 100644 --- a/ProjectMotorboat/ProjectMotorboat/MovementStrategy/StrategyStatus.cs +++ b/ProjectMotorboat/ProjectMotorboat/MovementStrategy/StrategyStatus.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectMotorboat.MovementStrategy; +namespace ProjectMotorboat.MovementStrategy; public enum StrategyStatus { diff --git a/ProjectMotorboat/ProjectMotorboat/Program.cs b/ProjectMotorboat/ProjectMotorboat/Program.cs index 0c67735..2bbdd34 100644 --- a/ProjectMotorboat/ProjectMotorboat/Program.cs +++ b/ProjectMotorboat/ProjectMotorboat/Program.cs @@ -2,9 +2,7 @@ namespace ProjectMotorboat { internal static class Program { - /// - /// The main entry point for the application. - /// + [STAThread] static void Main() { diff --git a/WinFormsApp1/WinFormsApp1.sln b/WinFormsApp1/WinFormsApp1.sln deleted file mode 100644 index cc16879..0000000 --- a/WinFormsApp1/WinFormsApp1.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.8.34525.116 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsApp1", "WinFormsApp1\WinFormsApp1.csproj", "{50092433-6AF5-4E71-9559-079AE2F9901A}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {50092433-6AF5-4E71-9559-079AE2F9901A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50092433-6AF5-4E71-9559-079AE2F9901A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50092433-6AF5-4E71-9559-079AE2F9901A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50092433-6AF5-4E71-9559-079AE2F9901A}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {59C3FED6-0E53-4AF0-9E1B-5ACF902ED5CE} - EndGlobalSection -EndGlobal diff --git a/WinFormsApp1/WinFormsApp1/Form1.Designer.cs b/WinFormsApp1/WinFormsApp1/Form1.Designer.cs deleted file mode 100644 index 1ac166c..0000000 --- a/WinFormsApp1/WinFormsApp1/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace WinFormsApp1 -{ - partial class Form1 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "Form1"; - } - - #endregion - } -} diff --git a/WinFormsApp1/WinFormsApp1/Form1.cs b/WinFormsApp1/WinFormsApp1/Form1.cs deleted file mode 100644 index dabe0d0..0000000 --- a/WinFormsApp1/WinFormsApp1/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace WinFormsApp1 -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} diff --git a/WinFormsApp1/WinFormsApp1/Form1.resx b/WinFormsApp1/WinFormsApp1/Form1.resx deleted file mode 100644 index 1af7de1..0000000 --- a/WinFormsApp1/WinFormsApp1/Form1.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/WinFormsApp1/WinFormsApp1/Program.cs b/WinFormsApp1/WinFormsApp1/Program.cs deleted file mode 100644 index 1e39c2a..0000000 --- a/WinFormsApp1/WinFormsApp1/Program.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace WinFormsApp1 -{ - 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 Form1()); - } - } -} \ No newline at end of file diff --git a/WinFormsApp1/WinFormsApp1/WinFormsApp1.csproj b/WinFormsApp1/WinFormsApp1/WinFormsApp1.csproj deleted file mode 100644 index 663fdb8..0000000 --- a/WinFormsApp1/WinFormsApp1/WinFormsApp1.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - WinExe - net8.0-windows - enable - true - enable - - - \ No newline at end of file