[TD]fix error in DPG from bf00a1afc9

This commit is contained in:
wandererfan
2023-04-09 20:07:48 -04:00
committed by WandererFan
parent 845a156410
commit d3f8132273

View File

@@ -585,9 +585,6 @@ std::pair<Base::Vector3d, Base::Vector3d> DrawProjGroup::getDirsFromFront(std::s
std::pair<Base::Vector3d, Base::Vector3d> result;
Base::Vector3d projDir, rotVec;
Base::Console().Error("DrawProjGroup - %s unknown projection: %s\n", getNameInDocument(),
viewType.c_str());
DrawProjGroupItem* anch = getAnchor();
if (!anch) {
Base::Console().Warning("DPG::getDirsFromFront - %s - No Anchor!\n", Label.getValue());
@@ -652,11 +649,16 @@ std::pair<Base::Vector3d, Base::Vector3d> DrawProjGroup::getDirsFromFront(std::s
projDir = dir2vec(newDir);
gp_Dir newXDir = gp_Dir(gp_Vec(gXDir) - gp_Vec(gDir));
rotVec = dir2vec(newXDir);
} else {
// not one of the standard view directions, so complain and use the values for "Front"
Base::Console().Error("DrawProjGroup - %s unknown projection: %s\n", getNameInDocument(),
viewType.c_str());
Base::Vector3d dirAnch = anch->Direction.getValue();
Base::Vector3d rotAnch = anch->getXDirection();
return std::make_pair(dirAnch, rotAnch);
}
Base::Vector3d dirAnch = anch->Direction.getValue();
Base::Vector3d rotAnch = anch->getXDirection();
return std::make_pair(dirAnch, rotAnch);
return std::make_pair(projDir, rotVec);
}
Base::Vector3d DrawProjGroup::dir2vec(gp_Dir d)
@@ -893,7 +895,7 @@ int DrawProjGroup::getViewIndex(const char* viewTypeCStr) const
else if (strcmp(viewTypeCStr, "FrontBottomRight") == 0) {
return thirdAngle ? 9 : 0;
}
throw Base::TypeError("Unknown view type in DrawProjGroup::getViewIndex()");
return 4; // Default to front view's position;
}