6 Commits
Lab-4 ... Lab-7

Author SHA1 Message Date
fd88fea05f Lab 7 done 2024-05-15 17:20:36 +04:00
326e4cf801 Final version 2024-04-20 09:16:18 +04:00
cf07e0696e removing unnecessary checks 2024-04-20 08:45:20 +04:00
cc1aa1d3d6 Cleaning excessive files 2024-04-20 00:24:34 +04:00
def409392f Lab-6 done 2024-04-20 00:22:42 +04:00
ebc2c222c6 Lab-5 done 2024-04-17 17:00:26 +04:00
23 changed files with 1335 additions and 168 deletions

View File

@@ -8,6 +8,17 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
@@ -23,4 +34,13 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Update="nlog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="serilogConfig.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>

View File

@@ -27,7 +27,7 @@ namespace Catamaran.CollectionGenericObjects
_pictureHeight = picHeight;
_pictureWidth = picWidth;
_collection = collection;
_collection.SetMaxCount = GetMaxCount;
_collection.MaxCount = GetMaxCount;
}
public static int operator +(AbstractCompany company, DrawingBoat boat)

View File

@@ -1,4 +1,5 @@
using System;
using Catamaran.Exceptions;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -13,8 +14,13 @@ namespace Catamaran.CollectionGenericObjects
public int Count => _collection.Length;
public int SetMaxCount
public int MaxCount
{
get
{
return _collection.Length;
}
set
{
if (value > 0)
@@ -31,6 +37,8 @@ namespace Catamaran.CollectionGenericObjects
}
}
public CollectionType GetCollectionType => CollectionType.Array;
public ArrayGenericObjects()
{
_collection = Array.Empty<T?>();
@@ -42,7 +50,7 @@ namespace Catamaran.CollectionGenericObjects
{
return _collection[position];
}
return null;
throw new PositionOutOfRangeException(position) ;
}
public int Insert(T obj)
@@ -55,31 +63,31 @@ namespace Catamaran.CollectionGenericObjects
return i;
}
}
return -1;
throw new CollectionOverflowException(Count);
}
public int Insert(T obj, int position)
{
if (position < Count)
if (position > Count || position < 0)
{
if (_collection[position] == null)
throw new PositionOutOfRangeException(position);
}
if (_collection[position] == null)
{
_collection[position] = obj;
return position;
}
else
else
{
for (int i = 0; i < Count; i++)
{
for (int i = 0; i < Count; i++)
if (_collection[i] == null)
{
if (_collection[i] == null)
{
_collection[i] = obj;
return i;
}
_collection[i] = obj;
return i;
}
}
}
return -1;
}
@@ -87,12 +95,20 @@ namespace Catamaran.CollectionGenericObjects
{
if (position > Count || position < 0)
{
return null;
throw new PositionOutOfRangeException(position);
}
if (_collection[position] == null) throw new ObjectNotFoundException();
T? obj = _collection[position];
_collection[position] = null;
return obj;
}
public IEnumerable<T?> GetItems()
{
for (int i = 0; i < _collection.Length; i++)
{
yield return _collection[i];
}
}
}
}

View File

@@ -11,7 +11,7 @@ namespace Catamaran.CollectionGenericObjects
{
int Count { get; }
int SetMaxCount { set; }
int MaxCount { get; set; }
int Insert(T obj);
@@ -20,5 +20,9 @@ namespace Catamaran.CollectionGenericObjects
T? Remove(int position);
T? Get(int position);
CollectionType GetCollectionType { get; }
IEnumerable<T?> GetItems();
}
}

View File

@@ -1,4 +1,5 @@
using System;
using Catamaran.Exceptions;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -16,7 +17,24 @@ namespace Catamaran.CollectionGenericObjects
public int Count => _collection.Count;
public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
public int MaxCount
{
get
{
if (_maxCount < _collection.Count) return _maxCount;
return _collection.Count;
}
set
{
if (value > 0)
{
_maxCount = value;
}
}
}
public CollectionType GetCollectionType => CollectionType.List;
public ListGenericObjects()
{
@@ -25,28 +43,27 @@ namespace Catamaran.CollectionGenericObjects
public T? Get(int position)
{
if (position < 0 || position >= Count)
{
return null;
}
if (position >= Count || position < 0) throw new PositionOutOfRangeException(position);
if (_collection[position] == null) throw new ObjectNotFoundException();
return _collection[position];
}
public int Insert(T obj)
{
if (Count + 1 > _maxCount)
{
return -1;
}
if (Count + 1 > _maxCount) throw new CollectionOverflowException(Count);
_collection.Add(obj);
return 1;
}
public int Insert(T obj, int position)
{
if (position < 0 || position > Count || Count + 1 > _maxCount)
if (position < 0 || position > Count)
{
return -1;
throw new PositionOutOfRangeException(position);
}
if (Count + 1 > _maxCount)
{
throw new CollectionOverflowException(Count);
}
_collection.Insert(position, obj);
return 1;
@@ -56,11 +73,19 @@ namespace Catamaran.CollectionGenericObjects
{
if (position < 0 || position > Count)
{
return null;
throw new PositionOutOfRangeException(position);
}
T? obj = _collection[position];
_collection.RemoveAt(position);
return obj;
}
public IEnumerable<T?> GetItems()
{
for (int i = 0; i < _collection.Count; i++)
{
yield return _collection[i];
}
}
}
}

View File

