Material: cards and templates, sort and move all cost group attributes

2019-03-01 19:57:30 +01:00
parent 75b5f249ab
commit 08c48c8524
19 changed files with 139 additions and 139 deletions
--- a/src/Mod/Material/StandardMaterial/ABS-Generic.FCMat
+++ b/src/Mod/Material/StandardMaterial/ABS-Generic.FCMat
@@ -7,7 +7,6 @@
 Name = ABS
 Description = This is a blend AcrylnitrilButadienStyrol (ABS) material card. The values are at the low end of the spectrum. If you need a more precise material definition use the more specialised ABS-blend cards.
 Father = Thermoplast
-ProductURL = https://en.wikipedia.org/wiki/Acrylonitrile_butadiene_styrene
 YoungsModulus = 2300 MPa
 UltimateTensileStrength = 38.8 MPa
 PoissonRatio = 0.37
@@ -17,3 +16,4 @@ SpecificHeat = 2050 J/kg/K
 ThermalConductivity = 0.158 W/m/K
 ThermalExpansionCoefficient = 0.000093 m/m/K
 YieldStrength = 44.1 MPa
+ProductURL = https://en.wikipedia.org/wiki/Acrylonitrile_butadiene_styrene
--- a/src/Mod/Material/StandardMaterial/Acrylic-Glass-Generic.FCMat
+++ b/src/Mod/Material/StandardMaterial/Acrylic-Glass-Generic.FCMat
@@ -8,7 +8,6 @@ Name = Acrylic Glass
 Description = Poly(methyl methacrylate) (PMMA, acrylic, acrylic glass, trade names Plexiglas, Acrylite, Lucite, Perspex) a transparent thermoplastic often used in sheet form as a lightweight or shatter-resistant alternative to glass.
 DescriptionPL = Szkło akrylowe (szkło organiczne; inaczej pleksi, pleksiglas, metapleks) – przezroczyste tworzywo sztuczne, którego głównym składnikiem jest polimer – poli(metakrylan metylu) (PMMA).
 Father = of the material, i.e. for PLA is Thermoplast, for Steel is Metal Thermoplast
-ProductURL = https://en.wikipedia.org/wiki/Poly(methyl_methacrylate)
 YoungsModulus = 2550 MPa
 UltimateTensileStrength = 57.7 MPa
 PoissonRatio = 0.38
@@ -20,3 +19,4 @@ SpecificHeat = 1480 J/kg/K
 ThermalConductivity = 0.193 W/m/K
 ThermalExpansionCoefficient = 0.000075 m/m/K
 YieldStrength = 73.7 MPa
+ProductURL = https://en.wikipedia.org/wiki/Poly(methyl_methacrylate)
--- a/src/Mod/Material/StandardMaterial/Aluminum-6061-T6.FCMat
+++ b/src/Mod/Material/StandardMaterial/Aluminum-6061-T6.FCMat
@@ -7,7 +7,6 @@
 Name = Aluminum 6061-T6
 Description = Precipitation-hardened, Nonferrous Aluminum alloy
 Father = Metal
-ProductURL = https://en.wikipedia.org/wiki/6061_aluminium_alloy
 YoungsModulus = 69000 MPa
 UltimateTensileStrength = 310 MPa
 PoissonRatio = 0.33
@@ -15,3 +14,4 @@ Density = 2700 kg/m^3
 KindOfMaterial = Aluminium
 KindOfMaterialDE = Aluminium
 ThermalConductivity = 167 W/m/K
+ProductURL = https://en.wikipedia.org/wiki/6061_aluminium_alloy
--- a/src/Mod/Material/StandardMaterial/Concrete-Generic.FCMat
+++ b/src/Mod/Material/StandardMaterial/Concrete-Generic.FCMat
@@ -7,9 +7,9 @@
 Name = Concrete
 Description = A standard C-25 construction concrete
 Father = Aggregate
-ProductURL = https://en.wikipedia.org/wiki/Concrete
 YoungsModulus = 32000 MPa
 PoissonRatio = 0.17
 CompressiveStrength = 25 MPa
 Density = 2400 kg/m^3
 StandardCode = Masterformat 03 33 13
+ProductURL = https://en.wikipedia.org/wiki/Concrete
--- a/src/Mod/Material/StandardMaterial/Glass-E-GlassFibre.FCMat
+++ b/src/Mod/Material/StandardMaterial/Glass-E-GlassFibre.FCMat
@@ -7,7 +7,7 @@
 Name = Glass-E
 Description = Glass Fibre
 Father = Glass
-ProductURL = https://en.wikipedia.org/wiki/Glass_fiber
 UltimateTensileStrength = 3445 MPa
 CompressiveStrength = 1080 MPa
 Density = 2580 kg/m^3
