Revert #1682 (three-axis milling) (#1715)

Thanks @bherbruck.

assets/icons/ui/source/icons.rs

@@ -142,19 +142,6 @@ pub(crate) fn paint_with(p: &Painter, r: Rect, name: &str, ink: Color32, fill: C
     let pen = Pen { p, r, ink, fill, accent, w: (r.width() / 24.0 * 1.4).max(1.0) };
     let a = pen.accent;
     match name {
-        "cam_path" => {
-            pen.closed(&[(3.0, 4.0), (21.0, 4.0), (21.0, 20.0), (3.0, 20.0)], ink);
-            pen.line(&[(5.0, 7.0), (18.0, 7.0), (18.0, 11.0), (6.0, 11.0), (6.0, 15.0), (18.0, 15.0)], a);
-        }
-        "cam_generate" => {
-            pen.line(&[(3.0, 5.0), (10.0, 5.0), (10.0, 11.0), (3.0, 11.0), (3.0, 18.0), (10.0, 18.0)], ink);
-            pen.poly(&[(14.0, 5.0), (22.0, 12.0), (14.0, 19.0)], a, a);
-        }
-        "cam_verify" => {
-            pen.iso_box(2.0, 9.0, 9.0, 6.0, 7.0);
-            pen.line(&[(12.0, 16.0), (15.0, 19.0), (22.0, 9.0)], a);
-        }
-
         "sketch" => {
             pen.poly(&[(3.0, 14.0), (13.0, 9.0), (21.0, 13.0), (11.0, 18.0)], pen.fill, ink);
             pen.line(&[(7.0, 13.0), (16.0, 4.0), (18.0, 6.0), (9.0, 15.0), (6.5, 15.5), (7.0, 13.0)], a);

assets/locales/en.json

@@ -305,22 +305,6 @@
   "cmd.browser_rename_group": "Rename Group",
   "cmd.browser_ungroup": "Ungroup",
   "cmd.browser_visibility": "Show/Hide",
-  "cmd.cam_boundary_from_profile": "Use Sketch Profile",
-  "cmd.cam_delete": "Delete Manufacturing Item",
-  "cmd.cam_export": "Export CAM Artifact",
-  "cmd.cam_export_result": "Collect CAM Export",
-  "cmd.cam_generate": "Generate Toolpaths",
-  "cmd.cam_holes_from_selection": "Use Selected Holes",
-  "cmd.cam_inspect": "Inspect Manufacturing",
-  "cmd.cam_job_cancel": "Cancel CAM Job",
-  "cmd.cam_job_status": "CAM Job Status",
-  "cmd.cam_operation_order": "Reorder Operations",
-  "cmd.cam_operation_put": "Milling Operation",
-  "cmd.cam_post": "Post Reference G-code",
-  "cmd.cam_program_put": "NC Program",
-  "cmd.cam_setup_put": "Milling Setup",
-  "cmd.cam_simulate": "Simulate Toolpaths",
-  "cmd.cam_tool_put": "Tool Library",
   "cmd.canvas_calibrate": "Calibrate Canvas",
   "cmd.canvas_decal": "Decal",
   "cmd.canvas_delete": "Delete Canvas",
@@ -1129,7 +1113,6 @@
   "ui.heading_design": "DESIGN",
   "ui.heading_draft": "DRAFT",
   "ui.heading_edit": "EDIT",
-  "ui.heading_export": "EXPORT",
   "ui.heading_extrude": "EXTRUDE",
   "ui.heading_fillet": "FILLET",
   "ui.heading_finish_sketch": "FINISH SKETCH",
@@ -1142,7 +1125,6 @@
   "ui.heading_make": "MAKE",
   "ui.heading_measure": "MEASURE",
   "ui.heading_mesh": "MESH",
-  "ui.heading_milling": "MILLING",
   "ui.heading_mirror": "MIRROR",
   "ui.heading_modify": "MODIFY",
   "ui.heading_move": "MOVE",
@@ -1177,12 +1159,10 @@
   "ui.heading_surface": "SURFACE",
   "ui.heading_sweep": "SWEEP",
   "ui.heading_thread": "THREAD",
-  "ui.heading_toolpaths": "TOOLPATHS",
   "ui.heading_top": "TOP",
   "ui.heading_torus": "TORUS",
   "ui.heading_utilities": "UTILITIES",
   "ui.heading_utility": "UTILITY",
-  "ui.heading_verify": "VERIFY",
   "ui.help": "Help",
   "ui.hide": "Hide",
   "ui.hideAxes": "Hide Axes",

assets/locales/ja.json

@@ -305,22 +305,6 @@
   "cmd.browser_rename_group": "グループの名前を変更",
   "cmd.browser_ungroup": "グループ解除",
   "cmd.browser_visibility": "表示/非表示",
-  "cmd.cam_boundary_from_profile": "スケッチプロファイルを使用",
-  "cmd.cam_delete": "加工項目を削除",
-  "cmd.cam_export": "CAM 成果物をエクスポート",
-  "cmd.cam_export_result": "CAM 出力を取得",
-  "cmd.cam_generate": "工具経路を生成",
-  "cmd.cam_holes_from_selection": "選択した穴を使用",
-  "cmd.cam_inspect": "加工を確認",
-  "cmd.cam_job_cancel": "CAM ジョブをキャンセル",
-  "cmd.cam_job_status": "CAM ジョブの状態",
-  "cmd.cam_operation_order": "加工順序を変更",
-  "cmd.cam_operation_put": "切削加工",
-  "cmd.cam_post": "参照 G コードを出力",
-  "cmd.cam_program_put": "NC プログラム",
-  "cmd.cam_setup_put": "切削セットアップ",
-  "cmd.cam_simulate": "工具経路をシミュレーション",
-  "cmd.cam_tool_put": "工具ライブラリ",
   "cmd.canvas_calibrate": "キャンバスの尺度を設定",
   "cmd.canvas_decal": "デカール",
   "cmd.canvas_delete": "キャンバスを削除",
@@ -1129,7 +1113,6 @@
   "ui.heading_design": "デザイン",
   "ui.heading_draft": "勾配",
   "ui.heading_edit": "編集",
-  "ui.heading_export": "出力",
   "ui.heading_extrude": "押し出し",
   "ui.heading_fillet": "フィレット",
   "ui.heading_finish_sketch": "スケッチを終了",
@@ -1142,7 +1125,6 @@
   "ui.heading_make": "製造",
   "ui.heading_measure": "計測",
   "ui.heading_mesh": "メッシュ",
-  "ui.heading_milling": "切削",
   "ui.heading_mirror": "ミラー",
   "ui.heading_modify": "修正",
   "ui.heading_move": "移動",
@@ -1177,12 +1159,10 @@
   "ui.heading_surface": "サーフェス",
   "ui.heading_sweep": "スイープ",
   "ui.heading_thread": "ねじ",
-  "ui.heading_toolpaths": "工具経路",
   "ui.heading_top": "上面",
   "ui.heading_torus": "トーラス",
   "ui.heading_utilities": "ユーティリティ",
   "ui.heading_utility": "ユーティリティ",
-  "ui.heading_verify": "検証",
   "ui.help": "ヘルプ",
   "ui.hide": "非表示",
   "ui.hideAxes": "軸を非表示",

assets/locales/zh.json

@@ -305,22 +305,6 @@
   "cmd.browser_rename_group": "重命名组",
   "cmd.browser_ungroup": "取消编组",
   "cmd.browser_visibility": "显示/隐藏",
-  "cmd.cam_boundary_from_profile": "使用草图轮廓",
-  "cmd.cam_delete": "删除制造项目",
-  "cmd.cam_export": "导出 CAM 工件",
-  "cmd.cam_export_result": "获取 CAM 导出",
-  "cmd.cam_generate": "生成刀具路径",
-  "cmd.cam_holes_from_selection": "使用选定孔",
-  "cmd.cam_inspect": "检查制造",
-  "cmd.cam_job_cancel": "取消 CAM 作业",
-  "cmd.cam_job_status": "CAM 作业状态",
-  "cmd.cam_operation_order": "重新排序操作",
-  "cmd.cam_operation_put": "铣削操作",
-  "cmd.cam_post": "输出参考 G 代码",
-  "cmd.cam_program_put": "NC 程序",
-  "cmd.cam_setup_put": "铣削设置",
-  "cmd.cam_simulate": "模拟刀具路径",
-  "cmd.cam_tool_put": "刀具库",
   "cmd.canvas_calibrate": "校准画布",
   "cmd.canvas_decal": "贴花",
   "cmd.canvas_delete": "删除画布",
@@ -1129,7 +1113,6 @@
   "ui.heading_design": "设计",
   "ui.heading_draft": "拔模",
   "ui.heading_edit": "编辑",
-  "ui.heading_export": "导出",
   "ui.heading_extrude": "拉伸",
   "ui.heading_fillet": "圆角",
   "ui.heading_finish_sketch": "完成草图",
@@ -1142,7 +1125,6 @@
   "ui.heading_make": "制作",
   "ui.heading_measure": "测量",
   "ui.heading_mesh": "网格",
-  "ui.heading_milling": "铣削",
   "ui.heading_mirror": "镜像",
   "ui.heading_modify": "修改",
   "ui.heading_move": "移动",
@@ -1177,12 +1159,10 @@
   "ui.heading_surface": "曲面",
   "ui.heading_sweep": "扫掠",
   "ui.heading_thread": "螺纹",
-  "ui.heading_toolpaths": "刀具路径",
   "ui.heading_top": "上视",
   "ui.heading_torus": "圆环体",
   "ui.heading_utilities": "工具",
   "ui.heading_utility": "实用工具",
-  "ui.heading_verify": "验证",
   "ui.help": "帮助",
   "ui.hide": "隐藏",
   "ui.hideAxes": "隐藏轴",

assets/styles/ui/palettes.rs

@@ -46,11 +46,6 @@ impl Tokens {
             preview_add: Color32::from_rgb(112, 160, 226),
             preview_sketch: Color32::from_rgb(32, 190, 96),
             preview_cut: Color32::from_rgba_unmultiplied_const(232, 84, 44, 110),
-            cam_stock: Color32::from_rgb(166, 127, 65),
-            cam_fixture: Color32::from_rgb(150, 90, 180),
-            cam_cut: Color32::from_rgb(20, 110, 160),
-            cam_rapid: Color32::from_rgb(185, 115, 25),
-            cam_tool: Color32::from_rgb(40, 150, 70),
             cube_face: Color32::from_rgb(236, 239, 244),
             cube_border: Color32::from_rgb(85, 94, 110),
             cube_text: Color32::from_rgb(38, 42, 50),
@@ -146,11 +141,6 @@ impl Tokens {
         t.hover = Color32::from_rgb(54, 61, 74);
         t.hover_edge_halo = Color32::from_rgb(203, 203, 203);
         t.origin_point = Color32::from_rgb(214, 215, 218);
-        t.cam_stock = Color32::from_rgb(190, 154, 92);
-        t.cam_fixture = Color32::from_rgb(177, 119, 209);
-        t.cam_cut = Color32::from_rgb(50, 180, 240);
-        t.cam_rapid = Color32::from_rgb(230, 170, 65);
-        t.cam_tool = Color32::from_rgb(135, 220, 145);
         t.viewport_top = Color32::from_rgb(46, 52, 64);
         t.viewport_bottom = Color32::from_rgb(46, 52, 64);
         t.grid = Color32::from_rgb(59, 65, 76);
@@ -219,12 +209,6 @@ impl Tokens {
             t.bend_down = Color32::from_rgb(200, 120, 0);
             t.sketch_accent = Color32::from_rgb(60, 150, 105);
         }
-        // Use the measured five-colour semantic set for stock, fixtures and motions.
-        t.cam_stock = t.sketch_fixed;
-        t.cam_fixture = t.sketch_projected;
-        t.cam_cut = t.sketch;
-        t.cam_rapid = t.sketch_lost;
-        t.cam_tool = t.sketch_locked;
         t
     }
 
@@ -241,12 +225,6 @@ impl Tokens {
             t.sketch_locked = Color32::from_rgb(20, 165, 70);
             t.box_crossing = Color32::from_rgb(200, 60, 120);
         }
-        // Use the measured five-colour semantic set for stock, fixtures and motions.
-        t.cam_stock = t.sketch_fixed;
-        t.cam_fixture = t.sketch_projected;
-        t.cam_cut = t.sketch;
-        t.cam_rapid = t.sketch_lost;
-        t.cam_tool = t.sketch_locked;
         t
     }
 }