Merge branch 'main' into annotation_dragging

hlorus · Dec 6, 2023 · f128ad2 · f128ad2
2 parents a792b9a + 008fc32
commit f128ad2
Show file tree

Hide file tree

Showing 94 changed files with 2,304 additions and 1,778 deletions.
diff --git a/cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake b/cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake
@@ -2,7 +2,7 @@ macro(ConfigureCMakeVariables)
     # ================================================================================
     # Output directories for install target
 
-    if(WIN32)
+    if(MSVC)
         set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "Installation root directory")
         set(CMAKE_INSTALL_BINDIR bin CACHE PATH "Output directory for executables")
         set(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files")

diff --git a/cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake b/cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake
@@ -75,7 +75,7 @@ macro(SetupSalomeSMESH)
         if(NOT FREECAD_USE_EXTERNAL_SMESH)
             find_package(MEDFile REQUIRED)
             # See https://www.hdfgroup.org/HDF5/release/cmakebuild.html
-            if (WIN32)
+            if (MSVC)
                 find_package(HDF5 COMPONENTS NO_MODULE REQUIRED static)
             else()
                 find_package(PkgConfig)

diff --git a/conda/environment.devenv.yml b/conda/environment.devenv.yml
@@ -61,14 +61,13 @@ dependencies:
 - coin3d==4.0.0
 - compilers
 - conda
-- conda-build
 - conda-devenv
-- conda-smithy
 - debugpy
 - doxygen
 - eigen
 - fmt
 - freetype
+- git
 - gmsh
 - graphviz
 - hdf5

diff --git a/contrib/.vscode/tasks.json b/contrib/.vscode/tasks.json
@@ -1,7 +1,7 @@
 {
   "tasks": [
     {
-      "type": "shell",
+      "type": "process",
       "label": "FreeCAD: setup conda environment",
       "linux": {
         "command": "conda/setup-environment.sh",
@@ -68,4 +68,4 @@
     }
   ],
   "version": "2.0.0"
-}
+}
diff --git a/src/App/Document.cpp b/src/App/Document.cpp
@@ -93,6 +93,7 @@ recompute path. Also, it enables more complicated dependencies beyond trees.
 #include <Base/Uuid.h>
 #include <Base/Sequencer.h>
 #include <Base/Stream.h>
+#include <Base/UnitsApi.h>
 
 #include "Document.h"
 #include "private/DocumentP.h"
@@ -821,6 +822,18 @@ Document::Document(const char* documentName)
                       0,
                       Prop_None,
                       "Additional tag to save the name of the company");
+    ADD_PROPERTY_TYPE(UnitSystem, (""), 0, Prop_None, "Unit system to use in this project");
+    // Set up the possible enum values for the unit system
+    int num = static_cast<int>(Base::UnitSystem::NumUnitSystemTypes);
+    std::vector<std::string> enumValsAsVector;
+    for (int i = 0; i < num; i++) {
+        QString item = Base::UnitsApi::getDescription(static_cast<Base::UnitSystem>(i));
+        enumValsAsVector.emplace_back(item.toStdString());
+    }
+    UnitSystem.setEnums(enumValsAsVector);
+    // Get the preferences/General unit system as the default for a new document
+    ParameterGrp::handle hGrpu = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Units");
+    UnitSystem.setValue(hGrpu->GetInt("UserSchema", 0));
     ADD_PROPERTY_TYPE(Comment, (""), 0, Prop_None, "Additional tag to save a comment");
     ADD_PROPERTY_TYPE(Meta, (), 0, Prop_None, "Map with additional meta information");
     ADD_PROPERTY_TYPE(Material, (), 0, Prop_None, "Map with material properties");

diff --git a/src/App/Document.h b/src/App/Document.h
@@ -93,6 +93,8 @@ class AppExport Document : public App::PropertyContainer
     PropertyString LastModifiedDate;
     /// company name UTF8(optional)
     PropertyString Company;
+    /// Unit System
+    PropertyEnumeration UnitSystem;
     /// long comment or description (UTF8 with line breaks)
     PropertyString Comment;
     /// Id e.g. Part number

diff --git a/src/App/PropertyExpressionEngine.h b/src/App/PropertyExpressionEngine.h
@@ -172,7 +172,7 @@ class AppExport PropertyExpressionEngine : public App::PropertyExpressionContain
     using DiGraph = boost::adjacency_list< boost::listS, boost::vecS, boost::directedS >;
     using Edge = std::pair<int, int>;
     // Note: use std::map instead of unordered_map to keep the binding order stable
-    #if defined(FC_OS_MACOSX) || defined(FC_OS_BSD)
+    #if defined(FC_OS_MACOSX) || defined(FC_OS_BSD) || defined(_LIBCPP_VERSION)
     using ExpressionMap = std::map<App::ObjectIdentifier, ExpressionInfo>;
     #else
     using ExpressionMap = std::map<const App::ObjectIdentifier, ExpressionInfo>;

