Tag stable version 8.0.4.

Currently translated at 99.9% (9191 of 9194 strings)

Translation: KiCad EDA/v8
Translate-URL: https://hosted.weblate.org/projects/kicad/v8/it/

.gitlab/doxygen.yml

@@ -6,7 +6,7 @@ build_doxygen_docker:
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_JOB_NAME == "doxygen"
   tags:
-    - docker
+    - gitlab-org-docker
   before_script:
     - docker info
     - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY"

.gitlab/macOS-CI.yml

@@ -15,25 +15,7 @@ macos_build:
     - cd build/macos
     - cmake
       -G Ninja
-      -DCMAKE_BUILD_TYPE=RelWithDebInfo
-      -DDEFAULT_INSTALL_PATH=/Library/Application\ Support /kicad
-      -DOCC_INCLUDE_DIR=/opt/homebrew/Cellar/opencascade/7.7.2_2/include/opencascade
-      -DOCC_LIBRARY_DIR=/opt/homebrew/Cellar/opencascade/7.7.2_2/Lib
-      -DCMAKE_INSTALL_PREFIX=/Users/ci/kicad-mac-builder/build/kicad-dest
-      -DCMAKE_C_COMPILER=/usr/bin/clang
-      -DCMAKE_CXX_COMPILER=/usr/bin/clang++
-      -DwxWidgets_CONFIG_EXECUTABLE=/Users/ci/kicad-mac-builder/build/wxwidgets-dest/bin/wx-config
-      -DKICAD_BUILD_I18N=ON
-      -DKICAD_SCRIPTING_WXPYTHON=ON
-      -DKICAD_BUILD_PNS_DEBUG_TOOL=ON
-      -DPYTHON_EXECUTABLE=/Users/ci/kicad-mac-builder/build/python-dest/Library/Frameworks/Python.framework/Versions/Current/bin/python3
-      -DPYTHON_INCLUDE_DIR=/Users/ci/kicad-mac-builder/build/python-dest/Library/Frameworks/Python.framework/Versions/Current/include/python3.9/
-      -DPYTHON_LIBRARY=/Users/ci/kicad-mac-builder/build/python-dest/Library/Frameworks/Python.framework/Versions/Current/lib/libpython3.9.dylib
-      -DPYTHON_SITE_PACKAGE_PATH=/Users/ci/kicad-mac-builder/build/python-dest/Library/Frameworks/Python.framework/Versions/Current/lib/python3.9/site-packages
-      -DPYTHON_FRAMEWORK=/Users/ci/kicad-mac-builder/build/python-dest/Library/Frameworks/Python.framework
-      -DNGSPICE_INCLUDE_DIR=/Users/ci/kicad-mac-builder/build/ngspice-dest/include
-      -DNGSPICE_LIBRARY=/Users/ci/kicad-mac-builder/build/ngspice-dest/lib/libngspice.dylib
-      -DKICAD_USE_3DCONNEXION=ON
+      -DCMAKE_TOOLCHAIN_FILE=/Users/ci/kicad-mac-builder/toolchain/kicad-mac-builder.cmake
       ../../
     - cmake --build . 2>&1 | tee compilation_log.txt
     - cd ../../

3d-viewer/3d_canvas/board_adapter.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2015-2023 Mario Luzeiro <mrluzeiro@ua.pt>
  * Copyright (C) 2023 CERN
- * Copyright (C) 1992-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2024 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -142,8 +142,8 @@ BOARD_ADAPTER::BOARD_ADAPTER() :
     m_offboardPadsFront = nullptr;
     m_offboardPadsBack = nullptr;
 
-    m_frontPlatedPadPolys = nullptr;
-    m_backPlatedPadPolys = nullptr;
+    m_frontPlatedPadAndGraphicPolys = nullptr;
+    m_backPlatedPadAndGraphicPolys = nullptr;
     m_frontPlatedCopperPolys = nullptr;
     m_backPlatedCopperPolys = nullptr;
 
@@ -397,13 +397,18 @@ void BOARD_ADAPTER::InitSettings( REPORTER* aStatusReporter, REPORTER* aWarningR
                     break;
 
                 case BS_ITEM_TYPE_COPPER:
-                    if( item->GetBrdLayerId() == F_Cu )
-                        m_frontCopperThickness3DU = item->GetThickness() * m_biuTo3Dunits;
-                    else if( item->GetBrdLayerId() == B_Cu )
-                        m_backCopperThickness3DU = item->GetThickness() * m_biuTo3Dunits;
-                    else if( item->IsEnabled() )
-                        thickness += item->GetThickness();
+                {
+                    // The copper thickness must be > 0 to avoid draw issues (divide by 0 for instance)
+                    // We use a minimal arbitrary value = 1 micrometer here:
+                    int copper_thickness = std::max( item->GetThickness(), pcbIUScale.mmToIU( 0.001 ) );
 
+                    if( item->GetBrdLayerId() == F_Cu )
+                        m_frontCopperThickness3DU = copper_thickness * m_biuTo3Dunits;
+                    else if( item->GetBrdLayerId() == B_Cu )
+                        m_backCopperThickness3DU = copper_thickness * m_biuTo3Dunits;
+                    else if( item->IsEnabled() )
+                        thickness += copper_thickness;
+                }
                     break;
 
                 default:
@@ -449,7 +454,7 @@ void BOARD_ADAPTER::InitSettings( REPORTER* aStatusReporter, REPORTER* aWarningR
     for( ; layer < MAX_CU_LAYERS; layer++ )
     {
         m_layerZcoordBottom[layer] = -( m_boardBodyThickness3DU / 2.0f );
-        m_layerZcoordTop[layer]    = -( m_boardBodyThickness3DU / 2.0f ) - m_backCopperThickness3DU;
+        m_layerZcoordTop[layer]    = m_layerZcoordBottom[layer] - m_backCopperThickness3DU;
     }
 
     // This is the top of the copper layer thickness.
@@ -703,6 +708,8 @@ void BOARD_ADAPTER::SetLayerColors( const std::map<int, COLOR4D>& aColors )
 
     for( const auto& [ layer, color ] : aColors )
         settings->SetColor( layer, color );
+
+    Pgm().GetSettingsManager().SaveColorSettings( settings, "3d_viewer" );
 }
 
 

3d-viewer/3d_canvas/board_adapter.h

@@ -331,8 +331,8 @@ public:
      */
     const MAP_POLY& GetPolyMap() const noexcept { return m_layers_poly; }
 
-    const SHAPE_POLY_SET* GetFrontPlatedPadPolys() { return m_frontPlatedPadPolys;  }
-    const SHAPE_POLY_SET* GetBackPlatedPadPolys() { return m_backPlatedPadPolys; }
+    const SHAPE_POLY_SET* GetFrontPlatedPadAndGraphicPolys() { return m_frontPlatedPadAndGraphicPolys;  }
+    const SHAPE_POLY_SET* GetBackPlatedPadAndGraphicPolys() { return m_backPlatedPadAndGraphicPolys; }
     const MAP_POLY& GetHoleIdPolysMap() const noexcept { return m_layerHoleIdPolys; }
     const MAP_POLY& GetHoleOdPolysMap() const noexcept { return m_layerHoleOdPolys; }
 
@@ -438,8 +438,8 @@ private:
     MAP_POLY          m_layers_poly;          ///< Amalgamated polygon contours for various types
                                               ///<   of items
 
-    SHAPE_POLY_SET*   m_frontPlatedPadPolys;
-    SHAPE_POLY_SET*   m_backPlatedPadPolys;
+    SHAPE_POLY_SET*   m_frontPlatedPadAndGraphicPolys;
+    SHAPE_POLY_SET*   m_backPlatedPadAndGraphicPolys;
     SHAPE_POLY_SET*   m_frontPlatedCopperPolys;
     SHAPE_POLY_SET*   m_backPlatedCopperPolys;
 

3d-viewer/3d_canvas/create_layer_items.cpp

@@ -117,8 +117,8 @@ void BOARD_ADAPTER::destroyLayers()
 
     DELETE_AND_FREE_MAP( m_layers_poly );
 
-    DELETE_AND_FREE( m_frontPlatedPadPolys )
-    DELETE_AND_FREE( m_backPlatedPadPolys )
+    DELETE_AND_FREE( m_frontPlatedPadAndGraphicPolys )
+    DELETE_AND_FREE( m_backPlatedPadAndGraphicPolys )
     DELETE_AND_FREE( m_frontPlatedCopperPolys )
     DELETE_AND_FREE( m_backPlatedCopperPolys )
 
@@ -241,8 +241,8 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
 
     if( cfg.differentiate_plated_copper )
     {
-        m_frontPlatedPadPolys = new SHAPE_POLY_SET;
-        m_backPlatedPadPolys = new SHAPE_POLY_SET;
+        m_frontPlatedPadAndGraphicPolys = new SHAPE_POLY_SET;
+        m_backPlatedPadAndGraphicPolys = new SHAPE_POLY_SET;
         m_frontPlatedCopperPolys = new SHAPE_POLY_SET;
         m_backPlatedCopperPolys = new SHAPE_POLY_SET;
 
@@ -586,10 +586,10 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
             // ADD PLATED PADS contours
             for( FOOTPRINT* footprint : m_board->Footprints() )
             {
-                footprint->TransformPadsToPolySet( *m_frontPlatedPadPolys, F_Cu, 0, maxError,
+                footprint->TransformPadsToPolySet( *m_frontPlatedPadAndGraphicPolys, F_Cu, 0, maxError,
                                                    ERROR_INSIDE, true, false, true );
 
-                footprint->TransformPadsToPolySet( *m_backPlatedPadPolys, B_Cu, 0, maxError,
+                footprint->TransformPadsToPolySet( *m_backPlatedPadAndGraphicPolys, B_Cu, 0, maxError,
                                                    ERROR_INSIDE, true, false, true );
             }
         }
@@ -1050,21 +1050,33 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
                                                           SHAPE_POLY_SET::PM_FAST );
         }
 
-        // SUBTRACT PLATED COPPER FROM (UNPLATED) COPPER
+        // Subtract plated copper from unplated copper
+        bool hasF_Cu = false;
+        bool hasB_Cu = false;
+
         if( m_layers_poly.find( F_Cu ) != m_layers_poly.end() )
         {
-            m_layers_poly[F_Cu]->BooleanSubtract( *m_frontPlatedPadPolys, SHAPE_POLY_SET::PM_FAST );
+            m_layers_poly[F_Cu]->BooleanSubtract( *m_frontPlatedPadAndGraphicPolys, SHAPE_POLY_SET::PM_FAST );
             m_layers_poly[F_Cu]->BooleanSubtract( *m_frontPlatedCopperPolys, SHAPE_POLY_SET::PM_FAST );
+            hasF_Cu = true;
         }
 
         if( m_layers_poly.find( B_Cu ) != m_layers_poly.end() )
         {
-            m_layers_poly[B_Cu]->BooleanSubtract( *m_backPlatedPadPolys, SHAPE_POLY_SET::PM_FAST );
+            m_layers_poly[B_Cu]->BooleanSubtract( *m_backPlatedPadAndGraphicPolys, SHAPE_POLY_SET::PM_FAST );
             m_layers_poly[B_Cu]->BooleanSubtract( *m_backPlatedCopperPolys, SHAPE_POLY_SET::PM_FAST );
+            hasB_Cu = true;
         }
 
-        m_frontPlatedPadPolys->Simplify( SHAPE_POLY_SET::PM_FAST );
-        m_backPlatedPadPolys->Simplify( SHAPE_POLY_SET::PM_FAST );
+        // Add plated graphic items to build vertical walls
+        if( hasF_Cu && m_frontPlatedCopperPolys->OutlineCount() )
+            m_frontPlatedPadAndGraphicPolys->Append( *m_frontPlatedCopperPolys );
+
+        if( hasB_Cu && m_backPlatedCopperPolys->OutlineCount() )
+            m_backPlatedPadAndGraphicPolys->Append( *m_backPlatedCopperPolys );
+
+        m_frontPlatedPadAndGraphicPolys->Simplify( SHAPE_POLY_SET::PM_FAST );
+        m_backPlatedPadAndGraphicPolys->Simplify( SHAPE_POLY_SET::PM_FAST );
         m_frontPlatedCopperPolys->Simplify( SHAPE_POLY_SET::PM_FAST );
         m_backPlatedCopperPolys->Simplify( SHAPE_POLY_SET::PM_FAST );
 
@@ -1134,6 +1146,7 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
                                 if( layerPoly != m_layers_poly.end() )
                                 {
                                     // This will make a union of all added contours
+                                    layerPoly->second->ClearArcs();
                                     layerPoly->second->Simplify( SHAPE_POLY_SET::PM_FAST );
                                 }
                             }

3d-viewer/3d_canvas/eda_3d_canvas.cpp

@@ -33,6 +33,7 @@
 #include <3d_rendering/opengl/render_3d_opengl.h>
 #include <3d_viewer_id.h>
 #include <advanced_config.h>
+#include <build_version.h>
 #include <board.h>
 #include <reporter.h>
 #include <gal/opengl/gl_context_mgr.h>
@@ -229,6 +230,9 @@ bool  EDA_3D_CANVAS::initializeOpenGL()
                     From_UTF8( (char*) glewGetString( GLEW_VERSION ) ) );
     }
 
+    SetOpenGLInfo( (const char*) glGetString( GL_VENDOR ), (const char*) glGetString( GL_RENDERER ),
+                   (const char*) glGetString( GL_VERSION ) );
+
     wxString version = From_UTF8( (char *) glGetString( GL_VERSION ) );
 
     wxLogTrace( m_logTrace, wxT( "EDA_3D_CANVAS::%s OpenGL version string %s." ),

3d-viewer/3d_model_viewer/eda_3d_model_viewer.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2015-2016 Mario Luzeiro <mrluzeiro@ua.pt>
- * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2024 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -35,6 +35,7 @@
 #include "../3d_cache/3d_cache.h"
 #include <wx/dcclient.h>
 #include <base_units.h>
+#include <build_version.h>
 #include <gal/opengl/gl_context_mgr.h>
 #include <settings/common_settings.h>
 #include <pgm_base.h>
@@ -102,11 +103,6 @@ EDA_3D_MODEL_VIEWER::EDA_3D_MODEL_VIEWER( wxWindow* aParent, const int* aAttribL
     m_BiuTo3dUnits = 1.0;
 
     m_glRC = nullptr;
-
-    COMMON_SETTINGS* settings = Pgm().GetCommonSettings();
-
-    const DPI_SCALING_COMMON dpi{ settings, this };
-    SetScaleFactor( dpi.GetScaleFactor() );
 }
 
 
@@ -200,6 +196,9 @@ void EDA_3D_MODEL_VIEWER::ogl_initialize()
                     From_UTF8( (char*) glewGetString( GLEW_VERSION ) ) );
     }
 
+    SetOpenGLInfo( (const char*) glGetString( GL_VENDOR ), (const char*) glGetString( GL_RENDERER ),
+                   (const char*) glGetString( GL_VERSION ) );
+
     glHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST );
     glHint( GL_LINE_SMOOTH_HINT, GL_NICEST );
     glHint( GL_POLYGON_SMOOTH_HINT, GL_NICEST );

3d-viewer/3d_rendering/opengl/create_scene.cpp

