【类 型】:feat

【主	题】:添加碰撞次数排序 函数
【描	述】:
	[原因]:拿来判断 哪些航线碰撞较多 可按排序 顺序来 逐个绕行
	[过程]:计算航线的碰撞次数
	[影响]:
【结	束】

# 类型 包含:
# feat:新功能(feature)
# fix:修补bug
# docs:文档(documentation)
# style: 格式(不影响代码运行的变动)
# refactor:重构(即不是新增功能,也不是修改bug的代码变动)
# test:增加测试
# chore:构建过程或辅助工具的变动
This commit is contained in:
tk 2024-06-24 16:19:10 +08:00
parent 2ef44cdd54
commit 44ab798803
37 changed files with 224 additions and 114 deletions

Binary file not shown.

View File

@ -745,13 +745,14 @@ namespace FlightRoute
} }
return re; return re;
} }
private static Vector3[] ABypassB(Vector3[] startPos, Vector3[] middlePos, Vector3[] endPos, List<int> check, double[] mRate, int loopIndex = 800, double offsetDistance = 60)//法线螺旋线绕行 private static Vector3[] ABypassB(Vector3[] startPos, Vector3[] middlePos, Vector3[] endPos, List<int> check, double[] mRate, SomeCalculateWay StrPrint, int loopIndex = 800, double offsetDistance = 60)//法线螺旋线绕行
{ {
Console.WriteLine("check:{0}", check.Count); StrPrint("需要绕行总共"+ check.Count + "架。");
bool pa; bool pa;
//设置绕行 //设置绕行
foreach (int id in check) foreach (int id in check)
{ {
StrPrint(Convert.ToString(id));
pa = false; pa = false;
Vector3 initialPos = middlePos[id];//记录初始位置 如果绕行不成功 还原位置 Vector3 initialPos = middlePos[id];//记录初始位置 如果绕行不成功 还原位置
for (int k = 0; k < mRate.Length; k++) for (int k = 0; k < mRate.Length; k++)
@ -784,7 +785,7 @@ namespace FlightRoute
} }
return middlePos; return middlePos;
} }
public static List<Vector3[]> ExeABypassB(Vector3[] startPos, Vector3[] endPos, out bool isSuccess, SomeCalculateWay strPrint)//绕行获取中间航点 public static List<Vector3[]> ExeABypassB(Vector3[] startPos, Vector3[] endPos, out bool isSuccess, SomeCalculateWay StrPrint)//绕行获取中间航点
{ {
isSuccess = false; isSuccess = false;
List<Vector3[]> middlePosS = new List<Vector3[]>();//声明返回坐标集合 可能是1 到 3组坐标 既 1到3个中间航点 List<Vector3[]> middlePosS = new List<Vector3[]>();//声明返回坐标集合 可能是1 到 3组坐标 既 1到3个中间航点
@ -794,7 +795,7 @@ namespace FlightRoute
double[] mRate = { .5, .6, .4, .7, .3 };//中点绕行的比例 double[] mRate = { .5, .6, .4, .7, .3 };//中点绕行的比例
Vector3[] middlePos = SetMiddleCurvedValue(startPos, endPos, 0.5, 1.2);//加中间航点 Vector3[] middlePos = SetMiddleCurvedValue(startPos, endPos, 0.5, 1.2);//加中间航点
bool pa = false; bool pa = false;
strPrint("中(二)段绕行开始"); StrPrint("中(二)段绕行开始");
while (true)//中段绕行循环 while (true)//中段绕行循环
{ {
//前中后所有碰撞的飞机id //前中后所有碰撞的飞机id
@ -802,13 +803,13 @@ namespace FlightRoute
//绕行 //绕行
if (check.Count != 0)//有碰撞 if (check.Count != 0)//有碰撞
{ {
middlePos = ABypassB(startPos, middlePos, endPos, check, mRate); middlePos = ABypassB(startPos, middlePos, endPos, check, mRate, StrPrint);
} }
//重新检查碰撞 //重新检查碰撞
checkEd = ABNeedCheck(startPos, middlePos, endPos); checkEd = ABNeedCheck(startPos, middlePos, endPos);
if (checkEd.Count == 0)//如果绕行没有碰撞 if (checkEd.Count == 0)//如果绕行没有碰撞
{ {
//strPrint("成功"); //StrPrint("成功");
middlePosS.Add(middlePos);//添加中间坐标组 middlePosS.Add(middlePos);//添加中间坐标组
isSuccess = true; isSuccess = true;
return middlePosS;//第一次绕行 没有碰撞 直接返回 return middlePosS;//第一次绕行 没有碰撞 直接返回
@ -817,7 +818,7 @@ namespace FlightRoute
{ {
if (pa)//判定第二次 check 和 checkEd一致 if (pa)//判定第二次 check 和 checkEd一致
{ {
//strPrint("一致跳出");//如果一个中间航点 算不过去 跳出然后 进行三段绕行 //StrPrint("一致跳出");//如果一个中间航点 算不过去 跳出然后 进行三段绕行
break;//连续两次check 和 checkEd一致 跳出 break;//连续两次check 和 checkEd一致 跳出
} }
pa = true; pa = true;
@ -831,15 +832,15 @@ namespace FlightRoute
check = ABNeedCheck(startPos, fMiddlePos, middlePos); check = ABNeedCheck(startPos, fMiddlePos, middlePos);
if (check.Count != 0)//检测是否进行一段循环 if (check.Count != 0)//检测是否进行一段循环
{ {
strPrint("一段绕行开始"); StrPrint("一段绕行开始");
while (true)//一段绕行 循环体 while (true)//一段绕行 循环体
{ {
//前中后所有碰撞的飞机id //前中后所有碰撞的飞机id
check = ABNeedCheck(startPos, fMiddlePos, middlePos); check = ABNeedCheck(startPos, fMiddlePos, middlePos);
if (check.Count != 0) fMiddlePos = ABypassB(startPos, fMiddlePos, middlePos, check, fmRate, 1500, 15);//有碰撞 绕行 if (check.Count != 0) fMiddlePos = ABypassB(startPos, fMiddlePos, middlePos, check, fmRate, StrPrint, 1500, 15);//有碰撞 绕行
else//没有碰撞 添加返回值并跳出 一段绕行 循环 else//没有碰撞 添加返回值并跳出 一段绕行 循环
{ {
//strPrint("成功"); //StrPrint("成功");
isSuccess = true; isSuccess = true;
middlePosS.Add(fMiddlePos);//添加一段 绕行结果 middlePosS.Add(fMiddlePos);//添加一段 绕行结果
break; break;
@ -851,7 +852,7 @@ namespace FlightRoute
{ {
if (pa)//判定第二次 check 和 checkEd一致 if (pa)//判定第二次 check 和 checkEd一致
{ {
//strPrint("一致跳出");//如果一个中间航点 算不过去 跳出然后 进行三段绕行 //StrPrint("一致跳出");//如果一个中间航点 算不过去 跳出然后 进行三段绕行
isSuccess = false; isSuccess = false;
middlePosS.Add(fMiddlePos);//添加一段 绕行结果 middlePosS.Add(fMiddlePos);//添加一段 绕行结果
break;//连续两次check 和 checkEd一致 跳出 break;//连续两次check 和 checkEd一致 跳出
@ -870,15 +871,15 @@ namespace FlightRoute
check = ABNeedCheck(middlePos, bMiddlePos, endPos); check = ABNeedCheck(middlePos, bMiddlePos, endPos);
if (check.Count != 0)//检测是否进行三段循环 if (check.Count != 0)//检测是否进行三段循环
{ {
strPrint("三段绕行开始"); StrPrint("三段绕行开始");
while (true)//一段绕行 循环体 while (true)//一段绕行 循环体
{ {
//前中后所有碰撞的飞机id //前中后所有碰撞的飞机id
check = ABNeedCheck(middlePos, bMiddlePos, endPos); check = ABNeedCheck(middlePos, bMiddlePos, endPos);
if (check.Count != 0) bMiddlePos = ABypassB(middlePos, bMiddlePos, endPos, check, bmRate, 1500, 15);//有碰撞 绕行 if (check.Count != 0) bMiddlePos = ABypassB(middlePos, bMiddlePos, endPos, check, bmRate, StrPrint, 1500, 15);//有碰撞 绕行
else//没有碰撞 添加返回值并跳出 三段绕行 循环 else//没有碰撞 添加返回值并跳出 三段绕行 循环
{ {
//strPrint("成功"); //StrPrint("成功");
isSuccess = true; isSuccess = true;
middlePosS.Add(bMiddlePos);//添加三段 绕行结果 middlePosS.Add(bMiddlePos);//添加三段 绕行结果
break; break;
@ -890,7 +891,7 @@ namespace FlightRoute
{ {
if (pa)//判定第二次 check 和 checkEd一致 if (pa)//判定第二次 check 和 checkEd一致
{ {
//strPrint("一致跳出");//如果一个中间航点 算不过去 跳出然后 进行三段绕行 //StrPrint("一致跳出");//如果一个中间航点 算不过去 跳出然后 进行三段绕行
isSuccess = false; isSuccess = false;
middlePosS.Add(bMiddlePos);//添加三段 绕行结果 middlePosS.Add(bMiddlePos);//添加三段 绕行结果
break;//连续两次check 和 checkEd一致 跳出 break;//连续两次check 和 checkEd一致 跳出
@ -904,6 +905,13 @@ namespace FlightRoute
return middlePosS; return middlePosS;
} }
//碰撞次数排序
public static List<int> CollisionTaxis(Vector3[] startPos, Vector3[] middlePos, Vector3[] endPos)
{
List<int> re = new List<int>();
AirImitation(startPos, middlePos);
AirImitation(middlePos, endPos);
return re;
}
} }
} }

View File

@ -8,11 +8,12 @@
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>FlyExe</RootNamespace> <RootNamespace>FlyExe</RootNamespace>
<AssemblyName>FlyExe</AssemblyName> <AssemblyName>FlyExe</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
@ -23,6 +24,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
@ -32,6 +34,7 @@
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ApplicationIcon>lnk.ico</ApplicationIcon> <ApplicationIcon>lnk.ico</ApplicationIcon>
@ -88,6 +91,7 @@
<Generator>ResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput> <LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource> </EmbeddedResource>
<None Include="app.config" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <LastGenOutput>Settings.Designer.cs</LastGenOutput>

View File

@ -7,8 +7,8 @@
mc:Ignorable="d" mc:Ignorable="d"
Title="MainWindow" Height="450" Width="800"> Title="MainWindow" Height="450" Width="800">
<Grid> <Grid>
<Button Name="aPassbBut" Content="3D绕行计算" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="75" Click="Button_Click"/> <Button Name="aPassbBut" Content="3D绕行计算" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="80" Click="Button_Click_ABypassB"/>
<TextBox Name="vLogBox" HorizontalAlignment="Right" Height="399" Margin="493,10,0,0" TextWrapping="Wrap" Text="beta 1.0" VerticalAlignment="Top" Width="289"/> <TextBox Name="vLogBox" HorizontalAlignment="Right" Height="399" Margin="493,10,0,0" TextWrapping="Wrap" Text="beta 1.0" VerticalAlignment="Top" Width="289"/>
<Button Content="碰撞次数排序" HorizontalAlignment="Left" Margin="10,34,0,0" VerticalAlignment="Top" Width="80" Click="Button_Click_CollisionSort"/>
</Grid> </Grid>
</Window> </Window>

View File

@ -45,22 +45,39 @@ namespace FlyExe
fs.Close(); fs.Close();
} }
//回调 输出日志 //回调 输出日志
public void strPrint(string str) public void StrPrint(string str)
{ {
vLogBox.Text += "\r\n"+str; vLogBox.Text += "\r\n"+str;
} }
//资源管理器 获取文件路径及文件名
//3D绕行 按钮执行 private string OpExplorer(string titName, out bool isSelect)
private void Button_Click(object sender, RoutedEventArgs e)
{ {
Microsoft.Win32.OpenFileDialog ofdl = new Microsoft.Win32.OpenFileDialog();//打开资源管理器 Microsoft.Win32.OpenFileDialog ofdl = new Microsoft.Win32.OpenFileDialog();//打开资源管理器
ofdl.Filter = "文本文件|*.txt";//资源管理器限制扩展名 ofdl.Filter = "航点文件|*.txt;*.svg";//资源管理器限制扩展名
strPrint("开始"); ofdl.Title = titName;
if (ofdl.ShowDialog() == true) if (ofdl.ShowDialog() == true)//执行打开资源管理器 并判断有没有获取到文件名
{ {
List<Vector3[]> txt = FlyBase.TxtToPos(ofdl.FileName, out string[] fightNames);//从txt文件里面读取航点 信息 isSelect = true;
}
else
{
isSelect = false;
}
return ofdl.FileName;//返回路径及文件名
}
//3D绕行 按钮执行
private void Button_Click_ABypassB(object sender, RoutedEventArgs e)
{
//导入航点
bool isSelect;//判断有没有获取到文件名
string fileName = OpExplorer("导入航点文件", out isSelect);
StrPrint("开始");
if (isSelect)//如果读取到文件路径名称
{
List<Vector3[]> txt = FlyBase.TxtToPos(fileName, out string[] fightNames);//从txt文件里面读取航点 信息
//3D绕行计算 //3D绕行计算
List<Vector3[]> txtC = FlyBase.ExeABypassB(txt[0], txt[1], out this.isSuccess, strPrint); List<Vector3[]> txtC = FlyBase.ExeABypassB(txt[0], txt[1], out this.isSuccess, StrPrint);
string txta = ""; string txta = "";
string txtb = ""; string txtb = "";
string txtc = ""; string txtc = "";
@ -72,19 +89,39 @@ namespace FlyExe
if (txtC.Count > 2) txtc += id + " 0" + " " + txtC[2][id - 1].x + " " + txtC[2][id - 1].y + " " + txtC[2][id - 1].z + "\r\n"; if (txtC.Count > 2) txtc += id + " 0" + " " + txtC[2][id - 1].x + " " + txtC[2][id - 1].y + " " + txtC[2][id - 1].z + "\r\n";
id++; id++;
} }
SaveFile("C:/Users/ddkk/Desktop/a.txt", txta); SaveFile("C:/Users/szdot/Desktop/a.txt", txta);
if (txtC.Count > 1) SaveFile("C:/Users/ddkk/Desktop/b.txt", txtb); if (txtC.Count > 1) SaveFile("C:/Users/szdot/Desktop/b.txt", txtb);
if (txtC.Count > 2) SaveFile("C:/Users/ddkk/Desktop/c.txt", txtc); if (txtC.Count > 2) SaveFile("C:/Users/szdot/Desktop/c.txt", txtc);
} }
if (this.isSuccess == true) if (this.isSuccess == true)
{ {
strPrint("成功"); StrPrint("成功");
} }
else else
{ {
strPrint("未成功"); StrPrint("未成功");
}
StrPrint("结束");
}
//碰撞次数排序
private void Button_Click_CollisionSort(object sender, RoutedEventArgs e)
{
//导入航点
bool isSelect;//判断有没有获取到文件名
string fileName = OpExplorer("导入航点文件", out isSelect);
if (isSelect)//如果读取到文件路径名称
{
List<Vector3[]> txt = FlyBase.TxtToPos(fileName, out string[] fightNames);//从txt文件里面读取航点 信息
//碰撞检测
List<int[]> airCollision = FlyBase.AirImitation(txt[0],txt[1]);
string txta="";
foreach (int[] item in airCollision)
{
txta += item[0]+"-"+item[1]+",";
}
SaveFile("C:/Users/ddkk/Desktop/a.txt", txta);
} }
strPrint("结束");
} }
} }
} }

View File

@ -1,69 +1,61 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
// 运行时版本: 4.0.30319.42000 // 运行时版本:4.0.30319.42000
// //
// 对此文件的更改可能导致不正确的行为,如果 // 对此文件的更改可能导致不正确的行为,并且如果
// 重新生成代码,则所做更改将丢失。 // 重新生成代码,这些更改将会丢失。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FlyExe.Properties namespace FlyExe.Properties {
{ using System;
/// <summary> /// <summary>
/// 强类型资源类,用于查找本地化字符串等。 /// 一个强类型资源类,用于查找本地化字符串等。
/// </summary> /// </summary>
// 此类是由 StronglyTypedResourceBuilder // 此类是由 StronglyTypedResourceBuilder
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或除成员,请编辑 .ResX 文件,然后重新运行 ResGen // 若要添加或除成员,请编辑 .ResX 文件,然后重新运行 ResGen
// (以 /str 作为命令选项),或重新生成 VS 项目。 // (以 /str 作为命令选项),或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources internal class Resources {
{
private static global::System.Resources.ResourceManager resourceMan; private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture; private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() internal Resources() {
{
} }
/// <summary> /// <summary>
/// 返回此类使用的缓存 ResourceManager 实例。 /// 返回此类使用的缓存 ResourceManager 实例。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager internal static global::System.Resources.ResourceManager ResourceManager {
{ get {
get if (object.ReferenceEquals(resourceMan, null)) {
{
if ((resourceMan == null))
{
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FlyExe.Properties.Resources", typeof(Resources).Assembly); global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FlyExe.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp; resourceMan = temp;
} }
return resourceMan; return resourceMan;
} }
} }
/// <summary> /// <summary>
/// 覆盖当前线程的 CurrentUICulture 属性 /// 重写当前线程的 CurrentUICulture 属性,对
/// 使用此强类型资源类的资源查找。 /// 使用此强类型资源类的所有资源查找执行重写
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture internal static global::System.Globalization.CultureInfo Culture {
{ get {
get
{
return resourceCulture; return resourceCulture;
} }
set set {
{
resourceCulture = value; resourceCulture = value;
} }
} }

View File

@ -1,28 +1,24 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // 此代码由工具生成。
// Runtime Version:4.0.30319.42000 // 运行时版本:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // 对此文件的更改可能会导致不正确的行为,并且如果
// the code is regenerated. // 重新生成代码,这些更改将会丢失。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FlyExe.Properties namespace FlyExe.Properties {
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
{
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default public static Settings Default {
{ get {
get
{
return defaultInstance; return defaultInstance;
} }
} }

Binary file not shown.

Binary file not shown.

View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "88D2FCC0D14F72D150CCF75A242EBFBA9C3DCC95" #pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1791ED17CFCFA5FCE2A3BC6EA9051B84A0B7F001904B3CA6C85B128240339F17"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。

View File

@ -1 +1 @@
f97a6cf095fbfd5d28e778aa70e22f3f37de2492 e16fc739e9ec147644c375ff4511444c12a43969

View File

@ -4,17 +4,17 @@
winexe winexe
C# C#
.cs .cs
C:\Users\ddkk\source\repos\FlyExe\FlyExe\obj\Debug\ f:\company\flyCube\repos\FlyExe\FlyExe\obj\Debug\
FlyExe FlyExe
none none
false false
DEBUG;TRACE DEBUG;TRACE
C:\Users\ddkk\source\repos\FlyExe\FlyExe\App.xaml f:\company\flyCube\repos\FlyExe\FlyExe\App.xaml
11151548125 11151548125
6275622168 6275622168
121654848548 121654848548
MainWindow.xaml; MainWindow.xaml;
False True

View File

@ -4,17 +4,17 @@
winexe winexe
C# C#
.cs .cs
C:\Users\ddkk\source\repos\FlyExe\FlyExe\obj\Debug\ F:\company\flyCube\repos\FlyExe\FlyExe\obj\Debug\
FlyExe FlyExe
none none
false false
DEBUG;TRACE DEBUG;TRACE
C:\Users\ddkk\source\repos\FlyExe\FlyExe\App.xaml F:\company\flyCube\repos\FlyExe\FlyExe\App.xaml
11151548125 11151548125
71584094132 7-339959000
121654848548 121654848548
MainWindow.xaml; MainWindow.xaml;
False True

View File

@ -1,4 +1,4 @@
 
FC:\Users\ddkk\source\repos\FlyExe\FlyExe\MainWindow.xaml;; Ff:\company\flyCube\repos\FlyExe\FlyExe\MainWindow.xaml;;

Binary file not shown.

View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "ED1E53A78C8E25821B7476E16EEE13C6AC05EA73" #pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FCA230EF8F254D9354ACE2DF79A22DA52FB657CC"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
@ -40,6 +40,22 @@ namespace FlyExe {
/// </summary> /// </summary>
public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector { public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
#line 10 "..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button aPassbBut;
#line default
#line hidden
#line 11 "..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox vLogBox;
#line default
#line hidden
private bool _contentLoaded; private bool _contentLoaded;
/// <summary> /// <summary>
@ -71,9 +87,21 @@ namespace FlyExe {
switch (connectionId) switch (connectionId)
{ {
case 1: case 1:
this.aPassbBut = ((System.Windows.Controls.Button)(target));
#line 10 "..\..\MainWindow.xaml" #line 10 "..\..\MainWindow.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click); this.aPassbBut.Click += new System.Windows.RoutedEventHandler(this.Button_Click_ABypassB);
#line default
#line hidden
return;
case 2:
this.vLogBox = ((System.Windows.Controls.TextBox)(target));
return;
case 3:
#line 12 "..\..\MainWindow.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click_CollisionSort);
#line default #line default
#line hidden #line hidden

View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "ED1E53A78C8E25821B7476E16EEE13C6AC05EA73" #pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0359BD5A430D6DD62687931B950585C6687C5CC0F99DF9C892B794E4DCF17C29"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
@ -40,6 +40,22 @@ namespace FlyExe {
/// </summary> /// </summary>
public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector { public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
#line 10 "..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button aPassbBut;
#line default
#line hidden
#line 11 "..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox vLogBox;
#line default
#line hidden
private bool _contentLoaded; private bool _contentLoaded;
/// <summary> /// <summary>
@ -71,9 +87,21 @@ namespace FlyExe {
switch (connectionId) switch (connectionId)
{ {
case 1: case 1:
this.aPassbBut = ((System.Windows.Controls.Button)(target));
#line 10 "..\..\MainWindow.xaml" #line 10 "..\..\MainWindow.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click); this.aPassbBut.Click += new System.Windows.RoutedEventHandler(this.Button_Click_ABypassB);
#line default
#line hidden
return;
case 2:
this.vLogBox = ((System.Windows.Controls.TextBox)(target));
return;
case 3:
#line 12 "..\..\MainWindow.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click_CollisionSort);
#line default #line default
#line hidden #line hidden

View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "88D2FCC0D14F72D150CCF75A242EBFBA9C3DCC95" #pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1791ED17CFCFA5FCE2A3BC6EA9051B84A0B7F001904B3CA6C85B128240339F17"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。

View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "88D2FCC0D14F72D150CCF75A242EBFBA9C3DCC95" #pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1791ED17CFCFA5FCE2A3BC6EA9051B84A0B7F001904B3CA6C85B128240339F17"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。

View File

@ -1 +1 @@
361348148997c80915d4ddb6950904440ca0e45e 0b80e210afd5d72a366960bb740ba613f795730c

View File

@ -13,7 +13,6 @@ C:\Users\ddkk\source\repos\FlyExe\FlyExe\obj\Release\FlyExe.exe
C:\Users\ddkk\source\repos\FlyExe\FlyExe\obj\Release\FlyExe.pdb C:\Users\ddkk\source\repos\FlyExe\FlyExe\obj\Release\FlyExe.pdb
F:\company\flyCube\repos\FlyExe\FlyExe\bin\Release\FlyExe.exe F:\company\flyCube\repos\FlyExe\FlyExe\bin\Release\FlyExe.exe
F:\company\flyCube\repos\FlyExe\FlyExe\bin\Release\FlyExe.pdb F:\company\flyCube\repos\FlyExe\FlyExe\bin\Release\FlyExe.pdb
F:\company\flyCube\repos\FlyExe\FlyExe\obj\Release\FlyExe.csprojAssemblyReference.cache
F:\company\flyCube\repos\FlyExe\FlyExe\obj\Release\MainWindow.g.cs F:\company\flyCube\repos\FlyExe\FlyExe\obj\Release\MainWindow.g.cs
F:\company\flyCube\repos\FlyExe\FlyExe\obj\Release\App.g.cs F:\company\flyCube\repos\FlyExe\FlyExe\obj\Release\App.g.cs
F:\company\flyCube\repos\FlyExe\FlyExe\obj\Release\FlyExe_MarkupCompile.cache F:\company\flyCube\repos\FlyExe\FlyExe\obj\Release\FlyExe_MarkupCompile.cache
@ -25,3 +24,5 @@ F:\company\flyCube\repos\FlyExe\FlyExe\obj\Release\FlyExe.csproj.GenerateResourc
F:\company\flyCube\repos\FlyExe\FlyExe\obj\Release\FlyExe.csproj.CoreCompileInputs.cache F:\company\flyCube\repos\FlyExe\FlyExe\obj\Release\FlyExe.csproj.CoreCompileInputs.cache
F:\company\flyCube\repos\FlyExe\FlyExe\obj\Release\FlyExe.exe F:\company\flyCube\repos\FlyExe\FlyExe\obj\Release\FlyExe.exe
F:\company\flyCube\repos\FlyExe\FlyExe\obj\Release\FlyExe.pdb F:\company\flyCube\repos\FlyExe\FlyExe\obj\Release\FlyExe.pdb
F:\company\flyCube\repos\FlyExe\FlyExe\bin\Release\FlyExe.exe.config
F:\company\flyCube\repos\FlyExe\FlyExe\obj\Release\FlyExe.csproj.AssemblyReference.cache

Binary file not shown.

Binary file not shown.

View File

@ -10,10 +10,10 @@ none
false false
TRACE TRACE
F:\company\flyCube\repos\FlyExe\FlyExe\App.xaml F:\company\flyCube\repos\FlyExe\FlyExe\App.xaml
11151548125 1219584333
6275622168 6-456654908
121654848548 121182277259
MainWindow.xaml; MainWindow.xaml;
False False

View File

@ -10,11 +10,11 @@ none
false false
TRACE TRACE
F:\company\flyCube\repos\FlyExe\FlyExe\App.xaml F:\company\flyCube\repos\FlyExe\FlyExe\App.xaml
11151548125 1219584333
71584094132 7-1018797491
121654848548 121182277259
MainWindow.xaml; MainWindow.xaml;
False True

Binary file not shown.

View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "18301429B29EC6CF4B77FF39F3DFBE4F9ADE133F" #pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0359BD5A430D6DD62687931B950585C6687C5CC0F99DF9C892B794E4DCF17C29"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
@ -90,7 +90,7 @@ namespace FlyExe {
this.aPassbBut = ((System.Windows.Controls.Button)(target)); this.aPassbBut = ((System.Windows.Controls.Button)(target));
#line 10 "..\..\MainWindow.xaml" #line 10 "..\..\MainWindow.xaml"
this.aPassbBut.Click += new System.Windows.RoutedEventHandler(this.Button_Click); this.aPassbBut.Click += new System.Windows.RoutedEventHandler(this.Button_Click_ABypassB);
#line default #line default
#line hidden #line hidden
@ -98,6 +98,14 @@ namespace FlyExe {
case 2: case 2:
this.vLogBox = ((System.Windows.Controls.TextBox)(target)); this.vLogBox = ((System.Windows.Controls.TextBox)(target));
return; return;
case 3:
#line 12 "..\..\MainWindow.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click_CollisionSort);
#line default
#line hidden
return;
} }
this._contentLoaded = true; this._contentLoaded = true;
} }

View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "18301429B29EC6CF4B77FF39F3DFBE4F9ADE133F" #pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0359BD5A430D6DD62687931B950585C6687C5CC0F99DF9C892B794E4DCF17C29"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
@ -90,7 +90,7 @@ namespace FlyExe {
this.aPassbBut = ((System.Windows.Controls.Button)(target)); this.aPassbBut = ((System.Windows.Controls.Button)(target));
#line 10 "..\..\MainWindow.xaml" #line 10 "..\..\MainWindow.xaml"
this.aPassbBut.Click += new System.Windows.RoutedEventHandler(this.Button_Click); this.aPassbBut.Click += new System.Windows.RoutedEventHandler(this.Button_Click_ABypassB);
#line default #line default
#line hidden #line hidden
@ -98,6 +98,14 @@ namespace FlyExe {
case 2: case 2:
this.vLogBox = ((System.Windows.Controls.TextBox)(target)); this.vLogBox = ((System.Windows.Controls.TextBox)(target));
return; return;
case 3:
#line 12 "..\..\MainWindow.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click_CollisionSort);
#line default
#line hidden
return;
} }
this._contentLoaded = true; this._contentLoaded = true;
} }