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

Fix creation of workplane based on a workplane. 

This fixes functionality introduced by commit 3c45158, which did not
take into account reference groups.
single-window
whitequark 2016-11-17 15:51:19 +00:00
parent c97ba6b928
commit e56630e71d
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/group.cpp
View File

@ -121,17 +121,25 @@ void Group::MenuGroup(Command id) {
if(SS.GW.projRight.Dot(ut) < 0) g.predef.negateU = true; if(SS.GW.projRight.Dot(ut) < 0) g.predef.negateU = true;
if(SS.GW.projUp. Dot(vt) < 0) g.predef.negateV = true; if(SS.GW.projUp. Dot(vt) < 0) g.predef.negateV = true;
} else if(gs.workplanes == 1 && gs.n == 1) { } else if(gs.workplanes == 1 && gs.n == 1) {
Group *wrkplg = SK.GetGroup(gs.entity[0].group()); if(gs.entity[0].request().IsFromReferences()) {
g.subtype = wrkplg->subtype; Entity *wrkpl = SK.GetEntity(gs.entity[0]);
g.predef.origin = wrkplg->predef.origin; Entity *normal = SK.GetEntity(wrkpl->normal);
if (wrkplg->subtype == Subtype::WORKPLANE_BY_LINE_SEGMENTS) { g.subtype = Subtype::WORKPLANE_BY_POINT_ORTHO;
g.predef.entityB = wrkplg->predef.entityB; g.predef.origin = wrkpl->point[0];
g.predef.entityC = wrkplg->predef.entityC; g.predef.q = normal->NormalGetNum();
g.predef.swapUV = wrkplg->predef.swapUV;
g.predef.negateU = wrkplg->predef.negateU;
g.predef.negateV = wrkplg->predef.negateV;
} else { } else {
g.predef.q = wrkplg->predef.q; Group *wrkplg = SK.GetGroup(gs.entity[0].group());
g.subtype = wrkplg->subtype;
g.predef.origin = wrkplg->predef.origin;
if(wrkplg->subtype == Subtype::WORKPLANE_BY_LINE_SEGMENTS) {
g.predef.entityB = wrkplg->predef.entityB;
g.predef.entityC = wrkplg->predef.entityC;
g.predef.swapUV = wrkplg->predef.swapUV;
g.predef.negateU = wrkplg->predef.negateU;
g.predef.negateV = wrkplg->predef.negateV;
} else if(wrkplg->subtype == Subtype::WORKPLANE_BY_POINT_ORTHO) {
g.predef.q = wrkplg->predef.q;
} else ssassert(false, "Unexpected workplane subtype");
} }
} else { } else {
Error("Bad selection for new sketch in workplane. This " Error("Bad selection for new sketch in workplane. This "