@@ -613,12 +613,12 @@ void RENDER_3D_OPENGL::reload( REPORTER* aStatusReporter, REPORTER* aWarningRepo
 
     if( m_boardAdapter.m_Cfg->m_Render.differentiate_plated_copper )
     {
-        const SHAPE_POLY_SET* frontPlatedPadPolys = m_boardAdapter.GetFrontPlatedPadPolys();
-        const SHAPE_POLY_SET* backPlatedPadPolys = m_boardAdapter.GetBackPlatedPadPolys();
+        const SHAPE_POLY_SET* frontPlatedPadAndGraphicPolys = m_boardAdapter.GetFrontPlatedPadAndGraphicPolys();
+        const SHAPE_POLY_SET* backPlatedPadAndGraphicPolys = m_boardAdapter.GetBackPlatedPadAndGraphicPolys();
 
-        if( frontPlatedPadPolys )
+        if( frontPlatedPadAndGraphicPolys )
         {
-            SHAPE_POLY_SET poly = frontPlatedPadPolys->CloneDropTriangulation();
+            SHAPE_POLY_SET poly = frontPlatedPadAndGraphicPolys->CloneDropTriangulation();
             poly.BooleanIntersection( m_boardAdapter.GetBoardPoly(), SHAPE_POLY_SET::PM_FAST );
             poly.BooleanSubtract( m_boardAdapter.GetTH_ODPolys(), SHAPE_POLY_SET::PM_FAST );
             poly.BooleanSubtract( m_boardAdapter.GetNPTH_ODPolys(), SHAPE_POLY_SET::PM_FAST );
@@ -630,9 +630,9 @@ void RENDER_3D_OPENGL::reload( REPORTER* aStatusReporter, REPORTER* aWarningRepo
                 m_layers[F_Cu] = generateEmptyLayerList( F_Cu );
         }
 
-        if( backPlatedPadPolys )
+        if( backPlatedPadAndGraphicPolys )
         {
-            SHAPE_POLY_SET poly = backPlatedPadPolys->CloneDropTriangulation();
+            SHAPE_POLY_SET poly = backPlatedPadAndGraphicPolys->CloneDropTriangulation();
             poly.BooleanIntersection( m_boardAdapter.GetBoardPoly(), SHAPE_POLY_SET::PM_FAST );
             poly.BooleanSubtract( m_boardAdapter.GetTH_ODPolys(), SHAPE_POLY_SET::PM_FAST );
             poly.BooleanSubtract( m_boardAdapter.GetNPTH_ODPolys(), SHAPE_POLY_SET::PM_FAST );
@@ -917,6 +917,10 @@ void RENDER_3D_OPENGL::load3dModels( REPORTER* aStatusReporter )
     if( !m_boardAdapter.GetBoard() )
         return;
 
+    // Building the 3D models late crashes on recent versions of macOS
+    // Unclear the exact mechanism, but as a workaround, just build them
+    // all the time.  See https://gitlab.com/kicad/code/kicad/-/issues/17198
+#ifndef __WXMAC__
     if( !m_boardAdapter.m_IsPreviewer
           && !m_boardAdapter.m_Cfg->m_Render.show_footprints_normal
           && !m_boardAdapter.m_Cfg->m_Render.show_footprints_insert
@@ -924,6 +928,7 @@ void RENDER_3D_OPENGL::load3dModels( REPORTER* aStatusReporter )
     {
         return;
     }
+#endif
 
     // Go for all footprints
     for( const FOOTPRINT* footprint : m_boardAdapter.GetBoard()->Footprints() )

3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp

@@ -812,9 +812,6 @@ void EDA_3D_VIEWER_FRAME::loadCommonSettings()
 
     COMMON_SETTINGS* settings = Pgm().GetCommonSettings();
 
-    const DPI_SCALING_COMMON dpi{ settings, this };
-    m_canvas->SetScaleFactor( dpi.GetScaleFactor() );
-
     // TODO(JE) use all control options
     m_boardAdapter.m_MousewheelPanning = settings->m_Input.scroll_modifier_zoom != 0;
 }

3d-viewer/dialogs/appearance_controls_3D.cpp

@@ -83,6 +83,13 @@ const APPEARANCE_CONTROLS_3D::APPEARANCE_SETTING_3D APPEARANCE_CONTROLS_3D::s_la
     RR( _HKI( "Background End" ),         LAYER_3D_BACKGROUND_BOTTOM, _HKI( "Background gradient end color" ) ),
 };
 
+// The list of IDs that can have colors coming from the board stackup, and cannot be
+// modified if use colors from stackup is activated
+static std::vector<int> inStackupColors{ LAYER_3D_BOARD, LAYER_3D_COPPER_TOP,
+                                         LAYER_3D_COPPER_BOTTOM, LAYER_3D_SOLDERPASTE,
+                                         LAYER_3D_SILKSCREEN_TOP, LAYER_3D_SILKSCREEN_BOTTOM,
+                                         LAYER_3D_SOLDERMASK_TOP, LAYER_3D_SOLDERMASK_BOTTOM
+                                        };
 
 APPEARANCE_CONTROLS_3D::APPEARANCE_CONTROLS_3D( EDA_3D_VIEWER_FRAME* aParent,
                                                 wxWindow* aFocusOwner ) :
@@ -568,8 +575,14 @@ void APPEARANCE_CONTROLS_3D::UpdateLayerCtls()
         {
             setting->m_Ctl_color->SetSwatchColor( colors[ setting->m_Id ], false );
 
-            if( cfg )
-                setting->m_Ctl_color->SetReadOnly( cfg->m_UseStackupColors );
+            // if cfg->m_UseStackupColors is set, board colors cannot be modified locally, but
+            // other colors can be
+            if( std::find( inStackupColors.begin(), inStackupColors.end(), setting->m_Id )
+                != inStackupColors.end() )
+            {
+                if( cfg )
+                    setting->m_Ctl_color->SetReadOnly( cfg->m_UseStackupColors );
+            }
         }
     }
 

3d-viewer/dialogs/panel_preview_3d_model.cpp

@@ -210,9 +210,6 @@ void PANEL_PREVIEW_3D_MODEL::loadSettings()
 
     COMMON_SETTINGS* settings = Pgm().GetCommonSettings();
 
-    const DPI_SCALING_COMMON dpi{ settings, this };
-    m_previewPane->SetScaleFactor( dpi.GetScaleFactor() );
-
     // TODO(JE) use all control options
     m_boardAdapter.m_MousewheelPanning = settings->m_Input.scroll_modifier_zoom != 0;
 
@@ -444,10 +441,15 @@ void PANEL_PREVIEW_3D_MODEL::doIncrementScale( wxSpinEvent& event, double aSign
     else if( spinCtrl == m_spinZscale )
         textCtrl = zscale;
 
+    double step = SCALE_INCREMENT;
+
+    if( wxGetMouseState().ShiftDown( ) )
+        step = SCALE_INCREMENT_FINE;
+
     double curr_value = EDA_UNIT_UTILS::UI::DoubleValueFromString( pcbIUScale, EDA_UNITS::UNSCALED,
                                                                    textCtrl->GetValue() );
 
-    curr_value += ( SCALE_INCREMENT * aSign );
+    curr_value += ( step * aSign );
     curr_value = std::max( 1/MAX_SCALE, curr_value );
     curr_value = std::min( curr_value, MAX_SCALE );
 
@@ -465,10 +467,15 @@ void PANEL_PREVIEW_3D_MODEL::doIncrementRotation( wxSpinEvent& aEvent, double aS
     else if( spinCtrl == m_spinZrot )
         textCtrl = zrot;
 
+    double step = ROTATION_INCREMENT;
+
+    if( wxGetMouseState().ShiftDown( ) )
+        step = ROTATION_INCREMENT_FINE;
+
     double curr_value = EDA_UNIT_UTILS::UI::DoubleValueFromString( unityScale, EDA_UNITS::DEGREES,
                                                                    textCtrl->GetValue() );
 
-    curr_value += ( ROTATION_INCREMENT * aSign );
+    curr_value += ( step * aSign );
     curr_value = std::max( -MAX_ROTATION, curr_value );
     curr_value = std::min( curr_value, MAX_ROTATION );
 
@@ -488,16 +495,22 @@ void PANEL_PREVIEW_3D_MODEL::doIncrementOffset( wxSpinEvent& event, double aSign
         textCtrl = zoff;
 
     double step_mm = OFFSET_INCREMENT_MM;
-    double curr_value_mm =
-            EDA_UNIT_UTILS::UI::DoubleValueFromString( pcbIUScale, m_userUnits,
-                                                       textCtrl->GetValue() )
-            / pcbIUScale.IU_PER_MM;
+
+    if( wxGetMouseState().ShiftDown( ) )
+        step_mm = OFFSET_INCREMENT_MM_FINE;
 
     if( m_userUnits == EDA_UNITS::MILS || m_userUnits == EDA_UNITS::INCHES )
     {
         step_mm = 25.4*OFFSET_INCREMENT_MIL/1000;
+
+        if( wxGetMouseState().ShiftDown( ) )
+            step_mm = 25.4*OFFSET_INCREMENT_MIL_FINE/1000;;
     }
 
+    double curr_value_mm = EDA_UNIT_UTILS::UI::DoubleValueFromString( pcbIUScale, m_userUnits,
+                                                                      textCtrl->GetValue() )
+                           / pcbIUScale.IU_PER_MM;
+
     curr_value_mm += ( step_mm * aSign );
     curr_value_mm = std::max( -MAX_OFFSET, curr_value_mm );
     curr_value_mm = std::min( curr_value_mm, MAX_OFFSET );
@@ -533,10 +546,10 @@ void PANEL_PREVIEW_3D_MODEL::onMouseWheelRot( wxMouseEvent& event )
 {
     wxTextCtrl* textCtrl = (wxTextCtrl*) event.GetEventObject();
 
-    double step = ROTATION_INCREMENT_WHEEL;
+    double step = ROTATION_INCREMENT;
 
     if( event.ShiftDown( ) )
-        step = ROTATION_INCREMENT_WHEEL_FINE;
+        step = ROTATION_INCREMENT_FINE;
 
     if( event.GetWheelRotation() >= 0 )
         step = -step;

3d-viewer/dialogs/panel_preview_3d_model.h

@@ -43,9 +43,8 @@
 #define SCALE_INCREMENT_FINE       0.02
 #define SCALE_INCREMENT            0.1
 
-#define ROTATION_INCREMENT 90            // in degrees, for spin button command
-#define ROTATION_INCREMENT_WHEEL 90      // in degrees, for mouse wheel command
-#define ROTATION_INCREMENT_WHEEL_FINE 1  // in degrees, for mouse wheel command
+#define ROTATION_INCREMENT 90      // in degrees
+#define ROTATION_INCREMENT_FINE 1  // in degrees
 
 #define OFFSET_INCREMENT_MM        0.5
 #define OFFSET_INCREMENT_MM_FINE   0.1

CMakeLists.txt

@@ -514,6 +514,8 @@ if( MSVC )
     string( APPEND CMAKE_CXX_FLAGS " /wd4800" )
     # /Zi: create PDB
     string( APPEND CMAKE_CXX_FLAGS " /Zi" )
+    # /Zc:__cplusplus: define this macro according to C++ standard version
+    string( APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus" )
     # /GF: enable string pooling
     string( APPEND CMAKE_CXX_FLAGS_RELEASE " /GF" )
     string( APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " /GF" )

bitmap2component/bitmap2cmp_frame.cpp

@@ -138,7 +138,7 @@ void IMAGE_SIZE::SetUnit( EDA_UNITS aUnit )
 }
 
 
-BEGIN_EVENT_TABLE( BITMAP2CMP_FRAME, EDA_BASE_FRAME )
+BEGIN_EVENT_TABLE( BITMAP2CMP_FRAME, KIWAY_PLAYER )
     EVT_MENU( wxID_CLOSE, BITMAP2CMP_FRAME::OnExit )
     EVT_MENU( wxID_EXIT, BITMAP2CMP_FRAME::OnExit )
 
@@ -193,6 +193,7 @@ BITMAP2CMP_FRAME::BITMAP2CMP_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
     m_toolManager->InitTools();
 
     ReCreateMenuBar();
+    setupUIConditions();
 
     GetSizer()->SetSizeHints( this );
 

cmake/FindOCC.cmake

@@ -27,7 +27,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
 # Set the needed libraries
-set( OCC_LIBS
+set( OCC_LIBS_COMMON
     TKBinL
     TKBin
     TKBinTObj
@@ -45,7 +45,6 @@ set( OCC_LIBS
     TKGeomAlgo
     TKGeomBase
     TKHLR
-    TKIGES
     TKLCAF
     TKMath
     TKMesh
@@ -56,18 +55,10 @@ set( OCC_LIBS
     TKRWMesh
     TKService
     TKShHealing
-    TKSTEP209
-    TKSTEPAttr
-    TKSTEPBase
-    TKSTEP
-    TKSTL
     TKTObj
     TKTopAlgo
     TKV3d
-    TKVRML
     TKXCAF
-    TKXDEIGES
-    TKXDESTEP
     TKXMesh
     TKXmlL
     TKXml
@@ -76,6 +67,27 @@ set( OCC_LIBS
     TKXSBase
 )
 
+# Libraries valid pre-7.8.0
+set( OCC_LIBS_PRE_78
+    TKIGES
+    TKSTEP209
+    TKSTEPAttr
+    TKSTEPBase
+    TKSTEP
+    TKSTL
+    TKVRML
+    TKXDEIGES
+    TKXDESTEP
+)
+
+# Libraries for versions >= 7.8.0
+set( OCC_LIBS_POST_78
+    TKDEIGES
+    TKDEGLTF
+    TKDESTEP
+    TKDESTL
+)
+
 set(OCC_TYPE "OpenCASCADE Standard Edition")
 if(WIN32)
   if(CYGWIN OR MINGW)
@@ -178,9 +190,8 @@ endif(OCC_INCLUDE_DIR AND NOT ${OCC_INCLUDE_DIR} STREQUAL "OCC_INCLUDE_DIR-NOTFO
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OCC REQUIRED_VARS OCC_INCLUDE_DIR VERSION_VAR OCC_VERSION_STRING)
 
-if(OCC_FOUND)
-  foreach(lib IN LISTS OCC_LIBS)
-
+macro(occ_lib_search SEARCH_LIST)
+  foreach(lib IN LISTS ${SEARCH_LIST})
 #Use the specified library location if given
     find_library(OCC_TEMP_LIB ${lib} HINTS ${OCC_LIBRARY_DIR} NO_DEFAULT_PATH)
     if(${OCC_TEMP_LIB} STREQUAL "OCC_TEMP_LIB-NOTFOUND")
@@ -197,11 +208,20 @@ if(OCC_FOUND)
 
     unset(OCC_TEMP_LIB CACHE)
   endforeach(lib)
+endmacro()
 
-  #Convert path names to absolute for cleaner display
-  get_filename_component(OCC_INCLUDE_DIR "${OCC_INCLUDE_DIR}" ABSOLUTE)
-  get_filename_component(OCC_LIBRARY_DIR "${OCC_LIBRARY_DIR}" ABSOLUTE)
-  message(STATUS "Found ${OCC_TYPE} version: ${OCC_VERSION_STRING}")
-  message(STATUS " ++ ${OCC_TYPE} include directory: ${OCC_INCLUDE_DIR}")
-  message(STATUS " ++ ${OCC_TYPE} shared libraries directory: ${OCC_LIBRARY_DIR}")
+if(OCC_FOUND)
+    occ_lib_search( OCC_LIBS_COMMON )
+    if(OCC_VERSION_STRING VERSION_LESS "7.8.0")
+        occ_lib_search( OCC_LIBS_PRE_78 )
+    else()
+        occ_lib_search( OCC_LIBS_POST_78 )
+    endif()
+
+    #Convert path names to absolute for cleaner display
+    get_filename_component(OCC_INCLUDE_DIR "${OCC_INCLUDE_DIR}" ABSOLUTE)
+    get_filename_component(OCC_LIBRARY_DIR "${OCC_LIBRARY_DIR}" ABSOLUTE)
+    message(STATUS "Found ${OCC_TYPE} version: ${OCC_VERSION_STRING}")
+    message(STATUS " ++ ${OCC_TYPE} include directory: ${OCC_INCLUDE_DIR}")
+    message(STATUS " ++ ${OCC_TYPE} shared libraries directory: ${OCC_LIBRARY_DIR}")
 endif(OCC_FOUND)

cmake/FindPythonInterp.cmake

@@ -37,7 +37,7 @@ unset(_Python_NAMES)
 
 set(_PYTHON1_VERSIONS 1.6 1.5)
 set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
-set(_PYTHON3_VERSIONS 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+set(_PYTHON3_VERSIONS 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
 
 # Disabling the "search every possible place" code for now
 # see https://gitlab.com/kicad/code/kicad/-/issues/8553

cmake/FindPythonLibs.cmake

@@ -44,7 +44,7 @@ cmake_find_frameworks(Python)
 
 set(_PYTHON1_VERSIONS 1.6 1.5)
 set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
-set(_PYTHON3_VERSIONS 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+set(_PYTHON3_VERSIONS 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
 
 if(PythonLibs_FIND_VERSION)
     if(PythonLibs_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$")

cmake/KiCadVersion.cmake

@@ -37,7 +37,7 @@
 # KiCad.
 #
 # Note: This version string should follow the semantic versioning system
-set( KICAD_SEMANTIC_VERSION "8.0.1" )
+set( KICAD_SEMANTIC_VERSION "8.0.4" )
 
 # Default the version to the semantic version.
 # This is overridden by the git repository tag though (if using git)

common/CMakeLists.txt

@@ -388,8 +388,10 @@ set( COMMON_IO_SRCS
     io/io_utils.cpp
 
     # Altium
-    io/altium/altium_parser.cpp
+    io/altium/altium_binary_parser.cpp
+    io/altium/altium_ascii_parser.cpp
     io/altium/altium_parser_utils.cpp
+    io/altium/altium_props_utils.cpp
 
     # Cadstar
     io/cadstar/cadstar_archive_parser.cpp

common/advanced_config.cpp

@@ -104,6 +104,11 @@ static const wxChar EnableEeschemaPrintCairo[] = wxT( "EnableEeschemaPrintCairo"
 static const wxChar DisambiguationTime[] = wxT( "DisambiguationTime" );
 static const wxChar PcbSelectionVisibilityRatio[] = wxT( "PcbSelectionVisibilityRatio" );
 static const wxChar MinimumSegmentLength[] = wxT( "MinimumSegmentLength" );
+static const wxChar OcePluginLinearDeflection[] = wxT( "OcePluginLinearDeflection" );
+static const wxChar OcePluginAngularDeflection[] = wxT( "OcePluginAngularDeflection" );
+static const wxChar TriangulateSimplificationLevel[] = wxT( "TriangulateSimplificationLevel" );
+static const wxChar TriangulateMinimumArea[] = wxT( "TriangulateMinimumArea" );
+static const wxChar EnableCacheFriendlyFracture[] = wxT( "EnableCacheFriendlyFracture" );
 } // namespace KEYS
 
 
@@ -248,6 +253,14 @@ ADVANCED_CFG::ADVANCED_CFG()
 
     m_MinimumSegmentLength      = 50;
 
+    m_OcePluginLinearDeflection = 0.14;
+    m_OcePluginAngularDeflection = 30;
+
+    m_TriangulateSimplificationLevel = 50;
+    m_TriangulateMinimumArea = 1000;
+
+    m_EnableCacheFriendlyFracture = true;
+
     loadFromConfigFile();
 }
 
@@ -444,6 +457,26 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
                                                   &m_MinimumSegmentLength,
                                                   m_MinimumSegmentLength, 10, 1000 ) );
 
+    configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::OcePluginLinearDeflection,
+                                                    &m_OcePluginLinearDeflection,
+                                                    m_OcePluginLinearDeflection, 0.01, 1.0 ) );
+
+    configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::OcePluginAngularDeflection,
+                                                    &m_OcePluginAngularDeflection,
+                                                    m_OcePluginAngularDeflection, 0.01, 360.0 ) );
+
+    configParams.push_back( new PARAM_CFG_INT( true, AC_KEYS::TriangulateSimplificationLevel,
+                                                    &m_TriangulateSimplificationLevel,
+                                                    m_TriangulateSimplificationLevel, 0, 1000 ) );
+
+    configParams.push_back( new PARAM_CFG_INT( true, AC_KEYS::TriangulateMinimumArea,
+                                                    &m_TriangulateMinimumArea,
+                                                    m_TriangulateMinimumArea, 0, 100000 ) );
+
+    configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::EnableCacheFriendlyFracture,
+                                                &m_EnableCacheFriendlyFracture,
+                                                m_EnableCacheFriendlyFracture ) );
+
     // Special case for trace mask setting...we just grab them and set them immediately
     // Because we even use wxLogTrace inside of advanced config
     wxString traceMasks;

common/build_version.cpp

@@ -51,6 +51,19 @@ extern std::string GetCurlLibVersion();
 #include <kicad_build_version.h>
 #undef INCLUDE_KICAD_VERSION
 
+// Remember OpenGL info
+static wxString s_glVendor;
+static wxString s_glRenderer;
+static wxString s_glVersion;
+
+void SetOpenGLInfo( const char* aVendor, const char* aRenderer, const char* aVersion )
+{
+    s_glVendor = wxString::FromUTF8( aVendor );
+    s_glRenderer = wxString::FromUTF8( aRenderer );
+    s_glVersion = wxString::FromUTF8( aVersion );
+}
+
+
 wxString GetPlatformGetBitnessName()
 {
     wxPlatformInfo platform;
@@ -200,6 +213,12 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief )
          << ", " << wxGetenv( "XDG_SESSION_TYPE" );
 #endif
 
+    if( !s_glVendor.empty() || !s_glRenderer.empty() || !s_glVersion.empty() )
+    {
+        aMsg << eol;
+        aMsg << "OpenGL: " << s_glVendor << ", " << s_glRenderer << ", " << s_glVersion;
+    }
+
     aMsg << eol << eol;
 
     if( !aBrief )

common/database/database_connection.cpp

@@ -347,6 +347,24 @@ bool DATABASE_CONNECTION::SelectOne( const std::string& aTable,
             return true;
         }
     }
+    else
+    {
+        wxLogTrace( traceDatabase, wxT( "SelectOne: table `%s` not in row cache; will SelectAll" ),
+                    tableName, aWhere.second );
+
+        selectAllAndCache( tableName, aWhere.first );
+
+        if( m_cache->Get( tableName, cacheEntry ) )
+        {
+            if( cacheEntry.count( aWhere.second ) )
+            {
+                wxLogTrace( traceDatabase, wxT( "SelectOne: `%s` with parameter `%s` - cache hit" ),
+                            tableName, aWhere.second );
+                aResult = cacheEntry.at( aWhere.second );
+                return true;
+            }
+        }
+    }
 
     if( !m_columnCache.count( tableName ) )
     {
@@ -372,15 +390,14 @@ bool DATABASE_CONNECTION::SelectOne( const std::string& aTable,
                                         columnsFor( tableName ),
                                         m_quoteChar, tableName, m_quoteChar,
                                         m_quoteChar, columnName, m_quoteChar );
-
-    nanodbc::statement statement( *m_conn );
     nanodbc::string query = fromUTF8( queryStr );
 
     PROF_TIMER timer;
+    nanodbc::statement statement;
 
     try
     {
-        statement.prepare( query );
+        statement.prepare( *m_conn, query );
         statement.bind( 0, aWhere.second.c_str() );
     }
     catch( nanodbc::database_error& e )
@@ -474,44 +491,14 @@ bool DATABASE_CONNECTION::SelectOne( const std::string& aTable,
 }
 
 
-bool DATABASE_CONNECTION::SelectAll( const std::string& aTable, const std::string& aKey,
-                                     std::vector<ROW>& aResults )
+bool DATABASE_CONNECTION::selectAllAndCache( const std::string& aTable, const std::string& aKey )
 {
-    if( !m_conn )
-    {
-        wxLogTrace( traceDatabase, wxT( "Called SelectAll without valid connection!" ) );
-        return false;
-    }
-
-    auto tableMapIter = m_tables.find( aTable );
-
-    if( tableMapIter == m_tables.end() )
-    {
-        wxLogTrace( traceDatabase, wxT( "SelectAll: requested table %s not found in cache" ),
-                    aTable );
-        return false;
-    }
-
-    DB_CACHE_TYPE::CACHE_VALUE cacheEntry;
-
-    if( m_cache->Get( aTable, cacheEntry ) )
-    {
-        wxLogTrace( traceDatabase, wxT( "SelectAll: `%s` - cache hit" ), aTable );
-
-        aResults.reserve( cacheEntry.size() );
-
-        for( auto &[ key, row ] : cacheEntry )
-            aResults.emplace_back( row );
-
-        return true;
-    }
-
     nanodbc::statement statement( *m_conn );
 
     nanodbc::string query = fromUTF8( fmt::format( "SELECT {} FROM {}{}{}", columnsFor( aTable ),
                                                    m_quoteChar, aTable, m_quoteChar ) );
 
-    wxLogTrace( traceDatabase, wxT( "SelectAll: `%s`" ), toUTF8( query ) );
+    wxLogTrace( traceDatabase, wxT( "selectAllAndCache: `%s`" ), toUTF8( query ) );
 
     PROF_TIMER timer;
 
@@ -522,7 +509,8 @@ bool DATABASE_CONNECTION::SelectAll( const std::string& aTable, const std::strin
     catch( nanodbc::database_error& e )
     {
         m_lastError = e.what();
-        wxLogTrace( traceDatabase, wxT( "Exception while preparing query for SelectAll: %s" ),
+        wxLogTrace( traceDatabase,
+                    wxT( "Exception while preparing query for selectAllAndCache: %s" ),
                     m_lastError );
 
         // Exception may be due to a connection error; nanodbc won't auto-reconnect
@@ -540,7 +528,8 @@ bool DATABASE_CONNECTION::SelectAll( const std::string& aTable, const std::strin
     catch( nanodbc::database_error& e )
     {
         m_lastError = e.what();
-        wxLogTrace( traceDatabase, wxT( "Exception while executing query for SelectAll: %s" ),
+        wxLogTrace( traceDatabase,
+                    wxT( "Exception while executing query for selectAllAndCache: %s" ),
                     m_lastError );
 
         // Exception may be due to a connection error; nanodbc won't auto-reconnect
@@ -551,15 +540,17 @@ bool DATABASE_CONNECTION::SelectAll( const std::string& aTable, const std::strin
 
     timer.Stop();
 
+    DB_CACHE_TYPE::CACHE_VALUE cacheEntry;
+
     auto handleException =
             [&]( std::runtime_error& aException, const std::string& aExtraContext = "" )
-            {
-                m_lastError = aException.what();
-                std::string extra = aExtraContext.empty() ? "" : ": " + aExtraContext;
-                wxLogTrace( traceDatabase,
-                            wxT( "Exception while parsing result %d from SelectAll: %s%s" ),
-                            aResults.size(), m_lastError, extra );
-            };
+    {
+        m_lastError = aException.what();
+        std::string extra = aExtraContext.empty() ? "" : ": " + aExtraContext;
+        wxLogTrace( traceDatabase,
+                    wxT( "Exception while parsing result %d from selectAllAndCache: %s%s" ),
+                    cacheEntry.size(), m_lastError, extra );
+    };
 
     while( results.next() )
     {
@@ -636,20 +627,64 @@ bool DATABASE_CONNECTION::SelectAll( const std::string& aTable, const std::strin
             }
         }
 
-        aResults.emplace_back( std::move( result ) );
+        wxASSERT( result.count( aKey ) );
+        std::string keyStr = std::any_cast<std::string>( result.at( aKey ) );
+        cacheEntry[keyStr] = result;
     }
 
-    wxLogTrace( traceDatabase, wxT( "SelectAll from %s completed in %0.1f ms" ), aTable,
+    wxLogTrace( traceDatabase, wxT( "selectAllAndCache from %s completed in %0.1f ms" ), aTable,
                 timer.msecs() );
 
-    for( const ROW& row : aResults )
+    m_cache->Put( aTable, cacheEntry );
+    return true;
+}
+
+
+bool DATABASE_CONNECTION::SelectAll( const std::string& aTable, const std::string& aKey,
+                                     std::vector<ROW>& aResults )
+{
+    if( !m_conn )
     {
-        wxASSERT( row.count( aKey ) );
-        std::string keyStr = std::any_cast<std::string>( row.at( aKey ) );
-        cacheEntry[keyStr] = row;
+        wxLogTrace( traceDatabase, wxT( "Called SelectAll without valid connection!" ) );
+        return false;
     }
 
-    m_cache->Put( aTable, cacheEntry );
+    auto tableMapIter = m_tables.find( aTable );
+
+    if( tableMapIter == m_tables.end() )
+    {
+        wxLogTrace( traceDatabase, wxT( "SelectAll: requested table %s not found in cache" ),
+                    aTable );
+        return false;
+    }
+
+    DB_CACHE_TYPE::CACHE_VALUE cacheEntry;
+
+    if( !m_cache->Get( aTable, cacheEntry ) )
+    {
+        if( !selectAllAndCache( aTable, aKey ) )
+        {
+            wxLogTrace( traceDatabase, wxT( "SelectAll: `%s` cache fill failed" ), aTable );
+            return false;
+        }
+
+        // Now it should be filled
+        m_cache->Get( aTable, cacheEntry );
+    }
+
+    if( !m_cache->Get( aTable, cacheEntry ) )
+    {
+        wxLogTrace( traceDatabase, wxT( "SelectAll: `%s` failed to get results from cache!" ),
+                    aTable );
+        return false;
+    }
+
+    wxLogTrace( traceDatabase, wxT( "SelectAll: `%s` - returning cached results" ), aTable );
+
+    aResults.reserve( cacheEntry.size() );
+
+    for( auto &[ key, row ] : cacheEntry )
+        aResults.emplace_back( row );
 
     return true;
 }

common/dialogs/dialog_configure_paths.cpp

@@ -70,7 +70,11 @@ DIALOG_CONFIGURE_PATHS::DIALOG_CONFIGURE_PATHS( wxWindow* aParent ) :
     m_EnvVars->ClearRows();
     m_EnvVars->AppendCols( 1 );     // for the isExternal flags
     m_EnvVars->HideCol( TV_FLAG_COL );
+#ifndef __WXMAC__
+    // macos crashes on languages at least using non-ascii characters for the column header here of all places
+    // if we use native column headers, so guard it for windows to still look nice
     m_EnvVars->UseNativeColHeader( true );
+#endif
 
     wxGridCellAttr* attr = new wxGridCellAttr;
     attr->SetEditor( new GRID_CELL_PATH_EDITOR( this, m_EnvVars, &m_curdir, wxEmptyString ) );

common/dialogs/dialog_edit_library_tables.cpp

@@ -43,6 +43,9 @@ void DIALOG_EDIT_LIBRARY_TABLES::InstallPanel( wxPanel* aPanel )
     auto mainSizer = new wxBoxSizer( wxVERTICAL );
     SetSizer( mainSizer );
 
+    m_infoBar = new WX_INFOBAR( this );
+    mainSizer->Add( m_infoBar, 0, wxEXPAND, 0 );
+
     mainSizer->Add( m_contentPanel, 1, wxEXPAND|wxLEFT|wxTOP|wxRIGHT, 5 );
     m_contentPanel->SetMinSize( FromDIP( wxSize( 1000, 600 ) ) );
 

common/dialogs/panel_grid_settings.cpp

@@ -71,6 +71,18 @@ PANEL_GRID_SETTINGS::PANEL_GRID_SETTINGS( wxWindow* aParent, UNITS_PROVIDER* aUn
             m_checkGridOverrideWires->Show( false );
             m_gridOverrideWiresChoice->Show( false );
         }
+
+        if( m_frameType == FRAME_GERBER )
+        {
+            m_overridesLabel->Show( false );
+            m_staticline3->Show( false );
+
+            m_checkGridOverrideText->Show( false );
+            m_gridOverrideTextChoice->Show( false );
+
+            m_checkGridOverrideGraphics->Show( false );
+            m_gridOverrideGraphicsChoice->Show( false );
+        }
     }
 
     int hk1 = ACTIONS::gridFast1.GetHotKey();

common/dialogs/panel_grid_settings_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
+// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -111,7 +111,7 @@ PANEL_GRID_SETTINGS_BASE::PANEL_GRID_SETTINGS_BASE( wxWindow* parent, wxWindowID
 	bSizerRightCol->Add( m_staticline3, 0, wxEXPAND|wxTOP|wxBOTTOM, 2 );
 
 	wxFlexGridSizer* fgGridOverrides;
-	fgGridOverrides = new wxFlexGridSizer( 0, 2, 4, 0 );
+	fgGridOverrides = new wxFlexGridSizer( 0, 2, 5, 0 );
 	fgGridOverrides->AddGrowableCol( 1 );
 	fgGridOverrides->SetFlexibleDirection( wxBOTH );
 	fgGridOverrides->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@@ -122,7 +122,7 @@ PANEL_GRID_SETTINGS_BASE::PANEL_GRID_SETTINGS_BASE( wxWindow* parent, wxWindowID
 	wxArrayString m_gridOverrideConnectedChoiceChoices;
 	m_gridOverrideConnectedChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_gridOverrideConnectedChoiceChoices, 0 );
 	m_gridOverrideConnectedChoice->SetSelection( 0 );
-	fgGridOverrides->Add( m_gridOverrideConnectedChoice, 0, wxALL, 5 );
+	fgGridOverrides->Add( m_gridOverrideConnectedChoice, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
 	m_checkGridOverrideWires = new wxCheckBox( this, wxID_ANY, _("Wires:"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgGridOverrides->Add( m_checkGridOverrideWires, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT, 8 );
@@ -130,7 +130,7 @@ PANEL_GRID_SETTINGS_BASE::PANEL_GRID_SETTINGS_BASE( wxWindow* parent, wxWindowID
 	wxArrayString m_gridOverrideWiresChoiceChoices;
 	m_gridOverrideWiresChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_gridOverrideWiresChoiceChoices, 0 );
 	m_gridOverrideWiresChoice->SetSelection( 0 );
-	fgGridOverrides->Add( m_gridOverrideWiresChoice, 0, wxALL, 5 );
+	fgGridOverrides->Add( m_gridOverrideWiresChoice, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
 	m_checkGridOverrideVias = new wxCheckBox( this, wxID_ANY, _("Vias:"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgGridOverrides->Add( m_checkGridOverrideVias, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT, 8 );
@@ -138,7 +138,7 @@ PANEL_GRID_SETTINGS_BASE::PANEL_GRID_SETTINGS_BASE( wxWindow* parent, wxWindowID
 	wxArrayString m_gridOverrideViasChoiceChoices;
 	m_gridOverrideViasChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_gridOverrideViasChoiceChoices, 0 );
 	m_gridOverrideViasChoice->SetSelection( 0 );
-	fgGridOverrides->Add( m_gridOverrideViasChoice, 0, wxALL, 5 );
+	fgGridOverrides->Add( m_gridOverrideViasChoice, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
 	m_checkGridOverrideText = new wxCheckBox( this, wxID_ANY, _("Text:"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgGridOverrides->Add( m_checkGridOverrideText, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT, 8 );
@@ -146,7 +146,7 @@ PANEL_GRID_SETTINGS_BASE::PANEL_GRID_SETTINGS_BASE( wxWindow* parent, wxWindowID
 	wxArrayString m_gridOverrideTextChoiceChoices;
 	m_gridOverrideTextChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_gridOverrideTextChoiceChoices, 0 );
 	m_gridOverrideTextChoice->SetSelection( 0 );
-	fgGridOverrides->Add( m_gridOverrideTextChoice, 0, wxALL, 5 );
+	fgGridOverrides->Add( m_gridOverrideTextChoice, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
 	m_checkGridOverrideGraphics = new wxCheckBox( this, wxID_ANY, _("Graphics:"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgGridOverrides->Add( m_checkGridOverrideGraphics, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT, 8 );
@@ -154,7 +154,7 @@ PANEL_GRID_SETTINGS_BASE::PANEL_GRID_SETTINGS_BASE( wxWindow* parent, wxWindowID
 	wxArrayString m_gridOverrideGraphicsChoiceChoices;
 	m_gridOverrideGraphicsChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_gridOverrideGraphicsChoiceChoices, 0 );
 	m_gridOverrideGraphicsChoice->SetSelection( 0 );
-	fgGridOverrides->Add( m_gridOverrideGraphicsChoice, 0, wxALL, 5 );
+	fgGridOverrides->Add( m_gridOverrideGraphicsChoice, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
 
 	bSizerRightCol->Add( fgGridOverrides, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 10 );

common/dialogs/panel_grid_settings_base.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
+// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!

common/dialogs/panel_setup_netclasses.cpp

@@ -442,14 +442,11 @@ bool PANEL_SETUP_NETCLASSES::TransferDataFromWindow()
         wxString netclass = m_assignmentGrid->GetCellValue( row, 1 );
 
         m_netSettings->m_NetClassPatternAssignments.push_back(
-                {
-                    std::make_unique<EDA_COMBINED_MATCHER>( pattern, CTX_NETCLASS ),
-                    netclass
-                } );
-
-        m_netSettings->m_NetClassPatternAssignmentCache.clear();
+                { std::make_unique<EDA_COMBINED_MATCHER>( pattern, CTX_NETCLASS ), netclass } );
     }
 
+    m_netSettings->m_NetClassPatternAssignmentCache.clear();
+
     return true;
 }
 

common/draw_panel_gal.cpp

@@ -648,8 +648,21 @@ void EDA_DRAW_PANEL_GAL::onShowTimer( wxTimerEvent& aEvent )
 
 void EDA_DRAW_PANEL_GAL::SetCurrentCursor( KICURSOR aCursor )
 {
-    if( m_gal )
-        m_gal->SetNativeCursorStyle( aCursor );
+    if( !m_gal )
+        return;
+
+    DPI_SCALING_COMMON dpi( nullptr, m_parent );
+
+    bool hidpi = false;
+
+    // Cursor scaling factor cannot be set for a wxCursor on GTK and OSX (at least before wx 3.3),
+    // resulting in 4x rendered size on 2x window scale.
+    // MSW renders the bitmap as-is, without scaling, so this works here.
+#ifdef __WXMSW__
+    hidpi = dpi.GetContentScaleFactor() >= 2.0;
+#endif
+
+    m_gal->SetNativeCursorStyle( aCursor, hidpi );
 }
 
 

common/drawing_sheet/ds_data_item.cpp

@@ -681,6 +681,35 @@ void DS_DATA_ITEM_TEXT::SetConstrainedTextSize()
 
     if( m_ConstrainedTextSize.y == 0 )
         m_ConstrainedTextSize.y = DS_DATA_MODEL::GetTheInstance().m_DefaultTextSize.y;
+
+    if( m_BoundingBoxSize.x > 0 || m_BoundingBoxSize.y > 0 )
+    {
+        // to know the X and Y size of the line, we should use EDA_TEXT::GetTextBox()
+        // but this function uses integers
+        // So, to avoid truncations with our unit in mm, use microns.
+        VECTOR2I size_micron;
+        #define FSCALE 1000.0
+        int linewidth = 0;
+        size_micron.x = KiROUND( m_ConstrainedTextSize.x * FSCALE );
+        size_micron.y = KiROUND( m_ConstrainedTextSize.y * FSCALE );
+        DS_DRAW_ITEM_TEXT dummy( unityScale, this, 0, m_FullText, VECTOR2I( 0, 0 ), size_micron,
+                                 linewidth, m_Font, m_Italic, m_Bold, m_TextColor );
+        dummy.SetMultilineAllowed( true );
+        dummy.SetHorizJustify( m_Hjustify ) ;
+        dummy.SetVertJustify( m_Vjustify );
+        dummy.SetTextAngle( EDA_ANGLE( m_Orient, DEGREES_T ) );
+
+        BOX2I    rect = dummy.GetTextBox();
+        VECTOR2D size;
+        size.x = KiROUND( (int) rect.GetWidth() / FSCALE );
+        size.y = KiROUND( (int) rect.GetHeight() / FSCALE );
+
+        if( m_BoundingBoxSize.x > 0 && size.x > m_BoundingBoxSize.x )
+            m_ConstrainedTextSize.x *= m_BoundingBoxSize.x / size.x;
+
+        if( m_BoundingBoxSize.y > 0 &&  size.y > m_BoundingBoxSize.y )
+            m_ConstrainedTextSize.y *= m_BoundingBoxSize.y / size.y;
+    }
 }
 
 

common/eda_base_frame.cpp

@@ -1202,6 +1202,7 @@ void EDA_BASE_FRAME::ShowPreferences( wxString aStartPage, wxString aStartParent
             book->AddPage( new wxPanel( book ), _( "Gerber Viewer" ) );
             book->AddLazySubPage( LAZY_CTOR( PANEL_GBR_DISPLAY_OPTIONS ), _( "Display Options" ) );
             book->AddLazySubPage( LAZY_CTOR( PANEL_GBR_COLORS ), _( "Colors" ) );
+            book->AddLazySubPage( LAZY_CTOR( PANEL_GBR_GRIDS ), _( "Grids" ) );
             book->AddLazySubPage( LAZY_CTOR( PANEL_GBR_EXCELLON_OPTIONS ), _( "Excellon Options" ) );
         }
         catch( ... )

common/eda_shape.cpp

@@ -1973,53 +1973,65 @@ static struct EDA_SHAPE_DESC
             return false;
         };
 
+        const wxString shapeProps = _HKI( "Shape Properties" );
+
         auto shape = new PROPERTY_ENUM<EDA_SHAPE, SHAPE_T>( _HKI( "Shape" ),
                      NO_SETTER( EDA_SHAPE, SHAPE_T ), &EDA_SHAPE::GetShape );
-        propMgr.AddProperty( shape );
+        propMgr.AddProperty( shape, shapeProps );
 
         propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "Start X" ),
                     &EDA_SHAPE::SetStartX, &EDA_SHAPE::GetStartX, PROPERTY_DISPLAY::PT_COORD,
-                    ORIGIN_TRANSFORMS::ABS_X_COORD ) )
+                    ORIGIN_TRANSFORMS::ABS_X_COORD ),
+                    shapeProps )
                 .SetAvailableFunc( isNotPolygonOrCircle );
         propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "Start Y" ),
                     &EDA_SHAPE::SetStartY, &EDA_SHAPE::GetStartY, PROPERTY_DISPLAY::PT_COORD,
-                    ORIGIN_TRANSFORMS::ABS_Y_COORD ) )
+                    ORIGIN_TRANSFORMS::ABS_Y_COORD ),
+                    shapeProps )
                 .SetAvailableFunc( isNotPolygonOrCircle );
 
         propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "Center X" ),
-                    &EDA_SHAPE::SetStartX, &EDA_SHAPE::GetStartX, PROPERTY_DISPLAY::PT_COORD,
-                    ORIGIN_TRANSFORMS::ABS_X_COORD ) )
+                    &EDA_SHAPE::SetCenterX, &EDA_SHAPE::GetStartX, PROPERTY_DISPLAY::PT_COORD,
+                    ORIGIN_TRANSFORMS::ABS_X_COORD ),
+                    shapeProps )
                 .SetAvailableFunc( isCircle );
 
         propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "Center Y" ),
-                    &EDA_SHAPE::SetStartY, &EDA_SHAPE::GetStartY, PROPERTY_DISPLAY::PT_COORD,
-                    ORIGIN_TRANSFORMS::ABS_Y_COORD ) )
+                    &EDA_SHAPE::SetCenterY, &EDA_SHAPE::GetStartY, PROPERTY_DISPLAY::PT_COORD,
+                    ORIGIN_TRANSFORMS::ABS_Y_COORD ),
+                    shapeProps )
                 .SetAvailableFunc( isCircle );
 
         propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "Radius" ),
                     &EDA_SHAPE::SetRadius, &EDA_SHAPE::GetRadius, PROPERTY_DISPLAY::PT_SIZE,
