Commit Graph

1681 Commits

Author SHA1 Message Date
Abdullah Tahiri
00a1aa6225 Part: Geometry - encapsulate construction access 2020-10-25 03:52:51 +01:00
Neinei0k
1a9dcdb3db Sketcher: Fix ticket #4399
The reason for this behaviour is that root point (origin) and axes are not treated as fixed geometry. Every external geometry has negative ID which is at most GeoEnum::RefExt defined as -3 in the file src/Mod/Sketcher/App/SketchObject.cpp. Ids of root point and axes are also defined in this file with id -1 for root point and horizontal axis, and -2 for vertical axis. To fix the problem, GeoEnum::RefExt id was replaced by root point id in the condition checking for the largest id of fixed geometry.
2020-10-25 02:27:06 +01:00
wmayer
067b51b835 Gui: [skip ci] let view provider to decide to whether open a transaction on double-click
The sketcher view provider doesn't need a transaction on double-click or otherwise shows a useless entry in the undo dialog which when undoing leads to weird behaviour
2020-10-24 15:37:04 +02:00
luz paz
a305b3b53f Sketcher: Capitalize opeCommand() text [skip-ci] 2020-10-24 12:26:35 +02:00
luz paz
8068a5307a Sketcher: Fix typos [skip-ci] 2020-10-24 12:26:35 +02:00
wmayer
13850707ef Sketcher: [skip ci] fix changing multiplicity of a spline for Windows builds if PCH is enabled 2020-10-23 13:43:42 +02:00
wmayer
b5d3ba129c Sketcher: [skip ci] fix crash when deleting a selected geometry directly with delGeometry() 2020-10-23 11:56:17 +02:00
wmayer
9b806f4ac9 Sketch: [skip ci] handle possible crashes when decreasing degree of a spline 2020-10-23 11:26:15 +02:00
wmayer
d532f8ef33 Sketcher: implement command to decrease degree of a B-spline 2020-10-23 00:36:41 +02:00
wmayer
09c72214e8 Sketcher: [skip ci] remove AutoTransaction from ViewProviderSketch::mouseButtonPressed because it breaks the open/commit transaction logic 2020-10-22 19:35:31 +02:00
wmayer
da46b9de3d Sketcher: [skip ci] remove superfluous transaction when start/finish editing a sketch 2020-10-22 19:35:20 +02:00
wmayer
731f89ccbf Sketcher: [skip ci] do not create dialog on heap if not needed to improve exception-safety and reduce possible memory leaks 2020-10-22 16:01:22 +02:00
vocx-fc
19978b5e31 Sketcher: add BSplineDecreaseDegree although with an empty implementation
Currently there is a command to increase the degree of a B-spline
but the corresponding command to reduce the degree does not exist.
So this command is a placeholder for when the full implementation
is added in the future by somebody.
2020-10-22 14:53:52 +02:00
vocx-fc
7cddeb0283 Sketcher: clean up line spacing for VirtualSpace command 2020-10-22 14:53:52 +02:00
vocx-fc
9936004fbc Sketcher: clean up the sketcher B-spline tooltips
Also clean up linespacing and whitespaces to make the code more
readable. Extremely long lines are broken to be 80 to 100 characters
long when possible.
2020-10-22 14:53:52 +02:00
vocx-fc
3ce832896d Sketcher: clean up the sketcher tools tooltips
Also clean up linespacing and whitespaces to make the code more
readable. Extremely long lines are broken to be 80 to 100 characters
long when possible.

'DrawSketchHandlerCopy' and 'DrawSketchHandlerRectangularArray'
are de-indented so that they start at column 1.
2020-10-22 14:53:52 +02:00
wmayer
5d37581019 Sketcher: fix regression in CmdSketcherValidateSketch
Do not enable the command if another task dialog is still active
2020-10-22 14:53:52 +02:00
vocx-fc
b47a0a0a58 Sketcher: clean up general commands tooltips
* `MapOnSketch` is active only when there is a sketch available
  in the document.
* `ReorientSketch` and `ValidateSketch` are active only when one,
  and only one, sketch is selected.
* `MergeSketch` is active only when there is at least two sketches
  selected.
