sofiaivv/PIbd23_Ivanova_S.V._MotorBoat_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

done lab6

Browse Source
This commit is contained in:
sofiaivv 2023-12-12 13:30:06 +04:00
parent f3fbf1e64f
commit 64dac95ddd
8 changed files with 309 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MotorBoat/MotorBoat/BoatGenericCollection.cs
View File

@ -69,7 +69,7 @@ namespace MotorBoat.Generics
{
return false;
}
return (bool)collect?._collection.Insert(obj);
return collect?._collection.Insert(obj) ?? false;
}
/// <summary>
@ -78,14 +78,14 @@ namespace MotorBoat.Generics
/// <param name="collect"></param>
/// <param name="pos"></param>
/// <returns></returns>
public static bool operator -(BoatsGenericCollection<T, U>? collect, int pos)
public static T? operator -(BoatsGenericCollection<T, U>? collect, int pos)
{
T? obj = collect._collection[pos];
if (obj != null)
{
collect._collection.Remove(pos);
}
return false;
return obj;
}
/// <summary>
@ -148,5 +148,10 @@ namespace MotorBoat.Generics
i++;
}
}
/// <summary>
/// Получение объектов коллекции
/// </summary>
public IEnumerable<T?> GetBoats => _collection.GetBoats();
}
}

107
MotorBoat/MotorBoat/BoatsGenericStorage.cs
View File

@ -23,6 +23,21 @@ namespace MotorBoat.Generics
/// </summary>
public List<string> Keys => _boatStorages.Keys.ToList();
/// <summary>
/// Разделитель для записи ключа и значения элемента словаря
/// </summary>
private static readonly char _separatorForKeyValue = '|';
/// <summary>
/// Разделитель для записей коллекции данных в файл
/// </summary>
private readonly char _separatorRecords = ';';
/// <summary>
/// Разделитель для записи информации по объекту в файл
/// </summary>
private static readonly char _separatorForObject = ':';
/// <summary>
/// Ширина окна отрисовки
/// </summary>
@ -82,5 +97,97 @@ namespace MotorBoat.Generics
return null;
}
}
/// <summary>
/// Сохранение информации по лодкам в хранилище в файл
/// </summary>
/// <param name="filename">Путь и имя файла</param>
/// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
public bool SaveData(string filename)
{
if (File.Exists(filename))
{
File.Delete(filename);
}
StringBuilder data = new();
foreach (KeyValuePair<string, BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>> record in _boatStorages)
{
StringBuilder records = new();
foreach (DrawningBoat? elem in record.Value.GetBoats)
{
records.Append($"{elem?.GetDataForSave(_separatorForObject)}{_separatorRecords}");
}
data.AppendLine($"{record.Key}{_separatorForKeyValue}{records}");
}
if (data.Length == 0) {
return false;
}
using (StreamWriter writer = new StreamWriter(filename))
{
writer.Write($"BoatStorage{Environment.NewLine}{data}");
}
return true;
*/
}
/// <summary>
/// Загрузка информации по автомобилям в хранилище из файла
/// </summary>
/// <param name="filename">Путь и имя файла</param>
/// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
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("BoatStorage"))
{
return false;
}
_boatStorages.Clear();
string strs = "";
while ((strs = fs.ReadLine()) != null)
{
if (strs == null)
{
return false;
}
string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
if (record.Length != 2)
{
continue;
}
BoatsGenericCollection<DrawningBoat, DrawningObjectBoat> collection = new(_pictureWidth, _pictureHeight);
string[] set = record[1].Split(_separatorRecords, StringSplitOptions.RemoveEmptyEntries);
foreach (string elem in set)
{
DrawningBoat? boat = elem?.CreateDrawningBoat(_separatorForObject, _pictureWidth, _pictureHeight);
if (boat != null)
{
if (!(collection + boat))
{
return false;
}
}
}
_boatStorages.Add(record[0], collection);
}
return true;
}
}
}
}

66
MotorBoat/MotorBoat/ExtentionDrawningBoat.cs Normal file
View File

