Commit Graph

884 Commits

Author SHA1 Message Date
Mateusz Skowroński
d7541bcd28 QStyleOptionViewItemV4 is deprecated in Qt5. Replace it with QStyleOptionViewItem. 2017-02-12 05:46:07 +01:00
AjinkyaDahale
cc46acf10e [Sketcher] Moved radius to constraint mode framework 2017-02-10 17:32:18 +01:00
AjinkyaDahale
3d9b46d9f3 [Sketcher] corrected artifact introduced by faulty conflict resolution 2017-02-10 17:32:18 +01:00
AjinkyaDahale
3cf00a1314 [Sketcher] Moved distance to constraint mode 2017-02-10 17:32:18 +01:00
AjinkyaDahale
47624cf3e1 Moved vertical and horizontal distance to constraint creation mode 2017-02-10 17:32:18 +01:00
AjinkyaDahale
5ff6895080 Moved symmetric to general constrain creation mode framework
That makes all of the non-dimensioned constraints
2017-02-10 17:32:18 +01:00
AjinkyaDahale
45cb028f34 Moved equal to general constrain creation mode framework 2017-02-10 17:32:18 +01:00
AjinkyaDahale
adc13eda06 Move tangent to general constraint mode framework 2017-02-10 17:32:18 +01:00
AjinkyaDahale
df658ae889 Replace some of the allowedSelSequences with more general form
Greatly shortens the number of sequenses needed if you replace SelVertex
and SelRoot with SelVertexOrRoot and similar for the edges/axes.
For e.g. implemented sequences for perpendicular dropped from the older
25 to now 6.
2017-02-10 17:32:18 +01:00
Alexander Gryson
6fde63273c Integrate forum feedback on icons 2017-02-05 21:58:13 +01:00
wmayer
17a3d1e81f fix warnings: -Wmaybe-uninitialized 2017-02-04 15:16:47 +01:00
wmayer
33e0bc3a46 fix various warnings 2017-02-02 20:42:56 +01:00
Abdullah Tahiri
66982e21bd Sketcher: Polyline continuous mode support 2017-02-02 10:42:38 +01:00
Abdullah Tahiri
b708957080 Sketcher: BSpline deletion/special hideunused internal geometry
===============================================================

The implementation of BSpline differs from previous complex forms.

The BSpline is created constraint to be polynomic (non-rational), with radius of first circle and equality constraints.

Hide unused internal geometry considers as unused the following constraints:
- A pole which has equality constraints with another pole of the same bspline
- Any radius constraint on a pole

Deletion of a BSpline will delete the internal geometry that is unused as per the definition above.