@@ -1,6 +1,8 @@
using Catamaran.Drawings;
using Catamaran.Exceptions;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -8,12 +10,18 @@ using System.Threading.Tasks;
namespace Catamaran.CollectionGenericObjects
{
public class StorageCollection<T>
where T : class
where T : DrawingBoat
{
readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
public List<string> Keys => _storages.Keys.ToList();
private readonly string _collectionKey = "CollectionsStorage";
private readonly string _separatorKeyValue = "|";
private readonly string _separatorItems = ";";
public StorageCollection()
{
_storages = new Dictionary<string, ICollectionGenericObjects<T>>();
@@ -58,5 +66,128 @@ namespace Catamaran.CollectionGenericObjects
return _storages[name];
}
}
public void SaveData(string filename)
{
if (_storages.Count == 0)
{
throw new ArgumentException("В хранилище отсутствуют коллекции для сохранения");
}
if (File.Exists(filename))
{
File.Delete(filename);
}
using (StreamWriter writer = new(filename))
{
writer.Write(_collectionKey);
foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
{
writer.Write(Environment.NewLine);
if (value.Value.Count == 0)
{
continue;
}
writer.Write(value.Key);
writer.Write(_separatorKeyValue);
writer.Write(value.Value.GetCollectionType);
writer.Write(_separatorKeyValue);
writer.Write(value.Value.MaxCount);
writer.Write(_separatorKeyValue);
foreach (T? item in value.Value.GetItems())
{
string data = item?.GetDataForSave() ?? string.Empty;
if (string.IsNullOrEmpty(data))
{
continue;
}
writer.Write(data);
writer.Write(_separatorItems);
}
}
writer.Close();
}
}
public void LoadData(string filename)
{
if (!File.Exists(filename))
{
throw new FileNotFoundException("Файл не существует!");
}
using (StreamReader reader = new(filename))
{
string line = reader.ReadLine();
if (line == null || line.Length == 0)
{
throw new ArgumentException("В файле нет данных");
}
if (!line.Equals(_collectionKey))
{
throw new InvalidDataException("В файле неверные данные");
}
_storages.Clear();
while ((line = reader.ReadLine()) != null)
{
string[] record = line.Split(_separatorKeyValue, StringSplitOptions.RemoveEmptyEntries);
if (record.Length != 4)
{
continue;
}
CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
if (collection == null)
{
throw new InvalidCastException("Не удалось определить тип коллекции: " + record[1]);
}
collection.MaxCount = Convert.ToInt32(record[2]);
string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
foreach (string elem in set)
{
if (elem?.CreateDrawingBoat() is T boat)
{
try
{
if (collection.Insert(boat) < 0)
{
throw new InvalidOperationException("Объект не удалось добавить в коллекцию: " + record[3]);
}
}
catch (CollectionOverflowException ex)
{
throw new CollectionOverflowException("Коллекция переполнена", ex);
}
}
}
_storages.Add(record[0], collection);
}
}
}
private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
{
return collectionType switch
{
CollectionType.Array => new ArrayGenericObjects<T>(),
CollectionType.List => new ListGenericObjects<T>(),
_ => null,
};
}
}
}

View File

@@ -47,6 +47,12 @@ namespace Catamaran.Drawings
}
public DrawingBoat(EntityBoat? entityBoat) : this()
{
if (entityBoat == null) return;
EntityBoat = new EntityBoat(entityBoat.Speed, entityBoat.Weight, entityBoat.BodyColor);
}
protected DrawingBoat(int drawingCatamaranWidth, int drawingCatamaranHeight) : this()
{
_drawingCatamaranWidth = drawingCatamaranWidth;

View File

@@ -17,6 +17,12 @@ namespace Catamaran.Drawings
EntityBoat = new EntityCatamaran(speed, weight, bodyColor, additionalColor, leftBobber, rightBobber, sail);
}
public DrawingCatamaran(EntityCatamaran? entityCatamaran) : base(120, 90)
{
if (entityCatamaran == null) return;
EntityBoat = new EntityCatamaran(entityCatamaran.Speed, entityCatamaran.Weight, entityCatamaran.BodyColor,
entityCatamaran.AdditionalColor, entityCatamaran.LeftBobber, entityCatamaran.RightBobber, entityCatamaran.Sail);
}
public override void DrawTransport(Graphics g)
{

View File

@@ -0,0 +1,42 @@
using Catamaran.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Catamaran.Drawings
{
public static class ExtentionDrawingBoat
{
private static readonly string _separator = ":";
public static DrawingBoat? CreateDrawingBoat(this string info)
{
string[] strs = info.Split(_separator);
EntityBoat? boat = EntityCatamaran.CreateEntityCatamaran(strs);
if (boat != null)
{
return new DrawingCatamaran((EntityCatamaran)boat);
}
boat = EntityBoat.CreateEntityBoat(strs);
if (boat != null)
{
return new DrawingBoat(boat);
}
return null;
}
public static string GetDataForSave(this DrawingBoat drawingBoat)
{
string[]? array = drawingBoat?.EntityBoat?.GetStringRepresentation();
if (array == null)
{
return string.Empty;
}
return string.Join(_separator, array);
}
}
}

View File

@@ -19,6 +19,26 @@ namespace Catamaran.Entities
public double Step => Speed * 100 / Weight;
public void SetAdditionalColor(Color addColor)
{
AdditionalColor = addColor;
}
public override string[] GetStringRepresentation()
{
return new[] { nameof(EntityCatamaran), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name, LeftBobber.ToString(), RightBobber.ToString(), Sail.ToString() };
}
public static EntityCatamaran? CreateEntityCatamaran(string[] strs)
{
if (strs.Length != 8 || strs[0] != nameof(EntityCatamaran))
{
return null;
}
return new EntityCatamaran(Convert.ToInt32(strs[1]),
Convert.ToDouble(strs[2]), Color.FromName(strs[3]), Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]), Convert.ToBoolean(strs[7]));
}
public EntityCatamaran(int speed, double weight, Color bodyColor, Color additionalColor, bool leftBobber, bool rightBobber, bool sail) : base(speed, weight, bodyColor)
{
AdditionalColor = additionalColor;

View File

@@ -16,6 +16,27 @@ namespace Catamaran.Entities
public double Step => Speed * 100 / Weight;
public void SetBodyColor(Color color)
{
BodyColor = color;
}
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]));
}
public EntityBoat(int speed, double weight, Color bodyColor)
{
Speed = speed;

View File

@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
namespace Catamaran.Exceptions
{
[Serializable]
internal class CollectionOverflowException : ApplicationException
{
public CollectionOverflowException(int count) : base("Превышено количество элементов коллекции: count" + count) { }
public CollectionOverflowException() { }
public CollectionOverflowException(string message) : base(message) { }
public CollectionOverflowException(string message, Exception exception) : base(message, exception) { }
protected CollectionOverflowException(SerializationInfo info, StreamingContext context) : base(info, context) { }
}
}

View File

@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
namespace Catamaran.Exceptions
{
[Serializable]
internal class ObjectNotFoundException : ApplicationException
{
public ObjectNotFoundException(int i) : base("Не найден объект по позиции " + i) { }
public ObjectNotFoundException() : base() { }
public ObjectNotFoundException(string message) : base(message) { }
public ObjectNotFoundException(string message, Exception exception) : base(message, exception) { }
protected ObjectNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context) { }
}
}

