Begin version 8 development.

.gitlab-ci.yml

@@ -14,7 +14,7 @@ default:
 ##########################################################################
 # The variable CI_COMMIT_BEFORE_SHA is not available in normal merge requests
 # so we must build the commit hash ourselves, see:
-# https://gitlab.com/gitlab-org/gitlab/-/issues/12850
+# https://gitlab.com/gitlab-org/gitlab/issues/12850
 test_formatting:
   stage: test
   needs: []

.gitlab/doxygen.yml

@@ -7,7 +7,7 @@ build_doxygen_docker:
     - docker
   before_script:
     - docker info
-    - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY"
+    - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY"
   script:
     - docker build -t "${CI_REGISTRY_IMAGE}/doxygen:$CI_COMMIT_BRANCH" -f ./doxygen/doxygen.Dockerfile .
     - docker push "${CI_REGISTRY_IMAGE}/doxygen:$CI_COMMIT_BRANCH"

.gitlab/issue_templates/bare.md

@@ -1,20 +0,0 @@
-<!-- --------Before Creating a New Issue-----------
-* Limit report to a single issue.
-* Search the issue tracker to verify the issue has not already been reported.
-* Complete all instructions between `template comment markers <>.
-* Keep report contents limited to the necessary information required to fix the issue.
-* When creating an issue against the stable version of KiCad, make sure the latest available stable version is installed as issues may have already been resolved in later stable versions. -->
-# Description
-<!-- What is the current behavior and what is the expected behavior?  -->
-<!-- If the issue is visual/graphical, please attach screenshots of the problem. -->
-<!--  Add the issue details below this line and before the "Steps to reproduce" heading. -->
-
-# Steps to reproduce
-<!-- If there are multiple steps to reproduce it or it is a visual issue, then providing a screen recording as an attachment to this report is recommended. -->
-<!-- If this issue is specific to a project, please attach the necessary files to this issue. -->
-<!--  Add the steps to reproduce using the numbers below -->
-<!--  Add new step numbers before the "KiCad Version" heading. -->
-1.
-
-# KiCad Version
-

.gitlab/mr_formatting.yml

@@ -1,25 +0,0 @@
-##########################################################################
-# Test the formatting in a merge request using clang-format
-##########################################################################
-# The variable CI_COMMIT_BEFORE_SHA is not available in normal merge requests
-# so we must build the commit hash ourselves, see:
-# https://gitlab.com/gitlab-org/gitlab/-/issues/12850
-test_formatting:
-  stage: test
-  needs: []
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-  allow_failure: true
-  before_script:
-    # We must manually add the KiCad remote to ensure it is named sensibly
-    - git remote add product https://gitlab.com/kicad/code/kicad.git
-    - git remote add source ${CI_MERGE_REQUEST_SOURCE_PROJECT_URL}.git
-    - git fetch -n product
-    - git fetch -n source
-    # Get the SHAs of the commits
-    - "TARGET_HEAD_SHA=$(git rev-parse product/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME})"
-    - "SOURCE_HEAD_SHA=$(git rev-parse source/${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME})"
-    - "MERGE_BASE_SHA=$(git merge-base ${TARGET_HEAD_SHA} ${SOURCE_HEAD_SHA})"
-  script:
-    - echo "Testing formatting from commit ${MERGE_BASE_SHA}"
-    - ./tools/check_coding.sh --diff --ci --commit ${MERGE_BASE_SHA}

.gitlab/templates.yml

@@ -28,7 +28,7 @@
   # GitLab supports displaying the results in the GUI through JUNIT artifacts
   # (https://docs.gitlab.com/ee/ci/junit_test_reports.html)
   # so we upload the JUNIT results. Note that there is a bug with how paths
-  # are processed in the junit report (https://gitlab.com/gitlab-org/gitlab/-/issues/23835)
+  # are processed in the junit report (https://gitlab.com/gitlab-org/gitlab/issues/23835)
   # so we can't use a glob and have to list out each hierarchy separately.
   artifacts:
     reports:

3d-viewer/3d_canvas/board_adapter.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2015-2022 Mario Luzeiro <mrluzeiro@ua.pt>
- * Copyright (C) 1992-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2022 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
@@ -36,7 +36,6 @@
 #include <pgm_base.h>
 #include <settings/settings_manager.h>
 #include <wx/log.h>
-#include <pcbnew_settings.h>
 #include <advanced_config.h>
 
 
@@ -93,7 +92,8 @@ BOARD_ADAPTER::BOARD_ADAPTER() :
 {
     wxLogTrace( m_logTrace, wxT( "BOARD_ADAPTER::BOARD_ADAPTER" ) );
 
-    ReloadColorSettings();
+    if( PgmOrNull() )
+        m_colors = Pgm().GetSettingsManager().GetColorSettings();
 
     m_boardPos = VECTOR2I();
     m_boardSize = VECTOR2I();
@@ -208,15 +208,6 @@ BOARD_ADAPTER::~BOARD_ADAPTER()
 }
 
 
-void BOARD_ADAPTER::ReloadColorSettings() noexcept
-{
-    wxASSERT( PgmOrNull() );
-
-    PCBNEW_SETTINGS* settings = Pgm().GetSettingsManager().GetAppSettings<PCBNEW_SETTINGS>();
-    m_colors = Pgm().GetSettingsManager().GetColorSettings( settings->m_ColorTheme );
-}
-
-
 bool BOARD_ADAPTER::Is3dLayerEnabled( PCB_LAYER_ID aLayer ) const
 {
     wxASSERT( aLayer < PCB_LAYER_ID_COUNT );
@@ -260,8 +251,7 @@ bool BOARD_ADAPTER::Is3dLayerEnabled( PCB_LAYER_ID aLayer ) const
 
     case B_Cu:
     case F_Cu:
-        return !m_board || m_board->IsLayerVisible( aLayer ) || m_Cfg->m_Render.realistic
-                || m_board->IsFootprintHolder();
+        return !m_board || m_board->IsLayerVisible( aLayer ) || m_Cfg->m_Render.realistic;
 
     default:
         // the layer is an internal copper layer, used the visibility
@@ -681,8 +671,7 @@ bool BOARD_ADAPTER::createBoardPolygon( wxString* aErrorMsg )
             return false;
         }
 
-        // max dist from one endPt to next startPt
-        int chainingEpsilon = m_board->GetOutlinesChainingEpsilon();
+        int chainingEpsilon = pcbIUScale.mmToIU( 0.02 ); // max dist from one endPt to next startPt
 
         success = BuildFootprintPolygonOutlines( m_board, m_board_poly,
                                                  m_board->GetDesignSettings().m_MaxError,

3d-viewer/3d_canvas/board_adapter.h

@@ -100,7 +100,7 @@ public:
     void SetBoard( BOARD* aBoard ) noexcept { m_board = aBoard; }
     const BOARD* GetBoard() const noexcept { return m_board; }
 
-    void ReloadColorSettings() noexcept;
+    void SetColorSettings( COLOR_SETTINGS* aSettings ) noexcept { m_colors = aSettings; }
 
     /**
      * Function to be called by the render when it need to reload the settings for the board.
@@ -342,7 +342,8 @@ private:
     OBJECT_2D* createPadWithDrill( const PAD* aPad, int aInflateValue );
 
     void addPads( const FOOTPRINT* aFootprint, CONTAINER_2D_BASE* aDstContainer,
-                  PCB_LAYER_ID aLayerId, bool aSkipPlatedPads, bool aSkipNonPlatedPads );
+                  PCB_LAYER_ID aLayerId, bool aSkipNPTHPadsWihNoCopper, bool aSkipPlatedPads,
+                  bool aSkipNonPlatedPads );
 
     void addFootprintShapes( const FOOTPRINT* aFootprint, CONTAINER_2D_BASE* aDstContainer,
                              PCB_LAYER_ID aLayerId );

3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp

@@ -91,7 +91,7 @@ void BOARD_ADAPTER::addText( const EDA_TEXT* aText, CONTAINER_2D_BASE* aContaine
         callback_gal.SetIsFill( font->IsOutline() );
         callback_gal.SetIsStroke( font->IsStroke() );
         callback_gal.SetLineWidth( attrs.m_StrokeWidth );
-        font->Draw( &callback_gal, aText->GetShownText( true ), aText->GetDrawPos(), attrs );
+        font->Draw( &callback_gal, aText->GetShownText(), aText->GetDrawPos(), attrs );
 
         SHAPE_POLY_SET finalPoly;
         int            margin = attrs.m_StrokeWidth * 1.5 +
@@ -137,7 +137,7 @@ void BOARD_ADAPTER::addText( const EDA_TEXT* aText, CONTAINER_2D_BASE* aContaine
 
         attrs.m_Angle = aText->GetDrawRotation();
 
-        font->Draw( &callback_gal, aText->GetShownText( true ), aText->GetDrawPos(), attrs );
+        font->Draw( &callback_gal, aText->GetShownText(), aText->GetDrawPos(), attrs );
     }
 }
 
@@ -145,7 +145,7 @@ void BOARD_ADAPTER::addText( const EDA_TEXT* aText, CONTAINER_2D_BASE* aContaine
 void BOARD_ADAPTER::addShape( const PCB_DIMENSION_BASE* aDimension, CONTAINER_2D_BASE* aContainer,
                               const BOARD_ITEM* aOwner )
 {
-    addText( aDimension, aContainer, aDimension );
+    addText( &aDimension->Text(), aContainer, aDimension );
 
     const int linewidth = aDimension->GetLineThickness();
 
@@ -275,10 +275,6 @@ void BOARD_ADAPTER::createTrack( const PCB_TRACK* aTrack, CONTAINER_2D_BASE* aDs
         int       arcsegcount = GetArcToSegmentCount( radius, ARC_HIGH_DEF, arc_angle );
         int       circlesegcount;
 
-        // Avoid arcs that cannot be drawn
-        if( radius < std::numeric_limits<double>::min() || arc_angle.IsZero() )
-            break;
-
         // We need a circle to segment count. However, the arc angle can be small, and the
         // radius very big. so we calculate a reasonable value for circlesegcount.
         if( arcsegcount <= 1 )  // The arc will be approximated by a segment
@@ -492,24 +488,41 @@ OBJECT_2D* BOARD_ADAPTER::createPadWithDrill( const PAD* aPad, int aInflateValue
 
 
 void BOARD_ADAPTER::addPads( const FOOTPRINT* aFootprint, CONTAINER_2D_BASE* aContainer,
-                             PCB_LAYER_ID aLayerId, bool aSkipPlatedPads, bool aSkipNonPlatedPads )
+                             PCB_LAYER_ID aLayerId, bool aSkipNPTHPadsWihNoCopper,
+                             bool aSkipPlatedPads, bool aSkipNonPlatedPads )
 {
     for( PAD* pad : aFootprint->Pads() )
     {
         if( !pad->IsOnLayer( aLayerId ) )
             continue;
 
-        if( IsCopperLayer( aLayerId ) )
-        {
-            // Skip pad annulus when there isn't one (note: this is more discerning than
-            // pad->IsOnLayer(), which doesn't check for NPTH pads with holes that consume
-            // the entire pad).
-            if( !pad->IsOnCopperLayer() )
-                continue;
+        // Skip pad annulus when not connected on this layer (if removing is enabled)
+        if( !pad->FlashLayer( aLayerId ) && IsCopperLayer( aLayerId ) )
+            continue;
 
-            // Skip pad annulus when not connected on this layer (if removing is enabled)
-            if( !pad->FlashLayer( aLayerId ) )
-                continue;
+        // NPTH pads are not drawn on layers if the shape size and pos is the same as their hole:
+        if( aSkipNPTHPadsWihNoCopper && ( pad->GetAttribute() == PAD_ATTRIB::NPTH ) )
+        {
+            if( pad->GetDrillSize() == pad->GetSize() && pad->GetOffset() == wxPoint( 0, 0 ) )
+            {
+                switch( pad->GetShape() )
+                {
+                case PAD_SHAPE::CIRCLE:
+                    if( pad->GetDrillShape() == PAD_DRILL_SHAPE_CIRCLE )
+                        continue;
+
+                    break;
+
+                case PAD_SHAPE::OVAL:
+                    if( pad->GetDrillShape() != PAD_DRILL_SHAPE_CIRCLE )
+                        continue;
+
+                    break;
+
+                default:
+                    break;
+                }
+            }
         }
 
         VECTOR2I margin( 0, 0 );

3d-viewer/3d_canvas/create_layer_items.cpp

@@ -525,7 +525,9 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
         // ADD PADS
         for( FOOTPRINT* footprint : m_board->Footprints() )
         {
-            addPads( footprint, layerContainer, layer, renderPlatedPadsAsPlated, false );
+            // Note: NPTH pads are not drawn on copper layers when the pad has the same shape
+            // as its hole
+            addPads( footprint, layerContainer, layer, true, renderPlatedPadsAsPlated, false );
 
             // Micro-wave footprints may have items on copper layers
             addFootprintShapes( footprint, layerContainer, layer );
@@ -537,8 +539,8 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
         // ADD PLATED PADS
         for( FOOTPRINT* footprint : m_board->Footprints() )
         {
-            addPads( footprint, m_platedPadsFront, F_Cu, false, true );
-            addPads( footprint, m_platedPadsBack, B_Cu, false, true );
+            addPads( footprint, m_platedPadsFront, F_Cu, true, false, true );
+            addPads( footprint, m_platedPadsBack, B_Cu, true, false, true );
         }
 
         m_platedPadsFront->BuildBVH();
@@ -993,7 +995,7 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
             }
             else
             {
-                addPads( footprint, layerContainer, layer, false, false );
+                addPads( footprint, layerContainer, layer, false, false, false );
             }
 
             addFootprintShapes( footprint, layerContainer, layer );

3d-viewer/3d_canvas/eda_3d_canvas.cpp

@@ -32,7 +32,6 @@
 #include <3d_rendering/raytracing/render_3d_raytrace.h>
 #include <3d_rendering/opengl/render_3d_opengl.h>
 #include <3d_viewer_id.h>
-#include <advanced_config.h>
 #include <board.h>
 #include <reporter.h>
 #include <gl_context_mgr.h>
@@ -141,7 +140,7 @@ EDA_3D_CANVAS::EDA_3D_CANVAS( wxWindow* aParent, const int* aAttribList,
     // long calculation time)
     m_3d_render = m_3d_render_opengl;
 
-    m_boardAdapter.ReloadColorSettings();
+    m_boardAdapter.SetColorSettings( Pgm().GetSettingsManager().GetColorSettings() );
 
     wxASSERT( a3DCachePointer != nullptr );
     m_boardAdapter.Set3dCacheManager( a3DCachePointer );
@@ -304,7 +303,7 @@ void EDA_3D_CANVAS::ReloadRequest( BOARD* aBoard , S3D_CACHE* aCachePointer )
     if( aBoard != nullptr )
         m_boardAdapter.SetBoard( aBoard );
 
-    m_boardAdapter.ReloadColorSettings();
+    m_boardAdapter.SetColorSettings( Pgm().GetSettingsManager().GetColorSettings() );
 
     if( m_3d_render )
         m_3d_render->ReloadRequest();
@@ -384,15 +383,6 @@ void EDA_3D_CANVAS::DoRePaint()
     if( m_glRC == nullptr )
         m_glRC = GL_CONTEXT_MANAGER::Get().CreateCtx( this );
 
-    // CreateCtx could and does fail per sentry crash events, lets be graceful
-    if( m_glRC == nullptr )
-    {
-        warningReporter.Report( _( "OpenGL context creation error" ), RPT_SEVERITY_ERROR );
-        warningReporter.Finalize();
-        m_is_currently_painting.clear();
-        return;
-    }
-
     GL_CONTEXT_MANAGER::Get().LockCtx( m_glRC, this );
 
     // Set the OpenGL viewport according to the client size of this canvas.
@@ -532,11 +522,13 @@ void EDA_3D_CANVAS::DoRePaint()
         render_pivot( curtime_delta_s, scale );
     }
 
-    if( m_render3dmousePivot && ADVANCED_CFG::GetCfg().m_Use3DConnexionDriver )
+#if defined( KICAD_USE_3DCONNEXION )
+    if( m_render3dmousePivot )
     {
         const float scale = glm::min( m_camera.GetZoom(), 1.0f );
         render3dmousePivot( scale );
     }
+#endif
 
     // "Swaps the double-buffer of this window, making the back-buffer the
     //  front-buffer and vice versa, so that the output of the previous OpenGL

3d-viewer/3d_canvas/eda_3d_canvas.h

@@ -178,6 +178,8 @@ public:
      */
     void SetRenderPivot( bool aValue ) { m_render_pivot = aValue; }
 
+
+#if defined( KICAD_USE_3DCONNEXION )
     /**
      * Get a value indicating whether to render the 3dmouse pivot.
      */
@@ -207,6 +209,7 @@ public:
     {
         m_3dmousePivotPos = aPos;
     }
+#endif
 
 private:
     /**
@@ -275,12 +278,14 @@ private:
      */
     void render_pivot( float t, float aScale );
 
+#if defined( KICAD_USE_3DCONNEXION )
     /**
      * Render the 3dmouse pivot cursor.
      *
      * @param aScale scale to apply on the cursor.
      */
     void render3dmousePivot( float aScale );
+#endif
 
     /**
      * @return true if OpenGL initialization succeeded.
@@ -326,8 +331,10 @@ private:
 
     BOARD_ITEM*            m_currentRollOverItem;
 
+#if defined( KICAD_USE_3DCONNEXION )
     bool    m_render3dmousePivot = false; // Render the 3dmouse pivot
     SFVEC3F m_3dmousePivotPos;            // The position of the 3dmouse pivot
+#endif
 
     /**
      *  Trace mask used to enable or disable the trace output of this class.

3d-viewer/3d_canvas/eda_3d_canvas_pivot.cpp

@@ -120,6 +120,7 @@ void EDA_3D_CANVAS::render_pivot( float t, float aScale )
 }
 
 
+#if defined( KICAD_USE_3DCONNEXION )
 void EDA_3D_CANVAS::render3dmousePivot( float aScale )
 {
     wxASSERT( aScale >= 0.0f );
@@ -159,3 +160,4 @@ void EDA_3D_CANVAS::render3dmousePivot( float aScale )
     glDisable( GL_BLEND );
     glDisable( GL_POINT_SMOOTH );
 }
+#endif

3d-viewer/3d_model_viewer/eda_3d_model_viewer.cpp

@@ -257,13 +257,6 @@ void EDA_3D_MODEL_VIEWER::OnPaint( wxPaintEvent& event )
     if( m_glRC == nullptr )
         m_glRC = GL_CONTEXT_MANAGER::Get().CreateCtx( this );
 
-    // CreateCtx could and does fail per sentry crash events, lets be graceful
-    if( m_glRC == nullptr )
-    {
-        wxLogTrace( m_logTrace, wxT( "EDA_3D_MODEL_VIEWER::OnPaint creating gl context failed" ) );
-        return;
-    }
-
     GL_CONTEXT_MANAGER::Get().LockCtx( m_glRC, this );
 
     // Set the OpenGL viewport according to the client size of this canvas.
@@ -330,16 +323,8 @@ void EDA_3D_MODEL_VIEWER::OnPaint( wxPaintEvent& event )
         m_ogl_3dmodel->BeginDrawMulti( true );
 
         m_ogl_3dmodel->DrawOpaque( false );
-
-        glDepthMask( GL_FALSE );
-        glEnable( GL_BLEND );
-        glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
-
         m_ogl_3dmodel->DrawTransparent( 1.0f, false );
 
-        glDisable( GL_BLEND );
-        glDepthMask( GL_TRUE );
-
         m_ogl_3dmodel->EndDrawMulti();
 
         glPopMatrix();

3d-viewer/3d_navlib/CMakeLists.txt

@@ -1,3 +1,4 @@
+if( KICAD_USE_3DCONNEXION )
     add_library(3d-viewer_navlib STATIC
 	    "nl_3d_viewer_plugin.cpp"
 	    "nl_3d_viewer_plugin_impl.cpp"
@@ -22,4 +23,9 @@
         $<TARGET_PROPERTY:3DxWare::Navlib,INTERFACE_LINK_LIBRARIES>
         3DxWare::Navlib
     )
+else()
+    add_library(3d-viewer_navlib STATIC
+	    "nl_3d_viewer_plugin.cpp"
+    )
+endif(KICAD_USE_3DCONNEXION)
 

3d-viewer/3d_navlib/nl_3d_viewer_plugin.cpp

@@ -19,14 +19,14 @@
  */
 
 #include "nl_3d_viewer_plugin.h"
+
+#if defined( KICAD_USE_3DCONNEXION )
 #include "nl_3d_viewer_plugin_impl.h"
-#include <advanced_config.h>
 
 
-NL_3D_VIEWER_PLUGIN::NL_3D_VIEWER_PLUGIN( EDA_3D_CANVAS* aViewport )
+NL_3D_VIEWER_PLUGIN::NL_3D_VIEWER_PLUGIN( EDA_3D_CANVAS* aViewport ) :
+        m_impl( new NL_3D_VIEWER_PLUGIN_IMPL( aViewport ) )
 {
-    if( ADVANCED_CFG::GetCfg().m_Use3DConnexionDriver )
-        m_impl = new NL_3D_VIEWER_PLUGIN_IMPL( aViewport );
 }
 
 
@@ -38,6 +38,22 @@ NL_3D_VIEWER_PLUGIN::~NL_3D_VIEWER_PLUGIN()
 
 void NL_3D_VIEWER_PLUGIN::SetFocus( bool focus )
 {
-    if( ADVANCED_CFG::GetCfg().m_Use3DConnexionDriver )
-        m_impl->SetFocus( focus );
+    m_impl->SetFocus( focus );
 }
+#else
+
+
+NL_3D_VIEWER_PLUGIN::NL_3D_VIEWER_PLUGIN( EDA_3D_CANVAS* aViewport ) : m_impl( nullptr )
+{
+}
+
+
+void NL_3D_VIEWER_PLUGIN::SetFocus( bool focus )
+{
+}
+
+
+NL_3D_VIEWER_PLUGIN::~NL_3D_VIEWER_PLUGIN()
+{
+}
+#endif

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

@@ -27,14 +27,13 @@
  * @file  c_ogl_3dmodel.cpp
  * @brief
  */
-#include <algorithm>
 #include <stdexcept>
 #include <gal/opengl/kiglew.h>    // Must be included first
 
 #include "3d_model.h"
+#include "opengl_utils.h"
 #include "../common_ogl/ogl_utils.h"
 #include "../3d_math.h"
-#include <utility>
 #include <wx/debug.h>
 #include <wx/log.h>
 #include <chrono>
@@ -178,11 +177,9 @@ MODEL_3D::MODEL_3D( const S3DMODEL& a3DModel, MATERIAL_MODE aMaterialMode )
         // use material color for mesh bounding box or some sort of average vertex color.
         glm::vec3 avg_color = material.m_Diffuse;
 
-        BBOX_3D &mesh_bbox = m_meshes_bbox[mesh_i];
-
         for( unsigned int vtx_i = 0; vtx_i < mesh.m_VertexSize; ++vtx_i )
         {
-            mesh_bbox.Union( mesh.m_Positions[vtx_i] );
+            m_meshes_bbox[mesh_i].Union( mesh.m_Positions[vtx_i] );
 
             VERTEX& vtx_out = mesh_group.m_vertices[vtx_offset + vtx_i];
 
@@ -225,19 +222,16 @@ MODEL_3D::MODEL_3D( const S3DMODEL& a3DModel, MATERIAL_MODE aMaterialMode )
             }
         }
 
-        if( mesh_bbox.IsInitialized() )
+        if( m_meshes_bbox[mesh_i].IsInitialized() )
         {
             // generate geometry for the bounding box
-            MakeBbox( mesh_bbox, ( mesh_i + 1 ) * bbox_vtx_count,
+            MakeBbox( m_meshes_bbox[mesh_i], ( mesh_i + 1 ) * bbox_vtx_count,
                       &bbox_tmp_vertices[( mesh_i + 1 ) * bbox_vtx_count],
                       &bbox_tmp_indices[( mesh_i + 1 ) * bbox_idx_count],
                       { avg_color, 1.0f } );
 
             // bump the outer bounding box
-            m_model_bbox.Union( mesh_bbox );
-
-            // add to the material group
-            material.m_bbox.Union( mesh_bbox );
+            m_model_bbox.Union( m_meshes_bbox[mesh_i] );
         }
 
 
@@ -416,9 +410,7 @@ void MODEL_3D::EndDrawMulti()
 
 
 void MODEL_3D::Draw( bool aTransparent, float aOpacity, bool aUseSelectedMaterial,
-                     const SFVEC3F& aSelectionColor,
-                     const glm::mat4 *aModelWorldMatrix,
-                     const SFVEC3F *aCameraWorldPos ) const
+                     SFVEC3F& aSelectionColor ) const
 {
     if( aOpacity <= FLT_EPSILON )
         return;
@@ -447,102 +439,27 @@ void MODEL_3D::Draw( bool aTransparent, float aOpacity, bool aUseSelectedMateria
 
     glTexEnvfv( GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, (const float*)&param.x );
 
-    std::vector<const MODEL_3D::MATERIAL *> materialsToRender;
-    
-    materialsToRender.reserve( m_materials.size() );
-
-    if( aModelWorldMatrix && aCameraWorldPos )
+    for( const MODEL_3D::MATERIAL& mat : m_materials )
     {
-        // Sort Material groups
-
-        std::vector<std::pair<const MODEL_3D::MATERIAL*, float>> materialsSorted;
-
-        // Calculate the distance to the camera for each material group
-        for( const MODEL_3D::MATERIAL& mat : m_materials )
-        {
-            if( mat.m_render_idx_count == 0 )
-            {
-                continue;
-            }
-
-            if( ( mat.IsTransparent() != aTransparent )
+        if( ( mat.IsTransparent() != aTransparent )
                 && ( aOpacity >= 1.0f )
                 && m_materialMode != MATERIAL_MODE::DIFFUSE_ONLY )
-            {
-                continue;
-            }
-
-            const BBOX_3D& bBox = mat.m_bbox;
-            const SFVEC3F& bBoxCenter = bBox.GetCenter();
-            const SFVEC3F bBoxWorld = *aModelWorldMatrix * glm::vec4( bBoxCenter, 1.0f );
-
-            const float distanceToCamera = glm::length( *aCameraWorldPos - bBoxWorld );
-
-            materialsSorted.emplace_back( &mat, distanceToCamera  );
-        }
-
-        // Sort from back to front
-        std::sort( materialsSorted.begin(), materialsSorted.end(),
-            [&]( std::pair<const MODEL_3D::MATERIAL*, float>& a,
-                 std::pair<const MODEL_3D::MATERIAL*, float>& b ) {
-                    // If A is inside B, then A is rendered first
-                    if( b.first->m_bbox.Inside( a.first->m_bbox ) )
-                    {
-                        return true;
-                    }
-                    else
-                    {
-                        if( a.first->m_bbox.Inside( b.first->m_bbox ) )
-                        {
-                            return false;
-                        }
-                    }
-
-                    return a.second > b.second;
-            } );
-
-        for( const std::pair<const MODEL_3D::MATERIAL*, float>& mat : materialsSorted )
         {
-            materialsToRender.push_back( mat.first );
+            continue;
         }
-    }
-    else
-    {
-        for( const MODEL_3D::MATERIAL& mat : m_materials )
-        {
-            // There is at least one default material created in case a mesh has no declared materials.
-            // Most meshes have a material, so usually the first material will have nothing to render and is skip.
-            // See S3D::GetModel for more details.
-            if( mat.m_render_idx_count == 0 )
-            {
-                continue;
-            }
 
-            if( ( mat.IsTransparent() != aTransparent )
-                && ( aOpacity >= 1.0f )
-                && m_materialMode != MATERIAL_MODE::DIFFUSE_ONLY )
-            {
-                continue;
-            }
-            
-            materialsToRender.push_back( &mat );
-        }
-    }   
-
-    for( const MODEL_3D::MATERIAL* mat : materialsToRender )
-    {
         switch( m_materialMode )
         {
         case MATERIAL_MODE::NORMAL:
-            OglSetMaterial( *mat, aOpacity, aUseSelectedMaterial, aSelectionColor );
+            OglSetMaterial( mat, aOpacity, aUseSelectedMaterial, aSelectionColor );
             break;
 
         case MATERIAL_MODE::DIFFUSE_ONLY:
-            OglSetDiffuseMaterial( mat->m_Diffuse, aOpacity, aUseSelectedMaterial, aSelectionColor );
+            OglSetDiffuseMaterial( mat.m_Diffuse, aOpacity, aUseSelectedMaterial, aSelectionColor );
             break;
 
         case MATERIAL_MODE::CAD_MODE:
-            OglSetDiffuseMaterial( MaterialDiffuseToColorCAD( mat->m_Diffuse ), aOpacity,
+            OglSetDiffuseMaterial( MaterialDiffuseToColorCAD( mat.m_Diffuse ), aOpacity,
                                    aUseSelectedMaterial, aSelectionColor );
             break;
 
@@ -550,9 +467,9 @@ void MODEL_3D::Draw( bool aTransparent, float aOpacity, bool aUseSelectedMateria
             break;
         }
 
-        glDrawElements( GL_TRIANGLES, mat->m_render_idx_count, m_index_buffer_type,
+        glDrawElements( GL_TRIANGLES, mat.m_render_idx_count, m_index_buffer_type,
                         reinterpret_cast<const void*>(
-                                static_cast<uintptr_t>( mat->m_render_idx_buffer_offset ) ) );
+                                static_cast<uintptr_t>( mat.m_render_idx_buffer_offset ) ) );
     }
 }
 

3d-viewer/3d_rendering/opengl/3d_model.h

@@ -54,7 +54,7 @@ public:
      */
     void DrawOpaque( bool aUseSelectedMaterial, SFVEC3F aSelectionColor = SFVEC3F( 0.0f ) ) const
     {
-        Draw( false, 1.0f, aUseSelectedMaterial, aSelectionColor, nullptr, nullptr );
+        Draw( false, 1.0f, aUseSelectedMaterial, aSelectionColor );
     }
 
     /**
@@ -63,19 +63,9 @@ public:
     void DrawTransparent( float aOpacity, bool aUseSelectedMaterial,
                           SFVEC3F aSelectionColor = SFVEC3F( 0.0f ) ) const
     {
-        Draw( true, aOpacity, aUseSelectedMaterial, aSelectionColor, nullptr, nullptr );
+        Draw( true, aOpacity, aUseSelectedMaterial, aSelectionColor );
     }
 
-    /**
-     * Render the model into the current context.
-     * if aModelWorldMatrix and aCameraWorldPos is provided,
-     * it renders the material groups sorted.
-     */
-    void Draw( bool aTransparent, float aOpacity, bool aUseSelectedMaterial,
-               const SFVEC3F& aSelectionColor,
-               const glm::mat4 *aModelWorldMatrix,
-               const SFVEC3F *aCameraWorldPos ) const;
-
     /**
      * Return true if have opaque meshes to render.
      */
@@ -146,8 +136,6 @@ private:
         unsigned int m_render_idx_buffer_offset = 0;
         unsigned int m_render_idx_count = 0;
 
-        BBOX_3D m_bbox; ///< bounding box for this material group, used for transparent material ordering
-
         MATERIAL( const SMATERIAL& aOther ) : SMATERIAL( aOther ) { }
         bool IsTransparent() const { return m_Transparency > FLT_EPSILON; }
     };
@@ -171,6 +159,9 @@ private:
 
     static void MakeBbox( const BBOX_3D& aBox, unsigned int aIdxOffset, VERTEX* aVtxOut,
                           GLuint* aIdxOut, const glm::vec4& aColor );
+
+    void Draw( bool aTransparent, float aOpacity, bool aUseSelectedMaterial,
+               SFVEC3F& aSelectionColor ) const;
 };
 
 #endif // _MODEL_3D_H_

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

@@ -912,8 +912,7 @@ void RENDER_3D_OPENGL::load3dModels( REPORTER* aStatusReporter )
     if( !m_boardAdapter.GetBoard() )
         return;
 
-    if( !m_boardAdapter.m_IsPreviewer
-          && !m_boardAdapter.m_Cfg->m_Render.show_footprints_normal
+    if( !m_boardAdapter.m_Cfg->m_Render.show_footprints_normal
           && !m_boardAdapter.m_Cfg->m_Render.show_footprints_insert
           && !m_boardAdapter.m_Cfg->m_Render.show_footprints_virtual )
     {

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

@@ -22,19 +22,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <cstdint>
 #include <gal/opengl/kiglew.h>    // Must be included first
 
-#include "plugins/3dapi/xv3d_types.h"
 #include "render_3d_opengl.h"
 #include "opengl_utils.h"
 #include "common_ogl/ogl_utils.h"
 #include <footprint.h>
 #include <3d_math.h>
-#include <glm/geometric.hpp>
 #include <math/util.h>      // for KiROUND
-#include <utility>
-#include <vector>
 #include <wx/log.h>
 
 #include <base_units.h>
@@ -863,12 +858,9 @@ bool RENDER_3D_OPENGL::Redraw( bool aIsMoving, REPORTER* aStatusReporter,
         glPopMatrix();
     }
 
-    glm::mat4 cameraViewMatrix;
-
-    glGetFloatv( GL_MODELVIEW_MATRIX, glm::value_ptr( cameraViewMatrix ) );
-
     // Render 3D Models (Non-transparent)
-    renderOpaqueModels( cameraViewMatrix );
+    render3dModels( false, false );
+    render3dModels( true, false );
 
     // Display board body
     if( m_boardAdapter.m_Cfg->m_Render.show_board_body )
@@ -930,7 +922,8 @@ bool RENDER_3D_OPENGL::Redraw( bool aIsMoving, REPORTER* aStatusReporter,
     glTexEnvi( GL_TEXTURE_ENV, GL_SRC1_ALPHA, GL_CONSTANT );
     glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA );
 
-    renderTransparentModels( cameraViewMatrix );
+    render3dModels( false, true );
+    render3dModels( true, true );
 
     glDisable( GL_BLEND );
     OglResetTextureState();
@@ -1150,15 +1143,14 @@ void RENDER_3D_OPENGL::renderSolderMaskLayer( PCB_LAYER_ID aLayerID, float aZPos
 }
 
 
-void RENDER_3D_OPENGL::get3dModelsSelected( std::list<MODELTORENDER> &aDstRenderList,
-                                            bool aGetTop, bool aGetBot, bool aRenderTransparentOnly,
-                                            bool aRenderSelectedOnly )
+void RENDER_3D_OPENGL::render3dModelsSelected( bool aRenderTopOrBot, bool aRenderTransparentOnly,
+                                               bool aRenderSelectedOnly )
 {
-    wxASSERT( ( aGetTop == true ) || ( aGetBot == true ) );
-
     if( !m_boardAdapter.GetBoard() )
         return;
 
+    MODEL_3D::BeginDrawMulti( !aRenderSelectedOnly );
+
     // Go for all footprints
     for( FOOTPRINT* fp : m_boardAdapter.GetBoard()->Footprints() )
     {
@@ -1183,52 +1175,54 @@ void RENDER_3D_OPENGL::get3dModelsSelected( std::list<MODELTORENDER> &aDstRender
         {
             if( m_boardAdapter.IsFootprintShown( (FOOTPRINT_ATTR_T) fp->GetAttributes() ) )
             {
-                const bool isFlipped = fp->IsFlipped();
-
-                if( ( aGetTop == !isFlipped ) ||
-                    ( aGetBot == isFlipped ) )
-                    get3dModelsFromFootprint( aDstRenderList, fp, aRenderTransparentOnly, highlight );
+                if( aRenderTopOrBot == !fp->IsFlipped() )
+                    renderFootprint( fp, aRenderTransparentOnly, highlight );
             }
         }
     }
+
+    MODEL_3D::EndDrawMulti();
 }
 
 
-void RENDER_3D_OPENGL::get3dModelsFromFootprint( std::list<MODELTORENDER> &aDstRenderList,
-                                                 const FOOTPRINT* aFootprint, bool aRenderTransparentOnly,
-                                                 bool aIsSelected )
+void RENDER_3D_OPENGL::render3dModels( bool aRenderTopOrBot, bool aRenderTransparentOnly )
+{
+    if( m_boardAdapter.m_IsBoardView )
+        render3dModelsSelected( aRenderTopOrBot, aRenderTransparentOnly, true );
+
+    render3dModelsSelected( aRenderTopOrBot, aRenderTransparentOnly, false );
+}
+
+
+void RENDER_3D_OPENGL::renderFootprint( const FOOTPRINT* aFootprint, bool aRenderTransparentOnly,
+                                        bool aIsSelected )
 {
     if( !aFootprint->Models().empty() )
     {
         const double zpos = m_boardAdapter.GetFootprintZPos( aFootprint->IsFlipped() );
+        SFVEC3F selColor = m_boardAdapter.GetColor( m_boardAdapter.m_Cfg->m_Render.opengl_selection_color );
+
+
+        glPushMatrix();
 
         VECTOR2I pos = aFootprint->GetPosition();
 
-        glm::mat4 fpMatrix( 1.0f );
-
-        fpMatrix = glm::translate( fpMatrix,
-                                    SFVEC3F( pos.x * m_boardAdapter.BiuTo3dUnits(),
-                                            -pos.y * m_boardAdapter.BiuTo3dUnits(),
-                                            zpos ) );
+        glTranslatef( pos.x * m_boardAdapter.BiuTo3dUnits(), -pos.y * m_boardAdapter.BiuTo3dUnits(),
+                      zpos );
 
         if( !aFootprint->GetOrientation().IsZero() )
-        {
-            fpMatrix = glm::rotate( fpMatrix,
-                                    (float) aFootprint->GetOrientation().AsRadians(),
-                                    SFVEC3F( 0.0f, 0.0f, 1.0f ) );
-        }
+            glRotated( aFootprint->GetOrientation().AsDegrees(), 0.0, 0.0, 1.0 );
 
         if( aFootprint->IsFlipped() )
         {
-            fpMatrix = glm::rotate( fpMatrix, glm::pi<float>(), SFVEC3F( 0.0f, 1.0f, 0.0f ) );
-            fpMatrix = glm::rotate( fpMatrix, glm::pi<float>(), SFVEC3F( 0.0f, 0.0f, 1.0f ) );
+            glRotatef( 180.0f, 0.0f, 1.0f, 0.0f );
+            glRotatef( 180.0f, 0.0f, 0.0f, 1.0f );
         }
 
-        const double modelunit_to_3d_units_factor = m_boardAdapter.BiuTo3dUnits() *
-                                                    UNITS3D_TO_UNITSPCB;
+        double modelunit_to_3d_units_factor = m_boardAdapter.BiuTo3dUnits() * UNITS3D_TO_UNITSPCB;
 
-        fpMatrix = glm::scale( fpMatrix,
-                               SFVEC3F( modelunit_to_3d_units_factor ) );
+        glScaled( modelunit_to_3d_units_factor, modelunit_to_3d_units_factor,
+                  modelunit_to_3d_units_factor );
 
         // Get the list of model files for this model
         for( const FP_3DMODEL& sM : aFootprint->Models() )
@@ -1249,232 +1243,66 @@ void RENDER_3D_OPENGL::get3dModelsFromFootprint( std::list<MODELTORENDER> &aDstR
                 if( ( !aRenderTransparentOnly && modelPtr->HasOpaqueMeshes() && opaque ) ||
                     ( aRenderTransparentOnly && ( modelPtr->HasTransparentMeshes() || !opaque ) ) )
                 {
-                    glm::mat4 modelworldMatrix = fpMatrix;
+                    glPushMatrix();
 
-                    const SFVEC3F offset = SFVEC3F( sM.m_Offset.x, sM.m_Offset.y, sM.m_Offset.z );
-                    const SFVEC3F rotation = SFVEC3F( sM.m_Rotation.x, sM.m_Rotation.y, sM.m_Rotation.z );
-                    const SFVEC3F scale = SFVEC3F( sM.m_Scale.x, sM.m_Scale.y, sM.m_Scale.z );
-                    
-                    std::vector<float> key = { offset.x, offset.y, offset.z,
-                                               rotation.x, rotation.y, rotation.z,
-                                               scale.x, scale.y, scale.z };
+                    std::vector<double> key = { sM.m_Offset.x, sM.m_Offset.y, sM.m_Offset.z,
+                                                sM.m_Rotation.x, sM.m_Rotation.y, sM.m_Rotation.z,
+                                                sM.m_Scale.x, sM.m_Scale.y, sM.m_Scale.z };
 
                     auto it = m_3dModelMatrixMap.find( key );
 
                     if( it != m_3dModelMatrixMap.end() )
                     {
-                        modelworldMatrix *= it->second;
+                        glMultMatrixf( glm::value_ptr( it->second ) );
                     }
                     else
                     {
-                        glm::mat4 mtx( 1.0f );
-                        mtx = glm::translate( mtx, offset );
-                        mtx = glm::rotate( mtx, glm::radians( -rotation.z ), { 0.0f, 0.0f, 1.0f } );
-                        mtx = glm::rotate( mtx, glm::radians( -rotation.y ), { 0.0f, 1.0f, 0.0f } );
-                        mtx = glm::rotate( mtx, glm::radians( -rotation.x ), { 1.0f, 0.0f, 0.0f } );
-                        mtx = glm::scale( mtx, scale );
+                        glm::mat4 mtx( 1 );
+                        mtx = glm::translate( mtx, { sM.m_Offset.x, sM.m_Offset.y, sM.m_Offset.z } );
+                        mtx = glm::rotate( mtx, glm::radians( (float) -sM.m_Rotation.z ), { 0.0f, 0.0f, 1.0f } );
+                        mtx = glm::rotate( mtx, glm::radians( (float) -sM.m_Rotation.y ), { 0.0f, 1.0f, 0.0f } );
+                        mtx = glm::rotate( mtx, glm::radians( (float) -sM.m_Rotation.x ), { 1.0f, 0.0f, 0.0f } );
+                        mtx = glm::scale( mtx, { sM.m_Scale.x, sM.m_Scale.y, sM.m_Scale.z } );
                         m_3dModelMatrixMap[ key ] = mtx;
 
-                        modelworldMatrix *= mtx;
+                        glMultMatrixf( glm::value_ptr( mtx ) );
                     }
 
+
                     if( aRenderTransparentOnly )
                     {
-                        aDstRenderList.emplace_back( modelworldMatrix,
-                                                     modelPtr,
-                                                     sM.m_Opacity,
-                                                     true,
-                                                     aFootprint->IsSelected() || aIsSelected  );
+                        modelPtr->DrawTransparent( sM.m_Opacity,
+                                                   aFootprint->IsSelected() || aIsSelected,
+                                                   selColor );
                     }
                     else
                     {
-                        aDstRenderList.emplace_back( modelworldMatrix,
-                                                     modelPtr,
-                                                     1.0f,
-                                                     false,
-                                                     aFootprint->IsSelected() || aIsSelected );
+                        modelPtr->DrawOpaque( aFootprint->IsSelected() || aIsSelected, selColor );
                     }
-                }
-            }
-        }
-    }
-}
 
+                    if( m_boardAdapter.m_Cfg->m_Render.opengl_show_model_bbox )
+                    {
+                        glEnable( GL_BLEND );
+                        glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
 
-void RENDER_3D_OPENGL::renderOpaqueModels( const glm::mat4 &aCameraViewMatrix )
-{
-    const SFVEC3F selColor = m_boardAdapter.GetColor( m_boardAdapter.m_Cfg->m_Render.opengl_selection_color );
+                        glDisable( GL_LIGHTING );
 
-    glPushMatrix();
+                        glLineWidth( 1 );
+                        modelPtr->DrawBboxes();
 
-    std::list<MODELTORENDER> renderList;
+                        glLineWidth( 4 );
+                        modelPtr->DrawBbox();
 
-    if( m_boardAdapter.m_IsBoardView )
-    {
-        renderList.clear();
+                        glEnable( GL_LIGHTING );
+                        glDisable( GL_BLEND );
+                    }
 
-        get3dModelsSelected( renderList, true, true, false, true );
-
-        if( !renderList.empty() )
-        {
-            MODEL_3D::BeginDrawMulti( false );
-
-            for( const MODELTORENDER& mtr : renderList )
-            {
-                renderModel( aCameraViewMatrix, mtr, selColor, nullptr );
-            }
-
-            MODEL_3D::EndDrawMulti();
-        }
-    }
-
-    renderList.clear();
-    get3dModelsSelected( renderList, true, true, false, false );
-
-    if( !renderList.empty() )
-    {
-        MODEL_3D::BeginDrawMulti( true );
-
-        for( const MODELTORENDER& mtr : renderList )
-        {
-            renderModel( aCameraViewMatrix, mtr, selColor, nullptr );
-        }
-
-        MODEL_3D::EndDrawMulti();
-    }
-
-    glPopMatrix();
-}
-
-
-void RENDER_3D_OPENGL::renderTransparentModels( const glm::mat4 &aCameraViewMatrix )
-{
-    const SFVEC3F selColor = m_boardAdapter.GetColor( m_boardAdapter.m_Cfg->m_Render.opengl_selection_color );
-
-    std::list<MODELTORENDER> renderListModels; // do not clear it until this function returns
-
-    if( m_boardAdapter.m_IsBoardView )
-    {
-        // Get Transparent Selected
-        get3dModelsSelected( renderListModels, true, true, true, true );
-    }
-
-    // Get Transparent Not Selected
-    get3dModelsSelected( renderListModels, true, true, true, false );
-
-    if( renderListModels.empty() )
-        return;
-
-    std::vector<std::pair<const MODELTORENDER *, float>> transparentModelList;
-
-    transparentModelList.reserve( renderListModels.size() );
-
-    // Calculate the distance to the camera for each model
-    const SFVEC3F &cameraPos = m_camera.GetPos();
-
-    for( const MODELTORENDER& mtr : renderListModels )
-    {
-        const BBOX_3D& bBox = mtr.m_model->GetBBox();
-        const SFVEC3F& bBoxCenter = bBox.GetCenter();
-        const SFVEC3F bBoxWorld = mtr.m_modelWorldMat * glm::vec4( bBoxCenter, 1.0f );
-
-        const float distanceToCamera = glm::length( cameraPos - bBoxWorld );
-        
-        transparentModelList.emplace_back( &mtr, distanceToCamera );
-    }
-
-    // Sort from back to front
-    std::sort( transparentModelList.begin(), transparentModelList.end(),
-        [&]( std::pair<const MODELTORENDER *, float>& a,
-             std::pair<const MODELTORENDER *, float>& b ) {
-            return a.second > b.second;
-        } );
-
-    // Start rendering calls
-    glPushMatrix();
-
-    bool isUsingColorInformation = !( transparentModelList.begin()->first->m_isSelected &&
-                                      m_boardAdapter.m_IsBoardView );
-
-    MODEL_3D::BeginDrawMulti( isUsingColorInformation );
-
-    for( const std::pair<const MODELTORENDER *, float>& mtr : transparentModelList )
-    {
-        if( m_boardAdapter.m_IsBoardView )
-        {
-            // Toggle between using model color or the select color
-            if( !isUsingColorInformation && !mtr.first->m_isSelected )
-            {
-                isUsingColorInformation = true;
-
-                glEnableClientState( GL_COLOR_ARRAY );
-                glEnableClientState( GL_TEXTURE_COORD_ARRAY );
-                glEnable( GL_COLOR_MATERIAL );
-            }
-            else
-            {
-                if( isUsingColorInformation && mtr.first->m_isSelected )
-                {
-                    isUsingColorInformation = false;
-
-                    glDisableClientState( GL_COLOR_ARRAY );
-                    glDisableClientState( GL_TEXTURE_COORD_ARRAY );
-                    glDisable( GL_COLOR_MATERIAL );
+                    glPopMatrix();
                 }
             }
         }
 
-        // Render model, sort each individuall material group
-        // by passing cameraPos
-        renderModel( aCameraViewMatrix, *mtr.first, selColor, &cameraPos );
-    }
-
-    MODEL_3D::EndDrawMulti();
-
-    glPopMatrix();
-}
-
-
-void RENDER_3D_OPENGL::renderModel( const glm::mat4 &aCameraViewMatrix,
-                                    const MODELTORENDER &aModelToRender,
-                                    const SFVEC3F &aSelColor,
-                                    const SFVEC3F *aCameraWorldPos )
-{
-    const glm::mat4 modelviewMatrix = aCameraViewMatrix * aModelToRender.m_modelWorldMat;
-
-    glLoadMatrixf( glm::value_ptr( modelviewMatrix ) );
-
-    aModelToRender.m_model->Draw( aModelToRender.m_isTransparent,
-                                  aModelToRender.m_opacity,
-                                  aModelToRender.m_isSelected,
-                                  aSelColor,
-                                  &aModelToRender.m_modelWorldMat,
-                                  aCameraWorldPos );
-
-    if( m_boardAdapter.m_Cfg->m_Render.opengl_show_model_bbox )
-    {
-        const bool wasBlendEnabled = glIsEnabled( GL_BLEND );
-
-        if( !wasBlendEnabled )
-        {
-            glEnable( GL_BLEND );
-            glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
-        }
-
-        glDisable( GL_LIGHTING );
-
-        glLineWidth( 1 );
-        aModelToRender.m_model->DrawBboxes();
-
-        glLineWidth( 4 );
-        aModelToRender.m_model->DrawBbox();
-
-        glEnable( GL_LIGHTING );
-        
-        if( !wasBlendEnabled )
-        {
-            glDisable( GL_BLEND );
-        }
+        glPopMatrix();
     }
 }
 

3d-viewer/3d_rendering/opengl/render_3d_opengl.h

@@ -129,44 +129,18 @@ private:
      */
     void load3dModels( REPORTER* aStatusReporter );
 
-    struct MODELTORENDER
-    {
-        glm::mat4 m_modelWorldMat;
-        const MODEL_3D* m_model;
-        float m_opacity;
-        bool m_isTransparent;
-        bool m_isSelected;
+    /**
+     * @param aRenderTopOrBot true will render Top, false will render bottom
+     * @param aRenderTransparentOnly true will render only the transparent objects, false will
+     *                               render opaque
+     */
+    void render3dModels( bool aRenderTopOrBot, bool aRenderTransparentOnly );
 
-        MODELTORENDER( glm::mat4 aModelWorldMat,
-                       const MODEL_3D* aNodel,
-                       float aOpacity,
-                       bool aIsTransparent,
-                       bool aIsSelected ) :
-                       m_modelWorldMat( std::move( aModelWorldMat ) ),
-                       m_model( aNodel ),
-                       m_opacity( aOpacity ),
-                       m_isTransparent( aIsTransparent ),
-                       m_isSelected( aIsSelected )
-        {
-        }
-    };
+    void render3dModelsSelected( bool aRenderTopOrBot, bool aRenderTransparentOnly,
+                                 bool aRenderSelectedOnly );
 
-    void renderOpaqueModels( const glm::mat4 &aCameraViewMatrix );
-    void renderTransparentModels( const glm::mat4 &aCameraViewMatrix );
-
-    void renderModel( const glm::mat4 &aCameraViewMatrix,
-                      const MODELTORENDER &aModelToRender,
-                      const SFVEC3F &aSelColor,
-                      const SFVEC3F *aCameraWorldPos );
-
-
-    void get3dModelsSelected( std::list<MODELTORENDER> &aDstRenderList,
-                              bool aGetTop, bool aGetBot, bool aRenderTransparentOnly,
-                              bool aRenderSelectedOnly );
-
-    void get3dModelsFromFootprint( std::list<MODELTORENDER> &aDstRenderList,
-                                   const FOOTPRINT* aFootprint, bool aRenderTransparentOnly,
-                                   bool aIsSelected );
+    void renderFootprint( const FOOTPRINT* aFootprint, bool aRenderTransparentOnly,
+                          bool aIsSelected );
 
     void setLightFront( bool enabled );
     void setLightTop( bool enabled );
@@ -236,7 +210,7 @@ private:
 
     // Caches
     std::map< wxString, MODEL_3D* >            m_3dModelMap;
-    std::map< std::vector<float>, glm::mat4 > m_3dModelMatrixMap;
+    std::map< std::vector<double>, glm::mat4 > m_3dModelMatrixMap;
 
     BOARD_ITEM*         m_currentRollOverItem;
 

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

@@ -1202,8 +1202,7 @@ void RENDER_3D_RAYTRACE::load3DModels( CONTAINER_3D& aDstContainer, bool aSkipMa
     if( !m_boardAdapter.GetBoard() )
         return;
 
-    if( !m_boardAdapter.m_IsPreviewer
-          && !m_boardAdapter.m_Cfg->m_Render.show_footprints_normal
+    if( !m_boardAdapter.m_Cfg->m_Render.show_footprints_normal
           && !m_boardAdapter.m_Cfg->m_Render.show_footprints_insert
           && !m_boardAdapter.m_Cfg->m_Render.show_footprints_virtual )
     {

3d-viewer/3d_rendering/raytracing/shapes2D/bbox_2d.cpp

@@ -229,16 +229,6 @@ bool BBOX_2D::Inside( const SFVEC2F& aPoint ) const
 }
 
 
-bool BBOX_2D::Inside( const BBOX_2D& aBBox ) const
-{
-    wxASSERT( IsInitialized() );
-    wxASSERT( aBBox.IsInitialized() );
-
-    return Inside( aBBox.Min() ) &&
-           Inside( aBBox.Max() );
-}
-
-
 float BBOX_2D::Area() const
 {
     SFVEC2F extent = GetExtent();

3d-viewer/3d_rendering/raytracing/shapes2D/bbox_2d.h

@@ -132,14 +132,6 @@ public:
      */
     bool Inside( const SFVEC2F& aPoint ) const;
 
-    /**
-     * Check if a bounding box is inside this bounding box.
-     *
-     * @param aBBox the bounding box to test if it is inside
-     * @return true if aBBox is smaller and all points are inside
-     */
-    bool Inside( const BBOX_2D& aBBox ) const;
-
     /**
      * Calculate the area of a bounding box.
      *

3d-viewer/3d_rendering/raytracing/shapes3D/bbox_3d.cpp

@@ -238,16 +238,6 @@ bool BBOX_3D::Inside( const SFVEC3F& aPoint ) const
 }
 
 
-bool BBOX_3D::Inside( const BBOX_3D& aBBox ) const
-{
-    wxASSERT( IsInitialized() );
-    wxASSERT( aBBox.IsInitialized() );
-
-    return Inside( aBBox.Min() ) &&
-           Inside( aBBox.Max() );
-}
-
-
 float BBOX_3D::Volume() const
 {
     wxASSERT( IsInitialized() );

3d-viewer/3d_rendering/raytracing/shapes3D/bbox_3d.h

@@ -125,14 +125,6 @@ public:
      */
     bool Inside( const SFVEC3F& aPoint ) const;
 
-    /**
-     * Check if a bounding box is inside this bounding box.
-     *
-     * @param aBBox the bounding box to test if it is inside
-     * @return true if aBBox is smaller and all points are inside
-     */
-    bool Inside( const BBOX_3D& aBBox ) const;
-
     /**
      * Apply a transformation matrix to the box points.
      *

3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp

@@ -39,7 +39,6 @@
 #include <3d_viewer/tools/eda_3d_actions.h>
 #include <3d_viewer/tools/eda_3d_controller.h>
 #include <3d_viewer/tools/eda_3d_conditions.h>
-#include <advanced_config.h>
 #include <bitmaps.h>
 #include <board_design_settings.h>
 #include <core/arraydim.h>
@@ -57,7 +56,9 @@
 #include <widgets/wx_infobar.h>
 #include <wildcards_and_files_ext.h>
 
+#if defined( KICAD_USE_3DCONNEXION )
 #include <3d_navlib/nl_3d_viewer_plugin.h>
+#endif
 
 /**
  * Flag to enable 3D viewer main frame window debug tracing.
@@ -165,18 +166,16 @@ EDA_3D_VIEWER_FRAME::EDA_3D_VIEWER_FRAME( KIWAY* aKiway, PCB_BASE_FRAME* aParent
     m_canvas->SetInfoBar( m_infoBar );
     m_canvas->SetStatusBar( status_bar );
 
-
-    if( ADVANCED_CFG::GetCfg().m_Use3DConnexionDriver )
+#if defined( KICAD_USE_3DCONNEXION )
+    try
     {
-        try
-        {
-            m_spaceMouse = new NL_3D_VIEWER_PLUGIN( m_canvas );
-        }
-        catch( const std::system_error& e )
-        {
-            wxLogTrace( wxT( "KI_TRACE_NAVLIB" ), e.what() );
-        }
+        m_spaceMouse = new NL_3D_VIEWER_PLUGIN( m_canvas );
     }
+    catch( const std::system_error& e )
+    {
+        wxLogTrace( wxT( "KI_TRACE_NAVLIB" ), e.what() );
+    }
+#endif
 
     // Fixes bug in Windows (XP and possibly others) where the canvas requires the focus
     // in order to receive mouse events.  Otherwise, the user has to click somewhere on
@@ -194,7 +193,12 @@ EDA_3D_VIEWER_FRAME::EDA_3D_VIEWER_FRAME( KIWAY* aKiway, PCB_BASE_FRAME* aParent
 
 EDA_3D_VIEWER_FRAME::~EDA_3D_VIEWER_FRAME()
 {
-    delete m_spaceMouse;
+#if defined( KICAD_USE_3DCONNEXION )
+    if( m_spaceMouse != nullptr )
+    {
+        delete m_spaceMouse;
+    }
+#endif
 
     Prj().GetProjectFile().m_Viewports3D = GetUserViewports();
 
@@ -330,11 +334,12 @@ void EDA_3D_VIEWER_FRAME::handleIconizeEvent( wxIconizeEvent& aEvent )
 {
     KIWAY_PLAYER::handleIconizeEvent( aEvent );
 
-    if( m_spaceMouse != nullptr && aEvent.IsIconized()
-            && ADVANCED_CFG::GetCfg().m_Use3DConnexionDriver )
+#if defined( KICAD_USE_3DCONNEXION )
+    if( m_spaceMouse != nullptr && aEvent.IsIconized() )
     {
         m_spaceMouse->SetFocus( false );
     }
+#endif
 }
 
 
@@ -650,8 +655,12 @@ void EDA_3D_VIEWER_FRAME::OnActivate( wxActivateEvent &aEvent )
         m_canvas->SetFocus();
     }
 
-    if( m_spaceMouse != nullptr && ADVANCED_CFG::GetCfg().m_Use3DConnexionDriver )
+#if defined( KICAD_USE_3DCONNEXION )
+    if( m_spaceMouse != nullptr )
+    {
         m_spaceMouse->SetFocus( aEvent.GetActive() );
+    }
+#endif
 
     aEvent.Skip(); // required under wxMAC
 }

3d-viewer/CMakeLists.txt

@@ -122,6 +122,8 @@ target_link_libraries( 3d-viewer
 
 add_subdirectory( 3d_cache )
 
-message( STATUS "Including 3Dconnexion SpaceMouse navigation support in 3d-viewer" )
-add_subdirectory( 3d_navlib )
-target_link_libraries( 3d-viewer PRIVATE 3d-viewer_navlib)
+if( KICAD_USE_3DCONNEXION )
+	message( STATUS "Including 3Dconnexion SpaceMouse navigation support in 3d-viewer" )
+	add_subdirectory( 3d_navlib )
+    target_link_libraries( 3d-viewer PRIVATE 3d-viewer_navlib)
+endif()

3d-viewer/dialogs/panel_preview_3d_model.cpp

@@ -56,24 +56,20 @@ PANEL_PREVIEW_3D_MODEL::PANEL_PREVIEW_3D_MODEL( wxWindow* aParent, PCB_BASE_FRAM
     m_userUnits = aFrame->GetUserUnits();
 
     m_dummyBoard = new BOARD();
-
     m_dummyBoard->SetProject( &aFrame->Prj(), true );
 
     // This board will only be used to hold a footprint for viewing
     m_dummyBoard->SetBoardUse( BOARD_USE::FPHOLDER );
 
     BOARD_DESIGN_SETTINGS parent_bds = aFrame->GetDesignSettings();
-    BOARD_DESIGN_SETTINGS& dummy_bds = m_dummyBoard->GetDesignSettings();
+    BOARD_DESIGN_SETTINGS dummy_bds = m_dummyBoard->GetDesignSettings();
     dummy_bds.SetBoardThickness( parent_bds.GetBoardThickness() );
-    dummy_bds.SetEnabledLayers( LSET::FrontMask() | LSET::BackMask() );
     BOARD_STACKUP& dummy_board_stackup = m_dummyBoard->GetDesignSettings().GetStackupDescriptor();
     dummy_board_stackup.RemoveAll();
     dummy_board_stackup.BuildDefaultStackupList( &dummy_bds, 2 );
 
     m_selected = -1;
 
-    m_previewLabel->SetFont( KIUI::GetStatusFont( this ) );
-
     // Set the bitmap of 3D view buttons:
     m_bpvTop->SetBitmap( KiBitmap( BITMAPS::axis3d_top ) );
     m_bpvFront->SetBitmap( KiBitmap( BITMAPS::axis3d_front ) );
@@ -144,9 +140,6 @@ PANEL_PREVIEW_3D_MODEL::PANEL_PREVIEW_3D_MODEL( wxWindow* aParent, PCB_BASE_FRAM
                  this );
     }
 
-    aFrame->Connect( UNITS_CHANGED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL::onUnitsChanged ),
-                     nullptr, this );
-
 #ifdef __WXOSX__
     // Call layout once to get the proper button sizes after the bitmaps have been set
     Layout();
@@ -545,29 +538,6 @@ void PANEL_PREVIEW_3D_MODEL::onMouseWheelOffset( wxMouseEvent& event )
 }
 
 
-void PANEL_PREVIEW_3D_MODEL::onUnitsChanged( wxCommandEvent& aEvent )
-{
-    double xoff_mm = EDA_UNIT_UTILS::UI::DoubleValueFromString( pcbIUScale, m_userUnits,
-                                                                xoff->GetValue() )
-                     / pcbIUScale.IU_PER_MM;
-    double yoff_mm = EDA_UNIT_UTILS::UI::DoubleValueFromString( pcbIUScale, m_userUnits,
-                                                                yoff->GetValue() )
-                     / pcbIUScale.IU_PER_MM;
-    double zoff_mm = EDA_UNIT_UTILS::UI::DoubleValueFromString( pcbIUScale, m_userUnits,
-                                                                zoff->GetValue() )
-                     / pcbIUScale.IU_PER_MM;
-
-    PCB_BASE_FRAME* frame = static_cast<PCB_BASE_FRAME*>( aEvent.GetClientData() );
-    m_userUnits = frame->GetUserUnits();
-
-    xoff->SetValue( formatOffsetValue( xoff_mm ) );
-    yoff->SetValue( formatOffsetValue( yoff_mm ) );
-    zoff->SetValue( formatOffsetValue( zoff_mm ) );
-
-    aEvent.Skip();
-}
-
-
 void PANEL_PREVIEW_3D_MODEL::UpdateDummyFootprint( bool aReloadRequired )
 {
     m_dummyFootprint->Models().clear();

3d-viewer/dialogs/panel_preview_3d_model.h

@@ -141,8 +141,6 @@ private:
     void doIncrementRotation( wxSpinEvent& aEvent, double aSign );
     void doIncrementOffset( wxSpinEvent& aEvent, double aSign );
 
-    void onUnitsChanged( wxCommandEvent& aEvent );
-
     wxString formatScaleValue( double aValue );
     wxString formatRotationValue( double aValue );
     wxString formatOffsetValue( double aValue );

3d-viewer/dialogs/panel_preview_3d_model_base.cpp

@@ -183,11 +183,12 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi
 	wxBoxSizer* bSizer6;
 	bSizer6 = new wxBoxSizer( wxHORIZONTAL );
 
-	m_previewLabel = new wxStaticText( this, wxID_ANY, _("Preview"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_previewLabel->Wrap( -1 );
-	m_previewLabel->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	wxStaticText* staticPreviewLabel;
+	staticPreviewLabel = new wxStaticText( this, wxID_ANY, _("Preview"), wxDefaultPosition, wxDefaultSize, 0 );
+	staticPreviewLabel->Wrap( -1 );
+	staticPreviewLabel->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 
-	bSizer6->Add( m_previewLabel, 1, wxEXPAND|wxLEFT|wxRIGHT, 10 );
+	bSizer6->Add( staticPreviewLabel, 0, wxEXPAND|wxLEFT|wxRIGHT, 10 );
 
 
 	bSizerRight->Add( bSizer6, 0, wxEXPAND, 5 );
@@ -206,7 +207,7 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi
 	m_bpvISO = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
 	m_bpvISO->SetToolTip( _("Enable/disable orthographic projection") );
 
-	bSizer3DButtons->Add( m_bpvISO, 0, wxTOP, 14 );
+	bSizer3DButtons->Add( m_bpvISO, 0, wxTOP|wxBOTTOM, 5 );
 
 
 	bSizer3DButtons->Add( 0, 0, 1, wxEXPAND, 5 );

3d-viewer/dialogs/panel_preview_3d_model_base.fbp

@@ -2089,7 +2089,7 @@
                                 <object class="sizeritem" expanded="1">
                                     <property name="border">10</property>
                                     <property name="flag">wxEXPAND|wxLEFT|wxRIGHT</property>
-                                    <property name="proportion">1</property>
+                                    <property name="proportion">0</property>
                                     <object class="wxStaticText" expanded="1">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
@@ -2127,11 +2127,11 @@
                                         <property name="minimize_button">0</property>
                                         <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
-                                        <property name="name">m_previewLabel</property>
+                                        <property name="name">staticPreviewLabel</property>
                                         <property name="pane_border">1</property>
                                         <property name="pane_position"></property>
                                         <property name="pane_size"></property>
-                                        <property name="permission">protected</property>
+                                        <property name="permission">none</property>
                                         <property name="pin_button">1</property>
                                         <property name="pos"></property>
                                         <property name="resize">Resizable</property>
@@ -2172,8 +2172,8 @@
                         <property name="orient">wxVERTICAL</property>
                         <property name="permission">none</property>
                         <object class="sizeritem" expanded="1">
-                            <property name="border">14</property>
-                            <property name="flag">wxTOP</property>
+                            <property name="border">5</property>
+                            <property name="flag">wxTOP|wxBOTTOM</property>
                             <property name="proportion">0</property>
                             <object class="wxBitmapButton" expanded="1">
                                 <property name="BottomDockable">1</property>

3d-viewer/dialogs/panel_preview_3d_model_base.h

@@ -68,7 +68,6 @@ class PANEL_PREVIEW_3D_MODEL_BASE : public wxPanel
 		wxSlider* m_opacity;
 		wxTextCtrl* m_boardThicknessCtrl;
 		wxStaticText* m_boardThicknessUnits;
-		wxStaticText* m_previewLabel;
 		wxBoxSizer* m_SizerPanelView;
 		wxBitmapButton* m_bpvISO;
 		wxBitmapButton* m_bpvLeft;

CMakeLists.txt

@@ -350,16 +350,12 @@ endif(USE_DISTCC)
 # Set flags for GCC, or treat llvm as GCC
 #================================================
 
-if( CMAKE_COMPILER_IS_GNUCXX )
+if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
+
     # Set 32-bit flag for GCC to prevent excess precision
-    # clang des not know this flag, so keep this separate
     if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
         set( CMAKE_CXX_FLAGS "-ffloat-store ${CMAKE_CXX_FLAGS}" )
     endif()
-endif( CMAKE_COMPILER_IS_GNUCXX )
-
-
-if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
 
     # Link flags in Debug: -g1 and -ggdb1 or -g1 and -ggdb3 can be used.
     # Level 1 produces minimal information, enough for making basic backtraces.

cmake/CreateGitVersionHeader.cmake

@@ -66,7 +66,7 @@ macro( create_git_version_header _git_src_path )
     # Check to make sure 'git' command did not fail.  Otherwise fallback
     # to KiCadVersion.cmake as the revision level.
     if( _git_describe_result EQUAL 0 )
-        set( KICAD_VERSION "${_git_DESCRIBE}" )
+        set( KICAD_VERSION "(${_git_DESCRIBE})" )
     endif()
 
     if( _git_rev_parse_head_result EQUAL 0 )

cmake/FindwxWidgets.cmake

@@ -926,17 +926,8 @@ if(wxWidgets_FOUND)
     "\\2" wxWidgets_VERSION_MINOR "${_wx_version_h}" )
   string(REGEX REPLACE "^(.*\n)?#define +wxRELEASE_NUMBER +([0-9]+).*"
     "\\2" wxWidgets_VERSION_PATCH "${_wx_version_h}" )
-  string(REGEX REPLACE "^(.*\n)?#define +wxSUBRELEASE_NUMBER +([0-9]+).*"
-    "\\2" wxWidgets_VERSION_SUBRELEASE "${_wx_version_h}" )
-
-  if( ${wxWidgets_VERSION_SUBRELEASE} GREATER 0 )
-    set(wxWidgets_VERSION_STRING
-      "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}.${wxWidgets_VERSION_SUBRELEASE}" )
-  else()
-    set(wxWidgets_VERSION_STRING
-      "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}" )
-  endif()
-
+  set(wxWidgets_VERSION_STRING
+    "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}" )
   DBG_MSG("wxWidgets_VERSION_STRING:    ${wxWidgets_VERSION_STRING}")
 endif()
 

cmake/KiCadVersion.cmake

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

common/CMakeLists.txt

@@ -620,9 +620,12 @@ target_link_libraries( pcbcommon PUBLIC
     threadpool
 )
 
-message( STATUS "Including 3Dconnexion SpaceMouse navigation support in pcbcommon" )
-add_subdirectory( ../pcbnew/navlib ./navlib)
-target_link_libraries( pcbcommon PUBLIC pcbnew_navlib)
+if( KICAD_USE_3DCONNEXION )
+    message( STATUS "Including 3Dconnexion SpaceMouse navigation support in pcbcommon" )
+    add_subdirectory( ../pcbnew/navlib ./navlib)
+    target_link_libraries( pcbcommon PUBLIC pcbnew_navlib)
+endif()
+
 
 add_dependencies( pcbcommon delaunator )
 

common/advanced_config.cpp

@@ -62,16 +62,6 @@ namespace AC_STACK
 namespace AC_KEYS
 {
 
-/**
- * Should the schematic use the new incremental connectivity algorithm
- */
-static const wxChar IncrementalConnectivity[] = wxT( "IncrementalConnectivity" );
-
-/**
- * Decide whether to attempt usage of the 3DConnexion mouse
- */
-static const wxChar Use3DConnexionDriver[] = wxT( "3DConnexionDriver" );
-
 /**
  * When filling zones, we add an extra amount of clearance to each zone to ensure that rounding
  * errors do not overrun minimum clearance distances.  This is the extra in mm.
@@ -331,15 +321,6 @@ ADVANCED_CFG::ADVANCED_CFG()
 
     m_UseClipper2               = true;
 
-#ifdef _WIN32
-    // spacemouse is largely stable on Windows
-    m_Use3DConnexionDriver = true;
-#else
-    m_Use3DConnexionDriver = false;
-#endif
-
-    m_IncrementalConnectivity   = false;
-
     loadFromConfigFile();
 }
 
@@ -482,12 +463,6 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::UseClipper2,
                                                 &m_UseClipper2, m_UseClipper2 ) );
 
-    configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::Use3DConnexionDriver,
-                                                &m_Use3DConnexionDriver, m_Use3DConnexionDriver ) );
-
-    configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::IncrementalConnectivity,
-                                                &m_IncrementalConnectivity, m_IncrementalConnectivity ) );
-
 
 
     // Special case for trace mask setting...we just grab them and set them immediately

common/bitmap.cpp

@@ -45,7 +45,6 @@
 #include <eda_base_frame.h>
 #include <eda_draw_frame.h>
 #include <paths.h>
-#include <kiplatform/ui.h>
 
 
 static std::unique_ptr<BITMAP_STORE> s_BitmapStore;

common/bitmap_base.cpp

@@ -41,8 +41,7 @@ BITMAP_BASE::BITMAP_BASE( const VECTOR2I& pos )
     m_ppi    = 300;                     // the bitmap definition. the default is 300PPI
     m_pixelSizeIu = 254000.0 / m_ppi;   // a pixel size value OK for bitmaps using 300 PPI
                                         // for Eeschema which uses currently 254000PPI
-    m_isMirroredX = false;
-    m_isMirroredY = false;
+    m_isMirrored = false;
     m_rotation   = ANGLE_0;
 }
 
@@ -52,8 +51,7 @@ BITMAP_BASE::BITMAP_BASE( const BITMAP_BASE& aSchBitmap )
     m_scale = aSchBitmap.m_scale;
     m_ppi   = aSchBitmap.m_ppi;
     m_pixelSizeIu = aSchBitmap.m_pixelSizeIu;
-    m_isMirroredX = aSchBitmap.m_isMirroredX;
-    m_isMirroredY = aSchBitmap.m_isMirroredY;
+    m_isMirrored = aSchBitmap.m_isMirrored;
     m_rotation = aSchBitmap.m_rotation;
 
     m_image = nullptr;
@@ -77,7 +75,6 @@ void BITMAP_BASE::SetImage( wxImage* aImage )
     delete m_originalImage;
     m_originalImage = new wxImage( *aImage );
     rebuildBitmap();
-    updatePPI();
 }
 
 
@@ -93,21 +90,6 @@ void BITMAP_BASE::rebuildBitmap( bool aResetID )
 }
 
 
-void BITMAP_BASE::updatePPI()
-{
-    // Todo: eventually we need to support dpi / scaling in both dimensions
-    int dpiX = m_originalImage->GetOptionInt( wxIMAGE_OPTION_RESOLUTIONX );
-
-    if( dpiX > 1 )
-    {
-        if( m_originalImage->GetOptionInt( wxIMAGE_OPTION_RESOLUTIONUNIT ) == wxIMAGE_RESOLUTION_CM )
-            m_ppi = KiROUND( dpiX * 2.54 );
-        else
-            m_ppi = dpiX;
-    }
-}
-
-
 void BITMAP_BASE::ImportData( BITMAP_BASE* aItem )
 {
     *m_image  = *aItem->m_image;
@@ -117,8 +99,7 @@ void BITMAP_BASE::ImportData( BITMAP_BASE* aItem )
     m_scale   = aItem->m_scale;
     m_ppi     = aItem->m_ppi;
     m_pixelSizeIu = aItem->m_pixelSizeIu;
-    m_isMirroredX = aItem->m_isMirroredX;
-    m_isMirroredY = aItem->m_isMirroredY;
+    m_isMirrored = aItem->m_isMirrored;
     m_rotation = aItem->m_rotation;
 }
 
@@ -135,7 +116,6 @@ bool BITMAP_BASE::ReadImageFile( wxInputStream& aInStream )
     delete m_originalImage;
     m_originalImage = new wxImage( *m_image );
     rebuildBitmap();
-    updatePPI();
 
     return true;
 }
@@ -156,7 +136,17 @@ bool BITMAP_BASE::ReadImageFile( const wxString& aFullFilename )
     delete m_originalImage;
     m_originalImage = new wxImage( *m_image );
     rebuildBitmap();
-    updatePPI();
+
+    // Todo: eventually we need to support dpi / scaling in both dimensions
+    int dpiX = m_originalImage->GetOptionInt( wxIMAGE_OPTION_RESOLUTIONX );
+
+    if( dpiX > 1 )
+    {
+        if( m_originalImage->GetOptionInt( wxIMAGE_OPTION_RESOLUTIONUNIT ) == wxIMAGE_RESOLUTION_CM )
+            m_ppi = KiROUND( dpiX * 2.54 );
+        else
+            m_ppi = dpiX;
+    }
 
     return true;
 }
@@ -403,25 +393,8 @@ void BITMAP_BASE::Mirror( bool aVertically )
 {
     if( m_image )
     {
-        // wxImage::Mirror() clear some parameters of the original image.
-        // We need to restore them, especially resolution and unit, to be
-        // sure image parameters saved in file are the right parameters, not
-        // the defualt values
-        int resX = m_image->GetOptionInt( wxIMAGE_OPTION_RESOLUTIONX );
-        int resY = m_image->GetOptionInt( wxIMAGE_OPTION_RESOLUTIONY );
-        int unit = m_image->GetOptionInt( wxIMAGE_OPTION_RESOLUTIONUNIT );
-
         *m_image = m_image->Mirror( not aVertically );
-
-        m_image->SetOption( wxIMAGE_OPTION_RESOLUTIONUNIT , unit);
-        m_image->SetOption( wxIMAGE_OPTION_RESOLUTIONX, resX);
-        m_image->SetOption( wxIMAGE_OPTION_RESOLUTIONY, resY);
-
-        if( aVertically )
-            m_isMirroredY = !m_isMirroredY;
-        else
-            m_isMirroredX = !m_isMirroredX;
-
+        m_isMirrored = !m_isMirrored;
         rebuildBitmap( false );
     }
 }
@@ -431,20 +404,7 @@ void BITMAP_BASE::Rotate( bool aRotateCCW )
 {
     if( m_image )
     {
-        // wxImage::Rotate90() clear some parameters of the original image.
-        // We need to restore them, especially resolution and unit, to be
-        // sure image parameters saved in file are the right parameters, not
-        // the defualt values
-        int resX = m_image->GetOptionInt( wxIMAGE_OPTION_RESOLUTIONX );
-        int resY = m_image->GetOptionInt( wxIMAGE_OPTION_RESOLUTIONY );
-        int unit = m_image->GetOptionInt( wxIMAGE_OPTION_RESOLUTIONUNIT );
-
         *m_image = m_image->Rotate90( aRotateCCW );
-
-        m_image->SetOption( wxIMAGE_OPTION_RESOLUTIONUNIT , unit);
-        m_image->SetOption( wxIMAGE_OPTION_RESOLUTIONX, resX);
-        m_image->SetOption( wxIMAGE_OPTION_RESOLUTIONY, resY);
-
         m_rotation += ( aRotateCCW ? -ANGLE_90 : ANGLE_90 );
         rebuildBitmap( false );
     }

common/build_version.cpp

@@ -177,20 +177,12 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief )
 
     aMsg << eol;
 
-    wxString osDescription;
-
-#if __LINUX__
-    osDescription = wxGetLinuxDistributionInfo().Description;
-#endif
-
-    // Linux uses the lsb-release program to get the description of the OS, if lsb-release
-    // isn't installed, then the string will be empty and we fallback to the method used on
-    // the other platforms (to at least get the kernel/uname info).
-     if( osDescription.empty() )
-         osDescription = wxGetOsDescription();
-
     aMsg << "Platform: "
-         << osDescription << ", "
+#if __LINUX__
+         << wxGetLinuxDistributionInfo().Description << ", "
+#else
+         << wxGetOsDescription() << ", "
+#endif
          << GetPlatformGetBitnessName() << ", "
          << platform.GetEndiannessName() << ", "
          << platform.GetPortIdName();

common/confirm.cpp

@@ -31,13 +31,30 @@
 #include <dialogs/html_message_box.h>
 #include <functional>
 #include <unordered_map>
-#include <pgm_base.h>
 #include "cli/cli_names.h"
 
 // Set of dialogs that have been chosen not to be shown again
 static std::unordered_map<unsigned long, int> doNotShowAgainDlgs;
 
 
+bool IsGUI()
+{
+    if( !wxTheApp )
+        return false;
+
+#if wxCHECK_VERSION( 3, 1, 6 )
+    return wxTheApp->IsGUI();
+#else
+    // wxWidgets older than version 3.1.6 do not have a way to know if the app
+    // has a GUI or is a console application.
+    // So the trick is to set the App class name when starting kicad-cli, and when
+    // the app class name is the kicad-cli class name the app is a console app
+    bool run_gui = wxTheApp->GetClassName() != KICAD_CLI_APP_NAME;
+    return run_gui;
+#endif
+}
+
+
 KIDIALOG::KIDIALOG( wxWindow* aParent, const wxString& aMessage, const wxString& aCaption,
                     long aStyle )
     : wxRichMessageDialog( aParent, aMessage, aCaption, aStyle | wxCENTRE | wxSTAY_ON_TOP ),
@@ -288,7 +305,7 @@ void DisplayError( wxWindow* aParent, const wxString& aText, int aDisplayTime )
         return;
     }
 
-    if( !Pgm().IsGUI() )
+    if( !IsGUI() )
     {
         wxFprintf( stderr, aText );
         return;
@@ -313,7 +330,7 @@ void DisplayErrorMessage( wxWindow* aParent, const wxString& aText, const wxStri
         return;
     }
 
-    if( !Pgm().IsGUI() )
+    if( !IsGUI() )
     {
         wxFprintf( stderr, aText );
         return;
@@ -340,7 +357,7 @@ void DisplayInfoMessage( wxWindow* aParent, const wxString& aMessage, const wxSt
         return;
     }
 
-    if( !Pgm().IsGUI() )
+    if( !IsGUI() )
     {
         wxFprintf( stdout, "%s %s", aMessage, aExtraInfo );
         return;

common/database/database_connection.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2022 Jon Evans <jon@craftyjon.com>
- * Copyright (C) 2022-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2022 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
@@ -178,15 +178,7 @@ bool DATABASE_CONNECTION::Disconnect()
         return false;
     }
 
-    try
-    {
-        m_conn->disconnect();
-    }
-    catch( boost::locale::conv::conversion_error& exc )
-    {
-        wxLogTrace( traceDatabase, wxT( "Disconnect() error \"%s\" occured." ), exc.what() );
-        return false;
-    }
+    m_conn->disconnect();
 
     return !m_conn->connected();
 }

common/dialog_about/AboutDialog_main.cpp

@@ -659,10 +659,6 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
                                           wxEmptyString,
                                           wxEmptyString,
                                           wxS( "Greek (el_GR)" ) ) );
-    aInfo.AddTranslator( new CONTRIBUTOR( wxS( "aris-kimi" ),
-                                          wxEmptyString,
-                                          wxEmptyString,
-                                          wxS( "Greek (el_GR)" ) ) );
 
     aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Adolfo Jayme Barrientos" ),
                                           wxEmptyString,
@@ -692,10 +688,6 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
                                           wxEmptyString,
                                           wxEmptyString,
                                           wxS( "Spanish (ES)" ) ) );
-    aInfo.AddTranslator( new CONTRIBUTOR( wxT( "VicSanRoPe" ),
-                                          wxEmptyString,
-                                          wxEmptyString,
-                                          wxS( "Spanish - Latin American (ES)" ) ) );
 
     aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Ulices Avila Hernandez" ),
                                           wxEmptyString,
@@ -830,46 +822,14 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
                                           wxEmptyString,
                                           wxEmptyString,
                                           wxS( "Korean (KO)" ) ) );
-    aInfo.AddTranslator( new CONTRIBUTOR( wxT( "김낙환" ),
-                                          wxEmptyString,
-                                          wxEmptyString,
-                                          wxS( "Korean (KO)" ) ) );
-    aInfo.AddTranslator( new CONTRIBUTOR( wxT( "이기형" ),
-                                          wxEmptyString,
-                                          wxEmptyString,
-                                          wxS( "Korean (KO)" ) ) );
-    aInfo.AddTranslator( new CONTRIBUTOR( wxT( "남우근" ),
-                                          wxEmptyString,
-                                          wxEmptyString,
-                                          wxS( "Korean (KO)" ) ) );
     aInfo.AddTranslator( new CONTRIBUTOR( wxT( "강명구" ),
                                           wxEmptyString,
                                           wxEmptyString,
                                           wxS( "Korean (KO)" ) ) );
-    aInfo.AddTranslator( new CONTRIBUTOR( wxT( "김용재" ),
-                                          wxEmptyString,
-                                          wxEmptyString,
-                                          wxS( "Korean (KO)" ) ) );
     aInfo.AddTranslator( new CONTRIBUTOR( wxT( "서범기" ),
                                           wxEmptyString,
                                           wxEmptyString,
                                           wxS( "Korean (KO)" ) ) );
-    aInfo.AddTranslator( new CONTRIBUTOR( wxT( "김세영" ),
-                                          wxEmptyString,
-                                          wxEmptyString,
-                                          wxS( "Korean (KO)" ) ) );
-    aInfo.AddTranslator( new CONTRIBUTOR( wxT( "이윤성" ),
-                                          wxEmptyString,
-                                          wxEmptyString,
-                                          wxS( "Korean (KO)" ) ) );
-    aInfo.AddTranslator( new CONTRIBUTOR( wxT( "KwonHyeokbeom" ),
-                                          wxEmptyString,
-                                          wxEmptyString,
-                                          wxS( "Korean (KO)" ) ) );
-    aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Minsu Kim (0xGabriel)" ),
-                                          wxEmptyString,
-                                          wxEmptyString,
-                                          wxS( "Korean (KO)" ) ) );
 
     aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Henrik Kauhanen" ),
                                           wxEmptyString,
@@ -900,14 +860,6 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
                                           wxEmptyString,
                                           wxEmptyString,
                                           wxS( "Dutch (NL)" ) ) );
-    aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Tom Niesse" ),
-                                          wxEmptyString,
-                                          wxEmptyString,
-                                          wxS( "Dutch (NL)" ) ) );
-    aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Christiaan Nieuwlaat" ),
-                                          wxEmptyString,
-                                          wxEmptyString,
-                                          wxS( "Dutch (NL)" ) ) );
 
     aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Jarl Gjessing" ),
                                           wxEmptyString,
@@ -980,10 +932,6 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
                                           wxEmptyString,
                                           wxEmptyString,
                                           wxS( "Portuguese (PT)" ) ) );
-    aInfo.AddTranslator( new CONTRIBUTOR( wxT( "ssantos" ),
-                                          wxEmptyString,
-                                          wxEmptyString,
-                                          wxS( "Portuguese (PT)" ) ) );
 
     aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Igor Plyatov" ),
                                           wxEmptyString,
@@ -1181,7 +1129,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
     #define SYMBOL_LIB_CONTRIBUTION _( "Symbols by" )
     aInfo.AddLibrarian( new CONTRIBUTOR( wxS( "GitLab contributors" ),
                                       wxEmptyString,
-                                      wxS( "https://gitlab.com/kicad/libraries/kicad-symbols/-/graphs/master" ),
+                                      wxS( "https://gitlab.com/kicad/libraries/kicad-symbols/-/graphs/v7" ),
                                       SYMBOL_LIB_CONTRIBUTION,
                                       aInfo.CreateKiBitmap( BITMAPS::add_component ) ) );
 

common/dialog_shim.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
- * Copyright (C) 2012-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2012-2022 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
@@ -67,6 +67,10 @@ public:
 
 
 BEGIN_EVENT_TABLE( DIALOG_SHIM, wxDialog )
+    // If dialog has a grid and the grid has an active cell editor
+    // Esc key closes cell editor, otherwise Esc key closes the dialog.
+    EVT_GRID_EDITOR_SHOWN( DIALOG_SHIM::OnGridEditorShown )
+    EVT_GRID_EDITOR_HIDDEN( DIALOG_SHIM::OnGridEditorHidden )
     EVT_CHAR_HOOK( DIALOG_SHIM::OnCharHook )
 END_EVENT_TABLE()
 
@@ -321,38 +325,30 @@ bool DIALOG_SHIM::Enable( bool enable )
 // Recursive descent doing a SelectAll() in wxTextCtrls.
 // MacOS User Interface Guidelines state that when tabbing to a text control all its
 // text should be selected.  Since wxWidgets fails to implement this, we do it here.
-void DIALOG_SHIM::selectAllInTextCtrls( wxWindowList& children )
+static void selectAllInTextCtrls( wxWindowList& children )
 {
     for( wxWindow* child : children )
     {
-        if( wxTextCtrl* textCtrl = dynamic_cast<wxTextCtrl*>( child ) )
+        if( wxTextCtrl* childTextCtrl = dynamic_cast<wxTextCtrl*>( child ) )
         {
-            m_beforeEditValues[ textCtrl ] = textCtrl->GetValue();
-            textCtrl->Connect( wxEVT_SET_FOCUS, wxFocusEventHandler( DIALOG_SHIM::onChildSetFocus ),
-                               nullptr, this );
-
             // We don't currently run this on GTK because some window managers don't hide the
             // selection in non-active controls, and other window managers do the selection
             // automatically anyway.
 #if defined( __WXMAC__ ) || defined( __WXMSW__ )
-            if( !textCtrl->GetStringSelection().IsEmpty() )
+            if( !childTextCtrl->GetStringSelection().IsEmpty() )
             {
                 // Respect an existing selection
             }
-            else if( textCtrl->IsEditable() )
+            else
             {
-                textCtrl->SelectAll();
+                childTextCtrl->SelectAll();
             }
 #else
-            ignore_unused( textCtrl );
+            ignore_unused( childTextCtrl );
 #endif
         }
         else if( wxStyledTextCtrl* scintilla = dynamic_cast<wxStyledTextCtrl*>( child ) )
         {
-            m_beforeEditValues[ scintilla ] = scintilla->GetText();
-            scintilla->Connect( wxEVT_SET_FOCUS, wxFocusEventHandler( DIALOG_SHIM::onChildSetFocus ),
-                                nullptr, this );
-
             if( !scintilla->GetSelectedText().IsEmpty() )
             {
                 // Respect an existing selection
@@ -537,6 +533,11 @@ void DIALOG_SHIM::OnButton( wxCommandEvent& aEvent )
 {
     const int id = aEvent.GetId();
 
+    // If we are pressing a button to exit, we need to enable the escapeID
+    // otherwise the dialog does not process cancel
+    if( id == wxID_CANCEL )
+        SetEscapeId( wxID_ANY );
+
     if( IsQuasiModal() )
     {
         if( id == GetAffirmativeId() )
@@ -554,7 +555,7 @@ void DIALOG_SHIM::OnButton( wxCommandEvent& aEvent )
                 ignore_unused( TransferDataFromWindow() );
             }
         }
-        else if( id == wxID_CANCEL )
+        else if( id == GetEscapeId() || (id == wxID_CANCEL && GetEscapeId() == wxID_ANY) )
         {
             EndQuasiModal( wxID_CANCEL );
         }
@@ -571,19 +572,6 @@ void DIALOG_SHIM::OnButton( wxCommandEvent& aEvent )
 }
 
 
-void DIALOG_SHIM::onChildSetFocus( wxFocusEvent& aEvent )
-{
-    // When setting focus to a text control reset the before-edit value.
-
-    if( wxTextCtrl* textCtrl = dynamic_cast<wxTextCtrl*>( aEvent.GetEventObject() ) )
-        m_beforeEditValues[ textCtrl ] = textCtrl->GetValue();
-    else if( wxStyledTextCtrl* scintilla = dynamic_cast<wxStyledTextCtrl*>( aEvent.GetEventObject() ) )
-        m_beforeEditValues[ scintilla ] = scintilla->GetText();
-
-    aEvent.Skip();
-}
-
-
 void DIALOG_SHIM::OnCharHook( wxKeyEvent& aEvt )
 {
     if( aEvt.GetKeyCode() == 'U' && aEvt.GetModifiers() == wxMOD_CONTROL )
@@ -638,36 +626,25 @@ void DIALOG_SHIM::OnCharHook( wxKeyEvent& aEvt )
             return;
         }
     }
-    else if( aEvt.GetKeyCode() == WXK_ESCAPE )
-    {
-        wxObject* eventSource = aEvt.GetEventObject();
-
-        if( wxTextCtrl* textCtrl = dynamic_cast<wxTextCtrl*>( eventSource ) )
-        {
-            // First escape after an edit cancels edit
-            if( textCtrl->GetValue() != m_beforeEditValues[ textCtrl ] )
-            {
-                textCtrl->SetValue( m_beforeEditValues[ textCtrl ] );
-                textCtrl->SelectAll();
-                return;
-            }
-        }
-        else if( wxStyledTextCtrl* scintilla = dynamic_cast<wxStyledTextCtrl*>( eventSource ) )
-        {
-            // First escape after an edit cancels edit
-            if( scintilla->GetText() != m_beforeEditValues[ scintilla ] )
-            {
-                scintilla->SetText( m_beforeEditValues[ scintilla ] );
-                scintilla->SelectAll();
-                return;
-            }
-        }
-    }
 
     aEvt.Skip();
 }
 
 
+void DIALOG_SHIM::OnGridEditorShown( wxGridEvent& event )
+{
+    SetEscapeId( wxID_NONE );
+    event.Skip();
+}
+
+
+void DIALOG_SHIM::OnGridEditorHidden( wxGridEvent& event )
+{
+    SetEscapeId( wxID_ANY );
+    event.Skip();
+}
+
+
 static void recursiveDescent( wxSizer* aSizer, std::map<int, wxString>& aLabels )
 {
     wxStdDialogButtonSizer* sdbSizer = dynamic_cast<wxStdDialogButtonSizer*>( aSizer );

common/dialogs/dialog_assign_netclass.cpp

@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2022-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2022 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
@@ -105,7 +105,10 @@ void DIALOG_ASSIGN_NETCLASS::onPatternText( wxCommandEvent& aEvent )
 
             for( const wxString& net : m_netCandidates )
             {
-                if( matcher.StartsWith( net ) )
+                int matches;
+                int offset;
+
+                if( matcher.Find( net, matches, offset ) && offset == 0 )
                 {
                     m_matchingNets->Report( net );
                     matchingNetNames.push_back( net );

common/dialogs/dialog_color_picker.cpp

@@ -396,12 +396,12 @@ void DIALOG_COLOR_PICKER::drawRGBPalette()
 
     // Use Y axis from bottom to top and origin to center
     bitmapDC.SetAxisOrientation( true, true );
-#if wxCHECK_VERSION( 3, 1, 7 ) && defined( __WXMSW__)
+    #if wxCHECK_VERSION( 3, 1, 7 )
     // For some reason, SetDeviceOrigin has changed in wxWidgets 3.1.6 or 3.1.7
     bitmapDC.SetDeviceOrigin( half_size, -half_size );
-#else
+    #else
     bitmapDC.SetDeviceOrigin( half_size, half_size );
-#endif
+    #endif
 
     // Reserve room to draw cursors inside the bitmap
     half_size -= m_cursorsSize/2;
@@ -466,12 +466,12 @@ void DIALOG_COLOR_PICKER::drawHSVPalette()
 
     // Use Y axis from bottom to top and origin to center
     bitmapDC.SetAxisOrientation( true, true );
-#if wxCHECK_VERSION( 3, 1, 7 ) && defined( __WXMSW__)
+    #if wxCHECK_VERSION( 3, 1, 7 )
     // For some reason, SetDeviceOrigin has changed in wxWidgets 3.1.6 or 3.1.7
     bitmapDC.SetDeviceOrigin( half_size, -half_size );
-#else
+    #else
     bitmapDC.SetDeviceOrigin( half_size, half_size );
-#endif
+    #endif
 
     // Reserve room to draw cursors inside the bitmap
     half_size -= m_cursorsSize / 2;
@@ -701,13 +701,11 @@ void DIALOG_COLOR_PICKER::onHSVMouseDrag( wxMouseEvent& event )
 
 void DIALOG_COLOR_PICKER::OnColorValueText( wxCommandEvent& event )
 {
-    if( m_newColor4D.SetFromHexString( m_colorValue->GetValue() ) )
-    {
-        m_newColor4D.ToHSV( m_hue, m_sat, m_val, true );
+    m_newColor4D.SetFromHexString( m_colorValue->GetValue() );
+    m_newColor4D.ToHSV( m_hue, m_sat, m_val, true );
 
-        SetEditVals( HEX_CHANGED, false );
-        drawAll();
-    }
+    SetEditVals( HEX_CHANGED, true );
+    drawAll();
 }
 
 

common/dialogs/dialog_page_settings.cpp

@@ -223,7 +223,7 @@ bool DIALOG_PAGES_SETTINGS::TransferDataFromWindow()
         m_screen->SetContentModified();
 
         if( LocalPrjConfigChanged() )
-            m_parent->OnModify();
+            m_parent->SaveProjectSettings();
 
         // Call the post processing (if any) after changes
         m_parent->OnPageSettingsChange();
@@ -674,9 +674,9 @@ void DIALOG_PAGES_SETTINGS::UpdateDrawingSheetExample()
 
             GRFilledRect( &memDC, VECTOR2I( 0, 0 ), m_layout_size, 0, bgColor, bgColor );
 
-            PrintDrawingSheet( &renderSettings, pageDUMMY, emptyString, emptyString, emptyString,
-                               m_tb, nullptr, m_screen->GetPageCount(), m_screen->GetPageNumber(),
-                               1, &Prj(), wxEmptyString, m_screen->GetVirtualPageNumber() == 1 );
+            PrintDrawingSheet( &renderSettings, pageDUMMY, emptyString, emptyString, m_tb,
+                               nullptr, m_screen->GetPageCount(), m_screen->GetPageNumber(), 1,
+                               &Prj(), wxEmptyString, m_screen->GetVirtualPageNumber() == 1 );
 
             memDC.SelectObject( wxNullBitmap );
             m_PageLayoutExampleBitmap->SetBitmap( *m_pageBitmap );

common/dialogs/panel_color_settings.cpp

@@ -117,7 +117,8 @@ void PANEL_COLOR_SETTINGS::OnThemeChanged( wxCommandEvent& event )
 
     if( idx == static_cast<int>( m_cbTheme->GetCount() ) - 2 )
     {
-        m_cbTheme->SetStringSelection( GetSettingsDropdownName( m_currentSettings ) );
+        // separator; re-select active theme
+        m_cbTheme->SetStringSelection( m_currentSettings->GetName() );
         return;
     }
 
@@ -216,7 +217,10 @@ void PANEL_COLOR_SETTINGS::createThemeList( const wxString& aCurrent )
 
     for( COLOR_SETTINGS* settings : Pgm().GetSettingsManager().GetColorSettingsList() )
     {
-        wxString name = GetSettingsDropdownName( settings );
+        wxString name = settings->GetName();
+
+        if( settings->IsReadOnly() )
+            name += wxS( " " ) + _( "(read-only)" );
 
         int pos = m_cbTheme->Append( name, static_cast<void*>( settings ) );
 
@@ -258,11 +262,8 @@ void PANEL_COLOR_SETTINGS::createSwatch( int aLayer, const wxString& aName )
                                              defaultColor, SWATCH_MEDIUM );
     swatch->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    // Display the swatches in the left column and the layer name in the right column
-    // The right column is sometimes (depending on the translation) truncated for long texts.
-    // We cannot allow swatches to be truncated or not shown
-    m_colorsGridSizer->Add( swatch, 0, wxALIGN_CENTER_VERTICAL | wxALL, 3 );
     m_colorsGridSizer->Add( label, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxLEFT, 5 );
+    m_colorsGridSizer->Add( swatch, 0, wxALIGN_CENTER_VERTICAL | wxALL, 3 );
 
     m_labels[aLayer]   = label;
     m_swatches[aLayer] = swatch;
@@ -282,8 +283,6 @@ void PANEL_COLOR_SETTINGS::ShowColorContextMenu( wxMouseEvent& aEvent, int aLaye
     auto selected =
             static_cast<COLOR_SETTINGS*>( m_cbTheme->GetClientData( m_cbTheme->GetSelection() ) );
 
-    wxCHECK_RET( selected, wxT( "Invalid color theme selected" ) );
-
     COLOR4D current  = m_currentSettings->GetColor( aLayer );
     COLOR4D saved    = selected->GetColor( aLayer );
     bool    readOnly = m_currentSettings->IsReadOnly();
@@ -377,14 +376,3 @@ bool PANEL_COLOR_SETTINGS::saveCurrentTheme( bool aValidate )
 
     return true;
 }
-
-
-wxString PANEL_COLOR_SETTINGS::GetSettingsDropdownName(COLOR_SETTINGS* aSettings)
-{
-    wxString name = aSettings->GetName();
-
-    if( aSettings->IsReadOnly() )
-        name += wxS( " " ) + _( "(read-only)" );
-
-    return name;
-}

common/dialogs/panel_image_editor.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KICAD, a free EDA CAD application.
  *
  * Copyright (C) 2018 jean-pierre.charras
- * Copyright (C) 2011-2023 Kicad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2011-2020 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
@@ -110,19 +110,12 @@ bool PANEL_IMAGE_EDITOR::TransferDataFromWindow()
 void PANEL_IMAGE_EDITOR::OnRedrawPanel( wxPaintEvent& event )
 {
     wxPaintDC dc( m_panelDraw );
-    wxSize    display_size = m_panelDraw->GetClientSize();
+    wxSize    size = m_panelDraw->GetClientSize();
+    dc.SetDeviceOrigin( size.x / 2, size.y / 2 );
 
-    double img_scale = 1.0 / m_workingImage->GetScalingFactor();
-    VECTOR2I img_size_pixels = m_workingImage->GetSizePixels();
-
-    // Adjust the display scale to use the full available display area
-    double scale_X = (double)display_size.x/img_size_pixels.x;
-    double scale_Y = (double)display_size.y/img_size_pixels.y;
-
-    double display_scale = img_scale * std::min( scale_X, scale_Y );
-
-    dc.SetUserScale( display_scale, display_scale );
-    m_workingImage->DrawBitmap( &dc, VECTOR2I( m_workingImage->GetSize()/2 ) );
+    double scale = 1.0 / m_workingImage->GetScalingFactor();
+    dc.SetUserScale( scale, scale );
+    m_workingImage->DrawBitmap( &dc, wxPoint( 0, 0 ) );
 }
 
 

common/dialogs/panel_image_editor_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-282-g1fa54006)
+// C++ code generated with wxFormBuilder (version 3.10.1-133-g388db8e4)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!

common/dialogs/panel_image_editor_base.fbp

@@ -1,368 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<wxFormBuilder_Project>
-    <FileVersion major="1" minor="16" />
-    <object class="Project" expanded="1">
-        <property name="class_decoration"></property>
-        <property name="code_generation">C++</property>
-        <property name="disconnect_events">1</property>
-        <property name="disconnect_mode">source_name</property>
-        <property name="disconnect_php_events">0</property>
-        <property name="disconnect_python_events">0</property>
-        <property name="embedded_files_path">res</property>
-        <property name="encoding">UTF-8</property>
-        <property name="event_generation">connect</property>
-        <property name="file">panel_image_editor_base</property>
-        <property name="first_id">1000</property>
-        <property name="help_provider">none</property>
-        <property name="image_path_wrapper_function_name"></property>
-        <property name="indent_with_spaces"></property>
-        <property name="internationalize">1</property>
-        <property name="name">panel_image_editor_base</property>
-        <property name="namespace"></property>
-        <property name="path">.</property>
-        <property name="precompiled_header"></property>
-        <property name="relative_path">1</property>
-        <property name="skip_lua_events">1</property>
-        <property name="skip_php_events">1</property>
-        <property name="skip_python_events">1</property>
-        <property name="ui_table">UI</property>
-        <property name="use_array_enum">0</property>
-        <property name="use_enum">0</property>
-        <property name="use_microsoft_bom">0</property>
-        <object class="Panel" expanded="1">
-            <property name="aui_managed">0</property>
-            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
-            <property name="bg"></property>
-            <property name="context_help"></property>
-            <property name="context_menu">1</property>
-            <property name="drag_accept_files">0</property>
-            <property name="enabled">1</property>
-            <property name="event_handler">impl_virtual</property>
-            <property name="fg"></property>
-            <property name="font"></property>
-            <property name="hidden">0</property>
-            <property name="id">wxID_ANY</property>
-            <property name="maximum_size"></property>
-            <property name="minimum_size"></property>
-            <property name="name">PANEL_IMAGE_EDITOR_BASE</property>
-            <property name="pos"></property>
-            <property name="size">500,300</property>
-            <property name="subclass">; ; forward_declare</property>
-            <property name="tooltip"></property>
-            <property name="two_step_creation">0</property>
-            <property name="window_extra_style"></property>
-            <property name="window_name"></property>
-            <property name="window_style">wxTAB_TRAVERSAL</property>
-            <object class="wxBoxSizer" expanded="1">
-                <property name="minimum_size"></property>
-                <property name="name">bSizerMain</property>
-                <property name="orient">wxVERTICAL</property>
-                <property name="permission">none</property>
-                <object class="sizeritem" expanded="1">
-                    <property name="border">5</property>
-                    <property name="flag">wxEXPAND</property>
-                    <property name="proportion">1</property>
-                    <object class="wxBoxSizer" expanded="1">
-                        <property name="minimum_size"></property>
-                        <property name="name">bUpperSizer</property>
-                        <property name="orient">wxVERTICAL</property>
-                        <property name="permission">none</property>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxEXPAND</property>
-                            <property name="proportion">1</property>
-                            <object class="wxBoxSizer" expanded="1">
-                                <property name="minimum_size"></property>
-                                <property name="name">bSizerLeft</property>
-                                <property name="orient">wxHORIZONTAL</property>
-                                <property name="permission">none</property>
-                                <object class="sizeritem" expanded="1">
-                                    <property name="border">5</property>
-                                    <property name="flag">wxEXPAND | wxALL</property>
-                                    <property name="proportion">1</property>
-                                    <object class="wxPanel" expanded="1">
-                                        <property name="BottomDockable">1</property>
-                                        <property name="LeftDockable">1</property>
-                                        <property name="RightDockable">1</property>
-                                        <property name="TopDockable">1</property>
-                                        <property name="aui_layer"></property>
-                                        <property name="aui_name"></property>
-                                        <property name="aui_position"></property>
-                                        <property name="aui_row"></property>
-                                        <property name="best_size"></property>
-                                        <property name="bg"></property>
-                                        <property name="caption"></property>
-                                        <property name="caption_visible">1</property>
-                                        <property name="center_pane">0</property>
-                                        <property name="close_button">1</property>
-                                        <property name="context_help"></property>
-                                        <property name="context_menu">1</property>
-                                        <property name="default_pane">0</property>
-                                        <property name="dock">Dock</property>
-                                        <property name="dock_fixed">0</property>
-                                        <property name="docking">Left</property>
-                                        <property name="drag_accept_files">0</property>
-                                        <property name="enabled">1</property>
-                                        <property name="fg"></property>
-                                        <property name="floatable">1</property>
-                                        <property name="font"></property>
-                                        <property name="gripper">0</property>
-                                        <property name="hidden">0</property>
-                                        <property name="id">wxID_ANY</property>
-                                        <property name="max_size"></property>
-                                        <property name="maximize_button">0</property>
-                                        <property name="maximum_size"></property>
-                                        <property name="min_size"></property>
-                                        <property name="minimize_button">0</property>
-                                        <property name="minimum_size">256,256</property>
-                                        <property name="moveable">1</property>
-                                        <property name="name">m_panelDraw</property>
-                                        <property name="pane_border">1</property>
-                                        <property name="pane_position"></property>
-                                        <property name="pane_size"></property>
-                                        <property name="permission">protected</property>
-                                        <property name="pin_button">1</property>
-                                        <property name="pos"></property>
-                                        <property name="resize">Resizable</property>
-                                        <property name="show">1</property>
-                                        <property name="size"></property>
-                                        <property name="subclass"></property>
-                                        <property name="toolbar_pane">0</property>
-                                        <property name="tooltip"></property>
-                                        <property name="window_extra_style"></property>
-                                        <property name="window_name"></property>
-                                        <property name="window_style">wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL|wxBORDER_SIMPLE</property>
-                                        <event name="OnPaint">OnRedrawPanel</event>
-                                    </object>
-                                </object>
-                                <object class="sizeritem" expanded="1">
-                                    <property name="border">5</property>
-                                    <property name="flag">wxEXPAND|wxALL</property>
-                                    <property name="proportion">0</property>
-                                    <object class="wxBoxSizer" expanded="1">
-                                        <property name="minimum_size"></property>
-                                        <property name="name">bSizerRight</property>
-                                        <property name="orient">wxVERTICAL</property>
-                                        <property name="permission">none</property>
-                                        <object class="sizeritem" expanded="1">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
-                                            <property name="proportion">0</property>
-                                            <object class="wxButton" expanded="1">
-                                                <property name="BottomDockable">1</property>
-                                                <property name="LeftDockable">1</property>
-                                                <property name="RightDockable">1</property>
-                                                <property name="TopDockable">1</property>
-                                                <property name="aui_layer"></property>
-                                                <property name="aui_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="auth_needed">0</property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="bitmap"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</property>
-                                                <property name="center_pane">0</property>
-                                                <property name="close_button">1</property>
-                                                <property name="context_help"></property>
-                                                <property name="context_menu">1</property>
-                                                <property name="current"></property>
-                                                <property name="default">0</property>
-                                                <property name="default_pane">0</property>
-                                                <property name="disabled"></property>
-                                                <property name="dock">Dock</property>
-                                                <property name="dock_fixed">0</property>
-                                                <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
-                                                <property name="enabled">1</property>
-                                                <property name="fg"></property>
-                                                <property name="floatable">1</property>
-                                                <property name="focus"></property>
-                                                <property name="font"></property>
-                                                <property name="gripper">0</property>
-                                                <property name="hidden">0</property>
-                                                <property name="id">wxID_ANY</property>
-                                                <property name="label">Grey</property>
-                                                <property name="margins"></property>
-                                                <property name="markup">0</property>
-                                                <property name="max_size"></property>
-                                                <property name="maximize_button">0</property>
-                                                <property name="maximum_size"></property>
-                                                <property name="min_size"></property>
-                                                <property name="minimize_button">0</property>
-                                                <property name="minimum_size"></property>
-                                                <property name="moveable">1</property>
-                                                <property name="name">m_buttonGrey</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="position"></property>
-                                                <property name="pressed"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style"></property>
-                                                <property name="subclass"></property>
-                                                <property name="toolbar_pane">0</property>
-                                                <property name="tooltip"></property>
-                                                <property name="validator_data_type"></property>
-                                                <property name="validator_style">wxFILTER_NONE</property>
-                                                <property name="validator_type">wxDefaultValidator</property>
-                                                <property name="validator_variable"></property>
-                                                <property name="window_extra_style"></property>
-                                                <property name="window_name"></property>
-                                                <property name="window_style"></property>
-                                                <event name="OnButtonClick">OnGreyScaleConvert</event>
-                                            </object>
-                                        </object>
-                                        <object class="sizeritem" expanded="1">
-                                            <property name="border">10</property>
-                                            <property name="flag">wxEXPAND|wxTOP|wxBOTTOM</property>
-                                            <property name="proportion">0</property>
-                                            <object class="spacer" expanded="1">
-                                                <property name="height">0</property>
-                                                <property name="permission">protected</property>
-                                                <property name="width">0</property>
-                                            </object>
-                                        </object>
-                                        <object class="sizeritem" expanded="1">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
-                                            <property name="proportion">0</property>
-                                            <object class="wxStaticText" expanded="1">
-                                                <property name="BottomDockable">1</property>
-                                                <property name="LeftDockable">1</property>
-                                                <property name="RightDockable">1</property>
-                                                <property name="TopDockable">1</property>
-                                                <property name="aui_layer"></property>
-                                                <property name="aui_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</property>
-                                                <property name="center_pane">0</property>
-                                                <property name="close_button">1</property>
-                                                <property name="context_help"></property>
-                                                <property name="context_menu">1</property>
-                                                <property name="default_pane">0</property>
-                                                <property name="dock">Dock</property>
-                                                <property name="dock_fixed">0</property>
-                                                <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
-                                                <property name="enabled">1</property>
-                                                <property name="fg"></property>
-                                                <property name="floatable">1</property>
-                                                <property name="font"></property>
-                                                <property name="gripper">0</property>
-                                                <property name="hidden">0</property>
-                                                <property name="id">wxID_ANY</property>
-                                                <property name="label">Image Scale:</property>
-                                                <property name="markup">0</property>
-                                                <property name="max_size"></property>
-                                                <property name="maximize_button">0</property>
-                                                <property name="maximum_size"></property>
-                                                <property name="min_size"></property>
-                                                <property name="minimize_button">0</property>
-                                                <property name="minimum_size"></property>
-                                                <property name="moveable">1</property>
-                                                <property name="name">m_staticTextScale</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style"></property>
-                                                <property name="subclass"></property>
-                                                <property name="toolbar_pane">0</property>
-                                                <property name="tooltip"></property>
-                                                <property name="window_extra_style"></property>
-                                                <property name="window_name"></property>
-                                                <property name="window_style"></property>
-                                                <property name="wrap">-1</property>
-                                            </object>
-                                        </object>
-                                        <object class="sizeritem" expanded="1">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND</property>
-                                            <property name="proportion">0</property>
-                                            <object class="wxTextCtrl" expanded="1">
-                                                <property name="BottomDockable">1</property>
-                                                <property name="LeftDockable">1</property>
-                                                <property name="RightDockable">1</property>
-                                                <property name="TopDockable">1</property>
-                                                <property name="aui_layer"></property>
-                                                <property name="aui_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</property>
-                                                <property name="center_pane">0</property>
-                                                <property name="close_button">1</property>
-                                                <property name="context_help"></property>
-                                                <property name="context_menu">1</property>
-                                                <property name="default_pane">0</property>
-                                                <property name="dock">Dock</property>
-                                                <property name="dock_fixed">0</property>
-                                                <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
-                                                <property name="enabled">1</property>
-                                                <property name="fg"></property>
-                                                <property name="floatable">1</property>
-                                                <property name="font"></property>
-                                                <property name="gripper">0</property>
-                                                <property name="hidden">0</property>
-                                                <property name="id">wxID_ANY</property>
-                                                <property name="max_size"></property>
-                                                <property name="maximize_button">0</property>
-                                                <property name="maximum_size"></property>
-                                                <property name="maxlength">0</property>
-                                                <property name="min_size"></property>
-                                                <property name="minimize_button">0</property>
-                                                <property name="minimum_size"></property>
-                                                <property name="moveable">1</property>
-                                                <property name="name">m_textCtrlScale</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style"></property>
-                                                <property name="subclass"></property>
-                                                <property name="toolbar_pane">0</property>
-                                                <property name="tooltip"></property>
-                                                <property name="validator_data_type"></property>
-                                                <property name="validator_style">wxFILTER_NONE</property>
-                                                <property name="validator_type">wxDefaultValidator</property>
-                                                <property name="validator_variable"></property>
-                                                <property name="value"></property>
-                                                <property name="window_extra_style"></property>
-                                                <property name="window_name"></property>
-                                                <property name="window_style"></property>
-                                            </object>
-                                        </object>
-                                    </object>
-                                </object>
-                            </object>
-                        </object>
-                    </object>
-                </object>
-            </object>
-        </object>
-    </object>
-</wxFormBuilder_Project>

common/dialogs/panel_image_editor_base.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-282-g1fa54006)
+// C++ code generated with wxFormBuilder (version 3.10.1-133-g388db8e4)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!

common/dialogs/panel_setup_netclasses.cpp

@@ -708,7 +708,10 @@ void PANEL_SETUP_NETCLASSES::OnUpdateUI( wxUpdateUIEvent& event )
 
             for( const wxString& net : m_netNames )
             {
-                if( matcher.StartsWith( net ) )
+                int matches;
+                int offset;
+
+                if( matcher.Find( net, matches, offset ) && offset == 0 )
                     m_matchingNets->Report( net );
             }
         }

common/draw_panel_gal.cpp

@@ -58,13 +58,7 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin
                                         const wxPoint& aPosition, const wxSize& aSize,
                                         KIGFX::GAL_DISPLAY_OPTIONS& aOptions, GAL_TYPE aGalType ) :
         wxScrolledCanvas( aParentWindow, aWindowId, aPosition, aSize ),
-        m_MouseCapturedLost( false ),
-        m_parent( aParentWindow ),
         m_edaFrame( nullptr ),
-        m_lastRefresh( 0 ),
-        m_pendingRefresh( false ),
-        m_drawing( false ),
-        m_drawingEnabled( false ),
         m_gal( nullptr ),
         m_view( nullptr ),
         m_painter( nullptr ),
@@ -76,9 +70,10 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin
         m_stealsFocus( true ),
         m_statusPopup( nullptr )
 {
-    m_PaintEventCounter = std::make_unique<PROF_COUNTER>( "Draw panel paint events" );
+    m_parent = aParentWindow;
+    m_MouseCapturedLost = false;
 
-    m_minRefreshPeriod = 13; // 77 FPS (minus render time) by default
+    m_PaintEventCounter = std::make_unique<PROF_COUNTER>( "Draw panel paint events" );
 
     SetLayoutDirection( wxLayout_LeftToRight );
 
@@ -151,6 +146,12 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin
         Connect( eventType, wxEventHandler( EDA_DRAW_PANEL_GAL::OnEvent ), nullptr,
                  m_eventDispatcher );
 
+    m_pendingRefresh = false;
+    m_drawing = false;
+    m_drawingEnabled = false;
+
+    m_minRefreshPeriod = 13; // 77 FPS (minus render time) by default
+
     // Set up timer that prevents too frequent redraw commands
     m_refreshTimer.SetOwner( this );
     Connect( m_refreshTimer.GetId(), wxEVT_TIMER,
@@ -211,7 +212,7 @@ void EDA_DRAW_PANEL_GAL::DoRePaint()
     if( !m_drawingEnabled )
         return;
 
-    if( !m_gal->IsInitialized() || !m_gal->IsVisible() )
+    if( !m_gal->IsVisible() )
         return;
 
     m_pendingRefresh = false;
@@ -626,7 +627,7 @@ void EDA_DRAW_PANEL_GAL::onRefreshTimer( wxTimerEvent& aEvent )
 
 void EDA_DRAW_PANEL_GAL::onShowTimer( wxTimerEvent& aEvent )
 {
-    if( m_gal && m_gal->IsInitialized() && m_gal->IsVisible() )
+    if( m_gal && m_gal->IsVisible() )
     {
         m_onShowTimer.Stop();
         OnShow();

common/drawing_sheet/ds_draw_item.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 1992-2013 Jean-Pierre Charras <jp.charras at wanadoo.fr>.
- * Copyright (C) 1992-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2022 KiCad Developers, see AUTHORS.txt for contributors.
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -118,12 +118,8 @@ void DS_DRAW_ITEM_BASE::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame,
         break;
 
     case DS_DATA_ITEM::DS_TEXT:
-    {
-        DS_DRAW_ITEM_TEXT* textItem = static_cast<DS_DRAW_ITEM_TEXT*>( this );
-        // Don't use GetShownText(); we want to see the variable references here
-        aList.emplace_back( _( "Text" ), KIUI::EllipsizeStatusText( aFrame, textItem->GetText() ) );
+        aList.emplace_back( _( "Text" ), static_cast<DS_DRAW_ITEM_TEXT*>( this )->GetShownText() );
         break;
-    }
 
     case DS_DATA_ITEM::DS_POLYPOLYGON:
         aList.emplace_back( _( "Imported Shape" ), wxEmptyString );
@@ -194,7 +190,7 @@ bool DS_DRAW_ITEM_TEXT::HitTest( const BOX2I& aRect, bool aContains, int aAccura
 
 wxString DS_DRAW_ITEM_TEXT::GetItemDescription( UNITS_PROVIDER* aUnitsProvider ) const
 {
-    return wxString::Format( _( "Text '%s'" ), KIUI::EllipsizeMenuText( GetText() ) );
+    return wxString::Format( _( "Text '%s'" ), GetShownText() );
 }
 
 

common/drawing_sheet/ds_painter.cpp

@@ -270,7 +270,7 @@ void KIGFX::DS_PAINTER::draw( const DS_DRAW_ITEM_TEXT* aItem, int aLayer ) const
     attrs.m_StrokeWidth = std::max( aItem->GetEffectiveTextPenWidth(),
                                     m_renderSettings.GetDefaultPenWidth() );
 
-    font->Draw( m_gal, aItem->GetShownText( true ), aItem->GetTextPos(), attrs );
+    font->Draw( m_gal, aItem->GetShownText(), aItem->GetTextPos(), attrs );
 }
 
 

common/eda_base_frame.cpp

@@ -55,7 +55,6 @@
 #include <widgets/paged_dialog.h>
 #include <widgets/wx_infobar.h>
 #include <widgets/wx_aui_art_providers.h>
-#include <widgets/wx_grid.h>
 #include <wx/app.h>
 #include <wx/config.h>
 #include <wx/display.h>
@@ -220,10 +219,6 @@ void EDA_BASE_FRAME::windowClosing( wxCloseEvent& event )
     if( canCloseWindow( event ) )
     {
         m_isClosing = true;
-
-        if( m_infoBar )
-            m_infoBar->Dismiss();
-
         APP_SETTINGS_BASE* cfg = config();
 
         if( cfg )
@@ -404,8 +399,6 @@ void EDA_BASE_FRAME::HandleUpdateUIEvent( wxUpdateUIEvent& aEvent, EDA_BASE_FRAM
             enableRes = true;
         else if( textEntry && isPaste && textEntry->CanPaste() )
             enableRes = true;
-        else if( dynamic_cast<WX_GRID*>( focus ) )
-            enableRes = false;  // Must disable menu in order to get command as CharHook event
     }
 
     aEvent.Enable( enableRes );
@@ -1237,7 +1230,7 @@ bool EDA_BASE_FRAME::IsWritable( const wxFileName& aFileName, bool aVerbose )
 
 void EDA_BASE_FRAME::CheckForAutoSaveFile( const wxFileName& aFileName )
 {
-    if( !Pgm().IsGUI() )
+    if( !IsGUI() )
         return;
 
     wxCHECK_RET( aFileName.IsOk(), wxT( "Invalid file name!" ) );

common/eda_doc.cpp

@@ -144,10 +144,6 @@ bool GetAssociatedDocument( wxWindow* aParent, const wxString& aDocName, PROJECT
 
     wxFileName currentFileName( fullfilename );
 
-    // Use wxWidgets to resolve any "." and ".." in the path
-    currentFileName.MakeAbsolute();
-    fullfilename = currentFileName.GetFullPath();
-
     wxString file_ext = currentFileName.GetExt();
 
     if( file_ext.Lower() == wxT( "pdf" ) )

common/eda_draw_frame.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2004-2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2008 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 2004-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2004-2022 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
@@ -27,7 +27,6 @@
 #include <bitmaps.h>
 #include <confirm.h>
 #include <core/arraydim.h>
-#include <core/kicad_algo.h>
 #include <dialog_shim.h>
 #include <eda_draw_frame.h>
 #include <file_history.h>
@@ -79,16 +78,12 @@ BEGIN_EVENT_TABLE( EDA_DRAW_FRAME, KIWAY_PLAYER )
     EVT_ACTIVATE( EDA_DRAW_FRAME::onActivate )
 END_EVENT_TABLE()
 
-
 bool EDA_DRAW_FRAME::m_openGLFailureOccured = false;
 
-
 EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrameType,
                                 const wxString& aTitle, const wxPoint& aPos, const wxSize& aSize,
-                                long aStyle, const wxString& aFrameName,
-                                const EDA_IU_SCALE& aIuScale ) :
-    KIWAY_PLAYER( aKiway, aParent, aFrameType, aTitle, aPos, aSize, aStyle, aFrameName, aIuScale ),
-    m_socketServer( nullptr )
+                                long aStyle, const wxString& aFrameName, const EDA_IU_SCALE& aIuScale ) :
+    KIWAY_PLAYER( aKiway, aParent, aFrameType, aTitle, aPos, aSize, aStyle, aFrameName, aIuScale )
 {
     m_socketServer        = nullptr;
     m_mainToolBar         = nullptr;
@@ -176,8 +171,8 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame
               OnMove( dummy );
 
               // we need to kludge the msg panel to the correct size again
-              // especially important even for first launches as the constructor of the window
-              // here usually doesn't have the correct dpi awareness yet
+              // especially important even for first launches as the constructor of the window here usually doesn't
+              // have the correct dpi awareness yet
               m_frameSize.y += m_msgFrameHeight;
               m_msgFrameHeight = EDA_MSG_PANEL::GetRequiredHeight( this );
               m_frameSize.y -= m_msgFrameHeight;
@@ -290,7 +285,7 @@ void EDA_DRAW_FRAME::ToggleUserUnits()
     else
     {
         SetUserUnits( GetUserUnits() == EDA_UNITS::INCHES ? EDA_UNITS::MILLIMETRES
-                                                          : EDA_UNITS::INCHES );
+                                                       : EDA_UNITS::INCHES );
         unitsChangeRefresh();
 
         wxCommandEvent e( UNITS_CHANGED );
@@ -614,8 +609,7 @@ void EDA_DRAW_FRAME::DisplayGridMsg()
 {
     wxString msg;
 
-    msg.Printf( _( "grid %s" ), MessageTextFromValue( GetCanvas()->GetGAL()->GetGridSize().x,
-                                                      false ) );
+    msg.Printf( wxS( "grid %s" ), MessageTextFromValue( GetCanvas()->GetGAL()->GetGridSize().x, false ) );
 
     SetStatusText( msg, 4 );
 }
@@ -742,21 +736,21 @@ void EDA_DRAW_FRAME::SaveSettings( APP_SETTINGS_BASE* aCfg )
 void EDA_DRAW_FRAME::AppendMsgPanel( const wxString& aTextUpper, const wxString& aTextLower,
                                      int aPadding )
 {
-    if( m_messagePanel && !m_isClosing )
+    if( m_messagePanel )
         m_messagePanel->AppendMessage( aTextUpper, aTextLower, aPadding );
 }
 
 
 void EDA_DRAW_FRAME::ClearMsgPanel()
 {
-    if( m_messagePanel && !m_isClosing )
+    if( m_messagePanel )
         m_messagePanel->EraseMsgBox();
 }
 
 
 void EDA_DRAW_FRAME::SetMsgPanel( const std::vector<MSG_PANEL_ITEM>& aList )
 {
-    if( m_messagePanel && !m_isClosing )
+    if( m_messagePanel )
     {
         m_messagePanel->EraseMsgBox();
 
@@ -769,9 +763,10 @@ void EDA_DRAW_FRAME::SetMsgPanel( const std::vector<MSG_PANEL_ITEM>& aList )
 void EDA_DRAW_FRAME::SetMsgPanel( const wxString& aTextUpper, const wxString& aTextLower,
                                   int aPadding )
 {
-    if( m_messagePanel && !m_isClosing )
+    if( m_messagePanel )
     {
         m_messagePanel->EraseMsgBox();
+
         m_messagePanel->AppendMessage( aTextUpper, aTextLower, aPadding );
     }
 }
@@ -842,15 +837,26 @@ bool EDA_DRAW_FRAME::saveCanvasTypeSetting( EDA_DRAW_PANEL_GAL::GAL_TYPE aCanvas
     // Not all classes derived from EDA_DRAW_FRAME can save the canvas type, because some
     // have a fixed type, or do not have a option to set the canvas type (they inherit from
     // a parent frame)
-    static std::vector<FRAME_T> s_allowedFrames =
-            {
-                FRAME_SCH, FRAME_SCH_SYMBOL_EDITOR,
-                FRAME_PCB_EDITOR, FRAME_FOOTPRINT_EDITOR,
-                FRAME_GERBER,
-                FRAME_PL_EDITOR
-            };
+    FRAME_T allowed_frames[] =
+    {
+        FRAME_SCH, FRAME_SCH_SYMBOL_EDITOR,
+        FRAME_PCB_EDITOR, FRAME_FOOTPRINT_EDITOR,
+        FRAME_GERBER,
+        FRAME_PL_EDITOR
+    };
 
-    if( !alg::contains( s_allowedFrames, m_ident ) )
+    bool allow_save = false;
+
+    for( unsigned ii = 0; ii < arrayDim( allowed_frames ); ii++ )
+    {
+        if( m_ident == allowed_frames[ii] )
+        {
+            allow_save = true;
+            break;
+        }
+    }
+
+    if( !allow_save )
         return false;
 
     if( aCanvasType < EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE
@@ -860,7 +866,9 @@ bool EDA_DRAW_FRAME::saveCanvasTypeSetting( EDA_DRAW_PANEL_GAL::GAL_TYPE aCanvas
         return false;
     }
 
-    if( APP_SETTINGS_BASE* cfg = Kiface().KifaceSettings() )
+    APP_SETTINGS_BASE* cfg = Kiface().KifaceSettings();
+
+    if( cfg )
         cfg->m_Graphics.canvas_type = static_cast<int>( aCanvasType );
 
     return false;
@@ -870,7 +878,7 @@ bool EDA_DRAW_FRAME::saveCanvasTypeSetting( EDA_DRAW_PANEL_GAL::GAL_TYPE aCanvas
 VECTOR2I EDA_DRAW_FRAME::GetNearestGridPosition( const VECTOR2I& aPosition ) const
 {
     const VECTOR2I& gridOrigin = GetGridOrigin();
-    VECTOR2D        gridSize = GetCanvas()->GetGAL()->GetGridSize();
+    VECTOR2D       gridSize = GetCanvas()->GetGAL()->GetGridSize();
 
     double xOffset = fmod( gridOrigin.x, gridSize.x );
     int    x = KiROUND( (aPosition.x - xOffset) / gridSize.x );
@@ -884,7 +892,7 @@ VECTOR2I EDA_DRAW_FRAME::GetNearestGridPosition( const VECTOR2I& aPosition ) con
 VECTOR2I EDA_DRAW_FRAME::GetNearestHalfGridPosition( const VECTOR2I& aPosition ) const
 {
     const VECTOR2I& gridOrigin = GetGridOrigin();
-    VECTOR2D        gridSize = GetCanvas()->GetGAL()->GetGridSize() / 2.0;
+    VECTOR2D       gridSize = GetCanvas()->GetGAL()->GetGridSize() / 2.0;
 
     double xOffset = fmod( gridOrigin.x, gridSize.x );
     int    x = KiROUND( (aPosition.x - xOffset) / gridSize.x );
@@ -977,8 +985,8 @@ static const wxString productName = wxT( "KiCad E.D.A.  " );
 
 
 void PrintDrawingSheet( const RENDER_SETTINGS* aSettings, const PAGE_INFO& aPageInfo,
-                        const wxString& aSheetName, const wxString& aSheetPath,
-                        const wxString& aFileName, const TITLE_BLOCK& aTitleBlock,
+                        const wxString& aFullSheetName, const wxString& aFileName,
+                        const TITLE_BLOCK& aTitleBlock,
                         const std::map<wxString, wxString>* aProperties, int aSheetCount,
                         const wxString& aPageNumber, double aMils2Iu, const PROJECT* aProject,
                         const wxString& aSheetLayer, bool aIsFirstPage )
@@ -990,8 +998,7 @@ void PrintDrawingSheet( const RENDER_SETTINGS* aSettings, const PAGE_INFO& aPage
     drawList.SetPageNumber( aPageNumber );
     drawList.SetSheetCount( aSheetCount );
     drawList.SetFileName( aFileName );
-    drawList.SetSheetName( aSheetName );
-    drawList.SetSheetPath( aSheetPath );
+    drawList.SetSheetName( aFullSheetName );
     drawList.SetSheetLayer( aSheetLayer );
     drawList.SetProject( aProject );
     drawList.SetIsFirstPage( aIsFirstPage );
@@ -1021,10 +1028,9 @@ void EDA_DRAW_FRAME::PrintDrawingSheet( const RENDER_SETTINGS* aSettings, BASE_S
         DC->SetAxisOrientation( true, false );
     }
 
-    ::PrintDrawingSheet( aSettings, GetPageSettings(), GetScreenDesc(), GetFullScreenDesc(),
-                         aFilename, GetTitleBlock(), aProperties, aScreen->GetPageCount(),
-                         aScreen->GetPageNumber(), aMils2Iu, &Prj(), aSheetLayer,
-                         aScreen->GetVirtualPageNumber() == 1 );
+    ::PrintDrawingSheet( aSettings, GetPageSettings(), GetScreenDesc(), aFilename, GetTitleBlock(),
+                         aProperties, aScreen->GetPageCount(), aScreen->GetPageNumber(), aMils2Iu,
+                         &Prj(), aSheetLayer, aScreen->GetVirtualPageNumber() == 1 );
 
     if( origin.y > 0 )
     {
@@ -1041,13 +1047,6 @@ wxString EDA_DRAW_FRAME::GetScreenDesc() const
 }
 
 
-wxString EDA_DRAW_FRAME::GetFullScreenDesc() const
-{
-    // Virtual function. Base class implementation returns an empty string.
-    return wxEmptyString;
-}
-
-
 bool EDA_DRAW_FRAME::LibraryFileBrowser( bool doOpen, wxFileName& aFilename,
                                          const wxString& wildcard, const wxString& ext,
                                          bool isDirectory, bool aIsGlobal,

common/eda_item.cpp

@@ -392,9 +392,10 @@ static struct EDA_ITEM_DESC
         PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();
         REGISTER_TYPE( EDA_ITEM );
 
-        propMgr.AddProperty( new PROPERTY_ENUM<EDA_ITEM, KICAD_T>( wxS( "Type" ),
-                             NO_SETTER( EDA_ITEM, KICAD_T ), &EDA_ITEM::Type ) )
-                .SetIsHiddenFromPropertiesManager();
+        auto typeProp = new PROPERTY_ENUM<EDA_ITEM, KICAD_T>( wxS( "Type" ),
+                NO_SETTER( EDA_ITEM, KICAD_T ), &EDA_ITEM::Type );
+        typeProp->SetIsInternal( true );
+        propMgr.AddProperty( typeProp );
     }
 } _EDA_ITEM_DESC;
 

common/eda_pattern_match.cpp

@@ -412,30 +412,6 @@ bool EDA_COMBINED_MATCHER::Find( const wxString& aTerm, int& aMatchersTriggered,
 }
 
 
-bool EDA_COMBINED_MATCHER::Find( const wxString& aTerm )
-{
-    for( const std::unique_ptr<EDA_PATTERN_MATCH>& matcher : m_matchers )
-    {
-        if( matcher->Find( aTerm ).start >= 0 )
-            return true;
-    }
-
-    return false;
-}
-
-
-bool EDA_COMBINED_MATCHER::StartsWith( const wxString& aTerm )
-{
-    for( const std::unique_ptr<EDA_PATTERN_MATCH>& matcher : m_matchers )
-    {
-        if( matcher->Find( aTerm ).start == 0 )
-            return true;
-    }
-
-    return false;
-}
-
-
 wxString const& EDA_COMBINED_MATCHER::GetPattern() const
 {
     return m_pattern;

common/eda_shape.cpp

@@ -1687,36 +1687,21 @@ static struct EDA_SHAPE_DESC
 
         PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();
         REGISTER_TYPE( EDA_SHAPE );
-
-        auto isNotPolygon =
-                []( INSPECTABLE* aItem ) -> bool
-                {
-                    // Polygons, unlike other shapes, have no meaningful start or end coordinates
-                    if( EDA_SHAPE* shape = dynamic_cast<EDA_SHAPE*>( aItem ) )
-                        return shape->GetShape() != SHAPE_T::POLY;
-
-                    return false;
-                };
-
         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( new PROPERTY<EDA_SHAPE, int>( _HKI( "Start X" ),
                     &EDA_SHAPE::SetStartX, &EDA_SHAPE::GetStartX, PROPERTY_DISPLAY::PT_COORD,
-                    ORIGIN_TRANSFORMS::ABS_X_COORD ) )
-                .SetAvailableFunc( isNotPolygon );
+                    ORIGIN_TRANSFORMS::ABS_X_COORD ) );
         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 ) )
-                .SetAvailableFunc( isNotPolygon );
+                    ORIGIN_TRANSFORMS::ABS_Y_COORD ) );
         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 ) )
-                .SetAvailableFunc( isNotPolygon );
+                    ORIGIN_TRANSFORMS::ABS_X_COORD ) );
         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 ) )
-                .SetAvailableFunc( isNotPolygon );
+                    ORIGIN_TRANSFORMS::ABS_Y_COORD ) );
         // TODO: m_arcCenter, m_bezierC1, m_bezierC2, m_poly
         propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "Line Width" ),
                     &EDA_SHAPE::SetWidth, &EDA_SHAPE::GetWidth, PROPERTY_DISPLAY::PT_SIZE ) );
@@ -1736,17 +1721,7 @@ static struct EDA_SHAPE_DESC
         filled->SetAvailableFunc(
                       [=]( INSPECTABLE* aItem ) -> bool
                       {
-                          SHAPE_T itemShape;
-
-                          try
-                          {
-                            itemShape = aItem->Get<SHAPE_T>( shape );
-                          }
-                          catch( std::runtime_error& err )
-                          {
-                              wxFAIL_MSG( err.what() );
-                              return false;
-                          }
+                          SHAPE_T itemShape = aItem->Get<SHAPE_T>( shape );
 
                           switch( itemShape )
                           {

common/eda_text.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2016 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2004-2023 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-2022 KiCad Developers, see change_log.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
@@ -37,7 +37,6 @@
 #include <callback_gal.h>
 #include <eda_text.h>         // for EDA_TEXT, TEXT_EFFECTS, GR_TEXT_VJUSTIF...
 #include <gal/color4d.h>      // for COLOR4D, COLOR4D::BLACK
-#include <font/glyph.h>
 #include <gr_text.h>
 #include <string_utils.h>     // for UnescapeString
 #include <math/util.h>        // for KiROUND
@@ -118,10 +117,8 @@ EDA_TEXT::EDA_TEXT( const EDA_TEXT& aText ) :
 
     for( const std::unique_ptr<KIFONT::GLYPH>& glyph : aText.m_render_cache )
     {
-        if( KIFONT::OUTLINE_GLYPH* outline = dynamic_cast<KIFONT::OUTLINE_GLYPH*>( glyph.get() ) )
-            m_render_cache.emplace_back( std::make_unique<KIFONT::OUTLINE_GLYPH>( *outline ) );
-        else if( KIFONT::STROKE_GLYPH* stroke = dynamic_cast<KIFONT::STROKE_GLYPH*>( glyph.get() ) )
-            m_render_cache.emplace_back( std::make_unique<KIFONT::STROKE_GLYPH>( *stroke ) );
+        KIFONT::OUTLINE_GLYPH* outline_glyph = static_cast<KIFONT::OUTLINE_GLYPH*>( glyph.get() );
+        m_render_cache.emplace_back( std::make_unique<KIFONT::OUTLINE_GLYPH>( *outline_glyph ) );
     }
 
     m_bounding_box_cache_valid = aText.m_bounding_box_cache_valid;
@@ -152,10 +149,8 @@ EDA_TEXT& EDA_TEXT::operator=( const EDA_TEXT& aText )
 
     for( const std::unique_ptr<KIFONT::GLYPH>& glyph : aText.m_render_cache )
     {
-        if( KIFONT::OUTLINE_GLYPH* outline = dynamic_cast<KIFONT::OUTLINE_GLYPH*>( glyph.get() ) )
-            m_render_cache.emplace_back( std::make_unique<KIFONT::OUTLINE_GLYPH>( *outline ) );
-        else if( KIFONT::STROKE_GLYPH* stroke = dynamic_cast<KIFONT::STROKE_GLYPH*>( glyph.get() ) )
-            m_render_cache.emplace_back( std::make_unique<KIFONT::STROKE_GLYPH>( *stroke ) );
+        KIFONT::OUTLINE_GLYPH* outline_glyph = static_cast<KIFONT::OUTLINE_GLYPH*>( glyph.get() );
+        m_render_cache.emplace_back( std::make_unique<KIFONT::OUTLINE_GLYPH>( *outline_glyph ) );
     }
 
     m_bounding_box_cache_valid = aText.m_bounding_box_cache_valid;
@@ -396,12 +391,7 @@ void EDA_TEXT::Offset( const VECTOR2I& aOffset )
     m_pos += aOffset;
 
     for( std::unique_ptr<KIFONT::GLYPH>& glyph : m_render_cache )
-    {
-        if( KIFONT::OUTLINE_GLYPH* outline = dynamic_cast<KIFONT::OUTLINE_GLYPH*>( glyph.get() ) )
-            outline->Move( aOffset );
-        else if( KIFONT::STROKE_GLYPH* stroke = dynamic_cast<KIFONT::STROKE_GLYPH*>( glyph.get() ) )
-            glyph = stroke->Transform( { 1.0, 1.0 }, aOffset, 0, ANGLE_0, false, { 0, 0 } );
-    }
+        static_cast<KIFONT::OUTLINE_GLYPH*>( glyph.get() )->Move( aOffset );
 
     m_bounding_box_cache_valid = false;
 }
@@ -477,8 +467,7 @@ EDA_TEXT::GetRenderCache( const KIFONT::FONT* aFont, const wxString& forResolved
 
             attrs.m_Angle = resolvedAngle;
 
-            font->GetLinesAsGlyphs( &m_render_cache, forResolvedText, GetDrawPos() + aOffset,
-                                    attrs );
+            font->GetLinesAsGlyphs( &m_render_cache, GetShownText(), GetDrawPos() + aOffset, attrs );
             m_render_cache_angle = resolvedAngle;
             m_render_cache_text = forResolvedText;
             m_render_cache_offset = aOffset;
@@ -525,7 +514,7 @@ BOX2I EDA_TEXT::GetTextBox( int aLine, bool aInvertY ) const
 
     BOX2I          bbox;
     wxArrayString  strings;
-    wxString       text = GetShownText( true );
+    wxString       text = GetShownText();
     int            thickness = GetEffectiveTextPenWidth();
 
     if( IsMultilineAllowed() )
@@ -663,7 +652,7 @@ void EDA_TEXT::Print( const RENDER_SETTINGS* aSettings, const VECTOR2I& aOffset,
     {
         std::vector<VECTOR2I> positions;
         wxArrayString  strings;
-        wxStringSplit( GetShownText( true ), strings, '\n' );
+        wxStringSplit( GetShownText(), strings, '\n' );
 
         positions.reserve( strings.Count() );
 
@@ -674,8 +663,7 @@ void EDA_TEXT::Print( const RENDER_SETTINGS* aSettings, const VECTOR2I& aOffset,
     }
     else
     {
-        printOneLineOfText( aSettings, aOffset, aColor, aFillMode, GetShownText( true ),
-                            GetDrawPos() );
+        printOneLineOfText( aSettings, aOffset, aColor, aFillMode, GetShownText(), GetDrawPos() );
     }
 }
 
@@ -896,7 +884,7 @@ std::shared_ptr<SHAPE_COMPOUND> EDA_TEXT::GetEffectiveTextShape( bool aTriangula
                     shape->AddShape( triShape );
                 } );
 
-        font->Draw( &callback_gal, GetShownText( true ), GetDrawPos(), attrs );
+        font->Draw( &callback_gal, GetShownText(), GetDrawPos(), attrs );
     }
     else
     {
@@ -913,7 +901,7 @@ std::shared_ptr<SHAPE_COMPOUND> EDA_TEXT::GetEffectiveTextShape( bool aTriangula
                     shape->AddShape( aPoly.Clone() );
                 } );
 
-        font->Draw( &callback_gal, GetShownText( true ), GetDrawPos(), attrs );
+        font->Draw( &callback_gal, GetShownText(), GetDrawPos(), attrs );
     }
 
     return shape;

common/eda_units.cpp

@@ -65,7 +65,7 @@ int EDA_UNIT_UTILS::Mils2mm( double aVal )
 }
 
 
-bool EDA_UNIT_UTILS::FetchUnitsFromString( const wxString& aTextValue, EDA_UNITS& aUnits )
+void EDA_UNIT_UTILS::FetchUnitsFromString( const wxString& aTextValue, EDA_UNITS& aUnits )
 {
     wxString buf( aTextValue.Strip( wxString::both ) );
     unsigned brk_point = 0;
@@ -92,9 +92,6 @@ bool EDA_UNIT_UTILS::FetchUnitsFromString( const wxString& aTextValue, EDA_UNITS
         aUnits = EDA_UNITS::INCHES;
     else if( unit == wxT( "de" ) || unit == wxT( "ra" ) ) // "deg" or "rad"
         aUnits = EDA_UNITS::DEGREES;
-    else
-        return false;
-    return true;
 }
 
 

common/font/font.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KICAD, a free EDA CAD application.
  *
  * Copyright (C) 2021 Ola Rinta-Koski
- * Copyright (C) 2021-2023 Kicad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2021-2022 Kicad Developers, see AUTHORS.txt for contributors.
  *
  * Font abstract base class
  *
@@ -35,7 +35,6 @@
 // The "official" name of the building Kicad stroke font (always existing)
 #include <font/kicad_font_name.h>
 #include "macros.h"
-#include "wx/tokenzr.h"
 
 
 // markup_parser.h includes pegtl.hpp which includes windows.h... which leaks #define DrawText
@@ -121,13 +120,6 @@ void FONT::getLinePositions( const wxString& aText, const VECTOR2I& aPosition,
     VECTOR2I offset( 0, 0 );
     offset.y += aAttrs.m_Size.y;
 
-    if( IsStroke() )
-    {
-        // Fudge factors to match 6.0 positioning
-        offset.x += aAttrs.m_StrokeWidth / 1.52;
-        offset.y -= aAttrs.m_StrokeWidth * 0.052;
-    }
-
     switch(  aAttrs.m_Valign )
     {
     case GR_TEXT_V_ALIGN_TOP:                            break;
@@ -146,7 +138,7 @@ void FONT::getLinePositions( const wxString& aText, const VECTOR2I& aPosition,
         {
         case GR_TEXT_H_ALIGN_LEFT:                                   break;
         case GR_TEXT_H_ALIGN_CENTER: lineOffset.x = -lineSize.x / 2; break;
-        case GR_TEXT_H_ALIGN_RIGHT:  lineOffset.x = -( lineSize.x + offset.x );     break;
+        case GR_TEXT_H_ALIGN_RIGHT:  lineOffset.x = -lineSize.x;     break;
         }
 
         aPositions.push_back( aPosition + lineOffset );
@@ -199,8 +191,6 @@ VECTOR2I drawMarkup( BOX2I* aBoundingBox, std::vector<std::unique_ptr<GLYPH>>* a
                      bool aMirror, const VECTOR2I& aOrigin, TEXT_STYLE_FLAGS aTextStyle )
 {
     VECTOR2I nextPosition = aPosition;
-    bool     drawUnderline = false;
-    bool     drawOverbar = false;
 
     if( aNode )
     {
@@ -209,79 +199,30 @@ VECTOR2I drawMarkup( BOX2I* aBoundingBox, std::vector<std::unique_ptr<GLYPH>>* a
         if( !aNode->is_root() )
         {
             if( aNode->isSubscript() )
-                textStyle |= TEXT_STYLE::SUBSCRIPT;
+                textStyle = TEXT_STYLE::SUBSCRIPT;
             else if( aNode->isSuperscript() )
-                textStyle |= TEXT_STYLE::SUPERSCRIPT;
+                textStyle = TEXT_STYLE::SUPERSCRIPT;
 
             if( aNode->isOverbar() )
-                drawOverbar = true;
+                textStyle |= TEXT_STYLE::OVERBAR;
 
             if( aNode->has_content() )
             {
                 BOX2I bbox;
 
                 nextPosition = aFont->GetTextAsGlyphs( &bbox, aGlyphs, aNode->asWxString(), aSize,
-                                                       nextPosition, aAngle, aMirror, aOrigin,
+                                                       aPosition, aAngle, aMirror, aOrigin,
                                                        textStyle );
 
                 if( aBoundingBox )
                     aBoundingBox->Merge( bbox );
             }
         }
-        else if( aTextStyle & TEXT_STYLE::UNDERLINE )
-        {
-            drawUnderline = true;
-        }
 
         for( const std::unique_ptr<MARKUP::NODE>& child : aNode->children )
         {
             nextPosition = drawMarkup( aBoundingBox, aGlyphs, child, nextPosition, aFont, aSize,
-                    aAngle, aMirror, aOrigin, textStyle );
-
-        }
-    }
-
-    if( drawUnderline )
-    {
-        // Shorten the bar a little so its rounded ends don't make it over-long
-        double barTrim = aSize.x * 0.1;
-        double barOffset = aFont->ComputeUnderlineVerticalPosition( aSize.y );
-
-        VECTOR2D barStart( aPosition.x + barTrim, aPosition.y - barOffset );
-        VECTOR2D barEnd( nextPosition.x - barTrim, nextPosition.y - barOffset );
-
-        if( aGlyphs )
-        {
-            STROKE_GLYPH barGlyph;
-
-            barGlyph.AddPoint( barStart );
-            barGlyph.AddPoint( barEnd );
-            barGlyph.Finalize();
-
-            aGlyphs->push_back( barGlyph.Transform( { 1.0, 1.0 }, { 0, 0 }, false, aAngle, aMirror,
-                                                    aOrigin ) );
-        }
-    }
-
-    if( drawOverbar )
-    {
-        // Shorten the bar a little so its rounded ends don't make it over-long
-        double barTrim = aSize.x * 0.1;
-        double barOffset = aFont->ComputeOverbarVerticalPosition( aSize.y );
-
-        VECTOR2D barStart( aPosition.x + barTrim, aPosition.y - barOffset );
-        VECTOR2D barEnd( nextPosition.x - barTrim, nextPosition.y - barOffset );
-
-        if( aGlyphs )
-        {
-            STROKE_GLYPH barGlyph;
-
-            barGlyph.AddPoint( barStart );
-            barGlyph.AddPoint( barEnd );
-            barGlyph.Finalize();
-
-            aGlyphs->push_back( barGlyph.Transform( { 1.0, 1.0 }, { 0, 0 }, false, aAngle, aMirror,
-                                                    aOrigin ) );
+                                       aAngle, aMirror, aOrigin, textStyle );
         }
     }
 
@@ -312,7 +253,6 @@ void FONT::drawSingleLineText( KIGFX::GAL* aGal, BOX2I* aBoundingBox, const wxSt
 
     TEXT_STYLE_FLAGS textStyle = 0;
 
-
     if( aItalic )
         textStyle |= TEXT_STYLE::ITALIC;
 
@@ -341,8 +281,8 @@ VECTOR2I FONT::StringBoundaryLimits( const wxString& aText, const VECTOR2I& aSiz
     if( aItalic )
         textStyle |= TEXT_STYLE::ITALIC;
 
-    (void) drawMarkup( &boundingBox, nullptr, aText, VECTOR2I(), aSize, ANGLE_0, false, VECTOR2I(),
-            textStyle );
+    (void) drawMarkup( &boundingBox, nullptr, aText, VECTOR2I(), aSize, ANGLE_0, false,
+                       VECTOR2I(), textStyle );
 
     if( IsStroke() )
     {
@@ -368,7 +308,7 @@ VECTOR2I FONT::boundingBoxSingleLine( BOX2I* aBBox, const wxString& aText,
         textStyle |= TEXT_STYLE::ITALIC;
 
     VECTOR2I extents = drawMarkup( aBBox, nullptr, aText, aPosition, aSize, ANGLE_0, false,
-            VECTOR2I(), textStyle );
+                                   VECTOR2I(), textStyle );
 
     return extents;
 }
@@ -436,22 +376,20 @@ void wordbreakMarkup( std::vector<std::pair<wxString, int>>* aWords,
         }
         else
         {
-            wxString              textRun = aNode->asWxString();
-            wxStringTokenizer     tokenizer( textRun, " ", wxTOKEN_RET_DELIMS );
-            std::vector<wxString> words;
+            wxString      textRun = aNode->asWxString();
+            wxArrayString words;
 
-            while( tokenizer.HasMoreTokens() )
-                words.emplace_back( tokenizer.GetNextToken() );
+            wxStringSplit( textRun, words, ' ' );
 
-            for( const wxString& word : words )
+            if( textRun.EndsWith( wxS( " " ) ) )
+                words.Add( wxS( " " ) );
+
+            for( size_t ii = 0; ii < words.size(); ++ii )
             {
-                wxString chars = word;
-                chars.Trim();
-
-                int w = aFont->GetTextAsGlyphs( nullptr, nullptr, chars, aSize, { 0, 0 },
+                int w = aFont->GetTextAsGlyphs( nullptr, nullptr, words[ii], aSize, { 0, 0 },
                                                 ANGLE_0, false, { 0, 0 }, textStyle ).x;
 
-                aWords->emplace_back( std::make_pair( word, w ) );
+                aWords->emplace_back( std::make_pair( words[ii], w ) );
             }
         }
     }
@@ -503,70 +441,35 @@ void FONT::LinebreakText( wxString& aText, int aColumnWidth, const VECTOR2I& aSi
 
     for( size_t ii = 0; ii < textLines.Count(); ++ii )
     {
-        std::vector<std::pair<wxString, int>> markup;
+        bool virginLine = true;
+        int  lineWidth = 0;
         std::vector<std::pair<wxString, int>> words;
 
-        wordbreakMarkup( &markup, textLines[ii], aSize, textStyle );
+        wordbreakMarkup( &words, textLines[ii], aSize, textStyle );
 
-        for( const auto& [ run, runWidth ] : markup )
+        for( size_t jj = 0; jj < words.size(); /* advance in loop */ )
         {
-            if( !words.empty() && !words.back().first.EndsWith( ' ' ) )
+            if( virginLine )
             {
-                words.back().first += run;
-                words.back().second += runWidth;
+                // First word is always placed, even when wider than columnWidth.
+                aText += words[jj].first;
+                lineWidth += words[jj].second;
+                jj++;
+
+                virginLine = false;
+            }
+            else if( lineWidth + spaceWidth + words[jj].second < aColumnWidth - aThickness )
+            {
+                aText += " " + words[jj].first;
+                lineWidth += spaceWidth + words[jj].second;
+                jj++;
             }
             else
-            {
-                words.emplace_back( std::make_pair( run, runWidth ) );
-            }
-        }
-
-        bool     buryMode = false;
-        int      lineWidth = 0;
-        wxString pendingSpaces;
-
-        for( const auto& [ word, wordWidth ] : words )
-        {
-            int  pendingSpaceWidth = (int) pendingSpaces.Length() * spaceWidth;
-            bool overflow = lineWidth + pendingSpaceWidth + wordWidth > aColumnWidth - aThickness;
-
-            if( overflow && pendingSpaces.Length() > 0 )
             {
                 aText += '\n';
+
                 lineWidth = 0;
-                pendingSpaces = wxEmptyString;
-                pendingSpaceWidth = 0;
-                buryMode = true;
-            }
-
-            if( word == wxS( " " ) )
-            {
-                pendingSpaces += word;
-            }
-            else
-            {
-                if( buryMode )
-                {
-                    buryMode = false;
-                }
-                else
-                {
-                    aText += pendingSpaces;
-                    lineWidth += pendingSpaceWidth;
-                }
-
-                if( word.EndsWith( ' ' ) )
-                {
-                    aText += word.Left( word.Length() - 1 );
-                    pendingSpaces = wxS( " " );
-                }
-                else
-                {
-                    aText += word;
-                    pendingSpaces = wxEmptyString;
-                }
-
-                lineWidth += wordWidth;
+                virginLine = true;
             }
         }
 

common/font/fontconfig.cpp

@@ -18,25 +18,23 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <fontconfig/fontconfig.h>
 
+#include <font/fontconfig.h>
 #include <pgm_base.h>
 #include <wx/log.h>
 #include <trace_helpers.h>
-#include <string_utils.h>
-#include <macros.h>
-#include <font/fontconfig.h>
 
 using namespace fontconfig;
 
 static FONTCONFIG* g_config = nullptr;
 
-/**
- * A simple wrapper to avoid exporing fontconfig in the header
- */
-struct fontconfig::FONTCONFIG_PAT
+
+inline static FcChar8* wxStringToFcChar8( const wxString& str )
 {
-    FcPattern* pat;
-};
+    wxScopedCharBuffer const fcBuffer = str.ToUTF8();
+    return (FcChar8*) fcBuffer.data();
+}
 
 
 wxString FONTCONFIG::Version()
@@ -63,112 +61,19 @@ FONTCONFIG* Fontconfig()
 }
 
 
-bool FONTCONFIG::isLanguageMatch( const wxString& aSearchLang, const wxString& aSupportedLang )
-{
-    if( aSearchLang.Lower() == aSupportedLang.Lower() )
-        return true;
-
-    if( aSupportedLang.empty() )
-        return false;
-
-    if( aSearchLang.empty() )
-        return false;
-
-    wxArrayString supportedLangBits;
-    wxStringSplit( aSupportedLang.Lower(), supportedLangBits, wxS( '-' ) );
-
-    wxArrayString searhcLangBits;
-    wxStringSplit( aSearchLang.Lower(), searhcLangBits, wxS( '-' ) );
-
-    // if either side of the comparison have only one section, then its a broad match but fine
-    // i.e. the haystack is declaring broad support or the search language is broad
-    if( searhcLangBits.size() == 1 || supportedLangBits.size() == 1 )
-    {
-        return searhcLangBits[0] == supportedLangBits[0];
-    }
-
-    // the full two part comparison should have passed the initial shortcut
-
-    return false;
-}
-
-
-std::string FONTCONFIG::getFcString( FONTCONFIG_PAT& aPat, const char* aObj, int aIdx )
-{
-    FcChar8*    str;
-    std::string res;
-
-    if( FcPatternGetString( aPat.pat, aObj, aIdx, &str ) == FcResultMatch )
-        res = std::string( reinterpret_cast<char*>( str ) );
-
-    return res;
-}
-
-
-void FONTCONFIG::getAllFamilyStrings( FONTCONFIG_PAT&                               aPat,
-                                      std::unordered_map<std::string, std::string>& aFamStringMap )
-{
-    std::string famLang;
-    std::string fam;
-
-    int langIdx = 0;
-    do
-    {
-        famLang = getFcString( aPat, FC_FAMILYLANG, langIdx );
-
-        if( famLang.empty() && langIdx != 0 )
-            break;
-        else
-        {
-            fam = getFcString( aPat, FC_FAMILY, langIdx );
-            aFamStringMap.insert_or_assign( famLang, fam );
-        }
-    } while( langIdx++ < std::numeric_limits<
-                     int8_t>::max() ); //arbitrary to avoid getting stuck for any reason
-}
-
-
-std::string FONTCONFIG::getFamilyStringByLang( FONTCONFIG_PAT& aPat, const wxString& aDesiredLang )
-{
-    std::unordered_map<std::string, std::string> famStrings;
-    getAllFamilyStrings( aPat, famStrings );
-
-    if( famStrings.empty() )
-        return "";
-
-    for( auto const& [key, val] : famStrings )
-    {
-        if( isLanguageMatch( aDesiredLang, FROM_UTF8( key.c_str() ) ) )
-        {
-            return val;
-        }
-    }
-
-    // fall back to the first and maybe only available name
-    // most fonts by review don't even bother declaring more than one font family name
-    // and they don't even bother declare the language tag either, they just leave it blank
-    return famStrings.begin()->second;
-}
-
-
 FONTCONFIG::FF_RESULT FONTCONFIG::FindFont( const wxString &aFontName, wxString &aFontFile,
-                                            int& aFaceIndex, bool aBold, bool aItalic )
+        bool aBold, bool aItalic )
 {
     FF_RESULT retval = FF_RESULT::FF_ERROR;
     wxString qualifiedFontName = aFontName;
 
-    wxScopedCharBuffer const fcBuffer = qualifiedFontName.ToUTF8();
-
-    FcPattern* pat = FcPatternCreate();
-
     if( aBold )
-        FcPatternAddString( pat, FC_STYLE, (const FcChar8*) "Bold" );
+        qualifiedFontName << wxS( ":Bold" );
 
     if( aItalic )
-        FcPatternAddString( pat, FC_STYLE, (const FcChar8*) "Italic" );
-
-    FcPatternAddString( pat, FC_FAMILY, (FcChar8*) fcBuffer.data() );
+        qualifiedFontName << wxS( ":Italic" );
 
+    FcPattern* pat = FcNameParse( wxStringToFcChar8( qualifiedFontName ) );
     FcConfigSubstitute( nullptr, pat, FcMatchPattern );
     FcDefaultSubstitute( pat );
 
@@ -184,23 +89,14 @@ FONTCONFIG::FF_RESULT FONTCONFIG::FindFont( const wxString &aFontName, wxString
         if( FcPatternGetString( font, FC_FILE, 0, &file ) == FcResultMatch )
         {
             aFontFile = wxString::FromUTF8( (char*) file );
-            aFaceIndex = 0;
-
             wxString styleStr;
             FcChar8* family = nullptr;
             FcChar8* style = nullptr;
 
             retval = FF_RESULT::FF_SUBSTITUTE;
 
-            std::unordered_map<std::string, std::string> famStrings;
-            FONTCONFIG_PAT                               patHolder{ font };
-
-            getAllFamilyStrings( patHolder, famStrings );
-
             if( FcPatternGetString( font, FC_FAMILY, 0, &family ) == FcResultMatch )
             {
-                FcPatternGetInteger( font, FC_INDEX, 0, &aFaceIndex );
-
                 fontName = wxString::FromUTF8( (char*) family );
 
                 if( FcPatternGetString( font, FC_STYLE, 0, &style ) == FcResultMatch )
@@ -233,26 +129,18 @@ FONTCONFIG::FF_RESULT FONTCONFIG::FindFont( const wxString &aFontName, wxString
                     has_ital = true;
                 }
 
-                for( auto const& [key, val] : famStrings )
+                if( fontName.Lower().StartsWith( aFontName.Lower() ) )
                 {
-                    wxString searchFont;
-                    searchFont = wxString::FromUTF8( (char*) val.data() );
-
-                    if( searchFont.Lower().StartsWith( aFontName.Lower() ) )
-                    {
-                        if( ( aBold && !has_bold ) && ( aItalic && !has_ital ) )
-                            retval = FF_RESULT::FF_MISSING_BOLD_ITAL;
-                        else if( aBold && !has_bold )
-                            retval = FF_RESULT::FF_MISSING_BOLD;
-                        else if( aItalic && !has_ital )
-                            retval = FF_RESULT::FF_MISSING_ITAL;
-                        else if( ( aBold != has_bold ) || ( aItalic != has_ital ) )
-                            retval = FF_RESULT::FF_SUBSTITUTE;
-                        else
-                            retval = FF_RESULT::FF_OK;
-
-                        break;
-                    }
+                    if( ( aBold && !has_bold ) && ( aItalic && !has_ital ) )
+                        retval = FF_RESULT::FF_MISSING_BOLD_ITAL;
+                    else if( aBold && !has_bold )
+                        retval = FF_RESULT::FF_MISSING_BOLD;
+                    else if( aItalic && !has_ital )
+                        retval = FF_RESULT::FF_MISSING_ITAL;
+                    else if( ( aBold != has_bold ) || ( aItalic != has_ital ) )
+                        retval = FF_RESULT::FF_SUBSTITUTE;
+                    else
+                        retval = FF_RESULT::FF_OK;
                 }
             }
         }
@@ -270,14 +158,13 @@ FONTCONFIG::FF_RESULT FONTCONFIG::FindFont( const wxString &aFontName, wxString
 }
 
 
-void FONTCONFIG::ListFonts( std::vector<std::string>& aFonts, const std::string& aDesiredLang )
+void FONTCONFIG::ListFonts( std::vector<std::string>& aFonts )
 {
-    // be sure to cache bust if the language changed
-    if( m_fontInfoCache.empty() || m_fontCacheLastLang != aDesiredLang )
+    if( m_fonts.empty() )
     {
         FcPattern*   pat = FcPatternCreate();
-        FcObjectSet* os = FcObjectSetBuild( FC_FAMILY, FC_FAMILYLANG, FC_STYLE, FC_LANG, FC_FILE,
-                                            FC_OUTLINE, nullptr );
+        FcObjectSet* os = FcObjectSetBuild( FC_FAMILY, FC_STYLE, FC_LANG, FC_FILE, FC_OUTLINE,
+                                            nullptr );
         FcFontSet*   fs = FcFontList( nullptr, pat, os );
 
         for( int i = 0; fs && i < fs->nfont; ++i )
@@ -285,10 +172,12 @@ void FONTCONFIG::ListFonts( std::vector<std::string>& aFonts, const std::string&
             FcPattern* font = fs->fonts[i];
             FcChar8*   file;
             FcChar8*   style;
+            FcChar8*   family;
             FcLangSet* langSet;
             FcBool     outline;
 
             if( FcPatternGetString( font, FC_FILE, 0, &file ) == FcResultMatch
+                && FcPatternGetString( font, FC_FAMILY, 0, &family ) == FcResultMatch
                 && FcPatternGetString( font, FC_STYLE, 0, &style ) == FcResultMatch
                 && FcPatternGetLangSet( font, FC_LANG, 0, &langSet ) == FcResultMatch
                 && FcPatternGetBool( font, FC_OUTLINE, 0, &outline ) == FcResultMatch )
@@ -296,9 +185,7 @@ void FONTCONFIG::ListFonts( std::vector<std::string>& aFonts, const std::string&
                 if( !outline )
                     continue;
 
-                FONTCONFIG_PAT patHolder{ font };
-                std::string    theFamily =
-                        getFamilyStringByLang( patHolder, FROM_UTF8( aDesiredLang.c_str() ) );
+                std::string theFamily( reinterpret_cast<char *>( family ) );
 
 #ifdef __WXMAC__
                 // On Mac (at least) some of the font names are in their own language.  If
@@ -351,10 +238,10 @@ void FONTCONFIG::ListFonts( std::vector<std::string>& aFonts, const std::string&
                 if( theFamily.length() > 0 && theFamily.front() == '.' )
                     continue;
 
-                std::map<std::string, FONTINFO>::iterator it = m_fontInfoCache.find( theFamily );
+                std::map<std::string, FONTINFO>::iterator it = m_fonts.find( theFamily );
 
-                if( it == m_fontInfoCache.end() )
-                    m_fontInfoCache.emplace( theFamily, fontInfo );
+                if( it == m_fonts.end() )
+                    m_fonts.emplace( theFamily, fontInfo );
                 else
                     it->second.Children().push_back( fontInfo );
             }
@@ -362,10 +249,8 @@ void FONTCONFIG::ListFonts( std::vector<std::string>& aFonts, const std::string&
 
         if( fs )
             FcFontSetDestroy( fs );
-
-        m_fontCacheLastLang = aDesiredLang;
     }
 
-    for( const std::pair<const std::string, FONTINFO>& entry : m_fontInfoCache )
+    for( const std::pair<const std::string, FONTINFO>& entry : m_fonts )
         aFonts.push_back( entry.second.Family() );
 }

common/font/outline_font.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KICAD, a free EDA CAD application.
  *
  * Copyright (C) 2021 Ola Rinta-Koski <gitlab@rinta-koski.net>
- * Copyright (C) 2021-2023 Kicad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2021-2022 Kicad Developers, see AUTHORS.txt for contributors.
  *
  * Outline font class
  *
@@ -44,7 +44,6 @@ using namespace KIFONT;
 
 
 FT_Library OUTLINE_FONT::m_freeType = nullptr;
-std::mutex OUTLINE_FONT::m_freeTypeMutex;
 
 OUTLINE_FONT::OUTLINE_FONT() :
         m_face(NULL),
@@ -52,8 +51,6 @@ OUTLINE_FONT::OUTLINE_FONT() :
         m_fakeBold( false ),
         m_fakeItal( false )
 {
-    std::lock_guard<std::mutex> guard( m_freeTypeMutex );
-
     if( !m_freeType )
         FT_Init_FreeType( &m_freeType );
 }
@@ -61,8 +58,6 @@ OUTLINE_FONT::OUTLINE_FONT() :
 
 wxString OUTLINE_FONT::FreeTypeVersion()
 {
-    std::lock_guard<std::mutex> guard( m_freeTypeMutex );
-
     if( !m_freeType )
         FT_Init_FreeType( &m_freeType );
 
@@ -95,16 +90,12 @@ wxString OUTLINE_FONT::FontLibraryVersion()
 
 OUTLINE_FONT* OUTLINE_FONT::LoadFont( const wxString& aFontName, bool aBold, bool aItalic )
 {
-    std::unique_ptr<OUTLINE_FONT> font = std::make_unique<OUTLINE_FONT>();
+    OUTLINE_FONT* font = new OUTLINE_FONT();
 
     wxString fontFile;
-    int      faceIndex;
     using fc = fontconfig::FONTCONFIG;
 
-    fc::FF_RESULT retval = Fontconfig()->FindFont( aFontName, fontFile, faceIndex, aBold, aItalic );
-
-    if( retval == fc::FF_RESULT::FF_ERROR )
-        return nullptr;
+    fc::FF_RESULT retval = Fontconfig()->FindFont( aFontName, fontFile, aBold, aItalic );
 
     if( retval == fc::FF_RESULT::FF_MISSING_BOLD || retval == fc::FF_RESULT::FF_MISSING_BOLD_ITAL )
         font->SetFakeBold();
@@ -112,23 +103,21 @@ OUTLINE_FONT* OUTLINE_FONT::LoadFont( const wxString& aFontName, bool aBold, boo
     if( retval == fc::FF_RESULT::FF_MISSING_ITAL || retval == fc::FF_RESULT::FF_MISSING_BOLD_ITAL )
         font->SetFakeItal();
 
-    if( font->loadFace( fontFile, faceIndex ) != 0 )
-        return nullptr;
+    if( retval != fc::FF_RESULT::FF_ERROR )
+        (void) font->loadFace( fontFile );
 
     font->m_fontName = aFontName;       // Keep asked-for name, even if we substituted.
     font->m_fontFileName = fontFile;
 
-    return font.release();
+    return font;
 }
 
 
-FT_Error OUTLINE_FONT::loadFace( const wxString& aFontFileName, int aFaceIndex )
+FT_Error OUTLINE_FONT::loadFace( const wxString& aFontFileName )
 {
-    std::lock_guard<std::mutex> guard( m_freeTypeMutex );
-
     // TODO: check that going from wxString to char* with UTF-8
     // conversion for filename makes sense on any/all platforms
-    FT_Error e = FT_New_Face( m_freeType, aFontFileName.mb_str( wxConvUTF8 ), aFaceIndex, &m_face );
+    FT_Error e = FT_New_Face( m_freeType, aFontFileName.mb_str( wxConvUTF8 ), 0, &m_face );
 
     if( !e )
     {
@@ -313,24 +302,27 @@ VECTOR2I OUTLINE_FONT::GetTextAsGlyphs( BOX2I* aBBox, std::vector<std::unique_pt
 }
 
 
+double OUTLINE_FONT::getOverbarOffset( int ascender, int height, int thickness ) const
+{
+    double thicknessRatio = abs( (double) thickness ) / (double) height;
+    double ascenderRatio = (double) ascender / (double) height;
+
+    if( thicknessRatio < 0.05 )
+        return 0.04;
+    else if( ascenderRatio < 0.78 )
+        return 0.00;
+    else if( ascenderRatio < 0.80 )
+        return -0.03;
+    else
+        return -0.06;
+}
+
+
 VECTOR2I OUTLINE_FONT::getTextAsGlyphs( BOX2I* aBBox, std::vector<std::unique_ptr<GLYPH>>* aGlyphs,
                                         const wxString& aText, const VECTOR2I& aSize,
                                         const VECTOR2I& aPosition, const EDA_ANGLE& aAngle,
                                         bool aMirror, const VECTOR2I& aOrigin,
                                         TEXT_STYLE_FLAGS aTextStyle ) const
-{
-    std::lock_guard<std::mutex> guard( m_freeTypeMutex );
-
-    return getTextAsGlyphsUnlocked( aBBox, aGlyphs, aText, aSize, aPosition, aAngle, aMirror,
-                                    aOrigin, aTextStyle );
-}
-
-VECTOR2I OUTLINE_FONT::getTextAsGlyphsUnlocked( BOX2I* aBBox,
-                                                std::vector<std::unique_ptr<GLYPH>>* aGlyphs,
-                                                const wxString& aText, const VECTOR2I& aSize,
-                                                const VECTOR2I& aPosition, const EDA_ANGLE& aAngle,
-                                                bool aMirror, const VECTOR2I& aOrigin,
-                                                TEXT_STYLE_FLAGS aTextStyle ) const
 {
     VECTOR2D glyphSize = aSize;
     FT_Face  face = m_face;
@@ -374,7 +366,7 @@ VECTOR2I OUTLINE_FONT::getTextAsGlyphsUnlocked( BOX2I* aBBox,
             {
                 FT_Matrix matrix;
                 // Create a 12 degree slant
-                const float angle = (float)( -M_PI * 12.0f ) / 180.0f;
+                const float angle = ( -M_PI * 12 ) / 180.0f;
                 matrix.xx = (FT_Fixed) ( cos( angle ) * 0x10000L );
                 matrix.xy = (FT_Fixed) ( -sin( angle ) * 0x10000L );
                 matrix.yx = (FT_Fixed) ( 0 * 0x10000L );  // Don't rotate in the y direction
@@ -463,9 +455,75 @@ VECTOR2I OUTLINE_FONT::getTextAsGlyphsUnlocked( BOX2I* aBBox,
     }
 
     int      ascender = abs( face->size->metrics.ascender * GLYPH_SIZE_SCALER );
+    int      height = abs( face->size->metrics.height * GLYPH_SIZE_SCALER );
     int      descender = abs( face->size->metrics.descender * GLYPH_SIZE_SCALER );
     VECTOR2I extents( cursor.x * scaleFactor.x, ( ascender + descender ) * abs( scaleFactor.y ) );
 
+    // Font metrics don't include all descenders and diacriticals, so beef them up just a little.
+    extents.y *= 1.05;
+
+    if( IsOverbar( aTextStyle ) )
+    {
+        std::vector<std::unique_ptr<GLYPH>> underscoreGlyphs;
+
+        getTextAsGlyphs( nullptr, &underscoreGlyphs, wxT( "_" ), aSize, { 0, 0 }, ANGLE_0, false,
+                         { 0, 0 }, aTextStyle & ~TEXT_STYLE::OVERBAR );
+
+        OUTLINE_GLYPH* underscoreGlyph = static_cast<OUTLINE_GLYPH*>( underscoreGlyphs[0].get() );
+        BOX2I          underscoreBBox;
+
+        for( const VECTOR2I& pt : underscoreGlyph->Outline( 0 ).CPoints() )
+            underscoreBBox.Merge( pt );
+
+        int barThickness = underscoreBBox.GetHeight();
+
+        // Shorten the bar a little so its rounded ends don't make it over-long
+        double barTrim = barThickness / 2.0;
+        double barOffset = getOverbarOffset( ascender, height, barThickness / scaleFactor.y );
+
+        VECTOR2I topLeft( aPosition );
+        VECTOR2I topRight( aPosition );
+
+        topLeft.y += ascender * scaleFactor.y * ( 1.0 + barOffset );
+        topRight.y = topLeft.y;
+
+        topLeft.x += barTrim;
+        topRight.x += extents.x - barTrim;
+
+        extents.y *= ( 1.0 + barOffset + barOffset );
+        extents.x += barTrim;
+
+        if( IsItalic() )
+        {
+            topLeft.x += aSize.y * ITALIC_TILT;
+            topRight.x += aSize.y * ITALIC_TILT;
+            extents.x += aSize.y * ITALIC_TILT;
+        }
+
+        if( aMirror )
+        {
+            topLeft.x = aOrigin.x - ( topLeft.x - aOrigin.x );
+            topRight.x = aOrigin.x - ( topRight.x - aOrigin.x );
+        }
+
+        if( !aAngle.IsZero() )
+        {
+            RotatePoint( topLeft, aOrigin, aAngle );
+            RotatePoint( topRight, aOrigin, aAngle );
+        }
+
+        if( aGlyphs )
+        {
+            int            maxError = KiROUND( barThickness / 48 );
+            SHAPE_POLY_SET poly;
+
+            TransformOvalToPolygon( poly, topLeft, topRight, barThickness, maxError, ERROR_INSIDE );
+
+            std::unique_ptr<OUTLINE_GLYPH> overbarGlyph = std::make_unique<OUTLINE_GLYPH>( poly );
+            aGlyphs->push_back( std::move( overbarGlyph ) );
+        }
+    }
+
     hb_buffer_destroy( buf );
     hb_font_destroy( referencedFont );
 
@@ -494,9 +552,6 @@ void OUTLINE_FONT::RenderToOpenGLCanvas( KIGFX::OPENGL_GAL& aGal, const wxString
     unsigned int         glyphCount;
     hb_glyph_info_t*     glyphInfo = hb_buffer_get_glyph_infos( buf, &glyphCount );
     hb_glyph_position_t* glyphPos = hb_buffer_get_glyph_positions( buf, &glyphCount );
-
-    std::lock_guard<std::mutex> guard( m_freeTypeMutex );
-
     hb_font_t*           referencedFont = hb_ft_font_create_referenced( m_face );
 
     hb_ft_font_set_funcs( referencedFont );

common/font/stroke_font.cpp

@@ -4,7 +4,7 @@
  * Copyright (C) 2012 Torsten Hueter, torstenhtr <at> gmx.de
  * Copyright (C) 2013 CERN
  * @author Maciej Suminski <maciej.suminski@cern.ch>
- * Copyright (C) 2016-2023 Kicad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2016-2022 Kicad Developers, see AUTHORS.txt for contributors.
  *
  * Stroke font class
  *
@@ -44,7 +44,7 @@ using namespace KIFONT;
 
 
 ///< Factor that determines relative vertical position of the overbar.
-static constexpr double OVERBAR_POSITION_FACTOR = 1.23;
+static constexpr double OVERBAR_POSITION_FACTOR = 1.40;
 
 ///< Factor that determines relative vertical position of the underline.
 static constexpr double UNDERLINE_POSITION_FACTOR = -0.16;
@@ -52,8 +52,7 @@ static constexpr double UNDERLINE_POSITION_FACTOR = -0.16;
 ///< Scale factor for a glyph
 static constexpr double STROKE_FONT_SCALE = 1.0 / 21.0;
 
-///< Offset (in stroke font units) to move the origin to the baseline.
-static constexpr int FONT_OFFSET = -8;
+static constexpr int FONT_OFFSET = -10;
 
 
 bool                                g_defaultFontInitialized = false;
@@ -128,6 +127,7 @@ void STROKE_FONT::loadNewStrokeFont( const char* const aNewStrokeFont[], int aNe
 
             while( aNewStrokeFont[j][i] )
             {
+
                 if( aNewStrokeFont[j][i] == ' ' && aNewStrokeFont[j][i+1] == 'R' )
                     strokes++;
 
@@ -225,17 +225,18 @@ VECTOR2I STROKE_FONT::GetTextAsGlyphs( BOX2I* aBBox, std::vector<std::unique_ptr
                                        bool aMirror, const VECTOR2I& aOrigin,
                                        TEXT_STYLE_FLAGS aTextStyle ) const
 {
-    constexpr int    TAB_WIDTH = 4;
+    constexpr double SPACE_WIDTH = 0.6;
     constexpr double INTER_CHAR = 0.2;
-    constexpr double SUPER_SUB_SIZE_MULTIPLIER = 0.8;
-    constexpr double SUPER_HEIGHT_OFFSET = 0.35;
-    constexpr double SUB_HEIGHT_OFFSET = 0.15;
+    constexpr double TAB_WIDTH = 4 * 0.82;  // Not quite as wide as 5.1/6.0 tab formatting, but
+                                            // a better match for Scintilla, and closer to the
+                                            // nominal SPACE_WIDTH + INTER_CHAR
+    constexpr double SUPER_SUB_SIZE_MULTIPLIER = 0.7;
+    constexpr double SUPER_HEIGHT_OFFSET = 0.5;
+    constexpr double SUB_HEIGHT_OFFSET = 0.3;
 
     VECTOR2I cursor( aPosition );
     VECTOR2D glyphSize( aSize );
     double   tilt = ( aTextStyle & TEXT_STYLE::ITALIC ) ? ITALIC_TILT : 0.0;
-    double   space_width = m_glyphBoundingBoxes->front().GetWidth(); // First char is space
-    int      char_count = 0;
 
     if( aTextStyle & TEXT_STYLE::SUBSCRIPT || aTextStyle & TEXT_STYLE::SUPERSCRIPT )
     {
@@ -249,26 +250,18 @@ VECTOR2I STROKE_FONT::GetTextAsGlyphs( BOX2I* aBBox, std::vector<std::unique_ptr
 
     for( wxUniChar c : aText )
     {
-        // Handle tabs as locked to the next 4th column (in base-widths).
+        // Handle tabs as locked to the nearest 4th column (in space-widths).
         if( c == '\t' )
         {
-            char_count = ( char_count / TAB_WIDTH + 1 ) * TAB_WIDTH - 1;
+            int tabWidth = KiROUND( glyphSize.x * TAB_WIDTH );
+            int currentIntrusion = ( cursor.x - aOrigin.x ) % tabWidth;
 
-            int new_cursor = aPosition.x + aSize.x * char_count
-                    + aSize.x * space_width;
-
-            while( new_cursor <= cursor.x )
-            {
-                char_count += TAB_WIDTH;
-                new_cursor += aSize.x * TAB_WIDTH;
-            }
-
-            cursor.x = new_cursor;
+            cursor.x += tabWidth - currentIntrusion;
         }
         else if( c == ' ' )
         {
             // 'space' character - draw nothing, advance cursor position
-            cursor.x += KiROUND( glyphSize.x * space_width );
+            cursor.x += KiROUND( glyphSize.x * SPACE_WIDTH );
         }
         else
         {
@@ -294,16 +287,69 @@ VECTOR2I STROKE_FONT::GetTextAsGlyphs( BOX2I* aBBox, std::vector<std::unique_ptr
 
             glyphExtents *= glyphSize;
 
+            if( tilt > 0.0 )
+                glyphExtents.x -= glyphExtents.y * tilt;
+
             cursor.x += KiROUND( glyphExtents.x );
         }
+    }
 
-        ++char_count;
+    VECTOR2D barOffset( 0.0, 0.0 );
+
+    // Shorten the bar a little so its rounded ends don't make it over-long
+    double   barTrim = glyphSize.x * 0.1;
+
+    if( aTextStyle & TEXT_STYLE::OVERBAR )
+    {
+        barOffset.y = ComputeOverbarVerticalPosition( glyphSize.y );
+
+        if( aTextStyle & TEXT_STYLE::ITALIC )
+            barOffset.x = barOffset.y * ITALIC_TILT;
+
+        VECTOR2D barStart( aPosition.x + barOffset.x + barTrim, cursor.y - barOffset.y );
+        VECTOR2D barEnd( cursor.x + barOffset.x - barTrim, cursor.y - barOffset.y );
+
+        if( aGlyphs )
+        {
+            STROKE_GLYPH overbarGlyph;
+
+            overbarGlyph.AddPoint( barStart );
+            overbarGlyph.AddPoint( barEnd );
+            overbarGlyph.Finalize();
+
+            aGlyphs->push_back( overbarGlyph.Transform( { 1.0, 1.0 }, { 0, 0 }, false,
+                                                         aAngle, aMirror, aOrigin ) );
+        }
+    }
+
+    if( aTextStyle & TEXT_STYLE::UNDERLINE )
+    {
+        barOffset.y = ComputeUnderlineVerticalPosition( glyphSize.y );
+
+        if( aTextStyle & TEXT_STYLE::ITALIC )
+            barOffset.x = barOffset.y * ITALIC_TILT;
+
+        VECTOR2D barStart( aPosition.x + barOffset.x + barTrim, cursor.y - barOffset.y );
+        VECTOR2D barEnd( cursor.x + barOffset.x - barTrim, cursor.y - barOffset.y );
+
+        if( aGlyphs )
+        {
+            STROKE_GLYPH underlineGlyph;
+
+            underlineGlyph.AddPoint( barStart );
+            underlineGlyph.AddPoint( barEnd );
+            underlineGlyph.Finalize();
+
+            aGlyphs->push_back( underlineGlyph.Transform( { 1.0, 1.0 }, { 0, 0 }, false,
+                                                          aAngle, aMirror, aOrigin ) );
+        }
     }
 
     if( aBBox )
     {
         aBBox->SetOrigin( aPosition );
-        aBBox->SetEnd( cursor.x - KiROUND( glyphSize.x * INTER_CHAR ), cursor.y + glyphSize.y );
+        aBBox->SetEnd( cursor.x + barOffset.x - KiROUND( glyphSize.x * INTER_CHAR ),
+                       cursor.y + std::max( glyphSize.y, barOffset.y * OVERBAR_POSITION_FACTOR ) );
         aBBox->Normalize();
     }
 

common/footprint_filter.cpp

@@ -86,11 +86,12 @@ void FOOTPRINT_FILTER_IT::increment()
                                                    candidate.GetLibNickname(),
                                                    candidate.GetFootprintName(),
                                                    candidate.GetSearchText() );
-            bool exclude = false;
+            int      matches, position;
+            bool     exclude = false;
 
             for( std::unique_ptr<EDA_COMBINED_MATCHER>& matcher : m_filter->m_pattern_filters )
             {
-                if( !matcher->Find( searchStr.Lower() ) )
+                if( !matcher->Find( searchStr.Lower(), matches, position ) )
                 {
                     exclude = true;
                     break;

common/fp_lib_table.cpp

@@ -596,7 +596,6 @@ bool FP_LIB_TABLE::LoadGlobalTable( FP_LIB_TABLE& aTable )
         }
     }
 
-    aTable.Clear();
     aTable.Load( fn.GetFullPath() );
 
     SETTINGS_MANAGER& mgr = Pgm().GetSettingsManager();

common/gal/color4d.cpp

@@ -180,7 +180,7 @@ bool COLOR4D::SetFromHexString( const wxString& aColorString )
     str.Trim( true );
     str.Trim( false );
 
-    if( str.length() < 7 || !str.StartsWith( '#' ) )
+    if( str.length() < 7 || str.GetChar( 0 ) != '#' )
         return false;
 
     unsigned long tmp;

common/gal/dpi_scaling.cpp

@@ -57,6 +57,11 @@ static std::optional<double> getKiCadConfiguredScale( const COMMON_SETTINGS& aCo
         scale = canvas_scale;
     }
 
+    if( scale )
+    {
+        wxLogTrace( traceHiDpi, wxS( "Scale factor (configured): %f" ), *scale );
+    }
+
     return scale;
 }
 
@@ -78,6 +83,11 @@ static std::optional<double> getEnvironmentScale()
         scale = ENV_VAR::GetEnvVar<double>( wxS( "GDK_SCALE" ) );
     }
 
+    if( scale )
+    {
+        wxLogTrace( traceHiDpi, wxS( "Scale factor (environment): %f" ), *scale );
+    }
+
     return scale;
 }
 
@@ -91,18 +101,15 @@ DPI_SCALING::DPI_SCALING( COMMON_SETTINGS* aConfig, const wxWindow* aWindow )
 double DPI_SCALING::GetScaleFactor() const
 {
     std::optional<double> val;
-    wxString              src;
 
     if( m_config )
     {
         val = getKiCadConfiguredScale( *m_config );
-        src = wxS( "config" );
     }
 
     if( !val )
     {
         val = getEnvironmentScale();
-        src = wxS( "env" );
     }
 
     if( !val && m_window )
@@ -110,58 +117,17 @@ double DPI_SCALING::GetScaleFactor() const
         // Use the native WX reporting.
         // On Linux, this will not work until WX 3.2 and GTK >= 3.10
         // Otherwise it returns 1.0
-        val = KIPLATFORM::UI::GetPixelScaleFactor( m_window );
-        src = wxS( "platform" );
+        val = KIPLATFORM::UI::GetSystemScaleFactor( m_window );
+        wxLogTrace( traceHiDpi, wxS( "Scale factor (WX): %f" ), *val );
     }
 
     if( !val )
     {
         // Nothing else we can do, give it a default value
         val = GetDefaultScaleFactor();
-        src = wxS( "default" );
+        wxLogTrace( traceHiDpi, wxS( "Scale factor (default): %f" ), *val );
     }
 
-    wxLogTrace( traceHiDpi, wxS( "Scale factor (%s): %f" ), src, *val );
-
-    return *val;
-}
-
-
-double DPI_SCALING::GetContentScaleFactor() const
-{
-    std::optional<double> val;
-    wxString              src;
-
-    if( m_config )
-    {
-        val = getKiCadConfiguredScale( *m_config );
-        src = wxS( "config" );
-    }
-
-    if( !val )
-    {
-        val = getEnvironmentScale();
-        src = wxS( "env" );
-    }
-
-    if( !val && m_window )
-    {
-        // Use the native WX reporting.
-        // On Linux, this will not work until WX 3.2 and GTK >= 3.10
-        // Otherwise it returns 1.0
-        val = KIPLATFORM::UI::GetContentScaleFactor( m_window );
-        src = wxS( "platform" );
-    }
-
-    if( !val )
-    {
-        // Nothing else we can do, give it a default value
-        val = GetDefaultScaleFactor();
-        src = wxS( "default" );
-    }
-
-    wxLogTrace( traceHiDpi, wxS( "Content scale factor (%s): %f" ), src, *val );
-
     return *val;
 }
 

common/gal/opengl/opengl_gal.cpp

@@ -169,6 +169,14 @@ GLuint GL_BITMAP_CACHE::cacheBitmap( const BITMAP_BASE* aBitmap )
     bmp.w = imgData.GetSize().x;
     bmp.h = imgData.GetSize().y;
 
+    // The bitmap size needs to be a multiple of 4.
+    // This is easiest to achieve by ensuring that each row
+    // has a multiple of 4 pixels
+    int extra_w = bmp.w % 4;
+
+    if( extra_w )
+        extra_w = 4 - extra_w;
+
     GLuint textureID;
 
     if( m_freedTextureIds.empty() )
@@ -181,14 +189,15 @@ GLuint GL_BITMAP_CACHE::cacheBitmap( const BITMAP_BASE* aBitmap )
         m_freedTextureIds.pop_front();
     }
 
-    bmp.size = bmp.w * bmp.h * 4;
+    // make_unique initializes this to 0, so extra pixels are transparent
+    bmp.size = ( bmp.w + extra_w ) * bmp.h * 4;
     auto buf = std::make_unique<uint8_t[]>( bmp.size );
 
     for( int y = 0; y < bmp.h; y++ )
     {
         for( int x = 0; x < bmp.w; x++ )
         {
-            uint8_t* p = buf.get() + ( bmp.w * y + x ) * 4;
+            uint8_t* p = buf.get() + ( ( bmp.w + extra_w ) * y + x ) * 4;
 
             p[0] = imgData.GetRed( x, y );
             p[1] = imgData.GetGreen( x, y );
@@ -205,7 +214,7 @@ GLuint GL_BITMAP_CACHE::cacheBitmap( const BITMAP_BASE* aBitmap )
     }
 
     glBindTexture( GL_TEXTURE_2D, textureID );
-    glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, bmp.w, bmp.h, 0, GL_RGBA, GL_UNSIGNED_BYTE,
+    glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, bmp.w + extra_w, bmp.h, 0, GL_RGBA, GL_UNSIGNED_BYTE,
                   buf.get() );
 
     glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
@@ -1418,23 +1427,21 @@ void OPENGL_GAL::DrawBitmap( const BITMAP_BASE& aBitmap, double alphaBlend )
     glActiveTexture( GL_TEXTURE0 );
     glBindTexture( GL_TEXTURE_2D, texture_id );
 
-    float texStartX = aBitmap.IsMirroredX() ? 1.0 : 0.0;
-    float texEndX   = aBitmap.IsMirroredX() ? 0.0 : 1.0;
-    float texStartY = aBitmap.IsMirroredY() ? 1.0 : 0.0;
-    float texEndY   = aBitmap.IsMirroredY() ? 0.0 : 1.0;
+    float texStartX = aBitmap.IsMirrored() ? 1.0 : 0.0;
+    float texEndX   = aBitmap.IsMirrored() ? 0.0 : 1.0;
 
     glBegin( GL_QUADS );
     glColor4f( 1.0, 1.0, 1.0, alpha );
-    glTexCoord2f( texStartX, texStartY );
+    glTexCoord2f( texStartX, 0.0 );
     glVertex3f( v0.x, v0.y, m_layerDepth );
     glColor4f( 1.0, 1.0, 1.0, alpha );
-    glTexCoord2f( texEndX,  texStartY);
+    glTexCoord2f( texEndX, 0.0 );
     glVertex3f( v1.x, v0.y, m_layerDepth );
     glColor4f( 1.0, 1.0, 1.0, alpha );
-    glTexCoord2f( texEndX, texEndY);
+    glTexCoord2f( texEndX, 1.0 );
     glVertex3f( v1.x, v1.y, m_layerDepth );
     glColor4f( 1.0, 1.0, 1.0, alpha );
-    glTexCoord2f( texStartX, texEndY);
+    glTexCoord2f( texStartX, 1.0 );
     glVertex3f( v0.x, v1.y, m_layerDepth );
     glEnd();
 

common/gr_basic.cpp

@@ -91,11 +91,6 @@ void GRSetColorPen( wxDC* DC, const COLOR4D& Color, int width, wxPenStyle style
     if( s_ForceBlackPen )
         color = COLOR4D::BLACK;
 
-    // wxWidgets will enforce a minimum pen width when printing, so we have to make the pen
-    // transparent when we don't want the object stroked.
-    if( width == 0 )
-        color = COLOR4D::UNSPECIFIED;
-
     const wxPen& curr_pen = DC->GetPen();
 
     if( !curr_pen.IsOk() || curr_pen.GetColour() != color.ToColour()

common/grid_tricks.cpp

@@ -418,20 +418,12 @@ void GRID_TRICKS::onCharHook( wxKeyEvent& ev )
 {
     bool handled = false;
 
-    if( ( ev.GetKeyCode() == WXK_RETURN || ev.GetKeyCode() == WXK_NUMPAD_ENTER )
-        && ev.GetModifiers() == wxMOD_NONE
-        && m_grid->GetGridCursorRow() == m_grid->GetNumberRows() - 1 )
+    if( ev.GetKeyCode() == WXK_RETURN && m_grid->GetGridCursorRow() == m_grid->GetNumberRows() - 1 )
     {
-        if( m_grid->IsCellEditControlShown() )
-        {
-            if( m_grid->CommitPendingChanges() )
-                handled = true;
-        }
-        else
+        if( m_grid->CommitPendingChanges() )
         {
             wxCommandEvent dummy;
             m_addHandler( dummy );
-            handled = true;
         }
     }
     else if( ev.GetModifiers() == wxMOD_CONTROL && ev.GetKeyCode() == 'V' )
@@ -456,14 +448,6 @@ void GRID_TRICKS::onCharHook( wxKeyEvent& ev )
             m_grid->ForceRefresh();
         }
     }
-    else if( ev.GetKeyCode() == WXK_ESCAPE )
-    {
-        if( m_grid->IsCellEditControlShown() )
-        {
-            m_grid->CancelPendingChanges();
-            handled = true;
-        }
-    }
 
     if( !handled )
         ev.Skip( true );

common/kicad_curl/kicad_curl.cpp

@@ -27,21 +27,109 @@
 // conflicts for some defines, at least on Windows
 #include <kicad_curl/kicad_curl.h>
 
+#include <mutex>
 #include <ki_exception.h>   // THROW_IO_ERROR
 
 
+
+// These are even more private than class members, and since there is only
+// one instance of KICAD_CURL ever, these statics are hidden here to simplify the
+// client (API) header file.
+static volatile bool s_initialized;
+
+static std::mutex s_lock;        // for s_initialized
+
+/// At process termination, using atexit() keeps the CURL stuff out of the
+/// singletops and PGM_BASE.
+static void at_terminate()
+{
+    KICAD_CURL::Cleanup();
+}
+
+
 void KICAD_CURL::Init()
 {
-    if( curl_global_init( CURL_GLOBAL_ALL ) != CURLE_OK )
+    // We test s_initialized twice in an effort to avoid
+    // unnecessarily locking s_lock.  This understands that the common case
+    // will not need to lock.
+    if( !s_initialized )
     {
-        THROW_IO_ERROR( "curl_global_init() failed." );
+        std::lock_guard<std::mutex> lock( s_lock );
+
+        if( !s_initialized )
+        {
+            if( curl_global_init( CURL_GLOBAL_ALL ) != CURLE_OK )
+            {
+                THROW_IO_ERROR( "curl_global_init() failed." );
+            }
+
+            s_initialized = true;
+        }
     }
 }
 
 
 void KICAD_CURL::Cleanup()
 {
-    curl_global_cleanup();
+    /*
+
+    Calling lock_guard() from a static destructor will typically be bad, since the
+    s_lock may already have been statically destroyed itself leading to a boost
+    exception. (Remember C++ does not provide certain sequencing of static
+    destructor invocation.)
+
+    To prevent this we test s_initialized twice, which ensures that the lock_guard
+    is only instantiated on the first call, which should be from
+    PGM_BASE::destroy() which is first called earlier than static destruction.
+    Then when called again from the actual PGM_BASE::~PGM_BASE() function,
+    lock_guard will not be instantiated because s_initialized will be false.
+
+    */
+
+    if( s_initialized )
+    {
+        std::lock_guard<std::mutex> lock( s_lock );
+
+        if( s_initialized )
+        {
+            curl_global_cleanup();
+
+            atexit( &at_terminate );
+
+            s_initialized = false;
+        }
+    }
+}
+
+
+std::string KICAD_CURL::GetSimpleVersion()
+{
+    if( !s_initialized )
+        Init();
+
+    curl_version_info_data* info = curl_version_info( CURLVERSION_NOW );
+
+    std::string res;
+
+    if( info->version )
+    {
+        res += "libcurl version: " + std::string( info->version );
+    }
+
+    res += " (";
+
+    if( info->features & CURL_VERSION_SSL )
+    {
+        res += "with SSL - ";
+        res += std::string( info->ssl_version );
+    }
+    else
+    {
+        res += "without SSL";
+    }
+    res += ")";
+
+    return res;
 }
 
 

common/kicad_curl/kicad_curl_easy.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2015 Mark Roszko <mark.roszko@gmail.com>
- * Copyright (C) 2015-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2015-2021 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
@@ -100,18 +100,23 @@ static int xferinfo( void* aProgress, curl_off_t aDLtotal, curl_off_t aDLnow, cu
     return CURLE_OK;
 }
 
-#if LIBCURL_VERSION_NUM < 0x072000 // 7.32.0
+
 static int progressinfo( void* aProgress, double aDLtotal, double aDLnow, double aULtotal, double aULnow )
 {
     return xferinfo( aProgress, static_cast<curl_off_t>( aDLtotal ), static_cast<curl_off_t>( aDLnow ),
                      static_cast<curl_off_t>( aULtotal ), static_cast<curl_off_t>( aULnow ) );
 }
-#endif
 
 
 KICAD_CURL_EASY::KICAD_CURL_EASY() :
         m_headers( nullptr )
 {
+    // Call KICAD_CURL::Init() from in here every time, but only the first time
+    // will incur any overhead.  This strategy ensures that libcurl is never loaded
+    // unless it is needed.
+
+    KICAD_CURL::Init();
+
     m_CURL = curl_easy_init();
 
     if( !m_CURL )
@@ -121,11 +126,7 @@ KICAD_CURL_EASY::KICAD_CURL_EASY() :
     curl_easy_setopt( m_CURL, CURLOPT_WRITEDATA, static_cast<void*>( &m_buffer ) );
 
     // Only allow HTTP and HTTPS protocols
-#if LIBCURL_VERSION_NUM >= 0x075500     // version 7.85.0
-    curl_easy_setopt(m_CURL, CURLOPT_PROTOCOLS_STR, "http,https");
-#else
     curl_easy_setopt( m_CURL, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS );
-#endif
 
     #ifdef _WIN32
     // We need this to use the Windows Certificate store
@@ -263,7 +264,7 @@ bool KICAD_CURL_EASY::SetTransferCallback( const TRANSFER_CALLBACK& aCallback, s
 {
     progress = std::make_unique<CURL_PROGRESS>( this, aCallback,
                                                 static_cast<curl_off_t>( aInterval ) );
-#if LIBCURL_VERSION_NUM >= 0x072000 // 7.32.0
+#ifdef CURLOPT_XFERINFOFUNCTION
     setOption( CURLOPT_XFERINFOFUNCTION, xferinfo );
     setOption( CURLOPT_XFERINFODATA, progress.get() );
 #else
@@ -285,7 +286,7 @@ bool KICAD_CURL_EASY::SetOutputStream( const std::ostream* aOutput )
 
 int KICAD_CURL_EASY::GetTransferTotal( uint64_t& aDownloadedBytes ) const
 {
-#if LIBCURL_VERSION_NUM >= 0x073700 // 7.55.0
+#ifdef CURLINFO_SIZE_DOWNLOAD_T
     curl_off_t dl;
     int        result = curl_easy_getinfo( m_CURL, CURLINFO_SIZE_DOWNLOAD_T, &dl );
     aDownloadedBytes  = static_cast<uint64_t>( dl );

common/kiway.cpp

@@ -431,17 +431,15 @@ KIWAY_PLAYER* KIWAY::Player( FRAME_T aFrameType, bool doCreate, wxTopLevelWindow
         }
         catch( const IO_ERROR& ioe )
         {
-            wxLogError( ioe.What() );
-            wxLogError( _( "Error loading editor." ) );
+            DisplayErrorMessage( nullptr, _( "Error loading editor." ), ioe.What() );
         }
-        catch( const std::exception& e )
+        catch( const std::exception& e)
         {
-            wxLogError( e.what() );
-            wxLogError( _( "Error loading editor." ) );
+            DisplayErrorMessage( nullptr, _( "Error loading editor." ), e.what() );
         }
         catch( ... )
         {
-            wxLogError( _( "Error loading editor." ) );
+            DisplayErrorMessage( nullptr, _( "Error loading editor." ) );
         }
     }
 

common/lib_table_base.cpp

@@ -193,8 +193,6 @@ LIB_TABLE_ROW* LIB_TABLE::findRow( const wxString& aNickName, bool aCheckIfEnabl
     {
         cur->ensureIndex();
 
-        std::shared_lock<std::shared_mutex> lock( cur->m_nickIndexMutex );
-
         for( const std::pair<const wxString, int>& entry : cur->m_nickIndex )
         {
             if( entry.first == aNickName )
@@ -305,7 +303,7 @@ bool LIB_TABLE::InsertRow( LIB_TABLE_ROW* aRow, bool doReplace )
 {
     ensureIndex();
 
-    std::lock_guard<std::shared_mutex> lock( m_nickIndexMutex );
+    std::lock_guard<std::mutex> lock( m_nickIndexMutex );
 
     INDEX_CITER it = m_nickIndex.find( aRow->GetNickName() );
 

common/lib_table_grid_tricks.cpp

@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2017-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2017-2022 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
@@ -24,16 +24,12 @@ LIB_TABLE_GRID_TRICKS::LIB_TABLE_GRID_TRICKS( WX_GRID* aGrid ) : GRID_TRICKS( aG
 {
 }
 
-
 void LIB_TABLE_GRID_TRICKS::showPopupMenu( wxMenu& menu )
 {
     bool            showActivate = false;
     bool            showDeactivate = false;
     LIB_TABLE_GRID* tbl = static_cast<LIB_TABLE_GRID*>( m_grid->GetTable() );
 
-    // Ensure selection parameters are up to date
-    getSelectedArea();
-
     for( int row = m_sel_row_start; row < m_sel_row_start + m_sel_row_count; ++row )
     {
         if( tbl->GetValueAsBool( row, 0 ) )
@@ -53,14 +49,10 @@ void LIB_TABLE_GRID_TRICKS::showPopupMenu( wxMenu& menu )
         menu.Append( LIB_TABLE_GRID_TRICKS_ACTIVATE_SELECTED, _( "Activate selected" ) );
     if( showDeactivate )
         menu.Append( LIB_TABLE_GRID_TRICKS_DEACTIVATE_SELECTED, _( "Deactivate selected" ) );
-
-    if( showActivate || showDeactivate )
-        menu.AppendSeparator();
-
+    menu.AppendSeparator();
     GRID_TRICKS::showPopupMenu( menu );
 }
 
-
 void LIB_TABLE_GRID_TRICKS::doPopupSelection( wxCommandEvent& event )
 {
     int menu_id = event.GetId();
@@ -69,13 +61,10 @@ void LIB_TABLE_GRID_TRICKS::doPopupSelection( wxCommandEvent& event )
     {
         LIB_TABLE_GRID* tbl = (LIB_TABLE_GRID*) m_grid->GetTable();
 
-        bool selected_state = menu_id == LIB_TABLE_GRID_TRICKS_ACTIVATE_SELECTED;
-
         for( int row = m_sel_row_start; row < m_sel_row_start + m_sel_row_count; ++row )
-            tbl->SetValueAsBool( row, 0, selected_state );
-
-        // Ensure the new state (on/off) of the widgets is immediately shown:
-        m_grid->Refresh();
+        {
+            tbl->SetValueAsBool( row, 0, menu_id == LIB_TABLE_GRID_TRICKS_ACTIVATE_SELECTED );
+        }
     }
     else
     {

common/lib_tree_model.cpp

@@ -3,7 +3,7 @@
  *lib_tree_model
  * Copyright (C) 2017 Chris Pavlina <pavlina.chris@gmail.com>
  * Copyright (C) 2014 Henner Zeller <h.zeller@acm.org>
- * Copyright (C) 2014-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2014-2019 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
@@ -24,12 +24,14 @@
 #include <algorithm>
 #include <eda_pattern_match.h>
 #include <lib_tree_item.h>
+#include <utility>
 #include <pgm_base.h>
 #include <string_utils.h>
 
-// Each node gets this lowest score initially, without any matches applied.  Matches will then
-// increase this score.  This way, an empty search string will result in all components being
-// displayed as they have the minimum score. However, in that case, we avoid expanding all the
+// Each node gets this lowest score initially, without any matches applied.
+// Matches will then increase this score depending on match quality.  This way,
+// an empty search string will result in all components being displayed as they
+// have the minimum score. However, in that case, we avoid expanding all the
 // nodes asd the result is very unspecific.
 static const unsigned kLowestDefaultScore = 1;
 

common/lib_tree_model_adapter.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2017 Chris Pavlina <pavlina.chris@gmail.com>
  * Copyright (C) 2014 Henner Zeller <h.zeller@acm.org>
- * Copyright (C) 2014-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2014-2022 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
@@ -213,11 +213,17 @@ void LIB_TREE_MODEL_ADAPTER::UpdateSearchString( const wxString& aSearch, bool a
         Thaw();
     }
 
-    const LIB_TREE_NODE* firstMatch = ShowResults();
+    LIB_TREE_NODE* bestMatch = ShowResults();
 
-    if( firstMatch )
+    if( !bestMatch )
+        bestMatch = ShowPreselect();
+
+    if( !bestMatch )
+        bestMatch = ShowSingleLibrary();
+
+    if( bestMatch )
     {
-        wxDataViewItem item = ToItem( firstMatch );
+        wxDataViewItem item = wxDataViewItem( bestMatch );
         m_widget->Select( item );
 
         // Make sure the *parent* item is visible. The selected item is the
@@ -263,7 +269,7 @@ void LIB_TREE_MODEL_ADAPTER::recreateColumns()
     for( const wxString& colName : m_shownColumns )
     {
         if( !m_colNameMap.count( colName ) )
-            doAddColumn( colName, colName == wxT( "Description" ) );
+            doAddColumn( colName, false );
     }
 }
 
@@ -613,85 +619,93 @@ bool LIB_TREE_MODEL_ADAPTER::GetAttr( const wxDataViewItem&   aItem,
 }
 
 
-void recursiveDescent( LIB_TREE_NODE& aNode, const std::function<bool( const LIB_TREE_NODE* )>& f )
+void LIB_TREE_MODEL_ADAPTER::Find( LIB_TREE_NODE& aNode,
+                                            std::function<bool( const LIB_TREE_NODE* )> aFunc,
+                                            LIB_TREE_NODE** aHighScore )
 {
     for( std::unique_ptr<LIB_TREE_NODE>& node: aNode.m_Children )
     {
-        if( !f( node.get() ) )
-            break;
+        if( aFunc( &*node ) )
+        {
+            if( !(*aHighScore) || node->m_Score > (*aHighScore)->m_Score )
+                (*aHighScore) = &*node;
+        }
 
-        recursiveDescent( *node, f );
+        Find( *node, aFunc, aHighScore );
     }
 }
 
 
-const LIB_TREE_NODE* LIB_TREE_MODEL_ADAPTER::ShowResults()
+LIB_TREE_NODE* LIB_TREE_MODEL_ADAPTER::ShowResults()
 {
-    const LIB_TREE_NODE* firstMatch = nullptr;
+    LIB_TREE_NODE* highScore = nullptr;
 
-    // Expand parents of leaf nodes with some level of matching
-    recursiveDescent( m_tree,
-            [&]( const LIB_TREE_NODE* n )
-            {
-                if( n->m_Type == LIB_TREE_NODE::TYPE::LIBID && n->m_Score > 1 )
-                {
-                    if( !firstMatch )
-                        firstMatch = n;
-                    else if( n->m_Score > firstMatch->m_Score )
-                        firstMatch = n;
+    Find( m_tree,
+                   []( LIB_TREE_NODE const* n )
+                   {
+                       // return leaf nodes with some level of matching
+                       return n->m_Type == LIB_TREE_NODE::TYPE::LIBID && n->m_Score > 1;
+                   },
+                   &highScore );
 
-                    m_widget->ExpandAncestors( ToItem( n ) );
-                }
-
-                return true;    // keep going to expand ancestors of all found items
-            } );
-
-    // If no matches, find and show the preselect node
-    if( !firstMatch && m_preselect_lib_id.IsValid() )
+    if( highScore)
     {
-        recursiveDescent( m_tree,
-                [&]( const LIB_TREE_NODE* n )
-                {
-                    if( n->m_Type == LIB_TREE_NODE::LIBID
-                              && ( n->m_Children.empty() || !m_preselect_unit )
-                              && m_preselect_lib_id == n->m_LibId )
-                    {
-                        firstMatch = n;
-                        m_widget->ExpandAncestors( ToItem( n ) );
-                        return false;
-                    }
-                    else if( n->m_Type == LIB_TREE_NODE::UNIT
-                              && ( m_preselect_unit && m_preselect_unit == n->m_Unit )
-                              && m_preselect_lib_id == n->m_Parent->m_LibId )
-                    {
-                        firstMatch = n;
-                        m_widget->ExpandAncestors( ToItem( n ) );
-                        return false;
-                    }
-
-                    return true;
-                } );
+        wxDataViewItem item = wxDataViewItem( highScore );
+        m_widget->ExpandAncestors( item );
     }
 
-    // If still no matches expand a single library if there is only one
-    if( !firstMatch )
-    {
-        recursiveDescent( m_tree,
-                [&]( const LIB_TREE_NODE* n )
-                {
-                    if( n->m_Type == LIB_TREE_NODE::TYPE::LIBID
-                            && n->m_Parent->m_Parent->m_Children.size() == 1 )
-                    {
-                        firstMatch = n;
-                        m_widget->ExpandAncestors( ToItem( n ) );
-                        return false;
-                    }
-
-                    return true;
-                } );
-    }
-
-    return firstMatch;
+    return highScore;
 }
 
 
+LIB_TREE_NODE* LIB_TREE_MODEL_ADAPTER::ShowPreselect()
+{
+    LIB_TREE_NODE* highScore = nullptr;
+
+    if( !m_preselect_lib_id.IsValid() )
+        return highScore;
+
+    Find( m_tree,
+            [&]( LIB_TREE_NODE const* n )
+            {
+                if( n->m_Type == LIB_TREE_NODE::LIBID && ( n->m_Children.empty() ||
+                                                           !m_preselect_unit ) )
+                    return m_preselect_lib_id == n->m_LibId;
+                else if( n->m_Type == LIB_TREE_NODE::UNIT && m_preselect_unit )
+                    return m_preselect_lib_id == n->m_Parent->m_LibId &&
+                            m_preselect_unit == n->m_Unit;
+                else
+                    return false;
+            },
+            &highScore );
+
+    if( highScore)
+    {
+        wxDataViewItem item = wxDataViewItem( highScore );
+        m_widget->ExpandAncestors( item );
+    }
+
+    return highScore;
+}
+
+
+LIB_TREE_NODE* LIB_TREE_MODEL_ADAPTER::ShowSingleLibrary()
+{
+    LIB_TREE_NODE* highScore = nullptr;
+
+    Find( m_tree,
+                   []( LIB_TREE_NODE const* n )
+                   {
+                       return n->m_Type == LIB_TREE_NODE::TYPE::LIBID &&
+                              n->m_Parent->m_Parent->m_Children.size() == 1;
+                   },
+                   &highScore );
+
+    if( highScore)
+    {
+        wxDataViewItem item = wxDataViewItem( highScore );
+        m_widget->ExpandAncestors( item );
+    }
+
+    return highScore;
+}

common/libeval_compiler/libeval_compiler.cpp

@@ -2,7 +2,7 @@
  * This file is part of libeval, a simple math expression evaluator
  *
  * Copyright (C) 2017 Michael Geselbracht, mgeselbracht3@gmail.com
- * Copyright (C) 2019-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2019-2022 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
@@ -356,11 +356,10 @@ void COMPILER::newString( const wxString& aString )
     m_parseFinished = false;
 }
 
-
 T_TOKEN COMPILER::getToken()
 {
     T_TOKEN rv;
-    rv.value = defaultTokenValue;
+    rv.value.str = nullptr;
 
     bool    done = false;
 

common/pgm_base.cpp

@@ -43,7 +43,6 @@
 #include <wx/tooltip.h>
 
 #include <advanced_config.h>
-#include <cli/cli_names.h> // Needed for the pre wx 3.2 cli workaround
 #include <common.h>
 #include <config_params.h>
 #include <confirm.h>
@@ -52,7 +51,6 @@
 #include <eda_draw_frame.h>
 #include <gestfich.h>
 #include <id.h>
-#include <kicad_curl/kicad_curl.h>
 #include <kiplatform/policy.h>
 #include <lockfile.h>
 #include <menus_helpers.h>
@@ -112,7 +110,7 @@ LANGUAGE_DESCR LanguagesList[] =
     { wxLANGUAGE_SWEDISH,    ID_LANGUAGE_SWEDISH,    wxT( "Svenska" ),  true },
 //    { wxLANGUAGE_VIETNAMESE, ID_LANGUAGE_VIETNAMESE, wxT( "Tiếng Việt" ), true },
 //    { wxLANGUAGE_TURKISH,    ID_LANGUAGE_TURKISH,    wxT( "Türkçe" ),   true },
-    { wxLANGUAGE_UKRAINIAN,  ID_LANGUAGE_UKRANIAN,   wxT( "Українська" ),   true },
+    { wxLANGUAGE_UKRAINIAN,  ID_LANGUAGE_UKRANIAN,   wxT( "Українець" ),   true },
     { wxLANGUAGE_CHINESE_SIMPLIFIED, ID_LANGUAGE_CHINESE_SIMPLIFIED,
             wxT( "简体中文" ), true },
     { wxLANGUAGE_CHINESE_TRADITIONAL, ID_LANGUAGE_CHINESE_TRADITIONAL,
@@ -152,8 +150,6 @@ PGM_BASE::~PGM_BASE()
 
 void PGM_BASE::Destroy()
 {
-    KICAD_CURL::Cleanup();
-
 #ifdef KICAD_USE_SENTRY
     sentry_close();
 #endif
@@ -412,8 +408,6 @@ bool PGM_BASE::InitPgm( bool aHeadless, bool aSkipPyInit, bool aIsUnitTest )
     // In particular, the user cache path is the most likely to be hit by startup code
     PATHS::EnsureUserPathsExist();
 
-    KICAD_CURL::Init();
-
 #ifdef KICAD_USE_SENTRY
     sentryInit();
 #endif
@@ -781,26 +775,6 @@ void PGM_BASE::SetLanguageIdentifier( int menu_id )
 }
 
 
-wxString PGM_BASE::GetLanguageTag()
-{
-    const wxLanguageInfo* langInfo = wxLocale::GetLanguageInfo( m_language_id );
-
-    if( !langInfo )
-        return "";
-    else
-    {
-#if wxCHECK_VERSION( 3, 1, 6 )
-        wxString str = langInfo->GetCanonicalWithRegion();
-#else
-        wxString str = langInfo->CanonicalName;
-#endif
-        str.Replace( "_", "-" );
-
-        return str;
-    }
-}
-
-
 void PGM_BASE::SetLanguagePath()
 {
     wxLocale::AddCatalogLookupPathPrefix( PATHS::GetLocaleDataPath() );
@@ -863,21 +837,3 @@ ENV_VAR_MAP& PGM_BASE::GetLocalEnvVariables() const
 {
     return GetCommonSettings()->m_Env.vars;
 }
-
-
-bool PGM_BASE::IsGUI()
-{
-    if( !wxTheApp )
-        return false;
-
-#if wxCHECK_VERSION( 3, 1, 6 )
-    return wxTheApp->IsGUI();
-#else
-    // wxWidgets older than version 3.1.6 do not have a way to know if the app
-    // has a GUI or is a console application.
-    // So the trick is to set the App class name when starting kicad-cli, and when
-    // the app class name is the kicad-cli class name the app is a console app
-    bool run_gui = wxTheApp->GetClassName() != KICAD_CLI_APP_NAME;
-    return run_gui;
-#endif
-}

common/plotters/DXF_plotter.cpp

@@ -861,186 +861,145 @@ void DXF_PLOTTER::Text( const VECTOR2I&             aPos,
     }
     else
     {
-        TEXT_ATTRIBUTES attrs;
-        attrs.m_Halign = aH_justify;
-        attrs.m_Valign =aV_justify;
-        attrs.m_StrokeWidth = aWidth;
-        attrs.m_Angle = aOrient;
-        attrs.m_Italic = aItalic;
-        attrs.m_Bold = aBold;
-        attrs.m_Mirrored = aSize.x < 0;
-        attrs.m_Multiline = false;
-        plotOneLineOfText( aPos, aColor, aText, attrs );
-    }
-}
+        /* Emit text as a text entity. This loses formatting and shape but it's
+           more useful as a CAD object */
+        VECTOR2D origin_dev = userToDeviceCoordinates( aPos );
+        SetColor( aColor );
+        wxString cname = getDXFColorName( m_currentColor );
+        VECTOR2D size_dev = userToDeviceSize( aSize );
+        int h_code = 0, v_code = 0;
 
-
-void DXF_PLOTTER::PlotText( const VECTOR2I& aPos, const COLOR4D& aColor,
-                    const wxString& aText,
-                    const TEXT_ATTRIBUTES& aAttributes,
-                    KIFONT::FONT* aFont,
-                    void* aData )
-{
-    TEXT_ATTRIBUTES attrs = aAttributes;
-    // Fix me: see how to use DXF text mode for multiline texts
-    if( attrs.m_Multiline && !aText.Contains( wxT( "\n" ) ) )
-        attrs.m_Multiline = false;  // the text has only one line.
-
-    bool processSuperSub = aText.Contains( wxT( "^{" ) ) || aText.Contains( wxT( "_{" ) );
-
-    if( m_textAsLines || containsNonAsciiChars( aText ) || attrs.m_Multiline || processSuperSub )
-    {
-        // output text as graphics.
-        // Perhaps multiline texts could be handled as DXF text entity
-        // but I do not want spend time about that (JPC)
-        PLOTTER::PlotText( aPos, aColor, aText, aAttributes, aFont, aData );
-    }
-    else
-       plotOneLineOfText( aPos, aColor, aText, attrs );
-}
-
-void DXF_PLOTTER::plotOneLineOfText( const VECTOR2I& aPos, const COLOR4D& aColor,
-                                    const wxString& aText,
-                                    const TEXT_ATTRIBUTES& aAttributes )
-{
-    /* Emit text as a text entity. This loses formatting and shape but it's
-       more useful as a CAD object */
-    VECTOR2D origin_dev = userToDeviceCoordinates( aPos );
-    SetColor( aColor );
-    wxString cname = getDXFColorName( m_currentColor );
-    VECTOR2D size_dev = userToDeviceSize( aAttributes.m_Size );
-    int h_code = 0, v_code = 0;
-
-    switch( aAttributes.m_Halign )
-    {
-    case GR_TEXT_H_ALIGN_LEFT:   h_code = 0; break;
-    case GR_TEXT_H_ALIGN_CENTER: h_code = 1; break;
-    case GR_TEXT_H_ALIGN_RIGHT:  h_code = 2; break;
-    }
-
-    switch( aAttributes.m_Valign )
-    {
-    case GR_TEXT_V_ALIGN_TOP:    v_code = 3; break;
-    case GR_TEXT_V_ALIGN_CENTER: v_code = 2; break;
-    case GR_TEXT_V_ALIGN_BOTTOM: v_code = 1; break;
-    }
-
-    // Position, size, rotation and alignment
-    // The two alignment point usages is somewhat idiot (see the DXF ref)
-    // Anyway since we don't use the fit/aligned options, they're the same
-    fprintf( m_outputFile,
-             "  0\n"
-             "TEXT\n"
-             "  7\n"
-             "%s\n"          // Text style
-             "  8\n"
-             "%s\n"          // Layer name
-             "  10\n"
-             "%g\n"          // First point X
-             "  11\n"
-             "%g\n"          // Second point X
-             "  20\n"
-             "%g\n"          // First point Y
-             "  21\n"
-             "%g\n"          // Second point Y
-             "  40\n"
-             "%g\n"          // Text height
-             "  41\n"
-             "%g\n"          // Width factor
-             "  50\n"
-             "%g\n"          // Rotation
-             "  51\n"
-             "%g\n"          // Oblique angle
-             "  71\n"
-             "%d\n"          // Mirror flags
-             "  72\n"
-             "%d\n"          // H alignment
-             "  73\n"
-             "%d\n",         // V alignment
-             aAttributes.m_Bold ?
-                (aAttributes.m_Italic ? "KICADBI" : "KICADB")
-                : (aAttributes.m_Italic ? "KICADI" : "KICAD"), TO_UTF8( cname ),
-             origin_dev.x, origin_dev.x,
-             origin_dev.y, origin_dev.y,
-             size_dev.y, fabs( size_dev.x / size_dev.y ),
-             aAttributes.m_Angle.AsDegrees(),
-             aAttributes.m_Italic ? DXF_OBLIQUE_ANGLE : 0,
-             aAttributes.m_Mirrored ? 2 : 0, // X mirror flag
-             h_code, v_code );
-
-    /* There are two issue in emitting the text:
-       - Our overline character (~) must be converted to the appropriate
-       control sequence %%O or %%o
-       - Text encoding in DXF is more or less unspecified since depends on
-       the DXF declared version, the acad version reading it *and* some
-       system variables to be put in the header handled only by newer acads
-       Also before R15 unicode simply is not supported (you need to use
-       bigfonts which are a massive PITA). Common denominator solution:
-       use Latin1 (and however someone could choke on it, anyway). Sorry
-       for the extended latin people. If somewant want to try fixing this
-       recent version seems to use UTF-8 (and not UCS2 like the rest of
-       Windows)
-
-       XXX Actually there is a *third* issue: older DXF formats are limited
-       to 255 bytes records (it was later raised to 2048); since I'm lazy
-       and text so long is not probable I just don't implement this rule.
-       If someone is interested in fixing this, you have to emit the first
-       partial lines with group code 3 (max 250 bytes each) and then finish
-       with a group code 1 (less than 250 bytes). The DXF refs explains it
-       in no more details...
-     */
-
-    int braceNesting = 0;
-    int overbarDepth = -1;
-
-    fputs( "  1\n", m_outputFile );
-
-    for( unsigned int i = 0; i < aText.length(); i++ )
-    {
-        /* Here I do a bad thing: writing the output one byte at a time!
-           but today I'm lazy and I have no idea on how to coerce a Unicode
-           wxString to spit out latin1 encoded text ...
-
-           At least stdio is *supposed* to do output buffering, so there is
-           hope is not too slow */
-        wchar_t ch = aText[i];
-
-        if( ch > 255 )
+        switch( aH_justify )
         {
-            // I can't encode this...
-            putc( '?', m_outputFile );
+        case GR_TEXT_H_ALIGN_LEFT:   h_code = 0; break;
+        case GR_TEXT_H_ALIGN_CENTER: h_code = 1; break;
+        case GR_TEXT_H_ALIGN_RIGHT:  h_code = 2; break;
         }
-        else
+
+        switch( aV_justify )
         {
-            if( aText[i] == '~' && i+1 < aText.length() && aText[i+1] == '{' )
-            {
-                fputs( "%%o", m_outputFile );
-                overbarDepth = braceNesting;
+        case GR_TEXT_V_ALIGN_TOP:    v_code = 3; break;
+        case GR_TEXT_V_ALIGN_CENTER: v_code = 2; break;
+        case GR_TEXT_V_ALIGN_BOTTOM: v_code = 1; break;
+        }
 
-                // Skip the '{'
-                i++;
-                continue;
-            }
-            else if( aText[i] == '{' )
-            {
-                braceNesting++;
-            }
-            else if( aText[i] == '}' )
-            {
-                if( braceNesting > 0 )
-                    braceNesting--;
+        // Position, size, rotation and alignment
+        // The two alignment point usages is somewhat idiot (see the DXF ref)
+        // Anyway since we don't use the fit/aligned options, they're the same
+        fprintf( m_outputFile,
+                 "  0\n"
+                 "TEXT\n"
+                 "  7\n"
+                 "%s\n"          // Text style
+                 "  8\n"
+                 "%s\n"          // Layer name
+                 "  10\n"
+                 "%g\n"          // First point X
+                 "  11\n"
+                 "%g\n"          // Second point X
+                 "  20\n"
+                 "%g\n"          // First point Y
+                 "  21\n"
+                 "%g\n"          // Second point Y
+                 "  40\n"
+                 "%g\n"          // Text height
+                 "  41\n"
+                 "%g\n"          // Width factor
+                 "  50\n"
+                 "%g\n"          // Rotation
+                 "  51\n"
+                 "%g\n"          // Oblique angle
+                 "  71\n"
+                 "%d\n"          // Mirror flags
+                 "  72\n"
+                 "%d\n"          // H alignment
+                 "  73\n"
+                 "%d\n",         // V alignment
+                 aBold ? (aItalic ? "KICADBI" : "KICADB") : (aItalic ? "KICADI" : "KICAD"),
+                 TO_UTF8( cname ),
+                 origin_dev.x, origin_dev.x,
+                 origin_dev.y, origin_dev.y,
+                 size_dev.y, fabs( size_dev.x / size_dev.y ),
+                 aOrient.AsDegrees(),
+                 aItalic ? DXF_OBLIQUE_ANGLE : 0,
+                 size_dev.x < 0 ? 2 : 0, // X mirror flag
+                 h_code, v_code );
 
-                if( braceNesting == overbarDepth )
+        /* There are two issue in emitting the text:
+           - Our overline character (~) must be converted to the appropriate
+           control sequence %%O or %%o
+           - Text encoding in DXF is more or less unspecified since depends on
+           the DXF declared version, the acad version reading it *and* some
+           system variables to be put in the header handled only by newer acads
+           Also before R15 unicode simply is not supported (you need to use
+           bigfonts which are a massive PITA). Common denominator solution:
+           use Latin1 (and however someone could choke on it, anyway). Sorry
+           for the extended latin people. If somewant want to try fixing this
+           recent version seems to use UTF-8 (and not UCS2 like the rest of
+           Windows)
+
+           XXX Actually there is a *third* issue: older DXF formats are limited
+           to 255 bytes records (it was later raised to 2048); since I'm lazy
+           and text so long is not probable I just don't implement this rule.
+           If someone is interested in fixing this, you have to emit the first
+           partial lines with group code 3 (max 250 bytes each) and then finish
+           with a group code 1 (less than 250 bytes). The DXF refs explains it
+           in no more details...
+         */
+
+        int braceNesting = 0;
+        int overbarDepth = -1;
+
+        fputs( "  1\n", m_outputFile );
+
+        for( unsigned int i = 0; i < aText.length(); i++ )
+        {
+            /* Here I do a bad thing: writing the output one byte at a time!
+               but today I'm lazy and I have no idea on how to coerce a Unicode
+               wxString to spit out latin1 encoded text ...
+
+               At least stdio is *supposed* to do output buffering, so there is
+               hope is not too slow */
+            wchar_t ch = aText[i];
+
+            if( ch > 255 )
+            {
+                // I can't encode this...
+                putc( '?', m_outputFile );
+            }
+            else
+            {
+                if( aText[i] == '~' && i+1 < aText.length() && aText[i+1] == '{' )
                 {
-                    fputs( "%%O", m_outputFile );
-                    overbarDepth = -1;
+                    fputs( "%%o", m_outputFile );
+                    overbarDepth = braceNesting;
+
+                    // Skip the '{'
+                    i++;
                     continue;
                 }
+                else if( aText[i] == '{' )
+                {
+                    braceNesting++;
+                }
+                else if( aText[i] == '}' )
+                {
+                    if( braceNesting > 0 )
+                        braceNesting--;
+
+                    if( braceNesting == overbarDepth )
+                    {
+                        fputs( "%%O", m_outputFile );
+                        overbarDepth = -1;
+                        continue;
+                    }
+                }
+
+                putc( ch, m_outputFile );
             }
-
-            putc( ch, m_outputFile );
         }
-    }
 
-    putc( '\n', m_outputFile );
+        putc( '\n', m_outputFile );
+    }
 }
+

common/plotters/GERBER_plotter.cpp

@@ -154,6 +154,7 @@ void GERBER_PLOTTER::SetGerberCoordinatesFormat( int aResolution, bool aUseInche
 
 void GERBER_PLOTTER::emitDcode( const VECTOR2D& pt, int dcode )
 {
+
     fprintf( m_outputFile, "X%dY%dD%02d*\n", KiROUND( pt.x ), KiROUND( pt.y ), dcode );
 }
 
@@ -848,16 +849,11 @@ void GERBER_PLOTTER::plotArc( const SHAPE_ARC& aArc, bool aPlotInRegion )
         LineTo( start );
 
     VECTOR2D devEnd = userToDeviceCoordinates( end );
-
-    // devRelCenter is the position on arc center relative to the arc start, in Gerber coord.
-    // Warning: it is **not** userToDeviceCoordinates( center -  start ) when the plotter
-    // has an offset.
-    VECTOR2D devRelCenter = userToDeviceCoordinates( center ) - userToDeviceCoordinates( start );
+    VECTOR2D devCenter = userToDeviceCoordinates( center - start );
 
     // We need to know if the arc is CW or CCW in device coordinates, so build this arc.
     SHAPE_ARC deviceArc( userToDeviceCoordinates( start ),
-                         userToDeviceCoordinates( aArc.GetArcMid() ),
-                         devEnd, 0 );
+                         userToDeviceCoordinates( aArc.GetArcMid() ), devEnd, 0 );
 
     fprintf( m_outputFile, "G75*\n" );        // Multiquadrant (360 degrees) mode
 
@@ -868,7 +864,7 @@ void GERBER_PLOTTER::plotArc( const SHAPE_ARC& aArc, bool aPlotInRegion )
 
     fprintf( m_outputFile, "X%dY%dI%dJ%dD01*\n",
              KiROUND( devEnd.x ), KiROUND( devEnd.y ),
-             KiROUND( devRelCenter.x ), KiROUND( devRelCenter.y ) );
+             KiROUND( devCenter.x ), KiROUND( devCenter.y ) );
 
     fprintf( m_outputFile, "G01*\n" ); // Back to linear interpolate (perhaps useless here).
 }
@@ -889,8 +885,7 @@ void GERBER_PLOTTER::plotArc( const VECTOR2I& aCenter, const EDA_ANGLE& aStartAn
     end.x = aCenter.x + KiROUND( aRadius * aEndAngle.Cos() );
     end.y = aCenter.y - KiROUND( 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 );
+    VECTOR2D devCenter = userToDeviceCoordinates( aCenter ) - userToDeviceCoordinates( start );
 
     fprintf( m_outputFile, "G75*\n" );        // Multiquadrant (360 degrees) mode
 
@@ -901,22 +896,24 @@ void GERBER_PLOTTER::plotArc( const VECTOR2I& aCenter, const EDA_ANGLE& aStartAn
 
     fprintf( m_outputFile, "X%dY%dI%dJ%dD01*\n",
              KiROUND( devEnd.x ), KiROUND( devEnd.y ),
-             KiROUND( devRelCenter.x ), KiROUND( devRelCenter.y ) );
+             KiROUND( devCenter.x ), KiROUND( devCenter.y ) );
 
     fprintf( m_outputFile, "G01*\n" ); // Back to linear interpolate (perhaps useless here).
 }
 
 
-void GERBER_PLOTTER::PlotGerberRegion( const SHAPE_LINE_CHAIN& aPoly, GBR_METADATA* aGbrMetadata )
+void GERBER_PLOTTER::PlotGerberRegion( const SHAPE_LINE_CHAIN& aPoly, void* aData )
 {
     if( aPoly.PointCount() <= 2 )
         return;
 
+    GBR_METADATA* gbr_metadata = static_cast<GBR_METADATA*>( aData );
+
     bool clearTA_AperFunction = false;     // true if a TA.AperFunction is used
 
-    if( aGbrMetadata )
+    if( gbr_metadata )
     {
-        std::string attrib = aGbrMetadata->m_ApertureMetadata.FormatAttribute( !m_useX2format );
+        std::string attrib = gbr_metadata->m_ApertureMetadata.FormatAttribute( !m_useX2format );
 
         if( !attrib.empty() )
         {
@@ -925,7 +922,7 @@ void GERBER_PLOTTER::PlotGerberRegion( const SHAPE_LINE_CHAIN& aPoly, GBR_METADA
         }
     }
 
-    PlotPoly( aPoly, FILL_T::FILLED_SHAPE, 0 , aGbrMetadata );
+    PlotPoly( aPoly, FILL_T::FILLED_SHAPE, 0 , gbr_metadata );
 
     // Clear the TA attribute, to avoid the next item to inherit it:
     if( clearTA_AperFunction )
@@ -942,17 +939,18 @@ void GERBER_PLOTTER::PlotGerberRegion( const SHAPE_LINE_CHAIN& aPoly, GBR_METADA
 }
 
 
-void GERBER_PLOTTER::PlotGerberRegion( const std::vector<VECTOR2I>& aCornerList,
-                                       GBR_METADATA* aGbrMetadata )
+void GERBER_PLOTTER::PlotGerberRegion( const std::vector<VECTOR2I>& aCornerList, void* aData )
 {
     if( aCornerList.size() <= 2 )
         return;
 
+    GBR_METADATA* gbr_metadata = static_cast<GBR_METADATA*>( aData );
+
     bool clearTA_AperFunction = false;     // true if a TA.AperFunction is used
 
-    if( aGbrMetadata )
+    if( gbr_metadata )
     {
-        std::string attrib = aGbrMetadata->m_ApertureMetadata.FormatAttribute( !m_useX2format );
+        std::string attrib = gbr_metadata->m_ApertureMetadata.FormatAttribute( !m_useX2format );
 
         if( !attrib.empty() )
         {
@@ -961,7 +959,7 @@ void GERBER_PLOTTER::PlotGerberRegion( const std::vector<VECTOR2I>& aCornerList,
         }
     }
 
-    PlotPoly( aCornerList, FILL_T::FILLED_SHAPE, 0, aGbrMetadata );
+    PlotPoly( aCornerList, FILL_T::FILLED_SHAPE, 0, gbr_metadata );
 
     // Clear the TA attribute, to avoid the next item to inherit it:
     if( clearTA_AperFunction )
@@ -978,19 +976,6 @@ void GERBER_PLOTTER::PlotGerberRegion( const std::vector<VECTOR2I>& aCornerList,
 }
 
 
-void GERBER_PLOTTER::PlotPolyAsRegion( const SHAPE_LINE_CHAIN& aPoly, FILL_T aFill,
-                                       int aWidth, GBR_METADATA* aGbrMetadata )
-{
-    // plot a filled polygon using Gerber region, therefore adding X2 attributes
-    // to the solid polygon
-    if( aWidth )
-        PlotPoly( aPoly, FILL_T::NO_FILL, aWidth, aGbrMetadata );
-
-    if( aFill != FILL_T::NO_FILL )
-        PlotGerberRegion( aPoly, aGbrMetadata );
-}
-
-
 void GERBER_PLOTTER::PlotPoly( const SHAPE_LINE_CHAIN& aPoly, FILL_T aFill, int aWidth,
                                void* aData )
 {
@@ -1026,7 +1011,7 @@ void GERBER_PLOTTER::PlotPoly( const SHAPE_LINE_CHAIN& aPoly, FILL_T aFill, int
             {
                 const SHAPE_ARC& arc = aPoly.Arc( arcindex );
 
-                plotArc( arc, true );
+                plotArc( arc, ii > 0 );
 
                 // skip points on arcs, since we plot the arc itself
                 while( ii+1 < aPoly.PointCount() && arcindex == aPoly.ArcIndex( ii+1 ) )
@@ -1060,7 +1045,7 @@ void GERBER_PLOTTER::PlotPoly( const SHAPE_LINE_CHAIN& aPoly, FILL_T aFill, int
             {
                 const SHAPE_ARC& arc = aPoly.Arc( arcindex );
 
-                plotArc( arc, true );
+                plotArc( arc, ii > 0 );
 
                 // skip points on arcs, since we plot the arc itself
                 while( ii+1 < aPoly.PointCount() && arcindex == aPoly.ArcIndex( ii+1 ) )
@@ -1337,7 +1322,7 @@ void GERBER_PLOTTER::FlashPadOval( const VECTOR2I& aPos, const VECTOR2I& aSize,
         if( orient.IsCardinal90() )
             std::swap( size.x, size.y );
 
-        VECTOR2D pos_device = userToDeviceCoordinates( aPos );
+        VECTOR2I pos_device = userToDeviceCoordinates( aPos );
         int      aperture_attrib = gbr_metadata ? gbr_metadata->GetApertureAttrib() : 0;
         selectAperture( size, 0, ANGLE_0, APERTURE::AT_OVAL, aperture_attrib );
 
@@ -1368,7 +1353,7 @@ void GERBER_PLOTTER::FlashPadOval( const VECTOR2I& aPos, const VECTOR2I& aSize,
                         orient -= ANGLE_180;
                 }
 
-                VECTOR2D pos_device = userToDeviceCoordinates( aPos );
+                VECTOR2I pos_device = userToDeviceCoordinates( aPos );
                 int      aperture_attrib = gbr_metadata ? gbr_metadata->GetApertureAttrib() : 0;
                 selectAperture( size, 0, orient, APERTURE::AM_ROTATED_OVAL, aperture_attrib );
 
@@ -1431,7 +1416,7 @@ void GERBER_PLOTTER::FlashPadRect( const VECTOR2I& pos, const VECTOR2I& aSize,
         }
         else
         {
-            VECTOR2D pos_device = userToDeviceCoordinates( pos );
+            VECTOR2I pos_device = userToDeviceCoordinates( pos );
             int      aperture_attrib = gbr_metadata ? gbr_metadata->GetApertureAttrib() : 0;
             selectAperture( size, 0, ANGLE_0, APERTURE::AT_RECT, aperture_attrib );
 
@@ -1448,7 +1433,7 @@ void GERBER_PLOTTER::FlashPadRect( const VECTOR2I& pos, const VECTOR2I& aSize,
         {
             m_hasApertureRotRect = true;
 
-            VECTOR2D pos_device = userToDeviceCoordinates( pos );
+            VECTOR2I pos_device = userToDeviceCoordinates( pos );
             int      aperture_attrib = gbr_metadata ? gbr_metadata->GetApertureAttrib() : 0;
             selectAperture( size, 0, aOrient, APERTURE::AM_ROT_RECT, aperture_attrib );
 
@@ -1770,7 +1755,7 @@ void GERBER_PLOTTER::FlashPadChamferRoundRect( const VECTOR2I& aShapePos, const
     if( aData )
         gbr_metadata = *static_cast<GBR_METADATA*>( aData );
 
-    VECTOR2D              pos_device = userToDeviceCoordinates( aShapePos );
+    VECTOR2I              pos_device = userToDeviceCoordinates( aShapePos );
     SHAPE_POLY_SET        outline;
     std::vector<VECTOR2I> cornerList;
 
@@ -2009,20 +1994,6 @@ void GERBER_PLOTTER::Text( const VECTOR2I&             aPos,
 }
 
 
-void GERBER_PLOTTER::PlotText( const VECTOR2I& aPos, const COLOR4D& aColor,
-                    const wxString& aText,
-                    const TEXT_ATTRIBUTES& aAttributes,
-                    KIFONT::FONT* aFont,
-                    void* aData )
-{
-    GBR_METADATA* gbr_metadata = static_cast<GBR_METADATA*>( aData );
-
-    if( gbr_metadata )
-        formatNetAttribute( &gbr_metadata->m_NetlistMetadata );
-
-    PLOTTER::PlotText( aPos, aColor, aText, aAttributes, aFont, aData );
-}
-
 void GERBER_PLOTTER::SetLayerPolarity( bool aPositive )
 {
     if( aPositive )

common/plotters/PDF_plotter.cpp

@@ -513,11 +513,10 @@ void PDF_PLOTTER::PlotImage( const wxImage& aImage, const VECTOR2I& aPos, double
 
                 if( alpha < 0xFF )
                 {
-                    float d = alpha / 255.0;
-                    float a = 1.0 - d;
-                    r = std::min( KiROUND( r * d + ( a * 0xFF ) ), 0xFF );
-                    g = std::min( KiROUND( g * d + ( a * 0xFF ) ), 0xFF );
-                    b = std::min( KiROUND( b * d + ( a * 0xFF ) ), 0xFF );
+                    float a = 1.0 - ( (float) alpha / 255.0 );
+                    r = ( int )( r + ( a * 0xFF ) ) & 0xFF;
+                    g = ( int )( g + ( a * 0xFF ) ) & 0xFF;
+                    b = ( int )( b + ( a * 0xFF ) ) & 0xFF;
                 }
             }
 
@@ -1377,9 +1376,7 @@ void PDF_PLOTTER::Text( const VECTOR2I&             aPos,
     double ctm_a, ctm_b, ctm_c, ctm_d, ctm_e, ctm_f;
     double wideningFactor, heightFactor;
 
-    VECTOR2I t_size( std::abs( aSize.x ), std::abs( aSize.y ) );
-
-    computeTextParameters( aPos, aText, aOrient, t_size, m_plotMirror, aH_justify,
+    computeTextParameters( aPos, aText, aOrient, aSize, m_plotMirror, aH_justify,
                            aV_justify, aWidth, aItalic, aBold, &wideningFactor, &ctm_a,
                            &ctm_b, &ctm_c, &ctm_d, &ctm_e, &ctm_f, &heightFactor );
 
@@ -1392,7 +1389,7 @@ void PDF_PLOTTER::Text( const VECTOR2I&             aPos,
     if( !aFont )
         aFont = KIFONT::FONT::GetFont();
 
-    VECTOR2I full_box( aFont->StringBoundaryLimits( aText, t_size, aWidth, aBold, aItalic ) );
+    VECTOR2I full_box( aFont->StringBoundaryLimits( aText, aSize, aWidth, aBold, aItalic ) );
     VECTOR2I box_x( full_box.x, 0 );
     VECTOR2I box_y( 0, full_box.y );
 
@@ -1413,13 +1410,13 @@ void PDF_PLOTTER::Text( const VECTOR2I&             aPos,
     {
         wxString word = str_tok.GetNextToken();
 
-        computeTextParameters( pos, word, aOrient, t_size, m_plotMirror, GR_TEXT_H_ALIGN_LEFT,
+        computeTextParameters( pos, word, aOrient, aSize, m_plotMirror, GR_TEXT_H_ALIGN_LEFT,
                                GR_TEXT_V_ALIGN_BOTTOM, aWidth, aItalic, aBold, &wideningFactor, &ctm_a,
                                &ctm_b, &ctm_c, &ctm_d, &ctm_e, &ctm_f, &heightFactor );
 
         // Extract the changed width and rotate by the orientation to get the offset for the
         // next word
-        VECTOR2I bbox( aFont->StringBoundaryLimits( word, t_size, aWidth, aBold, aItalic ).x, 0 );
+        VECTOR2I bbox( aFont->StringBoundaryLimits( word, aSize, aWidth, aBold, aItalic ).x, 0 );
         RotatePoint( bbox, aOrient );
         pos += bbox;
 
@@ -1447,30 +1444,6 @@ void PDF_PLOTTER::Text( const VECTOR2I&             aPos,
 }
 
 
-void PDF_PLOTTER::PlotText( const VECTOR2I& aPos, const COLOR4D& aColor,
-                    const wxString& aText,
-                    const TEXT_ATTRIBUTES& aAttributes,
-                    KIFONT::FONT* aFont,
-                    void* aData )
-{
-    VECTOR2I size = aAttributes.m_Size;
-
-    // PDF files do not like 0 sized texts which create broken files.
-    if( size.x == 0 || size.y == 0 )
-        return;
-
-    if( aAttributes.m_Mirrored )
-        size.x = -size.x;
-
-    PDF_PLOTTER::Text( aPos, aColor, aText, aAttributes.m_Angle, size,
-                       aAttributes.m_Halign, aAttributes.m_Valign,
-                       aAttributes.m_StrokeWidth,
-                       aAttributes.m_Italic, aAttributes.m_Bold,
-                       aAttributes.m_Multiline,
-                       aFont, aData );
-}
-
-
 void PDF_PLOTTER::HyperlinkBox( const BOX2I& aBox, const wxString& aDestinationURL )
 {
     m_hyperlinksInPage.push_back( std::make_pair( aBox, aDestinationURL ) );

common/plotters/PS_plotter.cpp

@@ -967,28 +967,6 @@ void PS_PLOTTER::Text( const VECTOR2I&             aPos,
 }
 
 
-void PS_PLOTTER::PlotText( const VECTOR2I&          aPos,
-                           const COLOR4D&           aColor,
-                           const wxString&          aText,
-                           const TEXT_ATTRIBUTES&   aAttributes,
-                           KIFONT::FONT*            aFont,
-                           void*                    aData )
-{
-    SetCurrentLineWidth( aAttributes.m_StrokeWidth );
-    SetColor( aColor );
-
-    // Draw the hidden postscript text (if requested)
-    if( m_textMode == PLOT_TEXT_MODE::PHANTOM )
-    {
-        std::string ps_test = encodeStringForPlotter( aText );
-        VECTOR2D pos_dev = userToDeviceCoordinates( aPos );
-        fprintf( m_outputFile, "%s %g %g phantomshow\n", ps_test.c_str(), pos_dev.x, pos_dev.y );
-    }
-
-    PLOTTER::PlotText( aPos, aColor, aText, aAttributes, aFont, aData );
-}
-
-
 /**
  * Character widths for Helvetica
  */

common/plotters/SVG_plotter.cpp

@@ -633,13 +633,7 @@ void SVG_PLOTTER::PlotImage( const wxImage& aImage, const VECTOR2I& aPos, double
     {
         wxMemoryOutputStream img_stream;
 
-        if( m_colorMode )
-            aImage.SaveFile( img_stream, wxBITMAP_TYPE_PNG );
-        else    // Plot in B&W
-        {
-            wxImage image = aImage.ConvertToGreyscale();
-            image.SaveFile( img_stream, wxBITMAP_TYPE_PNG );
-        }
+        aImage.SaveFile( img_stream, wxBITMAP_TYPE_PNG );
         size_t input_len = img_stream.GetOutputStreamBuffer()->GetBufferSize();
         std::vector<uint8_t> buffer( input_len );
         std::vector<uint8_t> encoded;
@@ -853,23 +847,3 @@ void SVG_PLOTTER::Text( const VECTOR2I&             aPos,
 
     fputs( "</g>", m_outputFile );
 }
-
-
-void SVG_PLOTTER::PlotText( const VECTOR2I& aPos, const COLOR4D& aColor,
-                    const wxString& aText,
-                    const TEXT_ATTRIBUTES& aAttributes,
-                    KIFONT::FONT* aFont,
-                    void* aData )
-{
-    VECTOR2I size = aAttributes.m_Size;
-
-    if( aAttributes.m_Mirrored )
-        size.x = -size.x;
-
-    SVG_PLOTTER::Text( aPos, aColor, aText, aAttributes.m_Angle, size,
-                       aAttributes.m_Halign, aAttributes.m_Valign,
-                       aAttributes.m_StrokeWidth,
-                       aAttributes.m_Italic, aAttributes.m_Bold,
-                       aAttributes.m_Multiline,
-                       aFont, aData );
-}

common/plotters/common_plot_functions.cpp

@@ -139,10 +139,10 @@ void PlotDrawingSheet( PLOTTER* plotter, const PROJECT* aProject, const TITLE_BL
 
             int penWidth = std::max( text->GetEffectiveTextPenWidth(), defaultPenWidth );
 
-            plotter->Text( text->GetTextPos(), color, text->GetShownText( true ),
-                           text->GetTextAngle(), text->GetTextSize(), text->GetHorizJustify(),
-                           text->GetVertJustify(), penWidth, text->IsItalic(), text->IsBold(),
-                           text->IsMultilineAllowed(), font );
+            plotter->Text( text->GetTextPos(), color, text->GetShownText(), text->GetTextAngle(),
+                           text->GetTextSize(), text->GetHorizJustify(), text->GetVertJustify(),
+                           penWidth, text->IsItalic(), text->IsBold(), text->IsMultilineAllowed(),
+                           font );
         }
             break;
 

common/plotters/plotter.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2017-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2017-2022 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
@@ -694,6 +694,23 @@ void PLOTTER::PlotPoly( const SHAPE_LINE_CHAIN& aCornerList, FILL_T aFill, int a
 }
 
 
+/**
+ * Same as GRText, but plot graphic text instead of draw it.
+ *
+ * @param aPos is the text position (according to aH_justify, aV_justify).
+ * @param aColor is the text color.
+ * @param aText is the text to draw.
+ * @param aOrient is the angle.
+ * @param aSize is the text size (size.x or size.y can be < 0 for mirrored texts).
+ * @param aH_justify is the horizontal justification (Left, center, right).
+ * @param aV_justify is the vertical justification (bottom, center, top).
+ * @param aPenWidth is the line width (if = 0, use plot default line width).
+ * @param aItalic is the true to simulate an italic font.
+ * @param aBold use true to use a bold font Useful only with default width value (aPenWidth = 0).
+ * @param aMultilineAllowed use true to plot text as multiline, otherwise single line.
+ * @param aData is a parameter used by some plotters in SetCurrentLineWidth(),
+ *              not directly used here.
+ */
 void PLOTTER::Text( const VECTOR2I&             aPos,
                     const COLOR4D&              aColor,
                     const wxString&             aText,
@@ -742,55 +759,6 @@ void PLOTTER::Text( const VECTOR2I&             aPos,
     attributes.m_Valign = aV_justify;
     attributes.m_Size = aSize;
 
-    // if Size.x is < 0, the text is mirrored (we have no other param to know a text is mirrored)
-    if( attributes.m_Size.x < 0 )
-    {
-        attributes.m_Size.x = -attributes.m_Size.x;
-        attributes.m_Mirrored = true;
-    }
-
-    if( !aFont )
-        aFont = KIFONT::FONT::GetFont();
-
-    aFont->Draw( &callback_gal, aText, aPos, attributes );
-}
-
-void PLOTTER::PlotText( const VECTOR2I& aPos, const COLOR4D& aColor,
-                    const wxString& aText,
-                    const TEXT_ATTRIBUTES& aAttributes,
-                    KIFONT::FONT* aFont,
-                    void* aData )
-{
-    KIGFX::GAL_DISPLAY_OPTIONS empty_opts;
-
-    TEXT_ATTRIBUTES attributes = aAttributes;
-    int penWidth = attributes.m_StrokeWidth;
-
-    SetColor( aColor );
-    SetCurrentLineWidth( penWidth, aData );
-
-    if( penWidth == 0 && attributes.m_Bold ) // Use default values if aPenWidth == 0
-        penWidth = GetPenSizeForBold( std::min( attributes.m_Size.x, attributes.m_Size.y ) );
-
-    if( penWidth < 0 )
-        penWidth = -penWidth;
-
-    attributes.m_StrokeWidth = penWidth;
-
-    CALLBACK_GAL callback_gal( empty_opts,
-            // Stroke callback
-            [&]( const VECTOR2I& aPt1, const VECTOR2I& aPt2 )
-            {
-                MoveTo( aPt1 );
-                LineTo( aPt2 );
-                PenFinish();
-            },
-            // Polygon callback
-            [&]( const SHAPE_LINE_CHAIN& aPoly )
-            {
-                PlotPoly( aPoly, FILL_T::FILLED_SHAPE, 0, aData );
-            } );
-
     if( !aFont )
         aFont = KIFONT::FONT::GetFont();
 

common/plugins/cadstar/cadstar_archive_parser.cpp

@@ -193,7 +193,7 @@ void CADSTAR_ARCHIVE_PARSER::LINECODE::Parse( XNODE* aNode, PARSER_CONTEXT* aCon
 
     XNODE* cNode = aNode->GetChildren();
 
-    if( !cNode || cNode->GetName() != wxT( "STYLE" ) )
+    if( cNode->GetName() != wxT( "STYLE" ) )
         THROW_UNKNOWN_NODE_IO_ERROR( cNode->GetName(), wxString::Format( "LINECODE -> %s", Name ) );
 
     wxString styleStr = GetXmlAttributeIDString( cNode, 0 );
@@ -486,28 +486,18 @@ void CADSTAR_ARCHIVE_PARSER::VERTEX::AppendToChain( SHAPE_LINE_CHAIN* aChainToAp
         const std::function<VECTOR2I( const VECTOR2I& )> aCadstarToKicadPointCallback,
         double aAccuracy ) const
 {
+    VECTOR2I endPoint = aCadstarToKicadPointCallback( End );
+
     if( Type == VERTEX_TYPE::POINT )
     {
-        aChainToAppendTo->Append( aCadstarToKicadPointCallback( End ) );
+        aChainToAppendTo->Append( endPoint );
         return;
     }
 
     wxCHECK_MSG( aChainToAppendTo->PointCount() > 0, /*void*/,
                  "Can't append an arc to vertex to an empty chain" );
 
-    aChainToAppendTo->Append( BuildArc( aChainToAppendTo->GetPoint( -1 ), aCadstarToKicadPointCallback),
-                              aAccuracy );
-}
-
-
-SHAPE_ARC CADSTAR_ARCHIVE_PARSER::VERTEX::BuildArc( const VECTOR2I& aPrevPoint,
-        const std::function<VECTOR2I( const VECTOR2I& )> aCadstarToKicadPointCallback ) const
-{
-    wxCHECK_MSG( Type != VERTEX_TYPE::POINT, SHAPE_ARC(),
-                 "Can't build an arc for a straight segment!" );
-
-    VECTOR2I startPoint = aPrevPoint;
-    VECTOR2I endPoint = aCadstarToKicadPointCallback( End );
+    VECTOR2I startPoint = aChainToAppendTo->GetPoint( -1 );
     VECTOR2I centerPoint;
 
     if( Type == VERTEX_TYPE::ANTICLOCKWISE_SEMICIRCLE || Type == VERTEX_TYPE::CLOCKWISE_SEMICIRCLE )
@@ -526,8 +516,9 @@ SHAPE_ARC CADSTAR_ARCHIVE_PARSER::VERTEX::BuildArc( const VECTOR2I& aPrevPoint,
         clockwise = !clockwise;
 
     SHAPE_ARC arc;
+    arc.ConstructFromStartEndCenter( startPoint, endPoint, centerPoint, clockwise );
 
-    return arc.ConstructFromStartEndCenter( startPoint, endPoint, centerPoint, clockwise );
+    aChainToAppendTo->Append( arc, aAccuracy );
 }
 
 
@@ -2428,9 +2419,7 @@ XNODE* CADSTAR_ARCHIVE_PARSER::LoadArchiveFile( const wxString& aFileName,
                                                 const wxString& aFileTypeIdentifier, PROGRESS_REPORTER* aProgressReporter )
 {
     KEYWORD   emptyKeywords[1] = {};
-    XNODE*    rootNode = nullptr;
-    XNODE*    cNode = nullptr;
-    XNODE*    iNode = nullptr;
+    XNODE *   iNode = nullptr, *cNode = nullptr;
     int       tok;
     bool      cadstarFileCheckDone = false;
     wxString  str;
@@ -2462,10 +2451,7 @@ XNODE* CADSTAR_ARCHIVE_PARSER::LoadArchiveFile( const wxString& aFileName,
         if( aProgressReporter && ( currentProgress() - previousReportedProgress ) > 0.01 )
         {
             if( !aProgressReporter->KeepRefreshing() )
-            {
-                delete rootNode;
                 THROW_IO_ERROR( _( "File import cancelled by user." ) );
-            }
 
             aProgressReporter->SetCurrentProgress( currentProgress() );
             previousReportedProgress = currentProgress();
@@ -2481,7 +2467,6 @@ XNODE* CADSTAR_ARCHIVE_PARSER::LoadArchiveFile( const wxString& aFileName,
             else
             {
                 //too many closing brackets
-                delete rootNode;
                 THROW_IO_ERROR( _( "The selected file is not valid or might be corrupt!" ) );
             }
         }
@@ -2491,9 +2476,6 @@ XNODE* CADSTAR_ARCHIVE_PARSER::LoadArchiveFile( const wxString& aFileName,
             str   = wxString( lexer.CurText(), *conv );
             cNode = new XNODE( wxXML_ELEMENT_NODE, str );
 
-            if( !rootNode )
-                rootNode = cNode;
-
             if( iNode )
             {
                 //we will add it as attribute as well as child node
@@ -2503,10 +2485,7 @@ XNODE* CADSTAR_ARCHIVE_PARSER::LoadArchiveFile( const wxString& aFileName,
             else if( !cadstarFileCheckDone )
             {
                 if( cNode->GetName() != aFileTypeIdentifier )
-                {
-                    delete rootNode;
                     THROW_IO_ERROR( _( "The selected file is not valid or might be corrupt!" ) );
-                }
 
                 cadstarFileCheckDone = true;
             }
@@ -2522,28 +2501,19 @@ XNODE* CADSTAR_ARCHIVE_PARSER::LoadArchiveFile( const wxString& aFileName,
         else
         {
             //not enough closing brackets
-            delete rootNode;
             THROW_IO_ERROR( _( "The selected file is not valid or might be corrupt!" ) );
         }
     }
 
     // Not enough closing brackets
     if( iNode != nullptr )
-    {
-        delete rootNode;
         THROW_IO_ERROR( _( "The selected file is not valid or might be corrupt!" ) );
-    }
 
     // Throw if no data was parsed
-    if( rootNode )
-    {
-        return rootNode;
-    }
+    if( cNode )
+        return cNode;
     else
-    {
-        delete rootNode;
         THROW_IO_ERROR( _( "The selected file is not valid or might be corrupt!" ) );
-    }
 
     return nullptr;
 }

common/plugins/cadstar/cadstar_archive_parser.h

@@ -83,7 +83,6 @@ class wxXmlAttribute;
 class PROGRESS_REPORTER;
 class SHAPE_LINE_CHAIN;
 class SHAPE_POLY_SET;
-class SHAPE_ARC;
 
 /**
  * @brief Helper functions and common structures for CADSTAR PCB and Schematic archive files.
@@ -93,8 +92,6 @@ class CADSTAR_ARCHIVE_PARSER
 public:
     CADSTAR_ARCHIVE_PARSER() { m_progressReporter = nullptr; }
 
-    virtual ~CADSTAR_ARCHIVE_PARSER() {}
-
 
     typedef wxString LINECODE_ID;
     typedef wxString HATCHCODE_ID;
@@ -454,10 +451,6 @@ public:
         void AppendToChain( SHAPE_LINE_CHAIN* aChainToAppendTo,
                 const std::function<VECTOR2I( const VECTOR2I& )> aCadstarToKicadPointCallback,
                 double aAccuracy ) const;
-
-        SHAPE_ARC BuildArc( const VECTOR2I& aPrevPoint,
-                            const std::function<VECTOR2I( const VECTOR2I& )>
-                                    aCadstarToKicadPointCallback ) const;
     };
 
     /**

common/plugins/eagle/eagle_parser.cpp

@@ -49,7 +49,7 @@ wxString escapeName( const wxString& aNetName )
 
 wxString interpretText( const wxString& aText )
 {
-    wxString token = aText;
+    wxString token = aText.Upper();
 
     if( substituteVariable( &token ) )
         return token;
@@ -116,32 +116,25 @@ wxString interpretText( const wxString& aText )
 
 bool substituteVariable( wxString* aText )
 {
-    if( aText->StartsWith( '>' ) && aText->AfterFirst( ' ' ).IsEmpty() )
-    {
-        wxString token = aText->Upper();
+    if     ( *aText == wxT( ">NAME" ) )             *aText = wxT( "${REFERENCE}" );
+    else if( *aText == wxT( ">VALUE" ) )            *aText = wxT( "${VALUE}" );
+    else if( *aText == wxT( ">PART" ) )             *aText = wxT( "${REFERENCE}" );
+    else if( *aText == wxT( ">GATE" ) )             *aText = wxT( "${UNIT}" );
+    else if( *aText == wxT( ">MODULE" ) )           *aText = wxT( "${FOOTPRINT_NAME}" );
+    else if( *aText == wxT( ">SHEETNR" ) )          *aText = wxT( "${#}" );
+    else if( *aText == wxT( ">SHEETS" ) )           *aText = wxT( "${##}" );
+    else if( *aText == wxT( ">SHEET" ) )            *aText = wxT( "${#}/${##}" );
+    else if( *aText == wxT( ">SHEETNR_TOTAL" ) )    *aText = wxT( "${#}" );
+    else if( *aText == wxT( ">SHEETS_TOTAL" ) )     *aText = wxT( "${##}" );
+    else if( *aText == wxT( ">SHEET_TOTAL" ) )      *aText = wxT( "${#}/${##}" );
+    else if( *aText == wxT( ">SHEET_HEADLINE" ) )   *aText = wxT( "${SHEETNAME}" );
+    else if( *aText == wxT( ">ASSEMBLY_VARIANT" ) ) *aText = wxT( "${ASSEMBLY_VARIANT}" );
+    else if( *aText == wxT( ">DRAWING_NAME" ) )     *aText = wxT( "${PROJECTNAME}" );
+    else if( *aText == wxT( ">LAST_DATE_TIME" ) )   *aText = wxT( "${CURRENT_DATE}" );
+    else if( *aText == wxT( ">PLOT_DATE_TIME" ) )   *aText = wxT( "${CURRENT_DATE}" );
+    else return false;
 
-        if     ( token == wxT( ">NAME" ) )             *aText = wxT( "${REFERENCE}" );
-        else if( token == wxT( ">VALUE" ) )            *aText = wxT( "${VALUE}" );
-        else if( token == wxT( ">PART" ) )             *aText = wxT( "${REFERENCE}" );
-        else if( token == wxT( ">GATE" ) )             *aText = wxT( "${UNIT}" );
-        else if( token == wxT( ">MODULE" ) )           *aText = wxT( "${FOOTPRINT_NAME}" );
-        else if( token == wxT( ">SHEETNR" ) )          *aText = wxT( "${#}" );
-        else if( token == wxT( ">SHEETS" ) )           *aText = wxT( "${##}" );
-        else if( token == wxT( ">SHEET" ) )            *aText = wxT( "${#}/${##}" );
-        else if( token == wxT( ">SHEETNR_TOTAL" ) )    *aText = wxT( "${#}" );
-        else if( token == wxT( ">SHEETS_TOTAL" ) )     *aText = wxT( "${##}" );
-        else if( token == wxT( ">SHEET_TOTAL" ) )      *aText = wxT( "${#}/${##}" );
-        else if( token == wxT( ">SHEET_HEADLINE" ) )   *aText = wxT( "${SHEETNAME}" );
-        else if( token == wxT( ">ASSEMBLY_VARIANT" ) ) *aText = wxT( "${ASSEMBLY_VARIANT}" );
-        else if( token == wxT( ">DRAWING_NAME" ) )     *aText = wxT( "${PROJECTNAME}" );
-        else if( token == wxT( ">LAST_DATE_TIME" ) )   *aText = wxT( "${CURRENT_DATE}" );
-        else if( token == wxT( ">PLOT_DATE_TIME" ) )   *aText = wxT( "${CURRENT_DATE}" );
-        else *aText = wxString::Format( wxS( "${%s}" ), aText->Mid( 1 ).Trim() );
-
-        return true;
-    }
-
-    return false;
+    return true;
 }
 
 

common/plugins/eagle/eagle_parser.h

@@ -47,6 +47,7 @@ struct EPART;
 struct ETEXT;
 
 typedef std::unordered_map<wxString, wxXmlNode*> NODE_MAP;
+typedef std::map<wxString, FOOTPRINT*> FOOTPRINT_MAP;
 typedef std::map<wxString, EINSTANCE*> EINSTANCE_MAP;
 typedef std::map<wxString, std::unique_ptr<EPART>> EPART_MAP;
 

common/project/net_settings.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2020 CERN
- * Copyright (C) 2021-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2021-2022 KiCad Developers, see AUTHORS.txt for contributors.
  * @author Jon Evans <jon@craftyjon.com>
  *
  * This program is free software: you can redistribute it and/or modify it
@@ -393,7 +393,10 @@ std::shared_ptr<NETCLASS> NET_SETTINGS::GetEffectiveNetClass( const wxString& aN
 
     for( const auto& [ matcher, netclassName ] :  m_NetClassPatternAssignments )
     {
-        if( matcher->StartsWith( aNetName ) )
+        int matches;
+        int offset;
+
+        if( matcher->Find( aNetName, matches, offset ) && offset == 0 )
             return getNetclass( netclassName );
     }
 

common/project/project_local_settings.cpp

@@ -210,8 +210,6 @@ PROJECT_LOCAL_SETTINGS::PROJECT_LOCAL_SETTINGS( PROJECT* aProject, const wxStrin
                     return;
                 }
 
-                m_files.clear();
-
                 for( const nlohmann::json& file : aVal )
                 {
                     PROJECT_FILE_STATE fileState;

common/properties/pg_editors.cpp

@@ -73,14 +73,9 @@ wxPGWindowList PG_UNIT_EDITOR::CreateControls( wxPropertyGrid* aPropGrid, wxPGPr
     m_unitBinder->SetUnits( m_frame->GetUserUnits() );
 
     if( PGPROPERTY_DISTANCE* prop = dynamic_cast<PGPROPERTY_DISTANCE*>( aProperty ) )
-    {
         m_unitBinder->SetCoordType( prop->CoordType() );
-    }
     else if( dynamic_cast<PGPROPERTY_ANGLE*>( aProperty ) != nullptr )
-    {
-        m_unitBinder->SetCoordType( ORIGIN_TRANSFORMS::NOT_A_COORD );
         m_unitBinder->SetUnits( EDA_UNITS::DEGREES );
-    }
 
     UpdateControl( aProperty, win );
 

common/properties/property_mgr.cpp

@@ -130,7 +130,7 @@ const void* PROPERTY_MANAGER::TypeCast( const void* aSource, TYPE_ID aBase, TYPE
 }
 
 
-PROPERTY_BASE& PROPERTY_MANAGER::AddProperty( PROPERTY_BASE* aProperty, const wxString& aGroup )
+void PROPERTY_MANAGER::AddProperty( PROPERTY_BASE* aProperty, const wxString& aGroup )
 {
     const wxString& name = aProperty->Name();
     TYPE_ID hash = aProperty->OwnerHash();
@@ -147,16 +147,15 @@ PROPERTY_BASE& PROPERTY_MANAGER::AddProperty( PROPERTY_BASE* aProperty, const wx
     }
 
     m_dirty = true;
-    return *aProperty;
 }
 
 
-PROPERTY_BASE& PROPERTY_MANAGER::ReplaceProperty( size_t aBase, const wxString& aName,
-                                                  PROPERTY_BASE* aNew, const wxString& aGroup )
+void PROPERTY_MANAGER::ReplaceProperty( size_t aBase, const wxString& aName, PROPERTY_BASE* aNew,
+                                        const wxString& aGroup )
 {
     CLASS_DESC& classDesc = getClass( aNew->OwnerHash() );
     classDesc.m_replaced.insert( std::make_pair( aBase, aName ) );
-    return AddProperty( aNew, aGroup );
+    AddProperty( aNew, aGroup );
 }