-                    ORIGIN_TRANSFORMS::NOT_A_COORD ) )
+                    ORIGIN_TRANSFORMS::NOT_A_COORD ),
+                    shapeProps )
                 .SetAvailableFunc( isCircle );
 
         propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "End X" ),
                     &EDA_SHAPE::SetEndX, &EDA_SHAPE::GetEndX, PROPERTY_DISPLAY::PT_COORD,
-                    ORIGIN_TRANSFORMS::ABS_X_COORD ) )
+                    ORIGIN_TRANSFORMS::ABS_X_COORD ),
+                    shapeProps )
                 .SetAvailableFunc( isNotPolygonOrCircle );
 
         propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "End Y" ),
                     &EDA_SHAPE::SetEndY, &EDA_SHAPE::GetEndY, PROPERTY_DISPLAY::PT_COORD,
-                    ORIGIN_TRANSFORMS::ABS_Y_COORD ) )
+                    ORIGIN_TRANSFORMS::ABS_Y_COORD ),
+                    shapeProps )
                 .SetAvailableFunc( isNotPolygonOrCircle );
 
         propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "Line Width" ),
-                    &EDA_SHAPE::SetWidth, &EDA_SHAPE::GetWidth, PROPERTY_DISPLAY::PT_SIZE ) );
+                    &EDA_SHAPE::SetWidth, &EDA_SHAPE::GetWidth, PROPERTY_DISPLAY::PT_SIZE ),
+                    shapeProps );
 
         void ( EDA_SHAPE::*lineStyleSetter )( LINE_STYLE ) = &EDA_SHAPE::SetLineStyle;
-        propMgr.AddProperty( new PROPERTY_ENUM<EDA_SHAPE, LINE_STYLE>(
-                    _HKI( "Line Style" ), lineStyleSetter, &EDA_SHAPE::GetLineStyle ) );
+        propMgr.AddProperty( new PROPERTY_ENUM<EDA_SHAPE, LINE_STYLE>( _HKI( "Line Style" ),
+                    lineStyleSetter, &EDA_SHAPE::GetLineStyle ),
+                    shapeProps );
 
         propMgr.AddProperty( new PROPERTY<EDA_SHAPE, COLOR4D>( _HKI( "Line Color" ),
-                    &EDA_SHAPE::SetLineColor, &EDA_SHAPE::GetLineColor ) )
+                    &EDA_SHAPE::SetLineColor, &EDA_SHAPE::GetLineColor ),
+                    shapeProps )
                 .SetIsHiddenFromRulesEditor();
 
         auto angle = new PROPERTY<EDA_SHAPE, EDA_ANGLE>( _HKI( "Angle" ),
@@ -2033,7 +2045,7 @@ static struct EDA_SHAPE_DESC
 
                     return false;
                 } );
-        propMgr.AddProperty( angle );
+        propMgr.AddProperty( angle, shapeProps );
 
         auto fillAvailable =
                 [=]( INSPECTABLE* aItem ) -> bool
@@ -2056,11 +2068,13 @@ static struct EDA_SHAPE_DESC
                 };
 
         propMgr.AddProperty( new PROPERTY<EDA_SHAPE, bool>( _HKI( "Filled" ),
-                    &EDA_SHAPE::SetFilled, &EDA_SHAPE::IsFilled ) )
+                    &EDA_SHAPE::SetFilled, &EDA_SHAPE::IsFilled ),
+                    shapeProps )
                 .SetAvailableFunc( fillAvailable );
 
         propMgr.AddProperty( new PROPERTY<EDA_SHAPE, COLOR4D>( _HKI( "Fill Color" ),
-                    &EDA_SHAPE::SetFillColor, &EDA_SHAPE::GetFillColor ) )
+                    &EDA_SHAPE::SetFillColor, &EDA_SHAPE::GetFillColor ),
+                    shapeProps )
                 .SetAvailableFunc( fillAvailable )
                 .SetIsHiddenFromRulesEditor();
     }

common/eda_text.cpp

