From 940f4f7cfad80debfb64e38eb8d79c492500a9ad Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Tue, 6 Jun 2023 07:37:15 -0500 Subject: [PATCH 1/5] CMake: Remove last vestige of raytracing --- cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake | 1 - cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake | 1 - 2 files changed, 2 deletions(-) diff --git a/cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake b/cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake index 1a0378db08..334d3b2325 100644 --- a/cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake +++ b/cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake @@ -31,7 +31,6 @@ macro(CheckInterModuleDependencies) REQUIRES_MODS(BUILD_PART_DESIGN BUILD_SKETCHER) # REQUIRES_MODS(BUILD_PATH BUILD_PART BUILD_MESH BUILD_ROBOT) REQUIRES_MODS(BUILD_PATH BUILD_PART BUILD_MESH) - REQUIRES_MODS(BUILD_RAYTRACING BUILD_PART) REQUIRES_MODS(BUILD_REVERSEENGINEERING BUILD_PART BUILD_MESH) REQUIRES_MODS(BUILD_ROBOT BUILD_PART) REQUIRES_MODS(BUILD_SANDBOX BUILD_PART BUILD_MESH) diff --git a/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake b/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake index 03e9e4cf9a..c0d98a2517 100644 --- a/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake +++ b/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake @@ -119,7 +119,6 @@ macro(InitializeFreeCADBuildOptions) option(BUILD_PATH "Build the FreeCAD path module" ON) option(BUILD_PLOT "Build the FreeCAD plot module" ON) option(BUILD_POINTS "Build the FreeCAD points module" ON) - option(BUILD_RAYTRACING "Build the FreeCAD ray tracing module" ON) option(BUILD_REVERSEENGINEERING "Build the FreeCAD reverse engineering module" ON) option(BUILD_ROBOT "Build the FreeCAD robot module" ON) option(BUILD_SHOW "Build the FreeCAD Show module (helper module for visibility automation)" ON) From f18ead6f02e7794a1d7e7f8dc26d7f0eab768c96 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sat, 3 Jun 2023 18:22:23 -0800 Subject: [PATCH 2/5] Sketcher: Add missing translations --- src/Mod/Sketcher/Gui/Workbench.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Mod/Sketcher/Gui/Workbench.cpp b/src/Mod/Sketcher/Gui/Workbench.cpp index 32dc53216b..58e1b6e0c3 100644 --- a/src/Mod/Sketcher/Gui/Workbench.cpp +++ b/src/Mod/Sketcher/Gui/Workbench.cpp @@ -37,11 +37,13 @@ using namespace SketcherGui; qApp->translate("Workbench","P&rofiles"); qApp->translate("Workbench","S&ketch"); qApp->translate("Workbench", "Sketcher"); + qApp->translate("Workbench", "Sketcher edit mode"); qApp->translate("Workbench", "Sketcher geometries"); qApp->translate("Workbench", "Sketcher constraints"); qApp->translate("Workbench", "Sketcher tools"); qApp->translate("Workbench", "Sketcher B-spline tools"); qApp->translate("Workbench", "Sketcher virtual space"); + qApp->translate("Workbench", "Sketcher edit tools"); #endif /// @namespace SketcherGui @class Workbench @@ -109,7 +111,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const Gui::ToolBarItem* sketcherEditMode = new Gui::ToolBarItem(root, Gui::ToolBarItem::DefaultVisibility::Unavailable); - sketcherEditMode->setCommand("Sketcher Edit Mode"); + sketcherEditMode->setCommand("Sketcher edit mode"); addSketcherWorkbenchSketchEditModeActions(*sketcherEditMode); Gui::ToolBarItem* geom = From 0f9f0f29ca61d61b6ee94e1abc9e3350227e1360 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Tue, 6 Jun 2023 11:31:12 -0500 Subject: [PATCH 3/5] FEM: Add translation for Electromagnetic Constraints --- src/Mod/Fem/Gui/Workbench.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Mod/Fem/Gui/Workbench.cpp b/src/Mod/Fem/Gui/Workbench.cpp index 7741fb53cb..c7ae79ad6f 100755 --- a/src/Mod/Fem/Gui/Workbench.cpp +++ b/src/Mod/Fem/Gui/Workbench.cpp @@ -50,6 +50,8 @@ using namespace FemGui; qApp->translate("Workbench", "&Electrostatic Constraints"); qApp->translate("Workbench", "Fluid Constraints"); qApp->translate("Workbench", "&Fluid Constraints"); + qApp->translate("Workbench", "Electromagnetic Constraints"); + qApp->translate("Workbench", "&Electromagnetic Constraints"); qApp->translate("Workbench", "Geometrical Constraints"); qApp->translate("Workbench", "&Geometrical Constraints"); qApp->translate("Workbench", "Mechanical Constraints"); From ffb6b9722963ac2f01836352f9db478474621a75 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Tue, 6 Jun 2023 11:36:13 -0500 Subject: [PATCH 4/5] Arch: Fix typo in UI string --- src/Mod/Arch/Resources/ui/ArchSchedule.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Arch/Resources/ui/ArchSchedule.ui b/src/Mod/Arch/Resources/ui/ArchSchedule.ui index f6db541314..a55d9c88f8 100644 --- a/src/Mod/Arch/Resources/ui/ArchSchedule.ui +++ b/src/Mod/Arch/Resources/ui/ArchSchedule.ui @@ -95,7 +95,7 @@ Leave blank to use all objects from the document Filter - An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filer (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied + An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filter (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive): Name:Wall - Will only consider objects with 'wall' in their name (internal name); !Name:Wall - Will only consider objects which DON'T have 'wall' in their name (internal name); Description:Win - Will only consider objects with 'win' in their description; !Label:Win - Will only consider objects which DO NOT have 'win' in their label; IfcType:Wall - Will only consider objects which Ifc Type is 'Wall'; !Tag:Wall - Will only consider objects which tag is NOT 'Wall'. If you leave this field empty, no filtering is applied From 85b206e752d7e188083166429ebb02bc0157ecc5 Mon Sep 17 00:00:00 2001 From: MisterMaker Date: Tue, 6 Jun 2023 20:07:03 +0200 Subject: [PATCH 5/5] Delete CMakePresets.json So annoying this slipped in. --- CMakePresets.json | 59 ----------------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 CMakePresets.json diff --git a/CMakePresets.json b/CMakePresets.json deleted file mode 100644 index 27c27b34e8..0000000000 --- a/CMakePresets.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "version": 3, - "configurePresets": [ - { - "name": "windows-base", - "description": "Target Windows with the Visual Studio development environment.", - "hidden": true, - "generator": "Ninja", - "binaryDir": "C:\\github repros\\out\\freecadbuild/${presetName}", - "installDir": "C:\\github repros\\out\\freecadinstall/${presetName}", - "cacheVariables": { - "CMAKE_C_COMPILER": "cl.exe", - "CMAKE_CXX_COMPILER": "cl.exe", - "FREECAD_LIBPACK_DIR": "C:\\freecad_libs\\LibPack-OCC76-V2-7\\LibPack-OCC76-V2" - }, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - } - }, - { - "name": "x64-debug", - "displayName": "x64 Debug", - "description": "Target Windows (64-bit) with the Visual Studio development environment. (Debug)", - "inherits": "windows-base", - "architecture": { - "value": "x64", - "strategy": "external" - }, - "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug" } - }, - { - "name": "x64-release", - "displayName": "x64 Release", - "description": "Target Windows (64-bit) with the Visual Studio development environment. (RelWithDebInfo)", - "inherits": "x64-debug", - "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" } - }, - { - "name": "x86-debug", - "displayName": "x86 Debug", - "description": "Target Windows (32-bit) with the Visual Studio development environment. (Debug)", - "inherits": "windows-base", - "architecture": { - "value": "x86", - "strategy": "external" - }, - "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug" } - }, - { - "name": "x86-release", - "displayName": "x86 Release", - "description": "Target Windows (32-bit) with the Visual Studio development environment. (RelWithDebInfo)", - "inherits": "x86-debug", - "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" } - } - ] -} \ No newline at end of file