после доп задания

This commit is contained in:
AnnaLioness 2023-11-17 15:21:02 +04:00
parent 4c85daa81d
commit c17430f76d

View File

@ -65,34 +65,12 @@ namespace Lab1ContainersShip
private void LabelObject_MouseDown(object sender, MouseEventArgs e)
{
//(sender as Label)?.DoDragDrop((sender as Label)?.Name,DragDropEffects.Move | DragDropEffects.Copy);
if((sender as Label).Name == "labelSimpleObject")
{_ship = new DrawingShip((int)numericUpDownSpeed.Value,
(int)numericUpDownWeight.Value, Color.White, pictureBoxObject.Width,
pictureBoxObject.Height);
}
else {
_ship = new DrawingContainerShip((int)numericUpDownSpeed.Value,
(int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxCrane.Checked,
checkBoxContainers.Checked, pictureBoxObject.Width, pictureBoxObject.Height);
}
DoDragDrop(_ship, DragDropEffects.Move | DragDropEffects.Copy);
(sender as Label)?.DoDragDrop((sender as Label)?.Name,DragDropEffects.Move | DragDropEffects.Copy);
}
private void PanelObject_DragEnter(object sender, DragEventArgs e)
{
/*if (e.Data?.GetDataPresent(DataFormats.Text) ?? false)
{
e.Effect = DragDropEffects.Copy;
}
else
{
e.Effect = DragDropEffects.None;
}*/
if (e.Data?.GetDataPresent(typeof(DrawingShip)) ?? false)
{
e.Effect = DragDropEffects.Copy;
}
else if (e.Data?.GetDataPresent(typeof(DrawingContainerShip)) ?? false)
if (e.Data?.GetDataPresent(DataFormats.Text) ?? false)
{
e.Effect = DragDropEffects.Copy;
}
@ -100,14 +78,14 @@ namespace Lab1ContainersShip
{
e.Effect = DragDropEffects.None;
}
}
private void PanelObject_DragDrop(object sender, DragEventArgs e)
{
/*switch (e.Data?.GetData(DataFormats.Text).ToString())
switch (e.Data?.GetData(DataFormats.Text).ToString())
{
case "labelSimpleObject":
_ship =
new DrawingShip((int)numericUpDownSpeed.Value,
_ship = new DrawingShip((int)numericUpDownSpeed.Value,
(int)numericUpDownWeight.Value, Color.White, pictureBoxObject.Width,
pictureBoxObject.Height);
break;
@ -116,18 +94,7 @@ namespace Lab1ContainersShip
(int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxCrane.Checked,
checkBoxContainers.Checked, pictureBoxObject.Width,pictureBoxObject.Height);
break;
}*/
var eeee = e.Data?.GetData(typeof(DrawingShip));
var gggg = e.Data?.GetData(typeof(DrawingContainerShip));
if(eeee != null)
{
_ship = (DrawingShip)eeee;
}
else
{
_ship = (DrawingContainerShip)gggg;
}
DrawShip();
}