diff --git a/Plane.FormationCreator.sln b/Plane.FormationCreator.sln index 5366b41..729a900 100644 --- a/Plane.FormationCreator.sln +++ b/Plane.FormationCreator.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.7.34202.233 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plane.FormationCreator", "Plane.FormationCreator\Plane.FormationCreator.csproj", "{61E2F31E-220A-4E3F-A64D-F7CDC2135008}" ProjectSection(ProjectDependencies) = postProject - {705AAB55-ED7A-4856-8F7B-E7A78ED9E39A} = {705AAB55-ED7A-4856-8F7B-E7A78ED9E39A} + {9BFB2123-2239-4A85-B5BC-0328CE7640D7} = {9BFB2123-2239-4A85-B5BC-0328CE7640D7} EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plane.Windows", "..\Plane.Libraries\Plane.Windows\Plane.Windows.csproj", "{06848293-9B17-4068-9B35-44D0ED713CD4}" @@ -26,7 +26,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlaneGcsSdk_Shared", "..\Pl EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlaneGcsSdk.Contract_Shared", "..\Plane.Sdk3\PlaneGcsSdk.Contract_Shared\PlaneGcsSdk.Contract_Shared.shproj", "{695733D7-99FF-4707-8C89-474E949CADCB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlightRoute", "..\FlyTest\FlightRoute\FlightRoute.csproj", "{705AAB55-ED7A-4856-8F7B-E7A78ED9E39A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlightRoute", "..\FlyTest\FlightRoute\FlightRoute.csproj", "{9BFB2123-2239-4A85-B5BC-0328CE7640D7}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlightRouteV2", "..\FlyCube\FlightRouteV2\FlightRouteV2.csproj", "{626A9BFA-07DE-4063-A178-360EB7057ED6}" EndProject @@ -102,14 +102,14 @@ Global {47141894-ECE3-48CA-8DCF-CA751BDA231E}.v4.0-Debug|Any CPU.Build.0 = Debug|Any CPU {47141894-ECE3-48CA-8DCF-CA751BDA231E}.v4.0-Release|Any CPU.ActiveCfg = Release|Any CPU {47141894-ECE3-48CA-8DCF-CA751BDA231E}.v4.0-Release|Any CPU.Build.0 = Release|Any CPU - {705AAB55-ED7A-4856-8F7B-E7A78ED9E39A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {705AAB55-ED7A-4856-8F7B-E7A78ED9E39A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {705AAB55-ED7A-4856-8F7B-E7A78ED9E39A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {705AAB55-ED7A-4856-8F7B-E7A78ED9E39A}.Release|Any CPU.Build.0 = Release|Any CPU - {705AAB55-ED7A-4856-8F7B-E7A78ED9E39A}.v4.0-Debug|Any CPU.ActiveCfg = Debug|Any CPU - {705AAB55-ED7A-4856-8F7B-E7A78ED9E39A}.v4.0-Debug|Any CPU.Build.0 = Debug|Any CPU - {705AAB55-ED7A-4856-8F7B-E7A78ED9E39A}.v4.0-Release|Any CPU.ActiveCfg = Release|Any CPU - {705AAB55-ED7A-4856-8F7B-E7A78ED9E39A}.v4.0-Release|Any CPU.Build.0 = Release|Any CPU + {9BFB2123-2239-4A85-B5BC-0328CE7640D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9BFB2123-2239-4A85-B5BC-0328CE7640D7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9BFB2123-2239-4A85-B5BC-0328CE7640D7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9BFB2123-2239-4A85-B5BC-0328CE7640D7}.Release|Any CPU.Build.0 = Release|Any CPU + {9BFB2123-2239-4A85-B5BC-0328CE7640D7}.v4.0-Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9BFB2123-2239-4A85-B5BC-0328CE7640D7}.v4.0-Debug|Any CPU.Build.0 = Debug|Any CPU + {9BFB2123-2239-4A85-B5BC-0328CE7640D7}.v4.0-Release|Any CPU.ActiveCfg = Release|Any CPU + {9BFB2123-2239-4A85-B5BC-0328CE7640D7}.v4.0-Release|Any CPU.Build.0 = Release|Any CPU {626A9BFA-07DE-4063-A178-360EB7057ED6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {626A9BFA-07DE-4063-A178-360EB7057ED6}.Debug|Any CPU.Build.0 = Debug|Any CPU {626A9BFA-07DE-4063-A178-360EB7057ED6}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/Plane.FormationCreator/Formation/FlightTaskManager.cs b/Plane.FormationCreator/Formation/FlightTaskManager.cs index 37b857e..5bf2d23 100644 --- a/Plane.FormationCreator/Formation/FlightTaskManager.cs +++ b/Plane.FormationCreator/Formation/FlightTaskManager.cs @@ -968,11 +968,11 @@ namespace Plane.FormationCreator.Formation string extname = Path.GetExtension(filename); if (extname == ".svg") { - vc = FlyBase.svgToPos(filename); + vc = FlyBase.SvgToPos(filename); } else if (extname == ".obj") { - vc = FlyBase.objToPos(filename); + vc = FlyBase.ObjToPos(filename); } else return; @@ -1022,11 +1022,11 @@ namespace Plane.FormationCreator.Formation string extname = Path.GetExtension(filename); if (extname == ".svg") { - vc = FlyBase.svgToPos(filename); + vc = FlyBase.SvgToPos(filename); } else if (extname == ".obj") { - vc = FlyBase.objToPos(filename); + vc = FlyBase.ObjToPos(filename); } else return; @@ -2651,7 +2651,7 @@ namespace Plane.FormationCreator.Formation List> flyret = await CollisionLayersync(aVecs, bVecs, taskname_a, taskname_b); if (flyret.Count == 0) { - Message.Show($"任务{SelectedTaskIndex + 1}无法生成2D航线"); + //Message.Show($"任务{SelectedTaskIndex + 1}无法生成2D航线"); return; } firstMiddleVecs = flyret[0];