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

allow equal angle constraints when 3 or 4 lines selected. Variadic constraints broke this feature by make equal length lines in those cases.

Browse Source
This commit is contained in:
phkahler 2023-01-06 20:44:51 -05:00 committed by Paul Kahler
parent 3833dd0246
commit a71e4bef81
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/constraint.cpp
View File

@ -312,7 +312,21 @@ void Constraint::MenuConstrain(Command id) {
break; break;
case Command::EQUAL: case Command::EQUAL:
if(gs.lineSegments >= 2 && gs.lineSegments == gs.n) { if(gs.vectors == 3 && gs.n == 3) {
c.type = Type::EQUAL_ANGLE;
c.entityA = gs.vector[0];
c.entityB = gs.vector[1];
c.entityC = gs.vector[1];
c.entityD = gs.vector[2];
newcons.push_back(c);
} else if(gs.vectors == 4 && gs.n == 4) {
c.type = Type::EQUAL_ANGLE;
c.entityA = gs.vector[0];
c.entityB = gs.vector[1];
c.entityC = gs.vector[2];
c.entityD = gs.vector[3];
newcons.push_back(c);
} else if(gs.lineSegments >= 2 && gs.lineSegments == gs.n) {
c.type = Type::EQUAL_LENGTH_LINES; c.type = Type::EQUAL_LENGTH_LINES;
c.entityA = gs.entity[0]; c.entityA = gs.entity[0];
for (std::vector<hEntity>::size_type k = 1;k < gs.entity.size(); ++k){ for (std::vector<hEntity>::size_type k = 1;k < gs.entity.size(); ++k){
@ -341,20 +355,6 @@ void Constraint::MenuConstrain(Command id) {
c.entityB = gs.entity[1]; c.entityB = gs.entity[1];
c.ptA = gs.point[0]; c.ptA = gs.point[0];
newcons.push_back(c); newcons.push_back(c);
} else if(gs.vectors == 4 && gs.n == 4) {
c.type = Type::EQUAL_ANGLE;
c.entityA = gs.vector[0];
c.entityB = gs.vector[1];
c.entityC = gs.vector[2];
c.entityD = gs.vector[3];
newcons.push_back(c);
} else if(gs.vectors == 3 && gs.n == 3) {
c.type = Type::EQUAL_ANGLE;
c.entityA = gs.vector[0];
c.entityB = gs.vector[1];
c.entityC = gs.vector[1];
c.entityD = gs.vector[2];
newcons.push_back(c);
} else if(gs.circlesOrArcs >= 2 && gs.circlesOrArcs == gs.n) { } else if(gs.circlesOrArcs >= 2 && gs.circlesOrArcs == gs.n) {
c.type = Type::EQUAL_RADIUS; c.type = Type::EQUAL_RADIUS;
c.entityA = gs.entity[0]; c.entityA = gs.entity[0];