Merge branch 'master' into bugfix/path-invalid-base-geometry-robustness

src/Mod/AddonManager/AddonManager.py

@@ -26,14 +26,11 @@
 from __future__ import print_function
 
 import os
-import re
 import shutil
 import stat
-import sys
 import tempfile
 
 from PySide import QtGui, QtCore
-import AddonManager_rc
 import FreeCADGui
 
 from addonmanager_utilities import translate  # this needs to be as is for pylupdate

src/Mod/AddonManager/InitGui.py

@@ -4,7 +4,6 @@
 # License LGPL
 
 import AddonManager
-import AddonManager_rc
 
 FreeCADGui.addLanguagePath(":/translations")
 FreeCADGui.addCommand('Std_AddonMgr', AddonManager.CommandAddonManager())

src/Mod/AddonManager/addonmanager_workers.py

@@ -24,9 +24,7 @@
 import os
 import re
 import shutil
-import stat
 import sys
-import tempfile
 
 from PySide import QtCore, QtGui
 

src/Mod/Fem/Gui/TaskFemConstraintContact.cpp

@@ -404,7 +404,7 @@ TaskDlgFemConstraintContact::TaskDlgFemConstraintContact(ViewProviderFemConstrai
 {
     this->ConstraintView = ConstraintView;
     assert(ConstraintView);
-    this->parameter = new TaskFemConstraintContact(ConstraintView);;
+    this->parameter = new TaskFemConstraintContact(ConstraintView);
 
     Content.push_back(parameter);
 }

src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp

@@ -571,7 +571,7 @@ TaskDlgFemConstraintDisplacement::TaskDlgFemConstraintDisplacement(ViewProviderF
 {
     this->ConstraintView = ConstraintView;
     assert(ConstraintView);
-    this->parameter = new TaskFemConstraintDisplacement(ConstraintView);;
+    this->parameter = new TaskFemConstraintDisplacement(ConstraintView);
 
     Content.push_back(parameter);
 }

src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp

@@ -252,7 +252,7 @@ TaskDlgFemConstraintFixed::TaskDlgFemConstraintFixed(ViewProviderFemConstraintFi
 {
     this->ConstraintView = ConstraintView;
     assert(ConstraintView);
-    this->parameter = new TaskFemConstraintFixed(ConstraintView);;
+    this->parameter = new TaskFemConstraintFixed(ConstraintView);
 
     Content.push_back(parameter);
 }

src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp

@@ -872,7 +872,7 @@ TaskDlgFemConstraintFluidBoundary::TaskDlgFemConstraintFluidBoundary(ViewProvide
 {
     this->ConstraintView = ConstraintView;
     assert(ConstraintView);
-    this->parameter = new TaskFemConstraintFluidBoundary(ConstraintView);;
+    this->parameter = new TaskFemConstraintFluidBoundary(ConstraintView);
 
     Content.push_back(parameter);
 }

src/Mod/Fem/Gui/TaskFemConstraintForce.cpp

@@ -394,7 +394,7 @@ TaskDlgFemConstraintForce::TaskDlgFemConstraintForce(ViewProviderFemConstraintFo
 {
     this->ConstraintView = ConstraintView;
     assert(ConstraintView);
-    this->parameter = new TaskFemConstraintForce(ConstraintView);;
+    this->parameter = new TaskFemConstraintForce(ConstraintView);
 
     Content.push_back(parameter);
 }

src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp

@@ -383,7 +383,7 @@ TaskDlgFemConstraintHeatflux::TaskDlgFemConstraintHeatflux(ViewProviderFemConstr
 {
     this->ConstraintView = ConstraintView;
     assert(ConstraintView);
-    this->parameter = new TaskFemConstraintHeatflux(ConstraintView);;
+    this->parameter = new TaskFemConstraintHeatflux(ConstraintView);
 
     Content.push_back(parameter);
 }

src/Mod/Fem/Gui/TaskFemConstraintInitialTemperature.cpp

@@ -106,7 +106,7 @@ TaskDlgFemConstraintInitialTemperature::TaskDlgFemConstraintInitialTemperature(V
 {
     this->ConstraintView = ConstraintView;
     assert(ConstraintView);
-    this->parameter = new TaskFemConstraintInitialTemperature(ConstraintView);;
+    this->parameter = new TaskFemConstraintInitialTemperature(ConstraintView);
 
     Content.push_back(parameter);
 }

src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp

@@ -273,7 +273,7 @@ TaskDlgFemConstraintPlaneRotation::TaskDlgFemConstraintPlaneRotation(ViewProvide
 {
     this->ConstraintView = ConstraintView;
     assert(ConstraintView);
-    this->parameter = new TaskFemConstraintPlaneRotation(ConstraintView);;
+    this->parameter = new TaskFemConstraintPlaneRotation(ConstraintView);
 
     Content.push_back(parameter);
 }

src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp

@@ -269,7 +269,7 @@ TaskDlgFemConstraintPressure::TaskDlgFemConstraintPressure(ViewProviderFemConstr
 {
     this->ConstraintView = ConstraintView;
     assert(ConstraintView);
-    this->parameter = new TaskFemConstraintPressure(ConstraintView);;
+    this->parameter = new TaskFemConstraintPressure(ConstraintView);
 
     Content.push_back(parameter);
 }

src/Mod/Fem/Gui/TaskFemConstraintPulley.cpp

@@ -182,7 +182,7 @@ TaskDlgFemConstraintPulley::TaskDlgFemConstraintPulley(ViewProviderFemConstraint
 {
     this->ConstraintView = ConstraintView;
     assert(ConstraintView);
-    this->parameter = new TaskFemConstraintPulley(ConstraintView);;
+    this->parameter = new TaskFemConstraintPulley(ConstraintView);
 
     Content.push_back(parameter);
 }

src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp

@@ -324,7 +324,7 @@ TaskDlgFemConstraintTemperature::TaskDlgFemConstraintTemperature(ViewProviderFem
 {
     this->ConstraintView = ConstraintView;
     assert(ConstraintView);
-    this->parameter = new TaskFemConstraintTemperature(ConstraintView);;
+    this->parameter = new TaskFemConstraintTemperature(ConstraintView);
 
     Content.push_back(parameter);
 }

src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp

@@ -486,7 +486,7 @@ TaskDlgFemConstraintTransform::TaskDlgFemConstraintTransform(ViewProviderFemCons
 {
     this->ConstraintView = ConstraintView;
     assert(ConstraintView);
-    this->parameter = new TaskFemConstraintTransform(ConstraintView);;
+    this->parameter = new TaskFemConstraintTransform(ConstraintView);
 
     Content.push_back(parameter);
 }

src/Mod/Fem/femsolver/z88/writer.py

@@ -73,7 +73,7 @@ def write_z88_input(self):
             self.element_count = len(self.femelement_table)
         self.set_z88_elparam()
         self.write_z88_mesh()
-        self.write_z88_contraints()
+        self.write_z88_constraints()
         self.write_z88_face_loads()
         self.write_z88_materials()
         self.write_z88_elements_properties()
@@ -120,7 +120,7 @@ def write_z88_mesh(self):
         )
         f.close()
 
-    def write_z88_contraints(self):
+    def write_z88_constraints(self):
         constraints_data = []  # will be a list of tuple for better sorting
 
         # fixed constraints
@@ -155,8 +155,8 @@ def write_z88_contraints(self):
                         constraints_data.append((n, str(n) + "  3  1  " + str(v3) + "\n"))
 
         # write constraints_data to file
-        contraints_file_path = self.file_name + "i2.txt"
-        f = open(contraints_file_path, "w")
+        constraints_file_path = self.file_name + "i2.txt"
+        f = open(constraints_file_path, "w")
         f.write(str(len(constraints_data)) + "\n")
         for c in sorted(constraints_data):
             f.write(c[1])

src/Mod/PartDesign/Gui/TaskPipeParameters.cpp

@@ -436,6 +436,113 @@ void TaskPipeParameters::exitSelectionMode() {
     Gui::Selection().clearSelection();
 }
 
+bool TaskPipeParameters::accept()
+{
+    //see what to do with external references
+    //check the prerequisites for the selected objects
+    //the user has to decide which option we should take if external references are used
+    PartDesign::Pipe* pcPipe = static_cast<PartDesign::Pipe*>(getPipeView()->getObject());
+    auto pcActiveBody = PartDesignGui::getBodyFor(pcPipe, false);
+    if (!pcActiveBody) {
+        QMessageBox::warning(this, tr("Input error"), tr("No active body"));
+        return false;
+    }
+  //auto pcActivePart = PartDesignGui::getPartFor(pcActiveBody, false);
+    std::vector<App::DocumentObject*> copies;
+
+    bool extReference = false;
+    App::DocumentObject* spine = pcPipe->Spine.getValue();
+    App::DocumentObject* auxSpine = pcPipe->AuxillerySpine.getValue();
+
+    // If a spine isn't set but user entered a label then search for the appropriate document object
+    QString label = ui->spineBaseEdit->text();
+    if (!spine && !label.isEmpty()) {
+        QByteArray ba = label.toUtf8();
+        std::vector<App::DocumentObject*> objs = pcPipe->getDocument()->findObjects(App::DocumentObject::getClassTypeId(), nullptr, ba.constData());
+        if (!objs.empty()) {
+            pcPipe->Spine.setValue(objs.front());
+            spine = objs.front();
+        }
+    }
+
+    if (spine && !pcActiveBody->hasObject(spine) && !pcActiveBody->getOrigin()->hasObject(spine)) {
+        extReference = true;
+    }
+    else if (auxSpine && !pcActiveBody->hasObject(auxSpine) && !pcActiveBody->getOrigin()->hasObject(auxSpine)) {
+        extReference = true;
+    }
+    else {
+        for(App::DocumentObject* obj : pcPipe->Sections.getValues()) {
+            if (!pcActiveBody->hasObject(obj) && !pcActiveBody->getOrigin()->hasObject(obj)) {
+                extReference = true;
+                break;
+            }
+        }
+    }
+
+    if (extReference) {
+        QDialog dia(Gui::getMainWindow());
+        Ui_DlgReference dlg;
+        dlg.setupUi(&dia);
+        dia.setModal(true);
+        int result = dia.exec();
+        if (result == QDialog::DialogCode::Rejected)
+            return false;
+
+        if (!dlg.radioXRef->isChecked()) {
+
+            if (!pcActiveBody->hasObject(spine) && !pcActiveBody->getOrigin()->hasObject(spine)) {
+                pcPipe->Spine.setValue(PartDesignGui::TaskFeaturePick::makeCopy(spine, "",
+                                       dlg.radioIndependent->isChecked()),
+                                       pcPipe->Spine.getSubValues());
+                copies.push_back(pcPipe->Spine.getValue());
+            }
+            else if (!pcActiveBody->hasObject(auxSpine) && !pcActiveBody->getOrigin()->hasObject(auxSpine)){
+                pcPipe->AuxillerySpine.setValue(PartDesignGui::TaskFeaturePick::makeCopy(auxSpine, "",
+                                                dlg.radioIndependent->isChecked()),
+                                                pcPipe->AuxillerySpine.getSubValues());
+                copies.push_back(pcPipe->AuxillerySpine.getValue());
+            }
+
+            std::vector<App::DocumentObject*> objs;
+            int index = 0;
+            for(App::DocumentObject* obj : pcPipe->Sections.getValues()) {
+
+                if(!pcActiveBody->hasObject(obj) && !pcActiveBody->getOrigin()->hasObject(obj)) {
+                    objs.push_back(PartDesignGui::TaskFeaturePick::makeCopy(obj, "", dlg.radioIndependent->isChecked()));
+                    copies.push_back(objs.back());
+                }
+                else {
+                    objs.push_back(obj);
+                }
+
+                index++;
+            }
+
+            pcPipe->Sections.setValues(objs);
+        }
+    }
+
+    try {
+        Gui::cmdAppDocument(pcPipe, "recompute()");
+        if (!vp->getObject()->isValid())
+            throw Base::RuntimeError(vp->getObject()->getStatusString());
+        Gui::cmdGuiDocument(pcPipe, "resetEdit()");
+        Gui::Command::commitCommand();
+
+        //we need to add the copied features to the body after the command action, as otherwise FreeCAD crashes unexplainably
+        for (auto obj : copies) {
+            pcActiveBody->addObject(obj);
+        }
+    }
+    catch (const Base::Exception& e) {
+        QMessageBox::warning(this, tr("Input error"), QString::fromUtf8(e.what()));
+        return false;
+    }
+
+    return true;
+}
+
 
 //**************************************************************************
 //**************************************************************************
@@ -1014,89 +1121,7 @@ TaskDlgPipeParameters::~TaskDlgPipeParameters()
 
 bool TaskDlgPipeParameters::accept()
 {
-    //see what to do with external references
-    //check the prerequisites for the selected objects
-    //the user has to decide which option we should take if external references are used
-    PartDesign::Pipe* pcPipe = static_cast<PartDesign::Pipe*>(getPipeView()->getObject());
-    auto pcActiveBody = PartDesignGui::getBodyFor(pcPipe, false);
-  //auto pcActivePart = PartDesignGui::getPartFor(pcActiveBody, false);
-    std::vector<App::DocumentObject*> copies;
-
-    bool extReference = false;
-    if(!pcActiveBody->hasObject(pcPipe->Spine.getValue()) && !pcActiveBody->getOrigin()->hasObject(pcPipe->Spine.getValue()))
-        extReference = true;
-    else if(pcPipe->AuxillerySpine.getValue() && !pcActiveBody->hasObject(pcPipe->AuxillerySpine.getValue()) && 
-            !pcActiveBody->getOrigin()->hasObject(pcPipe->AuxillerySpine.getValue()))
-            extReference = true;
-    else {
-        for(App::DocumentObject* obj : pcPipe->Sections.getValues()) {
-            if(!pcActiveBody->hasObject(obj) && !pcActiveBody->getOrigin()->hasObject(obj))
-                extReference = true;
-        }
-    }
-
-    if (extReference) {
-        QDialog dia(Gui::getMainWindow());
-        Ui_DlgReference dlg;
-        dlg.setupUi(&dia);
-        dia.setModal(true);
-        int result = dia.exec();
-        if (result == QDialog::DialogCode::Rejected)
-            return false;
-
-        if(!dlg.radioXRef->isChecked()) {
-
-            if(!pcActiveBody->hasObject(pcPipe->Spine.getValue()) && !pcActiveBody->getOrigin()->hasObject(pcPipe->Spine.getValue())) {
-                pcPipe->Spine.setValue(PartDesignGui::TaskFeaturePick::makeCopy(pcPipe->Spine.getValue(), "", dlg.radioIndependent->isChecked()),
-                                        pcPipe->Spine.getSubValues());
-                copies.push_back(pcPipe->Spine.getValue());
-            }
-            else if(!pcActiveBody->hasObject(pcPipe->AuxillerySpine.getValue()) && !pcActiveBody->getOrigin()->hasObject(pcPipe->AuxillerySpine.getValue())){
-                pcPipe->AuxillerySpine.setValue(PartDesignGui::TaskFeaturePick::makeCopy(pcPipe->AuxillerySpine.getValue(), "", dlg.radioIndependent->isChecked()),
-                                        pcPipe->AuxillerySpine.getSubValues());
-                copies.push_back(pcPipe->AuxillerySpine.getValue());
-            }
-
-            std::vector<App::DocumentObject*> objs;
-            int index = 0;
-            for(App::DocumentObject* obj : pcPipe->Sections.getValues()) {
-
-                if(!pcActiveBody->hasObject(obj) && !pcActiveBody->getOrigin()->hasObject(obj)) {
-                    objs.push_back(PartDesignGui::TaskFeaturePick::makeCopy(obj, "", dlg.radioIndependent->isChecked()));
-                    copies.push_back(objs.back());
-                }
-                else
-                    objs.push_back(obj);
-
-                index++;
-            }
-
-            pcPipe->Sections.setValues(objs);
-        }
-    }
-
-    try {
-        Gui::cmdAppDocument(pcPipe, "recompute()");
-        if (!vp->getObject()->isValid())
-            throw Base::RuntimeError(vp->getObject()->getStatusString());
-        Gui::cmdGuiDocument(pcPipe, "resetEdit()");
-        Gui::Command::commitCommand();
-
-        //we need to add the copied features to the body after the command action, as otherwise FreeCAD crashes unexplainably
-        for(auto obj : copies) {
-            //Dead code: pcActiveBody was previously used without checking for null, so it won't be null here either.
-            //if(pcActiveBody)
-            pcActiveBody->addObject(obj);
-            //else if (pcActivePart)
-            //    pcActivePart->addObject(obj);
-        }
-    }
-    catch (const Base::Exception& e) {
-        QMessageBox::warning(parameter, tr("Input error"), QString::fromUtf8(e.what()));
-        return false;
-    }
-
-    return true;
+    return parameter->accept();
 }