Compare commits
3 Commits
LabWork_08
...
LabWork_05
| Author | SHA1 | Date | |
|---|---|---|---|
| d1356fb01e | |||
| c266418c75 | |||
| 737d77ac68 |
@@ -57,7 +57,7 @@ namespace Catamaran
|
||||
private void buttonCreateSailCatamaran_Click(object sender, EventArgs e)
|
||||
{
|
||||
Random random = new();
|
||||
//<EFBFBD> TODO <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
|
||||
//TODO <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
|
||||
Color color = Color.FromArgb(random.Next(0, 256),
|
||||
random.Next(0, 256), random.Next(0, 256));
|
||||
ColorDialog dialogColor = new();
|
||||
|
||||
@@ -146,6 +146,8 @@ namespace Catamaran.Generics
|
||||
}
|
||||
if (catamaran != null)
|
||||
{
|
||||
catamaran._pictureWidth = _pictureWidth;
|
||||
catamaran._pictureHeight = _pictureHeight;
|
||||
catamaran.SetPosition(i % width * _placeSizeWidth + _placeSizeWidth / 40,
|
||||
(height - diff) * _placeSizeHeight + _placeSizeHeight / 15);
|
||||
catamaran.DrawTransport(g);
|
||||
|
||||
@@ -20,11 +20,11 @@ namespace Catamaran.DrawningObjects
|
||||
/// <summary>
|
||||
/// Ширина окна
|
||||
/// </summary>
|
||||
private int _pictureWidth;
|
||||
public int _pictureWidth;
|
||||
/// <summary>
|
||||
/// Высота окна
|
||||
/// </summary>
|
||||
private int _pictureHeight;
|
||||
public int _pictureHeight;
|
||||
/// <summary>
|
||||
/// Левая координата прорисовки катамарана
|
||||
/// </summary>
|
||||
|
||||
@@ -39,6 +39,10 @@ namespace Catamaran.Entities
|
||||
Weight = weight;
|
||||
BodyColor = bodyColor;
|
||||
}
|
||||
public void setBodyColor(Color color)
|
||||
{
|
||||
BodyColor = color;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -39,5 +39,9 @@ namespace Catamaran.Entities
|
||||
Sail = sail;
|
||||
FloatDetail = floatDetail;
|
||||
}
|
||||
public void setAdditionalColor(Color color)
|
||||
{
|
||||
AdditionalColor = color;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -118,7 +118,7 @@ namespace Catamaran
|
||||
case "labelModifiedObject":
|
||||
_catamaran = new DrawningSailCatamaran((int)numericUpDownSpeed.Value,
|
||||
(int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxSail.Checked,
|
||||
checkBoxFloatDetails.Checked, pictureBoxObject.Width,
|
||||
checkBoxFloatDetails.Checked, pictureBoxObject.Width,
|
||||
pictureBoxObject.Height);
|
||||
break;
|
||||
}
|
||||
@@ -164,6 +164,7 @@ namespace Catamaran
|
||||
EventAddCatamaran?.Invoke(_catamaran);
|
||||
Close();
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user