LuizaAparyan/ISE_22.Aparyan.Bulldozer.Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Внесение правок. Сдана работа

Browse Source
This commit is contained in:
AparyanLuiza 2023-12-29 03:24:17 +04:00
parent 825ad3cdf5
commit ec986c5a2c
3 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ProjectBulldozer/FormBulldozerCollections.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace ProjectBulldozer using System.ComponentModel;
namespace ProjectBulldozer
{ {
partial class FormTractorCollections partial class FormTractorCollections
{ {
@ -23,7 +25,7 @@
сохранитьToolStripMenuItem = new ToolStripMenuItem(); сохранитьToolStripMenuItem = new ToolStripMenuItem();
загрузитьToolStripMenuItem = new ToolStripMenuItem(); загрузитьToolStripMenuItem = new ToolStripMenuItem();
toolStripMenuItem1 = new ToolStripMenuItem(); toolStripMenuItem1 = new ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)pictureBoxCollections).BeginInit(); ((ISupportInitialize)pictureBoxCollections).BeginInit();
groupBox1.SuspendLayout(); groupBox1.SuspendLayout();
Instruments.SuspendLayout(); Instruments.SuspendLayout();
menuStrip1.SuspendLayout(); menuStrip1.SuspendLayout();
@ -34,7 +36,7 @@
maskedTextBoxNumber.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; maskedTextBoxNumber.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
maskedTextBoxNumber.Location = new Point(33, 356); maskedTextBoxNumber.Location = new Point(33, 356);
maskedTextBoxNumber.Margin = new Padding(3, 2, 3, 2); maskedTextBoxNumber.Margin = new Padding(3, 2, 3, 2);
maskedTextBoxNumber.Mask = "0"; maskedTextBoxNumber.Mask = "00";
maskedTextBoxNumber.Name = "maskedTextBoxNumber"; maskedTextBoxNumber.Name = "maskedTextBoxNumber";
maskedTextBoxNumber.Size = new Size(131, 23); maskedTextBoxNumber.Size = new Size(131, 23);
maskedTextBoxNumber.TabIndex = 4; maskedTextBoxNumber.TabIndex = 4;
@ -217,7 +219,7 @@
Margin = new Padding(3, 2, 3, 2); Margin = new Padding(3, 2, 3, 2);
Name = "FormTractorCollections"; Name = "FormTractorCollections";
Text = "Набор объектов"; Text = "Набор объектов";
((System.ComponentModel.ISupportInitialize)pictureBoxCollections).EndInit(); ((ISupportInitialize)pictureBoxCollections).EndInit();
groupBox1.ResumeLayout(false); groupBox1.ResumeLayout(false);
groupBox1.PerformLayout(); groupBox1.PerformLayout();
Instruments.ResumeLayout(false); Instruments.ResumeLayout(false);
@ -227,6 +229,22 @@
ResumeLayout(false); ResumeLayout(false);
PerformLayout(); PerformLayout();
} }
private void файлToolStripMenuItem_Click(object sender, EventArgs e)
{
throw new NotImplementedException();
}
private void saveFileDialog_FileOk(object sender, CancelEventArgs e)
{
throw new NotImplementedException();
}
private void openFileDialog_FileOk(object sender, CancelEventArgs e)
{
throw new NotImplementedException();
}
private void pictureBoxCollections_Click(object sender, EventArgs e) private void pictureBoxCollections_Click(object sender, EventArgs e)
{ {
throw new NotImplementedException(); throw new NotImplementedException();

13
ProjectBulldozer/FormBulldozerCollections.resx
View File

@ -18,9 +18,7 @@
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, 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="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name=" <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value> <value>[base64 mime encoded serialized .NET Framework object]</value>
</data> </data>
@ -119,4 +117,13 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="openFileDialog.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="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>286, 17</value>
</metadata>
</root> </root>

2
ProjectBulldozer/Generics/TractorGenericStorage.cs
View File

@ -112,7 +112,7 @@ namespace ProjectBulldozer.Generics
_pictureWidth, _pictureHeight); _pictureWidth, _pictureHeight);
if (tractor != null) if (tractor != null)
{ {
if ((collection + tractor) == -1) if ((collection + tractor))
{ {
throw new ApplicationException("Ошибка добавления в коллекцию"); throw new ApplicationException("Ошибка добавления в коллекцию");
} }