* `MirrorSketch` is active only when there is at least one sketch selected.

Clean up the lines so they are not extremely long.
2020-10-22 14:53:52 +02:00
vocx-fc
ff5163cf75 Sketcher: add five tools to the Sketcher toolbar and reorder code
Add template specification for `SketcherAddWorkspaceSketchExtra`
for type `Gui::ToolBarItem` so that the following commands
are added to the toolbar as well as the Sketcher menu:
`ReorientSketch`, `ValidateSketch`, `MergeSketch`, `MirrorSketch`,
`StopOperation`.

Reorganize the order of the function declarations
so that they are in this order: Sketch actions (general),
geometries, constraints, tools, B-splines, and virtual space.

Add separators to the list of tools commands in the menu
so that it looks clearer.

Correct the header guard `#ifndef SKETCHER_WORKBENCH_H`.
Previously, it was using a guard `IMAGE_WORKBENCH_H`
seemingly copied from the Image Workbench.
2020-10-22 14:53:52 +02:00
Neinei0k
b1afdc8f61 Sketcher: Merged constraint selection fix.
When the sketch is not in XY plane, individual constraints from the merged constraint icon can't be selected. Constraint icon coordinates are given in sketcher coordinates. The function getCoordsOnSketchPlane projects vector in global coordinates to the sketch plane. So, it makes no sense to use sketcher coordinates with it. If the sketch is in the XY plane, then the global coordinates are the same as sketcher coordinates. The solution is to get global coordinates of the icon from the sketcher coordinates and use it to project icon to the screen.
2020-10-22 13:52:31 +02:00
0penBrain
d13235c960 [Sketcher] Allow selection of 2 vertices for horizontal/vertical constraint in continuous mode
Fixes #4444
2020-10-21 17:22:53 +02:00
Neinei0k
061b6fb620 [Sketcher] Changes to drawing of constraint icons.
* Change the formula to calculate maximum distance for merging of constraint icons.
* Ignore z coordinate while calculating the distance between icons. It is irrelevant but can slightly differ between icons.
* Choose first icon from the group of nearby icons as a location of the composite icon, instead of choosing icon closest to the average position. Fixes jittering of the icon while one of the constraints is moved.
2020-10-15 10:09:30 +02:00
Neinei0k
2d939f2751 [Sketcher] Fix merged constraint preselection bug
Constraint icons that located close to each other get merged into a single icon. If you zoom in, individual constraints on these icons can't be selected anymore because their relative positions, which must depend on the zoom, don't change. The problem is solved by multiplying relative position by the scale factor which depends on the magnification.
2020-10-12 16:22:56 +02:00
wmayer
99b5aaf64e Sketcher: [skip ci] fix handling of icon search paths when another workbench uses a sketcher command 2020-10-01 16:28:23 +02:00
vocx-fc
5001a80d81 Sketcher: new icons for two existing commands
New SVG icons, `Sketcher_DeleteConstraints`, `Sketcher_DeleteGeometry`
for two commands which previously used the very simple icon
`Element_SelectionTypeInvalid` (a single red X).

These icons clarify that the commands are used to delete
the constraints and the geometry, respectively.
2020-10-01 09:59:26 +02:00
vocx-fc
e7c21e453d Sketcher: add further commands to the toolbars
Most tools should be exposed in the toolbars and not kept
"hidden" in the menus.
* `ConstrainInternalAlignment` is added in the "constraints" toolbar.
* `SelectElementsWithDoF` is added in the "tools" toolbar.

Also amend the name of the `Sketcher_BSplineConvertToNURB` command.
2020-10-01 09:59:26 +02:00
vocx-fc
a4b2f56a2a Sketcher: upgrade icons for existing commands
`SelectConstraints`, `SelectElementsAssociatedWithConstraints`,
these include the icon for parallel constraint, which was upgraded
in 4fb193aa.

`SelectRedundantConstraints`, `SelectConflinctingConstraints`,
previosuly were the same with only a small color variation (orange
outline and red outline). Now they have another symbol overlayed
(lightning and exclamation mark) to distinguish them more clearly.
The parallel icon was also upgraded in these icons.

