suzanne.soy/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auto-remove point-on-line constraints when at-midpoint constraints

Browse Source 
are added. There was already precedent for that, since I
auto-remove horiz/vert constraints when symmetry constraints are
added.

[git-p4: depot-paths = "//depot/solvespace/": change = 1875]
This commit is contained in:
Jonathan Westhues 2008-09-06 13:36:31 -08:00
parent 92f55dd195
commit 816a1ee8b4
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
constraint.cpp
View File

@ -44,6 +44,29 @@ char *Constraint::DescriptionString(void) {
return ret; return ret;
} }
//-----------------------------------------------------------------------------
// Delete all constraints with the specified type, entityA, ptA. We use this
// when auto-removing constraints that would become redundant.
//-----------------------------------------------------------------------------
void Constraint::DeleteAllConstraintsFor(int type, hEntity entityA, hEntity ptA)
{
SS.constraint.ClearTags();
for(int i = 0; i < SS.constraint.n; i++) {
Constraint *ct = &(SS.constraint.elem[i]);
if(ct->type != type) continue;
if(ct->entityA.v != entityA.v) continue;
if(ct->ptA.v != ptA.v) continue;
ct->tag = 1;
}
SS.constraint.RemoveTagged();
// And no need to do anything special, since nothing
// ever depends on a constraint. But do clear the
// hover, in case the just-deleted constraint was
// hovered.
SS.GW.hover.Clear();
}
void Constraint::AddConstraint(Constraint *c) { void Constraint::AddConstraint(Constraint *c) {
AddConstraint(c, true); AddConstraint(c, true);
} }
@ -270,6 +293,10 @@ void Constraint::MenuConstrain(int id) {
c.type = AT_MIDPOINT; c.type = AT_MIDPOINT;
c.entityA = gs.entity[0]; c.entityA = gs.entity[0];
c.ptA = gs.point[0]; c.ptA = gs.point[0];
// If a point is at-midpoint, then no reason to also constrain
// it on-line; so auto-remove that.
DeleteAllConstraintsFor(PT_ON_LINE, c.entityA, c.ptA);
} else if(gs.lineSegments == 1 && gs.workplanes == 1 && gs.n == 2) { } else if(gs.lineSegments == 1 && gs.workplanes == 1 && gs.n == 2) {
c.type = AT_MIDPOINT; c.type = AT_MIDPOINT;
int i = SS.GetEntity(gs.entity[0])->IsWorkplane() ? 1 : 0; int i = SS.GetEntity(gs.entity[0])->IsWorkplane() ? 1 : 0;
@ -360,21 +387,11 @@ void Constraint::MenuConstrain(int id) {
if(gs.lineSegments == 1) { if(gs.lineSegments == 1) {
// If this line segment is already constrained horiz or // If this line segment is already constrained horiz or
// vert, then auto-remove that redundant constraint. // vert, then auto-remove that redundant constraint.
SS.constraint.ClearTags(); DeleteAllConstraintsFor(HORIZONTAL, (gs.entity[0]),
for(int i = 0; i < SS.constraint.n; i++) { Entity::NO_ENTITY);
Constraint *ct = &(SS.constraint.elem[i]); DeleteAllConstraintsFor(VERTICAL, (gs.entity[0]),
if(ct->type != HORIZONTAL && ct->type != VERTICAL) { Entity::NO_ENTITY);
continue;
}
if(ct->entityA.v != (gs.entity[0]).v) continue;
ct->tag = 1;
}
SS.constraint.RemoveTagged();
// And no need to do anything special, since nothing
// ever depends on a constraint. But do clear the
// hover, in case the just-deleted constraint was
// hovered.
SS.GW.hover.Clear();
} }
} else { } else {
// Symmetry with a symmetry plane specified explicitly. // Symmetry with a symmetry plane specified explicitly.

2
sketch.h
View File

@ -509,6 +509,8 @@ public:
static void AddConstraint(Constraint *c); static void AddConstraint(Constraint *c);
static void MenuConstrain(int id); static void MenuConstrain(int id);
static void DeleteAllConstraintsFor(int type, hEntity entityA, hEntity ptA);
struct { struct {
bool drawing; bool drawing;
Point2d mp; Point2d mp;