Victoria_Presnyakova/Pibd-22_Presnyakova.V.V_Catamaran_Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Presnyakova V.V Lab_5 #13

Closed
Victoria_Presnyakova wants to merge 4 commits from Lab_5 into Lab_4
pull from: Lab_5
merge into: Victoria_Presnyakova:Lab_4
Conversation 1 Commits 4 Files Changed 7 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ca7d484111 - Show all commits

6
Catamaran/FormBoatConfig.cs
View File

@ -22,7 +22,7 @@ namespace Catamaran
/// <summary>
/// Событие
/// </summary>
private event BoatDelegate EventAddBoat;
private event Action<DrawingBoat> EventAddBoat;
/// <summary>
/// Конструктор
/// </summary>
@ -55,11 +55,11 @@ namespace Catamaran
/// Добавление события
/// </summary>
/// <param name="ev"></param>
public void AddEvent(BoatDelegate ev)
public void AddEvent(Action<DrawingBoat> ev)
{
if (EventAddBoat == null)
{
EventAddBoat = new BoatDelegate(ev);
EventAddBoat = new Action<DrawingBoat>(ev);
}
else
{

2
Catamaran/FormMapWithSetBoats.cs
View File

@ -213,7 +213,7 @@ namespace Catamaran
private void buttonAddBoat_Click_1(object sender, EventArgs e)
{
var formBoatConfig = new FormBoatConfig();
formBoatConfig.AddEvent(new BoatDelegate(AddBoat));
formBoatConfig.AddEvent(new Action<DrawingBoat>(AddBoat));
// TODO Call method AddEvent from formCarConfig
formBoatConfig.Show();
}