group/Plane.FormationCreator
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

修改界面小bug

Browse Source
This commit is contained in:
xu 2020-02-05 02:47:57 +08:00
parent f9428fbad2
commit ffe6b466fe
2 changed files with 47 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Plane.FormationCreator/Formation/FlightTaskManager.cs
View File

@ -151,7 +151,8 @@ namespace Plane.FormationCreator.Formation
takeOffTask = new FlightTask(FlightTaskType.TakeOff); takeOffTask = new FlightTask(FlightTaskType.TakeOff);
takeOffTask.TakeOffNumAttr = TakeOffNumAttr; takeOffTask.TakeOffNumAttr = TakeOffNumAttr;
Tasks.Add(takeOffTask); Tasks.Add(takeOffTask);
TaskAdded?.Invoke(this, new FlightTaskAddedEventArgs { AddedTask = takeOffTask }); RaiseTaskAdded(null, takeOffTask);
//TaskAdded?.Invoke(this, new FlightTaskAddedEventArgs { AddedTask = takeOffTask });
} }
foreach (var copter in copters) foreach (var copter in copters)
{ {
@ -298,6 +299,35 @@ namespace Plane.FormationCreator.Formation
} }
public event EventHandler<FlightTaskAddedEventArgs> TaskAdded; public event EventHandler<FlightTaskAddedEventArgs> TaskAdded;
public void RaiseTaskAdded(FlightTask lastTask ,FlightTask newTask)
{
try
{
TaskAdded?.Invoke(this, new FlightTaskAddedEventArgs { LastTask = lastTask, AddedTask = newTask });
}
catch (Exception ex)
{
//RaiseExceptionThrown(ex);
}
newTask.PropertyChanged += (sender, e) =>
{
switch (e.PropertyName)
{
case nameof(FlightTask.TaskTypeIndex):
case nameof(FlightTask.TaskCnName):
TaskTypeChanged?.Invoke(this, new FlightTaskTypeChangedEventArgs((FlightTask)sender));
TaskcnNameChanged?.Invoke(this, new FlightTaskcnNameChangedEventArgs((FlightTask)sender));
break;
default:
break;
}
};
}
public event EventHandler<FlightTaskAddedOriginalEventArgs> OnOriginalSet; public event EventHandler<FlightTaskAddedOriginalEventArgs> OnOriginalSet;
public event EventHandler<SingleCopterInfoChangedEventArgs> SingleCopterInfoChanged; public event EventHandler<SingleCopterInfoChangedEventArgs> SingleCopterInfoChanged;
@ -375,31 +405,11 @@ namespace Plane.FormationCreator.Formation
} }
Tasks.Add(newTask); Tasks.Add(newTask);
try RaiseTaskAdded(lastTask, newTask);
{
TaskAdded?.Invoke(this, new FlightTaskAddedEventArgs { LastTask = lastTask, AddedTask = newTask });
}
catch (Exception ex)
{
//RaiseExceptionThrown(ex);
}
SelectedTask = newTask; SelectedTask = newTask;
SelectedTaskIndex = Tasks.Count - 1; SelectedTaskIndex = Tasks.Count - 1;
newTask.PropertyChanged+= (sender, e) =>
{
switch (e.PropertyName)
{
case nameof(FlightTask.TaskTypeIndex):
case nameof(FlightTask.TaskCnName):
TaskTypeChanged?.Invoke(this, new FlightTaskTypeChangedEventArgs((FlightTask)sender));
TaskcnNameChanged?.Invoke(this, new FlightTaskcnNameChangedEventArgs((FlightTask)sender));
break;
default:
break;
}
};
} }
@ -710,7 +720,7 @@ namespace Plane.FormationCreator.Formation
} }
Tasks.Add(newTask); Tasks.Add(newTask);
TaskAdded?.Invoke(this, new FlightTaskAddedEventArgs { LastTask = lastTask, AddedTask = newTask }); RaiseTaskAdded(lastTask, newTask);
} }
// Alert.Show("导入完成！"); // Alert.Show("导入完成！");
/* /*
@ -804,7 +814,7 @@ namespace Plane.FormationCreator.Formation
newTask.SingleCopterInfos.Add(newSingleCopterInfo); newTask.SingleCopterInfos.Add(newSingleCopterInfo);
Tasks.Add(newTask); Tasks.Add(newTask);
TaskAdded?.Invoke(this, new FlightTaskAddedEventArgs { LastTask = lastTask, AddedTask = newTask }); RaiseTaskAdded(lastTask, newTask);
Message.Show(vector); Message.Show(vector);
} }
} }
@ -871,7 +881,7 @@ namespace Plane.FormationCreator.Formation
newTask.SingleCopterInfos.Add(newSingleCopterInfo); newTask.SingleCopterInfos.Add(newSingleCopterInfo);
} }
Tasks.Add(newTask); Tasks.Add(newTask);
TaskAdded?.Invoke(this, new FlightTaskAddedEventArgs { LastTask = lastTask, AddedTask = newTask }); RaiseTaskAdded(lastTask, newTask);
} }
private void RestoreTurnTask(dynamic singleCopterInfos) private void RestoreTurnTask(dynamic singleCopterInfos)
@ -890,7 +900,7 @@ namespace Plane.FormationCreator.Formation
newTask.SingleCopterInfos.Add(newSingleCopterInfo); newTask.SingleCopterInfos.Add(newSingleCopterInfo);
} }
Tasks.Add(newTask); Tasks.Add(newTask);
TaskAdded?.Invoke(this, new FlightTaskAddedEventArgs { LastTask = lastTask, AddedTask = newTask }); RaiseTaskAdded(lastTask, newTask);
SelectedTask = newTask; SelectedTask = newTask;
SelectedTaskIndex = Tasks.Count - 1; SelectedTaskIndex = Tasks.Count - 1;
} }
@ -911,7 +921,7 @@ namespace Plane.FormationCreator.Formation
newTask.SingleCopterInfos.Add(newSingleCopterInfo); newTask.SingleCopterInfos.Add(newSingleCopterInfo);
} }
Tasks.Add(newTask); Tasks.Add(newTask);
TaskAdded?.Invoke(this, new FlightTaskAddedEventArgs { LastTask = lastTask, AddedTask = newTask }); RaiseTaskAdded(lastTask, newTask);
SelectedTask = newTask; SelectedTask = newTask;
SelectedTaskIndex = Tasks.Count - 1; SelectedTaskIndex = Tasks.Count - 1;
} }
@ -932,7 +942,7 @@ namespace Plane.FormationCreator.Formation
newTask.SingleCopterInfos.Add(newSingleCopterInfo); newTask.SingleCopterInfos.Add(newSingleCopterInfo);
} }
Tasks.Add(newTask); Tasks.Add(newTask);
TaskAdded?.Invoke(this, new FlightTaskAddedEventArgs { LastTask = lastTask, AddedTask = newTask }); RaiseTaskAdded(lastTask, newTask);
SelectedTask = newTask; SelectedTask = newTask;
SelectedTaskIndex = Tasks.Count - 1; SelectedTaskIndex = Tasks.Count - 1;
} }
@ -953,7 +963,7 @@ namespace Plane.FormationCreator.Formation
RTLTask.SingleCopterInfos.Add(newSingleCopterInfo); RTLTask.SingleCopterInfos.Add(newSingleCopterInfo);
} }
Tasks.Add(RTLTask); Tasks.Add(RTLTask);
TaskAdded?.Invoke(this, new FlightTaskAddedEventArgs { LastTask = lastTask, AddedTask = RTLTask }); RaiseTaskAdded(lastTask, RTLTask);
} }
@ -1001,7 +1011,7 @@ namespace Plane.FormationCreator.Formation
LandTask.SingleCopterInfos.Add(newSingleCopterInfo); LandTask.SingleCopterInfos.Add(newSingleCopterInfo);
} }
Tasks.Add(LandTask); Tasks.Add(LandTask);
TaskAdded?.Invoke(this, new FlightTaskAddedEventArgs { LastTask = lastTask, AddedTask = LandTask }); RaiseTaskAdded(lastTask, LandTask);
} }
@ -1038,7 +1048,7 @@ namespace Plane.FormationCreator.Formation
loiterTimeTask.SingleCopterInfos.Add(newSingleCopterInfo); loiterTimeTask.SingleCopterInfos.Add(newSingleCopterInfo);
} }
Tasks.Add(loiterTimeTask); Tasks.Add(loiterTimeTask);
TaskAdded?.Invoke(this, new FlightTaskAddedEventArgs { LastTask = lastTask, AddedTask = loiterTimeTask }); RaiseTaskAdded(lastTask, loiterTimeTask);
SelectedTask = loiterTimeTask; SelectedTask = loiterTimeTask;
SelectedTaskIndex = Tasks.Count - 1; SelectedTaskIndex = Tasks.Count - 1;
} }

5
Plane.FormationCreator/Views/TaskBarView.xaml.cs
View File

@ -92,10 +92,13 @@ namespace Plane.FormationCreator.Views
flytopage.Visibility = Visibility.Visible; flytopage.Visibility = Visibility.Visible;
if (_flightTaskManager.Tasks[_flightTaskManager.SelectedTaskIndex].TaskType!= FlightTaskType.Land) if (_flightTaskManager.Tasks[_flightTaskManager.SelectedTaskIndex].TaskType != FlightTaskType.Land)
flytoLabel.Content = (_flightTaskManager.SelectedTaskIndex + 1) + " " + _flightTaskManager.Tasks[_flightTaskManager.SelectedTaskIndex].TaskCnName; flytoLabel.Content = (_flightTaskManager.SelectedTaskIndex + 1) + " " + _flightTaskManager.Tasks[_flightTaskManager.SelectedTaskIndex].TaskCnName;
else else
{
flytoLabel.Content = (_flightTaskManager.SelectedTaskIndex + 1) + " 航点"; flytoLabel.Content = (_flightTaskManager.SelectedTaskIndex + 1) + " 航点";
addtaskbtn.IsEnabled = false;
}
} }