forked from FreeCAD/FreeCAD
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[pull] main from FreeCAD:main #1726
Open
pull
wants to merge
4,769
commits into
looooo:main
Choose a base branch
from
FreeCAD:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Forum Discussion - https://forum.freecad.org/viewtopic.php?t=93610&start=10#p806296 Github Issues - #19147 (comment)
…:Type's Regex based changes, manually verified
* Mods to accommodate tool order in Gcode. Some controllers want T# M6 others want M6 T#. Masso wants T# M6. Added file refactored_masso_g3_post.py (based on refactored_linuxcnc_post.py) and modified UtilsParse.py * Added tests and additional comments * Working on the testing framework * Tried to make refactored linux and masso as compatable line by line to support fil diffing * A space in the file name caused all sorts of grief ... Thanks Larry * added files to , swapped tool order in testrefactored_masso * Added note regarding how files are "clones" of one another * Added space in comment line for consistent formatting. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Updated formatting and comments --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
When in console mode, some messages from CLI interaction still resulted in popup dialogs, e.g. the response from `--help` or `--version`. This is becasue those information are communicated via exceptions and those exceptions prevented the console mode from being properly set. By using a scope guard the console mode flag is now evaluated in all cases. The code to display those messages got refactored into dedicated methods which now also take care of console mode.
* this is a workaround to remove caps pelase ignore this hackery * And now the caps are gone * a bunch of small tweaks and fixes. * Update FreeCAD Light.qss updated menubar color light theme * updated the buttons a tiny bit * Fix for to short buttons. Couldn't test it since my macro window is broken. Co-Authored-By: Syres916 <[email protected]> * qspinbox disabled tweaks. * Update FreeCAD Dark.qss Tweaked the buttons a bit so they are more in line with the light theme. * Update FreeCAD Dark.qss small tweaks * reversed the spreadsheet headers gradient for dark * Update light with undo arrows position Co-Authored-By: Syres916 <[email protected]> * Update undo buttons arrow position dark Co-Authored-By: Syres916 <[email protected]> * added an offset to qcombobox * removed the fix since it ruined every Qcombobox. * Tabs update more clean less gradients. * Update DlgMacroExecuteImp.cpp fixing conflicts * Update DlgMacroExecuteImp.cpp * Delete DlgMacroExecuteImp.cpp * Create DlgMacroExecuteImp.cpp * Revert "Create DlgMacroExecuteImp.cpp" This reverts commit 8de8f75. * Revert "Delete DlgMacroExecuteImp.cpp" This reverts commit 41315f3. * Revert "Update DlgMacroExecuteImp.cpp" This reverts commit aa79229. * Revert "Update DlgMacroExecuteImp.cpp" This reverts commit e8376a8. * Delete src/Gui/DlgMacroExecuteImp.cpp * Update DlgMacroExecuteImp.cpp finally realized what was going on lol --------- Co-authored-by: Syres916 <[email protected]>
`EditableDatumLabel` uses `activate`/`deactivate` methods for showing or hiding its widgets in the scene. However, `activate`/`deactivate` methods can end up being called as part of a scene graph / Coin action (`SoAction`) handler, in the context of `SoFCUnifiedSelection`, and this ended up in a Coin warning and eventual crash due to the scene graph being manipulated (nodes being removed), which Coin has checks for in debug mode: ``` Coin error in SoGroup::removeChild(): tried to remove non-existent child 0x5555579c5290 (Annotation) ``` Fix this issue by using a `SoSwitch` node instead and by controling the child visibility using it instead.
eliminate some error messages when a Job is not fully loaded (or when not properly constructed via scripting) TESTED ON V0.21 -- code hasn't changed since then
* Measurement: save 'Show Delta' state between commands #19204 When users set Show Delta option to off in the Measure tool, the setting was not being preserved when the tool was invoked again. This was due to using an uninitialized value as the default when loading the preference. Changes staged in: FreeCAD\src\Mod\Measure\Gui\TaskMeasure.cpp Fixed by: - Using explicit 'true' as default value when loading Show Delta preference - Maintains existing save functionality - Ensures consistent behavior on first use Fixes #19204 * Changed few things to ensure the delta state is saved #19204 added changes:- 1. settings.endGroup() When we call beginGroup(), it creates a prefix for all subsequent settings operations, All settings will be stored under the "TaskMeasure" group. endGroup() is needed to close this grouping scope Without it, subsequent settings operations would still use the "TaskMeasure" prefix 2. settings.sync() By default, QSettings caches changes in memory and writes them to disk later sync() makes an immediate write to the settings file This ensures the setting is saved right away rather than waiting for Qt to decide when to save. Makes the setting change immediately available for future commands. -Fixes Measurement: save 'Show Delta' state between commands #19204 * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Added proposed changes to autoSaveChanged() and newMeasurementBehaviourChanged() functions #19204 #19430 Added settings.endGroup() to the following functions:- 1.autoSaveChanged() 2.newMeasurementBehaviourChanged() Each beginGroup() should be followed by endGroup(). No need for explicitily calling sync() as it is called automatically from QSettings's destructor and by the event loop at regular intervals.(Refer documentation for more info) -Fixes Measurement: save 'Show Delta' state between commands #19204 #19430 --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
feat(PD): hole taskpanel: new image based cut panel
CI: Update Ubuntu 20.04 to Ubuntu 22.04
* TD: Add missing #include "PreCompiled.h" * Update src/Mod/TechDraw/Gui/CommandAlign.cpp Co-authored-by: Benjamin Nauck <[email protected]> * TD: Add guards around QMessageBox include --------- Co-authored-by: WandererFan <[email protected]> Co-authored-by: Benjamin Nauck <[email protected]>
* Draft: gui_utils.py fix error in select function PR #18795 changed the select function to also handle tuples. This PR adds a check to ensure the referenced objects in the tuple still exist before calling `Gui.Selection.addSelection()`.
* BIM: use tuple return value from QFileDialog.getOpenFileName Fixes: #19466 * BIM: remove filename assignment from tuple
…ts (#19378) * [ArchSketchObject / Window] Links of Window to support Individual Hosts Currently, Links of Window's Hosts property (and in generall all properties other than e.g. Placement) is shared with its Linked Window object, i.e. all Windows Links instances can only has a common Host(s) which is not flexible for the purpose of Links. AND, at the same time, Links in linked document suffer from the 'scope' of the original Linked Window, which is in the external Document. This commit adds feature to support: 1/ each Links instance of Windows has their own individual setting of Hosts, and 2/ it see the 'scope' of the Links in its document (rather than the Linked Window in the external document) FreeCAD Forum: - https://forum.freecad.org/viewtopic.php?p=808569#p808569 FreeCAD GitHub: - #19361 * [ArchSketchObject] Fix indentation
App: Clean up XML bindings.
refactor: use replace to avoid numbering refactor: fix the lint warnings refactor: fix clazy complaints refactor: apply review recommendation
…n-code-from-LS3 [Toponaming] Import code releted to _ElementMapVersion from LS3
It's impossible to click on the link because the tooltip fades away --------- Co-authored-by: Chris Hennes <[email protected]>
* Add nodiscard to vector3
Part: OCCWrapper: Fix compound cuts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )