kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Part: Attacher3D: new modes - align axes

Browse Source 
New attachment modes:
"Align O-Z-X"
"Align O-Z-Y"
"Align O-X-Y"
"Align O-X-Z"
"Align O-Y-Z"
"Align O-Y-X"
They allow to attach a sketch by picking origin point and sketch axes
directions.
This commit is contained in:
DeepSOIC
2017-09-03 02:49:44 +03:00
committed by wmayer
parent 96f3f0fa26
commit 0f92c3e559
3 changed files with 139 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/Mod/Part/App/Attacher.cpp
View File

@@ -122,6 +122,13 @@ const char* AttachEngine::eMapModeStrings[]= {
"FaceNormal",
"OZX",
"OZY",
"OXY",
"OXZ",
"OYZ",
"OYX",
NULL};
//this list must be in sync with eRefType enum.
@@ -943,6 +950,17 @@ AttachEngine3D::AttachEngine3D()
modeRefTypes[mmThreePointsPlane].push_back(s);
modeRefTypes[mmThreePointsNormal].push_back(s);
//------------origin-axis-axis modes
for (int mmode = mmOZX; mmode <= mmOYX; ++mmode){
modeRefTypes[mmode].push_back(cat(rtVertex, rtVertex, rtVertex));
modeRefTypes[mmode].push_back(cat(rtVertex, rtVertex, rtLine));
modeRefTypes[mmode].push_back(cat(rtVertex, rtLine, rtVertex));
modeRefTypes[mmode].push_back(cat(rtVertex, rtLine, rtLine));
modeRefTypes[mmode].push_back(cat(rtVertex, rtVertex));
modeRefTypes[mmode].push_back(cat(rtVertex, rtLine));
}
modeRefTypes[mmFolding].push_back(cat(rtLine, rtLine, rtLine, rtLine));
this->EnableAllSupportedModes();
@@ -1448,6 +1466,84 @@ Base::Placement AttachEngine3D::calculateAttachedPlacement(Base::Placement origP
SketchBasePoint = p;
} break;
case mmOZX:
case mmOZY:
case mmOXY:
case mmOXZ:
case mmOYZ:
case mmOYX: {
const char orderStrings[6][4] = {
"ZXY",
"ZYX",
"XYZ",
"XZY",
"YZX",
"YXZ",
};
const char* orderString = orderStrings[mmode - mmOZX];
enum dirIndex {
X,
Y,
Z
};
int order[3];
for(int i = 0; i < 3; ++i){
order[i] = orderString[i] - 'X';
}
if (shapes.size() < 2)
THROWM(Base::ValueError, "AttachEngine3D::calculateAttachedPlacement: not enough shapes linked (at least two are required).");
gp_Vec dirs[3];
//read out origin
if (shapes[0]->IsNull())
THROWM(Base::TypeError, "AttachEngine3D::calculateAttachedPlacement: null shape!")
if (shapes[0]->ShapeType() != TopAbs_VERTEX)
THROWM(Base::TypeError, "AttachEngine3D::calculateAttachedPlacement: first reference must be a vertex, it's not")
SketchBasePoint = BRep_Tool::Pnt(TopoDS::Vertex(*(shapes[0])));
//read out axes directions
for(int i = 1; i < 3 && i < shapes.size(); ++i){
if (shapes[i]->IsNull())
THROWM(Base::TypeError, "AttachEngine3D::calculateAttachedPlacement: null shape!")
if (shapes[i]->ShapeType() == TopAbs_VERTEX){
gp_Pnt p = BRep_Tool::Pnt(TopoDS::Vertex(*(shapes[i])));
dirs[order[i-1]] = gp_Vec(SketchBasePoint, p);
} else if (shapes[i]->ShapeType() == TopAbs_EDGE){
const TopoDS_Edge &e = TopoDS::Edge(*(shapes[i]));
BRepAdaptor_Curve crv(e);
double u1 = crv.FirstParameter();
double u2 = crv.LastParameter();
if ( Precision::IsInfinite(u1)
|| Precision::IsInfinite(u2) ){
u1 = 0.0;
u2 = 1.0;
}
gp_Pnt p1 = crv.Value(u1);
gp_Pnt p2 = crv.Value(u2);
dirs[order[i-1]] = gp_Vec(p1,p2);
}
}
//make the placement
Base::Rotation rot =
Base::Rotation::makeRotationByAxes(
Base::Vector3d(dirs[0].X(), dirs[0].Y(), dirs[0].Z()),
Base::Vector3d(dirs[1].X(), dirs[1].Y(), dirs[1].Z()),
Base::Vector3d(dirs[2].X(), dirs[2].Y(), dirs[2].Z()),
orderString
);
if(this->mapReverse){
rot = rot * Base::Rotation(Base::Vector3d(0,1,0),180);
}
Base::Placement plm =
Base::Placement(Base::Vector3d(SketchBasePoint.X(), SketchBasePoint.Y(), SketchBasePoint.Z()), rot);
plm *= this->superPlacement;
return plm;
} break;
default:
throwWrongMode(mmode);
}//switch (MapMode)

