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

Gui: change DAG view selection behavior

Browse Source 
If there is selection, then DAG view will show the owner document of
the resolved selected object instead of the active document.
This commit is contained in:
Zheng, Lei
2019-12-14 21:29:54 +08:00
committed by wmayer
parent 5a32181b64
commit 15944dde60
2 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Gui/DAGView/DAGModel.cpp
View File

@@ -150,6 +150,12 @@ Model::Model(QObject *parentIn, const Gui::Document &documentIn) : QGraphicsScen
connectChgObject = documentIn.signalChangedObject.connect(boost::bind(&Model::slotChangeObject, this, _1, _2));
connectEdtObject = documentIn.signalInEdit.connect(boost::bind(&Model::slotInEdit, this, _1));
connectResObject = documentIn.signalResetEdit.connect(boost::bind(&Model::slotResetEdit, this, _1));
for (auto obj : documentIn.getDocument()->getObjects()) {
auto vpd = Base::freecad_dynamic_cast<Gui::ViewProviderDocumentObject>(documentIn.getViewProvider(obj));
if (vpd)
slotNewObject(*vpd);
}
}
Model::~Model()

39
src/Gui/DAGView/DAGView.cpp
View File

@@ -69,6 +69,8 @@ View::~View()
void View::slotActiveDocument(const Document &documentIn)
{
if (Gui::Selection().hasSelection())
return;
ModelMap::const_iterator it = modelMap.find(&documentIn);
if (it == modelMap.end())
{
@@ -98,24 +100,31 @@ void View::awakeSlot()
void View::onSelectionChanged(const SelectionChanges& msg)
{
//dispatch to appropriate document.
ModelMap::iterator it;
for (auto it = modelMap.begin(); it != modelMap.end(); ++it)
{
if (std::string(it->first->getDocument()->getName()) == std::string(msg.pDocName))
{
it->second->selectionChanged(msg);
switch(msg.Type) {
case SelectionChanges::AddSelection:
case SelectionChanges::RmvSelection:
case SelectionChanges::SetSelection:
if (!msg.pDocName || !msg.pDocName[0])
return;
break;
case SelectionChanges::ClrSelection:
if (!msg.pDocName || !msg.pDocName[0]) {
for (auto &v : modelMap) {
v.second->selectionChanged(msg);
}
return;
}
break;
default:
return;
}
//FIXME: why am I getting a spontaneous event with an empty name?
//also getting events after the document has been removed from modelMap.
//just ignore for now.
// std::ostringstream stream;
// stream << std::endl << "couldn't find document of name: " << std::string(msg.pDocName) << std::endl << std::endl;
// Base::Console().Warning(stream.str().c_str());
// assert(0); //no document of name.
auto doc = Gui::Application::Instance->getDocument(msg.pDocName);
if (!doc) return;
auto &model = modelMap[doc];
if(!model)
model = std::make_shared<Model>(this, *doc);
this->setScene(model.get());
model->selectionChanged(msg);
}