diff --git a/XplorePlane/Assets/Icons/Home.png b/XplorePlane/Assets/Icons/Home.png new file mode 100644 index 0000000..5aca159 Binary files /dev/null and b/XplorePlane/Assets/Icons/Home.png differ diff --git a/XplorePlane/Assets/Icons/Module.png b/XplorePlane/Assets/Icons/Module.png new file mode 100644 index 0000000..3966b51 Binary files /dev/null and b/XplorePlane/Assets/Icons/Module.png differ diff --git a/XplorePlane/Assets/Icons/add-pos.png b/XplorePlane/Assets/Icons/add-pos.png new file mode 100644 index 0000000..1ea1ae8 Binary files /dev/null and b/XplorePlane/Assets/Icons/add-pos.png differ diff --git a/XplorePlane/Assets/Icons/bga.png b/XplorePlane/Assets/Icons/bga.png new file mode 100644 index 0000000..9be358e Binary files /dev/null and b/XplorePlane/Assets/Icons/bga.png differ diff --git a/XplorePlane/Assets/Icons/closedoor.png b/XplorePlane/Assets/Icons/closedoor.png new file mode 100644 index 0000000..1261385 Binary files /dev/null and b/XplorePlane/Assets/Icons/closedoor.png differ diff --git a/XplorePlane/Assets/Icons/detector.png b/XplorePlane/Assets/Icons/detector.png new file mode 100644 index 0000000..8b2d8d2 Binary files /dev/null and b/XplorePlane/Assets/Icons/detector.png differ diff --git a/XplorePlane/Assets/Icons/finish.png b/XplorePlane/Assets/Icons/finish.png new file mode 100644 index 0000000..2505218 Binary files /dev/null and b/XplorePlane/Assets/Icons/finish.png differ diff --git a/XplorePlane/Assets/Icons/get-pos.png b/XplorePlane/Assets/Icons/get-pos.png new file mode 100644 index 0000000..2689cff Binary files /dev/null and b/XplorePlane/Assets/Icons/get-pos.png differ diff --git a/XplorePlane/Assets/Icons/heat-engine.png b/XplorePlane/Assets/Icons/heat-engine.png new file mode 100644 index 0000000..9a716d1 Binary files /dev/null and b/XplorePlane/Assets/Icons/heat-engine.png differ diff --git a/XplorePlane/Assets/Icons/mark.png b/XplorePlane/Assets/Icons/mark.png new file mode 100644 index 0000000..069e411 Binary files /dev/null and b/XplorePlane/Assets/Icons/mark.png differ diff --git a/XplorePlane/Assets/Icons/message.png b/XplorePlane/Assets/Icons/message.png new file mode 100644 index 0000000..f47d495 Binary files /dev/null and b/XplorePlane/Assets/Icons/message.png differ diff --git a/XplorePlane/Assets/Icons/new-doc.png b/XplorePlane/Assets/Icons/new-doc.png new file mode 100644 index 0000000..d082c08 Binary files /dev/null and b/XplorePlane/Assets/Icons/new-doc.png differ diff --git a/XplorePlane/Assets/Icons/opendoor.png b/XplorePlane/Assets/Icons/opendoor.png new file mode 100644 index 0000000..3cc14cf Binary files /dev/null and b/XplorePlane/Assets/Icons/opendoor.png differ diff --git a/XplorePlane/Assets/Icons/pores.png b/XplorePlane/Assets/Icons/pores.png new file mode 100644 index 0000000..68ba530 Binary files /dev/null and b/XplorePlane/Assets/Icons/pores.png differ diff --git a/XplorePlane/Assets/Icons/quick-scan.png b/XplorePlane/Assets/Icons/quick-scan.png new file mode 100644 index 0000000..74b6dd9 Binary files /dev/null and b/XplorePlane/Assets/Icons/quick-scan.png differ diff --git a/XplorePlane/Assets/Icons/reference.png b/XplorePlane/Assets/Icons/reference.png new file mode 100644 index 0000000..349cb14 Binary files /dev/null and b/XplorePlane/Assets/Icons/reference.png differ diff --git a/XplorePlane/Assets/Icons/run.png b/XplorePlane/Assets/Icons/run.png new file mode 100644 index 0000000..4a24853 Binary files /dev/null and b/XplorePlane/Assets/Icons/run.png differ diff --git a/XplorePlane/Assets/Icons/save.png b/XplorePlane/Assets/Icons/save.png new file mode 100644 index 0000000..cd7e1d0 Binary files /dev/null and b/XplorePlane/Assets/Icons/save.png differ diff --git a/XplorePlane/Assets/Icons/saveall.png b/XplorePlane/Assets/Icons/saveall.png new file mode 100644 index 0000000..7d2c6bd Binary files /dev/null and b/XplorePlane/Assets/Icons/saveall.png differ diff --git a/XplorePlane/Assets/Icons/set-pos.png b/XplorePlane/Assets/Icons/set-pos.png new file mode 100644 index 0000000..7954d44 Binary files /dev/null and b/XplorePlane/Assets/Icons/set-pos.png differ diff --git a/XplorePlane/Assets/Icons/setting.png b/XplorePlane/Assets/Icons/setting.png new file mode 100644 index 0000000..d147078 Binary files /dev/null and b/XplorePlane/Assets/Icons/setting.png differ diff --git a/XplorePlane/Assets/Icons/stop.png b/XplorePlane/Assets/Icons/stop.png new file mode 100644 index 0000000..6e42222 Binary files /dev/null and b/XplorePlane/Assets/Icons/stop.png differ diff --git a/XplorePlane/Assets/Icons/tools.png b/XplorePlane/Assets/Icons/tools.png new file mode 100644 index 0000000..aded62d Binary files /dev/null and b/XplorePlane/Assets/Icons/tools.png differ diff --git a/XplorePlane/Assets/Icons/wait.png b/XplorePlane/Assets/Icons/wait.png new file mode 100644 index 0000000..1e7eaab Binary files /dev/null and b/XplorePlane/Assets/Icons/wait.png differ diff --git a/XplorePlane/Assets/Icons/workflow.png b/XplorePlane/Assets/Icons/workflow.png new file mode 100644 index 0000000..678a67d Binary files /dev/null and b/XplorePlane/Assets/Icons/workflow.png differ diff --git a/XplorePlane/Assets/Icons/xray.png b/XplorePlane/Assets/Icons/xray.png new file mode 100644 index 0000000..12e279c Binary files /dev/null and b/XplorePlane/Assets/Icons/xray.png differ diff --git a/XplorePlane/Assets/Icons/xyz.png b/XplorePlane/Assets/Icons/xyz.png new file mode 100644 index 0000000..6b9cbbb Binary files /dev/null and b/XplorePlane/Assets/Icons/xyz.png differ diff --git a/XplorePlane/GapInspect.ico b/XplorePlane/GapInspect.ico new file mode 100644 index 0000000..53ae163 Binary files /dev/null and b/XplorePlane/GapInspect.ico differ diff --git a/XplorePlane/Views/ImageProcessing/ImageProcessingPanelView.xaml b/XplorePlane/Views/ImageProcessing/ImageProcessingPanelView.xaml index 3b3030e..3d8094d 100644 --- a/XplorePlane/Views/ImageProcessing/ImageProcessingPanelView.xaml +++ b/XplorePlane/Views/ImageProcessing/ImageProcessingPanelView.xaml @@ -135,11 +135,11 @@ Grid.RowSpan="3" Margin="0,0,0,3" Header="原始图像"> - + - + diff --git a/XplorePlane/Views/Main/MainWindow.xaml b/XplorePlane/Views/Main/MainWindow.xaml index b21fbbf..05945e7 100644 --- a/XplorePlane/Views/Main/MainWindow.xaml +++ b/XplorePlane/Views/Main/MainWindow.xaml @@ -66,11 +66,6 @@ telerik:ScreenTip.Title="实时模式" Size="Large" Text="实时" /> - - - - - + - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -296,11 +202,10 @@ IsChecked="{Binding Path=SetIsWrapped.SelectedValue, Mode=TwoWay}" IsEnabled="{Binding Path=SetIsWrapped.IsEnabled}" Size="Medium" - SmallImage="{telerik:IconResource IconRelativePath=16/wrapText.png, - IconSources={StaticResource IconPaths}}" - Text="Wrap Text" /> + SmallImage="/Assets/Icons/heat-engine.png" + Text="暖机" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + SmallImage="/Assets/Icons/home.png" + Text="轴复位" /> + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + SmallImage="/Assets/Icons/new-doc.png" + Text="新建CNC" /> + SmallImage="/Assets/Icons/reference.png" + Text="参考点" /> + + - - - + + SmallImage="/Assets/Icons/add-pos.png" + Text="新建CNC" /> + SmallImage="/Assets/Icons/Module.png" + Text="参考点" /> + + + + @@ -487,194 +365,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -685,444 +392,38 @@ telerik:ScreenTip.Description="Create a link in your document for quick access to webpages and files. Hyperlinks can also take you to places in your document." telerik:ScreenTip.Title="Add a Hyperlink" Command="{Binding Path=ShowHyperlinkDialog.Command}" - Content="Hyperlink" + Content="快速扫描" IsEnabled="{Binding Path=ShowHyperlinkDialog.IsEnabled}" - LargeImage="{telerik:IconResource IconRelativePath=32/insertHyperlink.png, - IconSources={StaticResource IconPaths}}" + LargeImage="/Assets/Icons/quick-scan.png" Size="Large" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1180,7 +481,7 @@ - @@ -1220,7 +521,7 @@ VerticalAlignment="Center" FontFamily="Consolas" FontSize="11" - Foreground="#AAAAAA" + Foreground="White" Text="x: 0 y: 0 RGB: 0 0 0" /> diff --git a/XplorePlane/readme.txt b/XplorePlane/readme.txt index 0eaedc0..c8a91d2 100644 --- a/XplorePlane/readme.txt +++ b/XplorePlane/readme.txt @@ -34,12 +34,17 @@ 2026.3.18 ---------------------- -1、全局数据结构的考虑与设计(多个窗体可以调用公共的数据,如射线源状态,探测器状态,运动位置,图像等) +1、全局数据结构的考虑与设计(多个窗体可以调用公共的数据,如射线源状态,探测器状态,运动位置,图像等) √ 2、将计划窗体默认隐藏,只有CNC状态下展开 √ -3、日志该用XP.Common库和多语言的学习 +3、日志该用XP.Common库和多语言的学习 √ +2026.3.19 +---------------------- +1、软件主界面设计讨论,暂定初稿,给出效果图设计 +2、 +