View File

@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
namespace Catamaran.Exceptions
{
[Serializable]
internal class PositionOutOfRangeException : ApplicationException
{
public PositionOutOfRangeException(int i) : base("Не найден объект по позиции " + i) { }
public PositionOutOfRangeException() : base() { }
public PositionOutOfRangeException(string message) : base(message) { }
public PositionOutOfRangeException(string message, Exception exception) : base(message, exception) { }
protected PositionOutOfRangeException(SerializationInfo info, StreamingContext context) : base(info, context) { }
}
}

View File

@@ -29,6 +29,12 @@
private void InitializeComponent()
{
groupBox1 = new GroupBox();
panelCompanyTools = new Panel();
AddBoatButton = new Button();
UpdateButton = new Button();
maskedTextBox = new MaskedTextBox();
GoToTestButton = new Button();
DeleteButton = new Button();
buttonCompanyCreate = new Button();
panelCollection = new Panel();
buttonCollectionDelete = new Button();
@@ -38,19 +44,19 @@
radioButtonArray = new RadioButton();
textBoxCollectionName = new TextBox();
labelCollectionName = new Label();
UpdateButton = new Button();
GoToTestButton = new Button();
DeleteButton = new Button();
maskedTextBox = new MaskedTextBox();
AddCatamaranButton = new Button();
AddBoatButton = new Button();
comboBoxSelectorCompany = new ComboBox();
pictureBox = new PictureBox();
panelCompanyTools = new Panel();
menuStrip1 = new MenuStrip();
FileToolStripMenuItem = new ToolStripMenuItem();
SaveToolStripMenuItem = new ToolStripMenuItem();
LoadToolStripMenuItem = new ToolStripMenuItem();
saveFileDialog = new SaveFileDialog();
openFileDialog = new OpenFileDialog();
groupBox1.SuspendLayout();
panelCompanyTools.SuspendLayout();
panelCollection.SuspendLayout();
((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
panelCompanyTools.SuspendLayout();
menuStrip1.SuspendLayout();
SuspendLayout();
//
// groupBox1
@@ -60,13 +66,76 @@
groupBox1.Controls.Add(panelCollection);
groupBox1.Controls.Add(comboBoxSelectorCompany);
groupBox1.Dock = DockStyle.Right;
groupBox1.Location = new Point(809, 0);
groupBox1.Location = new Point(814, 28);
groupBox1.Name = "groupBox1";
groupBox1.Size = new Size(237, 642);
groupBox1.Size = new Size(237, 646);
groupBox1.TabIndex = 0;
groupBox1.TabStop = false;
groupBox1.Text = "Инструменты";
//
// panelCompanyTools
//
panelCompanyTools.Controls.Add(AddBoatButton);
panelCompanyTools.Controls.Add(UpdateButton);
panelCompanyTools.Controls.Add(maskedTextBox);
panelCompanyTools.Controls.Add(GoToTestButton);
panelCompanyTools.Controls.Add(DeleteButton);
panelCompanyTools.Dock = DockStyle.Bottom;
panelCompanyTools.Enabled = false;
panelCompanyTools.Location = new Point(3, 402);
panelCompanyTools.Name = "panelCompanyTools";
panelCompanyTools.Size = new Size(231, 241);
panelCompanyTools.TabIndex = 9;
//
// AddBoatButton
//
AddBoatButton.Location = new Point(3, 3);
AddBoatButton.Name = "AddBoatButton";
AddBoatButton.Size = new Size(222, 32);
AddBoatButton.TabIndex = 1;
AddBoatButton.Text = "Добавить лодку";
AddBoatButton.UseVisualStyleBackColor = true;
AddBoatButton.Click += AddBoatButton_Click;
//
// UpdateButton
//
UpdateButton.Location = new Point(3, 202);
UpdateButton.Name = "UpdateButton";
UpdateButton.Size = new Size(222, 38);
UpdateButton.TabIndex = 6;
UpdateButton.Text = "Обновить";
UpdateButton.UseVisualStyleBackColor = true;
UpdateButton.Click += UpdateButton_Click;
//
// maskedTextBox
//
maskedTextBox.Location = new Point(3, 80);
maskedTextBox.Mask = "00";
maskedTextBox.Name = "maskedTextBox";
maskedTextBox.Size = new Size(222, 27);
maskedTextBox.TabIndex = 3;
maskedTextBox.ValidatingType = typeof(int);
//
// GoToTestButton
//
GoToTestButton.Location = new Point(3, 158);
GoToTestButton.Name = "GoToTestButton";
GoToTestButton.Size = new Size(222, 38);
GoToTestButton.TabIndex = 5;
GoToTestButton.Text = "Передать на тесты";
GoToTestButton.UseVisualStyleBackColor = true;
GoToTestButton.Click += GoToTestButton_Click;
//
// DeleteButton
//
DeleteButton.Location = new Point(3, 113);
DeleteButton.Name = "DeleteButton";
DeleteButton.Size = new Size(222, 38);
DeleteButton.TabIndex = 4;
DeleteButton.Text = "Удалить лодку";
DeleteButton.UseVisualStyleBackColor = true;
DeleteButton.Click += DeleteButton_Click;
//
// buttonCompanyCreate
//
buttonCompanyCreate.Location = new Point(6, 366);
@@ -157,65 +226,6 @@
labelCollectionName.TabIndex = 0;
labelCollectionName.Text = "Название коллекции:";
//
// UpdateButton
//
UpdateButton.Location = new Point(3, 202);
UpdateButton.Name = "UpdateButton";
UpdateButton.Size = new Size(222, 38);
UpdateButton.TabIndex = 6;
UpdateButton.Text = "Обновить";
UpdateButton.UseVisualStyleBackColor = true;
UpdateButton.Click += UpdateButton_Click;
//
// GoToTestButton
//
GoToTestButton.Location = new Point(3, 158);
GoToTestButton.Name = "GoToTestButton";
GoToTestButton.Size = new Size(222, 38);
GoToTestButton.TabIndex = 5;
GoToTestButton.Text = "Передать на тесты";
GoToTestButton.UseVisualStyleBackColor = true;
GoToTestButton.Click += GoToTestButton_Click;
//
// DeleteButton
//
DeleteButton.Location = new Point(3, 113);
DeleteButton.Name = "DeleteButton";
DeleteButton.Size = new Size(222, 38);
DeleteButton.TabIndex = 4;
DeleteButton.Text = "Удалить лодку";
DeleteButton.UseVisualStyleBackColor = true;
DeleteButton.Click += DeleteButton_Click;
//
// maskedTextBox
//
maskedTextBox.Location = new Point(3, 80);
maskedTextBox.Mask = "00";
maskedTextBox.Name = "maskedTextBox";
maskedTextBox.Size = new Size(222, 27);
maskedTextBox.TabIndex = 3;
maskedTextBox.ValidatingType = typeof(int);
//
// AddCatamaranButton
//
AddCatamaranButton.Location = new Point(3, 41);
AddCatamaranButton.Name = "AddCatamaranButton";
AddCatamaranButton.Size = new Size(222, 33);
AddCatamaranButton.TabIndex = 2;
AddCatamaranButton.Text = "Добавить катамаран";
AddCatamaranButton.UseVisualStyleBackColor = true;
AddCatamaranButton.Click += AddCatamaranButton_Click;
//
// AddBoatButton
//
AddBoatButton.Location = new Point(3, 3);
AddBoatButton.Name = "AddBoatButton";
AddBoatButton.Size = new Size(222, 32);
AddBoatButton.TabIndex = 1;
AddBoatButton.Text = "Добавить лодку";
AddBoatButton.UseVisualStyleBackColor = true;
AddBoatButton.Click += AddBoatButton_Click;
//
// comboBoxSelectorCompany
//
comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
@@ -232,43 +242,75 @@
// pictureBox
//
pictureBox.Dock = DockStyle.Fill;
pictureBox.Location = new Point(0, 0);
pictureBox.Location = new Point(0, 28);
pictureBox.Name = "pictureBox";
pictureBox.Size = new Size(809, 642);
pictureBox.Size = new Size(814, 646);
pictureBox.TabIndex = 1;
pictureBox.TabStop = false;
//
// panelCompanyTools
// menuStrip1
//
panelCompanyTools.Controls.Add(AddCatamaranButton);
panelCompanyTools.Controls.Add(AddBoatButton);
panelCompanyTools.Controls.Add(UpdateButton);
panelCompanyTools.Controls.Add(maskedTextBox);
panelCompanyTools.Controls.Add(GoToTestButton);
panelCompanyTools.Controls.Add(DeleteButton);
panelCompanyTools.Dock = DockStyle.Bottom;
panelCompanyTools.Enabled = false;
panelCompanyTools.Location = new Point(3, 398);
panelCompanyTools.Name = "panelCompanyTools";
panelCompanyTools.Size = new Size(231, 241);
panelCompanyTools.TabIndex = 9;
menuStrip1.ImageScalingSize = new Size(20, 20);
menuStrip1.Items.AddRange(new ToolStripItem[] { FileToolStripMenuItem });
menuStrip1.Location = new Point(0, 0);
menuStrip1.Name = "menuStrip1";
menuStrip1.Size = new Size(1051, 28);
menuStrip1.TabIndex = 2;
menuStrip1.Text = "menuStrip1";
//
// FileToolStripMenuItem
//
FileToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { SaveToolStripMenuItem, LoadToolStripMenuItem });
FileToolStripMenuItem.Name = "FileToolStripMenuItem";
FileToolStripMenuItem.Size = new Size(59, 24);
FileToolStripMenuItem.Text = "Файл";
//
// SaveToolStripMenuItem
//
SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
SaveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
SaveToolStripMenuItem.Size = new Size(216, 26);
SaveToolStripMenuItem.Text = "Сохранить";
SaveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
//
// LoadToolStripMenuItem
//
LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
LoadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
LoadToolStripMenuItem.Size = new Size(216, 26);
LoadToolStripMenuItem.Text = "Загрузить";
LoadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
//
// saveFileDialog
//
saveFileDialog.Filter = "txt file | *.txt";
//
// openFileDialog
//
openFileDialog.FileName = "openFileDialog1";
openFileDialog.Filter = "txt file | *.txt";
//
// FormBoatColletion
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(1046, 642);
ClientSize = new Size(1051, 674);
Controls.Add(pictureBox);
Controls.Add(groupBox1);
Controls.Add(menuStrip1);
MainMenuStrip = menuStrip1;
Name = "FormBoatColletion";
Text = "Коллекция лодок";
groupBox1.ResumeLayout(false);
panelCompanyTools.ResumeLayout(false);
panelCompanyTools.PerformLayout();
panelCollection.ResumeLayout(false);
panelCollection.PerformLayout();
((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
panelCompanyTools.ResumeLayout(false);
panelCompanyTools.PerformLayout();
menuStrip1.ResumeLayout(false);
menuStrip1.PerformLayout();
ResumeLayout(false);
PerformLayout();
}
#endregion
@@ -276,7 +318,6 @@
private GroupBox groupBox1;
private ComboBox comboBoxSelectorCompany;
private Button AddBoatButton;
private Button AddCatamaranButton;
private PictureBox pictureBox;
private MaskedTextBox maskedTextBox;
private Button DeleteButton;
@@ -292,5 +333,11 @@
private ListBox listBoxCollection;
private Button buttonCollectionAdd;
private Panel panelCompanyTools;
private MenuStrip menuStrip1;
private ToolStripMenuItem FileToolStripMenuItem;
private ToolStripMenuItem SaveToolStripMenuItem;
private ToolStripMenuItem LoadToolStripMenuItem;
private SaveFileDialog saveFileDialog;
private OpenFileDialog openFileDialog;
}
}

View File

@@ -1,6 +1,9 @@
using Catamaran.CollectionGenericObjects;
using Catamaran.Drawings;
using Catamaran.Exceptions;
using Microsoft.Extensions.Logging;
using System;
using System.CodeDom;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -19,10 +22,13 @@ namespace Catamaran
private readonly StorageCollection<DrawingBoat> _storageCollection;
public FormBoatColletion()
private readonly ILogger _logger;
public FormBoatColletion(ILogger<FormBoatColletion> logger)
{
InitializeComponent();
_storageCollection = new();
_logger = logger;
}
private void comboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
@@ -30,51 +36,40 @@ namespace Catamaran
panelCompanyTools.Enabled = false;
}
private void CreateObject(string type)
private void AddBoatButton_Click(object sender, EventArgs e)
{
if (_company == null)
{
return;
}
FormBoatConfig form = new();
form.AddEvent(SetBoat);
form.Show();
}
DrawingBoat drawingBoat;
Random random = new();
switch (type)
private void SetBoat(DrawingBoat boat)
{
if (_company == null || boat == null)
{
case nameof(DrawingBoat):
drawingBoat = new DrawingBoat(random.Next(100, 500), random.Next(1000, 3000), GetColor(random));
break;
case nameof(DrawingCatamaran):
drawingBoat = new DrawingCatamaran(random.Next(100, 500), random.Next(1000, 3000), GetColor(random), GetColor(random),
Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
break;
default:
return;
return;
}
if (_company + drawingBoat >= 0)
try
{
int addingObj = _company + boat;
MessageBox.Show("Объект добавлен");
_logger.LogInformation($"Добавлен объект {boat.GetDataForSave()}");
pictureBox.Image = _company.Show();
}
else
catch (CollectionOverflowException ex)
{
MessageBox.Show("Не удалось добавить объект");
_logger.LogWarning($"Не удалось добавить объект {ex.Message}");
}
}
private void AddBoatButton_Click(object sender, EventArgs e)
{
CreateObject(nameof(DrawingBoat));
}
private void AddCatamaranButton_Click(object sender, EventArgs e)
{
CreateObject(nameof(DrawingCatamaran));
}
private static Color GetColor(Random random)
{
@@ -100,14 +95,22 @@ namespace Catamaran
}
int pos = Convert.ToInt32(maskedTextBox.Text);
if (_company - pos != null)
try
{
object delObj = _company - pos;
MessageBox.Show("Объект удален");
_logger.LogInformation($"Удален объект по позиции {pos}");
pictureBox.Image = _company.Show();
}
else
catch (ObjectNotFoundException ex)
{
MessageBox.Show("Не удалось удалить объект");
_logger.LogWarning($"Не удалось удалить объект по позиции {pos}");
}
catch (PositionOutOfRangeException)
{
MessageBox.Show("Удаление вне рамкок коллекции");
_logger.LogWarning($"Не удалось удалить объект по позиции {pos} - вне коллекции");
}
}
@@ -126,27 +129,34 @@ namespace Catamaran
{
return;
}
DrawingBoat? boat = null;
int counter = 100;
while (boat == null)
try
{
boat = _company.GetRandomObject();
DrawingBoat? boat = null;
int counter = 100;
while (boat == null)
{
boat = _company.GetRandomObject();
counter--;
if (counter <= 0) break;
}
counter--;
if (boat == null)
{
return;
}
if (counter <= 0) break;
}
if (boat == null)
{
throw new ObjectNotFoundException();
}
FormCatamaran form = new()
{
SetBoat = boat
};
form.ShowDialog();
FormCatamaran form = new()
{
SetBoat = boat
};
form.ShowDialog();
}
catch (ObjectNotFoundException)
{
_logger.LogWarning($"Не удалось найти объект для отправки на тест");
}
}
private void RefreshListBoxItems()
@@ -167,6 +177,7 @@ namespace Catamaran
if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonArray.Checked && !radioButtonList.Checked))
{
MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
_logger.LogWarning("Неверно введены данные для создания коллекции");
return;
}
@@ -181,6 +192,7 @@ namespace Catamaran
}
_storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
_logger.LogInformation($"Добавлена коллекция - {textBoxCollectionName.Text}");
RefreshListBoxItems();
}
@@ -189,13 +201,16 @@ namespace Catamaran
if (listBoxCollection.SelectedItem == null || listBoxCollection.SelectedIndex < 0)
{
MessageBox.Show("Не выбрана коллекция");
_logger.LogWarning("Ошибка удаления коллекции - она не выбрана");
return;
}
string temp = listBoxCollection.SelectedItem.ToString() ?? string.Empty;
if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
{
return;
}
_storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
_logger.LogInformation($"Удалена коллекция - {temp}");
RefreshListBoxItems();
}
@@ -204,6 +219,7 @@ namespace Catamaran
if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
{
MessageBox.Show("Коллекция не выбрана");
_logger.LogWarning("Ошибка создания компании - она не выбрана");
return;
}
@@ -211,6 +227,7 @@ namespace Catamaran
if (collection == null)
{
MessageBox.Show("Коллекция не инициализирована");
_logger.LogWarning("Ошибка инициализации коллекции");
return;
}
@@ -225,6 +242,44 @@ namespace Catamaran
RefreshListBoxItems();
}
private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
{
if (saveFileDialog.ShowDialog() == DialogResult.OK)
{
try
{
_storageCollection.SaveData(saveFileDialog.FileName);
MessageBox.Show("Успешно сохранено", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
_logger.LogInformation("Сохранение в файл: {filename}", saveFileDialog.FileName);
}
catch(Exception ex)
{
MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
_logger.LogError("Ошибка сохранения: {Message}", ex.Message);
}
}
}
private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
{
if (openFileDialog.ShowDialog() == DialogResult.OK)
{
try
{
_storageCollection.LoadData(openFileDialog.FileName);
MessageBox.Show("Успешно загружено", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
RefreshListBoxItems();
_logger.LogInformation("Загрузка из файла: {filename}", openFileDialog.FileName);
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
_logger.LogError("Ошибка загрузки: {Message}", ex.Message);
}
}
}
}
}

