Skip to content

Commit c24205f

Browse files
authored
Merge branch 'main' into testQuantitySpinBoxEntry
2 parents b8fdb37 + 357cdda commit c24205f

File tree

10,348 files changed

+2702246
-1965208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

10,348 files changed

+2702246
-1965208
lines changed

.clang-format

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ ObjCSpaceBeforeProtocolList: true
5050
PackConstructorInitializers: Never
5151
PointerAlignment: Left
5252
ReflowComments: true
53+
SortIncludes: Never
5354
SpaceAfterCStyleCast: false
5455
SpaceAfterLogicalNot: false
5556
SpaceAfterTemplateKeyword: false
@@ -60,7 +61,7 @@ SpaceBeforeInheritanceColon: false
6061
SpaceBeforeParens: ControlStatements
6162
SpaceBeforeRangeBasedForLoopColon: true
6263
SpaceInEmptyParentheses: false
63-
SpacesBeforeTrailingComments: 0
64+
SpacesBeforeTrailingComments: 2
6465
SpacesInAngles: false
6566
SpacesInCStyleCastParentheses: false
6667
SpacesInContainerLiterals: false

.clang-tidy

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
---
22
Checks: 'clang-diagnostic-*,clang-analyzer-*,boost-*,bugprone-*,
3-
performance-*,readability-*,portability-*,modernize-*,cppcoreguidelines-*,
4-
concurrency-*,-modernize-use-trailing-return-type, -modernize-use-nodiscard,
5-
-readability-redundant-access-specifiers,-readability-qualified-auto'
3+
performance-*,readability-*,portability-*,modernize-*,cppcoreguidelines-*,google-explicit-constructor,
4+
concurrency-*,-modernize-use-trailing-return-type, -modernize-use-nodiscard,-readability-identifier-length,
5+
-readability-redundant-access-specifiers,-readability-qualified-auto,
6+
-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,
7+
-readability-convert-member-functions-to-static,-bugprone-easily-swappable-parameters,
8+
-cppcoreguidelines-pro-type-static-cast-downcast'
69
WarningsAsErrors: ''
710
HeaderFilterRegex: ''
8-
AnalyzeTemporaryDtors: false
911
FormatStyle: file
1012
User: florians
1113
CheckOptions:
@@ -147,12 +149,10 @@ CheckOptions:
147149
value: '0'
148150
- key: concurrency-mt-unsafe.FunctionSet
149151
value: any
150-
- key: readability-identifier-length.IgnoredExceptionVariableNames
151-
value: '^[e]$'
152152
- key: google-readability-braces-around-statements.ShortStatementLines
153153
value: '1'
154154
- key: bugprone-reserved-identifier.AllowedIdentifiers
155-
value: ''
155+
value: '_object'
156156
- key: cppcoreguidelines-pro-type-member-init.IgnoreArrays
157157
value: 'false'
158158
- key: readability-else-after-return.WarnOnUnfixable

