diff --git a/src/Mod/AddonManager/AddonManager.py b/src/Mod/AddonManager/AddonManager.py index b234b3e538..97e635fe51 100644 --- a/src/Mod/AddonManager/AddonManager.py +++ b/src/Mod/AddonManager/AddonManager.py @@ -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 diff --git a/src/Mod/AddonManager/AddonManagerOptions.ui b/src/Mod/AddonManager/AddonManagerOptions.ui index 66bf262816..251f2a2bc7 100644 --- a/src/Mod/AddonManager/AddonManagerOptions.ui +++ b/src/Mod/AddonManager/AddonManagerOptions.ui @@ -334,13 +334,13 @@ installed addons will be checked for available updates - AddonScoreURL + AddonsScoreURL Addons - The URL for the Addon Score data (see documentation for formatting and hosting details). + The URL for the Addon Score data (see Addon Manager wiki page for formatting and hosting details). diff --git a/src/Mod/AddonManager/addonmanager_preferences_defaults.json b/src/Mod/AddonManager/addonmanager_preferences_defaults.json index 783d699b2b..0211354746 100644 --- a/src/Mod/AddonManager/addonmanager_preferences_defaults.json +++ b/src/Mod/AddonManager/addonmanager_preferences_defaults.json @@ -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": "", diff --git a/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg new file mode 100644 index 0000000000..bca7530e0d --- /dev/null +++ b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg @@ -0,0 +1,262 @@ + + + + Drawing sheet ISO 5457 - A0T + + + + + Drawing sheet ISO 5457 - A0T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Owner: + Drawing number: + Revision: + Issue date: + Sheet: + Title, supplementary title: + Responsible department: + Approved by: + Document type: + Created by: + Document status: + Paper size: + Scale: + General tolerances: + Part Material: + + + DN + AAA + YYYY-MM-DD + X / Y + ISO 7200 titleblock + ST1 + ST2 + RD + B. Hecate + Assembly Drawing + A. Nemesis + In preparation + A0 + 1 : 1 + ISO 2768-m + Stainless steel Mat.No. 1.4301 + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg new file mode 100644 index 0000000000..21fd90506c --- /dev/null +++ b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg @@ -0,0 +1,253 @@ + + + + Drawing sheet ISO 5457 - A0T + + + + + Drawing sheet ISO 5457 - A0T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Owner: + Drawing number: + Revision: + Issue date: + Sheet: + Title: + Approved by: + Created by: + Document type: + Paper size: + Scale: + General tolerances: + Part Material: + + + DN + AAA + YYYY-MM-DD + X / Y + ISO 5457 template + B. Hecate + A. Nemesis + Assembly Drawing + A0 + 1 : 1 + ISO 2768-m + Stainless steel Mat.No. 1.4301 + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/A0_Landscape_ISO7200TD.svg b/src/Mod/TechDraw/Templates/A0_Landscape_ISO7200TD.svg deleted file mode 100644 index 83fd664f33..0000000000 --- a/src/Mod/TechDraw/Templates/A0_Landscape_ISO7200TD.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - Created by: - Title: - Supplementary information: - Size: - Sheet: - Scale: - Part number: - Drawing number: - Date: - Revision: - - - - - - - AUTHOR NAME - DRAWING TITLE - - - FreeCAD DRAWING - - - - A0 - X / Y - SCALE - PN - DN - DD/MM/YYYY - REV A - - - diff --git a/src/Mod/TechDraw/Templates/A0_Landscape_ISO7200_Pep.svg b/src/Mod/TechDraw/Templates/A0_Landscape_ISO7200_Pep.svg deleted file mode 100644 index 71500e19d9..0000000000 --- a/src/Mod/TechDraw/Templates/A0_Landscape_ISO7200_Pep.svg +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 18 - 19 - 20 - - A - B - C - D - E - F - G - H - I - K - L - M - N - O - - A - B - C - D - E - F - G - H - I - K - L - M - N - O - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 18 - 19 - 20 - - - - - - - - - - - - - - - - - - - - - - - - - - - Author: - Appr.: - Legal owner: - TITLE: - Document type: - Sheet: - Size: - Scale: - Toler.: - Part material: - Part number: - Drawing no.: - Date: - Revision: - - - AUTHOR NAME - APPROVER NAME - OWNER NAME - FreeCAD - - - Mechanical assembly drawing - 99 of 99 - M x:x - +/- ? - PM - PN - DN - YYYY-MM-DD - REV A - A1 - (R) DO NOT DUPLICATE THIS DRAWING TO THIRD PARTIES WITHOUT OWNER'S PERMISSION ! - - - - diff --git a/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg new file mode 100644 index 0000000000..e943c8c1c8 --- /dev/null +++ b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg @@ -0,0 +1,214 @@ + + + + Drawing sheet ISO 5457 - A1T + + + + Drawing sheet ISO 5457 - A1T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Owner: + Drawing number: + Revision: + Issue date: + Sheet: + Title, supplementary title: + Responsible department: + Approved by: + Document type: + Created by: + Document status: + Paper size: + Scale: + General tolerances: + Part Material: + + + DN + AAA + YYYY-MM-DD + X / Y + ISO 7200 titleblock + ST1 + ST2 + RD + B. Hecate + Assembly Drawing + A. Nemesis + In preparation + A1 + 1 : 1 + ISO 2768-m + Stainless steel Mat.No. 1.4301 + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg new file mode 100644 index 0000000000..07a35974ed --- /dev/null +++ b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg @@ -0,0 +1,205 @@ + + + + Drawing sheet ISO 5457 - A1T + + + + Drawing sheet ISO 5457 - A1T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Owner: + Drawing number: + Revision: + Issue date: + Sheet: + Title: + Approved by: + Created by: + Document type: + Paper size: + Scale: + General tolerances: + Part Material: + + + DN + AAA + YYYY-MM-DD + X / Y + ISO 5457 template + B. Hecate + A. Nemesis + Assembly Drawing + A1 + 1 : 1 + ISO 2768-m + Stainless steel Mat.No. 1.4301 + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/A1_Landscape_ISO7200TD.svg b/src/Mod/TechDraw/Templates/A1_Landscape_ISO7200TD.svg deleted file mode 100644 index 29bb9fd241..0000000000 --- a/src/Mod/TechDraw/Templates/A1_Landscape_ISO7200TD.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - Created by: - Title: - Supplementary information: - Size: - Sheet: - Scale: - Part number: - Drawing number: - Date: - Revision: - - - - - - - AUTHOR NAME - DRAWING TITLE - - - FreeCAD DRAWING - - - - A1 - X / Y - SCALE - PN - DN - DD/MM/YYYY - REV A - - - diff --git a/src/Mod/TechDraw/Templates/A1_Landscape_ISO7200_Pep.svg b/src/Mod/TechDraw/Templates/A1_Landscape_ISO7200_Pep.svg deleted file mode 100644 index b2bfcd8b43..0000000000 --- a/src/Mod/TechDraw/Templates/A1_Landscape_ISO7200_Pep.svg +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - A - B - C - D - E - F - G - H - I - K - - A - B - C - D - E - F - G - H - I - K - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - - - - - - - - - - - - - - - - - - - - - - - - - Author: - Appr.: - Legal owner: - TITLE: - Document type: - Sheet: - Size: - Scale: - Toler.: - Part material: - Part number: - Drawing no.: - Date: - Revision: - - - AUTHOR NAME - APPROVER NAME - OWNER NAME - FreeCAD - - - Mechanical assembly drawing - 99 of 99 - M x:x - +/- ? - PM - PN - DN - YYYY-MM-DD - REV A - A1 - (R) DO NOT DUPLICATE THIS DRAWING TO THIRD PARTIES WITHOUT OWNER'S PERMISSION ! - - - - diff --git a/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg new file mode 100644 index 0000000000..dd3720c36f --- /dev/null +++ b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg @@ -0,0 +1,181 @@ + + + + Drawing sheet ISO 5457 - A2T + + + Drawing sheet ISO 5457 - A2T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Owner: + Drawing number: + Revision: + Issue date: + Sheet: + Title, supplementary title: + Responsible department: + Approved by: + Document type: + Created by: + Document status: + Paper size: + Scale: + General tolerances: + Part Material: + + + DN + AAA + YYYY-MM-DD + X / Y + ISO 7200 titleblock + ST1 + ST2 + RD + B. Hecate + Assembly Drawing + A. Nemesis + In preparation + A2 + 1 : 1 + ISO 2768-m + Stainless steel Mat.No. 1.4301 + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg new file mode 100644 index 0000000000..a0bfb31bae --- /dev/null +++ b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg @@ -0,0 +1,174 @@ + + + + Drawing sheet ISO 5457 - A2T + + + Drawing sheet ISO 5457 - A2T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Owner: + Drawing number: + Revision: + Issue date: + Sheet: + Title: + Approved by: + Created by: + Document type: + Paper size: + Scale: + General tolerances: + Part Material: + + + DN + AAA + YYYY-MM-DD + X / Y + ISO 5457 template + B. Hecate + A. Nemesis + Assembly Drawing + A2 + 1 : 1 + ISO 2768-m + Stainless steel Mat.No. 1.4301 + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/A2_Landscape_ISO7200TD.svg b/src/Mod/TechDraw/Templates/A2_Landscape_ISO7200TD.svg deleted file mode 100644 index 5a9e46faa9..0000000000 --- a/src/Mod/TechDraw/Templates/A2_Landscape_ISO7200TD.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - Created by: - Title: - Supplementary information: - Size: - Sheet: - Scale: - Part number: - Drawing number: - Date: - Revision: - - - - - transform="translate(384,123)"> - - AUTHOR NAME - DRAWING TITLE - - - FreeCAD DRAWING - - - - A2 - X / Y - SCALE - PN - DN - DD/MM/YYYY - REV A - - - diff --git a/src/Mod/TechDraw/Templates/A2_Landscape_ISO7200_Pep.svg b/src/Mod/TechDraw/Templates/A2_Landscape_ISO7200_Pep.svg deleted file mode 100644 index b78c891c7f..0000000000 --- a/src/Mod/TechDraw/Templates/A2_Landscape_ISO7200_Pep.svg +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - - A - B - C - D - E - F - G - - A - B - C - D - E - F - G - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - - - - - - - - - - - - - - - - - - - - - - - - - - - Author: - Appr.: - Legal owner: - TITLE: - Document type: - Sheet: - Size: - Scale: - Toler.: - Part material: - Part number: - Drawing no.: - Date: - Revision: - - - AUTHOR NAME - APPROVER NAME - OWNER NAME - FreeCAD - - - Mechanical assembly drawing - 99 of 99 - M x:x - +/- ? - PM - PN - DN - YYYY-MM-DD - REV A - A2 - (R) DO NOT DUPLICATE THIS DRAWING TO THIRD PARTIES WITHOUT OWNER'S PERMISSION ! - - - - diff --git a/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg new file mode 100644 index 0000000000..31562c5726 --- /dev/null +++ b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg @@ -0,0 +1,158 @@ + + + + Drawing sheet ISO 5457 - A3T + + + + Drawing sheet ISO 5457 - A3T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > + + + + + + + + + + + + + + + + + + + + + + + Owner: + Drawing number: + Revision: + Issue date: + Sheet: + Title, supplementary title: + Responsible department: + Approved by: + Document type: + Created by: + Document status: + Paper size: + Scale: + General tolerances: + Part Material: + + + DN + AAA + YYYY-MM-DD + X / Y + ISO 7200 titleblock + ST1 + ST2 + RD + B. Hecate + Assembly Drawing + A. Nemesis + In preparation + A3 + 1 : 1 + ISO 2768-m + Stainless steel Mat.No. 1.4301 + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg new file mode 100644 index 0000000000..1a82198256 --- /dev/null +++ b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg @@ -0,0 +1,150 @@ + + + + Drawing sheet ISO 5457 - A3T + + + + Drawing sheet ISO 5457 - A3T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > + + + + + + + + + + + + + + + + + + + + + Owner: + Drawing number: + Revision: + Issue date: + Sheet: + Title: + Approved by: + Created by: + Document type: + Paper size: + Scale: + General tolerances: + Part Material: + + + DN + AAA + YYYY-MM-DD + X / Y + ISO 5457 template + B. Hecate + A. Nemesis + Assembly Drawing + A3 + 1 : 1 + ISO 2768-m + Stainless steel Mat.No. 1.4301 + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/A3_Landscape_ISO7200TD.svg b/src/Mod/TechDraw/Templates/A3_Landscape_ISO7200TD.svg deleted file mode 100644 index 5edb0c5e4d..0000000000 --- a/src/Mod/TechDraw/Templates/A3_Landscape_ISO7200TD.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - Created by: - Title: - Supplementary information: - Size: - Sheet: - Scale: - Part number: - Drawing number: - Date: - Revision: - - - - - - - - AUTHOR NAME - DRAWING TITLE - - - FreeCAD DRAWING - - - - A3 - X / Y - SCALE - PN - DN - DD/MM/YYYY - REV A - - - diff --git a/src/Mod/TechDraw/Templates/A3_Landscape_ISO7200_Pep.svg b/src/Mod/TechDraw/Templates/A3_Landscape_ISO7200_Pep.svg deleted file mode 100644 index 964124106f..0000000000 --- a/src/Mod/TechDraw/Templates/A3_Landscape_ISO7200_Pep.svg +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - - A - B - C - D - E - - A - B - C - D - E - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - - - - - - - - - - - - - - - - - - - - - - - - - - - Author: - Appr.: - Legal owner: - TITLE: - Document type: - Sheet: - Size: - Scale: - Toler.: - Part material: - Part number: - Drawing no.: - Date: - Revision: - - - AUTHOR NAME - APPROVER NAME - OWNER NAME - FreeCAD - - - Mechanical assembly drawing - 99 of 99 - M x:x - +/- ? - PM - PN - DN - YYYY-MM-DD - REV A - A3 - (R) DO NOT DUPLICATE THIS DRAWING TO THIRD PARTIES WITHOUT OWNER'S PERMISSION! - - - - diff --git a/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg new file mode 100644 index 0000000000..50fe66d2ea --- /dev/null +++ b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg @@ -0,0 +1,132 @@ + + + + Drawing sheet ISO 5457 - A4T + + + + + + + + + + Drawing sheet ISO 5457 - A4T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Owner: + Drawing number: + Revision: + Issue date: + Sheet: + Title, supplementary title: + Responsible department: + Approved by: + Document type: + Created by: + Document status: + Paper size: + Scale: + General tolerances: + Part Material: + + + DN + AAA + YYYY-MM-DD + X / Y + ISO 7200 titleblock + ST1 + ST2 + RD + B. Hecate + Assembly Drawing + A. Nemesis + In preparation + A4 + 1 : 1 + ISO 2768-m + Stainless steel Mat.No. 1.4301 + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg new file mode 100644 index 0000000000..b8ef4593ed --- /dev/null +++ b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg @@ -0,0 +1,127 @@ + + + + Drawing sheet ISO 5457 - A4T + + + + + + + + + + Drawing sheet ISO 5457 - A4T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Owner: + Drawing number: + Revision: + Issue date: + Sheet: + Title: + Approved by: + Created by: + Document type: + Paper size: + Scale: + General tolerances: + Part Material: + Scale: + General tolerances: + Part Material: + + + DN + AAA + YYYY-MM-DD + X / Y + ISO 5457 template + B. Hecate + A. Nemesis + Assembly Drawing + A4 + 1 : 1 + ISO 2768-m + Stainless steel Mat.No. 1.4301 + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/A4_Landscape_ISO7200TD.svg b/src/Mod/TechDraw/Templates/A4_Landscape_ISO7200TD.svg deleted file mode 100644 index ab77ba9a1a..0000000000 --- a/src/Mod/TechDraw/Templates/A4_Landscape_ISO7200TD.svg +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - Created by: - Title: - Supplementary information: - Size: - Sheet: - Scale: - Part number: - Drawing no.: - Date: - Revision: - - - - - - - AUTHOR NAME - DRAWING TITLE - - FreeCAD DRAWING - - A4 - X / Y - SCALE - PN - DN - DD/MM/YYYY - REV A - - - diff --git a/src/Mod/TechDraw/Templates/A4_Landscape_ISO7200_Pep.svg b/src/Mod/TechDraw/Templates/A4_Landscape_ISO7200_Pep.svg deleted file mode 100644 index 3af2ab93d9..0000000000 --- a/src/Mod/TechDraw/Templates/A4_Landscape_ISO7200_Pep.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Author: - Appr.: - Legal owner: - TITLE: - Document type: - Sheet: - Size: - Scale: - Toler.: - Part material: - Part number: - Drawing no.: - Date: - Revision: - - - AUTHOR NAME - APPROVER NAME - OWNER NAME - FreeCAD - - - Mechanical assembly drawing - 99 of 99 - M x:x - +/- ? - PM - PN - DN - YYYY-MM-DD - REV A - A4 - (R) DO NOT DUPLICATE THIS DRAWING TO THIRD PARTIES WITHOUT OWNER'S PERMISSION ! - - - - diff --git a/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg new file mode 100644 index 0000000000..6f0f23de07 --- /dev/null +++ b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg @@ -0,0 +1,132 @@ + + + + Drawing sheet ISO 5457 - A4T + + + + Drawing sheet ISO 5457 - A4T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Owner: + Drawing number: + Revision: + Issue date: + Sheet: + Title, supplementary title: + Responsible department: + Approved by: + Document type: + Created by: + Document status: + Paper size: + Scale: + General tolerances: + Part Material: + + + DN + AAA + YYYY-MM-DD + X / Y + ISO 7200 titleblock + ST1 + ST2 + RD + B. Hecate + Assembly Drawing + A. Nemesis + In preparation + A4 + 1 : 1 + ISO 2768-m + Stainless steel Mat.No. 1.4301 + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg new file mode 100644 index 0000000000..4e821c731c --- /dev/null +++ b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg @@ -0,0 +1,124 @@ + + + + Drawing sheet ISO 5457 - A4T + + + + Drawing sheet ISO 5457 - A4T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Owner: + Drawing number: + Revision: + Issue date: + Sheet: + Title: + Approved by: + Created by: + Document type: + Paper size: + Scale: + General tolerances: + Part Material: + + + DN + AAA + YYYY-MM-DD + X / Y + ISO 5457 template + B. Hecate + A. Nemesis + Assembly Drawing + A4 + 1 : 1 + ISO 2768-m + Stainless steel Mat.No. 1.4301 + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/A4_Portrait_ISO7200Pep.svg b/src/Mod/TechDraw/Templates/A4_Portrait_ISO7200Pep.svg deleted file mode 100644 index e128fb8105..0000000000 --- a/src/Mod/TechDraw/Templates/A4_Portrait_ISO7200Pep.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Author: - Appr.: - Legal owner: - TITLE: - Document type: - Sheet: - Size: - Scale: - Toler.: - Part material: - Part number: - Drawing no.: - Date: - Revision: - - - AUTHOR NAME - APPROVER NAME - OWNER NAME - FreeCAD - - - Mechanical assembly drawing - 99 of 99 - M x:x - +/- ? - PM - PN - DN - YYYY-MM-DD - REV A - A4 - (R) DO NOT DUPLICATE THIS DRAWING TO THIRD PARTIES WITHOUT OWNER'S PERMISSION ! - - - - diff --git a/src/Mod/TechDraw/Templates/A4_Portrait_ISO7200TD.svg b/src/Mod/TechDraw/Templates/A4_Portrait_ISO7200TD.svg deleted file mode 100644 index c71e88e86c..0000000000 --- a/src/Mod/TechDraw/Templates/A4_Portrait_ISO7200TD.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - Created by: - Title: - Supplementary information: - Size: - Sheet: - Scale: - Part number: - Drawing number: - Date: - Revision: - - - AUTHOR NAME - DRAWING TITLE - - - FreeCAD DRAWING - - - - A4 - X / Y - SCALE - PN - DN - DD/MM/YYYY - REV A - - - - - - - diff --git a/src/Mod/TechDraw/Templates/ISO 5457/A0_Landscape_ISO5457_notitleblock.svg b/src/Mod/TechDraw/Templates/ISO 5457/A0_Landscape_ISO5457_notitleblock.svg new file mode 100644 index 0000000000..255c18c993 --- /dev/null +++ b/src/Mod/TechDraw/Templates/ISO 5457/A0_Landscape_ISO5457_notitleblock.svg @@ -0,0 +1,201 @@ + + + + Drawing sheet ISO 5457 - A0T + + + + + Drawing sheet ISO 5457 - A0T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/ISO 5457/A1_Landscape_ISO5457_notitleblock.svg b/src/Mod/TechDraw/Templates/ISO 5457/A1_Landscape_ISO5457_notitleblock.svg new file mode 100644 index 0000000000..1f343e0d8e --- /dev/null +++ b/src/Mod/TechDraw/Templates/ISO 5457/A1_Landscape_ISO5457_notitleblock.svg @@ -0,0 +1,153 @@ + + + + Drawing sheet ISO 5457 - A1T + + + + Drawing sheet ISO 5457 - A1T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/ISO 5457/A2_Landscape_ISO5457_notitleblock.svg b/src/Mod/TechDraw/Templates/ISO 5457/A2_Landscape_ISO5457_notitleblock.svg new file mode 100644 index 0000000000..9be9d85c56 --- /dev/null +++ b/src/Mod/TechDraw/Templates/ISO 5457/A2_Landscape_ISO5457_notitleblock.svg @@ -0,0 +1,120 @@ + + + + Drawing sheet ISO 5457 - A2T + + + Drawing sheet ISO 5457 - A2T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/ISO 5457/A3_Landscape_ISO5457_notitleblock.svg b/src/Mod/TechDraw/Templates/ISO 5457/A3_Landscape_ISO5457_notitleblock.svg new file mode 100644 index 0000000000..94115d03a8 --- /dev/null +++ b/src/Mod/TechDraw/Templates/ISO 5457/A3_Landscape_ISO5457_notitleblock.svg @@ -0,0 +1,97 @@ + + + + Drawing sheet ISO 5457 - A3T + + + + Drawing sheet ISO 5457 - A3T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > + + + + + + diff --git a/src/Mod/TechDraw/Templates/ISO 5457/A4_Landscape_ISO5457_notitleblock.svg b/src/Mod/TechDraw/Templates/ISO 5457/A4_Landscape_ISO5457_notitleblock.svg new file mode 100644 index 0000000000..408967838c --- /dev/null +++ b/src/Mod/TechDraw/Templates/ISO 5457/A4_Landscape_ISO5457_notitleblock.svg @@ -0,0 +1,71 @@ + + + + Drawing sheet ISO 5457 - A4T + + + + + + + + + + Drawing sheet ISO 5457 - A4T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/ISO 5457/A4_Portrait_ISO5457_notitleblock.svg b/src/Mod/TechDraw/Templates/ISO 5457/A4_Portrait_ISO5457_notitleblock.svg new file mode 100644 index 0000000000..b808a2ab26 --- /dev/null +++ b/src/Mod/TechDraw/Templates/ISO 5457/A4_Portrait_ISO5457_notitleblock.svg @@ -0,0 +1,71 @@ + + + + Drawing sheet ISO 5457 - A4T + + + + Drawing sheet ISO 5457 - A4T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_1_minimal.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_1_minimal.svg new file mode 100644 index 0000000000..20732adda0 --- /dev/null +++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_1_minimal.svg @@ -0,0 +1,85 @@ + + + + Titleblock ISO 7200 + + + + Titleblock ISO 7200 + + + + Benjamin May + + + + + + + + + + + + + + + + + + + + + + + + + Owner: + Drawing number: + Revision: + Issue date: + Sheet: + Title: + Approved by: + Created by: + Document type: + Paper size: + Scale: + General tolerances: + Part Material: + + + DN + AAA + YYYY-MM-DD + X / Y + ISO 5457 template + B. Hecate + A. Nemesis + Assembly Drawing + A3 + 1 : 1 + ISO 2768-m + Stainless steel Mat.No. 1.4301 + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg new file mode 100644 index 0000000000..ff34e6485d --- /dev/null +++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg @@ -0,0 +1,70 @@ + + + + Titleblock ISO 7200 + + + + Titleblock ISO 7200 + + + + Benjamin May + + + + + + + + + + + + + + + + + + + + + + + + + Owner: + Drawing number: + Revision: + Issue date: + Sheet: + Title: + Responsible department: + Approved by: + Created by: + Document type: + + + DN + AAA + YYYY-MM-DD + X / Y + ISO 5457 template + RD + B. Hecate + A. Nemesis + Assembly Drawing + + diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_3.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_3.svg new file mode 100644 index 0000000000..c3c4727253 --- /dev/null +++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_3.svg @@ -0,0 +1,93 @@ + + + + Titleblock ISO 7200 + + + + Titleblock ISO 7200 + + + + Benjamin May + + + + + + + + + + + + + + + + + + + + + + + + + + + Owner: + Drawing number: + Revision: + Issue date: + Sheet: + Title, supplementary title: + Responsible department: + Approved by: + Document type: + Created by: + Document status: + Paper size: + Scale: + General tolerances: + Part Material: + + + DN + AAA + YYYY-MM-DD + X / Y + ISO 7200 titleblock + ST1 + ST2 + RD + B. Hecate + Assembly Drawing + A. Nemesis + In preparation + A3 + 1 : 1 + ISO 2768-m + Stainless steel Mat.No. 1.4301 + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg new file mode 100644 index 0000000000..7f75a444b9 --- /dev/null +++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg @@ -0,0 +1,81 @@ + + + + Titleblock ISO 7200 + + + + Titleblock ISO 7200 + + + + Benjamin May + + + + + + + + + + + + + + + + + + + + + + + + + + + + Owner: + Drawing number: + Revision: + Issue date: + Sheet: + Language: + Title, supplementary title: + Responsible department: + Approved by: + Created by: + Document type: + Document status: + Paper size: + + + DN + AAA + YYYY-MM-DD + X / Y + EN + ISO 7200 titleblock + ST1 + ST2 + RD + B. Hecate + A. Nemesis + Assembly Drawing + In preparation + A3 + + diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_5_maximal.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_5_maximal.svg new file mode 100644 index 0000000000..a37986e146 --- /dev/null +++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_5_maximal.svg @@ -0,0 +1,107 @@ + + + + Titleblock ISO 7200 + + + + Titleblock ISO 7200 + + + + Benjamin May + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Owner: + Drawing number: + Revision: + Issue date: + Sheet: + Language: + Title, supplementary title: + Responsible department: + Technical reference: + Approved by: + Created by: + Document type: + Key words: + Document status: + Page: + Paper size: + Scale: + General tolerances: + Part Material: + + + DN + AAA + YYYY-MM-DD + X / Y + EN + ISO 7200 titleblock + ST1 + ST2 + RD + C. Kali + B. Hecate + A. Nemesis + Assembly Drawing + KW + In preparation + X / Y + A3 + 1 : 1 + ISO 2768-m + Stainless steel Mat.No. 1.4301 + + + + + + + + + + + diff --git a/tests/src/Mod/Part/App/FeaturePartCommon.cpp b/tests/src/Mod/Part/App/FeaturePartCommon.cpp index 8a9f5e02aa..dc030fb5e7 100644 --- a/tests/src/Mod/Part/App/FeaturePartCommon.cpp +++ b/tests/src/Mod/Part/App/FeaturePartCommon.cpp @@ -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 } diff --git a/tests/src/Mod/Part/App/PartFeature.cpp b/tests/src/Mod/Part/App/PartFeature.cpp index dba88a8731..0617f4588d 100644 --- a/tests/src/Mod/Part/App/PartFeature.cpp +++ b/tests/src/Mod/Part/App/PartFeature.cpp @@ -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 } diff --git a/tests/src/Mod/Part/App/PartTestHelpers.cpp b/tests/src/Mod/Part/App/PartTestHelpers.cpp index 5e0bc48f82..76a8d6284a 100644 --- a/tests/src/Mod/Part/App/PartTestHelpers.cpp +++ b/tests/src/Mod/Part/App/PartTestHelpers.cpp @@ -149,7 +149,7 @@ std::string mappedElementVectorToString(std::vector& 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(); diff --git a/tests/src/Mod/Part/App/TopoShapeExpansion.cpp b/tests/src/Mod/Part/App/TopoShapeExpansion.cpp index cd0f570643..298458357d 100644 --- a/tests/src/Mod/Part/App/TopoShapeExpansion.cpp +++ b/tests/src/Mod/Part/App/TopoShapeExpansion.cpp @@ -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", })); }