If there is another constraint (other than the Internal alignment constraint) it will leave the internal geometry having such constraint undeleted.
2017-02-02 10:42:38 +01:00
AjinkyaDahale
e8c822c93e Changes based on wwmayer's comments 2017-01-31 17:07:45 +01:00
AjinkyaDahale
fb2cd4d7b3 Moved Perpendicular to constraint mode framework
A couple of combinations, endpoint-endpoint and endpoint-curve, do not
work, and the latter probably should not work ever since endpoint-curve-
curve exists.
2017-01-31 17:07:45 +01:00
AjinkyaDahale
5e997fed02 Brought back select then constraint for all constraint tools yet converted 2017-01-31 17:07:45 +01:00
AjinkyaDahale
a881d30a70 Miscellaneous changes to constraint creation modes
Parallel constraints can also be made by select-then-constraint way.
Preliminary preparations for perpendicular constraint making mode.
Selection actually works when for constraints involving multiple
elements few of them are selected (thanks abdullah).
etc.
2017-01-31 17:07:45 +01:00
Abdullah Tahiri
9ec7bd4650 Sketcher: Fixing Green selection on new style constraints 2017-01-31 17:07:45 +01:00
AjinkyaDahale
a39d2545a6 Moved point on object to general constraint mode framework 2017-01-31 17:07:45 +01:00
AjinkyaDahale
643e61ccf6 Moved parallel to general constraint mode framework 2017-01-31 17:07:45 +01:00
AjinkyaDahale
180772b7ee Moved coincident and vertical to general constraint mode framework 2017-01-31 17:07:45 +01:00
AjinkyaDahale
dad03ca347 Moved CmdSketcherConstrainLock to general constraint mode framework 2017-01-31 17:07:45 +01:00
AjinkyaDahale
4ad41e1ad1 Generalize DrawSketchHandlerGenConstraint::releaseButton
The select-then-constrain method has been temporarily sacrificed
2017-01-31 17:07:45 +01:00
AjinkyaDahale
99f93f357b CmdSketcherConstraint::applyConstraint() is now used in DrawSketchHandlerGenConstraint 2017-01-31 17:07:45 +01:00
AjinkyaDahale
61324d8887 Initial commit with DrawSketchHandlerGenConstraint
Plus made CmdSketcherConstrainHorizontal subclass of
CmdSketcherConstraint, and made it use DrawSketchHandlerGenConstraint.
2017-01-31 17:07:45 +01:00
AjinkyaDahale
583bb48ad4 Replace All SelectionFilterGates in Constraint Modes by GenericConstraintSelection 2017-01-31 17:07:45 +01:00
AjinkyaDahale
b2c5e84e5d Addition to CmdSketcherConstraint and GenericConstraintSelection
Also making CmdSketcherConstrainLock a subclass of CmdSketcherConstraint
2017-01-31 17:07:45 +01:00
AjinkyaDahale
93cb552d2f Coincident constraint mode works on root (origin) too 2017-01-31 17:07:45 +01:00
AjinkyaDahale
3f02c72f85 Skeleton of general CmdSketcherConstraint Class 2017-01-31 17:07:45 +01:00
Alexander Gryson
ab196b5f8d Correct outline color in sketcher icon
The select constraint icon incorrectly showed icon as having an orange outline. This was corrected, but after merge of PR.
2017-01-29 20:21:22 +01:00
Abdullah Tahiri
9725be8686 Sketcher: Documentation of delete functions 2017-01-29 00:25:34 +01:00
Abdullah Tahiri
0edf17245c Sketcher: Fix deletion of geometry having internal geometry inserted before the geometry 2017-01-28 23:08:27 +01:00
Alexander Gryson
9512b463bf Update Metadata 2017-01-28 09:29:20 +01:00
Alexander Gryson
f254987a87 Update xpm icons 2017-01-28 09:29:19 +01:00
Alexander Gryson
0746a8ed9e Align Sketcher Workbench icons to guidelines 2017-01-28 09:29:19 +01:00
wwmayer
9b49777700 Merge pull request #475 from abdullahtahiriyo/bspline_stage1b_2017_firstdeliverable
Bspline stage1b 2017 firstdeliverable
2017-01-27 18:20:16 +01:00
Abdullah Tahiri
80e7ece429 Sketcher: BSpline - avoid tiny circles on removal of equality 2017-01-26 23:41:02 +01:00
Abdullah Tahiri
6ad51826d4 Sketcher: BSpline Creation - as single command for one-step undo 2017-01-26 21:31:03 +01:00
Abdullah Tahiri
bad73abe84 Sketcher: BSpline Creation fix - Remove introduced pole if creation cancelled 2017-01-26 21:31:03 +01:00
Abdullah Tahiri
cc31dac143 Sketcher: BSpline Creation improvement - Add constraints by groups 2017-01-26 21:31:03 +01:00
Abdullah Tahiri
ec8c514547 Sketcher: BSpline Creation acceleration - pole constraining on pole creation 2017-01-26 21:31:02 +01:00
Abdullah Tahiri
38fc7071c7 Sketcher: BSpline Creation solver call reduction 2017-01-26 21:31:02 +01:00
Abdullah Tahiri
bdc81aae2e Sketcher: BSpline Creation - pole circle on click
=================================================

This method creates the pole circles on every click. This allows to properly detect the closing of the curve
2017-01-26 21:31:02 +01:00
Abdullah Tahiri
f4a882093b Sketcher: InternalAligment Python extension to InternalAlignmentIndex
=====================================================================

Extension of Constraint Python code to consider the case with 4 ints, where the last int is InternalAligmentIndex for InternalAligment constraint
2017-01-26 21:31:02 +01:00
wmayer
43e8c21743 issue #0002816: Trimming tool crashes 2017-01-23 19:06:48 +01:00
Abdullah Tahiri
c43b39d001 Sketcher: BSpline creation mode end on right-click
==================================================

Now the BSpline ends with right-click, but creates the BSpline if at least two poles have been entered.

If continous creation mode is enabled, then it only exits when right-clicking without having entered any pole.
2017-01-22 00:38:23 +01:00
wmayer
ad57478ab4 fix a couple of compiler warnings 2017-01-20 22:54:10 +01:00
wmayer
f5c0f579cb write consistently 'B-spline' in menus and tooltips 2017-01-20 20:59:32 +01:00
wmayer
62b4782ed6 Several fixes:
+ use different iterator variable for nexted loops
+ avoid loss of data warnings
+ improve layout
2017-01-20 19:40:49 +01:00