pre-select name filter in import/export file dialog

[Path] Correction of drill speed calculation for grbl_G1 of 18.3

src/App/Application.cpp

@@ -1529,7 +1529,11 @@ void Application::initConfig(int argc, char ** argv)
     PyImport_AppendInittab ("FreeCAD", init_freecad_module);
     PyImport_AppendInittab ("__FreeCADBase__", init_freecad_base_module);
 #endif
-    mConfig["PythonSearchPath"] = Interpreter().init(argc,argv);
+    const char* pythonpath = Interpreter().init(argc,argv);
+    if (pythonpath)
+        mConfig["PythonSearchPath"] = pythonpath;
+    else
+        Base::Console().Warning("Encoding of Python paths failed\n");
 
     // Parse the options that have impact on the init process
     ParseOptions(argc,argv);

src/CXX/Python3/Objects.hxx

@@ -2033,25 +2033,25 @@ namespace Py
         }
 
         String()
-        : SeqBase<Char>( PyUnicode_FromString( "" ) )
+        : SeqBase<Char>( PyUnicode_FromString( "" ), true )
         {
             validate();
         }
 
         String( const char *latin1 )
-        : SeqBase<Char>( PyUnicode_FromString( latin1 ) )
+        : SeqBase<Char>( PyUnicode_FromString( latin1 ), true )
         {
             validate();
         }
 
         String( const std::string &latin1 )
-        : SeqBase<Char>( PyUnicode_FromStringAndSize( latin1.c_str(), latin1.size() ) )
+        : SeqBase<Char>( PyUnicode_FromStringAndSize( latin1.c_str(), latin1.size() ), true )
         {
             validate();
         }
 
         String( const char *latin1, Py_ssize_t size )
-        : SeqBase<Char>( PyUnicode_FromStringAndSize( latin1, size ) )
+        : SeqBase<Char>( PyUnicode_FromStringAndSize( latin1, size ), true )
         {
             validate();
         }

src/Gui/FileDialog.cpp

