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

+ issue #0002578: Duplicate objects copied and exported

Browse Source
This commit is contained in:
wmayer
2016-06-16 14:40:28 +02:00
parent 6665ae2460
commit 39ab11c701
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Gui/Application.cpp
View File

@@ -606,12 +606,13 @@ void Application::exportTo(const char* FileName, const char* DocName, const char
}
std::stringstream str;
std::set<App::DocumentObject*> unique_objs;
std::set<App::DocumentObject*> unique_objs;
str << "__objs__=[]" << std::endl;
for (std::vector<App::DocumentObject*>::iterator it = sel.begin(); it != sel.end(); ++it) {
if (unique_objs.insert(*it).second)
str << "__objs__.append(FreeCAD.getDocument(\"" << DocName << "\").getObject(\""
<< (*it)->getNameInDocument() << "\"))" << std::endl;
if (unique_objs.insert(*it).second) {
str << "__objs__.append(FreeCAD.getDocument(\"" << DocName << "\").getObject(\""
<< (*it)->getNameInDocument() << "\"))" << std::endl;
}
}
str << "import " << Module << std::endl;

4
src/Gui/CommandDoc.cpp
View File

@@ -928,10 +928,12 @@ StdCmdDuplicateSelection::StdCmdDuplicateSelection()
void StdCmdDuplicateSelection::activated(int iMsg)
{
std::vector<SelectionSingleton::SelObj> sel = Selection().getCompleteSelection();
std::set<App::DocumentObject*> unique_objs;
std::map< App::Document*, std::vector<App::DocumentObject*> > objs;
for (std::vector<SelectionSingleton::SelObj>::iterator it = sel.begin(); it != sel.end(); ++it) {
if (it->pObject && it->pObject->getDocument()) {
objs[it->pObject->getDocument()].push_back(it->pObject);
if (unique_objs.insert(it->pObject).second)
objs[it->pObject->getDocument()].push_back(it->pObject);
}
}

6
src/Gui/MainWindow.cpp
View File

@@ -1318,12 +1318,12 @@ void MainWindow::dragEnterEvent (QDragEnterEvent * e)
QMimeData * MainWindow::createMimeDataFromSelection () const
{
std::vector<SelectionSingleton::SelObj> selobj = Selection().getCompleteSelection();
std::set<App::DocumentObject*> unique_objs;
std::set<App::DocumentObject*> unique_objs;
std::map< App::Document*, std::vector<App::DocumentObject*> > objs;
for (std::vector<SelectionSingleton::SelObj>::iterator it = selobj.begin(); it != selobj.end(); ++it) {
if (it->pObject && it->pObject->getDocument()) {
if (unique_objs.insert(it->pObject).second)
objs[it->pObject->getDocument()].push_back(it->pObject);
if (unique_objs.insert(it->pObject).second)
objs[it->pObject->getDocument()].push_back(it->pObject);
}
}