diff --git a/src/Gui/NaviCube.cpp b/src/Gui/NaviCube.cpp index 8ed7d5b448..0d4b4ff4f6 100644 --- a/src/Gui/NaviCube.cpp +++ b/src/Gui/NaviCube.cpp @@ -298,11 +298,11 @@ QFont NaviCube::getDefaultSansserifFont() QFont font(QString::fromLatin1("Helvetica")); if (font.styleHint() & QFont::SansSerif) return font; - // on Windows 10 or newer there is no Helvetia font - // therefore if we did not found a Helvetica font check for - // first the Bahnschrift font (in all Windows since 2017 - // if this is also not found (on Win 7), we check for the - // the DejaVu Sans fonts + // on Windows 10 or newer there is no Helvetica font + // therefore if we didn't find a Helvetica font check + // for the Bahnschrift font (in all Windows since 2017) + // if this too is unavailable (on Win 7), we check for the + // DejaVu Sans fonts font.setFamily(QString::fromLatin1("Bahnschrift")); // on Windows 11 sansserif fonts like Bahnschrift do not have the // styleHint QFont::SansSerif but QFont::AnyStyle @@ -370,7 +370,7 @@ void NaviCubeImplementation::OnChange(ParameterGrp::SubjectType& rCaller, ParameterGrp::MessageType reason) { const auto& rGrp = static_cast(rCaller); - + if (strcmp(reason, "TextColor") == 0) { m_TextColor.setRgba(rGrp.GetUnsigned(reason, QColor(0, 0, 0, 255).rgba())); } @@ -472,7 +472,7 @@ auto convertWeights = [](int weight) -> QFont::Weight { GLuint NaviCubeImplementation::createCubeFaceTex(QtGLWidget* gl, float gap, const char* text, int shape) -{ +{ int texSize = m_CubeWidgetSize * m_OverSample; float gapi = texSize * gap; QImage image(texSize, texSize, QImage::Format_ARGB32); diff --git a/src/Mod/AddonManager/addonmanager_installer.py b/src/Mod/AddonManager/addonmanager_installer.py index 2ab2f2379d..1232d5e7bb 100644 --- a/src/Mod/AddonManager/addonmanager_installer.py +++ b/src/Mod/AddonManager/addonmanager_installer.py @@ -52,7 +52,7 @@ translate = FreeCAD.Qt.translate class InstallationMethod(IntEnum): """For packages installed from a git repository, in most cases it is possible to either use git or to download a zip archive of the addon. For a local repository, a direct copy may be used - instead. If "ANY" is given, the the internal code decides which to use.""" + instead. If "ANY" is given, the internal code decides which to use.""" GIT = auto() COPY = auto() diff --git a/src/Mod/Fem/femsolver/elmer/writer.py b/src/Mod/Fem/femsolver/elmer/writer.py index 772c1de708..a2a9034895 100644 --- a/src/Mod/Fem/femsolver/elmer/writer.py +++ b/src/Mod/Fem/femsolver/elmer/writer.py @@ -1263,7 +1263,7 @@ class Writer(object): self._equation(b, "Convection", equation.Convection) if equation.MagneticInduction is True: self._equation(b, "Magnetic Induction", equation.MagneticInduction) - + #------------------------------------------------------------------------------------------- # Flux diff --git a/src/Mod/Path/Data/Threads/sources.txt b/src/Mod/Path/Data/Threads/sources.txt index d67e754e4e..9e7ba5f55f 100644 --- a/src/Mod/Path/Data/Threads/sources.txt +++ b/src/Mod/Path/Data/Threads/sources.txt @@ -5,4 +5,4 @@ https://www.engineersedge.com/thread_strength/internal_screw_threads_chart.htm https://www.engineersedge.com/hardware/metric-external-thread-sizes1.htm https://www.engineersedge.com/hardware/metric-external-thread-sizes2.htm - dMinorMin = dPitchMin - (dMajorMax - dPitchMax) * 0.948 + dMinorMin = dPitchMin - (dMajorMax - dPitchMax) * 0.948 diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp index 9cab66a8d4..34b9fce81a 100644 --- a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp +++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp @@ -443,7 +443,7 @@ void TaskLeaderLine::removeFeature() if (Gui::Command::hasPendingCommand()) { std::vector undos = Gui::Application::Instance->activeDocument()->getUndoVector(); Gui::Application::Instance->activeDocument()->undo(1); - } + } } } diff --git a/src/Mod/TechDraw/TDTest/DrawViewDetailTest.py b/src/Mod/TechDraw/TDTest/DrawViewDetailTest.py index 635577f17d..81a6c654f6 100644 --- a/src/Mod/TechDraw/TDTest/DrawViewDetailTest.py +++ b/src/Mod/TechDraw/TDTest/DrawViewDetailTest.py @@ -69,7 +69,7 @@ class DrawViewDetailTest(unittest.TestCase): loop.exec_() edges = detail.getVisibleEdges() - + self.assertEqual(len(edges), 4, "DrawViewDetail has wrong number of edges") self.assertTrue("Up-to-date" in detail.State, "DrawViewDetail is not Up-to-date")