From 58ba9dd0e949407ec6d6e6050ab25ff47ee09060 Mon Sep 17 00:00:00 2001 From: Brad Collette Date: Sat, 17 Aug 2024 16:40:46 -0500 Subject: [PATCH] Remove deprecated materials # Conflicts: # src/Mod/Material/Resources/Materials/Machining/ToolSteel.FCMat --- src/Mod/Material/CMakeLists.txt | 14 ------------- .../Materials/Machining/Aluminum-6061.FCMat | 21 ------------------- .../Materials/Machining/Aluminum-7075.FCMat | 21 ------------------- .../Materials/Machining/Aluminum-Cast.FCMat | 21 ------------------- .../Materials/Machining/Brass-Hard.FCMat | 21 ------------------- .../Materials/Machining/Brass-Medium.FCMat | 21 ------------------- .../Materials/Machining/Brass-Soft.FCMat | 21 ------------------- .../Materials/Machining/CarbonSteel.FCMat | 13 ------------ .../Materials/Machining/HardPlastics.FCMat | 13 ------------ .../Materials/Machining/Hardwood.FCMat | 15 ------------- .../Materials/Machining/SoftPlastics.FCMat | 13 ------------ .../Materials/Machining/Softwood.FCMat | 15 ------------- .../Materials/Machining/Stainless-303.FCMat | 13 ------------ .../Materials/Machining/Stainless-304.FCMat | 13 ------------ .../Materials/Machining/Stainless-316.FCMat | 13 ------------ 15 files changed, 248 deletions(-) delete mode 100644 src/Mod/Material/Resources/Materials/Machining/Aluminum-6061.FCMat delete mode 100644 src/Mod/Material/Resources/Materials/Machining/Aluminum-7075.FCMat delete mode 100644 src/Mod/Material/Resources/Materials/Machining/Aluminum-Cast.FCMat delete mode 100644 src/Mod/Material/Resources/Materials/Machining/Brass-Hard.FCMat delete mode 100644 src/Mod/Material/Resources/Materials/Machining/Brass-Medium.FCMat delete mode 100644 src/Mod/Material/Resources/Materials/Machining/Brass-Soft.FCMat delete mode 100644 src/Mod/Material/Resources/Materials/Machining/CarbonSteel.FCMat delete mode 100644 src/Mod/Material/Resources/Materials/Machining/HardPlastics.FCMat delete mode 100644 src/Mod/Material/Resources/Materials/Machining/Hardwood.FCMat delete mode 100644 src/Mod/Material/Resources/Materials/Machining/SoftPlastics.FCMat delete mode 100644 src/Mod/Material/Resources/Materials/Machining/Softwood.FCMat delete mode 100644 src/Mod/Material/Resources/Materials/Machining/Stainless-303.FCMat delete mode 100644 src/Mod/Material/Resources/Materials/Machining/Stainless-304.FCMat delete mode 100644 src/Mod/Material/Resources/Materials/Machining/Stainless-316.FCMat diff --git a/src/Mod/Material/CMakeLists.txt b/src/Mod/Material/CMakeLists.txt index 1d6fb01bb6..c73ea1905e 100644 --- a/src/Mod/Material/CMakeLists.txt +++ b/src/Mod/Material/CMakeLists.txt @@ -213,27 +213,13 @@ SET(PatternLib_Files ) SET(MachiningLib_Files - Resources/Materials/Machining/Aluminum-6061.FCMat - Resources/Materials/Machining/Aluminum-7075.FCMat - Resources/Materials/Machining/Aluminum-Cast.FCMat Resources/Materials/Machining/AluminumCastAlloy.FCMat Resources/Materials/Machining/AluminumWroughtAlloy.FCMat Resources/Materials/Machining/AusteniticStainlessSteel.FCMat - Resources/Materials/Machining/Brass-Hard.FCMat - Resources/Materials/Machining/Brass-Medium.FCMat - Resources/Materials/Machining/Brass-Soft.FCMat - Resources/Materials/Machining/CarbonSteel.FCMat Resources/Materials/Machining/GrayCastIron.FCMat - Resources/Materials/Machining/HardPlastics.FCMat - Resources/Materials/Machining/Hardwood.FCMat Resources/Materials/Machining/LowAlloySteel.FCMat Resources/Materials/Machining/MalleableCastIron.FCMat Resources/Materials/Machining/MildSteel.FCMat - Resources/Materials/Machining/SoftPlastics.FCMat - Resources/Materials/Machining/Softwood.FCMat - Resources/Materials/Machining/Stainless-303.FCMat - Resources/Materials/Machining/Stainless-304.FCMat - Resources/Materials/Machining/Stainless-316.FCMat Resources/Materials/Machining/ToolSteel.FCMat ) diff --git a/src/Mod/Material/Resources/Materials/Machining/Aluminum-6061.FCMat b/src/Mod/Material/Resources/Materials/Machining/Aluminum-6061.FCMat deleted file mode 100644 index 5f49b8ab69..0000000000 --- a/src/Mod/Material/Resources/Materials/Machining/Aluminum-6061.FCMat +++ /dev/null @@ -1,21 +0,0 @@ -General: - UUID: "054d0414-a431-45bd-b401-be4687bdcc98" - Author: "Daniel Wood" - License: "CC-BY-3.0" - Name: "Aluminum 6061-T6" - Description: "Path Machining Material Aluminum (6061)" -Inherits: - Aluminum: - UUID: "68b152b2-fd5e-4f10-8db0-1a2df3fe0fda" -Models: - Father: - UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' - Father: "Metal" - MaterialStandard: - UUID: '1e2c0088-904a-4537-925f-64064c07d700' - KindOfMaterial: "Aluminium" - Machinability: - UUID: '9d81fcb2-bf81-48e3-bb57-d45ecf380096' - SurfaceSpeedHSS: '175 m/min' - SurfaceSpeedCarbide: '389 m/min' - SpecificCuttingForce: '' diff --git a/src/Mod/Material/Resources/Materials/Machining/Aluminum-7075.FCMat b/src/Mod/Material/Resources/Materials/Machining/Aluminum-7075.FCMat deleted file mode 100644 index 88a0b41f76..0000000000 --- a/src/Mod/Material/Resources/Materials/Machining/Aluminum-7075.FCMat +++ /dev/null @@ -1,21 +0,0 @@ -General: - UUID: "0fb7ecaf-0ec0-487e-a5b6-89d165f5ea8f" - Author: "Daniel Wood" - License: "CC-BY-3.0" - Name: "Aluminum 7075" - Description: "CAM Machining Material Aluminum (7075)" -Inherits: - Aluminum: - UUID: "9bf060e9-1663-44a2-88e2-2ff6ee858efe" -Models: - Father: - UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' - Father: "Metal" - MaterialStandard: - UUID: '1e2c0088-904a-4537-925f-64064c07d700' - KindOfMaterial: "Aluminium" - Machinability: - UUID: '9d81fcb2-bf81-48e3-bb57-d45ecf380096' - SurfaceSpeedHSS: '175 m/min' - SurfaceSpeedCarbide: '395 m/min' - SpecificCuttingForce: '' diff --git a/src/Mod/Material/Resources/Materials/Machining/Aluminum-Cast.FCMat b/src/Mod/Material/Resources/Materials/Machining/Aluminum-Cast.FCMat deleted file mode 100644 index 67da0c28a7..0000000000 --- a/src/Mod/Material/Resources/Materials/Machining/Aluminum-Cast.FCMat +++ /dev/null @@ -1,21 +0,0 @@ -General: - UUID: "7dca3625-cb0a-4b70-947f-856b1dbedeb1" - Author: "Daniel Wood" - License: "CC-BY-3.0" - Name: "Aluminum (Cast)" - Description: "CAM Machining Material Aluminum (Cast)" -Inherits: - Aluminum: - UUID: "9bf060e9-1663-44a2-88e2-2ff6ee858efe" -Models: - Father: - UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' - Father: "Metal" - MaterialStandard: - UUID: '1e2c0088-904a-4537-925f-64064c07d700' - KindOfMaterial: "Aluminium" - Machinability: - UUID: '9d81fcb2-bf81-48e3-bb57-d45ecf380096' - SurfaceSpeedHSS: '175 m/min' - SurfaceSpeedCarbide: '395 m/min' - SpecificCuttingForce: '' diff --git a/src/Mod/Material/Resources/Materials/Machining/Brass-Hard.FCMat b/src/Mod/Material/Resources/Materials/Machining/Brass-Hard.FCMat deleted file mode 100644 index 5faa290a1c..0000000000 --- a/src/Mod/Material/Resources/Materials/Machining/Brass-Hard.FCMat +++ /dev/null @@ -1,21 +0,0 @@ -General: - UUID: "787b55bb-2992-41be-a9a9-0b1bfc4905b9" - Author: "Daniel Wood" - License: "CC-BY-3.0" - Name: "Brass (Hard)" - Description: "CAM Machining Material Brass (Hard)" -Inherits: - Brass: - UUID: "4151e19c-fd6a-4ca4-83d4-d5e17d76cb9c" -Models: - Father: - UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' - Father: "Metal" - MaterialStandard: - UUID: '1e2c0088-904a-4537-925f-64064c07d700' - KindOfMaterial: "Brass" - Machinability: - UUID: '9d81fcb2-bf81-48e3-bb57-d45ecf380096' - SurfaceSpeedHSS: '200 m/min' - SurfaceSpeedCarbide: '395 m/min' - SpecificCuttingForce: '' diff --git a/src/Mod/Material/Resources/Materials/Machining/Brass-Medium.FCMat b/src/Mod/Material/Resources/Materials/Machining/Brass-Medium.FCMat deleted file mode 100644 index abcb198929..0000000000 --- a/src/Mod/Material/Resources/Materials/Machining/Brass-Medium.FCMat +++ /dev/null @@ -1,21 +0,0 @@ -General: - UUID: "7c40791a-db51-4e57-8799-92662baa3b49" - Author: "Daniel Wood" - License: "CC-BY-3.0" - Name: "Brass (Medium)" - Description: "CAM Machining Material Brass (Medium)" -Inherits: - Brass: - UUID: "4151e19c-fd6a-4ca4-83d4-d5e17d76cb9c" -Models: - Father: - UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' - Father: "Metal" - MaterialStandard: - UUID: '1e2c0088-904a-4537-925f-64064c07d700' - KindOfMaterial: "Brass" - Machinability: - UUID: '9d81fcb2-bf81-48e3-bb57-d45ecf380096' - SurfaceSpeedHSS: '175 m/min' - SurfaceSpeedCarbide: '350 m/min' - SpecificCuttingForce: '' diff --git a/src/Mod/Material/Resources/Materials/Machining/Brass-Soft.FCMat b/src/Mod/Material/Resources/Materials/Machining/Brass-Soft.FCMat deleted file mode 100644 index a1c2bca2a6..0000000000 --- a/src/Mod/Material/Resources/Materials/Machining/Brass-Soft.FCMat +++ /dev/null @@ -1,21 +0,0 @@ -General: - UUID: "88358e90-d3f5-4009-8a02-99f3a90719c1" - Author: "Daniel Wood" - License: "CC-BY-3.0" - Name: "Brass (Soft)" - Description: "CAM Machining Material Brass (Soft)" -Inherits: - Brass: - UUID: "4151e19c-fd6a-4ca4-83d4-d5e17d76cb9c" -Models: - Father: - UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' - Father: "Metal" - MaterialStandard: - UUID: '1e2c0088-904a-4537-925f-64064c07d700' - KindOfMaterial: "Brass" - Machinability: - UUID: '9d81fcb2-bf81-48e3-bb57-d45ecf380096' - SurfaceSpeedHSS: '125 m/min' - SurfaceSpeedCarbide: '300 m/min' - SpecificCuttingForce: '' diff --git a/src/Mod/Material/Resources/Materials/Machining/CarbonSteel.FCMat b/src/Mod/Material/Resources/Materials/Machining/CarbonSteel.FCMat deleted file mode 100644 index 9f46105c2f..0000000000 --- a/src/Mod/Material/Resources/Materials/Machining/CarbonSteel.FCMat +++ /dev/null @@ -1,13 +0,0 @@ -; CarbonSteel -; (c) 2022 Daniel Wood (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecadweb.org/wiki/Material - -[FCMat] -Name = Carbon Steel -Description = Path Material CarbonSteel -Father = Metal -SurfaceSpeed_HSS = 35 -SurfaceSpeed_Carbide = 120 -Kp = 1.88 -Kd = 24000 diff --git a/src/Mod/Material/Resources/Materials/Machining/HardPlastics.FCMat b/src/Mod/Material/Resources/Materials/Machining/HardPlastics.FCMat deleted file mode 100644 index 66286a24a1..0000000000 --- a/src/Mod/Material/Resources/Materials/Machining/HardPlastics.FCMat +++ /dev/null @@ -1,13 +0,0 @@ -; HardPlastics -; (c) 2022 Daniel Wood (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecadweb.org/wiki/Material - -[FCMat] -Name = Hard Plastics -Description = Path Material HardPlastics -Father = Polymer -SurfaceSpeed_HSS = 225 -SurfaceSpeed_Carbide = 275 -Kp = 0.75 -Kd = 2000 diff --git a/src/Mod/Material/Resources/Materials/Machining/Hardwood.FCMat b/src/Mod/Material/Resources/Materials/Machining/Hardwood.FCMat deleted file mode 100644 index 1635cef7b9..0000000000 --- a/src/Mod/Material/Resources/Materials/Machining/Hardwood.FCMat +++ /dev/null @@ -1,15 +0,0 @@ -General: - UUID: "c92ffa22-5f52-476b-a015-8c2401a55e6e" - Author: "Daniel Wood" - License: "CC-BY-3.0" - Name: "Hardwood" - Description: "CAM Machining Material Hardwood" -Inherits: - Wood: - UUID: "b588224e-e8d6-47ad-ba1f-a058333fd1c6" -Models: - Machinability: - UUID: '9d81fcb2-bf81-48e3-bb57-d45ecf380096' - SurfaceSpeedHSS: '145 m/min' - SurfaceSpeedCarbide: '275 m/min' - SpecificCuttingForce: '' diff --git a/src/Mod/Material/Resources/Materials/Machining/SoftPlastics.FCMat b/src/Mod/Material/Resources/Materials/Machining/SoftPlastics.FCMat deleted file mode 100644 index ae9be3fc59..0000000000 --- a/src/Mod/Material/Resources/Materials/Machining/SoftPlastics.FCMat +++ /dev/null @@ -1,13 +0,0 @@ -; SoftPlastics -; (c) 2022 Daniel Wood (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecadweb.org/wiki/Material - -[FCMat] -Name = Soft Plastics -Description = Path Material SoftPlastics -Father = Polymer -SurfaceSpeed_HSS = 225 -SurfaceSpeed_Carbide = 255 -Kp = 0.5 -Kd = 2000 diff --git a/src/Mod/Material/Resources/Materials/Machining/Softwood.FCMat b/src/Mod/Material/Resources/Materials/Machining/Softwood.FCMat deleted file mode 100644 index 172c6efbd4..0000000000 --- a/src/Mod/Material/Resources/Materials/Machining/Softwood.FCMat +++ /dev/null @@ -1,15 +0,0 @@ -General: - UUID: "c92ffa22-5f52-476b-a015-8c2401a55e6e" - Author: "Daniel Wood" - License: "CC-BY-3.0" - Name: "Softwood" - Description: "CAM Machining Material Softwood" -Inherits: - Wood: - UUID: "b588224e-e8d6-47ad-ba1f-a058333fd1c6" -Models: - Machinability: - UUID: '9d81fcb2-bf81-48e3-bb57-d45ecf380096' - SurfaceSpeedHSS: '225 m/min' - SurfaceSpeedCarbide: '255 m/min' - SpecificCuttingForce: '' diff --git a/src/Mod/Material/Resources/Materials/Machining/Stainless-303.FCMat b/src/Mod/Material/Resources/Materials/Machining/Stainless-303.FCMat deleted file mode 100644 index 9990ed65d9..0000000000 --- a/src/Mod/Material/Resources/Materials/Machining/Stainless-303.FCMat +++ /dev/null @@ -1,13 +0,0 @@ -; Stainless(303) -; (c) 2022 Daniel Wood (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecadweb.org/wiki/Material - -[FCMat] -Name = Stainless (303) -Description = Path Material Stainless(303) -Father = Metal -SurfaceSpeed_HSS = 25 -SurfaceSpeed_Carbide = 85 -Kp = 2.07 -Kd = 200000 diff --git a/src/Mod/Material/Resources/Materials/Machining/Stainless-304.FCMat b/src/Mod/Material/Resources/Materials/Machining/Stainless-304.FCMat deleted file mode 100644 index a6077a17d6..0000000000 --- a/src/Mod/Material/Resources/Materials/Machining/Stainless-304.FCMat +++ /dev/null @@ -1,13 +0,0 @@ -; Stainless(304) -; (c) 2022 Daniel Wood (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecadweb.org/wiki/Material - -[FCMat] -Name = Stainless (304) -Description = Path Material Stainless(304) -Father = Metal -SurfaceSpeed_HSS = 10 -SurfaceSpeed_Carbide = 37.5 -Kp = 2.07 -Kd = 22000 diff --git a/src/Mod/Material/Resources/Materials/Machining/Stainless-316.FCMat b/src/Mod/Material/Resources/Materials/Machining/Stainless-316.FCMat deleted file mode 100644 index 4bf1846ab9..0000000000 --- a/src/Mod/Material/Resources/Materials/Machining/Stainless-316.FCMat +++ /dev/null @@ -1,13 +0,0 @@ -; Stainless(316) -; (c) 2022 Daniel Wood (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecadweb.org/wiki/Material - -[FCMat] -Name = Stainless-316 -Description = Path Material Stainless(316) -Father = Metal -SurfaceSpeed_HSS = 7.5 -SurfaceSpeed_Carbide = 25 -Kp = 2.07 -Kd = 24000