Merge branch 'master' of https://github.com/FreeCAD/FreeCAD into lead…

…inout_gui
FreeCAD · Jan 1, 2021 · cb9ad77 · cb9ad77
2 parents b12bf37 + 01072f3
commit cb9ad77
Show file tree

Hide file tree

Showing 1,112 changed files with 256,825 additions and 202,695 deletions.
diff --git a/README.md b/README.md
@@ -87,6 +87,24 @@ The pages below contain up-to-date build instructions:
 - [Cygwin](https://wiki.freecadweb.org/Compile_on_Cygwin)
 - [MinGW](https://wiki.freecadweb.org/Compile_on_MinGW)
 
+
+Reporting Issues
+---------
+
+To report an issue please:
+- First post to forum to verify the issue; 
+- Link forum thread to bug tracker ticket and vice-a-versa; 
+- Use the most updated stable or development versions of FreeCAD; 
+- Post version info from eg. `Help > About FreeCAD > Copy to clipboard`; 
+- Post a Step-By-Step explanation on how to recreate the issue; 
+- Upload an example file to demonstrate problem. 
+
+For more detail see:
+- [Wiki Page about the Bug Tracker](https://wiki.freecadweb.org/Tracker)
+- [Bug Tracker](https://tracker.freecadweb.org)
+- [Help Forum](http://forum.freecadweb.org/viewforum.php?f=3)
+
+
 Usage & Getting help
 --------------------
 

diff --git a/src/3rdParty/salomesmesh/inc/SMESH_Controls.hxx b/src/3rdParty/salomesmesh/inc/SMESH_Controls.hxx
@@ -53,7 +53,7 @@ namespace SMESH{
     class SMESHCONTROLS_EXPORT Functor
     {
     public:
-      ~Functor(){}
+      virtual ~Functor(){}
       virtual void SetMesh( const SMDS_Mesh* theMesh ) = 0;
       virtual SMDSAbs_ElementType GetType() const = 0;
     };

diff --git a/src/App/Application.h b/src/App/Application.h
@@ -24,7 +24,7 @@
 #ifndef APP_APPLICATION_H
 #define APP_APPLICATION_H
 
-#include <boost/signals2.hpp>
+#include <boost_signals2.hpp>
 
 #include <vector>
 #include <deque>

diff --git a/src/App/ApplicationPy.cpp b/src/App/ApplicationPy.cpp
@@ -104,7 +104,7 @@ PyMethodDef Application::Methods[] = {
      "loadFile(string=filename,[string=module]) -> None\n\n"
      "Loads an arbitrary file by delegating to the given Python module:\n"
      "* If no module is given it will be determined by the file extension.\n"
-     "* If more than one module can load a file the first one one will be taken.\n"
+     "* If more than one module can load a file the first one will be taken.\n"
      "* If no module exists to load the file an exception will be raised."},
     {"open",   reinterpret_cast<PyCFunction>(reinterpret_cast<void (*) (void)>( Application::sOpenDocument )), METH_VARARGS|METH_KEYWORDS,
      "See openDocument(string)"},

diff --git a/src/App/Document.cpp b/src/App/Document.cpp
@@ -70,7 +70,7 @@ recompute path. Also, it enables more complicated dependencies beyond trees.
 
 #include <boost/algorithm/string.hpp>
 
-#include <boost/graph/adjacency_list.hpp>
+#include <boost_graph_adjacency_list.hpp>
 #include <boost/graph/subgraph.hpp>
 #include <boost/graph/graphviz.hpp>
 #include <boost/graph/strong_components.hpp>

diff --git a/src/App/Document.h b/src/App/Document.h
@@ -37,7 +37,7 @@
 #include <stack>
 #include <functional>
 
-#include <boost/signals2.hpp>
+#include <boost_signals2.hpp>
 
 namespace Base {
     class Writer;

diff --git a/src/App/DocumentObject.h b/src/App/DocumentObject.h
@@ -36,7 +36,7 @@
 
 #include <unordered_map>
 #include <bitset>
-#include <boost/signals2.hpp>
+#include <boost_signals2.hpp>
 
 namespace App
 {
@@ -407,7 +407,7 @@ class AppExport DocumentObject: public App::TransactionalObject
      *
      * @param newLabel: input as the new label, which can be modified by object itself
      *
-     * This function is is called before onBeforeChange()
+     * This function is called before onBeforeChange()
      */
     virtual void onBeforeChangeLabel(std::string &newLabel) {(void)newLabel;}
 

diff --git a/src/App/DocumentObserver.h b/src/App/DocumentObserver.h
@@ -25,7 +25,7 @@
 #define APP_DOCUMENTOBSERVER_H
 
 #include <Base/BaseClass.h>
-#include <boost/signals2.hpp>
+#include <boost_signals2.hpp>
 #include <set>
 #include <memory>
 

diff --git a/src/App/DocumentObserverPython.h b/src/App/DocumentObserverPython.h
@@ -26,7 +26,7 @@
 
 #include <CXX/Objects.hxx>
 
-#include <boost/signals2.hpp>
+#include <boost_signals2.hpp>
 #include <boost/bind/bind.hpp>
 #include <string>
 

diff --git a/src/App/GroupExtension.h b/src/App/GroupExtension.h
@@ -24,7 +24,7 @@
 #ifndef APP_GROUPEXTENSION_H
 #define APP_GROUPEXTENSION_H
 
-#include <boost/signals2.hpp>
+#include <boost_signals2.hpp>
 #include "FeaturePython.h"
 #include "DocumentObject.h"
 #include "PropertyLinks.h"

diff --git a/src/App/Link.h b/src/App/Link.h
@@ -24,7 +24,7 @@
 #define APP_LINK_H
 
 #include <unordered_set>
-#include <boost/signals2.hpp>
+#include <boost_signals2.hpp>
 #include <boost/preprocessor/facilities/expand.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/seq/for_each.hpp>

diff --git a/src/App/MergeDocuments.h b/src/App/MergeDocuments.h
@@ -24,7 +24,7 @@
 #ifndef APP_MERGEDOCUMENTS_H
 #define APP_MERGEDOCUMENTS_H
 
-#include <boost/signals2.hpp>
+#include <boost_signals2.hpp>
 #include <Base/Persistence.h>
 
 namespace zipios {

diff --git a/src/App/PreCompiled.h b/src/App/PreCompiled.h
@@ -80,13 +80,13 @@
 #include <iterator>
 
 // Boost
-#include <boost/signals2.hpp>
+#include <boost_signals2.hpp>
 #include <boost/bind/bind.hpp>
 #include <boost/regex.hpp>
 
 #include <boost/tuple/tuple.hpp>
 #include <boost/utility.hpp>
-#include <boost/graph/adjacency_list.hpp>
+#include <boost_graph_adjacency_list.hpp>
 
 #include <boost/program_options.hpp>
 //namespace po = boost::program_options;

diff --git a/src/App/PropertyExpressionEngine.cpp b/src/App/PropertyExpressionEngine.cpp
@@ -36,7 +36,6 @@
 #include <CXX/Objects.hxx>
 #include <boost/bind/bind.hpp>
 #include <boost/graph/graph_traits.hpp>
-#include <boost/graph/adjacency_list.hpp>
 
 
 using namespace App;

diff --git a/src/App/PropertyExpressionEngine.h b/src/App/PropertyExpressionEngine.h
@@ -25,8 +25,8 @@
 
 #include <boost/unordered/unordered_map.hpp>
 #include <boost/function.hpp>
-#include <boost/signals2.hpp>
-#include <boost/graph/adjacency_list.hpp>
+#include <boost_signals2.hpp>
+#include <boost_graph_adjacency_list.hpp>
 #include <boost/graph/topological_sort.hpp>
 #include <App/PropertyLinks.h>
 #include <App/Expression.h>

diff --git a/src/App/PropertyLinks.h b/src/App/PropertyLinks.h
@@ -25,7 +25,7 @@
 #define APP_PROPERTYLINKS_H
 
 // Std. configurations
-#include <boost/signals2.hpp>
+#include <boost_signals2.hpp>
 
 #include <vector>
 #include <map>

diff --git a/src/App/TextDocument.cpp b/src/App/TextDocument.cpp
@@ -25,7 +25,7 @@
 
 #include <string>
 #include <fstream>
-#include <boost/signals2.hpp>
+#include <boost_signals2.hpp>
 
 #include "DocumentObject.h"
 #include "TextDocument.h"

diff --git a/src/App/TextDocument.h b/src/App/TextDocument.h
@@ -26,7 +26,7 @@
 
 
 #include <string>
-#include <boost/signals2.hpp>
+#include <boost_signals2.hpp>
 
 #include "DocumentObject.h"
 #include "PropertyStandard.h"

diff --git a/src/Base/Tools.h b/src/Base/Tools.h
@@ -30,7 +30,7 @@
 #include <iostream>
 #include <vector>
 #include <string>
-#include <boost/signals2.hpp>
+#include <boost_signals2.hpp>
 #include <QString>
 #include <QObject>
 

diff --git a/src/CXX/Python3/Objects.hxx b/src/CXX/Python3/Objects.hxx
@@ -2135,13 +2135,20 @@ namespace Py
         // Queries
         virtual size_type size() const
         {
-            return PyUnicode_GET_SIZE( ptr() );
+            return PyUnicode_GetLength( ptr() );
+        }
+
+#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 9
+        const Py_UNICODE *unicode_data() const
+        {
+            return PyUnicode_AS_UNICODE( ptr() );
         }
 
         unicodestring as_unicodestring() const
         {
-            return unicodestring( PyUnicode_AS_UNICODE( ptr() ), PyUnicode_GET_SIZE( ptr() ) );
+            return unicodestring( unicode_data(), PyUnicode_GetLength( ptr() ) );
         }
+#endif
 
         operator std::string() const
         {
@@ -2154,11 +2161,6 @@ namespace Py
             Bytes b( encode( encoding, error ) );
             return b.as_std_string();
         }
-
-        const Py_UNICODE *unicode_data() const
-        {
-            return PyUnicode_AS_UNICODE( ptr() );
-        }
     };
 
     // ==================================================

diff --git a/src/Doc/CMakeLists.txt b/src/Doc/CMakeLists.txt
@@ -65,7 +65,8 @@ if(DOXYGEN_FOUND)
                            ${CMAKE_SOURCE_DIR}/src/Mod
                            ${CMAKE_BINARY_DIR}/src/Mod
                            #${CMAKE_SOURCE_DIR}/src/Main #nothing to document there ATM...
-                           ${CMAKE_SOURCE_DIR}/src/Doc 
+                           ${CMAKE_SOURCE_DIR}/src/Doc
+                           ${CMAKE_BINARY_DIR}/src/Doc 
     )
     STRING(REGEX REPLACE ";" " " DOXYGEN_INPUT_LIST "${DOXYGEN_SOURCE_DIR}")
 

diff --git a/src/Doc/mainpage.dox.in b/src/Doc/mainpage.dox.in
@@ -22,8 +22,6 @@
 
 /**
 
-
-
     \mainpage FreeCAD source documentation
 
     This is the source documentation of <a href=https://www.freecadweb.org>FreeCAD</a>. 
@@ -50,8 +48,6 @@
     the source code documentation</a>. You can also browse through the <a href=https://github.com/FreeCAD/FreeCAD>source
     code on github</a>.
 
-
-
   \if DEV_DOCUMENTATION
 
   \mainpage FreeCAD source documentation
@@ -78,7 +74,9 @@
 
   \endif
 
+<small>
 @GIT_REVISION_INFO@
+</small>
  */
 
 /** \namespace std

diff --git a/src/Doc/templates/footer.html b/src/Doc/templates/footer.html
@@ -16,11 +16,17 @@
 </div>
 </div>
 <!--BEGIN !GENERATE_TREEVIEW-->
-<hr class="footer"/><address class="footer"><small>
-$generatedby &#160;<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="$relpath^doxygen.png" alt="doxygen"/>
-</a> $doxygenversion
-</small></address>
+<address class="footer">
+    <small>
+        <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">
+            <img alt="Creative Commons Licence" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/80x15.png" />
+        </a> &#160;
+        $generatedby &#160;
+        <a href="http://www.doxygen.org/index.html">
+            <img class="footer" src="$relpath^doxygen.png" alt="doxygen"/>
+        </a> $doxygenversion
+    </small>
+</address>
 <!--END !GENERATE_TREEVIEW-->
 </body>
 </html>
diff --git a/src/Doc/templates/header.html b/src/Doc/templates/header.html
@@ -20,16 +20,21 @@
         $mathjax
         <link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
         $extrastylesheet
-        <link href='//fonts.googleapis.com/css?family=Roboto+Slab' rel='stylesheet' type='text/css'>
+        <!--<link href='//fonts.googleapis.com/css?family=Roboto+Slab' rel='stylesheet' type='text/css'>-->
         <link rel="stylesheet" href="$relpath^freecad.css">
         <script type="text/javascript" src="$relpath^doxy-boot.js"></script>
-        <link rel="shortcut icon" href="favicon.ico">
+        <link rel="shortcut icon" href="https://freecadweb.org/images/favicon.ico">
     </head>
     <body>        
         <ul class="navbar" role="navigation">
+            <li>
+                <a href="https://freecadweb.org" title="FreeCAD">
+                    <img src="https://freecadweb.org/images/freecad-logo.png">
+                </a>
+            </li>
             <li><a href="$relpath^index.html" title="Index">Index</a></li>
-            <li><a href="$relpath^modules.html" title="Modules list">Modules Hierarchy</a></li>
-            <li><a href="$relpath^annotated.html" title="Annotated list">Alphabetical list</a></li>
+            <li><a href="$relpath^modules.html" title="Modules list">Modules</a></li>
+            <li><a href="$relpath^annotated.html" title="Annotated list">Classes</a></li>
         </ul>
 
         <div id="top" class="maincontents"><!-- do not remove this div, it is closed by doxygen! -->

diff --git a/src/Gui/Action.cpp b/src/Gui/Action.cpp
@@ -24,7 +24,7 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <boost/signals2.hpp>
+# include <boost_signals2.hpp>
 # include <boost_bind_bind.hpp>
 # include <QAbstractItemView>
 # include <QActionEvent>
@@ -252,8 +252,10 @@ void ActionGroup::addTo(QWidget *w)
     // and adding this action to the widget doesn't work.
     if (_dropDown) {
         if (w->inherits("QMenu")) {
-            QMenu* menu = qobject_cast<QMenu*>(w);
-            menu = menu->addMenu(_action->text());
+            QMenu *menu = new QMenu(w);
+            QAction* action = qobject_cast<QMenu*>(w)->addMenu(menu);
+            action->setMenuRole(_action->menuRole());
+            menu->setTitle(_action->text());
             menu->addActions(_group->actions());
         }
         else if (w->inherits("QToolBar")) {

diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp
@@ -25,7 +25,7 @@
 
 #ifndef _PreComp_
 # include "InventorAll.h"
-# include <boost/signals2.hpp>
+# include <boost_signals2.hpp>
 # include <boost_bind_bind.hpp>
 # include <sstream>
 # include <stdexcept>

diff --git a/src/Gui/ApplicationPy.cpp b/src/Gui/ApplicationPy.cpp
@@ -214,7 +214,7 @@ PyMethodDef Application::Methods[] = {
    "loadFile(string=filename,[string=module]) -> None\n\n"
    "Loads an arbitrary file by delegating to the given Python module:\n"
    "* If no module is given it will be determined by the file extension.\n"
-   "* If more than one module can load a file the first one one will be taken.\n"
+   "* If more than one module can load a file the first one will be taken.\n"
    "* If no module exists to load the file an exception will be raised."},
 
   {"coinRemoveAllChildren",     (PyCFunction) Application::sCoinRemoveAllChildren, METH_VARARGS,

diff --git a/src/Gui/AutoSaver.h b/src/Gui/AutoSaver.h
@@ -29,7 +29,7 @@
 #include <map>
 #include <set>
 #include <string>
-#include <boost/signals2.hpp>
+#include <boost_signals2.hpp>
 
 namespace App {
 class Document;

diff --git a/src/Gui/Command.cpp b/src/Gui/Command.cpp
@@ -995,6 +995,7 @@ Command *GroupCommand::addCommand(const char *name) {
 
 Action * GroupCommand::createAction(void) {
     ActionGroup* pcAction = new ActionGroup(this, getMainWindow());
+    pcAction->setMenuRole(QAction::NoRole);
     pcAction->setDropDownMenu(true);
     pcAction->setExclusive(false);
     pcAction->setCheckable(true);

diff --git a/src/Gui/CommandStd.cpp b/src/Gui/CommandStd.cpp
@@ -377,6 +377,7 @@ Action * StdCmdDlgPreferences::createAction(void)
 {
     Action *pcAction = Command::createAction();
     pcAction->setMenuRole(QAction::PreferencesRole);
+
     return pcAction;
 }