7
src/Mod/Part/App/Attacher.h
View File

@@ -101,6 +101,13 @@ enum eMapMode {
mm1FaceNormal,
mmOZX,
mmOZY,
mmOXY,
mmOXZ,
mmOYZ,
mmOYX,
mmDummy_NumberOfModes//a value useful to check the validity of mode value
};//see also eMapModeStrings[] definition in .cpp

36
src/Mod/Part/Gui/AttacherTexts.cpp
View File

@@ -97,6 +97,24 @@ TextSet getUIStrings(Base::Type attacherType, eMapMode mmode)
case mmInertialCS:
return TwoStrings(qApp->translate("Attacher3D", "Inertial CS","Attachment3D mode caption"),
qApp->translate("Attacher3D", "Inertial coordinate system, constructed on principal axes of inertia and center of mass.","Attachment3D mode tooltip"));
case mmOZX:
return TwoStrings(qApp->translate("Attacher3D", "Align O-Z-X","Attachment3D mode caption"),
qApp->translate("Attacher3D", "Match origin with first Vertex. Align Z' and X' axes towards vertex/along line.","Attachment3D mode tooltip"));
case mmOZY:
return TwoStrings(qApp->translate("Attacher3D", "Align O-Z-Y","Attachment3D mode caption"),
qApp->translate("Attacher3D", "Match origin with first Vertex. Align Z' and Y' axes towards vertex/along line.","Attachment3D mode tooltip"));
case mmOXY:
return TwoStrings(qApp->translate("Attacher3D", "Align O-X-Y","Attachment3D mode caption"),
qApp->translate("Attacher3D", "Match origin with first Vertex. Align X' and Y' axes towards vertex/along line.","Attachment3D mode tooltip"));
case mmOXZ:
return TwoStrings(qApp->translate("Attacher3D", "Align O-X-Z","Attachment3D mode caption"),
qApp->translate("Attacher3D", "Match origin with first Vertex. Align X' and Z' axes towards vertex/along line.","Attachment3D mode tooltip"));
case mmOYZ:
return TwoStrings(qApp->translate("Attacher3D", "Align O-Y-Z","Attachment3D mode caption"),
qApp->translate("Attacher3D", "Match origin with first Vertex. Align Y' and Z' axes towards vertex/along line.","Attachment3D mode tooltip"));
case mmOYX:
return TwoStrings(qApp->translate("Attacher3D", "Align O-Y-X","Attachment3D mode caption"),
qApp->translate("Attacher3D", "Match origin with first Vertex. Align Y' and X' axes towards vertex/along line.","Attachment3D mode tooltip"));
default:
break;
}
@@ -154,6 +172,24 @@ TextSet getUIStrings(Base::Type attacherType, eMapMode mmode)
case mmInertialCS:
return TwoStrings(qApp->translate("Attacher2D", "Inertia 2-3","AttachmentPlane mode caption"),
qApp->translate("Attacher2D", "Plane constructed on second and third principal axes of inertia (passes through center of mass).","AttachmentPlane mode tooltip"));
case mmOZX:
return TwoStrings(qApp->translate("Attacher3D", "Align O-N-X","Attachment3D mode caption"),
qApp->translate("Attacher3D", "Match origin with first Vertex. Align normal and horizontal plane axis towards vertex/along line.","Attachment3D mode tooltip"));
case mmOZY:
return TwoStrings(qApp->translate("Attacher3D", "Align O-N-Y","Attachment3D mode caption"),
qApp->translate("Attacher3D", "Match origin with first Vertex. Align normal and vertical plane axis towards vertex/along line.","Attachment3D mode tooltip"));
case mmOXY:
return TwoStrings(qApp->translate("Attacher3D", "Align O-X-Y","Attachment3D mode caption"),
qApp->translate("Attacher3D", "Match origin with first Vertex. Align horizontal and vertical plane axes towards vertex/along line.","Attachment3D mode tooltip"));
case mmOXZ:
return TwoStrings(qApp->translate("Attacher3D", "Align O-X-N","Attachment3D mode caption"),
qApp->translate("Attacher3D", "Match origin with first Vertex. Align horizontal plane axis and normal towards vertex/along line.","Attachment3D mode tooltip"));
case mmOYZ:
return TwoStrings(qApp->translate("Attacher3D", "Align O-Y-N","Attachment3D mode caption"),
qApp->translate("Attacher3D", "Match origin with first Vertex. Align vertical plane axis and normal towards vertex/along line.","Attachment3D mode tooltip"));
case mmOYX:
return TwoStrings(qApp->translate("Attacher3D", "Align O-Y-X","Attachment3D mode caption"),
qApp->translate("Attacher3D", "Match origin with first Vertex. Align vertical and horizontal plane axes towards vertex/along line.","Attachment3D mode tooltip"));
default:
break;
}