@ -0,0 +1,66 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using MotorBoat.Entities;
namespace MotorBoat.DrawningObjects
{
/// <summary>
/// Расширение для класса EntityBoat
/// </summary>
public static class ExtentionDrawningBoat
{
/// <summary>
/// Создание объекта из строки
/// </summary>
/// <param name="info">Строка с данными для создания объекта</param>
/// <param name="separatorForObject">Разделитель даннных</param>
/// <param name="width">Ширина</param>
/// <param name="height">Высота</param>
/// <returns>Объект</returns>
public static DrawningBoat? CreateDrawningBoat(this string info, char separatorForObject, int width, int height)
{
string[] strs = info.Split(separatorForObject);
if (strs.Length == 3)
{
return new DrawningBoat(Convert.ToInt32(strs[0]),
Convert.ToInt32(strs[1]), Color.FromName(strs[2]), width, height);
}
if (strs.Length == 7)
{
return new DrawningMotorBoat(Convert.ToInt32(strs[0]),
Convert.ToInt32(strs[1]),
Color.FromName(strs[2]),
Color.FromName(strs[3]),
Convert.ToBoolean(strs[4]),
Convert.ToBoolean(strs[5]), width, height);
}
return null;
}
/// <summary>
/// Получение данных для сохранения в файл
/// </summary>
/// <param name="drawningBoat">Сохраняемый объект</param>
/// <param name="separatorForObject">Разделитель даннных</param>
/// <returns>Строка с данными по объекту</returns>
public static string GetDataForSave(this DrawningBoat drawningBoat,
char separatorForObject)
{
var boat = drawningBoat.EntityBoat;
if (boat == null)
{
return string.Empty;
}
var str = $"{boat.Speed}{separatorForObject}{boat.Weight}{separatorForObject}{boat.BodyColor.Name}";
if (boat is not EntityMotorBoat motorBoat)
{
return str;
}
return $"{str}{separatorForObject}{motorBoat.AdditionalColor.Name}" +
$"{separatorForObject}{motorBoat.Glass}{separatorForObject}{motorBoat.Engine}{separatorForObject}";
}
}
}

69
MotorBoat/MotorBoat/FormBoatCollection.Designer.cs generated
View File

@ -39,17 +39,24 @@
listBoxStorages = new ListBox();
ButtonAddObject = new Button();
textBoxStorageName = new MaskedTextBox();
menuStrip1 = new MenuStrip();
FileToolStripMenuItem = new ToolStripMenuItem();
SaveToolStripMenuItem = new ToolStripMenuItem();
LoadToolStripMenuItem = new ToolStripMenuItem();
openFileDialog = new OpenFileDialog();
saveFileDialog = new SaveFileDialog();
((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit();
groupBoxTools.SuspendLayout();
groupBoxCollections.SuspendLayout();
menuStrip1.SuspendLayout();
SuspendLayout();
//
// pictureBoxCollection
//
pictureBoxCollection.Dock = DockStyle.Left;
pictureBoxCollection.Location = new Point(0, 0);
pictureBoxCollection.Location = new Point(0, 24);
pictureBoxCollection.Name = "pictureBoxCollection";
pictureBoxCollection.Size = new Size(578, 500);
pictureBoxCollection.Size = new Size(578, 504);
pictureBoxCollection.TabIndex = 1;
pictureBoxCollection.TabStop = false;
//
@ -98,9 +105,9 @@
groupBoxTools.Controls.Add(ButtonAddBoat);
groupBoxTools.Controls.Add(maskedTextBoxNumber);
groupBoxTools.Dock = DockStyle.Right;
groupBoxTools.Location = new Point(584, 0);
groupBoxTools.Location = new Point(584, 24);
groupBoxTools.Name = "groupBoxTools";
groupBoxTools.Size = new Size(200, 500);
groupBoxTools.Size = new Size(200, 504);
groupBoxTools.TabIndex = 0;
groupBoxTools.TabStop = false;
groupBoxTools.Text = "Инструменты";
@ -136,7 +143,7 @@
listBoxStorages.Name = "listBoxStorages";
listBoxStorages.Size = new Size(176, 109);
listBoxStorages.TabIndex = 2;
listBoxStorages.SelectedIndexChanged += ListBoxObjects_SelectedIndexChanged;
listBoxStorages.SelectedIndexChanged += ButtonRefreshCollection_Click;
//
// ButtonAddObject
//
@ -155,13 +162,54 @@
textBoxStorageName.Size = new Size(176, 23);
textBoxStorageName.TabIndex = 0;
//
// menuStrip1
//
menuStrip1.Items.AddRange(new ToolStripItem[] { FileToolStripMenuItem });
menuStrip1.Location = new Point(0, 0);
menuStrip1.Name = "menuStrip1";
menuStrip1.Size = new Size(784, 24);
menuStrip1.TabIndex = 2;
menuStrip1.Text = "menuStrip1";
//
// FileToolStripMenuItem
//
FileToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { SaveToolStripMenuItem, LoadToolStripMenuItem });
FileToolStripMenuItem.Name = "FileToolStripMenuItem";
FileToolStripMenuItem.Size = new Size(48, 20);
FileToolStripMenuItem.Text = "Файл";
//
// SaveToolStripMenuItem
//
SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
SaveToolStripMenuItem.Size = new Size(180, 22);
SaveToolStripMenuItem.Text = "Сохранение";
SaveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
//
// LoadToolStripMenuItem
//
LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
LoadToolStripMenuItem.Size = new Size(180, 22);
LoadToolStripMenuItem.Text = "Загрузка";
LoadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
//
// openFileDialog
//
openFileDialog.FileName = "openFileDialog1";
openFileDialog.Filter = "txt file | *.txt";
//
// saveFileDialog
//
saveFileDialog.Filter = "txt file | *.txt";
//
// FormBoatCollection
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(784, 500);
ClientSize = new Size(784, 528);
Controls.Add(groupBoxTools);
Controls.Add(pictureBoxCollection);
Controls.Add(menuStrip1);
MainMenuStrip = menuStrip1;
Name = "FormBoatCollection";
Text = "Набор лодок";
((System.ComponentModel.ISupportInitialize)pictureBoxCollection).EndInit();
@ -169,7 +217,10 @@
groupBoxTools.PerformLayout();
groupBoxCollections.ResumeLayout(false);
groupBoxCollections.PerformLayout();
menuStrip1.ResumeLayout(false);
menuStrip1.PerformLayout();
ResumeLayout(false);
PerformLayout();
}
#endregion
@ -185,5 +236,11 @@
private ListBox listBoxStorages;
private Button ButtonAddObject;
private MaskedTextBox textBoxStorageName;
private MenuStrip menuStrip1;
private ToolStripMenuItem FileToolStripMenuItem;
private ToolStripMenuItem SaveToolStripMenuItem;
private ToolStripMenuItem LoadToolStripMenuItem;
private OpenFileDialog openFileDialog;
private SaveFileDialog saveFileDialog;
}
}