+ProductURL = https://en.wikipedia.org/wiki/Glass_fiber
--- a/src/Mod/Material/StandardMaterial/Glass-Generic.FCMat
+++ b/src/Mod/Material/StandardMaterial/Glass-Generic.FCMat
@@ -9,8 +9,8 @@ Description = Generic soda-lime glass
 DescriptionDE = Normalglas
 DescriptionPL = Szkło sodowe
 Father = Glass
-ProductURL = https://en.wikipedia.org/wiki/Soda-lime_glass
 YoungsModulus = 72000 MPa
 PoissonRatio = 0.22
 Density = 2520 kg/m^3
 ThermalExpansionCoefficient = 0.000009 m/m/K
+ProductURL = https://en.wikipedia.org/wiki/Soda-lime_glass
--- a/src/Mod/Material/StandardMaterial/Glass-S2-GlassFibre.FCMat
+++ b/src/Mod/Material/StandardMaterial/Glass-S2-GlassFibre.FCMat
@@ -7,7 +7,7 @@
 Name = Glass-S2
 Description = Glass Fibre
 Father = Glass
-ProductURL = https://en.wikipedia.org/wiki/Glass_fiber
 UltimateTensileStrength = 4890 MPa
 CompressiveStrength = 1600 MPa
 Density = 2460 kg/m^3
+ProductURL = https://en.wikipedia.org/wiki/Glass_fiber
--- a/src/Mod/Material/StandardMaterial/PA6-Generic.FCMat
+++ b/src/Mod/Material/StandardMaterial/PA6-Generic.FCMat
@@ -5,7 +5,6 @@

 [FCMat]
 Name = Polyamide 6
-ProductURL = https://en.wikipedia.org/wiki/Nylon_6
 YoungsModulus = 2930 MPa
 UltimateTensileStrength = 75.5 MPa
 PoissonRatio = 0.39
@@ -16,3 +15,4 @@ SpecificHeat = 1670 J/kg/K
 ThermalConductivity = 0.262 W/m/K
 ThermalExpansionCoefficient = 0.000082 m/m/K
 YieldStrength = 70.5 MPa
+ProductURL = https://en.wikipedia.org/wiki/Nylon_6
--- a/src/Mod/Material/StandardMaterial/PET-Generic.FCMat
+++ b/src/Mod/Material/StandardMaterial/PET-Generic.FCMat
@@ -5,7 +5,6 @@

 [FCMat]
 Name = PET
-ProductURL = https://en.wikipedia.org/wiki/Polyethylene_terephthalate
 YoungsModulus = 3150 MPa
 UltimateTensileStrength = 38.8 MPa
 PoissonRatio = 0.36
@@ -17,3 +16,4 @@ SpecificHeat = 1140 J/kg/K
 ThermalConductivity = 0.181 W/m/K
 ThermalExpansionCoefficient = 0.000072 m/m/K
 YieldStrength = 62.8 MPa
+ProductURL = https://en.wikipedia.org/wiki/Polyethylene_terephthalate
--- a/src/Mod/Material/StandardMaterial/PLA-Generic.FCMat
+++ b/src/Mod/Material/StandardMaterial/PLA-Generic.FCMat
@@ -7,7 +7,6 @@
 Name = PLA
 Description = Polylactic acid or polylactide (PLA, Poly) is a biodegradable thermoplastic aliphatic polyester derived from renewable resources, such as corn starch, tapioca roots, chips, starch or sugarcane.
 Father = Thermoplast
-ProductURL = https://en.wikipedia.org/wiki/Polylactic_acid
 YoungsModulus = 3640 MPa
 UltimateTensileStrength = 26.4 MPa
 PoissonRatio = 0.36
@@ -17,3 +16,4 @@ SpecificHeat = 1800 J/kg/K
 ThermalConductivity = 0.130 W/m/K
 ThermalExpansionCoefficient = 0.000041 m/m/K
 YieldStrength = 35.9 MPa
+ProductURL = https://en.wikipedia.org/wiki/Polylactic_acid
--- a/src/Mod/Material/StandardMaterial/PP-Generic.FCMat
+++ b/src/Mod/Material/StandardMaterial/PP-Generic.FCMat
@@ -5,7 +5,6 @@

 [FCMat]
 Name = Polypropylene
-ProductURL = https://en.wikipedia.org/wiki/Polypropylene
 YoungsModulus = 1470 MPa
 UltimateTensileStrength = 79.7 MPa
 PoissonRatio = 0.44
@@ -16,3 +15,4 @@ SpecificHeat = 1920 J/kg/K
 ThermalConductivity = 0.249 W/m/K
 ThermalExpansionCoefficient = 0.000123 m/m/K
 YieldStrength = 32.8 MPa
+ProductURL = https://en.wikipedia.org/wiki/Polypropylene
--- a/src/Mod/Material/StandardMaterial/PTFE-Generic.FCMat
+++ b/src/Mod/Material/StandardMaterial/PTFE-Generic.FCMat
@@ -5,7 +5,6 @@

 [FCMat]
 Name = PTFE
