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

Sketcher: fix external edges selection

Browse Source 
* fix selection from Sketcher Task Panel
 * fix selection from 3D View
 * Synchronize selection between Task Panel and 3D View

Signed-off-by: CalligaroV <vincenzo.calligaro@gmail.com>
This commit is contained in:
CalligaroV
2024-05-29 10:13:21 +02:00
committed by Chris Hennes
parent 13296ccfc2
commit 4a486b21ed
2 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
View File

@@ -1415,6 +1415,26 @@ void TaskSketcherElements::onSelectionChanged(const Gui::SelectionChanges& msg)
}
}
}
else if (shapetype.size() > 12 && shapetype.substr(0, 12) == "ExternalEdge") {
QRegularExpression rx(QString::fromLatin1("^ExternalEdge(\\d+)$"));
QRegularExpressionMatch match;
boost::ignore_unused(expr.indexOf(rx, 0, &match));
if (match.hasMatch()) {
bool ok;
int ElementId = -match.captured(1).toInt(&ok) - 2;
if (ok) {
int countItems = ui->listWidgetElements->count();
for (int i = 0; i < countItems; i++) {
ElementItem* item =
static_cast<ElementItem*>(ui->listWidgetElements->item(i));
if (item->ElementNbr == ElementId) {
item->isLineSelected = select;
break;
}
}
}
}
}
else if (shapetype.size() > 6 && shapetype.substr(0, 6) == "Vertex") {
QRegularExpression rx(QString::fromLatin1("^Vertex(\\d+)$"));
QRegularExpressionMatch match;
@@ -1607,7 +1627,12 @@ void TaskSketcherElements::onListWidgetElementsItemPressed(QListWidgetItem* it)
if (item->isLineSelected) {
ss << "Edge" << item->ElementNbr + 1;
if (item->ElementNbr >= 0) {
ss << "Edge" << item->ElementNbr + 1;
}
else {
ss << "ExternalEdge" << -item->ElementNbr - 2;
}
elementSubNames.push_back(ss.str());
}
@@ -1708,7 +1733,12 @@ void TaskSketcherElements::onListWidgetElementsMouseMoveOnItem(QListWidgetItem*
else if (item->hovered == SubElementType::mid)
preselectvertex(item->ElementNbr, Sketcher::PointPos::mid);
else if (item->hovered == SubElementType::edge) {
ss << "Edge" << item->ElementNbr + 1;
if (item->ElementNbr >= 0) {
ss << "Edge" << item->ElementNbr + 1;
}
else {
ss << "ExternalEdge" << -item->ElementNbr - 2;
}
Gui::Selection().setPreselect(doc_name.c_str(), obj_name.c_str(), ss.str().c_str());
}
}

17
src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
View File

@@ -2209,6 +2209,16 @@ void ViewProviderSketch::onSelectionChanged(const Gui::SelectionChanges& msg)
sketchHandler->applyCursor();
this->updateColor();
}
else if (shapetype.size() > 12 && shapetype.substr(0, 12) == "ExternalEdge") {
int GeoId = std::atoi(&shapetype[12]) - 1;
GeoId = -GeoId - 3;
resetPreselectPoint();
preselection.PreselectCurve = GeoId;
if (sketchHandler)
sketchHandler->applyCursor();
this->updateColor();
}
else if (shapetype.size() > 6 && shapetype.substr(0, 6) == "Vertex") {
int PtIndex = std::atoi(&shapetype[6]) - 1;
setPreselectPoint(PtIndex);
@@ -2449,7 +2459,12 @@ void ViewProviderSketch::doBoxSelection(const SbVec2s& startPos, const SbVec2s&
auto selectEdge = [this](int edgeid) {
std::stringstream ss;
ss << "Edge" << edgeid;
if (edgeid >= 0) {
ss << "Edge" << edgeid;
}
else {
ss << "ExternalEdge" << -edgeid - 1;
}
addSelection2(ss.str());
};