Merge branch 'main' into bgbsww-toponamingElementCacheExtras
This commit is contained in:
bgbsww
@@ -675,8 +675,8 @@ class CommandAddonManager:
|
||||
|
||||
def fetch_addon_score(self) -> None:
|
||||
"""Fetch the Addon score JSON data from a URL"""
|
||||
pref = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Addons")
|
||||
url = pref.GetString("AddonsScoreURL", "NONE")
|
||||
prefs = fci.Preferences()
|
||||
url = prefs.get("AddonsScoreURL")
|
||||
if url and url != "NONE":
|
||||
self.get_addon_score_worker = GetAddonScoreWorker(
|
||||
url, self.item_model.repos, self.dialog
|
||||
|
||||
@@ -334,13 +334,13 @@ installed addons will be checked for available updates
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="prefEntry" stdset="0">
|
||||
<cstring>AddonScoreURL</cstring>
|
||||
<cstring>AddonsScoreURL</cstring>
|
||||
</property>
|
||||
<property name="prefPath" stdset="0">
|
||||
<cstring>Addons</cstring>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>The URL for the Addon Score data (see documentation for formatting and hosting details).</string>
|
||||
<string>The URL for the Addon Score data (see Addon Manager wiki page for formatting and hosting details).</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
"https://raw.githubusercontent.com/FreeCAD/FreeCAD-addons/master/addonflags.json",
|
||||
"AddonsRemoteCacheURL": "https://addons.freecad.org/metadata.zip",
|
||||
"AddonsStatsURL": "https://freecad.org/addon_stats.json",
|
||||
"AddonsScoreURL": "NONE",
|
||||
"AutoCheck": false,
|
||||
"BlockedMacros": "BOLTS,WorkFeatures,how to install,documentation,PartsLibrary,FCGear",
|
||||
"CompositeSplitterState": "",
|
||||
|
||||
262
src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg
Normal file
262
src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 67 KiB |
253
src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg
Normal file
253
src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 66 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.3 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 12 KiB |
214
src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg
Normal file
214
src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 45 KiB |
205
src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg
Normal file
205
src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 44 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.3 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 9.9 KiB |
181
src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg
Normal file
181
src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 33 KiB |
174
src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg
Normal file
174
src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 32 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.3 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 8.7 KiB |
158
src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg
Normal file
158
src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 24 KiB |
150
src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg
Normal file
150
src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 23 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.4 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 8.3 KiB |
132
src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg
Normal file
132
src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 14 KiB |
127
src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg
Normal file
127
src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 13 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.0 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.6 KiB |
132
src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg
Normal file
132
src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 13 KiB |
124
src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg
Normal file
124
src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 12 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.6 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.3 KiB |
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 62 KiB |
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 39 KiB |
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 28 KiB |
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 19 KiB |
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 8.6 KiB |
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 7.9 KiB |
@@ -0,0 +1,85 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
|
||||
<svg
|
||||
width="180mm"
|
||||
height="36mm"
|
||||
viewBox="0 0 180 36"
|
||||
version="1.1"
|
||||
id="svg1"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:freecad="http://www.freecadweb.org/wiki/index.php?title=Svg_Namespace">
|
||||
<title id="title1">Titleblock ISO 7200</title>
|
||||
<metadata id="metadata1">
|
||||
<rdf:RDF>
|
||||
<cc:Work rdf:about="">
|
||||
<dc:title>Titleblock ISO 7200</dc:title>
|
||||
<cc:license rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
|
||||
<dc:creator>
|
||||
<cc:Agent>
|
||||
<dc:title>Benjamin May</dc:title>
|
||||
</cc:Agent>
|
||||
</dc:creator>
|
||||
</cc:Work>
|
||||
<cc:License rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
|
||||
<cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" />
|
||||
<cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" />
|
||||
<cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
|
||||
</cc:License>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
|
||||
<rect id="Frame" x="0" y="0" width="180" height="36" style="stroke-width:0.7" />
|
||||
<rect id="Owner border" x="140" y="0" width="40" height="24" />
|
||||
<rect id="Identification number border" x="0" y="24" width="80" height="12" />
|
||||
<rect id="Revision index border" x="140" y="24" width="20" height="12" />
|
||||
<rect id="Date of issue border" x="100" y="24" width="40" height="12" />
|
||||
<rect id="Sheet number border" x="160" y="24" width="20" height="12" />
|
||||
<rect id="Title border" x="0" y="0" width="80" height="12" />
|
||||
<rect id="Approval person border" x="80" y="12" width="60" height="12" />
|
||||
<rect id="Creator border" x="80" y="0" width="60" height="12" />
|
||||
<rect id="Document type border" x="0" y="12" width="80" height="12" />
|
||||
<rect id="Paper size border" x="80" y="24" width="20" height="12" />
|
||||
</g>
|
||||
<g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
|
||||
<text id="Owner label" x="140.5" y="3.6">Owner:</text>
|
||||
<text id="Identification number label" x="0.5" y="27.6">Drawing number:</text>
|
||||
<text id="Revision index label" x="140.5" y="27.6">Revision:</text>
|
||||
<text id="Date of issue label" x="100.5" y="27.6">Issue date:</text>
|
||||
<text id="Sheet number label" x="160.5" y="27.6">Sheet:</text>
|
||||
<text id="Title label" x="0.5" y="3.6">Title:</text>
|
||||
<text id="Approval person label" x="80.5" y="15.6">Approved by:</text>
|
||||
<text id="Creator label" x="80.5" y="3.6">Created by:</text>
|
||||
<text id="Document type label" x="0.5" y="15.6">Document type:</text>
|
||||
<text id="Paper size label" x="80.5" y="27.6">Paper size:</text>
|
||||
<text id="Sheet scale label" x="120.5" y="-8.4">Scale:</text>
|
||||
<text id="General tolerances label" x="80.5" y="-8.4">General tolerances:</text>
|
||||
<text id="Part material label" x="0.5" y="-8.4">Part Material:</text>
|
||||
</g>
|
||||
<g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
|
||||
<text id="Identification number data field" x="1" y="33.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
|
||||
<text id="Revision index data field" x="150" y="33.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
|
||||
<text id="Date of issue data field" x="101" y="33.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
|
||||
<text id="Sheet number data field" x="170" y="33.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
|
||||
<text id="Title data field" x="1" y="9.2" freecad:editable="title"><tspan>ISO 5457 template</tspan></text>
|
||||
<text id="Approval person data field" x="81" y="21.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
|
||||
<text id="Creator data field" x="81" y="9.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
|
||||
<text id="Document type data field" x="1" y="21.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
|
||||
<text id="Paper size data field" x="90" y="33.2" style="text-align:center;text-anchor:middle">A3</text>
|
||||
<text id="Sheet scale data field" x="130" y="-2.8" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
|
||||
<text id="General tolerances data field" x="81" y="-2.8" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
|
||||
<text id="Part material data field" x="1" y="-2.8" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
|
||||
</g>
|
||||
<g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
|
||||
<path id="Trapezoid" d="m 159,-17 -10,2.5 v 5 l 10,2.5 z" />
|
||||
<circle id="Inner circle" cx="166" r="2.5" cy="-12" />
|
||||
<circle id="Outer circle" cx="166" r="5" cy="-12" />
|
||||
</g>
|
||||
<g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75" >
|
||||
<path id="Horizontal" d="m 148,-12 h 24" style="stroke-dashoffset:0.25" />
|
||||
<path id="Vertical" d="m 166,-6 v -12" style="stroke-dashoffset:4.625" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 5.4 KiB |
70
src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg
Normal file
70
src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg
Normal file
@@ -0,0 +1,70 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
|
||||
<svg
|
||||
width="180mm"
|
||||
height="36mm"
|
||||
viewBox="0 0 180 36"
|
||||
version="1.1"
|
||||
id="svg1"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:freecad="http://www.freecadweb.org/wiki/index.php?title=Svg_Namespace">
|
||||
<title id="title1">Titleblock ISO 7200</title>
|
||||
<metadata id="metadata1">
|
||||
<rdf:RDF>
|
||||
<cc:Work rdf:about="">
|
||||
<dc:title>Titleblock ISO 7200</dc:title>
|
||||
<cc:license rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
|
||||
<dc:creator>
|
||||
<cc:Agent>
|
||||
<dc:title>Benjamin May</dc:title>
|
||||
</cc:Agent>
|
||||
</dc:creator>
|
||||
</cc:Work>
|
||||
<cc:License rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
|
||||
<cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" />
|
||||
<cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" />
|
||||
<cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
|
||||
</cc:License>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
|
||||
<rect id="Frame" x="0" y="0" width="180" height="36" style="stroke-width:0.7" />
|
||||
<rect id="Owner border" x="140" y="0" width="40" height="24" />
|
||||
<rect id="Identification number border" x="0" y="24" width="60" height="12" />
|
||||
<rect id="Revision index border" x="100" y="24" width="20" height="12" />
|
||||
<rect id="Date of issue border" x="60" y="24" width="40" height="12" />
|
||||
<rect id="Sheet number border" x="120" y="24" width="20" height="12" />
|
||||
<rect id="Title border" x="0" y="0" width="80" height="12" />
|
||||
<rect id="Responsible department border" x="140" y="24" width="40" height="12" />
|
||||
<rect id="Approval person border" x="80" y="12" width="60" height="12" />
|
||||
<rect id="Creator border" x="80" y="0" width="60" height="12" />
|
||||
<rect id="Document type border" x="0" y="12" width="80" height="12" />
|
||||
</g>
|
||||
<g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
|
||||
<text id="Owner label" x="140.5" y="3.6">Owner:</text>
|
||||
<text id="Identification number label" x="0.5" y="27.6">Drawing number:</text>
|
||||
<text id="Revision index label" x="100.5" y="27.6">Revision:</text>
|
||||
<text id="Date of issue label" x="60.5" y="27.6">Issue date:</text>
|
||||
<text id="Sheet number label" x="120.5" y="27.6">Sheet:</text>
|
||||
<text id="Title label" x="0.5" y="3.6">Title:</text>
|
||||
<text id="Responsible department label" x="140.5" y="27.6">Responsible department:</text>
|
||||
<text id="Approval person label" x="80.5" y="15.6">Approved by:</text>
|
||||
<text id="Creator label" x="80.5" y="3.6">Created by:</text>
|
||||
<text id="Document type label" x="0.5" y="15.6">Document type:</text>
|
||||
</g>
|
||||
<g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
|
||||
<text id="Identification number data field" y="33.2" x="1" freecad:editable="drawing_number"><tspan>DN</tspan></text>
|
||||
<text id="Revision index data field" x="110" y="33.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
|
||||
<text id="Date of issue data field" x="61" y="33.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
|
||||
<text id="Sheet number data field" x="130" y="33.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
|
||||
<text id="Title data field" x="1" y="9.2" freecad:editable="title"><tspan>ISO 5457 template</tspan></text>
|
||||
<text id="Responsible department data field" x="141" y="33.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
|
||||
<text id="Approval person data field" x="81" y="21.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
|
||||
<text id="Creator data field" x="81" y="9.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
|
||||
<text id="Document type data field" x="1" y="21.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 4.2 KiB |
93
src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_3.svg
Normal file
93
src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_3.svg
Normal file
@@ -0,0 +1,93 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
|
||||
<svg
|
||||
width="180mm"
|
||||
height="48mm"
|
||||
viewBox="0 0 180 48"
|
||||
version="1.1"
|
||||
id="svg1"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:freecad="http://www.freecadweb.org/wiki/index.php?title=Svg_Namespace">
|
||||
<title id="title1">Titleblock ISO 7200</title>
|
||||
<metadata id="metadata1">
|
||||
<rdf:RDF>
|
||||
<cc:Work rdf:about="">
|
||||
<dc:title>Titleblock ISO 7200</dc:title>
|
||||
<cc:license rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
|
||||
<dc:creator>
|
||||
<cc:Agent>
|
||||
<dc:title>Benjamin May</dc:title>
|
||||
</cc:Agent>
|
||||
</dc:creator>
|
||||
</cc:Work>
|
||||
<cc:License rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
|
||||
<cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" />
|
||||
<cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" />
|
||||
<cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
|
||||
</cc:License>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
|
||||
<rect id="Frame" x="0" y="0" width="180" height="48" style="stroke-width:0.7" />
|
||||
<rect id="Owner border" x="140" y="0" width="40" height="24" />
|
||||
<rect id="Identification number border" x="80" y="24" width="60" height="12" />
|
||||
<rect id="Revision index border" x="140" y="36" width="20" height="12" />
|
||||
<rect id="Date of issue border" x="100" y="36" width="40" height="12" />
|
||||
<rect id="Sheet number border" x="160" y="36" width="20" height="12" />
|
||||
<rect id="Title border" x="0" y="0" width="80" height="24" />
|
||||
<rect id="Responsible department border" x="140" y="24" width="40" height="12" />
|
||||
<rect id="Approval person border" x="80" y="12" width="60" height="12" />
|
||||
<rect id="Document type border" x="0" y="24" width="80" height="12" />
|
||||
<rect id="Creator border" x="80" y="0" width="60" height="12" />
|
||||
<rect id="Document status border" x="0" y="36" width="80" height="12" />
|
||||
<rect id="Paper size border" x="80" y="36" width="20" height="12" />
|
||||
</g>
|
||||
<g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
|
||||
<text id="Owner label" x="140.5" y="3.6">Owner:</text>
|
||||
<text id="Identification number label" x="80.5" y="27.6">Drawing number:</text>
|
||||
<text id="Revision index label" x="140.5" y="39.6">Revision:</text>
|
||||
<text id="Date of issue label" x="100.5" y="39.6">Issue date:</text>
|
||||
<text id="Sheet number label" x="160.5" y="39.6">Sheet:</text>
|
||||
<text id="Title label" x="0.5" y="3.6">Title, supplementary title:</text>
|
||||
<text id="Responsible department label" x="140.5" y="27.6">Responsible department:</text>
|
||||
<text id="Approval person label" x="80.5" y="15.6">Approved by:</text>
|
||||
<text id="Document type label" x="0.5" y="27.6">Document type:</text>
|
||||
<text id="Creator label" x="80.5" y="3.6">Created by:</text>
|
||||
<text id="Document status label" x="0.5" y="39.6">Document status:</text>
|
||||
<text id="Paper size label" x="80.5" y="39.6">Paper size:</text>
|
||||
<text id="Sheet scale label" x="120.5" y="-8.4">Scale:</text>
|
||||
<text id="General tolerances label" x="80.5" y="-8.4">General tolerances:</text>
|
||||
<text id="Part material label" x="0.5" y="-8.4">Part Material:</text>
|
||||
</g>
|
||||
<g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
|
||||
<text id="Identification number data field" x="81" y="33.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
|
||||
<text id="Revision index data field" x="150" y="45.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
|
||||
<text id="Date of issue data field" x="101" y="45.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
|
||||
<text id="Sheet number data field" x="170" y="45.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
|
||||
<text id="Title data field" x="1" y="9.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
|
||||
<text id="Supplementary title 1 data field" x="1" y="15.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
|
||||
<text id="Supplementary title 2 data field" x="1" y="21.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
|
||||
<text id="Responsible department data field" x="141" y="33.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
|
||||
<text id="Approval person data field" x="81" y="21.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
|
||||
<text id="Document type data field" x="1" y="33.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
|
||||
<text id="Creator data field" x="81" y="9.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
|
||||
<text id="Document status data field" x="1" y="45.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
|
||||
<text id="Paper size data field" x="90" y="45.2" style="text-align:center;text-anchor:middle">A3</text>
|
||||
<text id="Sheet scale data field" x="130" y="-2.8" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
|
||||
<text id="General tolerances data field" x="81" y="-2.8" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
|
||||
<text id="Part material data field" x="1" y="-2.8" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
|
||||
</g>
|
||||
<g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
|
||||
<path id="Trapezoid" d="m 159,-17 -10,2.5 v 5 l 10,2.5 z" />
|
||||
<circle id="Inner circle" cx="166" r="2.5" cy="-12" />
|
||||
<circle id="Outer circle" cx="166" r="5" cy="-12" />
|
||||
</g>
|
||||
<g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75" >
|
||||
<path id="Horizontal" d="m 148,-12 h 24" style="stroke-dashoffset:0.25" />
|
||||
<path id="Vertical" d="m 166,-6 v -12" style="stroke-dashoffset:4.625" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 6.3 KiB |
81
src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg
Normal file
81
src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg
Normal file
@@ -0,0 +1,81 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
|
||||
<svg
|
||||
width="180mm"
|
||||
height="48mm"
|
||||
viewBox="0 0 180 48"
|
||||
version="1.1"
|
||||
id="svg1"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:freecad="http://www.freecadweb.org/wiki/index.php?title=Svg_Namespace">
|
||||
<title id="title1">Titleblock ISO 7200</title>
|
||||
<metadata id="metadata1">
|
||||
<rdf:RDF>
|
||||
<cc:Work rdf:about="">
|
||||
<dc:title>Titleblock ISO 7200</dc:title>
|
||||
<cc:license rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
|
||||
<dc:creator>
|
||||
<cc:Agent>
|
||||
<dc:title>Benjamin May</dc:title>
|
||||
</cc:Agent>
|
||||
</dc:creator>
|
||||
</cc:Work>
|
||||
<cc:License rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
|
||||
<cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" />
|
||||
<cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" />
|
||||
<cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
|
||||
</cc:License>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
|
||||
<rect id="Frame" width="180" x="0" height="48" y="0" style="stroke-width:0.7" />
|
||||
<rect id="Owner border" width="40" x="140" height="24" y="0" />
|
||||
<rect id="Identification number border" width="60" x="80" height="12" y="24" />
|
||||
<rect id="Revision index border" width="20" x="140" height="12" y="36" />
|
||||
<rect id="Date of issue border" width="40" x="100" height="12" y="36" />
|
||||
<rect id="Sheet number border" width="20" x="160" height="12" y="36" />
|
||||
<rect id="Language code border" width="20" x="60" height="12" y="36" />
|
||||
<rect id="Title border" width="80" x="0" height="24" y="0" />
|
||||
<rect id="Responsible department border" width="40" x="140" height="12" y="24" />
|
||||
<rect id="Approval person border" width="60" x="80" height="12" y="12" />
|
||||
<rect id="Creator border" width="60" x="80" height="12" y="0" />
|
||||
<rect id="Document type border" width="80" x="0" height="12" y="24" />
|
||||
<rect id="Document status border" width="60" x="0" height="12" y="36" />
|
||||
<rect id="Paper size border" width="20" x="80" height="12" y="36" />
|
||||
</g>
|
||||
<g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
|
||||
<text id="Owner label" x="140.5" y="3.6">Owner:</text>
|
||||
<text id="Identification number label" x="80.5" y="27.6">Drawing number:</text>
|
||||
<text id="Revision index label" x="140.5" y="39.6">Revision:</text>
|
||||
<text id="Date of issue label" x="100.5" y="39.6">Issue date:</text>
|
||||
<text id="Sheet number label" x="160.5" y="39.6">Sheet:</text>
|
||||
<text id="Language code label" x="60.5" y="39.6">Language:</text>
|
||||
<text id="Title label" x="0.5" y="3.6">Title, supplementary title:</text>
|
||||
<text id="Responsible department label" x="140.5" y="27.6">Responsible department:</text>
|
||||
<text id="Approval person label" x="80.5" y="15.6">Approved by:</text>
|
||||
<text id="Creator label" x="80.5" y="3.6">Created by:</text>
|
||||
<text id="Document type label" x="0.5" y="27.6">Document type:</text>
|
||||
<text id="Document status label" x="0.5" y="39.6">Document status:</text>
|
||||
<text id="Paper size label" x="80.5" y="39.6">Paper size:</text>
|
||||
</g>
|
||||
<g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
|
||||
<text id="Identification number data field" x="81" y="33.200001" freecad:editable="drawing_number"><tspan>DN</tspan></text>
|
||||
<text id="Revision index data field" x="150" y="45.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
|
||||
<text id="Date of issue data field" x="101" y="45.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
|
||||
<text id="Sheet number data field" x="170" y="45.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
|
||||
<text id="Language code data field" x="70" y="45.2" freecad:editable="language" style="text-align:center;text-anchor:middle"><tspan>EN</tspan></text>
|
||||
<text id="Title data field" x="1" y="9.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
|
||||
<text id="Supplementary title 1 data field" x="1" y="15.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
|
||||
<text id="Supplementary title 2 data field" x="1" y="21.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
|
||||
<text id="Responsible department data field" x="141" y="33" freecad:editable="responsible_department"><tspan>RD</tspan></text>
|
||||
<text id="Approval person data field" x="81" y="21.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
|
||||
<text id="Creator data field" x="81" y="9.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
|
||||
<text id="Document type data field" x="1" y="33.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
|
||||
<text id="Document status data field" x="1" y="45.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
|
||||
<text id="Paper size data field" x="90" y="45.2" style="text-align:center;text-anchor:middle">A3</text>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 5.3 KiB |
@@ -0,0 +1,107 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
|
||||
<svg
|
||||
width="180mm"
|
||||
height="60mm"
|
||||
viewBox="0 0 180 60"
|
||||
version="1.1"
|
||||
id="svg1"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:freecad="http://www.freecadweb.org/wiki/index.php?title=Svg_Namespace">
|
||||
<title id="title1">Titleblock ISO 7200</title>
|
||||
<metadata id="metadata1">
|
||||
<rdf:RDF>
|
||||
<cc:Work rdf:about="">
|
||||
<dc:title>Titleblock ISO 7200</dc:title>
|
||||
<cc:license rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
|
||||
<dc:creator>
|
||||
<cc:Agent>
|
||||
<dc:title>Benjamin May</dc:title>
|
||||
</cc:Agent>
|
||||
</dc:creator>
|
||||
</cc:Work>
|
||||
<cc:License rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
|
||||
<cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" />
|
||||
<cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" />
|
||||
<cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
|
||||
</cc:License>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
|
||||
<rect id="Frame" x="0" y="0" width="180" height="60" style="stroke-width:0.7" />
|
||||
<rect id="Owner border" x="140" y="0" width="40" height="24" />
|
||||
<rect id="Identification number border" x="100" y="36" width="60" height="12" />
|
||||
<rect id="Revision index border" x="140" y="48" width="20" height="12" />
|
||||
<rect id="Date of issue border" x="100" y="48" width="40" height="12" />
|
||||
<rect id="Sheet number border" x="160" y="48" width="20" height="12" />
|
||||
<rect id="Language code border" x="60" y="48" width="20" height="12" />
|
||||
<rect id="Title border" x="0" y="0" width="80" height="24" />
|
||||
<rect id="Responsible department border" x="140" y="24" width="40" height="12" />
|
||||
<rect id="Technical reference border" x="80" y="24" width="60" height="12" />
|
||||
<rect id="Approval person border" x="80" y="12" width="60" height="12" />
|
||||
<rect id="Creator border" x="80" y="0" width="60" height="12" />
|
||||
<rect id="Document type border" x="0" y="24" width="80" height="12" />
|
||||
<rect id="Key words border" x="0" y="36" width="100" height="12" />
|
||||
<rect id="Document status border" x="0" y="48" width="60" height="12" />
|
||||
<rect id="Page number border" x="160" y="36" width="20" height="12" />
|
||||
<rect id="Paper size border" x="80" y="48" width="20" height="12" />
|
||||
</g>
|
||||
<g id="Labels"
|
||||
style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
|
||||
<text id="Owner label" x="140.5" y="3.6">Owner:</text>
|
||||
<text id="Identification number label" x="100.5" y="39.6">Drawing number:</text>
|
||||
<text id="Revision index label" x="140.5" y="51.6">Revision:</text>
|
||||
<text id="Date of issue label" x="100.5" y="51.6">Issue date:</text>
|
||||
<text id="Sheet number label" x="160.5" y="51.6">Sheet:</text>
|
||||
<text id="Language code label" x="60.5" y="51.6">Language:</text>
|
||||
<text id="Title label" x="0.5" y="3.6">Title, supplementary title:</text>
|
||||
<text id="Responsible department label" x="140.5" y="27.6">Responsible department:</text>
|
||||
<text id="Technical reference label" x="80.5" y="27.6">Technical reference:</text>
|
||||
<text id="Approval person label" x="80.5" y="15.6">Approved by:</text>
|
||||
<text id="Creator label" x="80.5" y="3.6">Created by:</text>
|
||||
<text id="Document type label" x="0.5" y="27.6">Document type:</text>
|
||||
<text id="Key words label" x="0.5" y="39.6">Key words:</text>
|
||||
<text id="Document status label" x="0.5" y="51.6">Document status:</text>
|
||||
<text id="Page number label" x="160.5" y="39.6">Page:</text>
|
||||
<text id="Paper size label" x="80.5" y="51.6">Paper size:</text>
|
||||
<text id="Sheet scale label" x="120.5" y="-8.4">Scale:</text>
|
||||
<text id="General tolerances label" x="80.5" y="-8.4">General tolerances:</text>
|
||||
<text id="Part material label" x="0.5" y="-8.4">Part Material:</text>
|
||||
</g>
|
||||
<g id="Data fields"
|
||||
style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
|
||||
<text id="Identification number data field" x="101" y="45.2" freecad:editable="drawing_number"><tspan id="tspan1">DN</tspan></text>
|
||||
<text id="Revision index data field" x="150" y="57.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan id="tspan2">AAA</tspan></text>
|
||||
<text id="Date of issue data field" x="101" y="57.2" freecad:editable="issue_date"><tspan id="tspan3">YYYY-MM-DD</tspan></text>
|
||||
<text id="Sheet number data field" x="170" y="57.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan id="tspan4">X / Y</tspan></text>
|
||||
<text id="Language code data field" x="70" y="57.2" freecad:editable="language" style="text-align:center;text-anchor:middle"><tspan id="tspan5">EN</tspan></text>
|
||||
<text id="Title data field" x="1" y="9.2" freecad:editable="title"><tspan id="tspan7">ISO 7200 titleblock</tspan></text>
|
||||
<text id="Supplementary title 1 data field" x="1" y="15.2" freecad:editable="supplementary_title_1"><tspan id="tspan8">ST1</tspan></text>
|
||||
<text id="Supplementary title 2 data field" x="1" y="21.2" freecad:editable="supplementary_title_2"><tspan id="tspan9">ST2</tspan></text>
|
||||
<text id="Responsible department data field" x="141" y="33.2" freecad:editable="responsible_department"><tspan id="tspan10">RD</tspan></text>
|
||||
<text id="Technical reference data field" x="81" y="33.2" freecad:editable="technical_reference"><tspan id="tspan11">C. Kali</tspan></text>
|
||||
<text id="Approval person data field" x="81" y="21.2" freecad:editable="approved_by"><tspan id="tspan12">B. Hecate</tspan></text>
|
||||
<text id="Creator data field" x="81" y="9.2" freecad:editable="created_by"><tspan id="tspan13">A. Nemesis</tspan></text>
|
||||
<text id="Document type data field" x="1" y="33.2" freecad:editable="document_type"><tspan id="tspan14">Assembly Drawing</tspan></text>
|
||||
<text id="Key words data field" x="1" y="45.2" freecad:editable="key_words"><tspan id="tspan15">KW</tspan></text>
|
||||
<text id="Document status data field" x="1" y="57.2" freecad:editable="document_status"><tspan id="tspan16">In preparation</tspan></text>
|
||||
<text id="Page number data field" x="170" y="45.2" freecad:editable="page_number" style="text-align:center;text-anchor:middle"><tspan id="tspan17">X / Y</tspan></text>
|
||||
<text id="Paper size data field" x="90" y="57.2" style="text-align:center;text-anchor:middle">A3</text>
|
||||
<text id="Sheet scale data field" x="130" y="-2.8" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
|
||||
<text id="General tolerances data field" x="81" y="-2.8" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
|
||||
<text id="Part material data field" x="1" y="-2.8" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
|
||||
</g>
|
||||
<g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
|
||||
<path id="Trapezoid" d="m 159,-17 -10,2.5 v 5 l 10,2.5 z" />
|
||||
<circle id="Inner circle" cx="166" r="2.5" cy="-12" />
|
||||
<circle id="Outer circle" cx="166" r="5" cy="-12" />
|
||||
</g>
|
||||
<g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75" >
|
||||
<path id="Horizontal" d="m 148,-12 h 24" style="stroke-dashoffset:0.25" />
|
||||
<path id="Vertical" d="m 166,-6 v -12" style="stroke-dashoffset:4.625" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 7.6 KiB |
@@ -218,6 +218,6 @@ TEST_F(FeaturePartCommonTest, testMapping)
|
||||
#ifndef FC_USE_TNP_FIX
|
||||
EXPECT_EQ(ts1.getElementMap().size(), 0);
|
||||
#else
|
||||
EXPECT_EQ(ts1.getElementMap().size(), 26);
|
||||
EXPECT_EQ(ts1.getElementMap().size(), 26); // TODO: This should be 26.
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ TEST_F(FeaturePartTest, testGetElementName)
|
||||
#ifndef FC_USE_TNP_FIX
|
||||
EXPECT_EQ(ts.getElementMap().size(), 0);
|
||||
#else
|
||||
EXPECT_EQ(ts.getElementMap().size(), 26); // Value and code TBD
|
||||
EXPECT_EQ(ts.getElementMap().size(), 0); // TODO: Value and code TBD
|
||||
#endif
|
||||
// TBD
|
||||
}
|
||||
|
||||
@@ -149,7 +149,7 @@ std::string mappedElementVectorToString(std::vector<MappedElement>& elements)
|
||||
return output.str();
|
||||
}
|
||||
|
||||
bool matchStringsWithoutClause(std::string first, std::string second, std::string regex)
|
||||
bool matchStringsWithoutClause(std::string first, std::string second, const std::string& regex)
|
||||
{
|
||||
first = std::regex_replace(first, std::regex(regex), "");
|
||||
second = std::regex_replace(second, std::regex(regex), "");
|
||||
@@ -169,17 +169,17 @@ testing::AssertionResult elementsMatch(const TopoShape& shape,
|
||||
{
|
||||
auto elements = shape.getElementMap();
|
||||
if (!elements.empty() || !names.empty()) {
|
||||
if (std::find_first_of(elements.begin(),
|
||||
elements.end(),
|
||||
names.begin(),
|
||||
names.end(),
|
||||
[&](const Data::MappedElement& element, const std::string& name) {
|
||||
return matchStringsWithoutClause(element.name.toString(),
|
||||
name,
|
||||
";D[a-fA-F0-9]+");
|
||||
})
|
||||
== elements.end()) {
|
||||
return testing::AssertionFailure() << mappedElementVectorToString(elements);
|
||||
for (const auto& name : names) {
|
||||
if (std::find_if(elements.begin(),
|
||||
elements.end(),
|
||||
[&, name](const Data::MappedElement& element) {
|
||||
return matchStringsWithoutClause(element.name.toString(),
|
||||
name,
|
||||
";D[a-fA-F0-9]+");
|
||||
})
|
||||
== elements.end()) {
|
||||
return testing::AssertionFailure() << mappedElementVectorToString(elements);
|
||||
}
|
||||
}
|
||||
}
|
||||
return testing::AssertionSuccess();
|
||||
|
||||
@@ -2022,19 +2022,22 @@ TEST_F(TopoShapeExpansionTest, makeElementSlice)
|
||||
EXPECT_EQ(TopAbs_ShapeEnum::TopAbs_WIRE, result.getShape().ShapeType());
|
||||
// Assert that we're creating a correct element map
|
||||
EXPECT_TRUE(result.getMappedChildElements().empty());
|
||||
EXPECT_TRUE(
|
||||
elementsMatch(result,
|
||||
{
|
||||
"Face1;SLC;:H1:4,F;:G2;SLC;:H1:8,V;SLC;:H1:4,V;MAK;:H1:4,V",
|
||||
"Face1;SLC;:H1:4,F;:G3;SLC;:H1:8,V;SLC;:H1:4,V;MAK;:H1:4,V",
|
||||
"Face1;SLC;:H1:4,F;:G4;SLC;:H1:8,V;D1;:H1:3,V;SLC;:H1:4,V;MAK;:H1:4,V",
|
||||
"Face1;SLC;:H1:4,F;:G4;SLC;:H1:8,V;SLC;:H1:4,V;MAK;:H1:4,V",
|
||||
"Face1;SLC;:H1:4,F;:G5;SLC;:H1:8,E;SLC;:H1:4,E;MAK;:H1:4,E",
|
||||
"Face1;SLC;:H1:4,F;:G6;SLC;:H1:8,E;SLC;:H1:4,E;MAK;:H1:4,E",
|
||||
"Face1;SLC;:H1:4,F;:G7;SLC;:H1:8,E;SLC;:H1:4,E;MAK;:H1:4,E",
|
||||
"Face1;SLC;:H1:4,F;:G8;SLC;:H1:8,E;SLC;:H1:4,E;MAK;:H1:4,E",
|
||||
})); // Changed with PR#12471. Probably will change again after importing
|
||||
// other TopoNaming logics
|
||||
EXPECT_TRUE(elementsMatch(
|
||||
result,
|
||||
{
|
||||
"Face1;SLC;:H1:4,F;:G2;SLC;:H1:8,V;SLC;:H1:4,V;MAK;:H1:4,V",
|
||||
"Face1;SLC;:H1:4,F;:G3;SLC;:H1:8,V;SLC;:H1:4,V;MAK;:H1:4,V",
|
||||
// TODO: Prove that this difference is not a problem.
|
||||
// The next element varies according to platform / OCCT version and thus can't be
|
||||
// absolutely tested.
|
||||
// "Face1;SLC;:H1:4,F;:G4;SLC;:H1:8,V;D1;:H1:3,V;SLC;:H1:4,V;MAK;:H1:4,V",
|
||||
"Face1;SLC;:H1:4,F;:G4;SLC;:H1:8,V;SLC;:H1:4,V;MAK;:H1:4,V",
|
||||
"Face1;SLC;:H1:4,F;:G5;SLC;:H1:8,E;SLC;:H1:4,E;MAK;:H1:4,E",
|
||||
"Face1;SLC;:H1:4,F;:G6;SLC;:H1:8,E;SLC;:H1:4,E;MAK;:H1:4,E",
|
||||
"Face1;SLC;:H1:4,F;:G7;SLC;:H1:8,E;SLC;:H1:4,E;MAK;:H1:4,E",
|
||||
"Face1;SLC;:H1:4,F;:G8;SLC;:H1:8,E;SLC;:H1:4,E;MAK;:H1:4,E",
|
||||
})); // Changed with PR#12471. Probably will change again after importing
|
||||
// other TopoNaming logics
|
||||
}
|
||||
|
||||
TEST_F(TopoShapeExpansionTest, makeElementSlices)
|
||||
@@ -2067,15 +2070,18 @@ TEST_F(TopoShapeExpansionTest, makeElementSlices)
|
||||
"Edge11;:G(Face1;SLC;:H1:4,F;K-3;:H1:4,F);SLC;:H1:26,V;SLC;:H1:4,V;MAK;:H1:4,V",
|
||||
"Edge11;:G(Face1;SLC_2;:H2:6,F;K-3;:H2:4,F);SLC_2;:H1:2a,V;SLC_2;:H1:6,V;MAK;:H1:4,V",
|
||||
"Edge11;:G(Face1;SLC_3;:H3:6,F;K-3;:H3:4,F);SLC_3;:H1:2a,V;SLC_3;:H1:6,V;MAK;:H1:4,V",
|
||||
"Edge12;:G(Face1;SLC;:H1:4,F;K-4;:H1:4,F);SLC;:H1:26,V;D1;:H1:3,V;SLC;:H1:4,V;MAK;:H1:"
|
||||
"4,V",
|
||||
"Edge12;:G(Face1;SLC;:H1:4,F;K-4;:H1:4,F);SLC;:H1:26,V;SLC;:H1:4,V;MAK;:H1:4,V",
|
||||
"Edge12;:G(Face1;SLC_2;:H2:6,F;K-4;:H2:4,F);SLC_2;:H1:2a,V;D1;:H1:3,V;SLC_2;:H1:6,V;"
|
||||
"MAK;:H1:4,V",
|
||||
"Edge12;:G(Face1;SLC_2;:H2:6,F;K-4;:H2:4,F);SLC_2;:H1:2a,V;SLC_2;:H1:6,V;MAK;:H1:4,V",
|
||||
"Edge12;:G(Face1;SLC_3;:H3:6,F;K-4;:H3:4,F);SLC_3;:H1:2a,V;D1;:H1:3,V;SLC_3;:H1:6,V;"
|
||||
"MAK;:H1:4,V",
|
||||
"Edge12;:G(Face1;SLC_3;:H3:6,F;K-4;:H3:4,F);SLC_3;:H1:2a,V;SLC_3;:H1:6,V;MAK;:H1:4,V",
|
||||
// TODO: Prove that this difference is not a problem.
|
||||
// The next elements vary according to platform / OCCT version and thus can't be
|
||||
// absolutely tested.
|
||||
// "Edge12;:G(Face1;SLC;:H1:4,F;K-4;:H1:4,F);SLC;:H1:26,V;D1;:H1:3,V;SLC;:H1:4,V;MAK;:H1:"
|
||||
// "4,V",
|
||||
// "Edge12;:G(Face1;SLC;:H1:4,F;K-4;:H1:4,F);SLC;:H1:26,V;SLC;:H1:4,V;MAK;:H1:4,V",
|
||||
// "Edge12;:G(Face1;SLC_2;:H2:6,F;K-4;:H2:4,F);SLC_2;:H1:2a,V;D1;:H1:3,V;SLC_2;:H1:6,V;"
|
||||
// "MAK;:H1:4,V",
|
||||
// "Edge12;:G(Face1;SLC_2;:H2:6,F;K-4;:H2:4,F);SLC_2;:H1:2a,V;SLC_2;:H1:6,V;MAK;:H1:4,V",
|
||||
// "Edge12;:G(Face1;SLC_3;:H3:6,F;K-4;:H3:4,F);SLC_3;:H1:2a,V;D1;:H1:3,V;SLC_3;:H1:6,V;"
|
||||
// "MAK;:H1:4,V",
|
||||
// "Edge12;:G(Face1;SLC_3;:H3:6,F;K-4;:H3:4,F);SLC_3;:H1:2a,V;SLC_3;:H1:6,V;MAK;:H1:4,V",
|
||||
"Face1;SLC;:H1:4,F;:G5(Face3;K-1;:H1:4,F);SLC;:H1:1b,E;SLC;:H1:4,E;MAK;:H1:4,E",
|
||||
"Face1;SLC;:H1:4,F;:G6(Face4;K-1;:H1:4,F);SLC;:H1:1b,E;SLC;:H1:4,E;MAK;:H1:4,E",
|
||||
"Face1;SLC;:H1:4,F;:G7(Face5;K-1;:H1:4,F);SLC;:H1:1b,E;SLC;:H1:4,E;MAK;:H1:4,E",
|
||||
@@ -2395,19 +2401,22 @@ TEST_F(TopoShapeExpansionTest, makeElementFilledFace)
|
||||
EXPECT_TRUE(PartTestHelpers::boxesMatch(bb, Base::BoundBox3d(0.0, -0.6, -0.6, 0, 1.6, 1.6)));
|
||||
EXPECT_FLOAT_EQ(getArea(result.getShape()), 1);
|
||||
// Assert elementMap is correct
|
||||
EXPECT_TRUE(allElementsMatch(result,
|
||||
{
|
||||
"Edge1;:G;FFC;:H2:7,E",
|
||||
"Edge1;:G;FFC;:H2:7,E;:L(Edge2;:G;FFC;:H2:7,E|Edge3;:G;FFC;:"
|
||||
"H2:7,E|Edge4;:G;FFC;:H2:7,E);FFC;:H2:47,F",
|
||||
"Edge2;:G;FFC;:H2:7,E",
|
||||
"Edge3;:G;FFC;:H2:7,E",
|
||||
"Edge4;:G;FFC;:H2:7,E",
|
||||
"Vertex1;:G;FFC;:H2:7,V",
|
||||
"Vertex2;:G;FFC;:H2:7,V",
|
||||
"Vertex3;:G;FFC;:H2:7,V",
|
||||
"Vertex4;:G;FFC;:H2:7,V",
|
||||
}));
|
||||
EXPECT_TRUE(elementsMatch(result,
|
||||
{
|
||||
"Edge1;:G;FFC;:H2:7,E",
|
||||
"Edge1;:G;FFC;:H2:7,E;:L(Edge2;:G;FFC;:H2:7,E|Edge3;:G;FFC;:"
|
||||
"H2:7,E|Edge4;:G;FFC;:H2:7,E);FFC;:H2:47,F",
|
||||
"Edge2;:G;FFC;:H2:7,E",
|
||||
"Edge3;:G;FFC;:H2:7,E",
|
||||
"Edge4;:G;FFC;:H2:7,E",
|
||||
// TODO: Prove that this difference is not a problem.
|
||||
// The next elements vary according to platform / OCCT version
|
||||
// and thus can't be absolutely tested.
|
||||
// "Vertex1;:G;FFC;:H2:7,V",
|
||||
// "Vertex2;:G;FFC;:H2:7,V",
|
||||
// "Vertex3;:G;FFC;:H2:7,V",
|
||||
// "Vertex4;:G;FFC;:H2:7,V",
|
||||
}));
|
||||
}
|
||||
|
||||
TEST_F(TopoShapeExpansionTest, makeElementBSplineFace)
|
||||
@@ -2478,13 +2487,11 @@ TEST_F(TopoShapeExpansionTest, replaceElementShape)
|
||||
EXPECT_TRUE(elementsMatch(
|
||||
result,
|
||||
{
|
||||
"Edge1", "Edge1;:H1,E", "Edge1;:H2,E", "Edge1;:H3,E", "Edge2",
|
||||
"Edge2;:H1,E", "Edge2;:H2,E", "Edge2;:H3,E", "Edge3", "Edge3;:H1,E",
|
||||
"Edge3;:H2,E", "Edge3;:H3,E", "Edge4;:H1,E", "Edge4;:H2,E", "Edge4;:H3,E",
|
||||
"Face1;:H2,F", "Face1;:H3,F", "Face1;:H4,F", "Face1;:H5,F", "Face1;:H6,F",
|
||||
"Vertex1", "Vertex1;:H1,V", "Vertex1;:H2,V", "Vertex2", "Vertex2;:H1,V",
|
||||
"Vertex2;:H2,V", "Vertex3", "Vertex3;:H1,V", "Vertex3;:H2,V", "Vertex4;:H1,V",
|
||||
"Vertex4;:H2,V",
|
||||
"Edge1;:H1,E", "Edge1;:H2,E", "Edge1;:H3,E", "Edge2;:H1,E", "Edge2;:H2,E",
|
||||
"Edge2;:H3,E", "Edge3;:H1,E", "Edge3;:H2,E", "Edge3;:H3,E", "Edge4;:H1,E",
|
||||
"Edge4;:H2,E", "Edge4;:H3,E", "Face1;:H2,F", "Face1;:H3,F", "Face1;:H4,F",
|
||||
"Face1;:H5,F", "Face1;:H6,F", "Vertex1;:H1,V", "Vertex1;:H2,V", "Vertex2;:H1,V",
|
||||
"Vertex2;:H2,V", "Vertex3;:H1,V", "Vertex3;:H2,V", "Vertex4;:H1,V", "Vertex4;:H2,V",
|
||||
}));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user