@@ -364,8 +364,8 @@ void EDA_TEXT::SetTextSize( VECTOR2I aNewSize, bool aEnforceMinTextSize )
 
     if( aEnforceMinTextSize )
     {
-        int min = m_IuScale.get().MilsToIU( TEXT_MIN_SIZE_MILS );
-        int max = m_IuScale.get().MilsToIU( TEXT_MAX_SIZE_MILS );
+        int min = m_IuScale.get().mmToIU( TEXT_MIN_SIZE_MM );
+        int max = m_IuScale.get().mmToIU( TEXT_MAX_SIZE_MM );
 
         aNewSize = VECTOR2I( alg::clamp( min, aNewSize.x, max ),
                              alg::clamp( min, aNewSize.y, max ) );
@@ -380,8 +380,8 @@ void EDA_TEXT::SetTextSize( VECTOR2I aNewSize, bool aEnforceMinTextSize )
 
 void EDA_TEXT::SetTextWidth( int aWidth )
 {
-    int min = m_IuScale.get().MilsToIU( TEXT_MIN_SIZE_MILS );
-    int max = m_IuScale.get().MilsToIU( TEXT_MAX_SIZE_MILS );
+    int min = m_IuScale.get().mmToIU( TEXT_MIN_SIZE_MM );
+    int max = m_IuScale.get().mmToIU( TEXT_MAX_SIZE_MM );
 
     m_attributes.m_Size.x = alg::clamp( min, aWidth, max );
     ClearRenderCache();
@@ -391,8 +391,8 @@ void EDA_TEXT::SetTextWidth( int aWidth )
 
 void EDA_TEXT::SetTextHeight( int aHeight )
 {
-    int min = m_IuScale.get().MilsToIU( TEXT_MIN_SIZE_MILS );
-    int max = m_IuScale.get().MilsToIU( TEXT_MAX_SIZE_MILS );
+    int min = m_IuScale.get().mmToIU( TEXT_MIN_SIZE_MM );
+    int max = m_IuScale.get().mmToIU( TEXT_MAX_SIZE_MM );
 
     m_attributes.m_Size.y = alg::clamp( min, aHeight, max );
     ClearRenderCache();
@@ -528,10 +528,13 @@ EDA_TEXT::GetRenderCache( const KIFONT::FONT* aFont, const wxString& forResolved
 }
 
 
-void EDA_TEXT::SetupRenderCache( const wxString& aResolvedText, const EDA_ANGLE& aAngle )
+void EDA_TEXT::SetupRenderCache( const wxString& aResolvedText, const KIFONT::FONT* aFont,
+                                 const EDA_ANGLE& aAngle, const VECTOR2I& aOffset )
 {
     m_render_cache_text = aResolvedText;
+    m_render_cache_font = aFont;
     m_render_cache_angle = aAngle;
+    m_render_cache_offset = aOffset;
     m_render_cache.clear();
 }
 
@@ -539,6 +542,7 @@ void EDA_TEXT::SetupRenderCache( const wxString& aResolvedText, const EDA_ANGLE&
 void EDA_TEXT::AddRenderCacheGlyph( const SHAPE_POLY_SET& aPoly )
 {
     m_render_cache.emplace_back( std::make_unique<KIFONT::OUTLINE_GLYPH>( aPoly ) );
+    static_cast<KIFONT::OUTLINE_GLYPH*>( m_render_cache.back().get() )->CacheTriangulation();
 }
 
 

common/eda_units.cpp

@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 1992-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2024 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -28,6 +28,22 @@
 #include <charconv>
 #include <wx/translation.h>
 
+
+static void removeTrailingZeros( wxString& aText )
+{
+    int len = aText.length();
+    int removeLast = 0;
+
+    while( --len > 0 && aText[len] == '0' )
+        removeLast++;
+
+    if( len >= 0 && ( aText[len] == '.' || aText[len] == ',' ) )
+        removeLast++;
+
+    aText = aText.RemoveLast( removeLast );
+}
+
+
 bool EDA_UNIT_UTILS::IsImperialUnit( EDA_UNITS aUnit )
 {
     switch( aUnit )
@@ -305,29 +321,46 @@ wxString EDA_UNIT_UTILS::UI::StringFromValue( const EDA_IU_SCALE& aIuScale, EDA_
         break;
     }
 
-    char buf[50];
+    const wxChar* format = nullptr;
 
-    if( value_to_print != 0.0 && fabs( value_to_print ) <= 0.0001 )
+    switch( aUnits )
     {
-        int len = snprintf( buf, sizeof( buf ) - 1, "%.10f", value_to_print );
 
-        while( --len > 0 && buf[len] == '0' )
-            buf[len] = '\0';
+    case EDA_UNITS::MILS:
+#if defined( EESCHEMA )
+        format = wxT( "%.3f" );
+#else
+        format = wxT( "%.5f" );
+#endif
+        break;
 
-        if( len >= 0 && ( buf[len] == '.' || buf[len] == ',' ) )
-            buf[len] = '\0';
-    }
-    else
-    {
-        snprintf( buf, sizeof( buf ) - 1, "%.10g", value_to_print );
+    case EDA_UNITS::INCHES:
+#if defined( EESCHEMA )
+        format = wxT( "%.6f" );
+#else
+        format = wxT( "%.8f" );
+#endif
+        break;
+
+    default:
+        format = wxT( "%.10f" );
+        break;
     }
 
-    wxString stringValue( buf, wxConvUTF8 );
+    wxString text;
+    text.Printf( format, value_to_print );
+    removeTrailingZeros( text );
+
+    if( value_to_print != 0.0 && ( text == wxS( "0" ) || text == wxS( "-0" ) ) )
+    {
+        text.Printf( wxS( "%.10f" ), value_to_print );
+        removeTrailingZeros( text );
+    }
 
     if( aAddUnitsText )
-        stringValue += EDA_UNIT_UTILS::GetText( aUnits, aType );
+        text << EDA_UNIT_UTILS::GetText( aUnits, aType );
 
-    return stringValue;
+    return text;
 }
 
 

common/exceptions.cpp

@@ -59,7 +59,9 @@ void IO_ERROR::init( const wxString& aProblem, const char* aThrowersFile,
     // a short filename will be printed (it is better for user, the full filename has no meaning).
     wxString srcname = aThrowersFile;
 
-    where.Printf( _( "from %s : %s() line %d" ),
+    // No need for translations of source code file/line messages (and wxWidget's translation
+    // stuff has bitten us before.  May be related to KICAD-YP.
+    where.Printf( wxS( "from %s : %s() line %d" ),
                   srcname.AfterLast( '/' ),
                   wxString( aThrowersFunction ),
                   aThrowersLineNumber );
@@ -87,7 +89,9 @@ void PARSE_ERROR::init( const wxString& aProblem, const char* aThrowersFile,
     // a short filename will be printed (it is better for user, the full filename has no meaning).
     wxString srcname = aThrowersFile;
 
-    where.Printf( _( "from %s : %s() line:%d" ),
+    // No need for translations of source code file/line messages (and wxWidget's translation
+    // stuff has bitten us before.  May be related to KICAD-YP.
+    where.Printf( wxS( "from %s : %s() line %d" ),
                   srcname.AfterLast( '/' ),
                   wxString( aThrowersFunction ),
                   aThrowersLineNumber );

common/font/fontconfig.cpp

@@ -26,6 +26,7 @@
 #include <string_utils.h>
 #include <macros.h>
 #include <cstdint>
+#include <reporter.h>
 
 #ifdef __WIN32__
 #define WIN32_LEAN_AND_MEAN
@@ -37,6 +38,8 @@ using namespace fontconfig;
 static FONTCONFIG* g_config = nullptr;
 static bool        g_fcInitSuccess = false;
 
+REPORTER* FONTCONFIG::s_reporter = nullptr;
+
 /**
  * A simple wrapper to avoid exporing fontconfig in the header
  */
@@ -57,6 +60,12 @@ FONTCONFIG::FONTCONFIG()
 };
 
 
+void fontconfig::FONTCONFIG::SetReporter( REPORTER* aReporter )
+{
+    s_reporter = aReporter;
+}
+
+
 /**
  * This is simply a wrapper to call FcInit() with SEH for Windows
  * SEH on Windows can only be used in functions without objects that might be unwinded
@@ -317,12 +326,15 @@ FONTCONFIG::FF_RESULT FONTCONFIG::FindFont( const wxString &aFontName, wxString
 
     if( retval == FF_RESULT::FF_ERROR )
     {
-        wxLogWarning( _( "Error loading font '%s'." ), qualifiedFontName );
+        if( s_reporter )
+            s_reporter->Report( wxString::Format( _( "Error loading font '%s'." ), qualifiedFontName ) );
     }
     else if( retval == FF_RESULT::FF_SUBSTITUTE )
     {
         fontName.Replace( ':', ' ' );
-        wxLogWarning( _( "Font '%s' not found; substituting '%s'." ), qualifiedFontName, fontName );
+
+        if( s_reporter )
+            s_reporter->Report( wxString::Format( _( "Font '%s' not found; substituting '%s'." ), qualifiedFontName, fontName ) );
     }
 
     FcPatternDestroy( pat );

common/font/glyph.cpp

@@ -82,19 +82,19 @@ std::unique_ptr<GLYPH> STROKE_GLYPH::Transform( const VECTOR2D& aGlyphSize, cons
     end.x *= aGlyphSize.x;
     end.y *= aGlyphSize.y;
 
-    if( aTilt )
+    if( aTilt != 0.0 )
         end.x -= end.y * aTilt;
 
     glyph->m_boundingBox.SetEnd( end );
     glyph->m_boundingBox.Offset( aOffset );
 
-    for( std::vector<VECTOR2D>& pointList : *glyph.get() )
+    for( std::vector<VECTOR2D>& pointList : *glyph )
     {
         for( VECTOR2D& point : pointList )
         {
             point *= aGlyphSize;
 
-            if( aTilt )
+            if( aTilt != 0.0 )
                 point.x -= point.y * aTilt;
 
             point += aOffset;
@@ -111,6 +111,18 @@ std::unique_ptr<GLYPH> STROKE_GLYPH::Transform( const VECTOR2D& aGlyphSize, cons
 }
 
 
+void STROKE_GLYPH::Move( const VECTOR2I& aOffset )
+{
+    m_boundingBox.Offset( aOffset );
+
+    for( std::vector<VECTOR2D>& pointList : *this )
+    {
+        for( VECTOR2D& point : pointList )
+            point += aOffset;
+    }
+}
+
+
 BOX2D OUTLINE_GLYPH::BoundingBox()
 {
     BOX2I bbox = BBox();

common/font/outline_font.cpp

@@ -259,6 +259,7 @@ VECTOR2I OUTLINE_FONT::getTextAsGlyphs( BOX2I* aBBox, std::vector<std::unique_pt
 struct GLYPH_CACHE_KEY {
     FT_Face        face;
     hb_codepoint_t codepoint;
+    double         scaler;
     bool           fakeItalic;
     bool           fakeBold;
     bool           mirror;
@@ -266,7 +267,7 @@ struct GLYPH_CACHE_KEY {
 
     bool operator==(const GLYPH_CACHE_KEY& rhs ) const
     {
-        return face == rhs.face && codepoint == rhs.codepoint
+        return face == rhs.face && codepoint == rhs.codepoint && scaler == rhs.scaler
                    && fakeItalic == rhs.fakeItalic && fakeBold == rhs.fakeBold
                    && mirror == rhs.mirror && angle == rhs.angle;
     }
@@ -280,6 +281,7 @@ namespace std
         std::size_t operator()( const GLYPH_CACHE_KEY& k ) const
         {
             return hash<const void*>()( k.face ) ^ hash<unsigned>()( k.codepoint )
+                        ^ hash<double>()( k.scaler )
                         ^ hash<int>()( k.fakeItalic ) ^ hash<int>()( k.fakeBold )
                         ^ hash<int>()( k.mirror ) ^ hash<int>()( k.angle.AsTenthsOfADegree() );
         }
@@ -339,7 +341,7 @@ VECTOR2I OUTLINE_FONT::getTextAsGlyphsUnlocked( BOX2I* aBBox,
 
         if( aGlyphs )
         {
-            GLYPH_CACHE_KEY key = { face, glyphInfo[i].codepoint, m_fakeItal, m_fakeBold,
+            GLYPH_CACHE_KEY key = { face, glyphInfo[i].codepoint, scaler, m_fakeItal, m_fakeBold,
                                     aMirror, aAngle };
             GLYPH_DATA&     glyphData = s_glyphCache[ key ];
 

common/fp_lib_table.cpp

@@ -327,8 +327,9 @@ const FP_LIB_TABLE_ROW* FP_LIB_TABLE::FindRow( const wxString& aNickname, bool a
 
     if( !row )
     {
-        wxString msg = wxString::Format( _( "fp-lib-table files contain no library named '%s'." ),
-                                         aNickname );
+        // We don't generally show this string to the user (who is unlikely to know what
+        // "fp-lib-table" means), and translating it may produce Sentry KICAD-YP.
+        wxString msg = wxString::Format( wxS( "'%s' not found in fp-lib-table." ), aNickname );
         THROW_IO_ERROR( msg );
     }
 

common/gal/cairo/cairo_gal.cpp

@@ -190,7 +190,7 @@ static double roundp( double x )
 
 const VECTOR2D CAIRO_GAL_BASE::roundp( const VECTOR2D& v )
 {
-    if( m_lineWidthIsOdd && m_isStrokeEnabled )
+    if( m_lineWidthIsOdd )
         return VECTOR2D( ::roundp( v.x ), ::roundp( v.y ) );
     else
         return VECTOR2D( floor( v.x + 0.5 ), floor( v.y + 0.5 ) );
@@ -352,13 +352,18 @@ void CAIRO_GAL_BASE::DrawArc( const VECTOR2D& aCenterPoint, double aRadius,
 
     double r = xform( aRadius );
 
-    // N.B. This is backwards. We set this because we want to adjust the center
-    // point that changes both endpoints.  In the worst case, this is twice as far.
-    // We cannot adjust radius or center based on the other because this causes the
-    // whole arc to change position/size
-    m_lineWidthIsOdd = !( static_cast<int>( aRadius ) % 2 );
+    // Adjust center and radius slightly to better match the rounding of endpoints.
+    VECTOR2D mid = roundp( xform( aCenterPoint ) );
 
-    auto mid = roundp( xform( aCenterPoint ) );
+    VECTOR2D startPointS = VECTOR2D( r, 0.0 );
+    VECTOR2D endPointS = VECTOR2D( r, 0.0 );
+    RotatePoint( startPointS, -EDA_ANGLE( startAngle, RADIANS_T ) );
+    RotatePoint( endPointS, -EDA_ANGLE( endAngle, RADIANS_T ) );
+
+    VECTOR2D refStart = roundp( xform( aCenterPoint ) + startPointS );
+    VECTOR2D refEnd = roundp( xform( aCenterPoint ) + endPointS );
+
+    r = ( ( refStart - mid ).EuclideanNorm() + ( refEnd - mid ).EuclideanNorm() ) / 2.0;
 
     cairo_set_line_width( m_currentContext, m_lineWidthInPixels );
     cairo_new_sub_path( m_currentContext );
@@ -403,13 +408,7 @@ void CAIRO_GAL_BASE::DrawArcSegment( const VECTOR2D& aCenterPoint, double aRadiu
 
     double r = xform( aRadius );
 
-    // N.B. This is backwards. We set this because we want to adjust the center
-    // point that changes both endpoints.  In the worst case, this is twice as far.
-    // We cannot adjust radius or center based on the other because this causes the
-    // whole arc to change position/size
-    m_lineWidthIsOdd = !( static_cast<int>( aRadius ) % 2 );
-
-    VECTOR2D mid = roundp( xform( aCenterPoint ) );
+    VECTOR2D mid = xform( aCenterPoint );
     double   width = xform( aWidth / 2.0 );
     VECTOR2D startPointS = VECTOR2D( r, 0.0 );
     VECTOR2D endPointS = VECTOR2D( r, 0.0 );
@@ -1672,13 +1671,16 @@ bool CAIRO_GAL::updatedGalDisplayOptions( const GAL_DISPLAY_OPTIONS& aOptions )
 }
 
 
-bool CAIRO_GAL::SetNativeCursorStyle( KICURSOR aCursor )
+bool CAIRO_GAL::SetNativeCursorStyle( KICURSOR aCursor, bool aHiDPI )
 {
     // Store the current cursor type and get the wxCursor for it
-    if( !GAL::SetNativeCursorStyle( aCursor ) )
+    if( !GAL::SetNativeCursorStyle( aCursor, aHiDPI ) )
         return false;
 
-    m_currentwxCursor = CURSOR_STORE::GetCursor( m_currentNativeCursor );
+    if( aHiDPI )
+        m_currentwxCursor = CURSOR_STORE::GetHiDPICursor( m_currentNativeCursor );
+    else
+        m_currentwxCursor = CURSOR_STORE::GetCursor( m_currentNativeCursor );
 
     // Update the cursor in the wx control
     wxWindow::SetCursor( m_currentwxCursor );

common/gal/cursors.cpp

@@ -44,85 +44,76 @@
 #include <cursors/cursor-subtract.xpm>
 #include <cursors/cursor-text.xpm>
 #include <cursors/cursor-xor.xpm>
-#include <cursors/cursor-zoom.xpm>
+#include <cursors/cursor-zoom-in.xpm>
 #include <cursors/cursor-zoom-out.xpm>
+#include <cursors/cursor_tune.xpm>
+#include <cursors/voltage_probe.xpm>
+#include <cursors/current_probe.xpm>
+
+// HiDPI cursor files
+#include <cursors/cursor-add64.xpm>
+#include <cursors/cursor-component64.xpm>
+#include <cursors/cursor-eraser64.xpm>
+#include <cursors/cursor-label-global64.xpm>
+#include <cursors/cursor-label-hier64.xpm>
+#include <cursors/cursor-label-net64.xpm>
+#include <cursors/cursor-line-bus64.xpm>
+#include <cursors/cursor-line-graphic64.xpm>
+#include <cursors/cursor-line-wire64.xpm>
+#include <cursors/cursor-line-wire-add64.xpm>
+#include <cursors/cursor-measure64.xpm>
+#include <cursors/cursor-pencil64.xpm>
+#include <cursors/cursor-select-lasso64.xpm>
+#include <cursors/cursor-select-window64.xpm>
+#include <cursors/cursor-subtract64.xpm>
+#include <cursors/cursor-text64.xpm>
+#include <cursors/cursor-xor64.xpm>
+#include <cursors/cursor-zoom-in64.xpm>
+#include <cursors/cursor-zoom-out64.xpm>
+#include <cursors/cursor_tune64.xpm>
+#include <cursors/voltage_probe64.xpm>
+#include <cursors/current_probe64.xpm>
+
 
 // Under MSW, the standard cursor is white on black.  Elsewhere it is black on white
 #ifdef __WINDOWS__
 #include <cursors/cursor-place.xpm>
+#include <cursors/cursor-place64.xpm>
 #include <cursors/cursor-select-m.xpm>
+#include <cursors/cursor-select-m64.xpm>
 #else
 #include <cursors/cursor-place-black.xpm>
+#include <cursors/cursor-place-black64.xpm>
 #include <cursors/cursor-select-m-black.xpm>
+#include <cursors/cursor-select-m-black64.xpm>
 #endif
 
 #include <wx/bitmap.h>
 #include <wx/debug.h>
 
 
-static const unsigned char voltage_probe[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00,
-    0x00, 0x30, 0x06, 0x00, 0x00, 0x18, 0x0c, 0x00, 0x00, 0x0e, 0x08, 0x00, 0x80, 0x07, 0x08, 0x00,
-    0xc0, 0x07, 0x18, 0x00, 0xe0, 0x07, 0x30, 0x00, 0xf0, 0x03, 0x60, 0x00, 0xf8, 0x01, 0x00, 0x00,
-    0xfc, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x80, 0x1f, 0x00, 0x00, 0xc0,
-    0x0f, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x00, 0xf0,
-    0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x02,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-
-static const unsigned char current_probe[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0x00, 0x00, 0x60, 0x06, 0x00,
-    0x00, 0x30, 0x0c, 0x00, 0x00, 0x1c, 0x08, 0x00, 0x00, 0x0f, 0x08, 0x00, 0x80, 0x0f, 0x18, 0x00,
-    0xc0, 0x0f, 0x30, 0x80, 0xe1, 0x07, 0x60, 0x80, 0xf1, 0x03, 0x00, 0x80, 0xf9, 0x01, 0x00, 0x80,
-    0xfd, 0x00, 0x00, 0x80, 0x7f, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x80, 0x1f, 0x00, 0x00, 0xc0,
-    0x0f, 0x00, 0x00, 0xf8, 0x07, 0x00, 0x00, 0xfe, 0x03, 0x00, 0x00, 0xc6, 0x01, 0x00, 0x00, 0x83,
-    0x01, 0x00, 0x00, 0x83, 0x01, 0x00, 0x00, 0x83, 0x01, 0x00, 0x00, 0xc2, 0x00, 0x00, 0x00, 0xfc,
-    0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00 };
-
-static const unsigned char cursor_tune[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0xc0, 0x0f, 0x00,
-    0x00, 0xe0, 0x1f, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00, 0xf8, 0x0f, 0x00, 0x00, 0xfc, 0x07, 0x00,
-    0x00, 0xfe, 0x03, 0x00, 0x00, 0xff, 0x01, 0x00, 0x80, 0xff, 0x00, 0x00, 0xc0, 0x7f, 0x00, 0x00,
-    0xe0, 0x3f, 0x00, 0x00, 0xe0, 0x1f, 0x00, 0x00, 0xfc, 0x0f, 0x00, 0x00, 0xfc, 0x07, 0x00, 0x00,
-    0xfc, 0x03, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0xf4, 0x00, 0x00, 0x00, 0xea, 0x00, 0x00, 0x00,
-    0x05, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x50,
-    0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x0a,
-    0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 };
-
-static const unsigned char cursor_tune_mask[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0xc0, 0x0f,
-    0x00, 0x00, 0xe0, 0x1f, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00, 0xf8, 0x0f, 0x00, 0x00, 0xfc, 0x07,
-    0x00, 0x00, 0xfe, 0x03, 0x00, 0x00, 0xff, 0x01, 0x00, 0x80, 0xff, 0x00, 0x00, 0xc0, 0x7f, 0x00,
-    0x00, 0xe0, 0x3f, 0x00, 0x00, 0xe0, 0x1f, 0x00, 0x00, 0xfc, 0x0f, 0x00, 0x00, 0xfc, 0x07, 0x00,
-    0x00, 0xfc, 0x03, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xee, 0x00, 0x00,
-    0x00, 0x07, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00,
-    0x70, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
-    0x0e, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 };
-
-
 static const std::vector<CURSOR_STORE::CURSOR_DEF> standard_cursors = {
     {
         KICURSOR::VOLTAGE_PROBE,
-        voltage_probe,
-        voltage_probe,
         nullptr,
+        nullptr,
+        voltage_probe_xpm,
         { 32, 32 },
         { 1, 31 },
     },
     {
         KICURSOR::CURRENT_PROBE,
-        current_probe,
-        current_probe,
         nullptr,
+        nullptr,
+        current_probe_xpm,
         { 32, 32 },
         { 4, 27 },
     },
     {
         KICURSOR::TUNE,
-        cursor_tune,
-        cursor_tune_mask,
         nullptr,
+        nullptr,
+        cursor_tune_xpm,
         { 32, 32 },
         { 1, 30 },
     },
@@ -198,7 +189,7 @@ static const std::vector<CURSOR_STORE::CURSOR_DEF> standard_cursors = {
         KICURSOR::ZOOM_IN,
         nullptr,
         nullptr,
-        cursor_zoom_xpm,
+        cursor_zoom_in_xpm,
         { 32, 32 },
         { 6, 6 },
     },
@@ -305,6 +296,209 @@ static const std::vector<CURSOR_STORE::CURSOR_DEF> standard_cursors = {
 };
 
 
+static const std::vector<CURSOR_STORE::CURSOR_DEF> hidpi_cursors = {
+    {
+        KICURSOR::VOLTAGE_PROBE,
+        nullptr,
+        nullptr,
+        voltage_probe64_xpm,
+        { 64, 64 },
+        { 1, 62 },
+    },
+    {
+        KICURSOR::CURRENT_PROBE,
+        nullptr,
+        nullptr,
+        current_probe64_xpm,
+        { 64, 64 },
+        { 8, 54 },
+    },
+    {
+        KICURSOR::TUNE,
+        nullptr,
+        nullptr,
+        cursor_tune64_xpm,
+        { 64, 64 },
+        { 2, 60 },
+    },
+    {
+        KICURSOR::PENCIL,
+        nullptr,
+        nullptr,
+        cursor_pencil64_xpm,
+        { 64, 64 },
+        { 8, 54 },
+    },
+    {
+        KICURSOR::MOVING,
+        nullptr,
+        nullptr,
+#ifdef __WINDOWS__
+        cursor_select_m64_xpm,
+#else
+        cursor_select_m_black64_xpm,
+#endif
+        { 64, 64 },
+        { 2, 2 },
+    },
+    {
+        KICURSOR::REMOVE,
+        nullptr,
+        nullptr,
+        cursor_eraser64_xpm,
+        { 64, 64 },
+        { 8, 8 },
+    },
+    {
+        KICURSOR::TEXT,
+        nullptr,
+        nullptr,
+        cursor_text64_xpm,
+        { 64, 64 },
+        { 14, 14 },
+    },
+    {
+        KICURSOR::MEASURE,
+        nullptr,
+        nullptr,
+        cursor_measure64_xpm,
+        { 64, 64 },
+        { 8, 8 },
+    },
+    {
+        KICURSOR::ADD,
+        nullptr,
+        nullptr,
+        cursor_add64_xpm,
+        { 64, 64 },
+        { 14, 14 },
+    },
+    {
+        KICURSOR::SUBTRACT,
+        nullptr,
+        nullptr,
+        cursor_subtract64_xpm,
+        { 64, 64 },
+        { 14, 14 },
+    },
+    {
+        KICURSOR::XOR,
+        nullptr,
+        nullptr,
+        cursor_xor64_xpm,
+        { 64, 64 },
+        { 14, 14 },
+    },
+    {
+        KICURSOR::ZOOM_IN,
+        nullptr,
+        nullptr,
+        cursor_zoom_in64_xpm,
+        { 64, 64 },
+        { 12, 12 },
+    },
+    {
+        KICURSOR::ZOOM_OUT,
+        nullptr,
+        nullptr,
+        cursor_zoom_out64_xpm,
+        { 64, 64 },
+        { 12, 12 },
+    },
+    {
+        KICURSOR::LABEL_NET,
+        nullptr,
+        nullptr,
+        cursor_label_net64_xpm,
+        { 64, 64 },
+        { 14, 14 },
+    },
+    {
+        KICURSOR::LABEL_GLOBAL,
+        nullptr,
+        nullptr,
+        cursor_label_global64_xpm,
+        { 64, 64 },
+        { 14, 14 },
+    },
+    {
+        KICURSOR::COMPONENT,
+        nullptr,
+        nullptr,
+        cursor_component64_xpm,
+        { 64, 64 },
+        { 14, 14 },
+    },
+    {
+        KICURSOR::SELECT_LASSO,
+        nullptr,
+        nullptr,
+        cursor_select_lasso64_xpm,
+        { 64, 64 },
+        { 14, 14 },
+    },
+    {
+        KICURSOR::SELECT_WINDOW,
+        nullptr,
+        nullptr,
+        cursor_select_window64_xpm,
+        { 64, 64 },
+        { 14, 20 },
+    },
+    {
+        KICURSOR::LINE_BUS,
+        nullptr,
+        nullptr,
+        cursor_line_bus64_xpm,
+        { 64, 64 },
+        { 10, 52 },
+    },
+    {
+        KICURSOR::LINE_WIRE,
+        nullptr,
+        nullptr,
+        cursor_line_wire64_xpm,
+        { 64, 64 },
+        { 10, 52 },
+    },
+    {
+        KICURSOR::LINE_WIRE_ADD,
+        nullptr,
+        nullptr,
+        cursor_line_wire_add64_xpm,
+        { 64, 64 },
+        { 10, 52 },
+    },
+    {
+        KICURSOR::LINE_GRAPHIC,
+        nullptr,
+        nullptr,
+        cursor_line_graphic64_xpm,
+        { 64, 64 },
+        { 10, 52 },
+    },
+    {
+        KICURSOR::LABEL_HIER,
+        nullptr,
+        nullptr,
+        cursor_label_hier64_xpm,
+        { 64, 64 },
+        { 14, 14 },
+    },
+    {
+        KICURSOR::PLACE,
+        nullptr,
+        nullptr,
+#ifdef __WINDOWS__
+        cursor_place64_xpm,
+#else
+        cursor_place_black64_xpm,
+#endif
+        { 64, 64 },
+        { 2, 2 },
+    },
+};
+
 /**
  * Construct a cursor for the given definition.
  *
@@ -393,8 +587,8 @@ const wxCursor& CURSOR_STORE::Get( KICURSOR aIdKey ) const
 
 const wxCursor CURSOR_STORE::GetCursor( KICURSOR aCursorType )
 {
-    wxStockCursor stock =
-            GetStockCursor( aCursorType );
+    wxStockCursor stock = GetStockCursor( aCursorType );
+
     if( stock != wxCURSOR_MAX )
     {
         return wxCursor( stock );
@@ -405,6 +599,20 @@ const wxCursor CURSOR_STORE::GetCursor( KICURSOR aCursorType )
 }
 
 
+const wxCursor CURSOR_STORE::GetHiDPICursor( KICURSOR aCursorType )
+{
+    wxStockCursor stock = GetStockCursor( aCursorType );
+
+    if( stock != wxCURSOR_MAX )
+    {
+        return wxCursor( stock );
+    }
+
+    static CURSOR_STORE store( hidpi_cursors );
+    return store.Get( aCursorType );
+}
+
+
 wxStockCursor CURSOR_STORE::GetStockCursor( KICURSOR aCursorType )
 {
     wxStockCursor stockCursor;

common/gal/graphics_abstraction_layer.cpp

@@ -81,7 +81,7 @@ GAL::GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions ) :
     SetCursorEnabled( false );
 
     // Initialize the native widget to an arrow cursor
-    SetNativeCursorStyle( KICURSOR::ARROW );
+    SetNativeCursorStyle( KICURSOR::ARROW, false );
 
     // Initialize text properties
     ResetTextAttributes();
@@ -277,7 +277,7 @@ void GAL::BitmapText( const wxString& aText, const VECTOR2I& aPosition, const ED
 }
 
 
-bool GAL::SetNativeCursorStyle( KICURSOR aCursor )
+bool GAL::SetNativeCursorStyle( KICURSOR aCursor, bool aHiDPI )
 {
     if( m_currentNativeCursor == aCursor )
         return false;

common/gal/hidpi_gl_canvas.cpp

@@ -34,8 +34,7 @@ HIDPI_GL_CANVAS::HIDPI_GL_CANVAS( const KIGFX::VC_SETTINGS& aSettings, wxWindow*
                                   const wxPoint& aPos, const wxSize& aSize, long aStyle,
                                   const wxString& aName, const wxPalette& aPalette ) :
         wxGLCanvas( aParent, aId, aAttribList, aPos, aSize, aStyle, aName, aPalette ),
-        m_settings( aSettings ),
-        m_scale_factor( DPI_SCALING::GetDefaultScaleFactor() )
+        m_settings( aSettings )
 {
 }
 
@@ -64,13 +63,7 @@ wxPoint HIDPI_GL_CANVAS::GetNativePosition( const wxPoint& aPoint ) const
 }
 
 
-void HIDPI_GL_CANVAS::SetScaleFactor( double aNewScaleFactor )
-{
-    m_scale_factor = aNewScaleFactor;
-}
-
-
 double HIDPI_GL_CANVAS::GetScaleFactor() const
 {
-    return m_scale_factor;
+    return GetContentScaleFactor();
 }

common/gal/opengl/antialiasing.cpp

@@ -185,7 +185,11 @@ void ANTIALIASING_SUPERSAMPLING::Present()
     glBindTexture( GL_TEXTURE_2D, compositor->GetBufferTexture( ssaaMainBuffer ) );
     compositor->SetBuffer( OPENGL_COMPOSITOR::DIRECT_RENDERING );
 
+    glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE );
+
     draw_fullscreen_primitive();
+
+    glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
 }
 
 
@@ -547,7 +551,11 @@ void ANTIALIASING_SMAA::Present()
     glActiveTexture( GL_TEXTURE1 );
     glBindTexture( GL_TEXTURE_2D, blendTex );
 
+    glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE );
+
     pass_3_shader->Use();
     draw_fullscreen_triangle();
     pass_3_shader->Deactivate();
+
+    glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
 }

common/gal/opengl/opengl_compositor.cpp

@@ -297,7 +297,7 @@ void OPENGL_COMPOSITOR::ClearBuffer( const COLOR4D& aColor )
 {
     wxASSERT( m_initialized );
 
-    glClearColor( aColor.r, aColor.g, aColor.b, 0.0f );
+    glClearColor( aColor.r, aColor.g, aColor.b, m_curFbo == DIRECT_RENDERING ? 1.0f : 0.0f );
     glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT );
 }
 

common/gal/opengl/opengl_gal.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KICAD, a free EDA CAD application.
  *
  * Copyright (C) 2012 Torsten Hueter, torstenhtr <at> gmx.de
- * Copyright (C) 2012-2023 Kicad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2012-2024 Kicad Developers, see AUTHORS.txt for contributors.
  * Copyright (C) 2013-2017 CERN
  * @author Maciej Suminski <maciej.suminski@cern.ch>
  *
@@ -33,6 +33,7 @@
 #endif
 
 #include <advanced_config.h>
+#include <build_version.h>
 #include <gal/opengl/opengl_gal.h>
 #include <gal/opengl/utils.h>
 #include <gal/definitions.h>
@@ -254,7 +255,8 @@ GLuint GL_BITMAP_CACHE::cacheBitmap( const BITMAP_BASE* aBitmap )
     bmp.accessTime = currentTime;
 
 #ifndef DISABLE_BITMAP_CACHE
-    if( m_cacheLru.size() + 1 > m_cacheMaxElements || m_cacheSize + bmp.size > m_cacheMaxSize )
+    if( ( m_cacheLru.size() + 1 > m_cacheMaxElements || m_cacheSize + bmp.size > m_cacheMaxSize )
+        && !m_cacheLru.empty() )
     {
         KIID toRemove( 0 );
         auto toRemoveLru = m_cacheLru.end();
@@ -506,13 +508,6 @@ bool OPENGL_GAL::updatedGalDisplayOptions( const GAL_DISPLAY_OPTIONS& aOptions )
         refresh = true;
     }
 
-    if( m_options.m_scaleFactor != GetScaleFactor() )
-    {
-        SetScaleFactor( m_options.m_scaleFactor );
-        m_gridLineWidth = m_options.m_scaleFactor * ( m_options.m_gridLineWidth + 0.25 );
-        refresh = true;
-    }
-
     if( super::updatedGalDisplayOptions( aOptions ) || refresh )
     {
         Refresh();
@@ -1005,11 +1000,20 @@ void OPENGL_GAL::DrawArc( const VECTOR2D& aCenterPoint, double aRadius,
 
         VECTOR2D p( cos( startAngle ) * aRadius, sin( startAngle ) * aRadius );
         double   alpha;
+        unsigned int lineCount = 0;
+
+        for( alpha = startAngle + alphaIncrement; alpha <= endAngle; alpha += alphaIncrement )
+            lineCount++;
+
+        if( alpha != endAngle )
+            lineCount++;
+
+        reserveLineQuads( lineCount );
 
         for( alpha = startAngle + alphaIncrement; alpha <= endAngle; alpha += alphaIncrement )
         {
             VECTOR2D p_next( cos( alpha ) * aRadius, sin( alpha ) * aRadius );
-            DrawLine( p, p_next );
+            drawLineQuad( p, p_next, false );
 
             p = p_next;
         }
@@ -1018,7 +1022,7 @@ void OPENGL_GAL::DrawArc( const VECTOR2D& aCenterPoint, double aRadius,
         if( alpha != endAngle )
         {
             VECTOR2D p_last( cos( endAngle ) * aRadius, sin( endAngle ) * aRadius );
-            DrawLine( p, p_last );
+            drawLineQuad( p, p_last, false );
         }
     }
 
@@ -1058,9 +1062,21 @@ void OPENGL_GAL::DrawArcSegment( const VECTOR2D& aCenterPoint, double aRadius,
     if( seg_count % 2 != 0 )
         seg_count += 1;
 
+    // Our shaders have trouble rendering null line quads, so delegate this task to DrawSegment.
+    if( seg_count == 0 )
+    {
+        VECTOR2D p_start( aCenterPoint.x + cos( startAngle ) * aRadius,
+                          aCenterPoint.y + sin( startAngle ) * aRadius );
+
+        VECTOR2D p_end( aCenterPoint.x + cos( endAngle ) * aRadius,
+                        aCenterPoint.y + sin( endAngle ) * aRadius );
+
+        DrawSegment( p_start, p_end, aWidth );
+        return;
+    }
+
     // Recalculate alphaIncrement with a even integer number of segment
-    if( seg_count )
-        alphaIncrement = ( endAngle - startAngle ) / seg_count;
+    alphaIncrement = ( endAngle - startAngle ) / seg_count;
 
     Save();
     m_currentManager->Translate( aCenterPoint.x, aCenterPoint.y, 0.0 );
@@ -2112,13 +2128,16 @@ void OPENGL_GAL::EndDiffLayer()
 }
 
 
-bool OPENGL_GAL::SetNativeCursorStyle( KICURSOR aCursor )
+bool OPENGL_GAL::SetNativeCursorStyle( KICURSOR aCursor, bool aHiDPI )
 {
     // Store the current cursor type and get the wxCursor for it
-    if( !GAL::SetNativeCursorStyle( aCursor ) )
+    if( !GAL::SetNativeCursorStyle( aCursor, aHiDPI ) )
         return false;
 
-    m_currentwxCursor = CURSOR_STORE::GetCursor( m_currentNativeCursor );
+    if( aHiDPI )
+        m_currentwxCursor = CURSOR_STORE::GetHiDPICursor( m_currentNativeCursor );
+    else
+        m_currentwxCursor = CURSOR_STORE::GetCursor( m_currentNativeCursor );
 
     // Update the cursor in the wx control
     HIDPI_GL_CANVAS::SetCursor( m_currentwxCursor );
@@ -2657,6 +2676,9 @@ void OPENGL_GAL::init()
 
 #endif // KICAD_USE_EGL
 
+    SetOpenGLInfo( (const char*) glGetString( GL_VENDOR ), (const char*) glGetString( GL_RENDERER ),
+                   (const char*) glGetString( GL_VERSION ) );
+
     if( GLEW_OK != err )
         throw std::runtime_error( (const char*) glewGetErrorString( err ) );
 

common/grid_tricks.cpp

@@ -444,7 +444,7 @@ void GRID_TRICKS::doPopupSelection( wxCommandEvent& event )
         break;
 
     default:
-        if( menu_id >= GRIDTRICKS_FIRST_SHOWHIDE )
+        if( menu_id >= GRIDTRICKS_FIRST_SHOWHIDE && m_grid->CommitPendingChanges( false ) )
         {
             int col = menu_id - GRIDTRICKS_FIRST_SHOWHIDE;
 

common/hotkey_store.cpp

@@ -32,14 +32,18 @@
 class PSEUDO_ACTION : public TOOL_ACTION
 {
 public:
-    PSEUDO_ACTION( const wxString& aLabel, int aHotKey )
+    PSEUDO_ACTION( const wxString& aLabel, int aHotKey, int aHotKeyAlt = 0 )
     {
         m_friendlyName = aLabel;
         m_hotKey = aHotKey;
+        m_hotKeyAlt = aHotKeyAlt;
     }
 };
 
 static PSEUDO_ACTION* g_gesturePseudoActions[] = {
+    new PSEUDO_ACTION( _( "Accept Autocomplete" ), WXK_RETURN, WXK_NUMPAD_ENTER ),
+    new PSEUDO_ACTION( _( "Cancel Autocomplete" ), WXK_ESCAPE ),
+    new PSEUDO_ACTION( _( "Toggle Checkbox" ), WXK_SPACE ),
     new PSEUDO_ACTION( _( "Pan Left/Right" ), MD_CTRL + PSEUDO_WXK_WHEEL ),
     new PSEUDO_ACTION( _( "Pan Up/Down" ), MD_SHIFT + PSEUDO_WXK_WHEEL ),
     new PSEUDO_ACTION( _( "Finish Drawing" ), PSEUDO_WXK_DBLCLICK ),

common/hotkeys_basic.cpp

@@ -63,79 +63,80 @@ struct hotkey_name_descr
 #define KEY_NON_FOUND -1
 static struct hotkey_name_descr hotkeyNameList[] =
 {
-    { wxT( "F1" ),           WXK_F1                                                   },
-    { wxT( "F2" ),           WXK_F2                                                   },
-    { wxT( "F3" ),           WXK_F3                                                   },
-    { wxT( "F4" ),           WXK_F4                                                   },
-    { wxT( "F5" ),           WXK_F5                                                   },
-    { wxT( "F6" ),           WXK_F6                                                   },
-    { wxT( "F7" ),           WXK_F7                                                   },
-    { wxT( "F8" ),           WXK_F8                                                   },
-    { wxT( "F9" ),           WXK_F9                                                   },
-    { wxT( "F10" ),          WXK_F10                                                  },
-    { wxT( "F11" ),          WXK_F11                                                  },
-    { wxT( "F12" ),          WXK_F12                                                  },
-    { wxT( "F13" ),          WXK_F13                                                  },
-    { wxT( "F14" ),          WXK_F14                                                  },
-    { wxT( "F15" ),          WXK_F15                                                  },
-    { wxT( "F16" ),          WXK_F16                                                  },
-    { wxT( "F17" ),          WXK_F17                                                  },
-    { wxT( "F18" ),          WXK_F18                                                  },
-    { wxT( "F19" ),          WXK_F19                                                  },
-    { wxT( "F20" ),          WXK_F20                                                  },
-    { wxT( "F21" ),          WXK_F21                                                  },
-    { wxT( "F22" ),          WXK_F22                                                  },
-    { wxT( "F23" ),          WXK_F23                                                  },
-    { wxT( "F24" ),          WXK_F24                                                  },
+    { wxT( "F1" ),            WXK_F1                 },
+    { wxT( "F2" ),            WXK_F2                 },
+    { wxT( "F3" ),            WXK_F3                 },
+    { wxT( "F4" ),            WXK_F4                 },
+    { wxT( "F5" ),            WXK_F5                 },
+    { wxT( "F6" ),            WXK_F6                 },
+    { wxT( "F7" ),            WXK_F7                 },
+    { wxT( "F8" ),            WXK_F8                 },
+    { wxT( "F9" ),            WXK_F9                 },
+    { wxT( "F10" ),           WXK_F10                },
+    { wxT( "F11" ),           WXK_F11                },
+    { wxT( "F12" ),           WXK_F12                },
+    { wxT( "F13" ),           WXK_F13                },
+    { wxT( "F14" ),           WXK_F14                },
+    { wxT( "F15" ),           WXK_F15                },
+    { wxT( "F16" ),           WXK_F16                },
+    { wxT( "F17" ),           WXK_F17                },
+    { wxT( "F18" ),           WXK_F18                },
+    { wxT( "F19" ),           WXK_F19                },
+    { wxT( "F20" ),           WXK_F20                },
+    { wxT( "F21" ),           WXK_F21                },
+    { wxT( "F22" ),           WXK_F22                },
+    { wxT( "F23" ),           WXK_F23                },
+    { wxT( "F24" ),           WXK_F24                },
 
-    { wxT( "Esc" ),          WXK_ESCAPE                                               },
-    { wxT( "Del" ),          WXK_DELETE                                               },
-    { wxT( "Tab" ),          WXK_TAB                                                  },
-    { wxT( "Back" ),         WXK_BACK                                                 },
-    { wxT( "Ins" ),          WXK_INSERT                                               },
+    { wxT( "Esc" ),           WXK_ESCAPE             },
+    { wxT( "Del" ),           WXK_DELETE             },
+    { wxT( "Tab" ),           WXK_TAB                },
+    { wxT( "Back" ),          WXK_BACK               },
+    { wxT( "Ins" ),           WXK_INSERT             },
 
-    { wxT( "Home" ),         WXK_HOME                                                 },
-    { wxT( "End" ),          WXK_END                                                  },
-    { wxT( "PgUp" ),         WXK_PAGEUP                                               },
-    { wxT( "PgDn" ),         WXK_PAGEDOWN                                             },
+    { wxT( "Home" ),          WXK_HOME               },
+    { wxT( "End" ),           WXK_END                },
+    { wxT( "PgUp" ),          WXK_PAGEUP             },
+    { wxT( "PgDn" ),          WXK_PAGEDOWN           },
 
-    { wxT( "Up" ),           WXK_UP                                                   },
-    { wxT( "Down" ),         WXK_DOWN                                                 },
-    { wxT( "Left" ),         WXK_LEFT                                                 },
-    { wxT( "Right" ),        WXK_RIGHT                                                },
+    { wxT( "Up" ),            WXK_UP                 },
+    { wxT( "Down" ),          WXK_DOWN               },
+    { wxT( "Left" ),          WXK_LEFT               },
+    { wxT( "Right" ),         WXK_RIGHT              },
 
-    { wxT( "Return" ),       WXK_RETURN                                               },
+    { wxT( "Return" ),        WXK_RETURN             },
 
-    { wxT( "Space" ),        WXK_SPACE                                                },
+    { wxT( "Space" ),         WXK_SPACE              },
 
-    { wxT( "Num Pad 0" ),    WXK_NUMPAD0                                              },
-    { wxT( "Num Pad 1" ),    WXK_NUMPAD1                                              },
-    { wxT( "Num Pad 2" ),    WXK_NUMPAD2                                              },
-    { wxT( "Num Pad 3" ),    WXK_NUMPAD3                                              },
-    { wxT( "Num Pad 4" ),    WXK_NUMPAD4                                              },
-    { wxT( "Num Pad 5" ),    WXK_NUMPAD5                                              },
-    { wxT( "Num Pad 6" ),    WXK_NUMPAD6                                              },
-    { wxT( "Num Pad 7" ),    WXK_NUMPAD7                                              },
-    { wxT( "Num Pad 8" ),    WXK_NUMPAD8                                              },
-    { wxT( "Num Pad 9" ),    WXK_NUMPAD9                                              },
-    { wxT( "Num Pad +" ),    WXK_NUMPAD_ADD                                           },
-    { wxT( "Num Pad -" ),    WXK_NUMPAD_SUBTRACT                                      },
-    { wxT( "Num Pad *" ),    WXK_NUMPAD_MULTIPLY                                      },
-    { wxT( "Num Pad /" ),    WXK_NUMPAD_DIVIDE                                        },
-    { wxT( "Num Pad ." ),    WXK_NUMPAD_SEPARATOR                                     },
-    { wxT( "Num Pad F1"),    WXK_NUMPAD_F1                                            },
-    { wxT( "Num Pad F2"),    WXK_NUMPAD_F2                                            },
-    { wxT( "Num Pad F3"),    WXK_NUMPAD_F3                                            },
-    { wxT( "Num Pad F4"),    WXK_NUMPAD_F4                                            },
+    { wxT( "Num Pad 0" ),     WXK_NUMPAD0            },
+    { wxT( "Num Pad 1" ),     WXK_NUMPAD1            },
+    { wxT( "Num Pad 2" ),     WXK_NUMPAD2            },
+    { wxT( "Num Pad 3" ),     WXK_NUMPAD3            },
+    { wxT( "Num Pad 4" ),     WXK_NUMPAD4            },
+    { wxT( "Num Pad 5" ),     WXK_NUMPAD5            },
+    { wxT( "Num Pad 6" ),     WXK_NUMPAD6            },
+    { wxT( "Num Pad 7" ),     WXK_NUMPAD7            },
+    { wxT( "Num Pad 8" ),     WXK_NUMPAD8            },
+    { wxT( "Num Pad 9" ),     WXK_NUMPAD9            },
+    { wxT( "Num Pad +" ),     WXK_NUMPAD_ADD         },
+    { wxT( "Num Pad -" ),     WXK_NUMPAD_SUBTRACT    },
+    { wxT( "Num Pad *" ),     WXK_NUMPAD_MULTIPLY    },
+    { wxT( "Num Pad /" ),     WXK_NUMPAD_DIVIDE      },
+    { wxT( "Num Pad ." ),     WXK_NUMPAD_SEPARATOR   },
+    { wxT( "Num Pad Enter" ), WXK_NUMPAD_ENTER       },
+    { wxT( "Num Pad F1"),     WXK_NUMPAD_F1          },
+    { wxT( "Num Pad F2"),     WXK_NUMPAD_F2          },
+    { wxT( "Num Pad F3"),     WXK_NUMPAD_F3          },
+    { wxT( "Num Pad F4"),     WXK_NUMPAD_F4          },
 
-    { wxT( "" ),             0                                                        },
+    { wxT( "" ),              0                      },
 
-    { wxT( "Click" ),        PSEUDO_WXK_CLICK                                         },
-    { wxT( "DblClick" ),     PSEUDO_WXK_DBLCLICK                                      },
-    { wxT( "Wheel" ),        PSEUDO_WXK_WHEEL                                         },
+    { wxT( "Click" ),         PSEUDO_WXK_CLICK       },
+    { wxT( "DblClick" ),      PSEUDO_WXK_DBLCLICK    },
+    { wxT( "Wheel" ),         PSEUDO_WXK_WHEEL       },
 
     // Do not change this line: end of list
-    { wxT( "" ),             KEY_NON_FOUND                                            }
+    { wxT( "" ),              KEY_NON_FOUND          }
 };
 
 

common/import_gfx/dxf_import_plugin.cpp

@@ -642,10 +642,6 @@ void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseData& aData )
     if( startAngle > endAngle )
         endAngle += ANGLE_360;
 
-    // Angles are relative to major axis
-    startAngle -= EDA_ANGLE( major );
-    endAngle -= EDA_ANGLE( major );
-
     if( aData.ratio == 1.0 )
     {
         double radius = major.EuclideanNorm();
@@ -658,6 +654,10 @@ void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseData& aData )
         }
         else
         {
+            // Angles are relative to major axis
+            startAngle -= EDA_ANGLE( major );
+            endAngle -= EDA_ANGLE( major );
+
             DL_ArcData arc( aData.cx, aData.cy, aData.cz, radius, startAngle.AsDegrees(),
                             endAngle.AsDegrees() );
             addArc( arc );

common/io/altium/altium_ascii_parser.cpp

@@ -0,0 +1,134 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2019-2020 Thomas Pointhuber <thomas.pointhuber@gmx.at>
+ * Copyright (C) 2020-2024 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include "altium_ascii_parser.h"
+#include "altium_parser_utils.h"
+
+
+ALTIUM_ASCII_PARSER::ALTIUM_ASCII_PARSER( const wxString& aInputFile ) :
+        m_fileInput( aInputFile.fn_str() )
+{
+}
+
+
+std::map<wxString, wxString> ALTIUM_ASCII_PARSER::ReadProperties()
+{
+    std::map<wxString, wxString> kv;
+    std::string str;
+    std::string line;
+
+    // Lines ending with |> continue on the next line
+    do
+    {
+        if( !std::getline( m_fileInput, line ) )
+        {
+            m_error = true;
+            return kv;
+        }
+
+        if( ( line.size() > 2 && line[line.size() - 2] == '|' && line[line.size() - 1] == '>' ) )
+        {
+            str.append( line, 0, line.size() - 2 );
+        }
+        else
+        {
+            str.append( line );
+            break;
+        }
+    } while( true );
+
+    std::size_t token_end = 0;
+
+    while( token_end < str.size() && token_end != std::string::npos )
+    {
+        std::size_t token_start = str.find( '|', token_end );
+        std::size_t token_equal = str.find( '=', token_end );
+        std::size_t key_start;
+
+        if( token_start <= token_equal )
+        {
+            key_start = token_start + 1;
+        }
+        else
+        {
+            // Leading "|" before "RECORD=28" may be missing in older schematic versions.
+            key_start = token_end;
+        }
+
+        token_end = str.find( '|', key_start );
+
+        if( token_equal >= token_end )
+        {
+            continue; // this looks like an error: skip the entry. Also matches on std::string::npos
+        }
+
+        if( token_end == std::string::npos )
+        {
+            token_end = str.size() + 1; // this is the correct offset
+        }
+
+        std::string keyS = str.substr( key_start, token_equal - key_start );
+        std::string valueS = str.substr( token_equal + 1, token_end - token_equal - 1 );
+
+        // convert the strings to wxStrings, since we use them everywhere
+        // value can have non-ASCII characters, so we convert them from LATIN1/ISO8859-1
+        wxString key( keyS.c_str(), wxConvISO8859_1 );
+        // Altium stores keys either in Upper, or in CamelCase. Lets unify it.
+        wxString canonicalKey = key.Trim( false ).Trim( true ).MakeUpper();
+        // If the key starts with '%UTF8%' we have to parse the value using UTF8
+        wxString value;
+
+        if( canonicalKey.StartsWith( "%UTF8%" ) )
+            value = wxString( valueS.c_str(), wxConvUTF8 );
+        else
+            value = wxString( valueS.c_str(), wxConvISO8859_1 );
+
+        if( canonicalKey != wxS( "PATTERN" ) && canonicalKey != wxS( "SOURCEFOOTPRINTLIBRARY" ) )
+        {
+            // Breathless hack because I haven't a clue what the story is here (but this character
+            // appears in a lot of radial dimensions and is rendered by Altium as a space).
+            value.Replace( wxT( "ÿ" ), wxT( " " ) );
+        }
+
+        // Storage binary data do not need conversion.
+        if( str.rfind( "|BINARY", 0 ) != 0 )
+        {
+            if( canonicalKey == wxT( "DESIGNATOR" ) || canonicalKey == wxT( "NAME" )
+                || canonicalKey == wxT( "TEXT" ) )
+            {
+                value = AltiumPropertyToKiCadString( value );
+            }
+        }
+
+        kv.insert( { canonicalKey, value.Trim() } );
+    }
+
+    return kv;
+}
+
+
+bool ALTIUM_ASCII_PARSER::CanRead()
+{
+    return m_fileInput && m_fileInput.peek() != std::ifstream::traits_type::eof();
+}

common/io/altium/altium_ascii_parser.h

@@ -0,0 +1,54 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2019-2020 Thomas Pointhuber <thomas.pointhuber@gmx.at>
+ * Copyright (C) 2020-2024 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef _ALTIUM_PARSER_H
+#define _ALTIUM_PARSER_H
+
+#include <map>
+#include <string>
+#include <fstream>
+
+#include <wx/string.h>
+
+
+class ALTIUM_ASCII_PARSER
+{
+public:
+    ALTIUM_ASCII_PARSER( const wxString& aInputFile );
+
+    std::map<wxString, wxString> ReadProperties();
+
+    bool CanRead();
+
+    bool HasParsingError()
+    {
+        return m_error;
+    }
+
+private:
+    std::ifstream m_fileInput;
+    bool          m_error = false;
+};
+
+#endif //_ALTIUM_PARSER_H

common/io/altium/altium_binary_parser.cpp

@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include "altium_parser.h"
+#include "altium_binary_parser.h"
 #include "altium_parser_utils.h"
 
 #include <compoundfilereader.h>
@@ -350,13 +350,13 @@ void ALTIUM_COMPOUND_FILE::cacheLibFootprintNames()
 
                                             if( m_reader->IsStream( entry ) && fileName == L"Parameters" )
                                             {
-                                                ALTIUM_PARSER                parametersReader( *this, entry );
+                                                ALTIUM_BINARY_PARSER                parametersReader( *this, entry );
                                                 std::map<wxString, wxString> parameterProperties =
                                                         parametersReader.ReadProperties();
 
-                                                wxString key = ALTIUM_PARSER::ReadString(
+                                                wxString key = ALTIUM_PROPS_UTILS::ReadString(
                                                         parameterProperties, wxT( "PATTERN" ), wxT( "" ) );
-                                                wxString fpName = ALTIUM_PARSER::ReadUnicodeString(
+                                                wxString fpName = ALTIUM_PROPS_UTILS::ReadUnicodeString(
                                                         parameterProperties, wxT( "PATTERN" ), wxT( "" ) );
 
                                                 m_libFootprintDirNameCache[key] = fpName;
@@ -370,7 +370,7 @@ void ALTIUM_COMPOUND_FILE::cacheLibFootprintNames()
 }
 
 
-ALTIUM_PARSER::ALTIUM_PARSER( const ALTIUM_COMPOUND_FILE&     aFile,
+ALTIUM_BINARY_PARSER::ALTIUM_BINARY_PARSER( const ALTIUM_COMPOUND_FILE&     aFile,
                               const CFB::COMPOUND_FILE_ENTRY* aEntry )
 {
     m_subrecord_end = nullptr;
@@ -384,7 +384,7 @@ ALTIUM_PARSER::ALTIUM_PARSER( const ALTIUM_COMPOUND_FILE&     aFile,
 }
 
 
-ALTIUM_PARSER::ALTIUM_PARSER( std::unique_ptr<char[]>& aContent, size_t aSize )
+ALTIUM_BINARY_PARSER::ALTIUM_BINARY_PARSER( std::unique_ptr<char[]>& aContent, size_t aSize )
 {
     m_subrecord_end = nullptr;
     m_size = aSize;
@@ -394,7 +394,7 @@ ALTIUM_PARSER::ALTIUM_PARSER( std::unique_ptr<char[]>& aContent, size_t aSize )
 }
 
 
-std::map<wxString, wxString> ALTIUM_PARSER::ReadProperties(
+std::map<wxString, wxString> ALTIUM_BINARY_PARSER::ReadProperties(
         std::function<std::map<wxString, wxString>( const std::string& )> handleBinaryData )
 {
 
@@ -502,123 +502,3 @@ std::map<wxString, wxString> ALTIUM_PARSER::ReadProperties(
     return kv;
 }
 
-
-int32_t ALTIUM_PARSER::ConvertToKicadUnit( const double aValue )
-{
-    constexpr double int_limit = ( std::numeric_limits<int>::max() - 10 ) / 2.54;
-
-    int32_t iu = KiROUND( Clamp<double>( -int_limit, aValue, int_limit ) * 2.54 );
-
-    // Altium's internal precision is 0.1uinch.  KiCad's is 1nm.  Round to nearest 10nm to clean
-    // up most rounding errors.  This allows lossless conversion of increments of 0.05mils and
-    // 0.01um.
-    return KiROUND( (double) iu / 10.0 ) * 10;
-}
-
-
-int ALTIUM_PARSER::ReadInt( const std::map<wxString, wxString>& aProps, const wxString& aKey,
-                            int aDefault )
-{
-    const std::map<wxString, wxString>::const_iterator& value = aProps.find( aKey );
-    return value == aProps.end() ? aDefault : wxAtoi( value->second );
-}
-
-
-double ALTIUM_PARSER::ReadDouble( const std::map<wxString, wxString>& aProps, const wxString& aKey,
-                                  double aDefault )
-{
-    const std::map<wxString, wxString>::const_iterator& value = aProps.find( aKey );
-
-    if( value == aProps.end() )
-        return aDefault;
-
-    // Locale independent str -> double conversation
-    std::istringstream istr( (const char*) value->second.mb_str() );
-    istr.imbue( std::locale::classic() );
-
-    double doubleValue;
-    istr >> doubleValue;
-    return doubleValue;
-}
-
-
-bool ALTIUM_PARSER::ReadBool( const std::map<wxString, wxString>& aProps, const wxString& aKey,
-                              bool aDefault )
-{
-    const std::map<wxString, wxString>::const_iterator& value = aProps.find( aKey );
-
-    if( value == aProps.end() )
-        return aDefault;
-    else
-        return value->second == "T" || value->second == "TRUE";
-}
-
-
-int32_t ALTIUM_PARSER::ReadKicadUnit( const std::map<wxString, wxString>& aProps,
-                                      const wxString& aKey, const wxString& aDefault )
-{
-    const wxString& value = ReadString( aProps, aKey, aDefault );
-
-    wxString prefix;
-
-    if( !value.EndsWith( "mil", &prefix ) )
-    {
-        wxLogError( _( "Unit '%s' does not end with 'mil'." ), value );
-        return 0;
-    }
-
-    prefix.StartsWith( "+", &prefix );
-
-    double mils;
-
-    if( !prefix.ToCDouble( &mils ) )
-    {
-        wxLogError( _( "Cannot convert '%s' to double." ), prefix );
-        return 0;
-    }
-
-    return ConvertToKicadUnit( mils * 10000 );
-}
-
-
-wxString ALTIUM_PARSER::ReadString( const std::map<wxString, wxString>& aProps,
-                                    const wxString& aKey, const wxString& aDefault )
-{
-    const auto& utf8Value = aProps.find( wxString( "%UTF8%" ) + aKey );
-
-    if( utf8Value != aProps.end() )
-        return utf8Value->second;
-
-    const auto& value = aProps.find( aKey );
-
-    if( value != aProps.end() )
-        return value->second;
-
-    return aDefault;
-}
-
-
-wxString ALTIUM_PARSER::ReadUnicodeString( const std::map<wxString, wxString>& aProps,
-                                           const wxString& aKey, const wxString& aDefault )
-{
-    const auto& unicodeFlag = aProps.find( wxS( "UNICODE" ) );
-
-    if( unicodeFlag != aProps.end() && unicodeFlag->second.Contains( wxS( "EXISTS" ) ) )
-    {
-        const auto& unicodeValue = aProps.find( wxString( "UNICODE__" ) + aKey );
-
-        if( unicodeValue != aProps.end() )
-        {
-            wxArrayString arr = wxSplit( unicodeValue->second, ',', '\0' );
-            wxString      out;
-
-            for( wxString part : arr )
-                out += wxString( wchar_t( wxAtoi( part ) ) );
-
-            return out;
-        }
-    }
-
-    return ReadString( aProps, aKey, aDefault );
-}
-

common/io/altium/altium_binary_parser.h

@@ -22,8 +22,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef ALTIUM_PARSER_H
-#define ALTIUM_PARSER_H
+#ifndef _ALTIUM_BINARY_PARSER_H
+#define _ALTIUM_BINARY_PARSER_H
+
+#include "altium_props_utils.h"
 
 #include <map>
 #include <memory>
@@ -106,12 +108,12 @@ private:
 };
 
 
-class ALTIUM_PARSER
+class ALTIUM_BINARY_PARSER
 {
 public:
-    ALTIUM_PARSER( const ALTIUM_COMPOUND_FILE& aFile, const CFB::COMPOUND_FILE_ENTRY* aEntry );
-    ALTIUM_PARSER( std::unique_ptr<char[]>& aContent, size_t aSize );
-    ~ALTIUM_PARSER() = default;
+    ALTIUM_BINARY_PARSER( const ALTIUM_COMPOUND_FILE& aFile, const CFB::COMPOUND_FILE_ENTRY* aEntry );
+    ALTIUM_BINARY_PARSER( std::unique_ptr<char[]>& aContent, size_t aSize );
+    ~ALTIUM_BINARY_PARSER() = default;
 
     template <typename Type>
     Type Read()
@@ -229,7 +231,7 @@ public:
 
     int32_t ReadKicadUnit()
     {
-        return ConvertToKicadUnit( Read<int32_t>() );
+        return ALTIUM_PROPS_UTILS::ConvertToKicadUnit( Read<int32_t>() );
     }
 
     int32_t ReadKicadUnitX()
@@ -270,26 +272,6 @@ public:
                 return std::map<wxString, wxString>();
             } );
 
-    static int32_t ConvertToKicadUnit( const double aValue );
-
-    static int ReadInt( const std::map<wxString, wxString>& aProps,
-                        const wxString& aKey, int aDefault );
-
-    static double ReadDouble( const std::map<wxString, wxString>& aProps,
-                              const wxString& aKey, double aDefault );
-
-    static bool ReadBool( const std::map<wxString, wxString>& aProps,
-                          const wxString& aKey, bool aDefault );
-
-    static int32_t ReadKicadUnit( const std::map<wxString, wxString>& aProps,
-                                  const wxString& aKey, const wxString& aDefault );
-
-    static wxString ReadString( const std::map<wxString, wxString>& aProps,
-                                const wxString& aKey, const wxString& aDefault );
-
-    static wxString ReadUnicodeString( const std::map<wxString, wxString>& aProps,
-                                       const wxString& aKey, const wxString& aDefault );
-
     void Skip( size_t aLength )
     {
         if( GetRemainingBytes() >= aLength )
@@ -447,4 +429,4 @@ private:
     }
 };
 
-#endif //ALTIUM_PARSER_H
+#endif //_ALTIUM_BINARY_PARSER_H

common/io/altium/altium_props_utils.cpp

@@ -0,0 +1,153 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2019-2020 Thomas Pointhuber <thomas.pointhuber@gmx.at>
+ * Copyright (C) 2020-2024 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include "altium_props_utils.h"
+
+#include <limits>
+#include <sstream>
+#include <math/util.h>
+
+#include <wx/crt.h>
+#include <wx/log.h>
+#include <wx/translation.h>
+
+
+int32_t ALTIUM_PROPS_UTILS::ConvertToKicadUnit( const double aValue )
+{
+    constexpr double int_limit = ( std::numeric_limits<int>::max() - 10 ) / 2.54;
+
+    int32_t iu = KiROUND( Clamp<double>( -int_limit, aValue, int_limit ) * 2.54 );
+
+    // Altium's internal precision is 0.1uinch.  KiCad's is 1nm.  Round to nearest 10nm to clean
+    // up most rounding errors.  This allows lossless conversion of increments of 0.05mils and
+    // 0.01um.
+    return KiROUND( (double) iu / 10.0 ) * 10;
+}
+
+
+int ALTIUM_PROPS_UTILS::ReadInt( const std::map<wxString, wxString>& aProps, const wxString& aKey,
+                            int aDefault )
+{
+    const std::map<wxString, wxString>::const_iterator& value = aProps.find( aKey );
+    return value == aProps.end() ? aDefault : wxAtoi( value->second );
+}
+
+
+double ALTIUM_PROPS_UTILS::ReadDouble( const std::map<wxString, wxString>& aProps, const wxString& aKey,
+                                  double aDefault )
+{
+    const std::map<wxString, wxString>::const_iterator& value = aProps.find( aKey );
+
+    if( value == aProps.end() )
+        return aDefault;
+
+    // Locale independent str -> double conversation
+    std::istringstream istr( (const char*) value->second.mb_str() );
+    istr.imbue( std::locale::classic() );
+
+    double doubleValue;
+    istr >> doubleValue;
+    return doubleValue;
+}
+
+
+bool ALTIUM_PROPS_UTILS::ReadBool( const std::map<wxString, wxString>& aProps, const wxString& aKey,
+                              bool aDefault )
+{
+    const std::map<wxString, wxString>::const_iterator& value = aProps.find( aKey );
+
+    if( value == aProps.end() )
+        return aDefault;
+    else
+        return value->second == "T" || value->second == "TRUE";
+}
+
+
+int32_t ALTIUM_PROPS_UTILS::ReadKicadUnit( const std::map<wxString, wxString>& aProps,
+                                      const wxString& aKey, const wxString& aDefault )
+{
+    const wxString& value = ReadString( aProps, aKey, aDefault );
+
+    wxString prefix;
+
+    if( !value.EndsWith( "mil", &prefix ) )
+    {
+        wxLogError( _( "Unit '%s' does not end with 'mil'." ), value );
+        return 0;
+    }
+
+    prefix.StartsWith( "+", &prefix );
+
+    double mils;
+
+    if( !prefix.ToCDouble( &mils ) )
+    {
+        wxLogError( _( "Cannot convert '%s' to double." ), prefix );
+        return 0;
+    }
+
+    return ConvertToKicadUnit( mils * 10000 );
+}
+
+
+wxString ALTIUM_PROPS_UTILS::ReadString( const std::map<wxString, wxString>& aProps,
+                                    const wxString& aKey, const wxString& aDefault )
+{
+    const auto& utf8Value = aProps.find( wxString( "%UTF8%" ) + aKey );
+
+    if( utf8Value != aProps.end() )
+        return utf8Value->second;
+
+    const auto& value = aProps.find( aKey );
+
+    if( value != aProps.end() )
+        return value->second;
+
+    return aDefault;
+}
+
+
+wxString ALTIUM_PROPS_UTILS::ReadUnicodeString( const std::map<wxString, wxString>& aProps,
+                                           const wxString& aKey, const wxString& aDefault )
+{
+    const auto& unicodeFlag = aProps.find( wxS( "UNICODE" ) );
+
+    if( unicodeFlag != aProps.end() && unicodeFlag->second.Contains( wxS( "EXISTS" ) ) )
+    {
+        const auto& unicodeValue = aProps.find( wxString( "UNICODE__" ) + aKey );
+
+        if( unicodeValue != aProps.end() )
+        {
+            wxArrayString arr = wxSplit( unicodeValue->second, ',', '\0' );
+            wxString      out;
+
+            for( wxString part : arr )
+                out += wxString( wchar_t( wxAtoi( part ) ) );
+
+            return out;
+        }
+    }
+
+    return ReadString( aProps, aKey, aDefault );
+}

common/io/altium/altium_props_utils.h

@@ -0,0 +1,58 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2019-2020 Thomas Pointhuber <thomas.pointhuber@gmx.at>
+ * Copyright (C) 2020-2024 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef _ALTIUM_PROPS_UTILS_H
+#define _ALTIUM_PROPS_UTILS_H
+
+#include <stdint.h>
+#include <map>
+
+#include <wx/string.h>
+
+
+class ALTIUM_PROPS_UTILS
+{
+public:
+    static int32_t ConvertToKicadUnit( const double aValue );
+
+    static int ReadInt( const std::map<wxString, wxString>& aProps, const wxString& aKey,
+                        int aDefault );
+
+    static double ReadDouble( const std::map<wxString, wxString>& aProps, const wxString& aKey,
+                              double aDefault );
+
+    static bool ReadBool( const std::map<wxString, wxString>& aProps, const wxString& aKey,
+                          bool aDefault );
+
+    static int32_t ReadKicadUnit( const std::map<wxString, wxString>& aProps, const wxString& aKey,
+                                  const wxString& aDefault );
+
+    static wxString ReadString( const std::map<wxString, wxString>& aProps, const wxString& aKey,
+                                const wxString& aDefault );
+
+    static wxString ReadUnicodeString( const std::map<wxString, wxString>& aProps,
+                                       const wxString& aKey, const wxString& aDefault );
+};
+
+#endif //_ALTIUM_PROPS_UTILS_H

common/io/eagle/eagle_parser.cpp

@@ -979,13 +979,20 @@ EELEMENT::EELEMENT( wxXmlNode* aElement )
     <!ATTLIST element
           name          %String;       #REQUIRED
           library       %String;       #REQUIRED
+          library_urn   %Urn;          ""
           package       %String;       #REQUIRED
+          package3d_urn %Urn;          ""
+          override_package3d_urn %Urn; ""
+          override_package_urn %Urn;    ""
+          override_locally_modified %Bool; "no"
           value         %String;       #REQUIRED
           x             %Coord;        #REQUIRED
           y             %Coord;        #REQUIRED
           locked        %Bool;         "no"
+          populate      %Bool;         "yes"
           smashed       %Bool;         "no"
           rot           %Rotation;     "R0"
+          grouprefs     IDREFS         #IMPLIED
           >
     */
 
@@ -1001,6 +1008,7 @@ EELEMENT::EELEMENT( wxXmlNode* aElement )
     y       = parseRequiredAttribute<ECOORD>( aElement, "y" );
 
     // optional
+    library_urn = parseOptionalAttribute<wxString>( aElement, "library_urn" );
     locked  = parseOptionalAttribute<bool>( aElement, "locked" );
     smashed = parseOptionalAttribute<bool>( aElement, "smashed" );
     rot     = parseOptionalAttribute<EROT>( aElement, "rot" );

common/io/eagle/eagle_parser.h

@@ -817,6 +817,7 @@ struct EELEMENT
 {
     wxString name;
     wxString library;
+    opt_wxString library_urn;
     wxString package;
     wxString value;
     ECOORD   x;

common/io/easyeda/easyeda_parser_base.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2023 Alex Shvartzkop <dudesuchamazing@gmail.com>
- * Copyright (C) 2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2023-2024 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -246,7 +246,7 @@ EASYEDA_PARSER_BASE::ParseLineChains( const wxString& data, int aArcMinSegLen, b
             arc.ConstructFromStartEndCenter( RelPos( start ), RelPos( end ), RelPos( arcCenter ),
                                              !cw );
 
-            chain.Append( arc );
+            chain.Append( arc, aArcMinSegLen );
 
             prevPt = end;
         }

common/io/easyeda/easyeda_parser_structs.cpp

@@ -87,6 +87,7 @@ void EASYEDA::from_json( const nlohmann::json& j, EASYEDA::DOCUMENT& d )
     PARSE_VALUE( head );
 
     PARSE_VALUE( canvas );
+    PARSE_VALUE( title );
     PARSE_VALUE( shape );
     PARSE_VALUE( dataStr );
 }

common/io/easyeda/easyeda_parser_structs.h

@@ -73,9 +73,10 @@ struct DOCUMENT
 
     // BBox
     // colors
-    wxString                                    canvas;
-    wxArrayString                               shape;
-    std::optional<nlohmann::json>               dataStr;
+    wxString                      canvas;
+    wxString                      title;
+    wxArrayString                 shape;
+    std::optional<nlohmann::json> dataStr;
 };
 
 struct C_PARA

common/io/kicad/kicad_io_utils.cpp

@@ -229,6 +229,9 @@ void Prettify( std::string& aSource, char aQuoteChar )
         ++cursor;
     }
 
+    // newline required at end of line / file for POSIX compliance. Keeps git diffs clean.
+    formatted += '\n';
+
     aSource = std::move( formatted );
 }
 

common/kiway_player.cpp

@@ -57,7 +57,6 @@ KIWAY_PLAYER::KIWAY_PLAYER( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrameType
 
 KIWAY_PLAYER::~KIWAY_PLAYER() throw()
 {
-
     // socket server must be destructed before we complete
     // destructing the frame or else we could crash
     // as the socket server holds a reference to this frame
@@ -69,6 +68,20 @@ KIWAY_PLAYER::~KIWAY_PLAYER() throw()
         delete m_socketServer;
         m_socketServer = nullptr;
     }
+
+    // remove active sockets as well
+    for( wxSocketBase* socket : m_sockets )
+    {
+        if( !socket )
+            continue;
+
+        // ensure any event handling stops
+        socket->Notify( false );
+
+        delete socket;
+    }
+
+    m_sockets.clear();
 }
 
 

common/lib_table_base.cpp

@@ -24,6 +24,7 @@
  */
 
 
+#include <wx/debug.h>
 #include <wx/filename.h>
 #include <set>
 #include <common.h>
@@ -198,7 +199,16 @@ LIB_TABLE_ROW* LIB_TABLE::findRow( const wxString& aNickName, bool aCheckIfEnabl
 
     do
     {
-        std::shared_lock<std::shared_mutex> lock( cur->m_mutex );
+        try
+        {
+            std::shared_lock<std::shared_mutex> lock( cur->m_mutex );
+        }
+        catch( std::system_error& e )
+        {
+            wxASSERT_MSG( false, wxString::Format( wxS( "Failed to lock lib table mutex: %s" ),
+                                                   e.what() ) );
+            continue;
+        }
 
         if( cur->m_rowsMap.count( aNickName ) )
             row = &*cur->m_rowsMap.at( aNickName );

common/lib_table_grid_tricks.cpp

@@ -21,7 +21,8 @@
 #include "lib_table_grid.h"
 
 
-LIB_TABLE_GRID_TRICKS::LIB_TABLE_GRID_TRICKS( WX_GRID* aGrid ) : GRID_TRICKS( aGrid )
+LIB_TABLE_GRID_TRICKS::LIB_TABLE_GRID_TRICKS( WX_GRID* aGrid ) :
+        GRID_TRICKS( aGrid )
 {
 }
 
@@ -65,11 +66,14 @@ void LIB_TABLE_GRID_TRICKS::showPopupMenu( wxMenu& menu, wxGridEvent& aEvent )
     if( showDeactivate )
         menu.Append( LIB_TABLE_GRID_TRICKS_DEACTIVATE_SELECTED, _( "Deactivate selected" ) );
 
-    if( showSetVisible )
-        menu.Append( LIB_TABLE_GRID_TRICKS_SET_VISIBLE, _( "Set visible flag" ) );
+    if( supportsVisibilityColumn() )
+    {
+        if( showSetVisible )
+            menu.Append( LIB_TABLE_GRID_TRICKS_SET_VISIBLE, _( "Set visible flag" ) );
 
-    if( showUnsetVisible )
-        menu.Append( LIB_TABLE_GRID_TRICKS_UNSET_VISIBLE, _( "Unset visible flag" ) );
+        if( showUnsetVisible )
+            menu.Append( LIB_TABLE_GRID_TRICKS_UNSET_VISIBLE, _( "Unset visible flag" ) );
+    }
 
     bool showSettings = false;
 

common/lib_tree_model.cpp

@@ -247,7 +247,12 @@ void LIB_TREE_NODE_ITEM::UpdateScore( EDA_COMBINED_MATCHER* aMatcher, const wxSt
     {
         int currentScore = aMatcher->ScoreTerms( m_SearchTerms );
 
-        if( m_Score >= 0 && currentScore > 0 )
+        // This is a hack: the second phase of search in the adapter will look for a tokenized
+        // LIB_ID and send the lib part down here.  While we generally want to prune ourselves
+        // out here (by setting score to -1) the first time we fail to match a search term,
+        // we want to give the same search term a second chance if it has been split from a library
+        // name.
+        if( ( m_Score >= 0 || !aLib.IsEmpty() ) && currentScore > 0 )
             m_Score += currentScore;
         else
             m_Score = -1;   // Item has failed to match this term, rule it out
@@ -290,28 +295,42 @@ LIB_TREE_NODE_ITEM& LIB_TREE_NODE_LIBRARY::AddItem( LIB_TREE_ITEM* aItem )
 void LIB_TREE_NODE_LIBRARY::UpdateScore( EDA_COMBINED_MATCHER* aMatcher, const wxString& aLib,
                                          std::function<bool( LIB_TREE_NODE& aNode )>* aFilter )
 {
-    int newScore = 0;
+    int maxChildScore = 0;
 
     for( std::unique_ptr<LIB_TREE_NODE>& child: m_Children )
     {
         child->UpdateScore( aMatcher, aLib, aFilter );
-        newScore = std::max( newScore, child->m_Score );
+        maxChildScore = std::max( maxChildScore, child->m_Score );
     }
 
     // Each time UpdateScore is called for a library, child (item) scores may go up or down.
     // If the all go down to zero, we need to make sure to drop the library from the list.
-    if( newScore > 0 )
-        m_Score = std::max( m_Score, newScore );
+    if( maxChildScore > 0 )
+        m_Score = std::max( m_Score, maxChildScore );
     else
         m_Score = 0;
 
     // aLib test is additive, but only when we've already accumulated some score from children
-    if( !aLib.IsEmpty() && m_Name.Lower().Matches( aLib ) && m_Score > 0 )
+    if( !aLib.IsEmpty()
+        && m_Name.Lower().Matches( aLib )
+        && ( m_Score > 0 || m_Children.empty() ) )
+    {
         m_Score += 1;
+    }
 
-    // aMatcher test is additive, but only when we've already accumulated some score from children
-    if( aMatcher && m_Score > 0 )
-        m_Score += aMatcher->ScoreTerms( m_SearchTerms );
+    // aMatcher test is additive
+    if( aMatcher )
+    {
+        int ownScore = aMatcher->ScoreTerms( m_SearchTerms );
+        m_Score += ownScore;
+
+        // If we have a hit on a library, show all children in that library
+        if( maxChildScore <= 0 && ownScore > 0 )
+        {
+            for( std::unique_ptr<LIB_TREE_NODE>& child: m_Children )
+                child->ForceScore( 1 );
+        }
+    }
 
     // show all nodes if no search/filter/etc. criteria are given
     if( m_Children.empty() && !aMatcher && aLib.IsEmpty() && ( !aFilter || (*aFilter)(*this) ) )

common/lib_tree_model_adapter.cpp

@@ -302,11 +302,6 @@ void LIB_TREE_MODEL_ADAPTER::UpdateSearchString( const wxString& aSearch, bool a
 
                 m_tree.UpdateScore( &itemNameMatcher, lib, nullptr );
             }
-            else
-            {
-                // In case the full token happens to match a library name
-                m_tree.UpdateScore( nullptr, '*' + term + '*', nullptr );
-            }
         }
 
         if( firstTerm )
@@ -421,7 +416,7 @@ wxDataViewColumn* LIB_TREE_MODEL_ADAPTER::doAddColumn( const wxString& aHeader,
 
     wxDataViewColumn* col = new wxDataViewColumn(
             translatedHeader, new LIB_TREE_RENDERER(), index, m_colWidths[aHeader], wxALIGN_NOT,
-            wxDATAVIEW_CELL_INERT | wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_COL_SORTABLE );
+            wxDATAVIEW_CELL_INERT | static_cast<int>( wxDATAVIEW_COL_RESIZABLE ) );
     m_widget->AppendColumn( col );
 
     col->SetMinWidth( headerMinWidth.x );

common/paths.cpp

@@ -169,6 +169,10 @@ wxString PATHS::GetStockDataPath( bool aRespectRunFromBuildDir )
         path = GetExecutablePath() + wxT( ".." );
 #endif
     }
+    else if( wxGetEnv( wxT( "KICAD_STOCK_DATA_HOME" ), &path ) && !path.IsEmpty() )
+    {
+        return path;
+    }
     else
     {
 #if defined( __WXMAC__ )
@@ -291,12 +295,16 @@ wxString PATHS::GetStockPlugins3DPath()
 {
     wxFileName fn;
 
-#ifdef __WXGTK__
-    // KICAD_PLUGINDIR = CMAKE_INSTALL_FULL_LIBDIR path is the absolute path
-    // corresponding to the install path used for constructing KICAD_USER_PLUGIN
-    wxString tfname = wxString::FromUTF8Unchecked( KICAD_PLUGINDIR );
-    fn.Assign( tfname, "" );
-    fn.AppendDir( wxT( "kicad" ) );
+#if defined( __WXMSW__ )
+    if( wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
+    {
+        fn.AssignDir( getWindowsKiCadRoot() );
+    }
+    else
+    {
+        fn.AssignDir( GetExecutablePath() );
+    }
+
     fn.AppendDir( wxT( "plugins" ) );
 #elif defined( __WXMAC__ )
     fn.Assign( wxStandardPaths::Get().GetPluginsDir(), wxEmptyString );
@@ -319,15 +327,11 @@ wxString PATHS::GetStockPlugins3DPath()
         fn.AppendDir( wxT( "PlugIns" ) );
     }
 #else
-    if( wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
-    {
-        fn.AssignDir( getWindowsKiCadRoot() );
-    }
-    else
-    {
-        fn.AssignDir( GetExecutablePath() );
-    }
-
+    // KICAD_PLUGINDIR = CMAKE_INSTALL_FULL_LIBDIR path is the absolute path
+    // corresponding to the install path used for constructing KICAD_USER_PLUGIN
+    wxString tfname = wxString::FromUTF8Unchecked( KICAD_PLUGINDIR );
+    fn.Assign( tfname, "" );
+    fn.AppendDir( wxT( "kicad" ) );
     fn.AppendDir( wxT( "plugins" ) );
 #endif
 

common/pgm_base.cpp

@@ -153,6 +153,9 @@ PGM_BASE::~PGM_BASE()
     }
 
     delete[] m_argvUtf8;
+
+    delete m_locale;
+    m_locale = nullptr;
 }
 
 
@@ -164,10 +167,6 @@ void PGM_BASE::Destroy()
     sentry_close();
 #endif
 
-    // unlike a normal destructor, this is designed to be called more than once safely:
-    delete m_locale;
-    m_locale = nullptr;
-
     m_pgm_checker.reset();
 }
 
@@ -990,7 +989,7 @@ void PGM_BASE::HandleAssert( const wxString& aFile, int aLine, const wxString& a
     {
         static std::set<SENTRY_ASSERT_CACHE_KEY> assertCache;
 
-        SENTRY_ASSERT_CACHE_KEY key = { aFile, aLine, aFunc, aCond, aMsg };
+        SENTRY_ASSERT_CACHE_KEY key = { aFile, aLine, aFunc, aCond };
 
         if( assertCache.find( key ) == assertCache.end() )
         {

common/plotters/GERBER_plotter.cpp

@@ -833,10 +833,21 @@ void GERBER_PLOTTER::Arc( const VECTOR2D& aCenter, const EDA_ANGLE& aStartAngle,
 {
     SetCurrentLineWidth( aWidth );
 
-    EDA_ANGLE endAngle = aStartAngle + aAngle;
+    double arcLength = std::abs( aRadius * aAngle.AsRadians() );
 
-    // aFill is not used here.
-    plotArc( aCenter, aStartAngle, endAngle, aRadius, false );
+    if( arcLength < 100 || std::abs( aAngle.AsDegrees() ) < 0.1 )
+    {
+        // Prevent plotting very short arcs as full circles, especially with 4.5 mm precision.
+        // Also reduce the risk of integer overflow issues.
+        polyArc( aCenter, aStartAngle, aAngle, aRadius, aFill, aWidth );
+    }
+    else
+    {
+        EDA_ANGLE endAngle = aStartAngle + aAngle;
+
+        // aFill is not used here.
+        plotArc( aCenter, aStartAngle, endAngle, aRadius, false );
+    }
 }
 
 
@@ -879,19 +890,19 @@ void GERBER_PLOTTER::plotArc( const SHAPE_ARC& aArc, bool aPlotInRegion )
 
 
 void GERBER_PLOTTER::plotArc( const VECTOR2I& aCenter, const EDA_ANGLE& aStartAngle,
-                              const EDA_ANGLE& aEndAngle, int aRadius, bool aPlotInRegion )
+                              const EDA_ANGLE& aEndAngle, double aRadius, bool aPlotInRegion )
 {
     VECTOR2I start, end;
-    start.x = aCenter.x + KiROUND( aRadius * aStartAngle.Cos() );
-    start.y = aCenter.y + KiROUND( aRadius * aStartAngle.Sin() );
+    start.x = KiROUND( aCenter.x + aRadius * aStartAngle.Cos() );
+    start.y = KiROUND( aCenter.y + aRadius * aStartAngle.Sin() );
 
     if( !aPlotInRegion )
         MoveTo( start );
     else
         LineTo( start );
 
-    end.x = aCenter.x + KiROUND( aRadius * aEndAngle.Cos() );
-    end.y = aCenter.y + KiROUND( aRadius * aEndAngle.Sin() );
+    end.x = KiROUND( aCenter.x + aRadius * aEndAngle.Cos() );
+    end.y = KiROUND( aCenter.y + aRadius * aEndAngle.Sin() );
     VECTOR2D devEnd = userToDeviceCoordinates( end );
     // devRelCenter is the position on arc center relative to the arc start, in Gerber coord.
     VECTOR2D devRelCenter = userToDeviceCoordinates( aCenter ) - userToDeviceCoordinates( start );

common/plotters/HPGL_plotter.cpp

@@ -565,6 +565,13 @@ void HPGL_PLOTTER::Arc( const VECTOR2D& aCenter, const EDA_ANGLE& aStartAngle,
     if( aRadius <= 0 )
         return;
 
+    // Avoid integer overflow when calculating the center point
+    if( std::abs( aAngle.AsDegrees() ) < 5 )
+    {
+        polyArc( aCenter, aStartAngle, aAngle, aRadius, aFill, aWidth );
+        return;
+    }
+
     double const radius_device       = userToDeviceSize( aRadius );
     double const circumf_device      = 2.0 * M_PI * radius_device;
     double const target_chord_length = m_arcTargetChordLength;
@@ -581,11 +588,11 @@ void HPGL_PLOTTER::Arc( const VECTOR2D& aCenter, const EDA_ANGLE& aStartAngle,
     EDA_ANGLE startAngle = -aStartAngle;
 
     // Calculate arc start point:
-    VECTOR2I cmap( aCenter.x + KiROUND( aRadius * startAngle.Cos() ),
-                   aCenter.y - KiROUND( aRadius * startAngle.Sin() ) );
+    VECTOR2I cmap( KiROUND( aCenter.x + aRadius * startAngle.Cos() ),
+                   KiROUND( aCenter.y - aRadius * startAngle.Sin() ) );
     VECTOR2D cmap_dev = userToDeviceCoordinates( cmap );
 
-    startOrAppendItem( cmap_dev, wxString::Format( "AA %.0f,%.0f,%.0f,%g",
+    startOrAppendItem( cmap_dev, wxString::Format( "AA %.0f,%.0f,%g,%g",
                                                    centre_device.x,
                                                    centre_device.y,
                                                    angle.AsDegrees(),

common/plotters/PDF_plotter.cpp

@@ -354,21 +354,21 @@ void PDF_PLOTTER::Arc( const VECTOR2D& aCenter, const EDA_ANGLE& aStartAngle,
     SetCurrentLineWidth( aWidth );
 
     // Usual trig arc plotting routine...
-    start.x = aCenter.x + KiROUND( aRadius * (-startAngle).Cos() );
-    start.y = aCenter.y + KiROUND( aRadius * (-startAngle).Sin() );
+    start.x = KiROUND( aCenter.x + aRadius * ( -startAngle ).Cos() );
+    start.y = KiROUND( aCenter.y + aRadius * ( -startAngle ).Sin() );
     VECTOR2D pos_dev = userToDeviceCoordinates( start );
     fprintf( m_workFile, "%g %g m ", pos_dev.x, pos_dev.y );
 
     for( EDA_ANGLE ii = startAngle + delta; ii < endAngle; ii += delta )
     {
-        end.x = aCenter.x + KiROUND( aRadius * (-ii).Cos() );
-        end.y = aCenter.y + KiROUND( aRadius * (-ii).Sin() );
+        end.x = KiROUND( aCenter.x + aRadius * ( -ii ).Cos() );
+        end.y = KiROUND( aCenter.y + aRadius * ( -ii ).Sin() );
         pos_dev = userToDeviceCoordinates( end );
         fprintf( m_workFile, "%g %g l ", pos_dev.x, pos_dev.y );
     }
 
-    end.x = aCenter.x + KiROUND( aRadius * (-endAngle).Cos() );
-    end.y = aCenter.y + KiROUND( aRadius * (-endAngle).Sin() );
+    end.x = KiROUND( aCenter.x + aRadius * ( -endAngle ).Cos() );
+    end.y = KiROUND( aCenter.y + aRadius * ( -endAngle ).Sin() );
     pos_dev = userToDeviceCoordinates( end );
     fprintf( m_workFile, "%g %g l ", pos_dev.x, pos_dev.y );
 

common/plotters/SVG_plotter.cpp

@@ -851,7 +851,7 @@ void SVG_PLOTTER::Text( const VECTOR2I&        aPos,
 
     fprintf( m_outputFile,
              "textLength=\"%.*f\" font-size=\"%.*f\" lengthAdjust=\"spacingAndGlyphs\"\n"
-             "text-anchor=\"%s\" opacity=\"0\">%s</text>\n",
+             "text-anchor=\"%s\" opacity=\"0\" stroke-opacity=\"0\">%s</text>\n",
              m_precision, sz_dev.x, m_precision, sz_dev.y, hjust, TO_UTF8( XmlEsc( aText ) ) );
 
     if( !aOrient.IsZero() )

common/plotters/plotter.cpp

@@ -191,8 +191,8 @@ void PLOTTER::polyArc( const VECTOR2D& aCenter, const EDA_ANGLE& aStartAngle,
 
     SetCurrentLineWidth( aWidth );
 
-    start.x = aCenter.x + KiROUND( aRadius * startAngle.Cos() );
-    start.y = aCenter.y + sign * KiROUND( aRadius * startAngle.Sin() );
+    start.x = KiROUND( aCenter.x + aRadius * startAngle.Cos() );
+    start.y = KiROUND( aCenter.y + sign * aRadius * startAngle.Sin() );
 
     if( aFill != FILL_T::NO_FILL )
     {
@@ -206,13 +206,13 @@ void PLOTTER::polyArc( const VECTOR2D& aCenter, const EDA_ANGLE& aStartAngle,
 
     for( EDA_ANGLE ii = startAngle + delta; ii < endAngle; ii += delta )
     {
-        end.x = aCenter.x + KiROUND( aRadius * ii.Cos() );
-        end.y = aCenter.y + sign * KiROUND( aRadius * ii.Sin() );
+        end.x = KiROUND( aCenter.x + aRadius * ii.Cos() );
+        end.y = KiROUND( aCenter.y + sign * aRadius * ii.Sin() );
         LineTo( end );
     }
 
-    end.x = aCenter.x + KiROUND( aRadius * endAngle.Cos() );
-    end.y = aCenter.y + sign * KiROUND( aRadius * endAngle.Sin() );
+    end.x = KiROUND( aCenter.x + aRadius * endAngle.Cos() );
+    end.y = KiROUND( aCenter.y + sign * aRadius * endAngle.Sin() );
 
     if( aFill != FILL_T::NO_FILL )
     {
@@ -706,7 +706,6 @@ void PLOTTER::Text( const VECTOR2I&       aPos,
     KIGFX::GAL_DISPLAY_OPTIONS empty_opts;
 
     SetColor( aColor );
-    SetCurrentLineWidth( aPenWidth, aData );
 
     if( aPenWidth == 0 && aBold ) // Use default values if aPenWidth == 0
         aPenWidth = GetPenSizeForBold( std::min( aSize.x, aSize.y ) );
@@ -718,6 +717,7 @@ void PLOTTER::Text( const VECTOR2I&       aPos,
             // Stroke callback
             [&]( const VECTOR2I& aPt1, const VECTOR2I& aPt2 )
             {
+                SetCurrentLineWidth( aPenWidth );
                 MoveTo( aPt1 );
                 LineTo( aPt2 );
                 PenFinish();

common/settings/app_settings.cpp

@@ -160,6 +160,9 @@ APP_SETTINGS_BASE::APP_SETTINGS_BASE( const std::string& aFilename, int aSchemaV
     m_params.emplace_back( new PARAM<int>( "system.last_imperial_units",
             &m_System.last_imperial_units, static_cast<int>( EDA_UNITS::MILS ) ) );
 
+    m_params.emplace_back( new PARAM<bool>( "system.show_import_issues",
+                                            &m_System.show_import_issues, true ) );
+
     m_params.emplace_back( new PARAM<wxString>( "appearance.color_theme",
             &m_ColorTheme, COLOR_SETTINGS::COLOR_BUILTIN_DEFAULT ) );
 

common/settings/color_settings.cpp

@@ -36,7 +36,7 @@ const wxString COLOR_SETTINGS::COLOR_BUILTIN_CLASSIC = "_builtin_classic";
 
 
 COLOR_SETTINGS::COLOR_SETTINGS( const wxString& aFilename, bool aAbsolutePath ) :
-        JSON_SETTINGS( std::move( aFilename ), SETTINGS_LOC::COLORS, colorsSchemaVersion ),
+        JSON_SETTINGS( aFilename, SETTINGS_LOC::COLORS, colorsSchemaVersion ),
         m_overrideSchItemColors( false )
 {
     if( aAbsolutePath )

common/settings/settings_manager.cpp

@@ -731,19 +731,47 @@ bool SETTINGS_MANAGER::GetPreviousVersionPaths( std::vector<wxString>* aPaths )
         }
     }
 
+    alg::delete_if( *aPaths, []( const wxString& aPath ) -> bool
+    {
+        wxFileName fulldir = wxFileName::DirName( aPath );
+        const wxArrayString& dirs = fulldir.GetDirs();
+
+        if( dirs.empty() || !fulldir.IsDirReadable() )
+            return true;
+
+        std::string ver = dirs.back().ToStdString();
+
+        if( !extractVersion( ver ) )
+            return true;
+
+        return false;
+    } );
+
     std::sort( aPaths->begin(), aPaths->end(),
                [&]( const wxString& a, const wxString& b ) -> bool
                {
-                   wxString verA = wxFileName::DirName( a ).GetDirs().back();
-                   wxString verB = wxFileName::DirName( b ).GetDirs().back();
+                   wxFileName aPath = wxFileName::DirName( a );
+                   wxFileName bPath = wxFileName::DirName( b );
 
-                   if( !extractVersion( verA.ToStdString() )
-                       || !extractVersion( verB.ToStdString() ) )
-                   {
+                   const wxArrayString& aDirs = aPath.GetDirs();
+                   const wxArrayString& bDirs = bPath.GetDirs();
+
+                   if( aDirs.empty() )
                        return false;
-                   }
 
-                   return compareVersions( verA.ToStdString(), verB.ToStdString() ) >= 0;
+                   if( bDirs.empty() )
+                       return true;
+
+                   std::string verA = aDirs.back().ToStdString();
+                   std::string verB = bDirs.back().ToStdString();
+
+                   if( !extractVersion( verA ) )
+                       return false;
+
+                   if( !extractVersion( verB ) )
+                       return true;
+
+                   return compareVersions( verA, verB ) >= 0;
                } );
 
     return aPaths->size() > 0;

common/string_utils.cpp

@@ -591,7 +591,7 @@ wxString RemoveHTMLTags( const wxString& aInput )
 
 wxString LinkifyHTML( wxString aStr )
 {
-    wxRegEx regex( wxS( "\\b(https?|ftp|file)://([-\\w+&@#/%?=~|!:,.;]*[^.<>\\s\u00b6])" ),
+    wxRegEx regex( wxS( "\\b(https?|ftp|file)://([-\\w+&@#/%?=~|!:,.;]*[^.,:;<>\\s\u00b6])" ),
                    wxRE_ICASE );
 
     regex.ReplaceAll( &aStr, "<a href=\"\\0\">\\0</a>" );
@@ -907,11 +907,12 @@ bool ApplyModifier( double& value, const wxString& aString )
     }
 
     if( units.length()
-            && !units.CmpNoCase( wxT( "F" ) )
-            && !units.CmpNoCase( wxT( "hz" ) )
-            && !units.CmpNoCase( wxT( "W" ) )
-            && !units.CmpNoCase( wxT( "V" ) )
-            && !units.CmpNoCase( wxT( "H" ) ) )
+            && !units.IsSameAs( wxT( "F" ), false )
+            && !units.IsSameAs( wxT( "hz" ), false )
+            && !units.IsSameAs( wxT( "W" ), false )
+            && !units.IsSameAs( wxT( "V" ), false )
+            && !units.IsSameAs( wxT( "A" ), false )
+            && !units.IsSameAs( wxT( "H" ), false ) )
     {
         return false;
     }

common/title_block.cpp

@@ -98,6 +98,18 @@ bool TITLE_BLOCK::TextVarResolver( wxString* aToken, const PROJECT* aProject ) c
     bool tokenUpdated = false;
     wxString originalToken = *aToken;
 
+    auto getCurrentDate =
+            []() -> wxString
+            {
+                // We can choose different formats. Should probably be kept in sync with ISSUE_DATE
+                // formatting in DIALOG_PAGES_SETTINGS.
+                //
+                //  return wxDateTime::Now().Format( wxLocale::GetInfo( wxLOCALE_SHORT_DATE_FMT ) );
+                //  return wxDateTime::Now().Format( wxLocale::GetInfo( wxLOCALE_LONG_DATE_FMT ) );
+                //  return wxDateTime::Now().Format( wxT("%Y-%b-%d") );
+                return wxDateTime::Now().FormatISODate();
+            };
+
     if( aToken->IsSameAs( wxT( "ISSUE_DATE" ) ) )
     {
         *aToken = GetDate();
@@ -105,14 +117,7 @@ bool TITLE_BLOCK::TextVarResolver( wxString* aToken, const PROJECT* aProject ) c
     }
     else if( aToken->IsSameAs( wxT( "CURRENT_DATE" ) ) )
     {
-        // We can choose different formats. Should probably be kept in sync with ISSUE_DATE
-        // formatting in DIALOG_PAGES_SETTINGS.
-        //
-        //  *aToken = wxDateTime::Now().Format( wxLocale::GetInfo( wxLOCALE_SHORT_DATE_FMT ) );
-        //  *aToken = wxDateTime::Now().Format( wxLocale::GetInfo( wxLOCALE_LONG_DATE_FMT ) );
-        //  *aToken = wxDateTime::Now().Format( wxT("%Y-%b-%d") );
-        *aToken = wxDateTime::Now().FormatISODate();
-
+        *aToken = getCurrentDate();
         tokenUpdated = true;
     }
     else if( aToken->IsSameAs( wxT( "REVISION" ) ) )
@@ -152,7 +157,9 @@ bool TITLE_BLOCK::TextVarResolver( wxString* aToken, const PROJECT* aProject ) c
 
     if( tokenUpdated )
     {
-        if( aProject )
+        if( aToken->IsSameAs( wxT( "CURRENT_DATE" ) ) )
+            *aToken = getCurrentDate();
+        else if( aProject )
             *aToken = ExpandTextVars( *aToken, aProject );
 
         // This is the default fallback, so don't claim we resolved it

common/tool/common_tools.cpp

@@ -547,7 +547,7 @@ int COMMON_TOOLS::ToggleGridOverrides( const TOOL_EVENT& aEvent )
 int COMMON_TOOLS::GridProperties( const TOOL_EVENT& aEvent )
 {
     auto showGridPrefs =
-            [this]( wxString aParentName )
+            [this]( const wxString& aParentName )
             {
                 m_frame->CallAfter(
                         [this, aParentName]()
@@ -563,6 +563,7 @@ int COMMON_TOOLS::GridProperties( const TOOL_EVENT& aEvent )
     case FRAME_PCB_EDITOR:        showGridPrefs( _( "PCB Editor" ) );           break;
     case FRAME_FOOTPRINT_EDITOR:  showGridPrefs( _( "Footprint Editor" ) );     break;
     case FRAME_PL_EDITOR:         showGridPrefs( _( "Drawing Sheet Editor" ) ); break;
+    case FRAME_GERBER:            showGridPrefs( _( "Gerber Viewer" ) );        break;
     default:                      wxFAIL_MSG( "Unknown frame: " + GetName() );  break;
     }
 

common/tool/selection.cpp

@@ -130,7 +130,7 @@ VECTOR2I SELECTION::GetCenter() const
 }
 
 
-BOX2I SELECTION::GetBoundingBox() const
+BOX2I SELECTION::GetBoundingBox( bool aOnlyVisible ) const
 {
     BOX2I bbox;
 

common/tool/tool_dispatcher.cpp

@@ -455,8 +455,11 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
 
     if( isMouseClick( type ) )
     {
-        if( m_toolMgr->GetToolHolder() && m_toolMgr->GetToolHolder()->GetToolCanvas() )
+        if( m_toolMgr->GetToolHolder() && m_toolMgr->GetToolHolder()->GetToolCanvas() &&
+            !m_toolMgr->GetToolHolder()->GetToolCanvas()->HasFocus() )
+        {
             m_toolMgr->GetToolHolder()->GetToolCanvas()->SetFocus();
+        }
     }
 
     // Mouse handling

common/tool/tool_manager.cpp

@@ -362,7 +362,11 @@ bool TOOL_MANAGER::doRunAction( const TOOL_ACTION& aAction, bool aNow, const std
 
             while( synchronousControl == STS_RUNNING )
             {
-                wxYield();
+                wxYield();          // Needed to honor mouse (and other) events during editing
+                wxMilliSleep( 1 );  // Needed to avoid 100% use of one cpu core.
+                                    // The sleeping time must be must be small to avoid
+                                    // noticeable lag in mouse and editing events
+                                    // (1 to 5 ms is a good value)
             }
 
             retVal = synchronousControl != STS_CANCELLED;

common/view/view.cpp

@@ -399,35 +399,19 @@ void VIEW::SetRequired( int aLayerId, int aRequiredId, bool aRequired )
 }
 
 
-// stupid C++... python lambda would do this in one line
-template <class CONTAINER>
-struct QUERY_VISITOR
-{
-    typedef typename CONTAINER::value_type item_type;
-
-    QUERY_VISITOR( CONTAINER& aCont, int aLayer ) :
-        m_cont( aCont ), m_layer( aLayer )
-    {
-    }
-
-    bool operator()( VIEW_ITEM* aItem )
-    {
-        if( aItem->viewPrivData()->GetFlags() & VISIBLE )
-            m_cont.push_back( VIEW::LAYER_ITEM_PAIR( aItem, m_layer ) );
-
-        return true;
-    }
-
-    CONTAINER&  m_cont;
-    int         m_layer;
-};
-
-
 int VIEW::Query( const BOX2I& aRect, std::vector<LAYER_ITEM_PAIR>& aResult ) const
 {
     if( m_orderedLayers.empty() )
         return 0;
 
+    int  layer = UNDEFINED_LAYER;
+    auto visitor =
+            [&]( VIEW_ITEM* item ) -> bool
+            {
+                aResult.push_back( VIEW::LAYER_ITEM_PAIR( item, layer ) );
+                return true;
+            };
+
     std::vector<VIEW_LAYER*>::const_reverse_iterator i;
 
     // execute queries in reverse direction, so that items that are on the top of
@@ -438,7 +422,7 @@ int VIEW::Query( const BOX2I& aRect, std::vector<LAYER_ITEM_PAIR>& aResult ) con
         if( ( *i )->displayOnly || !( *i )->visible )
             continue;
 
-        QUERY_VISITOR<std::vector<LAYER_ITEM_PAIR> > visitor( aResult, ( *i )->id );
+        layer = ( *i )->id;
         ( *i )->items->Query( aRect, visitor );
     }
 
@@ -446,6 +430,22 @@ int VIEW::Query( const BOX2I& aRect, std::vector<LAYER_ITEM_PAIR>& aResult ) con
 }
 
 
+void VIEW::Query( const BOX2I& aRect, const std::function<bool( VIEW_ITEM* )>& aFunc ) const
+{
+    if( m_orderedLayers.empty() )
+        return;
+
+    for( const auto& i : m_orderedLayers )
+    {
+        // ignore layers that do not contain actual items (i.e. the selection box, menus, floats)
+        if( i->displayOnly || !i->visible )
+            continue;
+
+        i->items->Query( aRect, aFunc );
+    }
+}
+
+
 VECTOR2D VIEW::ToWorld( const VECTOR2D& aCoord, bool aAbsolute ) const
 {
     const MATRIX3x3D& matrix = m_gal->GetScreenWorldMatrix();
@@ -622,6 +622,9 @@ void VIEW::SetCenter( const VECTOR2D& aCenter, const std::vector<BOX2D>& obscuri
     BOX2I bbox = unobscuredPoly.BBox();
     int   step = std::min( bbox.GetWidth(), bbox.GetHeight() ) / 10;
 
+    if( step < 20 )
+        step = 20;
+
     while( !unobscuredPoly.IsEmpty() )
     {
         unobscuredCenter = unobscuredPoly.BBox().Centre();

common/view/wx_view_controls.cpp

@@ -45,7 +45,7 @@
 #include <wx/log.h>
 
 #ifdef __WXMSW__
-    #define USE_MOUSE_CAPTURE
+   #define USE_MOUSE_CAPTURE
 #endif
 
 using namespace KIGFX;
@@ -81,7 +81,8 @@ WX_VIEW_CONTROLS::WX_VIEW_CONTROLS( VIEW* aView, EDA_DRAW_PANEL_GAL* aParentPane
         m_lastTimestamp( 0 ),
 #endif
         m_cursorPos( 0, 0 ),
-        m_updateCursor( true )
+        m_updateCursor( true ),
+        m_infinitePanWorks( false )
 {
     LoadSettings();
 
@@ -276,7 +277,8 @@ void WX_VIEW_CONTROLS::onMotion( wxMouseEvent& aEvent )
             {
                 if( !justWarped )
                 {
-                    if( KIPLATFORM::UI::WarpPointer( m_parentPanel, x + warpX, y + warpY ) )
+                    if( m_infinitePanWorks
+                        && KIPLATFORM::UI::WarpPointer( m_parentPanel, x + warpX, y + warpY ) )
                     {
                         m_dragStartPoint += VECTOR2D( warpX, warpY );
                         justWarped = true;
@@ -452,7 +454,7 @@ void WX_VIEW_CONTROLS::onButton( wxMouseEvent& aEvent )
         {
             m_dragStartPoint = VECTOR2D( aEvent.GetX(), aEvent.GetY() );
             setState( DRAG_PANNING );
-            KIPLATFORM::UI::InfiniteDragPrepareWindow( m_parentPanel );
+            m_infinitePanWorks = KIPLATFORM::UI::InfiniteDragPrepareWindow( m_parentPanel );
 
 #if defined USE_MOUSE_CAPTURE
             if( !m_parentPanel->HasCapture() )
@@ -692,7 +694,11 @@ void WX_VIEW_CONTROLS::CaptureCursor( bool aEnabled )
     // Note: for some reason, m_parentPanel->HasCapture() can be false even if CaptureMouse()
     // was called (i.e. mouse was captured, so when need to test m_MouseCapturedLost to be
     // sure a wxEVT_MOUSE_CAPTURE_LOST event was fired before. Otherwise wxMSW complains
-    if( aEnabled && !m_parentPanel->HasCapture() && m_parentPanel->m_MouseCapturedLost )
+    // The IsModalDialogFocused is checked because it's possible to start a capture
+    // due to event ordering while a modal dialog was just opened, the mouse capture steels focus
+    // from the modal and causes odd behavior
+    if( aEnabled && !m_parentPanel->HasCapture() && m_parentPanel->m_MouseCapturedLost
+        && !KIUI::IsModalDialogFocused() )
     {
         m_parentPanel->CaptureMouse();
 

common/widgets/footprint_preview_widget.cpp

@@ -92,6 +92,12 @@ void FOOTPRINT_PREVIEW_WIDGET::SetUserUnits( EDA_UNITS aUnits )
 }
 
 
+void FOOTPRINT_PREVIEW_WIDGET::SetPinFunctions( const std::map<wxString, wxString>& aPinFunctions )
+{
+    m_prev_panel->SetPinFunctions( aPinFunctions );
+}
+
+
 void FOOTPRINT_PREVIEW_WIDGET::DisplayFootprint( const LIB_ID& aFPID )
 {
     if( !m_prev_panel || m_libid == aFPID )

common/widgets/grid_text_button_helpers.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2021 CERN
- * Copyright (C) 2018-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2018-2024 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -213,13 +213,15 @@ protected:
         if( rawValue.IsEmpty() )
             rawValue = m_preselect;
 
-        wxString      symbolId = escapeLibId( rawValue );
-        KIWAY_PLAYER* frame = m_dlg->Kiway().Player( FRAME_SYMBOL_CHOOSER, true, m_dlg );
+        wxString symbolId = escapeLibId( rawValue );
 
-        if( frame->ShowModal( &symbolId, m_dlg ) )
-            SetValue( UnescapeString( symbolId ) );
+        if( KIWAY_PLAYER* frame = m_dlg->Kiway().Player( FRAME_SYMBOL_CHOOSER, true, m_dlg ) )
+        {
+            if( frame->ShowModal( &symbolId, m_dlg ) )
+                SetValue( UnescapeString( symbolId ) );
 
-        frame->Destroy();
+            frame->Destroy();
+        }
     }
 
     DIALOG_SHIM* m_dlg;
@@ -247,6 +249,7 @@ public:
             m_preselect( aPreselect ),
             m_symbolNetlist( aSymbolNetlist.ToStdString() )
     {
+        m_buttonFpChooserLock = false;
         SetButtonBitmaps( KiBitmap( BITMAPS::small_library ) );
 
         // win32 fix, avoids drawing the "native dropdown caret"
@@ -261,34 +264,49 @@ protected:
 
     void OnButtonClick() override
     {
+        if( m_buttonFpChooserLock ) // The button to show the FP chooser is clicked, but
+                                    // a previous click is currently in progress.
+            return;
+
+        // Disable the button until we have finished processing it.  Normally this is not an issue
+        // but if the footprint chooser is loading for the first time, it can be slow enough that
+        // multiple clicks will cause multiple instances of the footprint loader process to start
+        m_buttonFpChooserLock = true;
+
         // pick a footprint using the footprint picker.
         wxString fpid = GetValue();
 
         if( fpid.IsEmpty() )
             fpid = m_preselect;
 
-        KIWAY_PLAYER* frame = m_dlg->Kiway().Player( FRAME_FOOTPRINT_CHOOSER, true, m_dlg );
-
-        if( !m_symbolNetlist.empty() )
+        if( KIWAY_PLAYER* frame = m_dlg->Kiway().Player( FRAME_FOOTPRINT_CHOOSER, true, m_dlg ) )
         {
-            KIWAY_EXPRESS event( FRAME_FOOTPRINT_CHOOSER, MAIL_SYMBOL_NETLIST, m_symbolNetlist );
-            frame->KiwayMailIn( event );
+            if( !m_symbolNetlist.empty() )
+            {
+                KIWAY_EXPRESS event( FRAME_FOOTPRINT_CHOOSER, MAIL_SYMBOL_NETLIST, m_symbolNetlist );
+                frame->KiwayMailIn( event );
+            }
+
+            if( frame->ShowModal( &fpid, m_dlg ) )
+                SetValue( fpid );
+
+            frame->Destroy();
         }
 
-        if( frame->ShowModal( &fpid, m_dlg ) )
-            SetValue( fpid );
-
-        frame->Destroy();
+        m_buttonFpChooserLock = false;
     }
 
 protected:
     DIALOG_SHIM* m_dlg;
     wxString     m_preselect;
-
+    // Lock flag to lock the button to show the FP chooser
+    // true when the button is busy, waiting all footprints loaded to
+    // avoid running more than once the FP chooser
+    bool         m_buttonFpChooserLock;
     /*
      * Symbol netlist format:
-     *   pinCount
-     *   fpFilters
+     *   pinNumber pinName <tab> pinNumber pinName...
+     *   fpFilter fpFilter...
      */
     std::string  m_symbolNetlist;
 };

common/widgets/lib_tree.cpp

@@ -725,18 +725,6 @@ void LIB_TREE::onIdle( wxIdleEvent& aEvent )
 
     if( m_previewItem.IsOk() )
     {
-        // Scroll checker
-        if( m_tree_ctrl->GetItemRect( m_previewItem ) != m_previewItemRect )
-        {
-            hidePreview();
-
-            m_hoverPos = clientPos;
-            m_hoverItem = item;
-            m_hoverItemRect = m_tree_ctrl->GetItemRect( m_hoverItem );
-            m_hoverTimer.StartOnce( HOVER_TIMER_MILLIS );
-            return;
-        }
-
         if( item != m_previewItem )
         {
 #ifdef __WXGTK__

common/widgets/mathplot.cpp

@@ -518,8 +518,10 @@ void mpFXY::Plot( wxDC& dc, mpWindow& w )
             ys.insert( w.y2p( py ) );
         }
     }
-    else
+    else for( int sweep = 0; sweep < GetSweepCount(); ++sweep )
     {
+        SetSweepWindow( sweep );
+
         int     count = 0;
         int     x0 = 0;         // X position of merged current vertical line
         int     ymin0 = 0;      // y min coord of merged current vertical line
@@ -2456,18 +2458,20 @@ double mpScaleXLog::TransformFromPlot( double xplot ) const
 void mpFXYVector::Rewind()
 {
     m_index = 0;
+    m_sweepWindow = std::numeric_limits<size_t>::max();
 }
 
 
-size_t mpFXYVector::GetCount() const
+void mpFXYVector::SetSweepWindow( int aSweepIdx )
 {
-    return m_xs.size();
+    m_index = aSweepIdx * m_sweepSize;
+    m_sweepWindow = ( aSweepIdx + 1 ) * m_sweepSize;
 }
 
 
 bool mpFXYVector::GetNextXY( double& x, double& y )
 {
-    if( m_index >= m_xs.size() )
+    if( m_index >= m_xs.size() || m_index >= m_sweepWindow )
     {
         return false;
     }
@@ -2475,7 +2479,7 @@ bool mpFXYVector::GetNextXY( double& x, double& y )
     {
         x = m_xs[m_index];
         y = m_ys[m_index++];
-        return m_index <= m_xs.size();
+        return m_index <= m_xs.size() && m_index <= m_sweepWindow;
     }
 }
 

common/widgets/properties_panel.cpp

@@ -174,6 +174,14 @@ void PROPERTIES_PANEL::rebuildProperties( const SELECTION& aSelection )
         reset();
         return;
     }
+    else if( aSelection.Size() == 1 )
+    {
+        m_caption->SetLabel( aSelection.Front()->GetFriendlyName() );
+    }
+    else
+    {
+        m_caption->SetLabel( wxString::Format( _( "%d objects selected" ), aSelection.Size() ) );
+    }
 
     // Get all the selected types
     std::set<TYPE_ID> types;
@@ -292,15 +300,6 @@ void PROPERTIES_PANEL::rebuildProperties( const SELECTION& aSelection )
         }
     }
 
-    if( aSelection.Size() > 1 )
-    {
-        m_caption->SetLabel( wxString::Format( _( "%d objects selected" ), aSelection.Size() ) );
-    }
-    else
-    {
-        m_caption->SetLabel( aSelection.Front()->GetFriendlyName() );
-    }
-
     const wxString unspecifiedGroupCaption = _( "Basic Properties" );
 
     for( const wxString& groupName : groupDisplayOrder )
@@ -407,14 +406,19 @@ void PROPERTIES_PANEL::onShow( wxShowEvent& aEvent )
 {
     if( aEvent.IsShown() )
         UpdateData();
+
+    aEvent.Skip();
 }
 
 
 void PROPERTIES_PANEL::onCharHook( wxKeyEvent& aEvent )
 {
-    if( aEvent.GetKeyCode() == WXK_TAB && !aEvent.ShiftDown() )
+    if( aEvent.GetKeyCode() == WXK_TAB && !aEvent.ShiftDown() && m_grid->IsAnyModified() )
     {
         m_grid->CommitChangesFromEditor();
+
+        // Pass the tab key on so the default property grid tab behavior is honored.
+        aEvent.Skip();
         return;
     }
 

common/widgets/properties_panel.h

@@ -87,8 +87,8 @@ protected:
     virtual wxPGProperty* createPGProperty( const PROPERTY_BASE* aProperty ) const = 0;
 
     // Event handlers
-    virtual void valueChanging( wxPropertyGridEvent& aEvent ) {}
-    virtual void valueChanged( wxPropertyGridEvent& aEvent ) {}
+    virtual void valueChanging( wxPropertyGridEvent& aEvent ) { aEvent.Skip(); }
+    virtual void valueChanged( wxPropertyGridEvent& aEvent ) { aEvent.Skip(); }
     void onCharHook( wxKeyEvent& aEvent );
     void onShow( wxShowEvent& aEvent );
 

common/widgets/widget_hotkey_list.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2016 Chris Pavlina <pavlina.chris@gmail.com>
- * Copyright (C) 2016-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2016-2024 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -202,12 +202,14 @@ protected:
             // Let EVT_CHAR handle this one
             aEvent.DoAllowNextEvent();
 
-            // On Windows, wxEvent::Skip must NOT be called.
-            // On Linux and OSX, wxEvent::Skip MUST be called.
-            // No, I don't know why.
-#ifndef __WXMSW__
-            aEvent.Skip();
+#ifdef __WXMSW__
+            // On Windows, looks like a OnChar event is not generated when
+            // using the Alt key modifier. So ensure m_event is up to date
+            // to handle the right key code when releasing the key and therefore
+            // closing the dialog
+            m_event = aEvent;
 #endif
+            aEvent.Skip();
         }
         else
         {

cvpcb/cvpcb_mainframe.cpp

@@ -991,8 +991,19 @@ void CVPCB_MAINFRAME::BuildLibrariesList()
     COMMON_SETTINGS*   cfg = Pgm().GetCommonSettings();
     PROJECT_FILE&      project = Kiway().Prj().GetProjectFile();
     FP_LIB_TABLE*      tbl = PROJECT_PCB::PcbFootprintLibs( &Prj() );
-    std::set<wxString> pinnedMatches;
-    std::set<wxString> otherMatches;
+
+    // Use same sorting algorithm as LIB_TREE_NODE::AssignIntrinsicRanks
+    struct library_sort
+    {
+        bool operator()( const wxString& lhs, const wxString& rhs ) const
+        {
+            return StrNumCmp( lhs, rhs, true ) < 0;
+        }
+    };
+
+    std::set<wxString, library_sort> pinnedMatches;
+    std::set<wxString, library_sort> otherMatches;
+
     m_librariesListBox->ClearList();
 
     auto process =

cvpcb/display_footprints_frame.cpp

@@ -465,21 +465,14 @@ void DISPLAY_FOOTPRINTS_FRAME::ReloadFootprint( FOOTPRINT* aFootprint )
         return;
 
     GetBoard()->DeleteAllFootprints();
-    GetBoard()->RemoveUnusedNets( nullptr );
     GetCanvas()->GetView()->Clear();
 
-
     for( PAD* pad : aFootprint->Pads() )
     {
         const COMPONENT_NET& net = m_currentComp->GetNet( pad->GetNumber() );
 
         if( !net.GetPinFunction().IsEmpty() )
-        {
-            NETINFO_ITEM* netinfo = new NETINFO_ITEM( GetBoard() );
-            netinfo->SetNetname( net.GetPinFunction() );
-            GetBoard()->Add( netinfo );
-            pad->SetNet( netinfo );
-        }
+            pad->SetPinFunction( net.GetPinFunction() );
     }
 
     GetBoard()->Add( aFootprint );
@@ -504,7 +497,6 @@ void DISPLAY_FOOTPRINTS_FRAME::InitDisplay()
         return;
 
     GetBoard()->DeleteAllFootprints();
-    GetBoard()->RemoveUnusedNets( nullptr );
     GetCanvas()->GetView()->Clear();
 
     INFOBAR_REPORTER infoReporter( m_infoBar );
@@ -528,12 +520,7 @@ void DISPLAY_FOOTPRINTS_FRAME::InitDisplay()
                 const COMPONENT_NET& net = comp->GetNet( pad->GetNumber() );
 
                 if( !net.GetPinFunction().IsEmpty() )
-                {
-                    NETINFO_ITEM* netinfo = new NETINFO_ITEM( GetBoard() );
-                    netinfo->SetNetname( net.GetPinFunction() );
-                    GetBoard()->Add( netinfo );
-                    pad->SetNet( netinfo );
-                }
+                    pad->SetPinFunction( net.GetPinFunction() );
             }
         }
 

cvpcb/tools/cvpcb_control.cpp

@@ -176,11 +176,11 @@ int CVPCB_CONTROL::ShowFootprintViewer( const TOOL_EVENT& aEvent )
 
         fpframe = (DISPLAY_FOOTPRINTS_FRAME*) m_frame->Kiway().Player( FRAME_CVPCB_DISPLAY, true,
                                                                        m_frame );
+
+        // If Kiway() cannot create the eeschema frame, it shows a error message, and
+        // frame is null
         if( !fpframe )
-        {
-            wxMessageBox( _( "Unable to create the footprint viewer frame" ) );
             return 0;
-        }
 
         fpframe->Show( true );
     }

demos/interf_u/interf_u.kicad_pcb

@@ -1,7 +1,7 @@
 (kicad_pcb
-	(version 20231231)
+	(version 20240108)
 	(generator "pcbnew")
-	(generator_version "7.99")
+	(generator_version "8.0")
 	(general
 		(thickness 1.6002)
 		(legacy_teardrops no)

eeschema/CMakeLists.txt

@@ -397,6 +397,7 @@ set( EESCHEMA_SRCS
     symbol_tree_model_adapter.cpp
     symbol_tree_synchronizing_adapter.cpp
     symbol_viewer_frame.cpp
+    symb_transforms_utils.cpp
     toolbars_sch_editor.cpp
     toolbars_symbol_viewer.cpp
 

eeschema/connection_graph.cpp

@@ -85,8 +85,51 @@ void CONNECTION_SUBGRAPH::RemoveItem( SCH_ITEM* aItem )
 }
 
 
+void CONNECTION_SUBGRAPH::ExchangeItem( SCH_ITEM* aOldItem, SCH_ITEM* aNewItem )
+{
+    m_items.erase( aOldItem );
+    m_items.insert( aNewItem );
+
+    m_drivers.erase( aOldItem );
+    m_drivers.insert( aNewItem );
+
+    if( aOldItem == m_driver )
+    {
+        m_driver = aNewItem;
+        m_driver_connection = aNewItem->GetOrInitConnection( m_sheet, m_graph );
+    }
+
+    SCH_CONNECTION* old_conn = aOldItem->Connection( &m_sheet );
+    SCH_CONNECTION* new_conn = aNewItem->GetOrInitConnection( m_sheet, m_graph );
+
+    if( old_conn && new_conn )
+    {
+        new_conn->Clone( *old_conn );
+
+        if( old_conn->IsDriver() )
+            new_conn->SetDriver( aNewItem );
+
+        new_conn->ClearDirty();
+    }
+
+    if( aOldItem->Type() == SCH_SHEET_PIN_T )
+    {
+        m_hier_pins.erase( static_cast<SCH_SHEET_PIN*>( aOldItem ) );
+        m_hier_pins.insert( static_cast<SCH_SHEET_PIN*>( aNewItem ) );
+    }
+
+    if( aOldItem->Type() == SCH_HIER_LABEL_T )
+    {
+        m_hier_ports.erase( static_cast<SCH_HIERLABEL*>( aOldItem ) );
+        m_hier_ports.insert( static_cast<SCH_HIERLABEL*>( aNewItem ) );
+    }
+}
+
+
 bool CONNECTION_SUBGRAPH::ResolveDrivers( bool aCheckMultipleDrivers )
 {
+    std::lock_guard lock( m_driver_mutex );
+
     auto candidate_cmp = [&]( SCH_ITEM* a, SCH_ITEM* b ) -> bool
         {
             // meet irreflexive requirements of std::sort
@@ -574,6 +617,53 @@ void CONNECTION_GRAPH::Merge( CONNECTION_GRAPH& aGraph )
 }
 
 
+void CONNECTION_GRAPH::ExchangeItem( SCH_ITEM* aOldItem, SCH_ITEM* aNewItem )
+{
+    wxCHECK2( aOldItem->Type() == aNewItem->Type(), return );
+
+    auto exchange = [&]( SCH_ITEM* aOld, SCH_ITEM* aNew )
+    {
+        auto it = m_item_to_subgraph_map.find( aOld );
+
+        if( it == m_item_to_subgraph_map.end() )
+            return;
+
+        CONNECTION_SUBGRAPH* sg = it->second;
+
+        sg->ExchangeItem( aOld, aNew );
+
+        m_item_to_subgraph_map.erase( it );
+        m_item_to_subgraph_map.emplace( aNew, sg );
+
+        for( auto it2 = m_items.begin(); it2 != m_items.end(); ++it2 )
+        {
+            if( *it2 == aOld )
+            {
+                *it2 = aNew;
+                break;
+            }
+        }
+    };
+
+    exchange( aOldItem, aNewItem );
+
+    if( aOldItem->Type() == SCH_SYMBOL_T )
+    {
+        SCH_SYMBOL* oldSymbol = static_cast<SCH_SYMBOL*>( aOldItem );
+        SCH_SYMBOL* newSymbol = static_cast<SCH_SYMBOL*>( aNewItem );
+        std::vector<SCH_PIN*> oldPins = oldSymbol->GetPins( &m_schematic->CurrentSheet() );
+        std::vector<SCH_PIN*> newPins = newSymbol->GetPins( &m_schematic->CurrentSheet() );
+
+        wxCHECK2( oldPins.size() == newPins.size(), return );
+
+        for( size_t ii = 0; ii < oldPins.size(); ii++ )
+        {
+            exchange( oldPins[ii], newPins[ii] );
+        }
+    }
+}
+
+
 void CONNECTION_GRAPH::Reset()
 {
     for( auto& subgraph : m_subgraphs )
@@ -630,6 +720,48 @@ void CONNECTION_GRAPH::Recalculate( const SCH_SHEET_LIST& aSheetList, bool aUnco
                             item->GetTypeDesc() );
                 items.push_back( item );
                 dirty_items.insert( item );
+
+                // Add any symbol dirty pins to the dirty_items list
+                if( item->Type() == SCH_SYMBOL_T )
+                {
+                    SCH_SYMBOL* symbol = static_cast<SCH_SYMBOL*>( item );
+
+                    for( SCH_PIN* pin : symbol->GetPins( &sheet ) )
+                    {
+                        if( pin->IsConnectivityDirty() )
+                        {
+                            dirty_items.insert( pin );
+                        }
+                    }
+                }
+            }
+            // If the symbol isn't dirty, look at the pins
+            // TODO: remove symbols from connectivity graph and only use pins
+            else if( item->Type() == SCH_SYMBOL_T )
+            {
+                SCH_SYMBOL* symbol = static_cast<SCH_SYMBOL*>( item );
+
+                for( SCH_PIN* pin : symbol->GetPins( &sheet ) )
+                {
+                    if( pin->IsConnectivityDirty() )
+                    {
+                        items.push_back( pin );
+                        dirty_items.insert( pin );
+                    }
+                }
+            }
+            else if( item->Type() == SCH_SHEET_T )
+            {
+                SCH_SHEET* sheet = static_cast<SCH_SHEET*>( item );
+
+                for( SCH_SHEET_PIN* pin : sheet->GetPins() )
+                {
+                    if( pin->IsConnectivityDirty() )
+                    {
+                        items.push_back( pin );
+                        dirty_items.insert( pin );
+                    }
+                }
             }
 
             // Ensure the hierarchy info stored in the SCH_SCREEN (such as symbol units) reflects
@@ -672,7 +804,7 @@ void CONNECTION_GRAPH::Recalculate( const SCH_SHEET_LIST& aSheetList, bool aUnco
 
     PROF_TIMER build_graph( "buildConnectionGraph" );
 
-    buildConnectionGraph( aChangedItemHandler );
+    buildConnectionGraph( aChangedItemHandler, aUnconditional );
 
     if( wxLog::IsAllowedTraceMask( DanglingProfileMask ) )
         build_graph.Show();
@@ -710,42 +842,84 @@ std::set<std::pair<SCH_SHEET_PATH, SCH_ITEM*>> CONNECTION_GRAPH::ExtractAffected
         aSubgraph->getAllConnectedItems( retvals, subgraphs );
     };
 
+    auto extract_element = [&]( SCH_ITEM* aItem )
+    {
+        CONNECTION_SUBGRAPH* item_sg = GetSubgraphForItem( aItem );
+
+        if( !item_sg )
+        {
+            wxLogTrace( ConnTrace, wxT( "Item %s not found in connection graph" ), aItem->GetTypeDesc() );
+            return;
+        }
+        if( !item_sg->ResolveDrivers( true ) )
+        {
+            wxLogTrace( ConnTrace, wxT( "Item %s in subgraph %ld (%p) has no driver" ),
+                        aItem->GetTypeDesc(), item_sg->m_code, item_sg );
+        }
+
+        std::vector<CONNECTION_SUBGRAPH*> sg_to_scan = GetAllSubgraphs( item_sg->GetNetName() );
+
+        if( sg_to_scan.empty() )
+        {
+            wxLogTrace( ConnTrace, wxT( "Item %s in subgraph %ld with net %s has no neighbors" ),
+                        aItem->GetTypeDesc(), item_sg->m_code, item_sg->GetNetName() );
+            sg_to_scan.push_back( item_sg );
+        }
+
+        wxLogTrace( ConnTrace,
+                    wxT( "Removing all item %s connections from subgraph %ld with net %s: Found "
+                         "%zu subgraphs" ),
+                    aItem->GetTypeDesc(), item_sg->m_code, item_sg->GetNetName(),
+                    sg_to_scan.size() );
+
+        for( CONNECTION_SUBGRAPH* sg : sg_to_scan )
+
+        {
+            traverse_subgraph( sg );
+
+            for( auto& bus_it : sg->m_bus_neighbors )
+            {
+                for( CONNECTION_SUBGRAPH* bus_sg : bus_it.second )
+                    traverse_subgraph( bus_sg );
+            }
+
+            for( auto& bus_it : sg->m_bus_parents )
+            {
+                for( CONNECTION_SUBGRAPH* bus_sg : bus_it.second )
+                    traverse_subgraph( bus_sg );
+            }
+        }
+
+        alg::delete_matching( m_items, aItem );
+    };
+
     for( SCH_ITEM* item : aItems )
     {
-        auto it = m_item_to_subgraph_map.find( item );
-
-        if( it == m_item_to_subgraph_map.end() )
-            continue;
-
-        CONNECTION_SUBGRAPH* sg = it->second;
-
-        traverse_subgraph( sg );
-
-        for( auto& bus_it : sg->m_bus_neighbors )
+        if( item->Type() == SCH_SHEET_T )
         {
-            for( CONNECTION_SUBGRAPH* bus_sg : bus_it.second )
-                traverse_subgraph( bus_sg );
+            SCH_SHEET* sheet = static_cast<SCH_SHEET*>( item );
+
+            for( SCH_SHEET_PIN* pin : sheet->GetPins() )
+                extract_element( pin );
         }
-
-        for( auto& bus_it : sg->m_bus_parents )
-        {
-            for( CONNECTION_SUBGRAPH* bus_sg : bus_it.second )
-                traverse_subgraph( bus_sg );
-        }
-
-        alg::delete_matching( m_items, item );
-
-        if( item->Type() == SCH_SYMBOL_T )
+        else if ( item->Type() == SCH_SYMBOL_T )
         {
             SCH_SYMBOL* symbol = static_cast<SCH_SYMBOL*>( item );
 
-            for( SCH_PIN* pin : symbol->GetPins( &sg->m_sheet ) )
-                alg::delete_matching( m_items, pin );
+            for( SCH_PIN* pin : symbol->GetPins( &m_schematic->CurrentSheet() ) )
+                extract_element( pin );
+        }
+        else
+        {
+            extract_element( item );
         }
     }
 
     removeSubgraphs( subgraphs );
 
+    for( const auto& [path, item] : retvals )
+        alg::delete_matching( m_items, item );
+
     return retvals;
 }
 
@@ -770,6 +944,7 @@ void CONNECTION_GRAPH::RemoveItem( SCH_ITEM* aItem )
 
 void CONNECTION_GRAPH::removeSubgraphs( std::set<CONNECTION_SUBGRAPH*>& aSubgraphs )
 {
+    wxLogTrace( ConnTrace, wxT( "Removing %zu subgraphs" ), aSubgraphs.size() );
     std::sort( m_driver_subgraphs.begin(), m_driver_subgraphs.end() );
     std::sort( m_subgraphs.begin(), m_subgraphs.end() );
     std::set<int> codes_to_remove;
@@ -928,12 +1103,30 @@ void CONNECTION_GRAPH::removeSubgraphs( std::set<CONNECTION_SUBGRAPH*>& aSubgrap
 void CONNECTION_GRAPH::updateItemConnectivity( const SCH_SHEET_PATH& aSheet,
                                                const std::vector<SCH_ITEM*>& aItemList )
 {
+    wxLogTrace( wxT( "Updating connectivity for sheet %s with %zu items" ),
+                aSheet.Last()->GetFileName(), aItemList.size() );
     std::map<VECTOR2I, std::vector<SCH_ITEM*>> connection_map;
 
+    auto updatePin = [&]( SCH_PIN* aPin, SCH_CONNECTION* aConn )
+    {
+        aConn->SetType( CONNECTION_TYPE::NET );
+
+        // because calling the first time is not thread-safe
+        wxString name = aPin->GetDefaultNetName( aSheet );
+        aPin->ClearConnectedItems( aSheet );
+
+        // power symbol pins need to be post-processed later
+        if( aPin->IsGlobalPower() )
+        {
+            aConn->SetName( name );
+            m_global_power_pins.emplace_back( std::make_pair( aSheet, aPin ) );
+        }
+    };
+
     for( SCH_ITEM* item : aItemList )
     {
         std::vector<VECTOR2I> points = item->GetConnectionPoints();
-        item->ConnectedItems( aSheet ).clear();
+        item->ClearConnectedItems( aSheet );
 
         if( item->Type() == SCH_SHEET_T )
         {
@@ -941,7 +1134,7 @@ void CONNECTION_GRAPH::updateItemConnectivity( const SCH_SHEET_PATH& aSheet,
             {
                 pin->InitializeConnection( aSheet, this );
 
-                pin->ConnectedItems( aSheet ).clear();
+                pin->ClearConnectedItems( aSheet );
 
                 connection_map[ pin->GetTextPos() ].push_back( pin );
                 m_items.emplace_back( pin );
@@ -953,23 +1146,10 @@ void CONNECTION_GRAPH::updateItemConnectivity( const SCH_SHEET_PATH& aSheet,
 
             for( SCH_PIN* pin : symbol->GetPins( &aSheet ) )
             {
-                SCH_CONNECTION* conn = pin->InitializeConnection( aSheet, this );
-
-                VECTOR2I pos = pin->GetPosition();
-
-                // because calling the first time is not thread-safe
-                wxString name = pin->GetDefaultNetName( aSheet );
-                pin->ConnectedItems( aSheet ).clear();
-
-                // power symbol pins need to be post-processed later
-                if( pin->IsGlobalPower() )
-                {
-                    conn->SetName( name );
-                    m_global_power_pins.emplace_back( std::make_pair( aSheet, pin ) );
-                }
-
-                connection_map[ pos ].push_back( pin );
                 m_items.emplace_back( pin );
+                SCH_CONNECTION* conn = pin->InitializeConnection( aSheet, this );
+                updatePin( pin, conn );
+                connection_map[ pin->GetPosition() ].push_back( pin );
             }
         }
         else
@@ -994,7 +1174,10 @@ void CONNECTION_GRAPH::updateItemConnectivity( const SCH_SHEET_PATH& aSheet,
                 break;
 
             case SCH_PIN_T:
-                conn->SetType( CONNECTION_TYPE::NET );
+                if( points.empty() )
+                    points = { static_cast<SCH_PIN*>( item )->GetPosition() };
+
+                updatePin( static_cast<SCH_PIN*>( item ), conn );
                 break;
 
             case SCH_BUS_WIRE_ENTRY_T:
@@ -1075,9 +1258,6 @@ void CONNECTION_GRAPH::updateItemConnectivity( const SCH_SHEET_PATH& aSheet,
                 connected_item->SetLayer( busLine ? LAYER_BUS_JUNCTION : LAYER_JUNCTION );
             }
 
-            SCH_ITEM_SET& connected_set = connected_item->ConnectedItems( aSheet );
-            connected_set.reserve( connection_vec.size() );
-
             for( SCH_ITEM* test_item : connection_vec )
             {
                 bool      bus_connection_ok = true;
@@ -1111,7 +1291,7 @@ void CONNECTION_GRAPH::updateItemConnectivity( const SCH_SHEET_PATH& aSheet,
                     test_item->ConnectionPropagatesTo( connected_item ) &&
                     bus_connection_ok )
                 {
-                    connected_set.push_back( test_item );
+                    connected_item->AddConnectionTo( aSheet, test_item );
                 }
             }
 
@@ -1213,7 +1393,7 @@ void CONNECTION_GRAPH::buildItemSubGraphs()
                         connected_conn->SetSubgraphCode( subgraph->m_code );
                         m_item_to_subgraph_map[connected_item] = subgraph;
                         subgraph->AddItem( connected_item );
-                        SCH_ITEM_SET& citemset = connected_item->ConnectedItems( sheet );
+                        const SCH_ITEM_VEC& citemset = connected_item->ConnectedItems( sheet );
 
                         for( SCH_ITEM* citem : citemset )
                         {
@@ -1248,6 +1428,8 @@ void CONNECTION_GRAPH::resolveAllDrivers()
                       return candidate->m_dirty;
                   } );
 
+    wxLogTrace( ConnTrace, wxT( "Resolving drivers for %zu subgraphs" ), dirty_graphs.size() );
+
     std::vector<std::future<size_t>> returns( dirty_graphs.size() );
 
     auto update_lambda = []( CONNECTION_SUBGRAPH* subgraph ) -> size_t
@@ -1378,7 +1560,7 @@ void CONNECTION_GRAPH::generateBusAliasMembers()
 
     for( CONNECTION_SUBGRAPH* subgraph : m_driver_subgraphs )
     {
-        SCH_ITEM_SET vec = subgraph->GetAllBusLabels();
+        SCH_ITEM_VEC vec = subgraph->GetAllBusLabels();
 
         for( SCH_ITEM* item : vec )
         {
@@ -1556,14 +1738,20 @@ void CONNECTION_GRAPH::processSubGraphs()
 
         if( !subgraph->m_strong_driver )
         {
-            std::vector<CONNECTION_SUBGRAPH*>* vec = &m_net_name_to_subgraphs_map.at( name );
+            std::vector<CONNECTION_SUBGRAPH*> vec_empty;
+            std::vector<CONNECTION_SUBGRAPH*>* vec = &vec_empty;
+
+            if( m_net_name_to_subgraphs_map.count( name ) )
+                vec = &m_net_name_to_subgraphs_map.at( name );
 
             // If we are a unique bus vector, check if we aren't actually unique because of another
             // subgraph with a similar bus vector
             if( vec->size() <= 1 && subgraph->m_driver_connection->Type() == CONNECTION_TYPE::BUS )
             {
                 wxString prefixOnly = name.BeforeFirst( '[' ) + wxT( "[]" );
-                vec = &m_net_name_to_subgraphs_map.at( prefixOnly );
+
+                if( m_net_name_to_subgraphs_map.count( prefixOnly ) )
+                    vec = &m_net_name_to_subgraphs_map.at( prefixOnly );
             }
 
             if( vec->size() > 1 )
@@ -1858,7 +2046,7 @@ void CONNECTION_GRAPH::processSubGraphs()
 //     on some portion of the items.
 
 
-void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* aChangedItemHandler )
+void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* aChangedItemHandler, bool aUnconditional )
 {
     // Recache all bus aliases for later use
     wxCHECK_RET( m_schematic, wxT( "Connection graph cannot be built without schematic pointer" ) );
@@ -2146,6 +2334,7 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
 
     std::shared_ptr<NET_SETTINGS>& netSettings = m_schematic->Prj().GetProjectFile().m_NetSettings;
     std::map<wxString, wxString>   oldAssignments = netSettings->m_NetClassLabelAssignments;
+    std::set<wxString>             affectedNetclassNetAssignments;
 
     netSettings->m_NetClassLabelAssignments.clear();
 
@@ -2187,9 +2376,6 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
                     }
                 }
 
-                if( netclass.IsEmpty() )
-                    return;
-
                 if( !driverSubgraph )
                     driverSubgraph = subgraphs.front();
 
@@ -2199,7 +2385,10 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
                 {
                     for( const auto& member : driverSubgraph->m_driver_connection->Members() )
                     {
-                        netSettings->m_NetClassLabelAssignments[ member->Name() ] = netclass;
+                        if( netclass.IsEmpty() )
+                            netSettings->m_NetClassLabelAssignments.erase( member->Name() );
+                        else
+                            netSettings->m_NetClassLabelAssignments[member->Name()] = netclass;
 
                         auto ii = m_net_name_to_subgraphs_map.find( member->Name() );
 
@@ -2208,14 +2397,42 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
                     }
                 }
 
-                netSettings->m_NetClassLabelAssignments[ netname ] = netclass;
+                if( netclass.IsEmpty() )
+                    netSettings->m_NetClassLabelAssignments.erase( netname );
+                else
+                    netSettings->m_NetClassLabelAssignments[netname] = netclass;
 
-                if( oldAssignments[ netname ] != netclass )
+                if( oldAssignments.count( netname ) )
+                {
+                    if( oldAssignments[netname] != netclass )
+                    {
+                        affectedNetclassNetAssignments.insert( netname );
+                        dirtySubgraphs( subgraphs );
+                    }
+                }
+                else if( !netclass.IsEmpty() )
+                {
+                    affectedNetclassNetAssignments.insert( netname );
                     dirtySubgraphs( subgraphs );
+                }
             };
 
     for( const auto& [ netname, subgraphs ] : m_net_name_to_subgraphs_map )
         checkNetclassDrivers( subgraphs );
+
+    if( !aUnconditional )
+    {
+        for( auto& [ netname, netclass ] : oldAssignments )
+        {
+            if( netSettings->m_NetClassLabelAssignments.count( netname )
+                || affectedNetclassNetAssignments.count( netname ) )
+            {
+                continue;
+            }
+
+            netSettings->m_NetClassLabelAssignments[ netname ] = netclass;
+        }
+    }
 }
 
 
@@ -2819,7 +3036,7 @@ CONNECTION_SUBGRAPH* CONNECTION_GRAPH::FindFirstSubgraphByName( const wxString&
 }
 
 
-CONNECTION_SUBGRAPH* CONNECTION_GRAPH::GetSubgraphForItem( SCH_ITEM* aItem )
+CONNECTION_SUBGRAPH* CONNECTION_GRAPH::GetSubgraphForItem( SCH_ITEM* aItem ) const
 {
     auto                 it  = m_item_to_subgraph_map.find( aItem );
     CONNECTION_SUBGRAPH* ret = it != m_item_to_subgraph_map.end() ? it->second : nullptr;
@@ -2831,8 +3048,8 @@ CONNECTION_SUBGRAPH* CONNECTION_GRAPH::GetSubgraphForItem( SCH_ITEM* aItem )
 }
 
 
-const std::vector<CONNECTION_SUBGRAPH*> CONNECTION_GRAPH::GetAllSubgraphs(
-        const wxString& aNetName ) const
+const std::vector<CONNECTION_SUBGRAPH*>
+CONNECTION_GRAPH::GetAllSubgraphs( const wxString& aNetName ) const
 {
     std::vector<CONNECTION_SUBGRAPH*> subgraphs;
 
@@ -3647,6 +3864,33 @@ bool CONNECTION_GRAPH::ercCheckLabels( const CONNECTION_SUBGRAPH* aSubgraph )
     if( label_map.empty() )
         return true;
 
+    // No-connects on net neighbors will be noticed before, but to notice them on bus parents we
+    // need to walk the graph
+    for( auto pair : aSubgraph->m_bus_parents )
+    {
+        for( CONNECTION_SUBGRAPH* busParent : pair.second )
+        {
+            if( busParent->m_no_connect )
+            {
+                has_nc = true;
+                break;
+            }
+
+            CONNECTION_SUBGRAPH* hp = busParent->m_hier_parent;
+
+            while( hp )
+            {
+                if( hp->m_no_connect )
+                {
+                    has_nc = true;
+                    break;
+                }
+
+                hp = hp->m_hier_parent;
+            }
+        }
+    }
+
     wxString netName = GetResolvedSubgraphName( aSubgraph );
 
     wxCHECK_MSG( m_schematic, true, wxS( "Null m_schematic in CONNECTION_GRAPH::ercCheckLabels" ) );