diff --git a/Sailboat/Sailboat/BoatsGenericCollection.cs b/Sailboat/Sailboat/BoatsGenericCollection.cs
index 381661f..160b983 100644
--- a/Sailboat/Sailboat/BoatsGenericCollection.cs
+++ b/Sailboat/Sailboat/BoatsGenericCollection.cs
@@ -56,13 +56,13 @@ namespace Sailboat.Generics
///
///
///
- public static int operator +(BoatsGenericCollection collect, T? obj)
+ public static bool operator +(BoatsGenericCollection collect, T? obj)
{
if (obj == null)
{
- return -1;
+ return false;
}
- return collect._collection.Insert(obj);
+ return collect?._collection.Insert(obj) ?? false;
}
///
/// Перегрузка оператора вычитания
diff --git a/Sailboat/Sailboat/FormBoatCollection.Designer.cs b/Sailboat/Sailboat/FormBoatCollection.Designer.cs
index a2f0fd8..a3be7c3 100644
--- a/Sailboat/Sailboat/FormBoatCollection.Designer.cs
+++ b/Sailboat/Sailboat/FormBoatCollection.Designer.cs
@@ -30,19 +30,25 @@
{
this.pictureBoxCollection = new System.Windows.Forms.PictureBox();
this.panelTools = new System.Windows.Forms.Panel();
+ this.panelCollection = new System.Windows.Forms.Panel();
+ this.buttonDelObject = new System.Windows.Forms.Button();
+ this.listBoxStorages = new System.Windows.Forms.ListBox();
+ this.buttonAddObject = new System.Windows.Forms.Button();
+ this.textBoxStorageName = new System.Windows.Forms.TextBox();
this.maskedTextBoxNumber = new System.Windows.Forms.MaskedTextBox();
this.buttonRefreshCollection = new System.Windows.Forms.Button();
this.buttonRemoveBoat = new System.Windows.Forms.Button();
this.buttonAddBoat = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).BeginInit();
this.panelTools.SuspendLayout();
+ this.panelCollection.SuspendLayout();
this.SuspendLayout();
//
// pictureBoxCollection
//
this.pictureBoxCollection.Location = new System.Drawing.Point(0, 0);
this.pictureBoxCollection.Name = "pictureBoxCollection";
- this.pictureBoxCollection.Size = new System.Drawing.Size(750, 450);
+ this.pictureBoxCollection.Size = new System.Drawing.Size(750, 600);
this.pictureBoxCollection.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
this.pictureBoxCollection.TabIndex = 0;
this.pictureBoxCollection.TabStop = false;
@@ -50,25 +56,75 @@
// panelTools
//
this.panelTools.BackColor = System.Drawing.SystemColors.ScrollBar;
+ this.panelTools.Controls.Add(this.panelCollection);
this.panelTools.Controls.Add(this.maskedTextBoxNumber);
this.panelTools.Controls.Add(this.buttonRefreshCollection);
this.panelTools.Controls.Add(this.buttonRemoveBoat);
this.panelTools.Controls.Add(this.buttonAddBoat);
this.panelTools.Location = new System.Drawing.Point(756, 12);
this.panelTools.Name = "panelTools";
- this.panelTools.Size = new System.Drawing.Size(209, 426);
+ this.panelTools.Size = new System.Drawing.Size(209, 588);
this.panelTools.TabIndex = 1;
//
+ // panelCollection
+ //
+ this.panelCollection.BackColor = System.Drawing.SystemColors.AppWorkspace;
+ this.panelCollection.Controls.Add(this.buttonDelObject);
+ this.panelCollection.Controls.Add(this.listBoxStorages);
+ this.panelCollection.Controls.Add(this.buttonAddObject);
+ this.panelCollection.Controls.Add(this.textBoxStorageName);
+ this.panelCollection.Location = new System.Drawing.Point(16, 15);
+ this.panelCollection.Name = "panelCollection";
+ this.panelCollection.Size = new System.Drawing.Size(181, 287);
+ this.panelCollection.TabIndex = 4;
+ //
+ // buttonDelObject
+ //
+ this.buttonDelObject.Location = new System.Drawing.Point(12, 230);
+ this.buttonDelObject.Name = "buttonDelObject";
+ this.buttonDelObject.Size = new System.Drawing.Size(154, 34);
+ this.buttonDelObject.TabIndex = 5;
+ this.buttonDelObject.Text = "Удалить набор";
+ this.buttonDelObject.UseVisualStyleBackColor = true;
+ this.buttonDelObject.Click += new System.EventHandler(this.buttonDelObject_Click);
+ //
+ // listBoxStorages
+ //
+ this.listBoxStorages.FormattingEnabled = true;
+ this.listBoxStorages.ItemHeight = 20;
+ this.listBoxStorages.Location = new System.Drawing.Point(12, 102);
+ this.listBoxStorages.Name = "listBoxStorages";
+ this.listBoxStorages.Size = new System.Drawing.Size(154, 104);
+ this.listBoxStorages.TabIndex = 6;
+ this.listBoxStorages.SelectedIndexChanged += new System.EventHandler(this.ListBoxObjects_SelectedIndexChanged);
+ //
+ // buttonAddObject
+ //
+ this.buttonAddObject.Location = new System.Drawing.Point(12, 62);
+ this.buttonAddObject.Name = "buttonAddObject";
+ this.buttonAddObject.Size = new System.Drawing.Size(154, 34);
+ this.buttonAddObject.TabIndex = 5;
+ this.buttonAddObject.Text = "Добавить набор";
+ this.buttonAddObject.UseVisualStyleBackColor = true;
+ this.buttonAddObject.Click += new System.EventHandler(this.buttonAddObject_Click);
+ //
+ // textBoxStorageName
+ //
+ this.textBoxStorageName.Location = new System.Drawing.Point(29, 29);
+ this.textBoxStorageName.Name = "textBoxStorageName";
+ this.textBoxStorageName.Size = new System.Drawing.Size(125, 27);
+ this.textBoxStorageName.TabIndex = 0;
+ //
// maskedTextBoxNumber
//
- this.maskedTextBoxNumber.Location = new System.Drawing.Point(40, 87);
+ this.maskedTextBoxNumber.Location = new System.Drawing.Point(45, 416);
this.maskedTextBoxNumber.Name = "maskedTextBoxNumber";
this.maskedTextBoxNumber.Size = new System.Drawing.Size(125, 27);
this.maskedTextBoxNumber.TabIndex = 3;
//
// buttonRefreshCollection
//
- this.buttonRefreshCollection.Location = new System.Drawing.Point(16, 210);
+ this.buttonRefreshCollection.Location = new System.Drawing.Point(16, 531);
this.buttonRefreshCollection.Name = "buttonRefreshCollection";
this.buttonRefreshCollection.Size = new System.Drawing.Size(180, 34);
this.buttonRefreshCollection.TabIndex = 2;
@@ -78,7 +134,7 @@
//
// buttonRemoveBoat
//
- this.buttonRemoveBoat.Location = new System.Drawing.Point(16, 159);
+ this.buttonRemoveBoat.Location = new System.Drawing.Point(17, 469);
this.buttonRemoveBoat.Name = "buttonRemoveBoat";
this.buttonRemoveBoat.Size = new System.Drawing.Size(180, 34);
this.buttonRemoveBoat.TabIndex = 1;
@@ -88,7 +144,7 @@
//
// buttonAddBoat
//
- this.buttonAddBoat.Location = new System.Drawing.Point(16, 14);
+ this.buttonAddBoat.Location = new System.Drawing.Point(16, 339);
this.buttonAddBoat.Name = "buttonAddBoat";
this.buttonAddBoat.Size = new System.Drawing.Size(180, 34);
this.buttonAddBoat.TabIndex = 0;
@@ -100,7 +156,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(969, 450);
+ this.ClientSize = new System.Drawing.Size(969, 604);
this.Controls.Add(this.panelTools);
this.Controls.Add(this.pictureBoxCollection);
this.Name = "FormBoatCollection";
@@ -108,6 +164,8 @@
((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).EndInit();
this.panelTools.ResumeLayout(false);
this.panelTools.PerformLayout();
+ this.panelCollection.ResumeLayout(false);
+ this.panelCollection.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -121,5 +179,10 @@
private Button buttonRemoveBoat;
private Button buttonAddBoat;
private MaskedTextBox maskedTextBoxNumber;
+ private Panel panelCollection;
+ private Button buttonDelObject;
+ private ListBox listBoxStorages;
+ private Button buttonAddObject;
+ private TextBox textBoxStorageName;
}
}
\ No newline at end of file
diff --git a/Sailboat/Sailboat/FormBoatCollection.cs b/Sailboat/Sailboat/FormBoatCollection.cs
index 30dd6af..23c29c1 100644
--- a/Sailboat/Sailboat/FormBoatCollection.cs
+++ b/Sailboat/Sailboat/FormBoatCollection.cs
@@ -17,22 +17,54 @@ namespace Sailboat
{
public partial class FormBoatCollection : Form
{
- private readonly BoatsGenericCollection _boats;
+ private readonly BoatsGenericStorage _storage;
public FormBoatCollection()
{
InitializeComponent();
- _boats = new BoatsGenericCollection(pictureBoxCollection.Width, pictureBoxCollection.Height);
+ _storage = new BoatsGenericStorage(pictureBoxCollection.Width, pictureBoxCollection.Height);
+
+ }
+
+ private void ReloadObjects()
+ {
+ int index = listBoxStorages.SelectedIndex;
+ listBoxStorages.Items.Clear();
+ for (int i = 0; i < _storage.Keys.Count; i++)
+ {
+ listBoxStorages.Items.Add(_storage.Keys[i]);
+ }
+ if (listBoxStorages.Items.Count > 0 && (index == -1 || index
+ >= listBoxStorages.Items.Count))
+ {
+ listBoxStorages.SelectedIndex = 0;
+ }
+ else if (listBoxStorages.Items.Count > 0 && index > -1 &&
+ index < listBoxStorages.Items.Count)
+ {
+ listBoxStorages.SelectedIndex = index;
+ }
}
private void buttonAddBoat_Click(object sender, EventArgs e)
{
+ if (listBoxStorages.SelectedIndex == -1)
+ {
+ return;
+ }
+ var obj = _storage[listBoxStorages.SelectedItem.ToString() ??
+ string.Empty];
+ if (obj == null)
+ {
+ return;
+ }
FormSailboat form = new();
if (form.ShowDialog() == DialogResult.OK)
{
- if (_boats + form.SelectedBoat != -1)
+ //вот здесь лажа какая то
+ if (obj + form.SelectedBoat)
{
MessageBox.Show("Объект добавлен");
- pictureBoxCollection.Image = _boats.ShowBoats();
+ pictureBoxCollection.Image = obj.ShowBoats();
}
else
{
@@ -43,15 +75,26 @@ namespace Sailboat
private void buttonRemoveBoat_Click(object sender, EventArgs e)
{
- if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+ if (listBoxStorages.SelectedIndex == -1)
+ {
+ return;
+ }
+ var obj = _storage[listBoxStorages.SelectedItem.ToString() ??
+ string.Empty];
+ if (obj == null)
+ {
+ return;
+ }
+ if (MessageBox.Show("Удалить объект?", "Удаление",
+ MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
{
return;
}
int pos = Convert.ToInt32(maskedTextBoxNumber.Text);
- if (_boats - pos != null)
+ if (obj - pos != null)
{
MessageBox.Show("Объект удален");
- pictureBoxCollection.Image = _boats.ShowBoats();
+ pictureBoxCollection.Image = obj.ShowBoats();
}
else
{
@@ -62,7 +105,50 @@ namespace Sailboat
private void buttonRefreshCollection_Click(object sender, EventArgs e)
{
- pictureBoxCollection.Image = _boats.ShowBoats();
+ if (listBoxStorages.SelectedIndex == -1)
+ {
+ return;
+ }
+ var obj = _storage[listBoxStorages.SelectedItem.ToString() ??
+ string.Empty];
+ if (obj == null)
+ {
+ return;
+ }
+ pictureBoxCollection.Image = obj.ShowBoats();
+
+ }
+
+ private void buttonAddObject_Click(object sender, EventArgs e)
+ {
+ if (string.IsNullOrEmpty(textBoxStorageName.Text))
+ {
+ MessageBox.Show("Не все данные заполнены", "Ошибка",
+ MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ _storage.AddSet(textBoxStorageName.Text);
+ ReloadObjects();
+ }
+
+ private void ListBoxObjects_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ pictureBoxCollection.Image =
+ _storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowBoats();
+ }
+
+ private void buttonDelObject_Click(object sender, EventArgs e)
+ {
+ if (listBoxStorages.SelectedIndex == -1)
+ {
+ return;
+ }
+ if (MessageBox.Show($"Удалить объект { listBoxStorages.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+ {
+ _storage.DelSet(listBoxStorages.SelectedItem.ToString()
+ ?? string.Empty);
+ ReloadObjects();
+ }
}
}
}
diff --git a/Sailboat/Sailboat/SetGeneric.cs b/Sailboat/Sailboat/SetGeneric.cs
index 2a67125..2c62ce4 100644
--- a/Sailboat/Sailboat/SetGeneric.cs
+++ b/Sailboat/Sailboat/SetGeneric.cs
@@ -35,9 +35,12 @@ namespace Sailboat.Generics
///
/// Добавляемая лодка
///
- public int Insert(T boat)
+ public bool Insert(T boat)
{
- return Insert(boat, 0);
+ if (_places.Count == _maxCount)
+ return false;
+ Insert(boat, 0);
+ return true;
}
///
/// Добавление объекта в набор на конкретную позицию
@@ -45,36 +48,12 @@ namespace Sailboat.Generics
/// Добавляемая лодка
/// Позиция
///
- public int Insert(T boat, int position)
+ public bool Insert(T boat, int position)
{
- int nullIndex = -1, i;
-
- if (position < 0 || position >= Count)
- {
- return -1;
- }
-
- for (i = position; i < Count; i++)
- {
- if (_places[i] == null)
- {
- nullIndex = i;
- break;
- }
- }
-
- if (nullIndex < 0)
- {
- return -1;
- }
-
- for (i = nullIndex; i > position; i--)
- {
- _places[i] = _places[i - 1];
- }
-
- _places[position] = boat;
- return position;
+ if (!(position >= 0 && position <= Count && _places.Count < _maxCount))
+ return false;
+ _places.Insert(position, boat);
+ return true;
}
///
/// Удаление объекта из набора с конкретной позиции