47
MotorBoat/MotorBoat/FormBoatCollection.cs
View File

@ -129,6 +129,7 @@ namespace MotorBoat
if (obj == null)
return;
if (obj + drawningBoat)
{
MessageBox.Show("Объект добавлен");
@ -189,5 +190,51 @@ namespace MotorBoat
pictureBoxCollection.Image = obj.ShowBoats();
}
/// <summary>
/// Обработка нажатия "Сохранение"
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
{
if (saveFileDialog.ShowDialog() == DialogResult.OK)
{
if (_storage.SaveData(saveFileDialog.FileName))
{
MessageBox.Show("Сохранение прошло успешно",
"Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
{
MessageBox.Show("Не сохранилось", "Результат",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
/// <summary>
/// Обработка нажатия "Загрузка"
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
{
if (openFileDialog.ShowDialog() == DialogResult.OK)
{
if (_storage.LoadData(openFileDialog.FileName))
{
MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
foreach (var collection in _storage.Keys)
{
listBoxStorages.Items.Add(collection);
}
}
else
{
MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
}
}

12
MotorBoat/MotorBoat/FormBoatCollection.resx
View File

@ -57,4 +57,16 @@
<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="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>132, 17</value>
</metadata>
<metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>272, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>39</value>
</metadata>
</root>

8
MotorBoat/MotorBoat/FormBoatConfig.Designer.cs generated
View File

@ -218,9 +218,9 @@
checkBoxEngine.AutoSize = true;
checkBoxEngine.Location = new Point(11, 126);
checkBoxEngine.Name = "checkBoxEngine";
checkBoxEngine.Size = new Size(225, 19);
checkBoxEngine.Size = new Size(180, 19);
checkBoxEngine.TabIndex = 7;
checkBoxEngine.Text = "Признак наличия защитного стекла";
checkBoxEngine.Text = "Признак наличия двигателя";
checkBoxEngine.UseVisualStyleBackColor = true;
//
// checkBoxGlass
@ -228,9 +228,9 @@
checkBoxGlass.AutoSize = true;
checkBoxGlass.Location = new Point(11, 99);
checkBoxGlass.Name = "checkBoxGlass";
checkBoxGlass.Size = new Size(180, 19);
checkBoxGlass.Size = new Size(225, 19);
checkBoxGlass.TabIndex = 6;
checkBoxGlass.Text = "Признак наличия двигателя";
checkBoxGlass.Text = "Признак наличия защитного стекла";
checkBoxGlass.UseVisualStyleBackColor = true;
//
// label2

4
MotorBoat/MotorBoat/SetGeneric.cs
View File

@ -60,7 +60,7 @@ namespace MotorBoat.Generics
/// <returns></returns>
public bool Insert(T boat, int position)
{
if(!(position >= 0 && position <= Count && _places.Count < _maxCount))
if (!(position >= 0 && position <= Count && _places.Count < _maxCount))
{
return false;
}
@ -108,7 +108,7 @@ namespace MotorBoat.Generics
/// </summary>
/// <param name="maxShips"></param>
/// <returns></returns>
public IEnumerable<T?> GetBoats(int? maxBoats = null)
public IEnumerable<T> GetBoats(int? maxBoats = null)
{
for (int i = 0; i < _places.Count; ++i)
{