zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Add constraining multiple points coincident

pull/1330/head
77maxikov 2023-01-03 00:23:11 +03:00 committed by ruevs
parent 6487fb890e
commit 7b6a85da5a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/constraint.cpp
View File

@ -270,11 +270,13 @@ void Constraint::MenuConstrain(Command id) {
} }
case Command::ON_ENTITY: case Command::ON_ENTITY:
if(gs.points == 2 && gs.n == 2) { if(gs.points >= 2 && gs.points == gs.n) {
c.type = Type::POINTS_COINCIDENT; c.type = Type::POINTS_COINCIDENT;
c.ptA = gs.point[0]; c.ptA = gs.point[0];
c.ptB = gs.point[1]; for(int k = 1; k < gs.points; k++) {
c.ptB = gs.point[k];
newcons.push_back(c); newcons.push_back(c);
}
} else if(gs.points == 1 && gs.workplanes == 1 && gs.n == 2) { } else if(gs.points == 1 && gs.workplanes == 1 && gs.n == 2) {
c.type = Type::PT_IN_PLANE; c.type = Type::PT_IN_PLANE;
c.ptA = gs.point[0]; c.ptA = gs.point[0];
@ -300,7 +302,7 @@ void Constraint::MenuConstrain(Command id) {
} else { } else {
Error(_("Bad selection for on point / curve / plane constraint. " Error(_("Bad selection for on point / curve / plane constraint. "
"This constraint can apply to:\n\n" "This constraint can apply to:\n\n"
" * two points (points coincident)\n" " * two or more points (points coincident)\n"
" * a point and a workplane (point in plane)\n" " * a point and a workplane (point in plane)\n"
" * a point and a line segment (point on line)\n" " * a point and a line segment (point on line)\n"
" * a point and a circle or arc (point on curve)\n" " * a point and a circle or arc (point on curve)\n"