.git-blame-ignore-revs

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,33 @@ ec899d75c6abf45d7ee4dd91ea0f8141a9818446
7373
233a337ca5d693e4773fecf1de14325752afd658
7474
9271b6d433578f65df9b469131ece4e4bdbb19aa
7575
2637527e3a4e132506e8c074b752721d66ae146a
76+
7681c62468d7b6f4d8af6758324b9ec983340b97 # Test: apply clang format
77+
4919fa18ff7f9a4cdfdd7896d768c2342e5f9f37 # Surface: apply clang format
78+
791fe029341aa1dda42376620d52c67ecaca7eea # Sketcher: Reformat to current clang-format standard
79+
0a8292a850b98d2e66e08e235dfb81b6e7285df1 # Web: apply clang format
80+
1a960286a4a549a6454155481ce51cad88a51745 # Tests: Reformat to current clang-format standard
81+
c1825036a6dfd44576da6157bde9fa2fab724d55 # Tools: Reformat to current clang-format standard
82+
17bf44ec9a5fd7a8f1c7bf0d3c24d63b6c808dbd # Start: apply clang format
83+
89579cff6e8834e296d5efe6292f019fadedce53 # Addon Manager: Reformat with new Black line length
84+
c989a8506ecc26e3172c0d18ce4d0f710b5c7d92 # RE: apply clang format
85+
c6bc17ffc13aee4d38d2938800ef5002fc874fc3 # RE: apply clang format
86+
6fb2bcafe85eb6bb0c625f37f233b0b09e093963 # MeshPart: apply clang format
87+
c2bda2f75684ed8bb64813d4a92a5a595181f556 # MeshPart: apply clang format
88+
ea116dc0332ccfc5797f248b04492a16f421b787 # Inspection: apply clang format
89+
8d24f0c021a04f19f5463a52e3be1af60fb892f1 # Points: apply clang-formatting
90+
e3de4f217c4f028523adcb5cb566f4d6a7957abe # minor reformat: break lines, one per item
91+
d57d14321b408beef7b115331e2cfa7215f59b8a # Web: Final application of pre-commit
92+
efd11e590d28d72e350b72f02f3f599ef4f704f4 # Test: Final application of pre-commit
93+
217674de04533afb81da0968483dd5a6c4d88667 # Surface: Final application of pre-commit
94+
70e046bbd5a7214b5d5ae8f12da5aed502dc89ab # Start: Final application of pre-commit
95+
db24eeec535f1f43fb3d5b63d24c5171af637880 # RE: Final application of pre-commit
96+
714cb0a309e243cfb035b046dd8cc543ac514cd2 # Points: Final application of pre-commit
97+
7593f0c112198a0cf033a0bcf8d55db4e0a0e3f5 # MeshPart: Final application of pre-commit
98+
b8f8b232cb0882d171cb299e6f6279a516cdd6eb # Inspection: Final application of pre-commit
99+
c5c2ea3498f402c0c89916c46ddb071e22756622 # Assembly: Final application of pre-commit
100+
592c992b863549fde52741fd8830418168387695 # Assembly: Apply pre-commit to Assembly files
101+
94ca51b7799b2ac60a2a56d7e6e753bb97a73671 # PartDesign: Fix #9377 - issue with accuracy in AdditiveHelix (#11312)
102+
d472927bba7b2d8d151c99fb29cf1d8dd099ea7d # Correct PartDesign Helix feature negative angles (#11399)
103+
b93c02e07da4990482b9d927506901e6f5d624e1 # Black updated to 24.3.0
104+
cbea6b60942f8327e6105b12e8c1d5db4647984c # FEM: Apply pre-commit to FEM files
105+
f9d66096878c7d89c273522b9ca57bdb14fee3bc # Rearranged CommandCreateGeo.cpp
Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
11
name: Report a Problem
2-
description: File an problem report
3-
title: "[Problem] "
4-
labels: ["needs triage"]
2+
description: Have you found something that does not work well, is too hard to do or is missing altogether? Please create a Problem Report.
3+
labels: ["Status: Needs triage","Status: Needs confirmation"]
54
body:
65
- type: checkboxes
76
id: existing_issue
87
attributes:
98
label: Is there an existing issue for this?
10-
description: Please search to see if an issue already exists for the problem you encountered.
9+
description: Please [search](https://github.com/FreeCAD/FreeCAD/issues) to see if a similar issue already exists for the problem you encountered.
1110
options:
1211
- label: I have searched the existing issues
1312
required: true
13+
- type: textarea
14+
id: description
15+
attributes:
16+
label: Problem description
17+
description: Describe the problem and how it impacts user experience, workflow, maintainability or speed of the code. If the problem appears to be a bug with the current functionality, provide as test case or recipe that reproduces the error. Ideally record a macro and attach it.
18+
placeholder: Description of the problem
19+
validations:
20+
required: true
1421
- type: textarea
1522
id: full_version
1623
attributes:
1724
label: Full version info
18-
description: Please use the About FreeCAD dialog to copy your full version information and paste it here.
25+
description: Please use the About FreeCAD dialog to copy your full version information and paste it here. Try reproducing the issue by restarting FreeCAD in safe mode too.
1926
render: shell
2027
validations:
2128
required: true
@@ -25,37 +32,33 @@ body:
2532
label: Subproject(s) affected?
2633
options:
2734
- Addon Manager
28-
- Arch
35+
- Assembly
36+
- BIM
37+
- CAM
2938
- Core
3039
- Draft
3140
- Expressions
3241
- FEM
3342
- File formats
34-
- GCS
43+
- Material
44+
- Measurement
45+
- Mesh
3546
- OpenSCAD
3647
- Part
3748
- PartDesign
38-
- Path
3949
- Project Tools & Websites
4050
- Sketcher
4151
- Spreadsheet
42-
- Techdraw
52+
- TechDraw
4353
- Other (specify in description)
44-
- type: textarea
45-
id: description
46-
attributes:
47-
label: Problem description
48-
description: Describe the problem and how it impacts user experience, workflow, maintainability or speed of the code. If the problem appears to be a bug with the current functionality, provide as test case or recipe that reproduces the error.
49-
placeholder: Description of the problem
50-
validations:
51-
required: true
5254
- type: textarea
5355
id: anything_else
5456
attributes:
5557
label: Anything else?
5658
description: |
5759
Links? References? Anything that will give us more context about the issue you are encountering!
5860
If there is a discussion about the problem on the forum, provide link(s) here.
61+
You can upload or copy your macro here to speed up the diagnosis and debugging.
5962
6063
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in. To attach a FCStd file, ZIP it first (GitHub won't recognize the extension otherwise).
6164
validations:
@@ -64,7 +67,7 @@ body:
6467
id: terms
6568
attributes:
6669
label: Code of Conduct
67-
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/FreeCAD/FreeCAD/blob/master/CODE_OF_CONDUCT.md)
70+
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/FreeCAD/FreeCAD/blob/main/CODE_OF_CONDUCT.md)
6871
options:
6972
- label: I agree to follow this project's Code of Conduct
7073
required: true

.github/codespellignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ vas
7474
vertexes
7575
vew
7676
wallthickness
77-
zuser
77+
zuser

.github/images/assembly-dark.png

431 KB
Loading

.github/images/assembly.png

416 KB
Loading

.github/images/bim-dark.png

540 KB
Loading

.github/images/bim.png

570 KB
Loading

.github/images/fem.png

464 KB
Loading

0 commit comments

Comments
 (0)