Kristina/ISEbd-22_Musatkina_K._Y._Speedboat_Base
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

зафиксировать

Browse Source
This commit is contained in:
Учебный 2023-11-27 10:39:35 +04:00
parent 8e894ae31a
commit d37961cec2
3 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ProjectBoat_base/ProjectBoat_bae/ExtentionBoat.cs
View File

@ -16,13 +16,13 @@ namespace ProjectBoat_bae
private static readonly char _separatorForObject = ':'; private static readonly char _separatorForObject = ':';
// Создание объекта из строки // Создание объекта из строки
public static Drawningboat CreateDrawningBoat(this string info, char _separatorForObject, int _pictureWidth, int _pictureHeight) public static Drawningboat? CreateDrawningBoat(this string info, char _separatorForObject, int _pictureWidth, int _pictureHeight)
{ {
string[] strs = info.Split(_separatorForObject); string[] strs = info.Split(_separatorForObject);
if (strs.Length == 3) if (strs.Length == 3)
{ {
return new Drawningboat(Convert.ToInt32(strs[0]), return new Drawningboat(Convert.ToInt32(strs[0]),
Convert.ToInt32(strs[1]), Color.FromName(strs[2]), Convert.ToInt32(strs[3]), Convert.ToInt32(strs[4])); Convert.ToInt32(strs[1]), Color.FromName(strs[2]), _pictureWidth, _pictureHeight);
} }
if (strs.Length == 7) if (strs.Length == 7)
{ {

25
ProjectBoat_base/ProjectBoat_bae/FormBoatCollection.cs
View File

@ -183,31 +183,6 @@ namespace ProjectBoat_bae
//загрузка //загрузка
private void LoadToolStripMenu_Click(object sender, EventArgs args) private void LoadToolStripMenu_Click(object sender, EventArgs args)
{ {
//if (openFileDialog.ShowDialog() == DialogResult.OK)
//{
// if (_storage.LoadData(openFileDialog.FileName))
// MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
// else
// MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
//}
//ReloadObjects();
//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);
// }
//}
if (openFileDialog.ShowDialog() == DialogResult.OK) if (openFileDialog.ShowDialog() == DialogResult.OK)
{ {

2
ProjectBoat_base/ProjectBoat_bae/FormBoatCollection.resx
View File

@ -127,6 +127,6 @@
<value>363, 21</value> <value>363, 21</value>
</metadata> </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>38</value> <value>91</value>
</metadata> </metadata>
</root> </root>