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

Toponaming: fix secondElementSelection and SelectionView

Browse Source
This commit is contained in:
bgbsww
2024-06-15 17:21:49 -04:00
committed by Chris Hennes
parent 1f4b8d74d5
commit 2d9e9efdd3
3 changed files with 84 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
src/Gui/SelectionView.cpp
View File

@@ -119,12 +119,16 @@ void SelectionView::leaveEvent(QEvent *)
}
/// @cond DOXERR
void SelectionView::onSelectionChanged(const SelectionChanges &Reason)
void SelectionView::onSelectionChanged(const SelectionChanges& Reason)
{
ParameterGrp::handle hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")
->GetGroup("Preferences")->GetGroup("Selection");
ParameterGrp::handle hGrp = App::GetApplication()
.GetUserParameter()
.GetGroup("BaseApp")
->GetGroup("Preferences")
->GetGroup("Selection");
bool autoShow = hGrp->GetBool("AutoShowSelectionView", false);
hGrp->SetBool("AutoShowSelectionView", autoShow); // Remove this line once the preferences window item is implemented
hGrp->SetBool("AutoShowSelectionView",
autoShow); // Remove this line once the preferences window item is implemented
if (autoShow) {
if (!parentWidget()->isVisible() && Selection().hasSelection()) {
@@ -139,90 +143,93 @@ void SelectionView::onSelectionChanged(const SelectionChanges &Reason)
QString selObject;
QTextStream str(&selObject);
auto getSelectionName = [](QTextStream& str,
const char* docName,
const char* objName,
const char* subName,
App::DocumentObject* obj) {
str << docName;
str << "#";
str << objName;
if (subName != 0 && subName[0] != 0) {
str << ".";
/* Original code doesn't take account of histories in subelement names and displays
* them inadvertently. Let's not do that.
str << subName;
*/
/* Remove the history from the displayed subelement name */
std::pair<std::string, std::string> elementName;
App::GeoFeature::resolveElement(obj, subName, elementName);
str << elementName.second.c_str(); // Use the shortened element name not the full one.
/* Mark it visually if there was a history as a "tell" for if a given selection has TNP
* fixes in it. */
if (elementName.first.size() > 0) {
str << " []";
}
auto subObj = obj->getSubObject(subName);
if (subObj) {
obj = subObj;
}
}
str << " (";
str << QString::fromUtf8(obj->Label.getValue());
str << ")";
};
if (Reason.Type == SelectionChanges::AddSelection) {
// save as user data
QStringList list;
list << QString::fromLatin1(Reason.pDocName);
list << QString::fromLatin1(Reason.pObjectName);
// insert the selection as item
str << Reason.pDocName;
str << "#";
str << Reason.pObjectName;
App::Document* doc = App::GetApplication().getDocument(Reason.pDocName);
App::DocumentObject* obj = doc->getObject(Reason.pObjectName);
if (Reason.pSubName[0] != 0 ) {
str << ".";
str << Reason.pSubName;
auto subObj = obj->getSubObject(Reason.pSubName);
if(subObj)
obj = subObj;
}
str << " (";
str << QString::fromUtf8(obj->Label.getValue());
str << ")";
getSelectionName(str, Reason.pDocName, Reason.pObjectName, Reason.pSubName, obj);
// insert the selection as item
QListWidgetItem* item = new QListWidgetItem(selObject, selectionView);
item->setData(Qt::UserRole, list);
}
else if (Reason.Type == SelectionChanges::ClrSelection) {
if(!Reason.pDocName[0]) {
if (!Reason.pDocName[0]) {
// remove all items
selectionView->clear();
}else{
}
else {
// build name
str << Reason.pDocName;
str << "#";
// remove all items
const auto items = selectionView->findItems(selObject,Qt::MatchStartsWith);
for(auto item : items)
const auto items = selectionView->findItems(selObject, Qt::MatchStartsWith);
for (auto item : items) {
delete item;
}
}
}
else if (Reason.Type == SelectionChanges::RmvSelection) {
// build name
str << Reason.pDocName;
str << "#";
str << Reason.pObjectName;
if (Reason.pSubName[0] != 0) {
str << ".";
str << Reason.pSubName;
}
str << " (";
App::Document* doc = App::GetApplication().getDocument(Reason.pDocName);
App::DocumentObject* obj = doc->getObject(Reason.pObjectName);
getSelectionName(str, Reason.pDocName, Reason.pObjectName, Reason.pSubName, obj);
// remove all items
QList<QListWidgetItem *> l = selectionView->findItems(selObject,Qt::MatchStartsWith);
if (l.size() == 1)
QList<QListWidgetItem*> l = selectionView->findItems(selObject, Qt::MatchStartsWith);
if (l.size() == 1) {
delete l[0];
}
}
else if (Reason.Type == SelectionChanges::SetSelection) {
// remove all items
selectionView->clear();
std::vector<SelectionSingleton::SelObj> objs = Gui::Selection().getSelection(Reason.pDocName, ResolveMode::NoResolve);
for (const auto & it : objs) {
std::vector<SelectionSingleton::SelObj> objs =
Gui::Selection().getSelection(Reason.pDocName, ResolveMode::NoResolve);
for (const auto& it : objs) {
// save as user data
QStringList list;
list << QString::fromLatin1(it.DocName);
list << QString::fromLatin1(it.FeatName);
// build name
str << it.DocName;
str << "#";
str << it.FeatName;
App::Document* doc = App::GetApplication().getDocument(it.DocName);
App::DocumentObject* obj = doc->getObject(it.FeatName);
if (it.SubName && it.SubName[0] != '\0') {
str << ".";
str << it.SubName;
auto subObj = obj->getSubObject(Reason.pSubName);
if(subObj)
obj = subObj;
}
str << " (";
str << QString::fromUtf8(obj->Label.getValue());
str << ")";
getSelectionName(str, it.DocName, it.FeatName, it.SubName, obj);
QListWidgetItem* item = new QListWidgetItem(selObject, selectionView);
item->setData(Qt::UserRole, list);
selObject.clear();
@@ -233,29 +240,21 @@ void SelectionView::onSelectionChanged(const SelectionChanges &Reason)
enablePickList->setChecked(picking);
pickList->setVisible(picking);
pickList->clear();
if(picking) {
const auto &sels = Selection().getPickedList(Reason.pDocName);
for(const auto &sel : sels) {
if (picking) {
const auto& sels = Selection().getPickedList(Reason.pDocName);
for (const auto& sel : sels) {
App::Document* doc = App::GetApplication().getDocument(sel.DocName);
if(!doc) continue;
if (!doc) {
continue;
}
App::DocumentObject* obj = doc->getObject(sel.FeatName);
if(!obj) continue;
if (!obj) {
continue;
}
QString selObject;
QTextStream str(&selObject);
str << sel.DocName;
str << "#";
str << sel.FeatName;
if (sel.SubName[0] != 0 ) {
str << ".";
str << sel.SubName;
auto subObj = obj->getSubObject(sel.SubName);
if(subObj)
obj = subObj;
}
str << " (";
str << QString::fromUtf8(obj->Label.getValue());
str << ")";
getSelectionName(str, sel.DocName, sel.FeatName, sel.SubName, obj);
this->x = sel.x;
this->y = sel.y;

9
src/Gui/SoFCUnifiedSelection.cpp
View File

@@ -71,6 +71,7 @@
#endif
#include <App/Document.h>
#include <App/GeoFeature.h>
#include <App/ElementNamingUtils.h>
#include <Base/Tools.h>
#include <Base/UnitsApi.h>
@@ -396,8 +397,14 @@ void SoFCUnifiedSelection::doAction(SoAction *action)
if (vp && (useNewSelection.getValue()||vp->useNewSelectionModel()) && vp->isSelectable()) {
SoDetail *detail = nullptr;
detailPath->truncate(0);
auto subName = selaction->SelChange.pSubName;
#ifdef FC_USE_TNP_FIX
std::pair<std::string, std::string> elementName;
App::GeoFeature::resolveElement(obj,subName,elementName);
subName = elementName.second.c_str(); // Use the shortened element name not the full one.
#endif
if(!selaction->SelChange.pSubName || !selaction->SelChange.pSubName[0] ||
vp->getDetailPath(selaction->SelChange.pSubName,detailPath,true,detail))
vp->getDetailPath(subName,detailPath,true,detail))
{
SoSelectionElementAction::Type type = SoSelectionElementAction::None;
if (selaction->SelChange.Type == SelectionChanges::AddSelection) {

6
src/Gui/View3DInventorSelection.cpp
View File

@@ -34,6 +34,7 @@
#include "View3DInventorSelection.h"
#include "ViewProviderDocumentObject.h"
#include <App/Document.h>
#include <App/GeoFeature.h>
#include <App/GeoFeatureGroupExtension.h>
#include <Base/Console.h>
@@ -113,6 +114,11 @@ void View3DInventorSelection::checkGroupOnTop(const SelectionChanges &Reason)
std::string key(obj->getNameInDocument());
key += '.';
auto subname = Reason.pSubName;
#ifdef FC_USE_TNP_FIX
std::pair<std::string, std::string> element;
App::GeoFeature::resolveElement(obj,Reason.pSubName,element);
subname = element.second.c_str();
#endif
if(subname)
key += subname;
if(Reason.Type == SelectionChanges::RmvSelection) {