View File

@@ -117,4 +117,13 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>153, 17</value>
</metadata>
<metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>318, 17</value>
</metadata>
</root>

View File

@@ -0,0 +1,378 @@
namespace Catamaran
{
partial class FormBoatConfig
{
/// <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()
{
groupBoxConfig = new GroupBox();
groupBoxColors = new GroupBox();
panelMagenta = new Panel();
panelBlack = new Panel();
panelGray = new Panel();
panelWhite = new Panel();
panelYellow = new Panel();
panelBlue = new Panel();
panelGreen = new Panel();
panelRed = new Panel();
checkBoxRightBobber = new CheckBox();
checkBoxLeftBobber = new CheckBox();
checkBoxSail = new CheckBox();
numericUpDownWeight = new NumericUpDown();
labelWeight = new Label();
numericUpDownSpeed = new NumericUpDown();
labelSpeed = new Label();
labelAdvancedObject = new Label();
labelSimpleObject = new Label();
pictureBoxObject = new PictureBox();
buttonAdd = new Button();
buttonCancel = new Button();
panelObject = new Panel();
labelAdditionalColor = new Label();
labelBodyColor = new Label();
groupBoxConfig.SuspendLayout();
groupBoxColors.SuspendLayout();
((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
panelObject.SuspendLayout();
SuspendLayout();
//
// groupBoxConfig
//
groupBoxConfig.Controls.Add(groupBoxColors);
groupBoxConfig.Controls.Add(checkBoxRightBobber);
groupBoxConfig.Controls.Add(checkBoxLeftBobber);
groupBoxConfig.Controls.Add(checkBoxSail);
groupBoxConfig.Controls.Add(numericUpDownWeight);
groupBoxConfig.Controls.Add(labelWeight);
groupBoxConfig.Controls.Add(numericUpDownSpeed);
groupBoxConfig.Controls.Add(labelSpeed);
groupBoxConfig.Controls.Add(labelAdvancedObject);
groupBoxConfig.Controls.Add(labelSimpleObject);
groupBoxConfig.Dock = DockStyle.Left;
groupBoxConfig.Location = new Point(0, 0);
groupBoxConfig.Name = "groupBoxConfig";
groupBoxConfig.Size = new Size(599, 271);
groupBoxConfig.TabIndex = 0;
groupBoxConfig.TabStop = false;
groupBoxConfig.Text = "Параметры";
//
// groupBoxColors
//
groupBoxColors.Controls.Add(panelMagenta);
groupBoxColors.Controls.Add(panelBlack);
groupBoxColors.Controls.Add(panelGray);
groupBoxColors.Controls.Add(panelWhite);
groupBoxColors.Controls.Add(panelYellow);
groupBoxColors.Controls.Add(panelBlue);
groupBoxColors.Controls.Add(panelGreen);
groupBoxColors.Controls.Add(panelRed);
groupBoxColors.Location = new Point(257, 26);
groupBoxColors.Name = "groupBoxColors";
groupBoxColors.Size = new Size(239, 125);
groupBoxColors.TabIndex = 9;
groupBoxColors.TabStop = false;
groupBoxColors.Text = "Цвета";
//
// panelMagenta
//
panelMagenta.BackColor = Color.Magenta;
panelMagenta.Location = new Point(189, 74);
panelMagenta.Name = "panelMagenta";
panelMagenta.Size = new Size(38, 39);
panelMagenta.TabIndex = 1;
panelMagenta.MouseDown += panel_MouseDown;
//
// panelBlack
//
panelBlack.BackColor = Color.Black;
panelBlack.Location = new Point(130, 74);
panelBlack.Name = "panelBlack";
panelBlack.Size = new Size(38, 39);
panelBlack.TabIndex = 1;
panelBlack.MouseDown += panel_MouseDown;
//
// panelGray
//
panelGray.BackColor = Color.Gray;
panelGray.Location = new Point(70, 74);
panelGray.Name = "panelGray";
panelGray.Size = new Size(38, 39);
panelGray.TabIndex = 1;
panelGray.MouseDown += panel_MouseDown;
//
// panelWhite
//
panelWhite.BackColor = Color.White;
panelWhite.Location = new Point(11, 74);
panelWhite.Name = "panelWhite";
panelWhite.Size = new Size(38, 39);
panelWhite.TabIndex = 1;
panelWhite.MouseDown += panel_MouseDown;
//
// panelYellow
//
panelYellow.BackColor = Color.Yellow;
panelYellow.Location = new Point(189, 22);
panelYellow.Name = "panelYellow";
panelYellow.Size = new Size(38, 39);
panelYellow.TabIndex = 1;
panelYellow.MouseDown += panel_MouseDown;
//
// panelBlue
//
panelBlue.BackColor = Color.Blue;
panelBlue.Location = new Point(130, 22);
panelBlue.Name = "panelBlue";
panelBlue.Size = new Size(38, 39);
panelBlue.TabIndex = 1;
panelBlue.MouseDown += panel_MouseDown;
//
// panelGreen
//
panelGreen.BackColor = Color.Green;
panelGreen.Location = new Point(70, 22);
panelGreen.Name = "panelGreen";
panelGreen.Size = new Size(38, 39);
panelGreen.TabIndex = 1;
panelGreen.MouseDown += panel_MouseDown;
//
// panelRed
//
panelRed.BackColor = Color.Red;
panelRed.Location = new Point(11, 22);
panelRed.Name = "panelRed";
panelRed.Size = new Size(38, 39);
panelRed.TabIndex = 0;
panelRed.MouseDown += panel_MouseDown;
//
// checkBoxRightBobber
//
checkBoxRightBobber.AutoSize = true;
checkBoxRightBobber.Location = new Point(12, 173);
checkBoxRightBobber.Name = "checkBoxRightBobber";
checkBoxRightBobber.Size = new Size(158, 24);
checkBoxRightBobber.TabIndex = 8;
checkBoxRightBobber.Text = "Правый поплавок";
checkBoxRightBobber.UseVisualStyleBackColor = true;
//
// checkBoxLeftBobber
//
checkBoxLeftBobber.AutoSize = true;
checkBoxLeftBobber.Location = new Point(12, 143);
checkBoxLeftBobber.Name = "checkBoxLeftBobber";
checkBoxLeftBobber.Size = new Size(148, 24);
checkBoxLeftBobber.TabIndex = 7;
checkBoxLeftBobber.Text = "Левый поплавок";
checkBoxLeftBobber.UseVisualStyleBackColor = true;
//
// checkBoxSail
//
checkBoxSail.AutoSize = true;
checkBoxSail.Location = new Point(12, 101);
checkBoxSail.Name = "checkBoxSail";
checkBoxSail.Size = new Size(73, 24);
checkBoxSail.TabIndex = 6;
checkBoxSail.Text = "Парус";
checkBoxSail.UseVisualStyleBackColor = true;
//
// numericUpDownWeight
//
numericUpDownWeight.Location = new Point(94, 61);
numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
numericUpDownWeight.Name = "numericUpDownWeight";
numericUpDownWeight.Size = new Size(136, 27);
numericUpDownWeight.TabIndex = 5;
numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
//
// labelWeight
//
labelWeight.AutoSize = true;
labelWeight.Location = new Point(12, 63);
labelWeight.Name = "labelWeight";
labelWeight.Size = new Size(36, 20);
labelWeight.TabIndex = 4;
labelWeight.Text = "Вес:";
//
// numericUpDownSpeed
//
numericUpDownSpeed.Location = new Point(94, 27);
numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
numericUpDownSpeed.Name = "numericUpDownSpeed";
numericUpDownSpeed.Size = new Size(136, 27);
numericUpDownSpeed.TabIndex = 3;
numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
//
// labelSpeed
//
labelSpeed.AutoSize = true;
labelSpeed.Location = new Point(12, 29);
labelSpeed.Name = "labelSpeed";
labelSpeed.Size = new Size(76, 20);
labelSpeed.TabIndex = 2;
labelSpeed.Text = "Скорость:";
//
// labelAdvancedObject
//
labelAdvancedObject.BorderStyle = BorderStyle.FixedSingle;
labelAdvancedObject.Location = new Point(411, 206);
labelAdvancedObject.Name = "labelAdvancedObject";
labelAdvancedObject.Size = new Size(148, 33);
labelAdvancedObject.TabIndex = 1;
labelAdvancedObject.Text = "Продвинутый";
labelAdvancedObject.TextAlign = ContentAlignment.MiddleCenter;
labelAdvancedObject.MouseDown += labelObject_MouseDown;
//
// labelSimpleObject
//
labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
labelSimpleObject.Location = new Point(257, 206);
labelSimpleObject.Name = "labelSimpleObject";
labelSimpleObject.Size = new Size(148, 33);
labelSimpleObject.TabIndex = 0;
labelSimpleObject.Text = "Простой";
labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
labelSimpleObject.MouseDown += labelObject_MouseDown;
//
// pictureBoxObject
//
pictureBoxObject.Location = new Point(14, 63);
pictureBoxObject.Name = "pictureBoxObject";
pictureBoxObject.Size = new Size(264, 119);
pictureBoxObject.TabIndex = 1;
pictureBoxObject.TabStop = false;
//
// buttonAdd
//
buttonAdd.Location = new Point(619, 210);
buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(94, 29);
buttonAdd.TabIndex = 2;
buttonAdd.Text = "Добавить";
buttonAdd.UseVisualStyleBackColor = true;
buttonAdd.Click += buttonAdd_Click;
//
// buttonCancel
//
buttonCancel.Location = new Point(789, 210);
buttonCancel.Name = "buttonCancel";
buttonCancel.Size = new Size(94, 29);
buttonCancel.TabIndex = 3;
buttonCancel.Text = "Отмена";
buttonCancel.UseVisualStyleBackColor = true;
//
// panelObject
//
panelObject.AllowDrop = true;
panelObject.Controls.Add(labelAdditionalColor);
panelObject.Controls.Add(labelBodyColor);
panelObject.Controls.Add(pictureBoxObject);
panelObject.Location = new Point(605, 12);
panelObject.Name = "panelObject";
panelObject.Size = new Size(287, 185);
panelObject.TabIndex = 4;
panelObject.DragDrop += panelObject_DragDrop;
panelObject.DragEnter += panelObject_DragEnter;
//
// labelAdditionalColor
//
labelAdditionalColor.AllowDrop = true;
labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
labelAdditionalColor.Location = new Point(169, 9);
labelAdditionalColor.Name = "labelAdditionalColor";
labelAdditionalColor.Size = new Size(109, 33);
labelAdditionalColor.TabIndex = 11;
labelAdditionalColor.Text = "Доп. цвет";
labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
labelAdditionalColor.DragDrop += labelAdditionalColor_DragDrop;
labelAdditionalColor.DragEnter += labelAdditionalColor_DragEnter;
//
// labelBodyColor
//
labelBodyColor.AllowDrop = true;
labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
labelBodyColor.Location = new Point(14, 9);
labelBodyColor.Name = "labelBodyColor";
labelBodyColor.Size = new Size(109, 33);
labelBodyColor.TabIndex = 10;
labelBodyColor.Text = "Цвет";
labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
labelBodyColor.DragDrop += labelBodyColor_DragDrop;
labelBodyColor.DragEnter += labelBodyColor_DragEnter;
//
// FormBoatConfig
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(920, 271);
Controls.Add(panelObject);
Controls.Add(buttonCancel);
Controls.Add(buttonAdd);
Controls.Add(groupBoxConfig);
Name = "FormBoatConfig";
Text = "Настройка объекта";
groupBoxConfig.ResumeLayout(false);
groupBoxConfig.PerformLayout();
groupBoxColors.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
panelObject.ResumeLayout(false);
ResumeLayout(false);
}
#endregion
private GroupBox groupBoxConfig;
private Label labelSimpleObject;
private Label labelSpeed;
private Label labelAdvancedObject;
private NumericUpDown numericUpDownSpeed;
private CheckBox checkBoxLeftBobber;
private CheckBox checkBoxSail;
private NumericUpDown numericUpDownWeight;
private Label labelWeight;
private GroupBox groupBoxColors;
private CheckBox checkBoxRightBobber;
private Panel panelYellow;
private Panel panelBlue;
private Panel panelGreen;
private Panel panelRed;
private Panel panelMagenta;
private Panel panelBlack;
private Panel panelGray;
private Panel panelWhite;
private PictureBox pictureBoxObject;
private Button buttonAdd;
private Button buttonCancel;
private Panel panelObject;
private Label labelAdditionalColor;
private Label labelBodyColor;
}
}

View File

@@ -0,0 +1,147 @@
using Catamaran.Drawings;
using Catamaran.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 Catamaran
{
public partial class FormBoatConfig : Form
{
private DrawingBoat? _boat = null;
public event Action<DrawingBoat>? BoatDelegate;
public FormBoatConfig()
{
InitializeComponent();
panelRed.MouseDown += panel_MouseDown;
panelGreen.MouseDown += panel_MouseDown;
panelBlue.MouseDown += panel_MouseDown;
panelWhite.MouseDown += panel_MouseDown;
panelBlack.MouseDown += panel_MouseDown;
panelGray.MouseDown += panel_MouseDown;
panelMagenta.MouseDown += panel_MouseDown;
panelYellow.MouseDown += panel_MouseDown;
buttonCancel.Click += (events, e) => Close();
}
public void AddEvent(Action<DrawingBoat>? boatDelegate)
{
BoatDelegate += boatDelegate;
}
private void DrawObject()
{
Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
Graphics g = Graphics.FromImage(bmp);
_boat?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
_boat?.SetPosition(5, 5);
_boat?.DrawTransport(g);
pictureBoxObject.Image = bmp;
}
private void labelObject_MouseDown(object sender, MouseEventArgs e)
{
var label = sender as Label;
label?.DoDragDrop(label?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy);
}
private void panelObject_DragEnter(object sender, DragEventArgs e)
{
if (e.Data?.GetDataPresent(DataFormats.Text) ?? false)
{
e.Effect = DragDropEffects.Copy;
}
else
{
e.Effect = DragDropEffects.None;
}
}
private void panelObject_DragDrop(object sender, DragEventArgs e)
{
switch (e.Data?.GetData(DataFormats.Text)?.ToString())
{
case "labelSimpleObject":
_boat = new DrawingBoat((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White);
break;
case "labelAdvancedObject":
_boat = new DrawingCatamaran((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, Color.Black,
checkBoxLeftBobber.Checked, checkBoxRightBobber.Checked, checkBoxSail.Checked);
break;
}
DrawObject();
}
private void panel_MouseDown(object? sender, MouseEventArgs e)
{
var panel = sender as Panel;
panel?.DoDragDrop(panel?.BackColor ?? Color.White, DragDropEffects.Move | DragDropEffects.Copy);
}
private void labelBodyColor_DragEnter(object sender, DragEventArgs e)
{
if (e.Data.GetDataPresent(typeof(Color)))
{
e.Effect = DragDropEffects.Copy;
}
else
{
e.Effect = DragDropEffects.None;
}
}
private void labelAdditionalColor_DragEnter(Object sender, DragEventArgs e)
{
if (_boat is DrawingCatamaran)
{
if (e.Data.GetDataPresent(typeof(Color)))
{
e.Effect = DragDropEffects.Copy;
}
else
{
e.Effect = DragDropEffects.None;
}
}
}
private void labelBodyColor_DragDrop(object sender, DragEventArgs e)
{
if (_boat == null)
{
return;
}
_boat.EntityBoat?.SetBodyColor((Color)e.Data.GetData(typeof(Color)));
DrawObject();
}
private void labelAdditionalColor_DragDrop(Object sender, DragEventArgs e)
{
if (_boat?.EntityBoat is EntityCatamaran _catamaran)
{
_catamaran.SetAdditionalColor((Color)e.Data?.GetData(typeof(Color)));
}
DrawObject();
}
private void buttonAdd_Click(object sender, EventArgs e)
{
if (_boat != null)
{
BoatDelegate?.Invoke(_boat);
Close();
}
}
}
}

View File

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

View File

@@ -1,3 +1,8 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Serilog;
namespace Catamaran
{
internal static class Program
@@ -11,7 +16,27 @@ namespace Catamaran
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
Application.Run(new FormBoatColletion());
ServiceCollection services = new ServiceCollection();
ConfigureServices(services);
using ServiceProvider serviceProvider = services.BuildServiceProvider();
Application.Run(serviceProvider.GetRequiredService<FormBoatColletion>());
}
public static void ConfigureServices(ServiceCollection services)
{
services.AddSingleton<FormBoatColletion>().AddLogging(option =>
{
var configuration = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory())
.AddJsonFile(path: "serilogConfig.json", optional: false, reloadOnChange: true)
.Build();
var logger = new LoggerConfiguration().ReadFrom.Configuration(configuration).CreateLogger();
option.SetMinimumLevel(LogLevel.Information);
option.AddSerilog(logger);
});
}
}
}

View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
autoReload="true" internalLogLevel="Info">
<targets>
<target xsi:type="File" name="tofile" fileName="carlog-${shortdate}.log" />
</targets>
<rules>
<logger name="*" minlevel="Debug" writeTo="tofile" />
</rules>
</nlog>
</configuration>

View File

@@ -0,0 +1,21 @@
{
"Serilog": {
"Using": [ "Serilog.Sinks.File" ],
"MinimumLevel": "Information",
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "Logs/log_.log",
"rollingInterval": "Day",
"outputTemplate": "{Level:u4}: [{Timestamp:HH:mm:ss.fff}] - {Message:lj}{Exception}{NewLine}"
}
}
],
"Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ],
"Properties": {
"Application": "Catamaran"
}
}
}