-ProductURL = https://en.wikipedia.org/wiki/Polytetrafluoroethylene
 YoungsModulus = 564 MPa
 UltimateTensileStrength = 34.6 MPa
 PoissonRatio = 0.46
@@ -16,3 +15,4 @@ SpecificHeat = 1010 J/kg/K
 ThermalConductivity = 0.263 W/m/K
 ThermalExpansionCoefficient = 0.000108 m/m/K
 YieldStrength = 20.5 MPa
+ProductURL = https://en.wikipedia.org/wiki/Polytetrafluoroethylene
--- a/src/Mod/Material/StandardMaterial/PVC-Generic.FCMat
+++ b/src/Mod/Material/StandardMaterial/PVC-Generic.FCMat
@@ -5,7 +5,6 @@

 [FCMat]
 Name = PVC
-ProductURL = https://en.wikipedia.org/wiki/Polyvinyl_chloride
 YoungsModulus = 2800 MPa
 UltimateTensileStrength = 50 MPa
 PoissonRatio = 0.38
@@ -14,3 +13,4 @@ SourceURL = http://www.matweb.com/search/DataSheet.aspx?MatGUID=1f650966ec834bb8
 SpecificHeat = 1000 J/kg/K
 ThermalConductivity = 0.150 W/m/K
 ThermalExpansionCoefficient = 0.000075 m/m/K
+ProductURL = https://en.wikipedia.org/wiki/Polyvinyl_chloride
--- a/src/Mod/Material/StandardMaterial/Steel-Generic.FCMat
+++ b/src/Mod/Material/StandardMaterial/Steel-Generic.FCMat
@@ -7,10 +7,10 @@
 Name = Steel-Generic
 Description = This is a blend Steel material card. The values are at the low end of the spectrum. If you need a more precise material definition use the more specialised steel cards.
 Father = Metal
-ProductURL = https://en.wikipedia.org/wiki/Steel
 YoungsModulus = 200000 MPa
 PoissonRatio = 0.3
 Density = 7900 kg/m^3
 SpecificHeat = 500 J/kg/K
 ThermalConductivity = 50 W/m/K
 ThermalExpansionCoefficient = 0.000012 m/m/K
+ProductURL = https://en.wikipedia.org/wiki/Steel
--- a/src/Mod/Material/StandardMaterial/TEMPLATE.FCMat
+++ b/src/Mod/Material/StandardMaterial/TEMPLATE.FCMat
@@ -22,15 +22,6 @@ DescriptionPL =
 ; Father of the material, i.e. for PLA is Thermoplast, for Steel is Metal
 Father =

-; Vendor of the material. Leave blank if not required
-Vendor =
-
-; Product URL, recommended are wikipedia links
-ProductURL = http://en.wikipedia.org/wiki/
-
-; Specific price in currency / mass, a currency is not supported by FreeCAD unit system
-SpecificPrice =
-
 ; Young's Modulus (or E-Module) in [FreeCAD Pressure unit], see http://en.wikipedia.org/wiki/Young%27s_modulus for the details
 YoungsModulus =

@@ -159,3 +150,12 @@ ViewLinewidth =

 ; Yield strength in [FreeCAD Pressure unit] https://en.wikipedia.org/wiki/Yield_%28engineering%29
 YieldStrength =
+
+; Product URL, recommended are wikipedia links
+ProductURL = http://en.wikipedia.org/wiki/
+
+; Specific price in currency / mass, a currency is not supported by FreeCAD unit system
+SpecificPrice =
+
+; Vendor of the material. Leave blank if not required
+Vendor =
--- a/src/Mod/Material/StandardMaterial/Tools/Materials.csv
+++ b/src/Mod/Material/StandardMaterial/Tools/Materials.csv
--- a/src/Mod/Material/StandardMaterial/Tools/Materials.ods
+++ b/src/Mod/Material/StandardMaterial/Tools/Materials.ods
--- a/src/Mod/Material/StandardMaterial/Tools/headers
+++ b/src/Mod/Material/StandardMaterial/Tools/headers
@@ -5,9 +5,6 @@ Description
 DescriptionDE
 DescriptionPL
 Father
-Vendor
-ProductURL
-SpecificPrice
 YoungsModulus
 UltimateTensileStrength
 PoissonRatio
@@ -51,3 +48,6 @@ ViewColor
 ViewFillPattern
 ViewLinewidth
 YieldStrength
+ProductURL
+SpecificPrice
+Vendor
--- a/src/Mod/Material/StandardMaterial/Wood-Generic.FCMat
+++ b/src/Mod/Material/StandardMaterial/Wood-Generic.FCMat
@@ -7,7 +7,7 @@
 Name = Wood
 Description = A standard construction wood
 Father = Aggregate
-ProductURL = https://en.wikipedia.org/wiki/Wood
 YoungsModulus = 12000 MPa
 PoissonRatio = 0.05
 Density = 700 kg/m^3
+ProductURL = https://en.wikipedia.org/wiki/Wood