+ suppress warnings when copying an object

FreeCAD · Feb 9, 2016 · 02578c4 · 02578c4
1 parent fe8be47
commit 02578c4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/src/App/Document.cpp b/src/App/Document.cpp
@@ -2205,6 +2205,8 @@ DocumentObject* Document::copyObject(DocumentObject* obj, bool recursive)
     objs.push_back(obj);
 
     MergeDocuments md(this);
+    // if not copying recursively then suppress possible warnings
+    md.setVerbose(recursive);
     if (recursive) {
         objs = obj->getDocument()->getDependencyList(objs);
     }

diff --git a/src/App/MergeDocuments.cpp b/src/App/MergeDocuments.cpp
@@ -127,6 +127,7 @@ MergeDocuments::importObjects(std::istream& input)
     this->nameMap.clear();
     this->stream = new zipios::ZipInputStream(input);
     XMLMergeReader reader(this->nameMap,"<memory>", *stream);
+    reader.setVerbose(isVerbose());
     std::vector<App::DocumentObject*> objs = appdoc->importObjects(reader);
 
     delete this->stream;

diff --git a/src/App/MergeDocuments.h b/src/App/MergeDocuments.h
@@ -39,6 +39,8 @@ class AppExport MergeDocuments : public Base::Persistence
 public:
     MergeDocuments(App::Document* doc);
     ~MergeDocuments();
+    bool isVerbose() const { return verbose; }
+    void setVerbose(bool on) { verbose = on; }
     unsigned int getMemSize (void) const;
     std::vector<App::DocumentObject*> importObjects(std::istream&);
     void importObject(const std::vector<App::DocumentObject*>& o, Base::XMLReader & r);
@@ -50,6 +52,7 @@ class AppExport MergeDocuments : public Base::Persistence
 
 private:
     bool guiup;
+    bool verbose;
     zipios::ZipInputStream* stream;
     App::Document* appdoc;
     std::vector<App::DocumentObject*> objects;