diff --git a/src/Base/Builder3D.h b/src/Base/Builder3D.h
@@ -26,12 +26,9 @@
 
 // Std. configurations
 
-#ifdef __GNUC__
-#include <cstdint>
-#endif
-
 #include <sstream>
 #include <vector>
+#include <cstdint>
 #include <Base/Tools3D.h>
 #ifndef FC_GLOBAL_H
 #include <FCGlobal.h>

diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp
@@ -933,19 +933,19 @@ void Application::slotActiveDocument(const App::Document& Doc)
                 Py::Module("FreeCADGui").setAttr(std::string("ActiveDocument"),Py::None());
             }
         }
-
-        //Set Unit System.
-        int projectUnitSystemIndex = doc->second->getProjectUnitSystem();
-        int ignore = doc->second->getProjectUnitSystemIgnore();
-        if( projectUnitSystemIndex >= 0 && !ignore ){//is valid
-        	Base::UnitsApi::setSchema(static_cast<Base::UnitSystem>(projectUnitSystemIndex));
+
+        // Update the application to show the unit change
+        ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath
+            ("User parameter:BaseApp/Preferences/Units");
+        if( Doc.FileName.getValue()[0] != '\0' &&  ! hGrp->GetBool("IgnoreProjectSchema")) {
+            int userSchema = Doc.UnitSystem.getValue();
+            Base::UnitsApi::setSchema(static_cast<Base::UnitSystem>(userSchema));
+            getMainWindow()->setUserSchema(userSchema);
+            Application::Instance->onUpdate();
         }else{// set up Unit system default
-			ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath
-			   ("User parameter:BaseApp/Preferences/Units");
 			Base::UnitsApi::setSchema((Base::UnitSystem)hGrp->GetInt("UserSchema",0));
 			Base::UnitsApi::setDecimals(hGrp->GetInt("Decimals", Base::UnitsApi::getDecimals()));
         }
-
         signalActiveDocument(*doc->second);
         updateActions();
     }

diff --git a/src/Gui/DemoMode.cpp b/src/Gui/DemoMode.cpp
@@ -180,7 +180,7 @@ void DemoMode::onAngleSliderValueChanged(int v)
         SbRotation rot(SbVec3f(-1, 0, 0), angle);
         reorientCamera(cam ,rot);
         this->oldvalue = v;
-        if (view->getViewer()->isAnimating()) {
+        if (view->getViewer()->isSpinning()) {
             startAnimation(view);
         }
     }
