Commit Graph

136 Commits

Author SHA1 Message Date
Abdullah Tahiri
6f46ce747b Sketcher: Enable reuse of constraint helper functions in other toolbars
=======================================================================

bool checkBothExternal(int GeoId1, int GeoId2);
void getIdsFromName(const std::string &name, const Sketcher::SketchObject* Obj, int &GeoId, Sketcher::PointPos &PosId);
bool inline isVertex(int GeoId, Sketcher::PointPos PosId);
bool inline isEdge(int GeoId, Sketcher::PointPos PosId);
bool isSimpleVertex(const Sketcher::SketchObject* Obj, int GeoId, Sketcher::PointPos PosId);
bool IsPointAlreadyOnCurve(int GeoIdCurve, int GeoIdPoint, Sketcher::PointPos PosIdPoint, Sketcher::SketchObject* Obj);
2017-04-08 12:58:06 +02:00
wmayer
74f7d9fd65 set continuous constraint mode consistently to true by default 2017-02-24 16:30:13 +01:00
wmayer
d6b8609c63 add missing word, fix layout 2017-02-24 16:24:24 +01:00
AjinkyaDahale
f5fc2b2bce Sketcher: costraint creation mode uses toolbar icons 2017-02-24 15:20:26 +01:00
AjinkyaDahale
286e71074a Sketcher: Added option to turn constraint creation modes on/off
Can be found below geometry creation "continous mode" option
2017-02-24 15:20:26 +01:00
AjinkyaDahale
10d9a6ec05 Sketcher: External edges in constraint modes (Symmetry) 2017-02-24 15:20:26 +01:00
AjinkyaDahale
0d96f0ca97 Sketcher: External edges in constraint modes (Angle) 2017-02-24 15:20:26 +01:00
AjinkyaDahale
9feaf8340f Sketcher: External edges in constraint modes (Equal) 2017-02-24 15:20:26 +01:00
AjinkyaDahale
f94ed49150 Sketcher: External edges in constraint modes (radius) 2017-02-24 15:20:26 +01:00
AjinkyaDahale
ca00469460 Sketcher: External edges in constraint modes (tangent) 2017-02-24 15:20:26 +01:00
AjinkyaDahale
f9857f0427 Sketcher: External edges in constraint modes (perpendicular) 2017-02-24 15:20:26 +01:00
AjinkyaDahale
4dfde986cf Sketcher: External edges in constraint modes (parallel) 2017-02-24 15:20:26 +01:00
AjinkyaDahale
e8c4c4d6fc Sketcher: External edges in constraint modes (DistanceX/Y) 2017-02-24 15:20:26 +01:00
AjinkyaDahale
350094a000 Sketcher: External edges in constraint modes (point on object) 2017-02-24 15:20:26 +01:00
AjinkyaDahale
e580727c1f Sketcher: External edges in constraint modes (distance) 2017-02-24 15:20:26 +01:00
AjinkyaDahale
f1dd824e78 [Sketcher] Moved angle to constraint creation mode
plus some cosmetic changes
2017-02-24 15:20:26 +01:00
Abdullah Tahiri
b714d50017 Sketcher: Information layer scenography update on geometry change 2017-02-21 13:24:10 +01:00
AjinkyaDahale
21535ec532 [Sketcher] Moved radius to constraint mode framework 2017-02-10 17:32:18 +01:00
AjinkyaDahale
49225c063f [Sketcher] corrected artifact introduced by faulty conflict resolution 2017-02-10 17:32:18 +01:00
AjinkyaDahale
5bb2a74701 [Sketcher] Moved distance to constraint mode 2017-02-10 17:32:18 +01:00
AjinkyaDahale
3b0936bc03 Moved vertical and horizontal distance to constraint creation mode 2017-02-10 17:32:18 +01:00
AjinkyaDahale
62c9dc0f10 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
aca3164ef6 Moved equal to general constrain creation mode framework 2017-02-10 17:32:18 +01:00
AjinkyaDahale
2c4ccfbc61 Move tangent to general constraint mode framework 2017-02-10 17:32:18 +01:00
AjinkyaDahale
689e6bf367 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
wmayer
81726f7db9 fix warnings: -Wmaybe-uninitialized 2017-02-04 15:16:47 +01:00
wmayer
a7539e2c97 fix various warnings 2017-02-02 20:42:56 +01:00
AjinkyaDahale
c00a627397 Changes based on wwmayer's comments 2017-01-31 17:07:45 +01:00
AjinkyaDahale
8a911f3ef3 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
ccfc4d943a Brought back select then constraint for all constraint tools yet converted 2017-01-31 17:07:45 +01:00
AjinkyaDahale
00ca4d3a36 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
16c87a5e11 Sketcher: Fixing Green selection on new style constraints 2017-01-31 17:07:45 +01:00
AjinkyaDahale
994b8a7fd3 Moved point on object to general constraint mode framework 2017-01-31 17:07:45 +01:00
AjinkyaDahale
63323ec85a Moved parallel to general constraint mode framework 2017-01-31 17:07:45 +01:00
AjinkyaDahale
de0301dc66 Moved coincident and vertical to general constraint mode framework 2017-01-31 17:07:45 +01:00
AjinkyaDahale
f2fbd8ba2b Moved CmdSketcherConstrainLock to general constraint mode framework 2017-01-31 17:07:45 +01:00
AjinkyaDahale
d1eab78b93 Generalize DrawSketchHandlerGenConstraint::releaseButton
The select-then-constrain method has been temporarily sacrificed
2017-01-31 17:07:45 +01:00
AjinkyaDahale
c4675b521c CmdSketcherConstraint::applyConstraint() is now used in DrawSketchHandlerGenConstraint 2017-01-31 17:07:45 +01:00
AjinkyaDahale
3b5c72357c Initial commit with DrawSketchHandlerGenConstraint
Plus made CmdSketcherConstrainHorizontal subclass of
CmdSketcherConstraint, and made it use DrawSketchHandlerGenConstraint.
2017-01-31 17:07:45 +01:00
AjinkyaDahale
d326c9e018 Replace All SelectionFilterGates in Constraint Modes by GenericConstraintSelection 2017-01-31 17:07:45 +01:00
AjinkyaDahale
24215170fc Addition to CmdSketcherConstraint and GenericConstraintSelection
Also making CmdSketcherConstrainLock a subclass of CmdSketcherConstraint
2017-01-31 17:07:45 +01:00
AjinkyaDahale
7718dd9aea Coincident constraint mode works on root (origin) too 2017-01-31 17:07:45 +01:00
AjinkyaDahale
137db465db Skeleton of general CmdSketcherConstraint Class 2017-01-31 17:07:45 +01:00
wmayer
d065c2fe5b fix whitespaces 2017-01-20 19:22:50 +01:00
abdullahtahiriyo
8d9af6f203 Merge branch 'master' into bspline_2017 2017-01-18 22:48:27 +01:00
Abdullah Tahiri
84041c0e50 Sketcher: BSpline SnellsLaw - unsupported 2017-01-15 22:34:14 +01:00
Abdullah Tahiri
6bf7d4d6c9 Sketcher: BSpline point-on-object - unsupported 2017-01-15 22:29:21 +01:00
AjinkyaDahale
4c001f40f3 Horizontal and Vertical Constraint creation modes 2017-01-15 17:00:45 +01:00
Abdullah Tahiri
6f09b31456 Sketcher: BSpline - Equality not supported user indication 2017-01-15 01:40:04 +01:00
Abdullah Tahiri
8f4eaf7587 Sketcher: BSpline - UI Perpendicularity 2017-01-15 01:27:46 +01:00