LivelyPuer/PIBD14-BOYKO-M.S.SuperEasySuperPuper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIBD-14 Boyko_M.S, LabWork05 Simple #6

Closed
LivelyPuer wants to merge 2 commits from lab5-develop into lab4-develop
pull from: lab5-develop
merge into: LivelyPuer:lab4-develop
Conversation 0 Commits 2 Files Changed 9 +3 -8
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9b3cbb5868 - Show all commits

9
ProjectElectroTrans/FormTransConfig.Designer.cs generated
View File

@ -43,7 +43,6 @@
panelRed = new Panel();
checkBoxBulldozerDump = new CheckBox();
checkBoxSupport = new CheckBox();
checkBoxBucket = new CheckBox();
numericUpDownWeight = new NumericUpDown();
numericUpDownSpeed = new NumericUpDown();
labelWeight = new Label();
@ -73,7 +72,6 @@
groupBoxConfig.Controls.Add(groupBoxColors);
groupBoxConfig.Controls.Add(checkBoxBulldozerDump);
groupBoxConfig.Controls.Add(checkBoxSupport);
groupBoxConfig.Controls.Add(checkBoxBucket);
groupBoxConfig.Controls.Add(numericUpDownWeight);
groupBoxConfig.Controls.Add(numericUpDownSpeed);
groupBoxConfig.Controls.Add(labelWeight);
@ -214,9 +212,7 @@
checkBoxSupport.TabIndex = 7;
checkBoxSupport.Text = "Признак наличие батарей ";
checkBoxSupport.UseVisualStyleBackColor = true;
//
// checkBoxBucket
//
numericUpDownWeight.Location = new Point(91, 54);
numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
@ -350,7 +346,7 @@
Controls.Add(buttonAdd);
Controls.Add(panelObject);
Controls.Add(groupBoxConfig);
Name = "FormExcavatorConfig";
Name = "FormTransConfig";
Text = "Создание объекта";
groupBoxConfig.ResumeLayout(false);
groupBoxConfig.PerformLayout();
@ -377,7 +373,6 @@
private Label labelSpeed;
private CheckBox checkBoxBulldozerDump;
private CheckBox checkBoxSupport;
private CheckBox checkBoxBucket;
private GroupBox groupBoxColors;
private Panel panelPurple;
private Panel panelYellow;

2
ProjectElectroTrans/FormTransConfig.cs
View File

@ -102,7 +102,7 @@ namespace ProjectElectroTrans
case "labelModifiedObject":
_trans = new DrawingElectroTrans((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value,
Color.White,
Color.Black, checkBoxBucket.Checked,
Color.Black, checkBoxBulldozerDump.Checked,
checkBoxSupport.Checked);
break;
}