@@ -199,6 +199,8 @@ QString FileDialog::getSaveFileName (QWidget * parent, const QString & caption,
         dlg.setDirectory(dirName);
         dlg.setOptions(options);
         dlg.setNameFilters(filter.split(QLatin1String(";;")));
+        if (selectedFilter && !selectedFilter->isEmpty())
+            dlg.selectNameFilter(*selectedFilter);
         dlg.onSelectedFilter(dlg.selectedNameFilter());
         dlg.setNameFilterDetailsVisible(true);
         dlg.setConfirmOverwrite(true);
@@ -295,6 +297,8 @@ QString FileDialog::getOpenFileName(QWidget * parent, const QString & caption, c
         dlg.setOptions(options);
         dlg.setNameFilters(filter.split(QLatin1String(";;")));
         dlg.setNameFilterDetailsVisible(true);
+        if (selectedFilter && !selectedFilter->isEmpty())
+            dlg.selectNameFilter(*selectedFilter);
         if (dlg.exec() == QDialog::Accepted) {
             if (selectedFilter)
                 *selectedFilter = dlg.selectedNameFilter();
@@ -369,6 +373,8 @@ QStringList FileDialog::getOpenFileNames (QWidget * parent, const QString & capt
         dlg.setOptions(options);
         dlg.setNameFilters(filter.split(QLatin1String(";;")));
         dlg.setNameFilterDetailsVisible(true);
+        if (selectedFilter && !selectedFilter->isEmpty())
+            dlg.selectNameFilter(*selectedFilter);
         if (dlg.exec() == QDialog::Accepted) {
             if (selectedFilter)
                 *selectedFilter = dlg.selectedNameFilter();

src/Gui/View3DInventor.cpp

@@ -477,7 +477,9 @@ void View3DInventor::printPreview()
 {
     QPrinter printer(QPrinter::ScreenResolution);
     printer.setFullPage(true);
-    //printer.setPageSize(QPrinter::A3);
+#if (QT_VERSION > QT_VERSION_CHECK(5, 9, 0))
+    printer.setPageSize(QPrinter::A4);
+#endif
     printer.setOrientation(QPrinter::Landscape);
 
     QPrintPreviewDialog dlg(&printer, this);

src/Gui/WidgetFactory.cpp

@@ -232,6 +232,28 @@ Py::Object qt_wrapInstance(qttype object, const char* className,
     return func.apply(arguments);
 }
 
+const char* qt_identifyType(QObject* ptr, const char* pyside)
+{
+    PyObject* module = PyImport_ImportModule(pyside);
+    if (!module) {
+        std::string error = "Cannot load ";
+        error += pyside;
+        error += " module";
+        throw Py::Exception(PyExc_ImportError, error);
+    }
+
+    Py::Module qtmod(module);
+    const QMetaObject* metaObject = ptr->metaObject();
+    while (metaObject) {
+        const char* className = metaObject->className();
+        if (qtmod.getDict().hasKey(className))
+            return className;
+        metaObject = metaObject->superClass();
+    }
+
+    return nullptr;
+}
+
 void* qt_getCppPointer(const Py::Object& pyobject, const char* shiboken, const char* unwrap)
 {
     // https://github.com/PySide/Shiboken/blob/master/shibokenmodule/typesystem_shiboken.xml
@@ -475,39 +497,50 @@ bool PythonWrapper::loadWidgetsModule()
 
 void PythonWrapper::createChildrenNameAttributes(PyObject* root, QObject* object)
 {
-#if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE)
     Q_FOREACH (QObject* child, object->children()) {
         const QByteArray name = child->objectName().toLocal8Bit();
 
         if (!name.isEmpty() && !name.startsWith("_") && !name.startsWith("qt_")) {
             bool hasAttr = PyObject_HasAttrString(root, name.constData());
             if (!hasAttr) {
-#if defined (HAVE_SHIBOKEN2) && defined(HAVE_PYSIDE2)
-                Shiboken::AutoDecRef pyChild(Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide2_QtCoreTypes[SBK_QOBJECT_IDX], child));
-#else
-                Shiboken::AutoDecRef pyChild(Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], child));
-#endif
+#if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE)
+                Shiboken::AutoDecRef pyChild(Shiboken::Conversions::pointerToPython(reinterpret_cast<SbkObjectType*>(Shiboken::SbkType<QObject>()), child));
                 PyObject_SetAttrString(root, name.constData(), pyChild);
+#elif QT_VERSION >= 0x050000
+                const char* className = qt_identifyType(child, "PySide2.QtWidgets");
+                if (!className) {
+                    if (qobject_cast<QWidget*>(child))
+                        className = "QWidget";
+                    else
+                        className = "QObject";
+                }
+
+                Py::Object pyChild(qt_wrapInstance<QObject*>(child, className, "shiboken2", "PySide2.QtWidgets", "wrapInstance"));
+                PyObject_SetAttrString(root, name.constData(), pyChild.ptr());
+#else
+                const char* className = qt_identifyType(child, "PySide.QtGui");
+                if (!className) {
+                    if (qobject_cast<QWidget*>(child))
+                        className = "QWidget";
+                    else
+                        className = "QObject";
+                }
+
+                Py::Object pyChild(qt_wrapInstance<QObject*>(child, className, "shiboken", "PySide.QtGui", "wrapInstance"));
+                PyObject_SetAttrString(root, name.constData(), pyChild.ptr());
+#endif
             }
             createChildrenNameAttributes(root, child);
         }
         createChildrenNameAttributes(root, child);
     }
-#else
-    Q_UNUSED(root);
-    Q_UNUSED(object);
-#endif
 }
 
 void PythonWrapper::setParent(PyObject* pyWdg, QObject* parent)
 {
 #if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE)
     if (parent) {
-#if defined (HAVE_SHIBOKEN2) && defined(HAVE_PYSIDE2)
-        Shiboken::AutoDecRef pyParent(Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide2_QtGuiTypes[SBK_QWIDGET_IDX], parent));
-#else
-        Shiboken::AutoDecRef pyParent(Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtGuiTypes[SBK_QWIDGET_IDX], parent));
-#endif
+        Shiboken::AutoDecRef pyParent(Shiboken::Conversions::pointerToPython(reinterpret_cast<SbkObjectType*>(Shiboken::SbkType<QWidget>()), parent));
         Shiboken::Object::setParent(pyParent, pyWdg);
     }
 #else

src/Mod/AddonManager/AddonManager.py

@@ -577,14 +577,18 @@ class UpdateWorker(QtCore.QThread):
             name = re.findall("title=\"(.*?) @",l)[0]
             self.info_label.emit(name)
             #url = re.findall("title=\"(.*?) @",l)[0]
-            url = "https://github.com/" + re.findall("href=\"\/(.*?)\/tree",l)[0]
-            addondir = moddir + os.sep + name
-            #print ("found:",name," at ",url)
-            if not os.path.exists(addondir):
-                state = 0
+            try:
+                url = "https://github.com/" + re.findall("href=\"\/(.*?)\/tree",l)[0]
+            except:
+                pass
             else:
-                state = 1
-            repos.append([name,url,state])
+                addondir = moddir + os.sep + name
+                #print ("found:",name," at ",url)
+                if not os.path.exists(addondir):
+                    state = 0
+                else:
+                    state = 1
+                repos.append([name,url,state])
         if not repos:
             self.info_label.emit(translate("AddonsInstaller", "Unable to download addon list."))
         else:

src/Mod/Fem/femsolver/elmer/tasks.py

@@ -28,6 +28,8 @@ __url__ = "http://www.freecadweb.org"
 
 import subprocess
 import os.path
+import sys
+
 import femtools.femutils as femutils
 
 from .. import run
@@ -112,7 +114,10 @@ class Solve(run.Solve):
     def _updateOutput(self, output):
         if self.solver.ElmerOutput is None:
             self._createOutput()
-        self.solver.ElmerOutput.Text = output.decode("utf-8")
+        if sys.version_info.major >= 3:
+            self.solver.ElmerOutput.Text = output
+        else:
+            self.solver.ElmerOutput.Text = output.decode("utf-8")
 
     def _createOutput(self):
         self.solver.ElmerOutput = self.analysis.Document.addObject(

src/Mod/Idf/Idf.py

@@ -22,11 +22,15 @@
 #*   Milos Koutny 2010                                                     *
 #***************************************************************************/
 
-import FreeCAD, Part, os, FreeCADGui, __builtin__
+import FreeCAD, Part, os, FreeCADGui
 from FreeCAD import Base
 from math import *
 import ImportGui
 
+# to distinguish python built-in open function from the one declared here
+if open.__module__ in ['__builtin__','io']:
+    pythonopen = open
+
 ##########################################################
 # Script version dated 19-Jan-2012                       #
 ##########################################################
@@ -54,8 +58,6 @@ IDF_diag_path="/tmp" # path for output of footprint.lst and missing_models.lst
 #              End config section do not touch code below                              #
 ########################################################################################
 
-pythonopen = __builtin__.open # to distinguish python built-in open function from the one declared here
-
 def open(filename):
 	"""called when freecad opens an Emn file"""
 	docname = os.path.splitext(os.path.basename(filename))[0]

src/Mod/Material/Material.py

@@ -20,6 +20,8 @@
 # *                                                                         *
 # ***************************************************************************
 
+import sys
+
 # here the usage description if you use this tool from the command line ("__main__")
 CommandlineUsage = """Material - Tool to work with FreeCAD Material definition cards
 
@@ -62,7 +64,10 @@ def importFCMat(fileName):
 
     Config = configparser.RawConfigParser()
     Config.optionxform = str
-    Config.read(fileName)
+    if sys.version_info.major >= 3:
+        Config.read(fileName, encoding='utf-8')  # respect unicode filenames
+    else:
+        Config.read(fileName)
     dict1 = {}
     for section in Config.sections():
         options = Config.options(section)

src/Mod/OpenSCAD/OpenSCADUtils.py

@@ -42,6 +42,8 @@ except AttributeError:
         return QtGui.QApplication.translate(context, text, None)
 
 import io
+import sys
+PY2 = sys.version_info.major == 2
 
 try:
     import FreeCAD
@@ -144,18 +146,23 @@ def callopenscad(inputfilename,outputfilename=None,outputext='csg',keepname=Fals
     import FreeCAD,os,subprocess,tempfile,time
     def check_output2(*args,**kwargs):
         kwargs.update({'stdout':subprocess.PIPE,'stderr':subprocess.PIPE})
-        p=subprocess.Popen(*args,**kwargs)
+        if PY2:
+            p=subprocess.Popen(*args)
+        else:
+            p=subprocess.Popen(*args,**kwargs)
         stdoutd,stderrd = p.communicate()
-        stdoutd = stdoutd.decode("utf8")
-        stderrd = stderrd.decode("utf8")
+        if not PY2:
+            stdoutd = stdoutd.decode("utf8")
+            stderrd = stderrd.decode("utf8")
         if p.returncode != 0:
             raise OpenSCADError('%s %s\n' % (stdoutd.strip(),stderrd.strip()))
             #raise Exception,'stdout %s\n stderr%s' %(stdoutd,stderrd)
-        if stderrd.strip():
-            FreeCAD.Console.PrintWarning(stderrd+u'\n')
-        if stdoutd.strip():
-            FreeCAD.Console.PrintMessage(stdoutd+u'\n')
-            return stdoutd
+        if not PY2:
+            if stderrd.strip():
+                FreeCAD.Console.PrintWarning(stderrd+u'\n')
+            if stdoutd.strip():
+                FreeCAD.Console.PrintMessage(stdoutd+u'\n')
+                return stdoutd
 
     osfilename = FreeCAD.ParamGet(\
         "User parameter:BaseApp/Preferences/Mod/OpenSCAD").\
@@ -182,7 +189,10 @@ def callopenscadstring(scadstr,outputext='csg'):
     dir1=tempfile.gettempdir()
     inputfilename=os.path.join(dir1,'%s.scad' % next(tempfilenamegen))
     inputfile = io.open(inputfilename,'w', encoding="utf8")
-    inputfile.write(scadstr)
+    if PY2:
+        inputfile.write(scadstr.decode('utf8'))
+    else:
+        inputfile.write(scadstr)
     inputfile.close()
     outputfilename = callopenscad(inputfilename,outputext=outputext,\
         keepname=True)

src/Mod/Part/App/FeatureCompound.cpp

@@ -66,21 +66,29 @@ App::DocumentObjectExecReturn *Compound::execute(void)
         TopoDS_Compound comp;
         builder.MakeCompound(comp);
 
+        // avoid duplicates without changing the order
+        // See also ViewProviderCompound::updateData
+        std::set<DocumentObject*> tempLinks;
+
         const std::vector<DocumentObject*>& links = Links.getValues();
         for (std::vector<DocumentObject*>::const_iterator it = links.begin(); it != links.end(); ++it) {
             if (*it && (*it)->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) {
                 Part::Feature* fea = static_cast<Part::Feature*>(*it);
-                const TopoDS_Shape& sh = fea->Shape.getValue();
-                if (!sh.IsNull()) {
-                    builder.Add(comp, sh);
-                    TopTools_IndexedMapOfShape faceMap;
-                    TopExp::MapShapes(sh, TopAbs_FACE, faceMap);
-                    ShapeHistory hist;
-                    hist.type = TopAbs_FACE;
-                    for (int i=1; i<=faceMap.Extent(); i++) {
-                        hist.shapeMap[i-1].push_back(countFaces++);
+
+                auto pos = tempLinks.insert(fea);
+                if (pos.second) {
+                    const TopoDS_Shape& sh = fea->Shape.getValue();
+                    if (!sh.IsNull()) {
+                        builder.Add(comp, sh);
+                        TopTools_IndexedMapOfShape faceMap;
+                        TopExp::MapShapes(sh, TopAbs_FACE, faceMap);
+                        ShapeHistory hist;
+                        hist.type = TopAbs_FACE;
+                        for (int i=1; i<=faceMap.Extent(); i++) {
+                            hist.shapeMap[i-1].push_back(countFaces++);
+                        }
+                        history.push_back(hist);
                     }
-                    history.push_back(hist);
                 }
             }
         }

src/Mod/Part/Gui/Command.cpp

@@ -908,11 +908,15 @@ void CmdPartCompound::activated(int iMsg)
 
     std::vector<Gui::SelectionSingleton::SelObj> Sel = getSelection().getSelection();
     std::stringstream str;
-    std::vector<std::string> tempSelNames;
+
+    // avoid duplicates without changing the order
+    std::set<std::string> tempSelNames;
     str << "App.activeDocument()." << FeatName << ".Links = [";
-    for (std::vector<Gui::SelectionSingleton::SelObj>::iterator it = Sel.begin(); it != Sel.end(); ++it){
-        str << "App.activeDocument()." << it->FeatName << ",";
-        tempSelNames.push_back(it->FeatName);
+    for (std::vector<Gui::SelectionSingleton::SelObj>::iterator it = Sel.begin(); it != Sel.end(); ++it) {
+        auto pos = tempSelNames.insert(it->FeatName);
+        if (pos.second) {
+            str << "App.activeDocument()." << it->FeatName << ",";
+        }
     }
     str << "]";
 

src/Mod/Part/Gui/ViewProviderCompound.cpp

@@ -72,6 +72,24 @@ void ViewProviderCompound::updateData(const App::Property* prop)
             (prop)->getValues();
         Part::Compound* objComp = static_cast<Part::Compound*>(getObject());
         std::vector<App::DocumentObject*> sources = objComp->Links.getValues();
+
+        if (hist.size() != sources.size()) {
+            // avoid duplicates without changing the order
+            // See also Compound::execute
+            std::set<App::DocumentObject*> tempSources;
+            std::vector<App::DocumentObject*> filter;
+            for (std::vector<App::DocumentObject*>::iterator it = sources.begin(); it != sources.end(); ++it) {
+                Part::Feature* objBase = dynamic_cast<Part::Feature*>(*it);
+                if (objBase) {
+                    auto pos = tempSources.insert(objBase);
+                    if (pos.second) {
+                        filter.push_back(objBase);
+                    }
+                }
+            }
+
+            sources = filter;
+        }
         if (hist.size() != sources.size())
             return;
 

src/Mod/Path/PathScripts/PathCircularHoleBaseGui.py

@@ -29,6 +29,10 @@ import PathScripts.PathOpGui as PathOpGui
 
 from PySide import QtCore, QtGui
 
+import sys
+if sys.version_info.major >= 3:
+    xrange = range
+
 __title__ = "Base for Circular Hole based operations' UI"
 __author__ = "sliptonic (Brad Collette)"
 __url__ = "http://www.freecadweb.org"

src/Mod/Path/PathScripts/PathJobGui.py

@@ -1019,6 +1019,10 @@ class TaskPanel:
             Draft.move(sel.Object, by)
 
     def updateSelection(self):
+        # Remove Job object if present in Selection: source of phantom paths
+        if self.obj in FreeCADGui.Selection.getSelection():
+            FreeCADGui.Selection.removeSelection(self.obj)
+
         sel = FreeCADGui.Selection.getSelectionEx()
 
         if len(sel) == 1 and len(sel[0].SubObjects) == 1:

src/Mod/Path/PathScripts/PathSurface.py

@@ -35,6 +35,10 @@ import PathScripts.PathOp as PathOp
 
 from PySide import QtCore
 
+import sys
+if sys.version_info.major >= 3:
+    xrange = range
+
 __title__ = "Path Surface Operation"
 __author__ = "sliptonic (Brad Collette)"
 __url__ = "http://www.freecadweb.org"

src/Mod/Path/PathScripts/post/grbl_G81_post.py

@@ -101,7 +101,7 @@ CURRENT_Z = 0
 
 
 # to distinguish python built-in open function from the one declared below
-if open.__module__ == '__builtin__':
+if open.__module__  in ['__builtin__','io']:
   pythonopen = open
 
 
@@ -393,7 +393,7 @@ def drill_translate(outstring, cmd, params):
     RETRACT_Z = CURRENT_Z
 
   # Recupere les valeurs des autres parametres
-  drill_Speed = params['F']
+  drill_Speed = params['F'] * SPEED_MULTIPLIER
   if cmd == 'G83':
     drill_Step = params['Q']
   elif cmd == 'G82':

src/Mod/Sketcher/App/SketchObject.cpp

@@ -5140,7 +5140,7 @@ int SketchObject::carbonCopy(App::DocumentObject * pObj, bool construction)
 
     for (std::vector<Part::Geometry *>::const_iterator it=svals.begin(); it != svals.end(); ++it){
         Part::Geometry *geoNew = (*it)->copy();
-        if(construction) {
+        if(construction && geoNew->getTypeId() != Part::GeomPoint::getClassTypeId()) {
             geoNew->Construction = true;
         }
         newVals.push_back(geoNew);
@@ -5174,11 +5174,13 @@ int SketchObject::carbonCopy(App::DocumentObject * pObj, bool construction)
     int sourceid = 0;
     for (std::vector< Sketcher::Constraint * >::const_iterator it= scvals.begin(); it != scvals.end(); ++it,nextcid++,sourceid++) {
 
-        if ((*it)->Type == Sketcher::Distance ||
-            (*it)->Type == Sketcher::Radius ||
-            (*it)->Type == Sketcher::Diameter ||
-            (*it)->Type == Sketcher::Angle ||
-            (*it)->Type == Sketcher::SnellsLaw) {
+        if ((*it)->Type == Sketcher::Distance   ||
+            (*it)->Type == Sketcher::Radius     ||
+            (*it)->Type == Sketcher::Diameter   ||
+            (*it)->Type == Sketcher::Angle      ||
+            (*it)->Type == Sketcher::SnellsLaw  ||
+            (*it)->Type == Sketcher::DistanceX  ||
+            (*it)->Type == Sketcher::DistanceY ) {
             // then we link its value to the parent
             // (there is a plausible alternative for a slightly different use case to copy the expression of the parent if one is existing)
             if ((*it)->isDriving) {
@@ -5191,45 +5193,7 @@ int SketchObject::carbonCopy(App::DocumentObject * pObj, bool construction)
 
                 boost::shared_ptr<App::Expression> expr(App::Expression::parse(this, spath.getDocumentObjectName().getString() +std::string(1,'.') + spath.toString()));
                 setExpression(Constraints.createPath(nextcid), expr);
-
-
             }
-
-        }
-        else if ((*it)->Type == Sketcher::DistanceX) {
-            // then we link its value to the parent
-            // (there is a plausible alternative for a slightly different use case to copy the expression of the parent if one is existing)
-            if ((*it)->isDriving) {
-                App::ObjectIdentifier spath = psObj->Constraints.createPath(sourceid);
-
-                if(xinv) {
-                    boost::shared_ptr<App::Expression> expr(App::Expression::parse(this, std::string(1,'-') + spath.getDocumentObjectName().getString() +std::string(1,'.') + spath.toString()));
-                    setExpression(Constraints.createPath(nextcid), expr);
-                }
-                else {
-                    boost::shared_ptr<App::Expression> expr(App::Expression::parse(this, spath.getDocumentObjectName().getString() +std::string(1,'.') + spath.toString()));
-
-                    setExpression(Constraints.createPath(nextcid), expr);
-                }
-            }
-
-        }
-        else if ((*it)->Type == Sketcher::DistanceY ) {
-            // then we link its value to the parent
-            // (there is a plausible alternative for a slightly different use case to copy the expression of the parent if one is existing)
-            if ((*it)->isDriving) {
-                App::ObjectIdentifier spath = psObj->Constraints.createPath(sourceid);
-
-                if(yinv) {
-                    boost::shared_ptr<App::Expression> expr(App::Expression::parse(this, std::string(1,'-') + spath.getDocumentObjectName().getString() +std::string(1,'.') + spath.toString()));
-                    setExpression(Constraints.createPath(nextcid), expr);
-                }
-                else {
-                    boost::shared_ptr<App::Expression> expr(App::Expression::parse(this, spath.getDocumentObjectName().getString() +std::string(1,'.') + spath.toString()));
-                    setExpression(Constraints.createPath(nextcid), expr);
-                }
-            }
-
         }
     }
 

src/Mod/Spreadsheet/importXLSX.py

@@ -57,6 +57,7 @@ known issues:
 import zipfile
 import xml.dom.minidom
 import FreeCAD as App
+import sys
 
 try: import FreeCADGui
 except ValueError: gui = False
@@ -371,7 +372,10 @@ def handleCells(cellList, actCellSheet, sList):
           if cellType == 'n':
             actCellSheet.set(ref, theValue)
           if cellType == 's':
-            actCellSheet.set(ref, (sList[int(theValue)]).encode('utf8'))
+            if sys.version_info.major >= 3:
+                actCellSheet.set(ref, (sList[int(theValue)]))
+            else:
+                actCellSheet.set(ref, (sList[int(theValue)]).encode('utf8'))
 
 
 def handleWorkBook(theBook, sheetDict, Doc):

src/Mod/TechDraw/Gui/QGIFace.cpp

@@ -517,6 +517,7 @@ void QGIFace::buildSvgHatch()
     before.append(QString::fromStdString(SVGCOLPREFIX + SVGCOLDEFAULT));
     after.append(QString::fromStdString(SVGCOLPREFIX + m_svgCol));
     QByteArray colorXML = m_svgXML.replace(before,after);
+    long int tileCount = 0;
     for (int iw = 0; iw < int(nw); iw++) {
         for (int ih = 0; ih < int(nh); ih++) {
             QGCustomSvg* tile = new QGCustomSvg();
@@ -525,6 +526,14 @@ void QGIFace::buildSvgHatch()
                 tile->setParentItem(m_rect);
                 tile->setPos(iw*wTile,-h + ih*hTile);
             }
+            tileCount++;
+            if (tileCount > m_maxTile) {
+                Base::Console().Warning("SVG tile count exceeded: %ld\n",tileCount);
+                break;
+            }
+        }
+        if (tileCount > m_maxTile) {
+            break;
         }
     }
 }
@@ -611,6 +620,10 @@ void QGIFace::getParameters(void)
         .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/PAT");
 
     m_maxSeg = hGrp->GetInt("MaxSeg",10000l);
+
+    hGrp = App::GetApplication().GetUserParameter()
+        .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Decorations");
+    m_maxTile = hGrp->GetInt("MaxSVGTile",10000l);
 }
 
 

src/Mod/TechDraw/Gui/QGIFace.h

@@ -147,6 +147,7 @@ protected:
     std::vector<DashSpec> m_dashSpecs;
     long int m_segCount;
     long int m_maxSeg;
+    long int m_maxTile;
 
 
 private:

src/Mod/TechDraw/Gui/QGIViewPart.cpp

@@ -374,7 +374,10 @@ void QGIViewPart::drawViewPart()
                         }
                         newFace->isHatched(true);
                         newFace->setFillMode(QGIFace::GeomHatchFill);
-                        newFace->setHatchScale(fGeom->ScalePattern.getValue());
+                        double hatchScale = fGeom->ScalePattern.getValue();
+                        if (hatchScale > 0.0) {
+                            newFace->setHatchScale(fGeom->ScalePattern.getValue());
+                        }
                         newFace->setHatchFile(fGeom->FilePattern.getValue());
                         Gui::ViewProvider* gvp = QGIView::getViewProvider(fGeom);
                         ViewProviderGeomHatch* geomVp = dynamic_cast<ViewProviderGeomHatch*>(gvp);
@@ -392,7 +395,10 @@ void QGIViewPart::drawViewPart()
                     Gui::ViewProvider* gvp = QGIView::getViewProvider(fHatch);
                     ViewProviderHatch* hatchVp = dynamic_cast<ViewProviderHatch*>(gvp);
                     if (hatchVp != nullptr) {
-                        newFace->setHatchScale(hatchVp->HatchScale.getValue());
+                        double hatchScale = hatchVp->HatchScale.getValue();
+                        if (hatchScale > 0.0) {
+                            newFace->setHatchScale(hatchVp->HatchScale.getValue());
+                        }
                         newFace->setHatchColor(hatchVp->HatchColor.getValue());
                     }
                 }
@@ -541,7 +547,8 @@ void QGIViewPart::removePrimitives()
     for (auto& c:children) {
          QGIPrimPath* prim = dynamic_cast<QGIPrimPath*>(c);
          if (prim) {
-            removeFromGroup(prim);
+            prim->hide();
+//            removeFromGroup(prim);
             scene()->removeItem(prim);
             delete prim;
          }
@@ -559,11 +566,13 @@ void QGIViewPart::removeDecorations()
          QGIDecoration* decor = dynamic_cast<QGIDecoration*>(c);
          QGIMatting* mat = dynamic_cast<QGIMatting*>(c);
          if (decor) {
-            removeFromGroup(decor);
+            decor->hide();
+//            removeFromGroup(decor);
             scene()->removeItem(decor);
             delete decor;
          } else if (mat) {
-            removeFromGroup(mat);
+            mat->hide();
+//            removeFromGroup(mat);
             scene()->removeItem(mat);
             delete mat;
          }

src/Mod/TechDraw/Gui/ViewProviderHatch.cpp

@@ -47,8 +47,13 @@
 
 using namespace TechDrawGui;
 
-App::PropertyFloatConstraint::Constraints ViewProviderHatch::scaleRange = {Precision::Confusion(),
-                                                                  std::numeric_limits<double>::max(),
+//scaleRange = {lowerLimit, upperLimit, stepSize}
+//original range is far too broad for drawing.  causes massive loop counts.
+//App::PropertyFloatConstraint::Constraints ViewProviderHatch::scaleRange = {Precision::Confusion(),
+//                                                                  std::numeric_limits<double>::max(),
+//                                                                  pow(10,- Base::UnitsApi::getDecimals())};
+App::PropertyFloatConstraint::Constraints ViewProviderHatch::scaleRange = {pow(10,- Base::UnitsApi::getDecimals()),
+                                                                  1000.0,
                                                                   pow(10,- Base::UnitsApi::getDecimals())};
 
 
@@ -99,9 +104,11 @@ void ViewProviderHatch::onChanged(const App::Property* prop)
 {
     if ((prop == &HatchScale) ||
         (prop == &HatchColor)) {
-        TechDraw::DrawViewPart* parent = getViewObject()->getSourceView();
-        if (parent) {
-            parent->requestPaint();
+        if (HatchScale.getValue() > 0.0) {
+            TechDraw::DrawViewPart* parent = getViewObject()->getSourceView();
+            if (parent) {
+                parent->requestPaint();
+            }
         }
     }
 }

src/Mod/Web/Gui/BrowserView.cpp

@@ -227,6 +227,11 @@ BrowserView::BrowserView(QWidget* parent)
       isLoading(false),
       textSizeMultiplier(1.0)
 {
+#if defined(QTWEBENGINE)
+    // Otherwise cause crash on exit, probably due to double deletion
+    setAttribute(Qt::WA_DeleteOnClose,false);
+#endif
+
     view = new WebView(this);
     setCentralWidget(view);