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

Handle multiple face selection

Browse Source
This commit is contained in:
wandererfan
2019-05-30 10:49:51 -04:00
committed by WandererFan
parent 07e26d3624
commit 448c68cd41
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/TechDraw/Gui/CommandAnnotate.cpp
View File

@@ -594,8 +594,8 @@ CmdTechDrawCenterLine::CmdTechDrawCenterLine()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Add a centerline to a Face");
sToolTipText = QT_TR_NOOP("Add a centerline to a Face");
sMenuText = QT_TR_NOOP("Add a centerline to a Face(s)");
sToolTipText = QT_TR_NOOP("Add a centerline to a Face(s)");
sWhatsThis = "TechDraw_CenterLine";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-centerline";
@@ -643,7 +643,7 @@ void CmdTechDrawCenterLine::activated(int iMsg)
}
if (SubNames.empty()) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Selection Error"),
QObject::tr("You must select a Face for the center line."));
QObject::tr("You must select a Face(s) for the center line."));
return;
}

31
src/Mod/TechDraw/Gui/TaskCenterLine.cpp
View File

@@ -228,8 +228,7 @@ void TaskCenterLine::createCenterLine(void)
vertical = true;
}
m_extendBy = ui->qsbExtend->rawValue();
//TODO: (if m_partFeat->getGeomTypeFromName(m_subNames.at(0)) == "Face") {
TechDraw::CosmeticEdge* ce = makeMidLine(m_subNames.at(0),vertical,m_extendBy);
TechDraw::CosmeticEdge* ce = calcEndPoints(m_subNames,vertical,m_extendBy);
m_partFeat->addRandomEdge(ce);
m_partFeat->requestPaint();
Gui::Command::updateActive();
@@ -288,22 +287,29 @@ void TaskCenterLine::enableTaskButtons(bool b)
m_btnCancel->setEnabled(b);
}
TechDraw::CosmeticEdge* TaskCenterLine::makeMidLine(std::string faceName, bool vert, double ext)
TechDraw::CosmeticEdge* TaskCenterLine::calcEndPoints(std::vector<std::string> faceNames, bool vert, double ext)
{
// Base::Console().Message("TCL::makeMidLine(%s, %d) \n",faceName.c_str(), vert);
// Base::Console().Message("TCL::calcEndPoints(%d, %d) \n",faceNames.size(), vert);
TechDraw::CosmeticEdge* result = nullptr;
double scale = m_partFeat->getScale();
Base::Vector3d p1, p2;
int idx = TechDraw::DrawUtil::getIndexFromName(faceName);
std::vector<TechDrawGeometry::BaseGeom*> faceEdges =
m_partFeat->getFaceEdgesByIndex(idx);
Bnd_Box faceBox;
faceBox.SetGap(0.0);
for (auto& fe: faceEdges) {
if (!fe->cosmetic) {
BRepBndLib::Add(fe->occEdge, faceBox);
for (auto& fn: faceNames) {
if (TechDraw::DrawUtil::getGeomTypeFromName(fn) != "Face") {
continue;
}
int idx = TechDraw::DrawUtil::getIndexFromName(fn);
std::vector<TechDrawGeometry::BaseGeom*> faceEdges =
m_partFeat->getFaceEdgesByIndex(idx);
for (auto& fe: faceEdges) {
if (!fe->cosmetic) {
BRepBndLib::Add(fe->occEdge, faceBox);
}
}
}
double scale = m_partFeat->getScale();
double Xmin,Ymin,Zmin,Xmax,Ymax,Zmax;
faceBox.Get(Xmin,Ymin,Zmin,Xmax,Ymax,Zmax);
@@ -317,6 +323,7 @@ TechDraw::CosmeticEdge* TaskCenterLine::makeMidLine(std::string faceName, bool v
Base::Vector3d bbxCenter(Xmid, Ymid, 0.0);
Base::Vector3d p1, p2;
if (vert) {
Base::Vector3d top(Xmid, Ymid - Yspan, 0.0);
Base::Vector3d bottom(Xmid, Ymid + Yspan, 0.0);

4
src/Mod/TechDraw/Gui/TaskCenterLine.h
View File

@@ -108,7 +108,9 @@ protected:
QGIView* findParentQGIV();
void updateCenterLine(void);
void removeCenterLine(void);
TechDraw::CosmeticEdge* makeMidLine(std::string subName, bool vert, double ext);
TechDraw::CosmeticEdge* calcEndPoints(std::vector<std::string> faceNames,
bool vert,
double ext);
void saveState(void);
void restoreState(void);