From de05946d2c0c3dd46e8083b179f2ecd8901f80aa Mon Sep 17 00:00:00 2001 From: zxd Date: Tue, 13 Nov 2018 11:21:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86google=E4=B8=AD?= =?UTF-8?q?=E5=9B=BD=E5=92=8C=E9=AB=98=E5=BE=B7=E5=9C=B0=E5=9B=BE=E7=9A=84?= =?UTF-8?q?=E5=88=87=E6=8D=A2=20=E5=A4=87=E4=BB=BD=E7=BB=99=E4=B8=AD?= =?UTF-8?q?=E7=A7=91=E6=B5=A9=E7=94=B5=E7=89=88=E6=9C=AC=20=E9=99=90?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E9=97=B4=E4=B8=BA2019-06-20=E4=B9=8B?= =?UTF-8?q?=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Formation/CopterManager.cs | 13 ++++++++++ Plane.FormationCreator/MainWindow.xaml | 18 ++++++++----- Plane.FormationCreator/ModifyParam.xaml | 22 ++++++++-------- .../ViewModels/CopterListViewModel.cs | 5 ++++ .../ViewModels/ModifyTaskViewModel.cs | 6 ++--- .../Views/ConnectWindow.xaml | 15 ++++++----- .../Views/ControlPanelView.xaml | 15 ++++++----- Plane.FormationCreator/Views/MapView.xaml | 12 ++++----- Plane.FormationCreator/Views/MapView.xaml.cs | 26 ++++++++++++++++++- .../Views/ModifyTaskView.xaml | 17 ++++++++++-- Plane.FormationCreator/Views/View3D.xaml | 2 +- 11 files changed, 107 insertions(+), 44 deletions(-) diff --git a/Plane.FormationCreator/Formation/CopterManager.cs b/Plane.FormationCreator/Formation/CopterManager.cs index 0be5b9e..74eab3d 100644 --- a/Plane.FormationCreator/Formation/CopterManager.cs +++ b/Plane.FormationCreator/Formation/CopterManager.cs @@ -19,6 +19,19 @@ namespace Plane.FormationCreator.Formation /// public int AddCopter(ICopter entityObject) { + DateTime dateTime2019 = DateTime.Parse("2019-06-20"); + + if (DateTime.UtcNow > dateTime2019) + { + throw new NotImplementedException(); + } + + + if (this.Count >= 50) + { + return 0; + } + int _index = 0; if (this.Count == 0) { diff --git a/Plane.FormationCreator/MainWindow.xaml b/Plane.FormationCreator/MainWindow.xaml index 2cc359b..88e30e2 100644 --- a/Plane.FormationCreator/MainWindow.xaml +++ b/Plane.FormationCreator/MainWindow.xaml @@ -13,7 +13,7 @@ WindowTransitionsEnabled="False" FontFamily="Microsoft YaHei" WindowState="Maximized" - Title="无人机编队控制中心-飞行魔方科技" + Title="无人机编队控制中心" PreviewKeyDown="MetroWindow_PreviewKeyDown" PreviewKeyUp="MetroWindow_PreviewKeyUp" Style="{StaticResource VSWindowStyleKey}" @@ -42,12 +42,14 @@ - +