The `Move` icon is also made more clear. The first element
now has a clear outline, instead of being a faded green color
which is hard to see. An arrow is added to imply movement
from the first position to the second position.
2020-10-01 09:59:26 +02:00
vocx-fc
c592e5bf28 Sketcher: small changes to two .ui dialogs 2020-10-01 09:59:26 +02:00
vocx-fc
16c8f55770 Sketcher: move icons to general subdirectory 2020-10-01 09:59:26 +02:00
vocx-fc
86bf3f4b1c Sketcher: move other icons into their subdirectories 2020-10-01 09:59:26 +02:00
vocx-fc
817f2f15aa Sketcher: add two icons reorient and validate 2020-10-01 09:59:26 +02:00
vocx-fc
5c14c8f3fa Sketcher: move icons to tools subdirectory
Add the icon path to the workbench's `InitGui.py`.
2020-10-01 09:59:26 +02:00
vocx-fc
7a1d3a486c Sketcher: move icons to splines subdirectory
Add the icon path to the workbench's `InitGui.py`.
2020-10-01 09:59:26 +02:00
vocx-fc
c63dd6230f Sketcher: move icons to geometry subdirectory
Add the icon path to the workbench's `InitGui.py`.
2020-10-01 09:59:26 +02:00
vocx-fc
b64ed4c72e Sketcher: move icons to elements and pointers subdirectories
Add the icon paths to the workbench's `InitGui.py`.
2020-10-01 09:59:26 +02:00
vocx-fc
e0604d05ef Sketcher: move icons to constraints subdirectory
Add the icon path to the workbench's `InitGui.py`.
2020-10-01 09:59:26 +02:00
vocx-fc
748c387607 Sketcher: move icons to obsolete subdirectory
Icons not used in the source code, but which may be kept for historical
reasons, or in case they are used in the future.
2020-10-01 09:59:26 +02:00
vocx-fc
273e6a30ae Sketcher: small style changes to make the lines shorter 2020-10-01 09:59:26 +02:00
vocx-fc
ec0acf44f1 Sketcher: rename constraint icons to be more consistent with the rest
`Sketcher_ConstrainBlock` to `Constraint_Block`.
`Sketcher_ConstrainLock` to `Constraint_Lock`, and the corresponding
`_Driven` variant.

Adjust the icons in the taskpanel for the sketcher constraints,
elements, and for the action menu for constraints.

Adjust the icon order in the `Sketcher.qrc` resource file.
2020-10-01 09:59:26 +02:00
wmayer
2b49d60ac5 Sketcher: [skip ci] fix build failure 2020-10-01 08:10:28 +02:00
John Yani
893fd13b99 HiDPI: Hot point scaling is only required for X11 2020-09-30 22:31:43 +02:00
Yorik van Havre
c2cec2c38a Merged crowdin translations 2020-09-30 14:37:02 +02:00
Yorik van Havre
545055f65f Updated ts files 2020-09-30 13:06:53 +02:00
wmayer
e2d0bf2c3a Sketcher: [skip ci] fix computing of hotspot of XPM icons on Windows/macOS
Add a cross to copy and array icons.
2020-09-27 12:06:26 +02:00
wmayer
f752814e1a Sketcher: [skip ci] fix inconsistent indentations in SketchObject::rebuildExternalGeometry 2020-09-24 11:32:22 +02:00
shermelin
de28f074e1 Projections of arcs of circle, orthogonal case
Implementation when circle plane orthogonal to projection plane.
2020-09-24 11:22:58 +02:00
wmayer
bb657cd425 Sketcher: [skip ci] fix undo bug when directly changing a datum constraint in the property editor 2020-09-23 16:59:23 +02:00
wmayer
5956f41e5d Sketcher: [skip ci] fix computing of hotspot of sketcher icons on macOS 2020-09-23 11:31:17 +02:00
Vanuan
590e1ccac1 HiDPI: Change Sketcher crosshair hot spot xy
See https://forum.freecadweb.org/viewtopic.php?p=432021#p432021
2020-09-23 09:55:41 +02:00
wmayer
95d03c8d92 Sketcher: [skip ci] fix computing of hotspot of sketcher icons on Windows 2020-09-21 16:32:25 +02:00