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

Use N for equal angle constraints. Allows 3 or 4 line segments to be set equal length all at once.

Browse Source
This commit is contained in:
phkahler 2023-01-10 16:17:57 -05:00
parent 10cb310f18
commit 20e3d15f90
1 changed files with 14 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,21 +312,7 @@ void Constraint::MenuConstrain(Command id) {
break; break;
case Command::EQUAL: case Command::EQUAL:
if(gs.vectors == 3 && gs.n == 3) { if(gs.lineSegments >= 2 && gs.lineSegments == gs.n) {
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){
@ -716,7 +702,19 @@ void Constraint::MenuConstrain(Command id) {
case Command::ANGLE: case Command::ANGLE:
case Command::REF_ANGLE: { case Command::REF_ANGLE: {
if(gs.vectors == 2 && gs.n == 2) { 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];
} 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];
} else if(gs.vectors == 2 && gs.n == 2) {
c.type = Type::ANGLE; c.type = Type::ANGLE;
c.entityA = gs.vector[0]; c.entityA = gs.vector[0];
c.entityB = gs.vector[1]; c.entityB = gs.vector[1];