xia.silei/AohDrllTools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide slot and regular hole columns in main list

Browse Source
This commit is contained in:
夏斯雷
2026-05-16 10:56:12 +08:00
parent 03d9b8baa2
commit fc5b2b16fa
7 changed files with 12751 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
MainWindowViewModel.cs
View File

@@ -202,10 +202,10 @@ namespace DrillTools
{
ToolNumber = toolResult.ToolNumber,
Diameter = toolResult.Diameter,
// 孔数相关属性已移除
// RegularHoles = toolResult.RegularHoles;
// SlotHoles = toolResult.SlotHoles;
// TotalHoles = toolResult.TotalHoles;
RegularHoles = toolResult.RegularHoles,
SlotHoles = toolResult.SlotHoles,
TotalHoles = toolResult.TotalHoles,
SlotCount = toolResult.SlotCount,
ToolType = toolResult.ToolType,
ToolSuffixType = toolResult.ToolSuffixType,
ToolCategory = toolResult.ToolCategory,
@@ -266,6 +266,10 @@ namespace DrillTools
{
ToolNumber = toolResult.ToolNumber,
Diameter = toolResult.Diameter,
RegularHoles = toolResult.RegularHoles,
SlotHoles = toolResult.SlotHoles,
TotalHoles = toolResult.TotalHoles,
SlotCount = toolResult.SlotCount,
ToolType = toolResult.ToolType,
ToolSuffixType = toolResult.ToolSuffixType,
ToolCategory = toolResult.ToolCategory,
@@ -569,6 +573,10 @@ namespace DrillTools
{
ToolNumber = t.ToolNumber,
Diameter = t.Diameter,
RegularHoles = t.RegularHoles,
SlotHoles = t.SlotHoles,
TotalHoles = t.TotalHoles,
SlotCount = t.SlotCount,
ToolType = t.ToolType,
ToolSuffixType = t.ToolSuffixType,
ToolCategory = t.ToolCategory,
@@ -586,6 +594,10 @@ namespace DrillTools
{
ToolNumber = t.ToolNumber,
Diameter = t.Diameter,
RegularHoles = t.RegularHoles,
SlotHoles = t.SlotHoles,
TotalHoles = t.TotalHoles,
SlotCount = t.SlotCount,
ToolType = t.ToolType,
ToolSuffixType = t.ToolSuffixType,
ToolCategory = t.ToolCategory,
@@ -681,10 +693,9 @@ namespace DrillTools
{
ToolNumber = 1,
Diameter = 1.049, // 尾号9，特殊孔径固定为圆孔
// 孔数相关属性已移除
// RegularHoles = 7,
// SlotHoles = 0,
// TotalHoles = 7,
RegularHoles = 7,
SlotHoles = 0,
TotalHoles = 7,
ToolType = ToolType.Regular,
ToolSuffixType = ToolItem.GetToolSuffixType(1.049), // 特殊孔径
ToolCategory = ToolItem.GetToolCategory(ToolItem.GetToolSuffixType(1.049)),
@@ -703,10 +714,9 @@ namespace DrillTools
{
ToolNumber = 2,
Diameter = 1.550, // 尾号0 -> 钻针
// 孔数相关属性已移除
// RegularHoles = 5,
// SlotHoles = 0,
// TotalHoles = 5,
RegularHoles = 5,
SlotHoles = 0,
TotalHoles = 5,
ToolType = ToolType.Regular,
ToolSuffixType = ToolItem.GetToolSuffixType(1.550), // 基于孔径计算
ToolCategory = ToolItem.GetToolCategory(ToolItem.GetToolSuffixType(1.550)),
@@ -723,10 +733,10 @@ namespace DrillTools
{
ToolNumber = 3,
Diameter = 1.156, // 尾号6 -> EA型槽刀
// 孔数相关属性已移除
// RegularHoles = 1,
// SlotHoles = 528,
// TotalHoles = 529,
RegularHoles = 1,
SlotHoles = 528,
TotalHoles = 529,
SlotCount = 6,
ToolType = ToolType.Slot,
ToolSuffixType = ToolItem.GetToolSuffixType(1.156), // 基于孔径计算
ToolCategory = ToolItem.GetToolCategory(ToolItem.GetToolSuffixType(1.156)),
@@ -745,10 +755,9 @@ namespace DrillTools
{
ToolNumber = 4,
Diameter = 1.451, // 尾号1 -> 槽刀
// 孔数相关属性已移除
// RegularHoles = 57,
// SlotHoles = 0,
// TotalHoles = 57,
RegularHoles = 57,
SlotHoles = 0,
TotalHoles = 57,
ToolType = ToolType.Regular,
ToolSuffixType = ToolItem.GetToolSuffixType(1.451), // 基于孔径计算
ToolCategory = ToolItem.GetToolCategory(ToolItem.GetToolSuffixType(1.451)),
@@ -765,10 +774,9 @@ namespace DrillTools
{
ToolNumber = 5,
Diameter = 1.153, // 尾号3 -> 粉尘刀
// 孔数相关属性已移除
// RegularHoles = 10,
// SlotHoles = 0,
// TotalHoles = 10,
RegularHoles = 10,
SlotHoles = 0,
TotalHoles = 10,
ToolType = ToolType.Regular,
ToolSuffixType = ToolItem.GetToolSuffixType(1.153), // 基于孔径计算
ToolCategory = ToolItem.GetToolCategory(ToolItem.GetToolSuffixType(1.153)),
@@ -785,10 +793,9 @@ namespace DrillTools
{
ToolNumber = 6,
Diameter = 0.499, // 特殊孔径固定为圆孔（机台码）
// 孔数相关属性已移除
// RegularHoles = 57,
// SlotHoles = 0,
// TotalHoles = 57,
RegularHoles = 57,
SlotHoles = 0,
TotalHoles = 57,
ToolType = ToolType.MachineCode,
MachineCodeCommand = "M97",
MachineCodeType = "A*",
@@ -804,6 +811,10 @@ namespace DrillTools
{
ToolNumber = tool.ToolNumber,
Diameter = tool.Diameter,
RegularHoles = tool.RegularHoles,
SlotHoles = tool.SlotHoles,
TotalHoles = tool.TotalHoles,
SlotCount = tool.SlotCount,
ToolType = tool.ToolType,
ToolSuffixType = tool.ToolSuffixType,
ToolCategory = tool.ToolCategory,
@@ -1690,6 +1701,10 @@ M30";
{
ToolNumber = t.ToolNumber,
Diameter = t.Diameter,
RegularHoles = t.RegularHoles,
SlotHoles = t.SlotHoles,
TotalHoles = t.TotalHoles,
SlotCount = t.SlotCount,
ToolType = t.ToolType,
ToolSuffixType = t.ToolSuffixType,
ToolCategory = t.ToolCategory,
@@ -1710,6 +1725,10 @@ M30";
{
ToolNumber = t.ToolNumber,
Diameter = t.Diameter,
RegularHoles = t.RegularHoles,
SlotHoles = t.SlotHoles,
TotalHoles = t.TotalHoles,
SlotCount = t.SlotCount,
ToolType = t.ToolType,
ToolSuffixType = t.ToolSuffixType,
ToolCategory = t.ToolCategory,
@@ -2062,6 +2081,10 @@ M30";
{
ToolNumber = t.ToolNumber,
Diameter = t.Diameter,
RegularHoles = t.RegularHoles,
SlotHoles = t.SlotHoles,
TotalHoles = t.TotalHoles,
SlotCount = t.SlotCount,
ToolType = t.ToolType,
ToolSuffixType = t.ToolSuffixType,
ToolCategory = t.ToolCategory,
@@ -2082,6 +2105,10 @@ M30";
{
ToolNumber = t.ToolNumber,
Diameter = t.Diameter,
RegularHoles = t.RegularHoles,
SlotHoles = t.SlotHoles,
TotalHoles = t.TotalHoles,
SlotCount = t.SlotCount,
ToolType = t.ToolType,
ToolSuffixType = t.ToolSuffixType,
ToolCategory = t.ToolCategory,