Firsov_Kirill/PIbd-23_Firsov_Kirill_Tractor_basis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-23 Firsov Kirill LabWork 05 #21

Closed
Firsov_Kirill wants to merge 5 commits from Laba5 into Laba4.2
pull from: Laba5
merge into: Firsov_Kirill:Laba4.2
Conversation 0 Commits 5 Files Changed 9 +9 -4
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e092aed49c - Show all commits

7
RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractorCollection.cs
View File

@ -102,6 +102,7 @@ namespace ProjectTractor
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ButtonAddTractor_Click(object sender, EventArgs e)
{
if (listBoxStorages.SelectedIndex == -1)
@ -208,7 +209,7 @@ namespace ProjectTractor
this.pictureBoxCollection.Dock = System.Windows.Forms.DockStyle.Left;
this.pictureBoxCollection.Location = new System.Drawing.Point(0, 0);
this.pictureBoxCollection.Name = "pictureBoxCollection";
this.pictureBoxCollection.Size = new System.Drawing.Size(620, 536);
this.pictureBoxCollection.Size = new System.Drawing.Size(645, 536);
this.pictureBoxCollection.TabIndex = 1;
this.pictureBoxCollection.TabStop = false;
//
@ -219,7 +220,7 @@ namespace ProjectTractor
this.groupBox.Controls.Add(this.ButtonRemoveTractor);
this.groupBox.Controls.Add(this.ButtonAddTractor);
this.groupBox.Controls.Add(this.maskedTextBoxNumber);
this.groupBox.Location = new System.Drawing.Point(626, 12);
this.groupBox.Location = new System.Drawing.Point(651, 14);
this.groupBox.Name = "groupBox";
this.groupBox.Size = new System.Drawing.Size(255, 522);
this.groupBox.TabIndex = 2;
@ -315,7 +316,7 @@ namespace ProjectTractor
//
// FormTractorCollection
//
this.ClientSize = new System.Drawing.Size(893, 536);
this.ClientSize = new System.Drawing.Size(918, 536);
this.Controls.Add(this.groupBox);
this.Controls.Add(this.pictureBoxCollection);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;

4
RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractorConfig.cs
View File

@ -9,6 +9,8 @@ using System.Threading.Tasks;
using System.Windows.Forms;
using ProjectTractor.DrawningObjects;
using ProjectTractor.Entities;
using ProjectTractor.Generics;
using ProjectTractor.MovementStrategy;
namespace ProjectTractor;
@ -29,6 +31,7 @@ public partial class FormTractorConfig : Form
/// Конструктор
/// </summary>
//
public delegate void TractorDelegate(DrawningTractor tractor);
eegov commented 2023-12-10 21:58:01 +04:00
Review
Copy Link

Делегат следовало заменить на встроенный

Делегат следовало заменить на встроенный
public FormTractorConfig()
{
InitializeComponent();
@ -170,6 +173,7 @@ public partial class FormTractorConfig : Form
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
///
private void ButtonOk_Click(object sender, EventArgs e)
{
if (_tractor == null)

2
RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/TractorsGenericCollection.cs
View File

@ -134,7 +134,7 @@ namespace ProjectTractor.Generics
if (tractor != null)
{
int countRows = _pictureWidth / _placeSizeWidth;
tractor.SetPosition(_pictureWidth - _placeSizeWidth * 2 - (i % countRows * _placeSizeWidth) + 20, _pictureHeight - i / countRows * _placeSizeHeight - 160);
tractor.SetPosition(_pictureWidth - _placeSizeWidth - (i % countRows * _placeSizeWidth), _pictureHeight - i / countRows * _placeSizeHeight - 160);
tractor.DrawTransport(g);
}
i++;