@@ -206,7 +206,7 @@ void DemoMode::onSpeedSliderValueChanged(int v)
 {
     Q_UNUSED(v);
     Gui::View3DInventor* view = activeView();
-    if (view && view->getViewer()->isAnimating()) {
+    if (view && view->getViewer()->isSpinning()) {
         startAnimation(view);
     }
 }
@@ -216,7 +216,7 @@ void DemoMode::onPlayButtonToggled(bool pressed)
     Gui::View3DInventor* view = activeView();
     if (view) {
         if (pressed) {
-            if (!view->getViewer()->isAnimating()) {
+            if (!view->getViewer()->isSpinning()) {
                 SoCamera* cam = view->getViewer()->getSoRenderManager()->getCamera();
                 if (cam) {
                     SbRotation rot = cam->orientation.getValue();
@@ -263,17 +263,14 @@ void DemoMode::onTimeoutValueChanged(int v)
 void DemoMode::onAutoPlay()
 {
     Gui::View3DInventor* view = activeView();
-    if (view && !view->getViewer()->isAnimating()) {
+    if (view && !view->getViewer()->isSpinning()) {
         ui->playButton->setChecked(true);
         startAnimation(view);
     }
 }
 
 void DemoMode::startAnimation(Gui::View3DInventor* view)
 {
-    if (!view->getViewer()->isAnimationEnabled())
-        view->getViewer()->setAnimationEnabled(true);
-
     view->getViewer()->startSpinningAnimation(getDirection(view),
                                               getSpeed(ui->speedSlider->value()));
 }

diff --git a/src/Gui/DlgPreferences.ui b/src/Gui/DlgPreferences.ui
@@ -13,7 +13,7 @@
   <property name="minimumSize">
    <size>
     <width>1000</width>
-    <height>600</height>
+    <height>500</height>
    </size>
   </property>
   <property name="windowTitle">

diff --git a/src/Gui/DlgPreferencesImp.cpp b/src/Gui/DlgPreferencesImp.cpp
@@ -39,6 +39,7 @@
 # include <QToolTip>
 # include <QProcess>
 # include <QPushButton>
+# include <QWindow>
 #endif
 
 #include <App/Application.h>
@@ -690,6 +691,22 @@ void DlgPreferencesImp::restartIfRequired()
 void DlgPreferencesImp::showEvent(QShowEvent* ev)
 {
     QDialog::showEvent(ev);
+
+    auto screen = windowHandle()->screen();
+    auto availableSize = screen->availableSize();
+
+    // leave at least 100 px of height so preferences window does not take
+    // entire screen height. User will still be able to resize the window,
+    // but it should never start too tall.
+    auto maxStartHeight = availableSize.height() - 100;
+
+    if (height() > maxStartHeight) {
+        auto heightDifference = availableSize.height() - maxStartHeight;
+
+        // resize and reposition window so it is fully visible
+        resize(width(), maxStartHeight);
+        move(x(), heightDifference / 2);
+    }
 }
 
 QModelIndex findRootIndex(const QModelIndex& index)

diff --git a/src/Gui/DlgProjectInformation.ui b/src/Gui/DlgProjectInformation.ui
@@ -137,6 +137,23 @@
        </widget>
       </item>
       <item row="4" column="0">
+       <widget class="QLabel" name="textLabelUnitSystem">
+        <property name="text">
+         <string>Unit System:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+        <widget class="QComboBox" name="comboBox_unitSystem">
+         <property name="toolTip">
+          <string>Unit system for this file</string>
+         </property>
+        </widget>
+      </item>
+      <item row="5" column="0">
        <widget class="QLabel" name="textLabelCreator">
         <property name="text">
          <string>Created &amp;by:</string>
@@ -149,7 +166,7 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="1">
+      <item row="5" column="1">
        <widget class="QLineEdit" name="lineEditCreator">
         <property name="minimumSize">
          <size>
@@ -159,7 +176,7 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="0">
+      <item row="6" column="0">
        <widget class="QLabel" name="textLabelCreateDate">
         <property name="text">
          <string>Creation &amp;date:</string>
@@ -172,7 +189,7 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="1">
+      <item row="6" column="1">
        <widget class="QLineEdit" name="lineEditDate">
         <property name="minimumSize">
          <size>
@@ -185,7 +202,7 @@
         </property>
        </widget>
       </item>
-      <item row="6" column="0">
+      <item row="7" column="0">
        <widget class="QLabel" name="textLabelLastMod">
         <property name="text">
          <string>&amp;Last modified by:</string>
@@ -198,7 +215,7 @@
         </property>
        </widget>
       </item>
-      <item row="6" column="1">
+      <item row="7" column="1">
        <widget class="QLineEdit" name="lineEditLastMod">
         <property name="minimumSize">
          <size>
@@ -208,7 +225,7 @@
         </property>
        </widget>
       </item>
-      <item row="7" column="0">
+      <item row="8" column="0">
        <widget class="QLabel" name="textLabelLastModDate">
         <property name="text">
          <string>Last &amp;modification date:</string>
@@ -221,7 +238,7 @@
         </property>
        </widget>
       </item>
-      <item row="7" column="1">
+      <item row="8" column="1">
        <widget class="QLineEdit" name="lineEditLastModDate">
         <property name="minimumSize">
          <size>
@@ -234,7 +251,7 @@
         </property>
        </widget>
       </item>
-      <item row="8" column="0">
+      <item row="9" column="0">
        <widget class="QLabel" name="textLabelCompany">
         <property name="text">
          <string>Com&amp;pany:</string>
@@ -247,7 +264,7 @@
         </property>
        </widget>
       </item>
-      <item row="8" column="1">
+      <item row="9" column="1">
        <widget class="QLineEdit" name="lineEditCompany">
         <property name="minimumSize">
          <size>
@@ -257,7 +274,7 @@
         </property>
        </widget>
       </item>
-      <item row="9" column="0">
+      <item row="10" column="0">
        <widget class="QLabel" name="textLabelLicense">
         <property name="text">
          <string>License information:</string>
@@ -267,10 +284,10 @@
         </property>
        </widget>
       </item>
-      <item row="9" column="1">
+      <item row="10" column="1">
        <widget class="QComboBox" name="comboLicense"/>
       </item>
-      <item row="10" column="0">
+      <item row="11" column="0">
        <widget class="QLabel" name="textLabelLicenseURL">
         <property name="text">
          <string>License URL</string>
@@ -280,7 +297,7 @@
         </property>
        </widget>
       </item>
-      <item row="10" column="1">
+      <item row="11" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
          <widget class="QLineEdit" name="lineEditLicenseURL"/>
@@ -294,7 +311,7 @@
         </item>
        </layout>
       </item>
-      <item row="11" column="0">
+      <item row="12" column="0">
        <widget class="QLabel" name="textLabelComment">
         <property name="text">
          <string>&amp;Comment:</string>
@@ -307,10 +324,10 @@
         </property>
        </widget>
       </item>
-      <item row="11" column="1" rowspan="2">
+      <item row="12" column="1" rowspan="2">
        <widget class="QTextEdit" name="textEditComment"/>
       </item>
-      <item row="12" column="0">
+      <item row="13" column="0">
        <spacer>
         <property name="orientation">
          <enum>Qt::Vertical</enum>