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: []
@@ -23,10 +23,8 @@ test_formatting:
   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 set-url product https://gitlab.com/kicad/code/kicad.git
-    - git remote add source ${CI_MERGE_REQUEST_SOURCE_PROJECT_URL}.git ||
-      git remote set-url source ${CI_MERGE_REQUEST_SOURCE_PROJECT_URL}.git
+    - 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

.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_cache/3d_plugin_manager.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2015-2016 Cirilo Bernardo <cirilo.bernardo@gmail.com>
- * Copyright (C) 2020-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2020-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
@@ -294,16 +294,6 @@ void S3D_PLUGIN_MANAGER::checkPluginName( const wxString& aPath,
         ++bl;
     }
 
-    // prevent loading non-plugin dlls 
-    if( wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
-    {
-        if( !path.GetName().StartsWith( "s3d_plugin" )
-            && !path.GetName().StartsWith( "libs3d_plugin" ) )
-        {
-            return;
-        }
-    }
-
     aPluginList.push_back( wxpath );
 
     wxLogTrace( MASK_3D_PLUGINMGR, wxT( " * [INFO] found 3D plugin '%s'\n" ), wxpath.GetData() );

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
@@ -657,6 +647,11 @@ void BOARD_ADAPTER::InitSettings( REPORTER* aStatusReporter, REPORTER* aWarningR
 }
 
 
+extern bool BuildFootprintPolygonOutlines( BOARD* aBoard, SHAPE_POLY_SET& aOutlines,
+                                           int aErrorMax, int aChainingEpsilon,
+                                           OUTLINE_ERROR_HANDLER* aErrorHandler = nullptr );
+
+
 bool BOARD_ADAPTER::createBoardPolygon( wxString* aErrorMsg )
 {
     m_board_poly.RemoveAllContours();
@@ -676,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,13 +342,14 @@ 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 );
 
     void addText( const EDA_TEXT* aText, CONTAINER_2D_BASE* aDstContainer,
-                  const BOARD_ITEM* aItem );
+                  const BOARD_ITEM* aOwner );
 
     void addShape( const PCB_SHAPE* aShape, CONTAINER_2D_BASE* aContainer,
                    const BOARD_ITEM* aOwner );

3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp

@@ -64,7 +64,7 @@
 
 
 void BOARD_ADAPTER::addText( const EDA_TEXT* aText, CONTAINER_2D_BASE* aContainer,
-                             const BOARD_ITEM* aItem )
+                             const BOARD_ITEM* aOwner )
 {
     KIGFX::GAL_DISPLAY_OPTIONS empty_opts;
     TEXT_ATTRIBUTES            attrs = aText->GetAttributes();
@@ -74,25 +74,34 @@ void BOARD_ADAPTER::addText( const EDA_TEXT* aText, CONTAINER_2D_BASE* aContaine
     if( !font )
         font = KIFONT::FONT::GetFont( wxEmptyString, aText->IsBold(), aText->IsItalic() );
 
-    if( aItem && aItem->IsKnockout() )
+    if( aOwner && aOwner->IsKnockout() )
     {
-        int            maxError = m_board->GetDesignSettings().m_MaxError;
+        SHAPE_POLY_SET knockouts;
+
+        CALLBACK_GAL callback_gal( empty_opts,
+                // Polygon callback
+                [&]( const SHAPE_LINE_CHAIN& aPoly )
+                {
+                    knockouts.AddOutline( aPoly );
+                } );
+
+        attrs.m_StrokeWidth = aText->GetEffectiveTextPenWidth();
+        attrs.m_Angle = aText->GetDrawRotation();
+
+        callback_gal.SetIsFill( font->IsOutline() );
+        callback_gal.SetIsStroke( font->IsStroke() );
+        callback_gal.SetLineWidth( attrs.m_StrokeWidth );
+        font->Draw( &callback_gal, aText->GetShownText(), aText->GetDrawPos(), attrs );
+
         SHAPE_POLY_SET finalPoly;
+        int            margin = attrs.m_StrokeWidth * 1.5 +
+                                    GetKnockoutTextMargin( attrs.m_Size, attrs.m_StrokeWidth );
 
-        if( aItem->Type() == PCB_FP_TEXT_T )
-        {
-            static_cast<const FP_TEXT*>( aItem )->TransformTextToPolySet( finalPoly, 0, maxError,
-                                                                          ERROR_INSIDE );
-        }
-        else if( aItem->Type() == PCB_TEXT_T )
-        {
-            static_cast<const PCB_TEXT*>( aItem )->TransformTextToPolySet( finalPoly, 0, maxError,
-                                                                           ERROR_INSIDE );
-        }
+        aText->TransformBoundingBoxToPolygon( &finalPoly, margin );
+        finalPoly.BooleanSubtract( knockouts, SHAPE_POLY_SET::PM_FAST );
+        finalPoly.Fracture( SHAPE_POLY_SET::PM_FAST );
 
-        // Do not call finalPoly.Fracture() here: ConvertPolygonToTriangles() call it
-        // if needed, and Fracture() called twice can create bad results and is useless
-        ConvertPolygonToTriangles( finalPoly, *aContainer, m_biuTo3Dunits, *aItem );
+        ConvertPolygonToTriangles( finalPoly, *aContainer, m_biuTo3Dunits, *aOwner );
     }
     else
     {
@@ -111,24 +120,24 @@ void BOARD_ADAPTER::addText( const EDA_TEXT* aText, CONTAINER_2D_BASE* aContaine
                     {
                         // Cannot add segments that have the same start and end point
                         aContainer->Add( new FILLED_CIRCLE_2D( pt1_3DU, penWidth_3DU / 2,
-                                                               *aItem ) );
+                                                               *aOwner ) );
                     }
                     else
                     {
                         aContainer->Add( new ROUND_SEGMENT_2D( pt1_3DU, pt2_3DU, penWidth_3DU,
-                                                               *aItem ) );
+                                                               *aOwner ) );
                     }
                 },
                 // Triangulation callback
                 [&]( const VECTOR2I& aPt1, const VECTOR2I& aPt2, const VECTOR2I& aPt3 )
                 {
                     aContainer->Add( new TRIANGLE_2D( TO_SFVEC2F( aPt1 ), TO_SFVEC2F( aPt2 ),
-                                                      TO_SFVEC2F( aPt3 ), *aItem ) );
+                                                      TO_SFVEC2F( aPt3 ), *aOwner ) );
                 } );
 
         attrs.m_Angle = aText->GetDrawRotation();
 
-        font->Draw( &callback_gal, aText->GetShownText( true ), aText->GetDrawPos(), attrs );
+        font->Draw( &callback_gal, aText->GetShownText(), aText->GetDrawPos(), attrs );
     }
 }
 
@@ -136,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();
 
@@ -201,8 +210,7 @@ void BOARD_ADAPTER::addFootprintShapes( const FOOTPRINT* aFootprint, CONTAINER_2
 
             if( textbox->GetLayer() == aLayerId )
             {
-                if( textbox->IsBorderEnabled() )
-                    addShape( textbox, aContainer, aFootprint );
+                addShape( textbox, aContainer, aFootprint );
                 addText( textbox, aContainer, aFootprint );
             }
 
@@ -261,29 +269,12 @@ void BOARD_ADAPTER::createTrack( const PCB_TRACK* aTrack, CONTAINER_2D_BASE* aDs
     {
         const PCB_ARC* arc = static_cast<const PCB_ARC*>( aTrack );
 
-        if( arc->IsDegenerated() )
-        {
-            // Draw this very small arc like a track segment (a PCB_TRACE_T)
-            PCB_TRACK track( arc->GetParent() );
-            track.SetStart( arc->GetStart() );
-            track.SetEnd( arc->GetEnd() );
-            track.SetWidth( arc->GetWidth() );
-            track.SetLayer( arc->GetLayer() );
-
-            createTrack( &track, aDstContainer );
-            return;
-        }
-
         VECTOR2D  center( arc->GetCenter() );
         EDA_ANGLE arc_angle = arc->GetAngle();
         double    radius = arc->GetRadius();
         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
@@ -497,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 );
@@ -639,12 +647,16 @@ void BOARD_ADAPTER::addShape( const PCB_SHAPE* aShape, CONTAINER_2D_BASE* aConta
             if( inner_radius3DU < 0 )
                 inner_radius3DU = 0.0;
 
-            if( aShape->IsFilled() )
+            if( outer_radius3DU == 0.0 )
+            {
+                // Don't attempt to render degenerate shapes
+            }
+            else if( aShape->IsFilled() )
             {
                 aContainer->Add( new FILLED_CIRCLE_2D( center3DU, outer_radius3DU,
                                                        *aOwner ) );
             }
-            else if( outer_radius3DU > inner_radius3DU )
+            else
             {
                 aContainer->Add( new RING_2D( center3DU, inner_radius3DU, outer_radius3DU,
                                               *aOwner ) );
@@ -792,7 +804,7 @@ void BOARD_ADAPTER::buildPadOutlineAsSegments( const PAD* aPad, CONTAINER_2D_BAS
     }
 
     // For other shapes, add outlines as thick segments in polygon buffer
-    const std::shared_ptr<SHAPE_POLY_SET>& corners = aPad->GetEffectivePolygon( ERROR_INSIDE );
+    const std::shared_ptr<SHAPE_POLY_SET>& corners = aPad->GetEffectivePolygon();
     const SHAPE_LINE_CHAIN&                path = corners->COutline( 0 );
 
     for( int j = 0; j < path.PointCount(); j++ )

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();
@@ -605,8 +607,7 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
 
             case PCB_TEXTBOX_T:
                 addText( static_cast<PCB_TEXTBOX*>( item ), layerContainer, item );
-                if( static_cast<PCB_TEXTBOX*>( item )->IsBorderEnabled() )
-                    addShape( static_cast<PCB_TEXTBOX*>( item ), layerContainer, item );
+                addShape( static_cast<PCB_TEXTBOX*>( item ), layerContainer, item );
                 break;
 
             case PCB_DIM_ALIGNED_T:
@@ -650,7 +651,7 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
                 {
                     PCB_TEXT* text = static_cast<PCB_TEXT*>( item );
 
-                    text->TransformTextToPolySet( *layerPoly, 0, maxError, ERROR_INSIDE );
+                    text->TransformTextToPolySet( *layerPoly, layer, 0, maxError, ERROR_INSIDE );
                     break;
                 }
 
@@ -658,7 +659,7 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
                 {
                     PCB_TEXTBOX* textbox = static_cast<PCB_TEXTBOX*>( item );
 
-                    textbox->TransformTextToPolySet( *layerPoly, 0, maxError, ERROR_INSIDE );
+                    textbox->TransformTextToPolySet( *layerPoly, layer, 0, maxError, ERROR_INSIDE );
                     break;
                 }
 
@@ -959,7 +960,7 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
                 {
                     PCB_TEXT* text = static_cast<PCB_TEXT*>( item );
 
-                    text->TransformTextToPolySet( *layerPoly, 0, maxError, ERROR_INSIDE );
+                    text->TransformTextToPolySet( *layerPoly, layer, 0, maxError, ERROR_INSIDE );
                     break;
                 }
 
@@ -967,7 +968,7 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
                 {
                     PCB_TEXTBOX* textbox = static_cast<PCB_TEXTBOX*>( item );
 
-                    textbox->TransformTextToPolySet( *layerPoly, 0, maxError, ERROR_INSIDE );
+                    textbox->TransformTextToPolySet( *layerPoly, layer, 0, maxError, ERROR_INSIDE );
                     break;
                 }
 
@@ -994,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/create_layer_poly.cpp

@@ -51,7 +51,7 @@ void BOARD_ADAPTER::buildPadOutlineAsPolygon( const PAD* aPad, SHAPE_POLY_SET& a
     }
 
     // For other shapes, add outlines as thick segments in polygon buffer
-    const std::shared_ptr<SHAPE_POLY_SET>& corners = aPad->GetEffectivePolygon( ERROR_INSIDE );
+    const std::shared_ptr<SHAPE_POLY_SET>& corners = aPad->GetEffectivePolygon();
     const SHAPE_LINE_CHAIN&                path = corners->COutline( 0 );
 
     for( int ii = 0; ii < path.PointCount(); ++ii )

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,100 +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 )
-                {
-                    bool aInsideB = a.first->m_bbox.Inside( b.first->m_bbox );
-                    bool bInsideA = b.first->m_bbox.Inside( a.first->m_bbox );
-
-                    // If A is inside B, then A is rendered first
-                    if( aInsideB != bInsideA )
-                        return bInsideA;
-
-                    if( a.second != b.second )
-                        return a.second > b.second;
-
-                    return a.first > b.first;       // compare pointers as a last resort
-                } );
-
-        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;
 
@@ -548,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

@@ -27,7 +27,6 @@
 #include <board.h>
 #include <footprint.h>
 #include "../../3d_math.h"
-#include "convert_basic_shapes_to_polygon.h"
 #include <trigo.h>
 #include <project.h>
 #include <profile.h>        // To use GetRunningMicroSecs or another profiling utility
@@ -776,9 +775,6 @@ void RENDER_3D_OPENGL::generateViasAndPads()
             {
                 const PCB_VIA* via = static_cast<const PCB_VIA*>( track );
 
-                if( via->GetViaType() == VIATYPE::THROUGH )
-                    continue;   // handle with pad holes so castellation is taken into account
-
                 const float holediameter = via->GetDrillValue() * m_boardAdapter.BiuTo3dUnits();
                 const int nrSegments = m_boardAdapter.GetCircleSegmentCount( via->GetDrillValue() );
                 const float hole_inner_radius = holediameter / 2.0f;
@@ -808,33 +804,14 @@ void RENDER_3D_OPENGL::generateViasAndPads()
     }
 
 
-    if( m_boardAdapter.GetHoleCount() > 0 || m_boardAdapter.GetViaCount() > 0 )
+    if( m_boardAdapter.GetHoleCount() > 0 )
     {
-        SHAPE_POLY_SET tht_outer_holes_poly; // Stores the outer poly of the copper holes
-        SHAPE_POLY_SET tht_inner_holes_poly; // Stores the inner poly of the copper holes
+        SHAPE_POLY_SET tht_outer_holes_poly; // Stores the outer poly of the copper holes (the pad)
+        SHAPE_POLY_SET tht_inner_holes_poly; // Stores the inner poly of the copper holes (the hole)
 
         tht_outer_holes_poly.RemoveAllContours();
         tht_inner_holes_poly.RemoveAllContours();
 
-        // Insert through-via holes (vertical cylinders)
-        for( const PCB_TRACK* track : m_boardAdapter.GetBoard()->Tracks() )
-        {
-            if( track->Type() == PCB_VIA_T )
-            {
-                const PCB_VIA* via = static_cast<const PCB_VIA*>( track );
-
-                if( via->GetViaType() == VIATYPE::THROUGH )
-                {
-                    TransformCircleToPolygon( tht_outer_holes_poly, via->GetPosition(),
-                                              via->GetDrill() / 2 + platingThickness,
-                                              ARC_HIGH_DEF, ERROR_INSIDE );
-
-                    TransformCircleToPolygon( tht_inner_holes_poly, via->GetPosition(),
-                                              via->GetDrill() / 2, ARC_HIGH_DEF, ERROR_INSIDE );
-                }
-            }
-        }
-
         // Insert pads holes (vertical cylinders)
         for( const FOOTPRINT* footprint : m_boardAdapter.GetBoard()->Footprints() )
         {
@@ -926,9 +903,7 @@ void RENDER_3D_OPENGL::Load3dModelsIfNeeded()
         load3dModels( &activityReporter );
     }
     else
-    {
         load3dModels( nullptr );
-    }
 }
 
 
@@ -937,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>
@@ -802,14 +797,11 @@ bool RENDER_3D_OPENGL::Redraw( bool aIsMoving, REPORTER* aStatusReporter,
         {
             setLayerMaterial( layer_id );
 
-            OPENGL_RENDER_LIST* throughHolesOuter = m_outerThroughHoles;
-
-            if( m_boardAdapter.m_Cfg->m_Render.clip_silk_on_via_annulus
-                    && m_boardAdapter.m_Cfg->m_Render.realistic
-                    && ( layer_id == B_SilkS || layer_id == F_SilkS ) )
-            {
-                throughHolesOuter = m_outerThroughHoleRings;
-            }
+            OPENGL_RENDER_LIST* throughHolesOuter =
+                        m_boardAdapter.m_Cfg->m_Render.clip_silk_on_via_annulus
+                        && m_boardAdapter.m_Cfg->m_Render.realistic
+                        && ( layer_id == B_SilkS || layer_id == F_SilkS ) ? m_outerThroughHoleRings
+                                                                          : m_outerThroughHoles;
 
             if( throughHolesOuter )
             {
@@ -827,20 +819,11 @@ bool RENDER_3D_OPENGL::Redraw( bool aIsMoving, REPORTER* aStatusReporter,
                                                         - pLayerDispList->GetZBot() );
             }
 
-            if( skipRenderHoles )
-            {
-                // Do not render Paste layers when skipRenderHoles is enabled
-                // otherwise it will cause z-fight issues
-                if( layer_id != B_Paste && layer_id != F_Paste )
-                {
-                    pLayerDispList->DrawAllCameraCulledSubtractLayer( drawMiddleSegments,
-                                                                      anti_board );
-                }
-            }
-            else if( m_boardAdapter.m_Cfg->m_Render.subtract_mask_from_silk
-                  && m_boardAdapter.m_Cfg->m_Render.realistic
-                  && (   ( layer_id == B_SilkS && m_layers.find( B_Mask ) != m_layers.end() )
-                      || ( layer_id == F_SilkS && m_layers.find( F_Mask ) != m_layers.end() ) ) )
+            if( !skipRenderHoles
+                    && m_boardAdapter.m_Cfg->m_Render.subtract_mask_from_silk
+                    && m_boardAdapter.m_Cfg->m_Render.realistic
+                    && (   ( layer_id == B_SilkS && m_layers.find( B_Mask ) != m_layers.end() )
+                        || ( layer_id == F_SilkS && m_layers.find( F_Mask ) != m_layers.end() ) ) )
             {
                 const PCB_LAYER_ID layerMask_id = (layer_id == B_SilkS) ? B_Mask : F_Mask;
 
@@ -850,28 +833,34 @@ bool RENDER_3D_OPENGL::Redraw( bool aIsMoving, REPORTER* aStatusReporter,
                                                                   pLayerDispListMask,
                                                                   throughHolesOuter, anti_board );
             }
-            else if( throughHolesOuter )
-            {
-                pLayerDispList->DrawAllCameraCulledSubtractLayer( drawMiddleSegments, nullptr,
-                                                                  throughHolesOuter,
-                                                                  anti_board );
-            }
             else
             {
-                pLayerDispList->DrawAllCameraCulledSubtractLayer( drawMiddleSegments,
-                                                                  anti_board );
+                if( !skipRenderHoles && throughHolesOuter
+                  && ( layer_id == B_SilkS || layer_id == F_SilkS ) )
+                {
+                    pLayerDispList->DrawAllCameraCulledSubtractLayer( drawMiddleSegments, nullptr,
+                                                                      throughHolesOuter,
+                                                                      anti_board );
+                }
+                else
+                {
+                    // Do not render Paste layers when skipRenderHoles is enabled
+                    // otherwise it will cause z-fight issues
+                    if( !( skipRenderHoles && ( layer_id == B_Paste || layer_id == F_Paste ) ) )
+                    {
+                        pLayerDispList->DrawAllCameraCulledSubtractLayer( drawMiddleSegments,
+                                                                          anti_board );
+                    }
+                }
             }
         }
 
         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 )
@@ -933,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();
@@ -1153,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() )
     {
@@ -1186,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() )
@@ -1252,236 +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 )
-            {
-                if( a.second != b.second )
-                    return a.second > b.second;
-
-                return a.first > b.first;   // use pointers as a last resort
-            } );
-
-    // 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

@@ -931,33 +931,10 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe
     {
         float ratio =
                 std::max( 1.0f, m_objectContainer.GetBBox().GetMaxDimension() / RANGE_SCALE_3D );
+        m_camera.SetMaxZoom( CAMERA::DEFAULT_MAX_ZOOM * ratio );
 
-        float max_zoom = CAMERA::DEFAULT_MAX_ZOOM * ratio;
-        float min_zoom = static_cast<float>( MIN_DISTANCE_IU * m_boardAdapter.BiuTo3dUnits()
-                                             / -m_camera.GetCameraInitPos().z );
-
-        if( min_zoom > max_zoom )
-            std::swap( min_zoom, max_zoom );
-
-        float zoom_ratio = max_zoom / min_zoom;
-
-        // Set the minimum number of zoom 'steps' between max and min.
-        int steps = 3 * 3;
-        steps -= static_cast<int>( ceil( log( zoom_ratio ) / log( 1.26f ) ) );
-        steps = std::max( steps, 0 );
-
-        // Resize max and min zoom to accomplish the number of steps.
-        float increased_zoom = pow( 1.26f, steps / 2 );
-        max_zoom *= increased_zoom;
-        min_zoom /= increased_zoom;
-
-        if( steps & 1 )
-            min_zoom /= 1.26f;
-
-        min_zoom = std::min( min_zoom, 1.0f );
-
-        m_camera.SetMaxZoom( max_zoom );
-        m_camera.SetMinZoom( min_zoom );
+        m_camera.SetMinZoom( static_cast<float>( MIN_DISTANCE_IU * m_boardAdapter.BiuTo3dUnits()
+                                                 / -m_camera.GetCameraInitPos().z ) );
     }
 
     // Create an accelerator
@@ -1225,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/render_3d_raytrace.cpp

@@ -1911,19 +1911,9 @@ void RENDER_3D_RAYTRACE::initializeBlockPositions()
 
     const SFVEC2UI center( m_realBufferSize.x / 2, m_realBufferSize.y / 2 );
     std::sort( m_blockPositions.begin(), m_blockPositions.end(),
-            [&]( const SFVEC2UI& a, const SFVEC2UI& b )
-            {
+            [&]( const SFVEC2UI& a, const SFVEC2UI& b ) {
                 // Sort order: inside out.
-                float distanceA = distance( a, center );
-                float distanceB = distance( b, center );
-
-                if( distanceA != distanceB )
-                    return distanceA < distanceB;
-
-                if( a[0] != b[0] )
-                    return a[0] < b[0];
-
-                return a[1] < b[1];
+                return distance( a, center ) < distance( b, center );
             } );
 
     // Create m_shader buffer

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_3D_raytracing_options_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -26,7 +26,7 @@ PANEL_3D_RAYTRACING_OPTIONS_BASE::PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* pa
 
 	m_cbRaytracing_proceduralTextures = new wxCheckBox( this, wxID_ANY, _("Procedural textures (slow)"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_cbRaytracing_proceduralTextures->SetValue(true);
-	gSizer1->Add( m_cbRaytracing_proceduralTextures, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	gSizer1->Add( m_cbRaytracing_proceduralTextures, 0, wxALL, 5 );
 
 	m_cbRaytracing_addFloor = new wxCheckBox( this, wxID_ANY, _("Add floor (slow)"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_cbRaytracing_addFloor->SetValue(true);
@@ -347,7 +347,6 @@ PANEL_3D_RAYTRACING_OPTIONS_BASE::PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* pa
 
 	this->SetSizer( bSizerMain );
 	this->Layout();
-	bSizerMain->Fit( this );
 }
 
 PANEL_3D_RAYTRACING_OPTIONS_BASE::~PANEL_3D_RAYTRACING_OPTIONS_BASE()

3d-viewer/dialogs/panel_3D_raytracing_options_base.fbp

@@ -45,7 +45,7 @@
             <property name="minimum_size"></property>
             <property name="name">PANEL_3D_RAYTRACING_OPTIONS_BASE</property>
             <property name="pos"></property>
-            <property name="size">-1,-1</property>
+            <property name="size">834,514</property>
             <property name="subclass">RESETTABLE_PANEL; widgets/resettable_panel.h; forward_declare</property>
             <property name="tooltip"></property>
             <property name="two_step_creation">0</property>
@@ -190,7 +190,7 @@
                         <property name="vgap">0</property>
                         <object class="sizeritem" expanded="0">
                             <property name="border">5</property>
-                            <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
+                            <property name="flag">wxALL</property>
                             <property name="proportion">0</property>
                             <object class="wxCheckBox" expanded="0">
                                 <property name="BottomDockable">1</property>

3d-viewer/dialogs/panel_3D_raytracing_options_base.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -103,7 +103,7 @@ class PANEL_3D_RAYTRACING_OPTIONS_BASE : public RESETTABLE_PANEL
 
 	public:
 
-		PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
+		PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 834,514 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
 
 		~PANEL_3D_RAYTRACING_OPTIONS_BASE();
 

3d-viewer/dialogs/panel_preview_3d_model.cpp

@@ -25,7 +25,6 @@
  */
 
 #include "panel_preview_3d_model.h"
-#include <dialogs/dialog_unit_entry.h>
 #include <3d_canvas/eda_3d_canvas.h>
 #include <tool/tool_manager.h>
 #include <tool/tool_dispatcher.h>
@@ -47,34 +46,30 @@ PANEL_PREVIEW_3D_MODEL::PANEL_PREVIEW_3D_MODEL( wxWindow* aParent, PCB_BASE_FRAM
                                                 FOOTPRINT* aFootprint,
                                                 std::vector<FP_3DMODEL>* aParentModelList ) :
         PANEL_PREVIEW_3D_MODEL_BASE( aParent, wxID_ANY ),
-        m_parentFrame( aFrame ),
         m_previewPane( nullptr ),
         m_infobar( nullptr ),
         m_boardAdapter(),
         m_currentCamera( m_trackBallCamera ),
-        m_trackBallCamera( 2 * RANGE_SCALE_3D )
+        m_trackBallCamera( 2 * RANGE_SCALE_3D ),
+        m_boardThickness( aFrame, nullptr, m_boardThicknessCtrl, m_boardThicknessUnits )
 {
-    m_userUnits = m_parentFrame->GetUserUnits();
+    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 ) );
@@ -84,7 +79,6 @@ PANEL_PREVIEW_3D_MODEL::PANEL_PREVIEW_3D_MODEL( wxWindow* aParent, PCB_BASE_FRAM
     m_bpvBottom->SetBitmap( KiBitmap( BITMAPS::axis3d_bottom ) );
     m_bpvISO->SetBitmap( KiBitmap( BITMAPS::ortho ) );
     m_bpUpdate->SetBitmap( KiBitmap( BITMAPS::reload ) );
-    m_bpSettings->SetBitmap( KiBitmap( BITMAPS::options_3drender ) );
 
     // Set the min and max values of spin buttons (mandatory on Linux)
     // They are not used, so they are set to min and max 32 bits int values
@@ -105,15 +99,6 @@ PANEL_PREVIEW_3D_MODEL::PANEL_PREVIEW_3D_MODEL( wxWindow* aParent, PCB_BASE_FRAM
 
     m_dummyFootprint = new FOOTPRINT( *aFootprint );
     m_dummyFootprint->SetParentGroup( nullptr );
-
-    // Ensure the footprint is shown like in Fp editor: rot 0, not flipped
-    // to avoid mistakes when setting the3D shape position/rotation
-    if( m_dummyFootprint->IsFlipped() )
-        m_dummyFootprint->Flip( m_dummyFootprint->GetPosition(), false );
-
-    m_dummyFootprint->SetOrientation( ANGLE_0 );
-
-
     m_dummyBoard->Add( m_dummyFootprint );
 
     // Create the 3D canvas
@@ -155,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();
@@ -175,7 +157,6 @@ PANEL_PREVIEW_3D_MODEL::PANEL_PREVIEW_3D_MODEL( wxWindow* aParent, PCB_BASE_FRAM
     m_bpvBottom->SetMinSize( m_bpvBottom->GetSize() + borderFix );
     m_bpvISO->SetMinSize( m_bpvISO->GetSize() + borderFix );
     m_bpUpdate->SetMinSize( m_bpUpdate->GetSize() + borderFix );
-    m_bpSettings->SetMinSize( m_bpSettings->GetSize() + borderFix );
 #endif
 }
 
@@ -339,6 +320,9 @@ void PANEL_PREVIEW_3D_MODEL::SetSelectedModel( int idx )
 
         m_opacity->SetValue( 100 );
     }
+
+    BOARD_DESIGN_SETTINGS dummy_bds = m_dummyBoard->GetDesignSettings();
+    m_boardThickness.ChangeValue( dummy_bds.GetBoardThickness() );
 }
 
 
@@ -391,27 +375,16 @@ void PANEL_PREVIEW_3D_MODEL::onOpacitySlider( wxCommandEvent& event )
 }
 
 
-void PANEL_PREVIEW_3D_MODEL::View3DSettings( wxCommandEvent& event )
+void PANEL_PREVIEW_3D_MODEL::updateBoardThickness( wxCommandEvent& event )
 {
-    BOARD_DESIGN_SETTINGS bds = m_dummyBoard->GetDesignSettings();
-    int                   thickness = bds.GetBoardThickness();
+    BOARD_DESIGN_SETTINGS dummy_bds = m_dummyBoard->GetDesignSettings();
+    dummy_bds.SetBoardThickness( m_boardThickness.GetValue() );
 
-    WX_UNIT_ENTRY_DIALOG dlg( m_parentFrame, _( "Board Thickness: " ),
-                              _( "Preview Settings" ), thickness );
-
-    if( dlg.ShowModal() != wxID_OK )
-        return;
-
-    bds.SetBoardThickness( (int) dlg.GetValue() );
-
-    BOARD_STACKUP& boardStackup = m_dummyBoard->GetDesignSettings().GetStackupDescriptor();
-    boardStackup.RemoveAll();
-    boardStackup.BuildDefaultStackupList( &bds, 2 );
+    BOARD_STACKUP& dummy_board_stackup = m_dummyBoard->GetDesignSettings().GetStackupDescriptor();
+    dummy_board_stackup.RemoveAll();
+    dummy_board_stackup.BuildDefaultStackupList( &dummy_bds, 2 );
 
     UpdateDummyFootprint( true );
-
-    m_previewPane->ReloadRequest();
-    m_previewPane->Refresh();
 }
 
 
@@ -565,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

@@ -135,12 +135,12 @@ private:
 
     void onOpacitySlider( wxCommandEvent& event ) override;
 
+    void updateBoardThickness( wxCommandEvent& event ) override;
+
     void doIncrementScale( wxSpinEvent& aEvent, double aSign );
     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 );
@@ -172,8 +172,6 @@ private:
         m_previewPane->Refresh();
     }
 
-    void View3DSettings( wxCommandEvent& event ) override;
-
 	void View3DRight( wxCommandEvent& event ) override
     {
         m_previewPane->SetView3D( ID_VIEW3D_RIGHT );
@@ -190,7 +188,6 @@ private:
     }
 
 private:
-    PCB_BASE_FRAME*          m_parentFrame;
     EDA_3D_CANVAS*           m_previewPane;
     WX_INFOBAR*              m_infobar;
     BOARD_ADAPTER            m_boardAdapter;
@@ -203,6 +200,7 @@ private:
     std::vector<FP_3DMODEL>* m_parentModelList;
     int                      m_selected;   /// Index into m_parentInfoList
 
+    UNIT_BINDER              m_boardThickness;
     EDA_UNITS                m_userUnits;
 };
 

3d-viewer/dialogs/panel_preview_3d_model_base.cpp

@@ -21,7 +21,7 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi
 	sbSizerScale = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Scale") ), wxVERTICAL );
 
 	wxFlexGridSizer* fgSizerScale;
-	fgSizerScale = new wxFlexGridSizer( 0, 3, 2, 3 );
+	fgSizerScale = new wxFlexGridSizer( 0, 3, 3, 3 );
 	fgSizerScale->AddGrowableCol( 1 );
 	fgSizerScale->SetFlexibleDirection( wxBOTH );
 	fgSizerScale->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@@ -66,7 +66,7 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi
 	sbSizerRotation = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Rotation") ), wxVERTICAL );
 
 	wxFlexGridSizer* fgSizerRotate;
-	fgSizerRotate = new wxFlexGridSizer( 0, 3, 2, 3 );
+	fgSizerRotate = new wxFlexGridSizer( 0, 3, 3, 3 );
 	fgSizerRotate->AddGrowableCol( 1 );
 	fgSizerRotate->SetFlexibleDirection( wxBOTH );
 	fgSizerRotate->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@@ -111,7 +111,7 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi
 	sbSizerOffset = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Offset") ), wxVERTICAL );
 
 	wxFlexGridSizer* fgSizerOffset;
-	fgSizerOffset = new wxFlexGridSizer( 0, 3, 2, 3 );
+	fgSizerOffset = new wxFlexGridSizer( 0, 3, 3, 3 );
 	fgSizerOffset->AddGrowableCol( 1 );
 	fgSizerOffset->SetFlexibleDirection( wxBOTH );
 	fgSizerOffset->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@@ -159,7 +159,20 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi
 	sbSizer4->Add( m_opacity, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
 
 
-	bSizerLeft->Add( sbSizer4, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizerLeft->Add( sbSizer4, 1, wxEXPAND|wxLEFT|wxRIGHT, 5 );
+
+	wxStaticBoxSizer* sbSizerBoardThickness;
+	sbSizerBoardThickness = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Board Thickness") ), wxHORIZONTAL );
+
+	m_boardThicknessCtrl = new wxTextCtrl( sbSizerBoardThickness->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	sbSizerBoardThickness->Add( m_boardThicknessCtrl, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
+
+	m_boardThicknessUnits = new wxStaticText( sbSizerBoardThickness->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_boardThicknessUnits->Wrap( -1 );
+	sbSizerBoardThickness->Add( m_boardThicknessUnits, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+	bSizerLeft->Add( sbSizerBoardThickness, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
 
 
 	bSizermain->Add( bSizerLeft, 0, 0, 5 );
@@ -170,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 );
@@ -182,7 +196,7 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi
 	m_SizerPanelView = new wxBoxSizer( wxVERTICAL );
 
 
-	bSizerRight->Add( m_SizerPanelView, 1, wxEXPAND|wxBOTTOM, 5 );
+	bSizerRight->Add( m_SizerPanelView, 1, wxEXPAND|wxBOTTOM, 8 );
 
 
 	bSizermain->Add( bSizerRight, 1, wxRIGHT|wxLEFT|wxEXPAND, 5 );
@@ -193,13 +207,13 @@ 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 );
 
 	m_bpvLeft = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizer3DButtons->Add( m_bpvLeft, 0, wxBOTTOM, 5 );
+	bSizer3DButtons->Add( m_bpvLeft, 0, wxALIGN_LEFT|wxALIGN_RIGHT|wxBOTTOM, 5 );
 
 	m_bpvRight = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
 	bSizer3DButtons->Add( m_bpvRight, 0, wxBOTTOM, 5 );
@@ -224,9 +238,6 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi
 
 	bSizer3DButtons->Add( m_bpUpdate, 0, wxBOTTOM, 5 );
 
-	m_bpSettings = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-	bSizer3DButtons->Add( m_bpSettings, 0, 0, 5 );
-
 
 	bSizermain->Add( bSizer3DButtons, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 );
 
@@ -273,6 +284,8 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi
 	m_spinZoffset->Connect( wxEVT_SCROLL_LINEDOWN, wxSpinEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onDecrementOffset ), NULL, this );
 	m_spinZoffset->Connect( wxEVT_SCROLL_LINEUP, wxSpinEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onIncrementOffset ), NULL, this );
 	m_opacity->Connect( wxEVT_SLIDER, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onOpacitySlider ), NULL, this );
+	m_boardThicknessCtrl->Connect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onMouseWheelBoardThickness ), NULL, this );
+	m_boardThicknessCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::updateBoardThickness ), NULL, this );
 	m_bpvISO->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DISO ), NULL, this );
 	m_bpvLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DLeft ), NULL, this );
 	m_bpvRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DRight ), NULL, this );
@@ -281,7 +294,6 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi
 	m_bpvTop->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DTop ), NULL, this );
 	m_bpvBottom->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DBottom ), NULL, this );
 	m_bpUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DUpdate ), NULL, this );
-	m_bpSettings->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DSettings ), NULL, this );
 }
 
 PANEL_PREVIEW_3D_MODEL_BASE::~PANEL_PREVIEW_3D_MODEL_BASE()
@@ -324,6 +336,8 @@ PANEL_PREVIEW_3D_MODEL_BASE::~PANEL_PREVIEW_3D_MODEL_BASE()
 	m_spinZoffset->Disconnect( wxEVT_SCROLL_LINEDOWN, wxSpinEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onDecrementOffset ), NULL, this );
 	m_spinZoffset->Disconnect( wxEVT_SCROLL_LINEUP, wxSpinEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onIncrementOffset ), NULL, this );
 	m_opacity->Disconnect( wxEVT_SLIDER, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onOpacitySlider ), NULL, this );
+	m_boardThicknessCtrl->Disconnect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onMouseWheelBoardThickness ), NULL, this );
+	m_boardThicknessCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::updateBoardThickness ), NULL, this );
 	m_bpvISO->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DISO ), NULL, this );
 	m_bpvLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DLeft ), NULL, this );
 	m_bpvRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DRight ), NULL, this );
@@ -332,6 +346,5 @@ PANEL_PREVIEW_3D_MODEL_BASE::~PANEL_PREVIEW_3D_MODEL_BASE()
 	m_bpvTop->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DTop ), NULL, this );
 	m_bpvBottom->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DBottom ), NULL, this );
 	m_bpUpdate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DUpdate ), NULL, this );
-	m_bpSettings->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DSettings ), NULL, this );
 
 }

3d-viewer/dialogs/panel_preview_3d_model_base.fbp

@@ -93,7 +93,7 @@
                                         <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
                                         <property name="permission">none</property>
                                         <property name="rows">0</property>
-                                        <property name="vgap">2</property>
+                                        <property name="vgap">3</property>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
@@ -686,7 +686,7 @@
                                         <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
                                         <property name="permission">none</property>
                                         <property name="rows">0</property>
-                                        <property name="vgap">2</property>
+                                        <property name="vgap">3</property>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
@@ -1279,7 +1279,7 @@
                                         <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
                                         <property name="permission">none</property>
                                         <property name="rows">0</property>
-                                        <property name="vgap">2</property>
+                                        <property name="vgap">3</property>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
@@ -1847,7 +1847,7 @@
                         </object>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
+                            <property name="flag">wxEXPAND|wxLEFT|wxRIGHT</property>
                             <property name="proportion">1</property>
                             <object class="wxStaticBoxSizer" expanded="1">
                                 <property name="id">wxID_ANY</property>
@@ -1925,6 +1925,147 @@
                                 </object>
                             </object>
                         </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT</property>
+                            <property name="proportion">0</property>
+                            <object class="wxStaticBoxSizer" expanded="1">
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">Board Thickness</property>
+                                <property name="minimum_size"></property>
+                                <property name="name">sbSizerBoardThickness</property>
+                                <property name="orient">wxHORIZONTAL</property>
+                                <property name="parent">1</property>
+                                <property name="permission">none</property>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT</property>
+                                    <property name="proportion">1</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="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"></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_boardThicknessCtrl</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">; ; forward_declare</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>
+                                        <event name="OnMouseWheel">onMouseWheelBoardThickness</event>
+                                        <event name="OnText">updateBoardThickness</event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL</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="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">mm</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_boardThicknessUnits</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">; ; forward_declare</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>
+                        </object>
                     </object>
                 </object>
                 <object class="sizeritem" expanded="1">
@@ -1948,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>
@@ -1986,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>
@@ -2009,7 +2150,7 @@
                             </object>
                         </object>
                         <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
+                            <property name="border">8</property>
                             <property name="flag">wxEXPAND|wxBOTTOM</property>
                             <property name="proportion">1</property>
                             <object class="wxBoxSizer" expanded="1">
@@ -2031,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>
@@ -2116,7 +2257,7 @@
                         </object>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxBOTTOM</property>
+                            <property name="flag">wxALIGN_LEFT|wxALIGN_RIGHT|wxBOTTOM</property>
                             <property name="proportion">0</property>
                             <object class="wxBitmapButton" expanded="1">
                                 <property name="BottomDockable">1</property>
@@ -2642,80 +2783,6 @@
                                 <event name="OnButtonClick">View3DUpdate</event>
                             </object>
                         </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag"></property>
-                            <property name="proportion">0</property>
-                            <object class="wxBitmapButton" 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="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">MyButton</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_bpSettings</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">; ; forward_declare</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">View3DSettings</event>
-                            </object>
-                        </object>
                     </object>
                 </object>
             </object>

3d-viewer/dialogs/panel_preview_3d_model_base.h

@@ -66,7 +66,8 @@ class PANEL_PREVIEW_3D_MODEL_BASE : public wxPanel
 		wxTextCtrl* zoff;
 		wxSpinButton* m_spinZoffset;
 		wxSlider* m_opacity;
-		wxStaticText* m_previewLabel;
+		wxTextCtrl* m_boardThicknessCtrl;
+		wxStaticText* m_boardThicknessUnits;
 		wxBoxSizer* m_SizerPanelView;
 		wxBitmapButton* m_bpvISO;
 		wxBitmapButton* m_bpvLeft;
@@ -76,7 +77,6 @@ class PANEL_PREVIEW_3D_MODEL_BASE : public wxPanel
 		wxBitmapButton* m_bpvTop;
 		wxBitmapButton* m_bpvBottom;
 		wxBitmapButton* m_bpUpdate;
-		wxBitmapButton* m_bpSettings;
 
 		// Virtual event handlers, override them in your derived class
 		virtual void onMouseWheelScale( wxMouseEvent& event ) { event.Skip(); }
@@ -90,6 +90,8 @@ class PANEL_PREVIEW_3D_MODEL_BASE : public wxPanel
 		virtual void onDecrementOffset( wxSpinEvent& event ) { event.Skip(); }
 		virtual void onIncrementOffset( wxSpinEvent& event ) { event.Skip(); }
 		virtual void onOpacitySlider( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onMouseWheelBoardThickness( wxMouseEvent& event ) { event.Skip(); }
+		virtual void updateBoardThickness( wxCommandEvent& event ) { event.Skip(); }
 		virtual void View3DISO( wxCommandEvent& event ) { event.Skip(); }
 		virtual void View3DLeft( wxCommandEvent& event ) { event.Skip(); }
 		virtual void View3DRight( wxCommandEvent& event ) { event.Skip(); }
@@ -98,7 +100,6 @@ class PANEL_PREVIEW_3D_MODEL_BASE : public wxPanel
 		virtual void View3DTop( wxCommandEvent& event ) { event.Skip(); }
 		virtual void View3DBottom( wxCommandEvent& event ) { event.Skip(); }
 		virtual void View3DUpdate( wxCommandEvent& event ) { event.Skip(); }
-		virtual void View3DSettings( wxCommandEvent& event ) { event.Skip(); }
 
 
 	public:

CMakeLists.txt

@@ -53,13 +53,6 @@ set( CMAKE_EXPORT_COMPILE_COMMANDS ON )
 set( KICAD_CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" )
 set( CMAKE_MODULE_PATH       "${KICAD_CMAKE_MODULE_PATH}" )
 
-# Create a flag to identify the non-Apple unix systems
-if( UNIX AND NOT APPLE )
-    set( UNIX_NOT_APPLE ON )
-else()
-    set( UNIX_NOT_APPLE OFF )
-endif()
-
 # On Windows, binaries created by link option -g3 are very large (more than 1Gb for pcbnew,
 # and more than 3Gb for the full kicad suite)
 # This option create binaries using link option -g1 that create much smaller files, but
@@ -100,17 +93,6 @@ option( KICAD_I18N_UNIX_STRICT_PATH
     "Use standard Unix locale lookup path (default OFF)."
     OFF )
 
-# Options to build with flatpak platform defaults (only on Linux)
-cmake_dependent_option( KICAD_BUILD_FLATPAK
-    "Build KiCad with metadata, launchers, icons, and MIME info following flatpak conventions"
-    OFF "UNIX_NOT_APPLE"
-    OFF )
-
-cmake_dependent_option( KICAD_BUILD_NIGHTLY_FLATPAK
-    "Build a Nightly flatpak (requires KICAD_BUILD_FLATPAK=ON)"
-    OFF "UNIX_NOT_APPLE"
-    OFF )
-
 # Not supported by all platforms (for instance mingw)
 option( KICAD_SANITIZE_ADDRESS
     "Build KiCad with sanitizer options. WARNING: Not compatible with gold linker"
@@ -368,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.
@@ -501,12 +479,6 @@ if( MSVC )
     string( APPEND CMAKE_CXX_FLAGS " /EHs" )
     endif()
 
-    if( KICAD_SANITIZE_ADDRESS )
-        add_definitions( -DKICAD_SANITIZE_ADDRESS )
-        add_definitions( -D_DISABLE_VECTOR_ANNOTATION )
-        string( APPEND CMAKE_CXX_FLAGS " /fsanitize=address" )
-    endif()
-
     foreach( type EXE SHARED MODULE)
         # /DEBUG: create PDB
         string( APPEND CMAKE_${type}_LINKER_FLAGS " /DEBUG /MANIFEST:NO" )

bitmap2component/bitmap2cmp_gui.cpp

@@ -147,7 +147,6 @@ END_EVENT_TABLE()
 BM2CMP_FRAME::BM2CMP_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
     BM2CMP_FRAME_BASE( aParent )
 {
-    m_ident = FRAME_BM2CMP;      // Initialized to wxID_ANY by wxFormBuilder
     SetKiway( this, aKiway );
 
     for( wxString unit : { _( "mm" ), _( "Inch" ), _( "DPI" ) } )

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/FindPythonInterp.cmake

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

cmake/FindPythonLibs.cmake

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

cmake/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.9" )
+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

@@ -176,7 +176,6 @@ set( COMMON_WIDGET_SRCS
     widgets/footprint_preview_widget.cpp
     widgets/footprint_select_widget.cpp
     widgets/gal_options_panel.cpp
-    widgets/gal_options_panel_base.cpp
     widgets/grid_bitmap_toggle.cpp
     widgets/grid_color_swatch_helpers.cpp
     widgets/grid_combobox.cpp
@@ -217,7 +216,6 @@ set( COMMON_WIDGET_SRCS
     widgets/wx_panel.cpp
     widgets/wx_progress_reporters.cpp
     widgets/wx_splitter_window.cpp
-    widgets/wx_treebook.cpp
     )
 
 set( COMMON_DRAWING_SHEET_SRCS
@@ -354,6 +352,7 @@ set( COMMON_SRCS
     lib_tree_model.cpp
     lib_tree_model_adapter.cpp
     locale_io.cpp
+    lockfile.cpp
     lset.cpp
     marker_base.cpp
     markup_parser.cpp
@@ -621,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/callback_gal.cpp

@@ -49,9 +49,8 @@ void CALLBACK_GAL::DrawGlyph( const KIFONT::GLYPH& aGlyph, int aNth, int aTotal
                     int            strokeWidth = GetLineWidth();
                     SHAPE_POLY_SET poly;
 
-                    // Use ERROR_INSIDE because it avoids Clipper and is therefore much faster.
                     TransformOvalToPolygon( poly, pointList[ ii - 1 ], pointList[ ii ],
-                                            strokeWidth, strokeWidth / 180, ERROR_INSIDE );
+                                            strokeWidth, strokeWidth / 48, ERROR_OUTSIDE );
 
                     m_outlineCallback( poly.Outline( 0 ) );
                 }

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 ),
@@ -155,7 +172,7 @@ long KIDIALOG::getStyle( KD_TYPE aType )
 }
 
 
-bool AskOverrideLock( wxWindow* aParent, const wxString& aMessage )
+bool OverrideLock( wxWindow* aParent, const wxString& aMessage )
 {
 #ifdef __APPLE__
     // wxMessageDialog gets the button spacing wrong on Mac so we have to use wxRichMessageDialog.
@@ -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
@@ -44,7 +44,6 @@
 
 #include <database/database_connection.h>
 #include <database/database_cache.h>
-#include <profile.h>
 
 
 const char* const traceDatabase = "KICAD_DATABASE";
@@ -90,7 +89,7 @@ DATABASE_CONNECTION::DATABASE_CONNECTION( const std::string& aDataSourceName,
     m_pass    = aPassword;
     m_timeout = aTimeoutSeconds;
 
-    init();
+    m_cache = std::make_unique<DATABASE_CACHE>( 10, 1 );
 
     if( aConnectNow )
         Connect();
@@ -104,7 +103,7 @@ DATABASE_CONNECTION::DATABASE_CONNECTION( const std::string& aConnectionString,
     m_connectionString = aConnectionString;
     m_timeout          = aTimeoutSeconds;
 
-    init();
+    m_cache = std::make_unique<DATABASE_CACHE>( 10, 1 );
 
     if( aConnectNow )
         Connect();
@@ -118,12 +117,6 @@ DATABASE_CONNECTION::~DATABASE_CONNECTION()
 }
 
 
-void DATABASE_CONNECTION::init()
-{
-    m_cache = std::make_unique<DB_CACHE_TYPE>( 10, 1 );
-}
-
-
 void DATABASE_CONNECTION::SetCacheParams( int aMaxSize, int aMaxAge )
 {
     if( !m_cache )
@@ -166,10 +159,12 @@ bool DATABASE_CONNECTION::Connect()
         return false;
     }
 
-    m_tables.clear();
-
     if( IsConnected() )
+    {
+        syncTables();
+        cacheColumns();
         getQuoteChar();
+    }
 
     return IsConnected();
 }
@@ -183,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();
 }
@@ -206,55 +193,65 @@ bool DATABASE_CONNECTION::IsConnected() const
 }
 
 
-bool DATABASE_CONNECTION::CacheTableInfo( const std::string& aTable,
-                                          const std::set<std::string>& aColumns )
+bool DATABASE_CONNECTION::syncTables()
 {
     if( !m_conn )
         return false;
 
+    m_tables.clear();
+
     try
     {
         nanodbc::catalog catalog( *m_conn );
-        nanodbc::catalog::tables tables = catalog.find_tables( fromUTF8( aTable ) );
+        nanodbc::catalog::tables tables = catalog.find_tables();
 
-        if( !tables.next() )
+        while( tables.next() )
         {
-            wxLogTrace( traceDatabase, wxT( "CacheTableInfo: table '%s' not found in catalog" ),
-                        aTable );
-            return false;
+            std::string key = toUTF8( tables.table_name() );
+            m_tables[key] = toUTF8( tables.table_type() );
         }
+    }
+    catch( nanodbc::database_error& e )
+    {
+        m_lastError = e.what();
+        wxLogTrace( traceDatabase, wxT( "Exception while syncing tables: %s" ), m_lastError );
+        return false;
+    }
 
-        std::string key = toUTF8( tables.table_name() );
-        m_tables[key] = toUTF8( tables.table_type() );
+    return true;
+}
 
+
+bool DATABASE_CONNECTION::cacheColumns()
+{
+    if( !m_conn )
+        return false;
+
+    m_columnCache.clear();
+
+    for( const auto& tableIter : m_tables )
+    {
         try
         {
+            nanodbc::catalog catalog( *m_conn );
             nanodbc::catalog::columns columns =
-                    catalog.find_columns( NANODBC_TEXT( "" ), tables.table_name() );
+                    catalog.find_columns( NANODBC_TEXT( "" ), fromUTF8( tableIter.first ) );
 
             while( columns.next() )
             {
                 std::string columnKey = toUTF8( columns.column_name() );
-
-                if( aColumns.count( columnKey ) )
-                    m_columnCache[key][columnKey] = columns.data_type();
+                m_columnCache[tableIter.first][columnKey] = columns.data_type();
             }
 
         }
         catch( nanodbc::database_error& e )
         {
             m_lastError = e.what();
-            wxLogTrace( traceDatabase, wxT( "Exception while syncing columns for table '%s': %s" ),
-                        key, m_lastError );
+            wxLogTrace( traceDatabase, wxT( "Exception while syncing columns for table %s: %s" ),
+                        tableIter.first, m_lastError );
             return false;
         }
     }
-    catch( nanodbc::database_error& e )
-    {
-        m_lastError = e.what();
-        wxLogTrace( traceDatabase, wxT( "Exception while caching table info: %s" ), m_lastError );
-        return false;
-    }
 
     return true;
 }
@@ -286,35 +283,6 @@ bool DATABASE_CONNECTION::getQuoteChar()
 }
 
 
-std::string DATABASE_CONNECTION::columnsFor( const std::string& aTable )
-{
-    if( !m_columnCache.count( aTable ) )
-    {
-        wxLogTrace( traceDatabase, wxT( "columnsFor: requested table %s missing from cache!" ),
-                    aTable );
-        return "*";
-    }
-
-    if( m_columnCache[aTable].empty() )
-    {
-        wxLogTrace( traceDatabase, wxT( "columnsFor: requested table %s has no columns mapped!" ),
-                    aTable );
-        return "*";
-    }
-
-    std::string ret;
-
-    for( const auto& [ columnName, columnType ] : m_columnCache[aTable] )
-        ret += fmt::format( "{}{}{}, ", m_quoteChar, columnName, m_quoteChar );
-
-    // strip tailing ', '
-    ret.resize( ret.length() - 2 );
-
-    return ret;
-}
-
-//next step, make SelectOne take from the SelectAll cache if the SelectOne cache is missing.
-//To do this, need to build a map of PK->ROW for the cache result.
 bool DATABASE_CONNECTION::SelectOne( const std::string& aTable,
                                      const std::pair<std::string, std::string>& aWhere,
                                      DATABASE_CONNECTION::ROW& aResult )
@@ -335,18 +303,6 @@ bool DATABASE_CONNECTION::SelectOne( const std::string& aTable,
     }
 
     const std::string& tableName = tableMapIter->first;
-    DB_CACHE_TYPE::CACHE_VALUE cacheEntry;
-
-    if( m_cache->Get( tableName, cacheEntry ) )
-    {
-        if( cacheEntry.count( aWhere.second ) )
-        {
-            wxLogTrace( traceDatabase, wxT( "SelectOne: `%s` with parameter `%s` - cache hit" ),
-                        tableName, aWhere.second );
-            aResult = cacheEntry.at( aWhere.second );
-            return true;
-        }
-    }
 
     if( !m_columnCache.count( tableName ) )
     {
@@ -368,15 +324,19 @@ bool DATABASE_CONNECTION::SelectOne( const std::string& aTable,
 
     std::string cacheKey = fmt::format( "{}{}{}", tableName, columnName, aWhere.second );
 
-    std::string queryStr = fmt::format( "SELECT {} FROM {}{}{} WHERE {}{}{} = ?",
-                                        columnsFor( tableName ),
+    std::string queryStr = fmt::format( "SELECT * FROM {}{}{} WHERE {}{}{} = ?",
                                         m_quoteChar, tableName, m_quoteChar,
                                         m_quoteChar, columnName, m_quoteChar );
 
     nanodbc::statement statement( *m_conn );
     nanodbc::string query = fromUTF8( queryStr );
 
-    PROF_TIMER timer;
+    if( m_cache->Get( cacheKey, aResult ) )
+    {
+        wxLogTrace( traceDatabase, wxT( "SelectOne: `%s` with parameter `%s` - cache hit" ),
+                    toUTF8( query ), aWhere.second );
+        return true;
+    }
 
     try
     {
@@ -416,17 +376,14 @@ bool DATABASE_CONNECTION::SelectOne( const std::string& aTable,
         return false;
     }
 
-    timer.Stop();
-
-
     if( !results.first() )
     {
         wxLogTrace( traceDatabase, wxT( "SelectOne: no results returned from query" ) );
         return false;
     }
 
-    wxLogTrace( traceDatabase, wxT( "SelectOne: %ld results returned from query in %0.1f ms" ),
-                results.rows(), timer.msecs() );
+    wxLogTrace( traceDatabase, wxT( "SelectOne: %ld results returned from query" ),
+                results.rows() );
 
     aResult.clear();
 
@@ -435,22 +392,7 @@ bool DATABASE_CONNECTION::SelectOne( const std::string& aTable,
         for( short i = 0; i < results.columns(); ++i )
         {
             std::string column = toUTF8( results.column_name( i ) );
-
-            switch( results.column_datatype( i ) )
-            {
-            case SQL_DOUBLE:
-            case SQL_FLOAT:
-            case SQL_REAL:
-            case SQL_DECIMAL:
-            case SQL_NUMERIC:
-            {
-                aResult[column] = fmt::format( "{:G}", results.get<double>( i ) );
-                break;
-            }
-
-            default:
-                aResult[column] = toUTF8( results.get<nanodbc::string>( i, NANODBC_TEXT( "" ) ) );
-            }
+            aResult[ column ] = toUTF8( results.get<nanodbc::string>( i, NANODBC_TEXT( "" ) ) );
         }
     }
     catch( nanodbc::database_error& e )
@@ -461,12 +403,13 @@ bool DATABASE_CONNECTION::SelectOne( const std::string& aTable,
         return false;
     }
 
+    m_cache->Put( cacheKey, aResult );
+
     return true;
 }
 
 
-bool DATABASE_CONNECTION::SelectAll( const std::string& aTable, const std::string& aKey,
-                                     std::vector<ROW>& aResults )
+bool DATABASE_CONNECTION::SelectAll( const std::string& aTable, std::vector<ROW>& aResults )
 {
     if( !m_conn )
     {
@@ -483,27 +426,13 @@ bool DATABASE_CONNECTION::SelectAll( const std::string& aTable, const std::strin
         return false;
     }
 
-    DB_CACHE_TYPE::CACHE_VALUE cacheEntry;
-
-    if( m_cache->Get( aTable, cacheEntry ) )
-    {
-        wxLogTrace( traceDatabase, wxT( "SelectAll: `%s` - cache hit" ), aTable );
-
-        for( auto &[ key, row ] : cacheEntry )
-            aResults.emplace_back( row );
-
-        return true;
-    }
-
     nanodbc::statement statement( *m_conn );
 
-    nanodbc::string query = fromUTF8( fmt::format( "SELECT {} FROM {}{}{}", columnsFor( aTable ),
-                                                   m_quoteChar, aTable, m_quoteChar ) );
+    nanodbc::string query = fromUTF8( fmt::format( "SELECT * FROM {}{}{}", m_quoteChar,
+                                                   tableMapIter->first, m_quoteChar ) );
 
     wxLogTrace( traceDatabase, wxT( "SelectAll: `%s`" ), toUTF8( query ) );
 
-    PROF_TIMER timer;
-
     try
     {
         statement.prepare( query );
@@ -538,8 +467,6 @@ bool DATABASE_CONNECTION::SelectAll( const std::string& aTable, const std::strin
         return false;
     }
 
-    timer.Stop();
-
     try
     {
         while( results.next() )
@@ -549,23 +476,7 @@ bool DATABASE_CONNECTION::SelectAll( const std::string& aTable, const std::strin
             for( short j = 0; j < results.columns(); ++j )
             {
                 std::string column = toUTF8( results.column_name( j ) );
-
-                switch( results.column_datatype( j ) )
-                {
-                case SQL_DOUBLE:
-                case SQL_FLOAT:
-                case SQL_REAL:
-                case SQL_DECIMAL:
-                case SQL_NUMERIC:
-                {
-                    result[column] = fmt::format( "{:G}", results.get<double>( j ) );
-                    break;
-                }
-
-                default:
-                    result[column] = toUTF8( results.get<nanodbc::string>( j,
-                                                                           NANODBC_TEXT( "" ) ) );
-                }
+                result[column] = toUTF8( results.get<nanodbc::string>( j, NANODBC_TEXT( "" ) ) );
             }
 
             aResults.emplace_back( std::move( result ) );
@@ -579,17 +490,5 @@ bool DATABASE_CONNECTION::SelectAll( const std::string& aTable, const std::strin
         return false;
     }
 
-    wxLogTrace( traceDatabase, wxT( "SelectAll from %s completed in %0.1f ms" ), aTable,
-                timer.msecs() );
-
-    for( const ROW& row : aResults )
-    {
-        wxASSERT( row.count( aKey ) );
-        std::string keyStr = std::any_cast<std::string>( row.at( aKey ) );
-        cacheEntry[keyStr] = row;
-    }
-
-    m_cache->Put( aTable, cacheEntry );
-
     return true;
 }

common/database/database_lib_settings.cpp

@@ -74,11 +74,6 @@ DATABASE_LIB_SETTINGS::DATABASE_LIB_SETTINGS( const std::string& aFilename ) :
                 table.symbols_col    = entry["symbols"].get<std::string>();
                 table.footprints_col = entry["footprints"].get<std::string>();
 
-                // Sanitize library display names; currently only `/` is removed because we use it
-                // as a separator and allow it in symbol names.
-                table.name.erase( std::remove( table.name.begin(), table.name.end(), '/' ),
-                                  table.name.end() );
-
                 if( entry.contains( "properties" ) && entry["properties"].is_object() )
                 {
                     const nlohmann::json& pj = entry["properties"];

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()
 
@@ -133,41 +137,12 @@ DIALOG_SHIM::DIALOG_SHIM( wxWindow* aParent, wxWindowID id, const wxString& titl
         Pgm().App().SetTopWindow( (EDA_BASE_FRAME*) kiwayHolder );
 #endif
 
-    Bind( wxEVT_PAINT, &DIALOG_SHIM::OnPaint, this );
+    Connect( wxEVT_PAINT, wxPaintEventHandler( DIALOG_SHIM::OnPaint ) );
 }
 
 
 DIALOG_SHIM::~DIALOG_SHIM()
 {
-    Unbind( wxEVT_CLOSE_WINDOW, &DIALOG_SHIM::OnCloseWindow, this );
-    Unbind( wxEVT_BUTTON, &DIALOG_SHIM::OnButton, this );
-    Unbind( wxEVT_PAINT, &DIALOG_SHIM::OnPaint, this );
-
-    std::function<void( wxWindowList& )> disconnectFocusHandlers = [&]( wxWindowList& children )
-    {
-        for( wxWindow* child : children )
-        {
-            if( wxTextCtrl* textCtrl = dynamic_cast<wxTextCtrl*>( child ) )
-            {
-                textCtrl->Disconnect( wxEVT_SET_FOCUS,
-                                      wxFocusEventHandler( DIALOG_SHIM::onChildSetFocus ), nullptr,
-                                      this );
-            }
-            else if( wxStyledTextCtrl* scintilla = dynamic_cast<wxStyledTextCtrl*>( child ) )
-            {
-                scintilla->Disconnect( wxEVT_SET_FOCUS,
-                                       wxFocusEventHandler( DIALOG_SHIM::onChildSetFocus ), nullptr,
-                                       this );
-            }
-            else
-            {
-                disconnectFocusHandlers( child->GetChildren() );
-            }
-        }
-    };
-
-    disconnectFocusHandlers( GetChildren() );
-
     // if the dialog is quasi-modal, this will end its event loop
     if( IsQuasiModal() )
         EndQuasiModal( wxID_CANCEL );
@@ -311,9 +286,6 @@ bool DIALOG_SHIM::Show( bool show )
         ret = wxDialog::Show( show );
     }
 
-    if( m_parent )
-        m_parent->SetFocus();
-
     return ret;
 }
 
@@ -353,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
@@ -515,9 +479,6 @@ int DIALOG_SHIM::ShowQuasiModal()
 
     m_qmodal_showing = false;
 
-    if( parent )
-        parent->SetFocus();
-
     return GetReturnCode();
 }
 
@@ -572,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() )
@@ -589,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 );
         }
@@ -606,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 )
@@ -630,8 +583,7 @@ void DIALOG_SHIM::OnCharHook( wxKeyEvent& aEvt )
         }
     }
     // shift-return (Mac default) or Ctrl-Return (GTK) for OK
-    else if( ( aEvt.GetKeyCode() == WXK_RETURN || aEvt.GetKeyCode() == WXK_NUMPAD_ENTER )
-             && ( aEvt.ShiftDown() || aEvt.ControlDown() ) )
+    else if( aEvt.GetKeyCode() == WXK_RETURN && ( aEvt.ShiftDown() || aEvt.ControlDown() ) )
     {
         wxPostEvent( this, wxCommandEvent( wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK ) );
         return;
@@ -674,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;
     }
 
@@ -159,7 +160,6 @@ void PANEL_COLOR_SETTINGS::OnThemeChanged( wxCommandEvent& event )
         m_cbTheme->SetSelection( idx );
 
         m_optOverrideColors->SetValue( newSettings->GetOverrideSchItemColors() );
-        m_optOverrideColors->Enable( !newSettings->IsReadOnly() );
 
         *m_currentSettings = *newSettings;
         updateSwatches();
@@ -175,7 +175,6 @@ void PANEL_COLOR_SETTINGS::OnThemeChanged( wxCommandEvent& event )
                 return;
 
             m_optOverrideColors->SetValue( selected->GetOverrideSchItemColors() );
-            m_optOverrideColors->Enable( !selected->IsReadOnly() );
 
             *m_currentSettings = *selected;
             onNewThemeSelected();
@@ -218,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 ) );
 
@@ -260,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;
@@ -284,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();
@@ -379,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_common_settings.cpp

@@ -44,8 +44,9 @@
  * Ugly as it all is, it does improve our usability on various platforms.
  */
 
-PANEL_COMMON_SETTINGS::PANEL_COMMON_SETTINGS( wxWindow* aParent )
+PANEL_COMMON_SETTINGS::PANEL_COMMON_SETTINGS( DIALOG_SHIM* aDialog, wxWindow* aParent )
         : PANEL_COMMON_SETTINGS_BASE( aParent ),
+          m_dialog( aDialog ),
           m_iconScaleLabel( nullptr ),
           m_iconScaleSlider( nullptr ),
           m_iconScaleAuto( nullptr ),

common/dialogs/panel_common_settings_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -415,7 +415,6 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind
 
 	this->SetSizer( bPanelSizer );
 	this->Layout();
-	bPanelSizer->Fit( this );
 
 	// Connect Events
 	m_textEditorBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_COMMON_SETTINGS_BASE::OnTextEditorClick ), NULL, this );

common/dialogs/panel_common_settings_base.fbp

@@ -45,7 +45,7 @@
             <property name="minimum_size"></property>
             <property name="name">PANEL_COMMON_SETTINGS_BASE</property>
             <property name="pos"></property>
-            <property name="size">-1,-1</property>
+            <property name="size">676,655</property>
             <property name="subclass">RESETTABLE_PANEL; widgets/resettable_panel.h; Not forward_declare</property>
             <property name="tooltip"></property>
             <property name="two_step_creation">0</property>

common/dialogs/panel_common_settings_base.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -113,7 +113,7 @@ class PANEL_COMMON_SETTINGS_BASE : public RESETTABLE_PANEL
 
 	public:
 
-		PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
+		PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 676,655 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
 
 		~PANEL_COMMON_SETTINGS_BASE();
 

common/dialogs/panel_data_collection.cpp

@@ -37,8 +37,8 @@
 #include <settings/settings_manager.h>
 
 
-PANEL_DATA_COLLECTION::PANEL_DATA_COLLECTION( wxWindow* aParent ) :
-        PANEL_DATA_COLLECTION_BASE( aParent )
+PANEL_DATA_COLLECTION::PANEL_DATA_COLLECTION( PAGED_DIALOG* aDialog, wxWindow* aParent ) :
+        PANEL_DATA_COLLECTION_BASE( aParent ), m_dialog( aDialog )
 {
 }
 
@@ -47,9 +47,9 @@ bool PANEL_DATA_COLLECTION::TransferDataToWindow()
 {
     applySettingsToPanel();
 
-    KIPLATFORM::POLICY::PBOOL policyState =
-            KIPLATFORM::POLICY::GetPolicyBool( POLICY_KEY_DATACOLLECTION );
-    if( policyState != KIPLATFORM::POLICY::PBOOL::NOT_CONFIGURED )
+    KIPLATFORM::POLICY::STATE policyState =
+            KIPLATFORM::POLICY::GetPolicyState( POLICY_KEY_DATACOLLECTION );
+    if( policyState != KIPLATFORM::POLICY::STATE::NOT_CONFIGURED )
     {
         Disable();
     }

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_mouse_settings.cpp

@@ -26,8 +26,9 @@
 #include <wx/defs.h>
 
 
-PANEL_MOUSE_SETTINGS::PANEL_MOUSE_SETTINGS( wxWindow* aParent ) :
+PANEL_MOUSE_SETTINGS::PANEL_MOUSE_SETTINGS( PAGED_DIALOG* aDialog, wxWindow* aParent ) :
         PANEL_MOUSE_SETTINGS_BASE( aParent ),
+        m_dialog( aDialog ),
         m_currentScrollMod( {} )
 {
 #ifdef __WXOSX_MAC__
@@ -81,9 +82,8 @@ bool PANEL_MOUSE_SETTINGS::TransferDataFromWindow()
 
     if( !isScrollModSetValid( m_currentScrollMod ) )
     {
-        PAGED_DIALOG::GetDialog( this )->SetError( _( "Only one action can be assigned to each "
-                                                      "vertical scroll setting" ),
-                                                   this, nullptr );
+        m_dialog->SetError( _( "Only one action can be assigned to each vertical scroll setting" ),
+                            this, nullptr );
         return false;
     }
 

common/dialogs/panel_mouse_settings_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -316,7 +316,6 @@ PANEL_MOUSE_SETTINGS_BASE::PANEL_MOUSE_SETTINGS_BASE( wxWindow* parent, wxWindow
 
 	this->SetSizer( bSizer10 );
 	this->Layout();
-	bSizer10->Fit( this );
 
 	// Connect Events
 	m_rbZoomNone->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( PANEL_MOUSE_SETTINGS_BASE::OnScrollRadioButton ), NULL, this );

common/dialogs/panel_mouse_settings_base.fbp

@@ -45,7 +45,7 @@
             <property name="minimum_size"></property>
             <property name="name">PANEL_MOUSE_SETTINGS_BASE</property>
             <property name="pos"></property>
-            <property name="size">-1,-1</property>
+            <property name="size">609,523</property>
             <property name="subclass">RESETTABLE_PANEL; widgets/resettable_panel.h; Not forward_declare</property>
             <property name="tooltip"></property>
             <property name="two_step_creation">0</property>

common/dialogs/panel_mouse_settings_base.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -97,7 +97,7 @@ class PANEL_MOUSE_SETTINGS_BASE : public RESETTABLE_PANEL
 
 	public:
 
-		PANEL_MOUSE_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
+		PANEL_MOUSE_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 609,523 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
 
 		~PANEL_MOUSE_SETTINGS_BASE();
 

common/dialogs/panel_setup_netclasses.cpp

@@ -39,6 +39,7 @@
 #include <widgets/wx_html_report_box.h>
 #include <widgets/wx_panel.h>
 #include <widgets/std_bitmap_button.h>
+#include <wx/treebook.h>
 #include <project/net_settings.h>
 
 
@@ -69,12 +70,13 @@ std::vector<BITMAPS> g_lineStyleIcons;
 wxArrayString        g_lineStyleNames;
 
 
-PANEL_SETUP_NETCLASSES::PANEL_SETUP_NETCLASSES( wxWindow* aParentWindow, EDA_DRAW_FRAME* aFrame,
+PANEL_SETUP_NETCLASSES::PANEL_SETUP_NETCLASSES( PAGED_DIALOG* aParent, EDA_DRAW_FRAME* aFrame,
                                                 std::shared_ptr<NET_SETTINGS> aNetSettings,
                                                 const std::set<wxString>& aNetNames,
                                                 bool aIsEEschema ) :
-        PANEL_SETUP_NETCLASSES_BASE( aParentWindow ),
+        PANEL_SETUP_NETCLASSES_BASE( aParent->GetTreebook() ),
         m_frame( aFrame ),
+        m_parent( aParent ),
         m_isEEschema( aIsEEschema ),
         m_netSettings( aNetSettings ),
         m_netNames( aNetNames ),
@@ -119,8 +121,10 @@ PANEL_SETUP_NETCLASSES::PANEL_SETUP_NETCLASSES( wxWindow* aParentWindow, EDA_DRA
         // as this initial width is sometimes strange depending on the language (wxGrid bug?)
         int const min_width =  m_netclassGrid->GetVisibleWidth( i, true, true );
 
-        int const weighted_min_best_width = ( i == GRID_LINESTYLE ) ? min_best_width * 3 / 2
-                                                                    : min_best_width;
+        int const weighted_min_best_width =
+                        ( i == GRID_LINESTYLE )
+                        ? min_best_width * 3 / 2
+                        : min_best_width;
 
         m_netclassGrid->SetColMinimalWidth( i, min_width );
 
@@ -154,8 +158,8 @@ PANEL_SETUP_NETCLASSES::PANEL_SETUP_NETCLASSES( wxWindow* aParentWindow, EDA_DRA
     }
 
     wxGridCellAttr* attr = new wxGridCellAttr;
-    attr->SetRenderer( new GRID_CELL_COLOR_RENDERER( PAGED_DIALOG::GetDialog( this ) ) );
-    attr->SetEditor( new GRID_CELL_COLOR_SELECTOR( PAGED_DIALOG::GetDialog( this ), m_netclassGrid ) );
+    attr->SetRenderer( new GRID_CELL_COLOR_RENDERER( aParent ) );
+    attr->SetEditor( new GRID_CELL_COLOR_SELECTOR( aParent, m_netclassGrid ) );
     m_netclassGrid->SetColAttr( GRID_SCHEMATIC_COLOR, attr );
 
     attr = new wxGridCellAttr;
@@ -170,6 +174,7 @@ PANEL_SETUP_NETCLASSES::PANEL_SETUP_NETCLASSES( wxWindow* aParentWindow, EDA_DRA
 
     m_netclassGrid->SetAutoEvalCols( { GRID_WIREWIDTH,
                                        GRID_BUSWIDTH,
+
                                        GRID_CLEARANCE,
                                        GRID_TRACKSIZE,
                                        GRID_VIASIZE,
@@ -322,8 +327,6 @@ bool PANEL_SETUP_NETCLASSES::TransferDataToWindow()
         row++;
     }
 
-    AdjustAssignmentGridColumns( GetSize().x * 3 / 5 );
-
     return true;
 }
 
@@ -425,7 +428,7 @@ bool PANEL_SETUP_NETCLASSES::validateNetclassName( int aRow, const wxString& aNa
     if( tmp.IsEmpty() )
     {
         wxString msg =  _( "Netclass must have a name." );
-        PAGED_DIALOG::GetDialog( this )->SetError( msg, this, m_netclassGrid, aRow, GRID_NAME );
+        m_parent->SetError( msg, this, m_netclassGrid, aRow, GRID_NAME );
         return false;
     }
 
@@ -434,8 +437,7 @@ bool PANEL_SETUP_NETCLASSES::validateNetclassName( int aRow, const wxString& aNa
         if( ii != aRow && m_netclassGrid->GetCellValue( ii, GRID_NAME ).CmpNoCase( tmp ) == 0 )
         {
             wxString msg = _( "Netclass name already in use." );
-            PAGED_DIALOG::GetDialog( this )->SetError( msg, this, m_netclassGrid,
-                                                       focusFirst ? aRow : ii, GRID_NAME );
+            m_parent->SetError( msg, this, m_netclassGrid, focusFirst ? aRow : ii, GRID_NAME );
             return false;
         }
     }
@@ -650,15 +652,16 @@ void PANEL_SETUP_NETCLASSES::AdjustAssignmentGridColumns( int aWidth )
     // Account for scroll bars
     aWidth -= ( m_assignmentGrid->GetSize().x - m_assignmentGrid->GetClientSize().x );
 
-    int classNameWidth = 160;
-    m_assignmentGrid->SetColSize( 1, classNameWidth );
+    // Set className column width to original className width from netclasses grid
+    int classNameWidth = m_originalColWidths[ 0 ];
+    m_assignmentGrid->SetColSize( 1, m_originalColWidths[ 0 ] );
     m_assignmentGrid->SetColSize( 0, std::max( aWidth - classNameWidth, classNameWidth ) );
 }
 
 
 void PANEL_SETUP_NETCLASSES::OnSizeAssignmentGrid( wxSizeEvent& event )
 {
-    AdjustAssignmentGridColumns( event.GetSize().GetX() );
+    AdjustAssignmentGridColumns( event.GetSize().GetX());
 
     event.Skip();
 }
@@ -705,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/dialogs/panel_setup_netclasses_base.cpp

@@ -74,7 +74,7 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi
 
 	// Cell Defaults
 	m_netclassGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
-	bUpperSizer->Add( m_netclassGrid, 1, wxEXPAND|wxFIXED_MINSIZE|wxLEFT|wxRIGHT|wxTOP, 1 );
+	bUpperSizer->Add( m_netclassGrid, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 1 );
 
 	wxBoxSizer* buttonBoxSizer;
 	buttonBoxSizer = new wxBoxSizer( wxHORIZONTAL );
@@ -129,7 +129,7 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi
 	m_assignmentGrid->SetMargins( 0, 0 );
 
 	// Columns
-	m_assignmentGrid->SetColSize( 0, 270 );
+	m_assignmentGrid->SetColSize( 0, 400 );
 	m_assignmentGrid->SetColSize( 1, 160 );
 	m_assignmentGrid->EnableDragColMove( false );
 	m_assignmentGrid->EnableDragColSize( true );
@@ -147,7 +147,7 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi
 
 	// Cell Defaults
 	m_assignmentGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
-	bSizer14->Add( m_assignmentGrid, 2, wxEXPAND|wxFIXED_MINSIZE|wxLEFT, 5 );
+	bSizer14->Add( m_assignmentGrid, 2, wxEXPAND|wxLEFT, 5 );
 
 
 	bColumns->Add( bSizer14, 3, wxEXPAND, 5 );
@@ -186,6 +186,7 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi
 
 	this->SetSizer( bpanelNetClassesSizer );
 	this->Layout();
+	bpanelNetClassesSizer->Fit( this );
 
 	// Connect Events
 	this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( PANEL_SETUP_NETCLASSES_BASE::OnUpdateUI ) );

common/dialogs/panel_setup_netclasses_base.fbp

@@ -45,7 +45,7 @@
             <property name="minimum_size">-1,-1</property>
             <property name="name">PANEL_SETUP_NETCLASSES_BASE</property>
             <property name="pos"></property>
-            <property name="size">700,500</property>
+            <property name="size">-1,-1</property>
             <property name="subclass">; forward_declare</property>
             <property name="tooltip"></property>
             <property name="two_step_creation">0</property>
@@ -258,7 +258,7 @@
                                             </object>
                                             <object class="sizeritem" expanded="0">
                                                 <property name="border">1</property>
-                                                <property name="flag">wxEXPAND|wxFIXED_MINSIZE|wxLEFT|wxRIGHT|wxTOP</property>
+                                                <property name="flag">wxEXPAND|wxLEFT|wxRIGHT|wxTOP</property>
                                                 <property name="proportion">1</property>
                                                 <object class="wxGrid" expanded="0">
                                                     <property name="BottomDockable">1</property>
@@ -737,7 +737,7 @@
                                                             <property name="permission">none</property>
                                                             <object class="sizeritem" expanded="0">
                                                                 <property name="border">5</property>
-                                                                <property name="flag">wxEXPAND|wxFIXED_MINSIZE|wxLEFT</property>
+                                                                <property name="flag">wxEXPAND|wxLEFT</property>
                                                                 <property name="proportion">2</property>
                                                                 <object class="wxGrid" expanded="0">
                                                                     <property name="BottomDockable">1</property>
@@ -766,7 +766,7 @@
                                                                     <property name="col_label_values">&quot;Pattern&quot; &quot;Net Class&quot;</property>
                                                                     <property name="col_label_vert_alignment">wxALIGN_CENTER</property>
                                                                     <property name="cols">2</property>
-                                                                    <property name="column_sizes">270,160</property>
+                                                                    <property name="column_sizes">400,160</property>
                                                                     <property name="context_help"></property>
                                                                     <property name="context_menu">1</property>
                                                                     <property name="default_pane">0</property>

common/dialogs/panel_setup_netclasses_base.h

@@ -69,7 +69,7 @@ class PANEL_SETUP_NETCLASSES_BASE : public wxPanel
 
 	public:
 
-		PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 700,500 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
+		PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
 
 		~PANEL_SETUP_NETCLASSES_BASE();
 

common/dialogs/panel_setup_severities.cpp

@@ -28,13 +28,14 @@
 #include <wx/radiobut.h>
 #include <wx/scrolwin.h>
 #include <wx/stattext.h>
+#include <wx/treebook.h>
 
 
-PANEL_SETUP_SEVERITIES::PANEL_SETUP_SEVERITIES( wxWindow* aParentWindow,
+PANEL_SETUP_SEVERITIES::PANEL_SETUP_SEVERITIES( PAGED_DIALOG* aParent,
                                                 std::vector<std::reference_wrapper<RC_ITEM>> aItems,
                                                 std::map<int, SEVERITY>& aSeverities,
                                                 RC_ITEM* aPinMapSpecialCase ) :
-        wxPanel( aParentWindow ),
+        wxPanel( aParent->GetTreebook() ),
         m_severities( aSeverities ),
         m_items( aItems ),
         m_pinMapSpecialCase( aPinMapSpecialCase )
@@ -161,18 +162,16 @@ void PANEL_SETUP_SEVERITIES::ImportSettingsFrom( std::map<int, SEVERITY>& aSetti
     {
         int errorCode = item.GetErrorCode();
 
-        wxRadioButton* button = nullptr;
+        if(! m_buttonMap[ errorCode ][0] )  // this entry does not actually exist
+            continue;
 
         switch( aSettings[ errorCode ] )
         {
-        case RPT_SEVERITY_ERROR:   button = m_buttonMap[ errorCode ][0]; break;
-        case RPT_SEVERITY_WARNING: button = m_buttonMap[ errorCode ][1]; break;
-        case RPT_SEVERITY_IGNORE:  button = m_buttonMap[ errorCode ][2]; break;
-        default: break;
+        case RPT_SEVERITY_ERROR:   m_buttonMap[ errorCode ][0]->SetValue( true ); break;
+        case RPT_SEVERITY_WARNING: m_buttonMap[ errorCode ][1]->SetValue( true ); break;
+        case RPT_SEVERITY_IGNORE:  m_buttonMap[ errorCode ][2]->SetValue( true ); break;
+        default:                                                                  break;
         }
-
-        if( button )    // this entry must actually exist
-            button->SetValue( true );
     }
 
     if( m_pinMapSpecialCase )

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 );
 
@@ -110,7 +105,6 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin
 
     EnableScrolling( false, false ); // otherwise Zoom Auto disables GAL canvas
     KIPLATFORM::UI::SetOverlayScrolling( this, false ); // Prevent excessive repaint on GTK
-    KIPLATFORM::UI::ImmControl( this, false ); // Ensure our panel can't suck in IME events
 
     Connect( wxEVT_SIZE, wxSizeEventHandler( EDA_DRAW_PANEL_GAL::onSize ), nullptr, this );
     Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( EDA_DRAW_PANEL_GAL::onEnter ), nullptr,
@@ -152,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,
@@ -212,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;
@@ -366,10 +366,7 @@ void EDA_DRAW_PANEL_GAL::onSize( wxSizeEvent& aEvent )
     if( m_view )
     {
         if( infobar && infobar->IsLocked() )
-        {
-            VECTOR2D halfScreen( std::ceil( 0.5 * clientSize.x ), std::ceil( 0.5 * clientSize.y ) );
-            m_view->SetCenter( bottom - m_view->ToWorld( halfScreen, false ) );
-        }
+            m_view->SetCenter( bottom - m_view->ToWorld( clientSize, false ) / 2.0 );
 
         m_view->MarkTargetDirty( KIGFX::TARGET_CACHED );
         m_view->MarkTargetDirty( KIGFX::TARGET_NONCACHED );
@@ -630,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_data_item.cpp

@@ -106,13 +106,13 @@ void DS_DATA_ITEM::SyncDrawItems( DS_DRAW_ITEM_LIST* aCollector, KIGFX::VIEW* aV
 
     for( int j = 0; j < m_RepeatCount; j++ )
     {
-        if( j > 0 && !IsInsidePage( j ) )
+        if( j && ! IsInsidePage( j ) )
             continue;
 
         if( m_type == DS_SEGMENT )
-            item = new DS_DRAW_ITEM_LINE( this, j, GetStartPosIU( j ), GetEndPosIU( j ), pensize );
+            item = new DS_DRAW_ITEM_LINE( this, j, GetStartPosUi( j ), GetEndPosUi( j ), pensize );
         else if( m_type == DS_RECT )
-            item = new DS_DRAW_ITEM_RECT( this, j, GetStartPosIU( j ), GetEndPosIU( j ), pensize );
+            item = new DS_DRAW_ITEM_RECT( this, j, GetStartPosUi( j ), GetEndPosUi( j ), pensize );
         else
         {
             wxFAIL_MSG( wxS( "Unknown drawing sheet item type" ) );
@@ -162,8 +162,8 @@ void DS_DATA_ITEM::MoveTo( const VECTOR2D& aPosition )
 
     for( DS_DRAW_ITEM_BASE* drawItem : m_drawItems )
     {
-        drawItem->SetPosition( GetStartPosIU( drawItem->GetIndexInPeer() ) );
-        drawItem->SetEnd( GetEndPosIU( drawItem->GetIndexInPeer() ) );
+        drawItem->SetPosition( GetStartPosUi( drawItem->GetIndexInPeer() ) );
+        drawItem->SetEnd( GetEndPosUi( drawItem->GetIndexInPeer() ) );
     }
 }
 
@@ -294,7 +294,7 @@ const VECTOR2D DS_DATA_ITEM::GetStartPos( int ii ) const
 }
 
 
-const VECTOR2I DS_DATA_ITEM::GetStartPosIU( int ii ) const
+const VECTOR2I DS_DATA_ITEM::GetStartPosUi( int ii ) const
 {
     VECTOR2D pos = GetStartPos( ii ) * DS_DATA_MODEL::GetTheInstance().m_WSunits2Iu;
     return VECTOR2I( KiROUND( pos.x ), KiROUND( pos.y ) );
@@ -331,7 +331,7 @@ const VECTOR2D DS_DATA_ITEM::GetEndPos( int ii ) const
 }
 
 
-const VECTOR2I DS_DATA_ITEM::GetEndPosIU( int ii ) const
+const VECTOR2I DS_DATA_ITEM::GetEndPosUi( int ii ) const
 {
     VECTOR2D pos = GetEndPos( ii );
     pos = pos * DS_DATA_MODEL::GetTheInstance().m_WSunits2Iu;
@@ -343,13 +343,17 @@ bool DS_DATA_ITEM::IsInsidePage( int ii ) const
 {
     DS_DATA_MODEL& model = DS_DATA_MODEL::GetTheInstance();
 
-    for( const VECTOR2D& pos : { GetStartPos( ii ), GetEndPos( ii ) } )
+    VECTOR2D pos = GetStartPos( ii );
+
+    for( int kk = 0; kk < 1; kk++ )
     {
         if( model.m_RB_Corner.x < pos.x || model.m_LT_Corner.x > pos.x )
             return false;
 
         if( model.m_RB_Corner.y < pos.y || model.m_LT_Corner.y > pos.y )
             return false;
+
+        pos = GetEndPos( ii );
     }
 
     return true;
@@ -402,11 +406,11 @@ void DS_DATA_ITEM_POLYGONS::SyncDrawItems( DS_DRAW_ITEM_LIST* aCollector, KIGFX:
 
     for( int j = 0; j < m_RepeatCount; j++ )
     {
-        if( j > 0 && !IsInsidePage( j ) )
+        if( j && !IsInsidePage( j ) )
             continue;
 
         int pensize = GetPenSizeUi();
-        auto poly_shape = new DS_DRAW_ITEM_POLYPOLYGONS( this, j, GetStartPosIU( j ), pensize );
+        auto poly_shape = new DS_DRAW_ITEM_POLYPOLYGONS( this, j, GetStartPosUi( j ), pensize );
         poly_shape->SetFlags( itemFlags[ j ] );
         m_drawItems.push_back( poly_shape );
 
@@ -580,7 +584,7 @@ void DS_DATA_ITEM_TEXT::SyncDrawItems( DS_DRAW_ITEM_LIST* aCollector, KIGFX::VIE
         if( j > 0 && !IsInsidePage( j ) )
             continue;
 
-        text = new DS_DRAW_ITEM_TEXT( this, j, m_FullText, GetStartPosIU( j ), textsize, pensize,
+        text = new DS_DRAW_ITEM_TEXT( this, j, m_FullText, GetStartPosUi( j ), textsize, pensize,
                                       m_Font, m_Italic, m_Bold, m_TextColor );
         text->SetFlags( itemFlags[ j ] );
         m_drawItems.push_back( text );
@@ -591,14 +595,14 @@ void DS_DATA_ITEM_TEXT::SyncDrawItems( DS_DRAW_ITEM_LIST* aCollector, KIGFX::VIE
         if( aView )
             aView->Add( text );
 
-        text->SetHorizJustify( m_Hjustify );
+        text->SetHorizJustify( m_Hjustify ) ;
         text->SetVertJustify( m_Vjustify );
         text->SetTextAngle( EDA_ANGLE( m_Orient, DEGREES_T ) );
         text->SetMultilineAllowed( multilines );
 
         // Increment label for the next text (has no meaning for multiline texts)
         if( m_RepeatCount > 1 && !multilines )
-            IncrementLabel( ( j + 1 ) * m_IncrementLabel );
+            IncrementLabel(( j + 1 ) * m_IncrementLabel );
     }
 }
 
@@ -742,10 +746,10 @@ void DS_DATA_ITEM_BITMAP::SyncDrawItems( DS_DRAW_ITEM_LIST* aCollector, KIGFX::V
 
     for( int j = 0; j < m_RepeatCount; j++ )
     {
-        if( j > 0 && !IsInsidePage( j ) )
+        if( j && !IsInsidePage( j ) )
             continue;
 
-        DS_DRAW_ITEM_BITMAP* bitmap = new DS_DRAW_ITEM_BITMAP( this, j, GetStartPosIU( j ) );
+        DS_DRAW_ITEM_BITMAP* bitmap = new DS_DRAW_ITEM_BITMAP( this, j, GetStartPosUi( j ) );
 
         bitmap->SetFlags( itemFlags[ j ] );
         m_drawItems.push_back( bitmap );

common/drawing_sheet/ds_data_model_io.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2013-2016 CERN
- * Copyright (C) 2019-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2019-2022 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * @author Jean-Pierre Charras, jp.charras at wanadoo.fr
  *
@@ -247,14 +247,13 @@ void DS_DATA_MODEL_IO::format( DS_DATA_ITEM_TEXT* aItem, int aNestLevel ) const
     // Write font info, only if it is not the default setup
     bool write_size = aItem->m_TextSize.x != 0.0 || aItem->m_TextSize.y != 0.0;
     bool write_thickness = aItem->m_LineWidth != 0.0;
-    bool write_face = aItem->m_Font && !aItem->m_Font->GetName().IsEmpty();
 
-    if( write_thickness || write_size || aItem->m_Bold || aItem->m_Italic
-        || write_face || aItem->m_TextColor != COLOR4D::UNSPECIFIED )
+    if( write_thickness || write_size || aItem->m_Bold
+        || aItem->m_Italic || aItem->m_TextColor != COLOR4D::UNSPECIFIED )
     {
         m_out->Print( 0, " (font" );
 
-        if( write_face )
+        if( aItem->m_Font && !aItem->m_Font->GetName().IsEmpty() )
             m_out->Print( 0, " (face \"%s\")", aItem->m_Font->NameAsToken() );
 
         if( write_thickness )

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 );
@@ -174,37 +170,6 @@ void DS_DRAW_ITEM_TEXT::PrintWsItem( const RENDER_SETTINGS* aSettings, const VEC
 }
 
 
-const BOX2I DS_DRAW_ITEM_TEXT::GetApproxBBox()
-{
-    // A really dumb over-approximation because doing it for real (even with the stroke font)
-    // shows up large in profiles.
-
-    const TEXT_ATTRIBUTES& attrs = GetAttributes();
-    const wxString         text = GetShownText( true );
-    BOX2I                  bbox( GetTextPos() );
-
-    bbox.SetWidth( (int) text.length() * attrs.m_Size.x * 1.3 );
-    bbox.SetHeight( attrs.m_Size.y );
-
-    switch( attrs.m_Halign )
-    {
-    case GR_TEXT_H_ALIGN_LEFT:                                           break;
-    case GR_TEXT_H_ALIGN_CENTER: bbox.Offset( -bbox.GetWidth() / 2, 0 ); break;
-    case GR_TEXT_H_ALIGN_RIGHT:  bbox.Offset( -bbox.GetWidth(),     0 ); break;
-    }
-
-    switch( GetAttributes().m_Valign )
-    {
-    case GR_TEXT_V_ALIGN_TOP:                                             break;
-    case GR_TEXT_V_ALIGN_CENTER: bbox.Offset( 0, -bbox.GetHeight() / 2 ); break;
-    case GR_TEXT_V_ALIGN_BOTTOM: bbox.Offset( 0, -bbox.GetHeight()     ); break;
-    }
-
-    bbox.Inflate( attrs.m_Size.x, attrs.m_Size.y / 2 );
-    return bbox;
-}
-
-
 const BOX2I DS_DRAW_ITEM_TEXT::GetBoundingBox() const
 {
     return EDA_TEXT::GetTextBox();
@@ -225,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/drawing_sheet/ds_proxy_view_item.cpp

@@ -106,22 +106,14 @@ void DS_PROXY_VIEW_ITEM::ViewDraw( int aLayer, VIEW* aView ) const
 
     buildDrawList( aView, m_properties, &drawList );
 
-    BOX2I viewport( aView->GetViewport().GetOrigin(), aView->GetViewport().GetSize() );
-
     // Draw the title block normally even if the view is flipped
     bool flipped = gal->IsFlippedX();
 
     if( flipped )
     {
-        int pageWidth = m_pageInfo->GetWidthMils() * m_mils2IUscalefactor;
-
         gal->Save();
-        gal->Translate( VECTOR2D( pageWidth, 0 ) );
+        gal->Translate( VECTOR2D( m_pageInfo->GetWidthMils() * m_mils2IUscalefactor, 0 ) );
         gal->Scale( VECTOR2D( -1.0, 1.0 ) );
-
-        int right = pageWidth - viewport.GetLeft();
-        int left = right - viewport.GetWidth();
-        viewport.SetOrigin( left, viewport.GetTop() );
     }
 
     DS_PAINTER ws_painter( gal );
@@ -135,10 +127,7 @@ void DS_PROXY_VIEW_ITEM::ViewDraw( int aLayer, VIEW* aView ) const
 
     // Draw all the components that make the drawing sheet
     for( DS_DRAW_ITEM_BASE* item = drawList.GetFirst(); item; item = drawList.GetNext() )
-    {
-        if( viewport.Intersects( item->GetApproxBBox() ) )
-            ws_painter.Draw( item, LAYER_DRAWINGSHEET );
-    }
+        ws_painter.Draw( item, LAYER_DRAWINGSHEET );
 
     // Draw gray line that outlines the sheet size
     if( settings->GetShowPageLimits() )

common/eda_base_frame.cpp

@@ -55,15 +55,13 @@
 #include <widgets/paged_dialog.h>
 #include <widgets/wx_infobar.h>
 #include <widgets/wx_aui_art_providers.h>
-#include <widgets/wx_grid.h>
-#include <widgets/wx_treebook.h>
 #include <wx/app.h>
 #include <wx/config.h>
 #include <wx/display.h>
 #include <wx/stdpaths.h>
 #include <wx/string.h>
+#include <wx/treebook.h>
 #include <kiplatform/app.h>
-#include <kiplatform/io.h>
 #include <kiplatform/ui.h>
 
 #include <functional>
@@ -168,28 +166,15 @@ EDA_BASE_FRAME::EDA_BASE_FRAME( wxWindow* aParent, FRAME_T aFrameType, const wxS
 }
 
 
-wxWindow* findQuasiModalDialog( wxWindow* aParent )
-{
-    for( wxWindow* child : aParent->GetChildren() )
-    {
-        if( DIALOG_SHIM* dlg = dynamic_cast<DIALOG_SHIM*>( child ) )
-        {
-            if( dlg->IsQuasiModal() )
-                return dlg;
-
-            if( wxWindow* nestedDlg = findQuasiModalDialog( child ) )
-                return nestedDlg;
-        }
-    }
-
-    return nullptr;
-}
-
-
 wxWindow* EDA_BASE_FRAME::findQuasiModalDialog()
 {
-    if( wxWindow* dlg = ::findQuasiModalDialog( this ) )
-        return dlg;
+    for( wxWindow* iter : GetChildren() )
+    {
+        DIALOG_SHIM* dlg = dynamic_cast<DIALOG_SHIM*>( iter );
+
+        if( dlg && dlg->IsQuasiModal() )
+            return dlg;
+    }
 
     // FIXME: CvPcb is currently implemented on top of KIWAY_PLAYER rather than DIALOG_SHIM,
     // so we have to look for it separately.
@@ -234,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 )
@@ -418,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 );
@@ -1022,45 +1001,26 @@ void EDA_BASE_FRAME::ShowPreferences( wxString aStartPage, wxString aStartParent
 {
     wxBeginBusyCursor( wxHOURGLASS_CURSOR );
 
-    PAGED_DIALOG dlg( this, _( "Preferences" ), true, wxEmptyString, wxSize( 980, 560 ) );
+    PAGED_DIALOG dlg( this, _( "Preferences" ), true );
 
     dlg.SetEvtHandlerEnabled( false );
+    wxTreebook*  book = dlg.GetTreebook();
 
-    WX_TREEBOOK*            book = dlg.GetTreebook();
     PANEL_HOTKEYS_EDITOR*   hotkeysPanel = new PANEL_HOTKEYS_EDITOR( this, book, false );
     KIFACE*                 kiface = nullptr;
     std::vector<int>        expand;
 
     Kiway().GetActions( hotkeysPanel->ActionsList() );
 
-    book->AddLazyPage(
-            []( wxWindow* aParent ) -> wxWindow*
-            {
-                return new PANEL_COMMON_SETTINGS( aParent );
-            },
-            _( "Common" ) );
-
-    book->AddLazyPage(
-            []( wxWindow* aParent ) -> wxWindow*
-            {
-                return new PANEL_MOUSE_SETTINGS( aParent );
-            }, _( "Mouse and Touchpad" ) );
-
+    book->AddPage( new PANEL_COMMON_SETTINGS( &dlg, book ), _( "Common" ) );
+    book->AddPage( new PANEL_MOUSE_SETTINGS( &dlg, book ), _( "Mouse and Touchpad" ) );
     book->AddPage( hotkeysPanel, _( "Hotkeys" ) );
 
 #ifdef KICAD_USE_SENTRY
-    book->AddLazyPage(
-            []( wxWindow* aParent ) -> wxWindow*
-            {
-                return new PANEL_DATA_COLLECTION( aParent );
-            }, _( "Data Collection" ) );
+    book->AddPage( new PANEL_DATA_COLLECTION( &dlg, book ), _( "Data Collection" ) );
 #endif
 
-#define LAZY_CTOR( key )                                                \
-        [=]( wxWindow* aParent )                                        \
-        {                                                               \
-            return kiface->CreateKiWindow( aParent, key, &Kiway() );    \
-        }
+#define CREATE_PANEL( key ) kiface->CreateKiWindow( book, key, &Kiway() )
 
     // If a dll is not loaded, the loader will show an error message.
 
@@ -1074,19 +1034,20 @@ void EDA_BASE_FRAME::ShowPreferences( wxString aStartPage, wxString aStartParent
             expand.push_back( book->GetPageCount() );
 
         book->AddPage( new wxPanel( book ), _( "Symbol Editor" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_SYM_DISP_OPTIONS ), _( "Display Options" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_SYM_EDIT_OPTIONS ), _( "Editing Options" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_SYM_COLORS ), _( "Colors" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_SYM_DISP_OPTIONS ), _( "Display Options" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_SYM_EDIT_OPTIONS ), _( "Editing Options" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_SYM_COLORS ), _( "Colors" ) );
 
         if( GetFrameType() == FRAME_SCH )
             expand.push_back( book->GetPageCount() );
 
         book->AddPage( new wxPanel( book ), _( "Schematic Editor" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_SCH_DISP_OPTIONS ), _( "Display Options" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_SCH_EDIT_OPTIONS ), _( "Editing Options" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_SCH_ANNO_OPTIONS ), _( "Annotation Options" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_SCH_COLORS ), _( "Colors" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_SCH_FIELD_NAME_TEMPLATES ), _( "Field Name Templates" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_SCH_DISP_OPTIONS ), _( "Display Options" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_SCH_EDIT_OPTIONS ), _( "Editing Options" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_SCH_ANNO_OPTIONS ), _( "Annotation Options" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_SCH_COLORS ), _( "Colors" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_SCH_FIELD_NAME_TEMPLATES ),
+                          _( "Field Name Templates" ) );
     }
     catch( ... )
     {
@@ -1102,29 +1063,29 @@ void EDA_BASE_FRAME::ShowPreferences( wxString aStartPage, wxString aStartParent
             expand.push_back( book->GetPageCount() );
 
         book->AddPage( new wxPanel( book ), _( "Footprint Editor" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_FP_DISPLAY_OPTIONS ), _( "Display Options" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_FP_EDIT_OPTIONS ), _( "Editing Options" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_FP_COLORS ), _( "Colors" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_FP_DEFAULT_VALUES ), _( "Default Values" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_FP_DISPLAY_OPTIONS ), _( "Display Options" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_FP_EDIT_OPTIONS ), _( "Editing Options" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_FP_COLORS ), _( "Colors" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_FP_DEFAULT_VALUES ), _( "Default Values" ) );
 
         if( GetFrameType() ==  FRAME_PCB_EDITOR )
             expand.push_back( book->GetPageCount() );
 
         book->AddPage( new wxPanel( book ), _( "PCB Editor" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_PCB_DISPLAY_OPTIONS ), _( "Display Options" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_PCB_EDIT_OPTIONS ), _( "Editing Options" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_PCB_COLORS ), _( "Colors" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_PCB_ACTION_PLUGINS ), _( "Action Plugins" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_PCB_ORIGINS_AXES ), _( "Origins & Axes" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_PCB_DISPLAY_OPTIONS ), _( "Display Options" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_PCB_EDIT_OPTIONS ), _( "Editing Options" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_PCB_COLORS ), _( "Colors" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_PCB_ACTION_PLUGINS ), _( "Action Plugins" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_PCB_ORIGINS_AXES ), _( "Origins & Axes" ) );
 
         if( GetFrameType() == FRAME_PCB_DISPLAY3D )
             expand.push_back( book->GetPageCount() );
 
         book->AddPage( new wxPanel( book ), _( "3D Viewer" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_3DV_DISPLAY_OPTIONS ), _( "General" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_3DV_OPENGL ), _( "Realtime Renderer" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_3DV_RAYTRACING ), _( "Raytracing Renderer" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_3DV_COLORS ), _( "Colors" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_3DV_DISPLAY_OPTIONS ), _( "General" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_3DV_OPENGL ), _( "Realtime Renderer" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_3DV_RAYTRACING ), _( "Raytracing Renderer" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_3DV_COLORS ), _( "Colors" ) );
     }
     catch( ... )
     {
@@ -1140,9 +1101,9 @@ void EDA_BASE_FRAME::ShowPreferences( wxString aStartPage, wxString aStartParent
             expand.push_back( book->GetPageCount() );
 
         book->AddPage( new wxPanel( book ), _( "Gerber Viewer" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_GBR_DISPLAY_OPTIONS ), _( "Display Options" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_GBR_COLORS ), _( "Colors" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_GBR_EXCELLON_OPTIONS ), _( "Excellon Options" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_GBR_DISPLAY_OPTIONS ), _( "Display Options" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_GBR_COLORS ), _( "Colors" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_GBR_EXCELLON_OPTIONS ), _( "Excellon Options" ) );
     }
     catch( ... )
     {
@@ -1157,14 +1118,10 @@ void EDA_BASE_FRAME::ShowPreferences( wxString aStartPage, wxString aStartParent
             expand.push_back( book->GetPageCount() );
 
         book->AddPage( new wxPanel( book ), _( "Drawing Sheet Editor" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_DS_DISPLAY_OPTIONS ), _( "Display Options" ) );
-        book->AddLazySubPage( LAZY_CTOR( PANEL_DS_COLORS ), _( "Colors" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_DS_DISPLAY_OPTIONS ), _( "Display Options" ) );
+        book->AddSubPage( CREATE_PANEL( PANEL_DS_COLORS ), _( "Colors" ) );
 
-        book->AddLazyPage(
-                []( wxWindow* aParent ) -> wxWindow*
-                {
-                    return new PANEL_PCM_SETTINGS( aParent );
-                }, _( "Plugin and Content Manager" ) );
+        book->AddPage( new PANEL_PCM_SETTINGS( book ), _( "Plugin and Content Manager" ) );
     }
     catch( ... )
     {
@@ -1192,7 +1149,7 @@ void EDA_BASE_FRAME::ShowPreferences( wxString aStartPage, wxString aStartParent
         dlg.Kiway().CommonSettingsChanged( false, false );
     }
 
-#undef LAZY_CTOR
+#undef CREATE_PANEL
 }
 
 
@@ -1273,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!" ) );
@@ -1304,9 +1261,6 @@ void EDA_BASE_FRAME::CheckForAutoSaveFile( const wxFileName& aFileName )
     // the file name.
     if( response == wxYES )
     {
-        // Preserve the permissions of the current file
-        KIPLATFORM::IO::DuplicatePermissions( aFileName.GetFullPath(), autoSaveFileName.GetFullPath() );
-
         if( !wxRenameFile( autoSaveFileName.GetFullPath(), aFileName.GetFullPath() ) )
         {
             wxMessageBox( _( "The auto save file could not be renamed to the board 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;
@@ -217,31 +212,15 @@ EDA_DRAW_FRAME::~EDA_DRAW_FRAME()
 
 void EDA_DRAW_FRAME::ReleaseFile()
 {
-    if( m_file_checker.get() != nullptr )
-        m_file_checker->UnlockFile();
+    m_file_checker = nullptr;
 }
 
 
 bool EDA_DRAW_FRAME::LockFile( const wxString& aFileName )
 {
-    // We need to explicitly reset here to get the deletion before
-    // we create a new unique_ptr that may be for the same file
-    m_file_checker.reset();
+    m_file_checker = ::LockFile( aFileName );
 
-    m_file_checker = std::make_unique<LOCKFILE>( aFileName );
-
-    if( !m_file_checker->Valid() && m_file_checker->IsLockedByMe() )
-    {
-        // If we cannot acquire the lock but we appear to be the one who
-        // locked it, check to see if there is another KiCad instance running.
-        // If there is not, then we can override the lock.  This could happen if
-        // KiCad crashed or was interrupted
-        if( !Pgm().SingleInstance()->IsAnotherRunning() )
-            m_file_checker->OverrideLock();
-    }
-    // If the file is valid, return true.  This could mean that the file is
-    // locked or it could mean that the file is read-only
-    return m_file_checker->Valid();
+    return m_file_checker && !m_file_checker->IsAnotherRunning();
 }
 
 
@@ -306,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 );
@@ -630,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 );
 }
@@ -758,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();
 
@@ -785,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 );
     }
 }
@@ -858,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
@@ -876,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;
@@ -886,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 );
@@ -900,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 );
@@ -993,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 )
@@ -1006,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 );
@@ -1037,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 )
     {
@@ -1057,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

@@ -114,12 +114,6 @@ wxString EDA_ITEM::GetItemDescription( UNITS_PROVIDER* aUnitsProvider ) const
 }
 
 
-bool isWordChar( const wxUniChar& c )
-{
-    return wxIsalnum( c ) || c == '_';
-}
-
-
 bool EDA_ITEM::Matches( const wxString& aText, const EDA_SEARCH_DATA& aSearchData ) const
 {
     wxString text = aText;
@@ -135,12 +129,6 @@ bool EDA_ITEM::Matches( const wxString& aText, const EDA_SEARCH_DATA& aSearchDat
         searchText.MakeUpper();
     }
 
-    auto isWordChar =
-            []( const wxUniChar& c )
-            {
-                return wxIsalnum( c ) || c == '_';
-            };
-
     if( aSearchData.matchMode == EDA_SEARCH_MATCH_MODE::WHOLEWORD )
     {
         int ii = 0;
@@ -155,8 +143,8 @@ bool EDA_ITEM::Matches( const wxString& aText, const EDA_SEARCH_DATA& aSearchDat
             ii = next;
             next += searchText.length();
 
-            bool startOK = ( ii == 0 || !isWordChar( text.GetChar( ii - 1 ) ) );
-            bool endOK = ( next == (int) text.length() || !isWordChar( text.GetChar( next ) ) );
+            bool startOK = ( ii == 0 || !wxIsalnum( text.GetChar( ii - 1 ) ) );
+            bool endOK = ( next == (int) text.length() || !wxIsalnum( text.GetChar( next ) ) );
 
             if( startOK && endOK )
                 return true;
@@ -213,8 +201,8 @@ bool EDA_ITEM::Replace( const EDA_SEARCH_DATA& aSearchData, wxString& aText )
 
         if( aSearchData.matchMode == EDA_SEARCH_MATCH_MODE::WHOLEWORD )
         {
-            startOK = ( ii == 0 || !isWordChar( text.GetChar( ii - 1 ) ) );
-            endOK = ( next == (int) text.length() || !isWordChar( text.GetChar( next ) ) );
+            startOK = ( ii == 0 || !wxIsalnum( text.GetChar( ii - 1 ) ) );
+            endOK = ( next == (int) text.length() || !wxIsalnum( text.GetChar( next ) ) );
         }
         else
         {
@@ -404,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

@@ -417,11 +417,11 @@ void EDA_SHAPE::RebuildBezierToSegmentsPointsList( int aMinSegLen )
     // Ensure last point respects aMinSegLen parameter
     if( m_bezierPoints.size() > 2 )
     {
-        int idx = m_bezierPoints.size() - 1;
+        int idx = m_bezierPoints.size()-1;
 
-        if( VECTOR2I( m_bezierPoints[idx] - m_bezierPoints[idx] - 1 ).EuclideanNorm() < aMinSegLen )
+        if( VECTOR2I( m_bezierPoints[idx] - m_bezierPoints[idx]-1 ).EuclideanNorm() < aMinSegLen )
         {
-            m_bezierPoints[idx - 1] = m_bezierPoints[idx];
+            m_bezierPoints[idx]-1 = m_bezierPoints[idx];
             m_bezierPoints.pop_back();
         }
     }
@@ -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
@@ -91,7 +90,6 @@ GR_TEXT_V_ALIGN_T EDA_TEXT::MapVertJustify( int aVertJustify )
 EDA_TEXT::EDA_TEXT( const EDA_IU_SCALE& aIuScale, const wxString& aText ) :
         m_text( aText ),
         m_IuScale( aIuScale ),
-        m_render_cache_font( nullptr ),
         m_bounding_box_cache_valid( false ),
         m_bounding_box_cache_line( -1 ),
         m_bounding_box_cache_inverted( false )
@@ -112,19 +110,15 @@ EDA_TEXT::EDA_TEXT( const EDA_TEXT& aText ) :
     m_attributes = aText.m_attributes;
     m_pos = aText.m_pos;
 
-    m_render_cache_font = aText.m_render_cache_font;
     m_render_cache_text = aText.m_render_cache_text;
     m_render_cache_angle = aText.m_render_cache_angle;
-    m_render_cache_offset = aText.m_render_cache_offset;
 
     m_render_cache.clear();
 
     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;
@@ -148,19 +142,15 @@ EDA_TEXT& EDA_TEXT::operator=( const EDA_TEXT& aText )
     m_attributes = aText.m_attributes;
     m_pos = aText.m_pos;
 
-    m_render_cache_font = aText.m_render_cache_font;
     m_render_cache_text = aText.m_render_cache_text;
     m_render_cache_angle = aText.m_render_cache_angle;
-    m_render_cache_offset = aText.m_render_cache_offset;
 
     m_render_cache.clear();
 
     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;
@@ -398,18 +388,10 @@ void EDA_TEXT::SetTextY( int aY )
 
 void EDA_TEXT::Offset( const VECTOR2I& aOffset )
 {
-    if( aOffset.x == 0 && aOffset.y == 0 )
-        return;
-
     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;
 }
@@ -469,26 +451,23 @@ std::vector<std::unique_ptr<KIFONT::GLYPH>>*
 EDA_TEXT::GetRenderCache( const KIFONT::FONT* aFont, const wxString& forResolvedText,
                           const VECTOR2I& aOffset ) const
 {
-    if( aFont->IsOutline() )
+    if( getDrawFont()->IsOutline() )
     {
         EDA_ANGLE resolvedAngle = GetDrawRotation();
 
         if( m_render_cache.empty()
-                || m_render_cache_font != aFont
                 || m_render_cache_text != forResolvedText
                 || m_render_cache_angle != resolvedAngle
                 || m_render_cache_offset != aOffset )
         {
             m_render_cache.clear();
 
-            const KIFONT::OUTLINE_FONT* font = static_cast<const KIFONT::OUTLINE_FONT*>( aFont );
-            TEXT_ATTRIBUTES             attrs = GetAttributes();
+            KIFONT::OUTLINE_FONT* font = static_cast<KIFONT::OUTLINE_FONT*>( getDrawFont() );
+            TEXT_ATTRIBUTES       attrs = GetAttributes();
 
             attrs.m_Angle = resolvedAngle;
 
-            font->GetLinesAsGlyphs( &m_render_cache, forResolvedText, GetDrawPos() + aOffset,
-                                    attrs );
-            m_render_cache_font = aFont;
+            font->GetLinesAsGlyphs( &m_render_cache, GetShownText(), GetDrawPos() + aOffset, attrs );
             m_render_cache_angle = resolvedAngle;
             m_render_cache_text = forResolvedText;
             m_render_cache_offset = aOffset;
@@ -535,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() )
@@ -563,16 +542,12 @@ BOX2I EDA_TEXT::GetTextBox( int aLine, bool aInvertY ) const
     // bounding box will be moved later according to the actual text options
     wxSize   textsize = wxSize( extents.x, extents.y );
     VECTOR2I pos = drawPos;
-    int      fudgeFactor = extents.y * 0.17;
-
-    if( font->IsStroke() )
-        textsize.y += fudgeFactor;
 
     if( IsMultilineAllowed() && aLine > 0 && aLine < (int) strings.GetCount() )
         pos.y -= KiROUND( aLine * font->GetInterline( fontSize.y ) );
 
     if( text.Contains( wxT( "~{" ) ) )
-        overbarOffset = extents.y / 6;
+        overbarOffset = extents.y / 14;
 
     if( aInvertY )
         pos.y = -pos.y;
@@ -580,7 +555,7 @@ BOX2I EDA_TEXT::GetTextBox( int aLine, bool aInvertY ) const
     bbox.SetOrigin( pos );
 
     // for multiline texts and aLine < 0, merge all rectangles (aLine == -1 signals all lines)
-    if( IsMultilineAllowed() && aLine < 0 && strings.GetCount() > 1 )
+    if( IsMultilineAllowed() && aLine < 0 && strings.GetCount() )
     {
         for( unsigned ii = 1; ii < strings.GetCount(); ii++ )
         {
@@ -594,8 +569,6 @@ BOX2I EDA_TEXT::GetTextBox( int aLine, bool aInvertY ) const
         textsize.y += KiROUND( ( strings.GetCount() - 1 ) * font->GetInterline( fontSize.y ) );
     }
 
-    textsize.y += overbarOffset;
-
     bbox.SetSize( textsize );
 
     /*
@@ -624,16 +597,14 @@ BOX2I EDA_TEXT::GetTextBox( int aLine, bool aInvertY ) const
     switch( GetVertJustify() )
     {
     case GR_TEXT_V_ALIGN_TOP:
-        bbox.Offset( 0, -fudgeFactor );
         break;
 
     case GR_TEXT_V_ALIGN_CENTER:
-        bbox.SetY( bbox.GetY() - bbox.GetHeight() / 2 );
+        bbox.SetY( bbox.GetY() - ( bbox.GetHeight() + overbarOffset ) / 2 );
         break;
 
     case GR_TEXT_V_ALIGN_BOTTOM:
-        bbox.SetY( bbox.GetY() - bbox.GetHeight() );
-        bbox.Offset( 0, fudgeFactor );
+        bbox.SetY( bbox.GetY() - ( bbox.GetHeight() + overbarOffset ) );
         break;
     }
 
@@ -681,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() );
 
@@ -692,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() );
     }
 }
 
@@ -881,33 +851,18 @@ void EDA_TEXT::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControl
 
 
 std::shared_ptr<SHAPE_COMPOUND> EDA_TEXT::GetEffectiveTextShape( bool aTriangulate,
-                                                                 const BOX2I& aBBox,
-                                                                 const EDA_ANGLE& aAngle ) const
+                                                                 bool aUseTextRotation ) const
 {
     std::shared_ptr<SHAPE_COMPOUND> shape = std::make_shared<SHAPE_COMPOUND>();
     KIGFX::GAL_DISPLAY_OPTIONS      empty_opts;
     KIFONT::FONT*                   font = getDrawFont();
     int                             penWidth = GetEffectiveTextPenWidth();
-    wxString                        shownText( GetShownText( true ) );
-    VECTOR2I                        drawPos = GetDrawPos();
     TEXT_ATTRIBUTES                 attrs = GetAttributes();
 
-    std::vector<std::unique_ptr<KIFONT::GLYPH>>* cache = nullptr;
-
-    if( aBBox.GetWidth() )
-    {
-        drawPos = aBBox.GetCenter();
-        attrs.m_Halign = GR_TEXT_H_ALIGN_CENTER;
-        attrs.m_Valign = GR_TEXT_V_ALIGN_CENTER;
-        attrs.m_Angle = aAngle;
-    }
-    else
-    {
+    if( aUseTextRotation )
         attrs.m_Angle = GetDrawRotation();
-
-        if( font->IsOutline() )
-            cache = GetRenderCache( font, shownText, VECTOR2I() );
-    }
+    else
+        attrs.m_Angle = ANGLE_0;
 
     if( aTriangulate )
     {
@@ -929,10 +884,7 @@ std::shared_ptr<SHAPE_COMPOUND> EDA_TEXT::GetEffectiveTextShape( bool aTriangula
                     shape->AddShape( triShape );
                 } );
 
-        if( cache )
-            callback_gal.DrawGlyphs( *cache );
-        else
-            font->Draw( &callback_gal, shownText, drawPos, attrs );
+        font->Draw( &callback_gal, GetShownText(), GetDrawPos(), attrs );
     }
     else
     {
@@ -949,10 +901,7 @@ std::shared_ptr<SHAPE_COMPOUND> EDA_TEXT::GetEffectiveTextShape( bool aTriangula
                     shape->AddShape( aPoly.Clone() );
                 } );
 
-        if( cache )
-            callback_gal.DrawGlyphs( *cache );
-        else
-            font->Draw( &callback_gal, shownText, drawPos, attrs );
+        font->Draw( &callback_gal, GetShownText(), GetDrawPos(), attrs );
     }
 
     return shape;
@@ -993,6 +942,41 @@ int EDA_TEXT::Compare( const EDA_TEXT* aOther ) const
 }
 
 
+void EDA_TEXT::TransformBoundingBoxToPolygon( SHAPE_POLY_SET* aBuffer, int aClearance ) const
+{
+    if( GetText().Length() == 0 )
+        return;
+
+    VECTOR2I corners[4];    // Buffer of polygon corners
+    BOX2I    rect = GetTextBox();
+
+    // TrueType bounding boxes aren't guaranteed to include all descenders, diacriticals, etc.
+    // Since we use this for zone knockouts and DRC, we need something more accurate.
+    if( getDrawFont()->IsOutline() )
+        rect = GetEffectiveTextShape( false, false )->BBox();
+
+    rect.Inflate( aClearance );
+
+    corners[0].x = rect.GetOrigin().x;
+    corners[0].y = rect.GetOrigin().y;
+    corners[1].y = corners[0].y;
+    corners[1].x = rect.GetRight();
+    corners[2].x = corners[1].x;
+    corners[2].y = rect.GetBottom();
+    corners[3].y = corners[2].y;
+    corners[3].x = corners[0].x;
+
+    aBuffer->NewOutline();
+
+    for( VECTOR2I& corner : corners )
+    {
+        RotatePoint( corner, GetDrawPos(), GetDrawRotation() );
+
+        aBuffer->Append( corner.x, corner.y );
+    }
+}
+
+
 bool EDA_TEXT::ValidateHyperlink( const wxString& aURL )
 {
     if( aURL.IsEmpty() || IsGotoPageHref( aURL ) )

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/exceptions.cpp

@@ -120,18 +120,10 @@ FUTURE_FORMAT_ERROR::FUTURE_FORMAT_ERROR( const PARSE_ERROR& aParseError,
                                           const wxString& aRequiredVersion ) :
         PARSE_ERROR()
 {
-    if( const FUTURE_FORMAT_ERROR* ffe = dynamic_cast<const FUTURE_FORMAT_ERROR*>( &aParseError ) )
-    {
-        requiredVersion = ffe->requiredVersion;
-        problem = ffe->Problem();
-    }
-    else
-    {
-        init( aRequiredVersion );
+    init( aRequiredVersion );
 
-        if( !aParseError.Problem().IsEmpty() )
-            problem += wxS( "\n\n" ) + _( "Full error text:" ) + wxS( "\n" ) + aParseError.Problem();
-    }
+    if( !aParseError.Problem().IsEmpty() )
+        problem += wxS( "\n\n" ) + _( "Full error text:" ) + wxS( "\n" ) + aParseError.Problem();
 
     lineNumber = aParseError.lineNumber;
     byteIndex = aParseError.byteIndex;

common/filename_resolver.cpp

@@ -253,6 +253,11 @@ wxString FILENAME_RESOLVER::ResolvePath( const wxString& aFileName, const wxStri
     // first attempt to use the name as specified:
     wxString tname = aFileName;
 
+    #ifdef _WIN32
+    // translate from KiCad's internal UNIX-like path to MSWin paths
+    tname.Replace( wxT( "/" ), wxT( "\\" ) );
+    #endif
+
     // Note: variable expansion must preferably be performed via a threadsafe wrapper for the
     // getenv() system call. If we allow the wxFileName::Normalize() routine to perform expansion
     // then we will have a race condition since wxWidgets does not assure a threadsafe wrapper

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,13 +281,13 @@ 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() )
     {
         // Inflate by a bit more than thickness/2 to catch diacriticals, descenders, etc.
-        boundingBox.Inflate( KiROUND( aThickness * 1.5 ) );
+        boundingBox.Inflate( KiROUND( aThickness * 1.25 ) );
     }
     else if( IsOutline() )
     {
@@ -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()
@@ -47,6 +45,7 @@ wxString FONTCONFIG::Version()
 
 FONTCONFIG::FONTCONFIG()
 {
+    (void) FcInitLoadConfigAndFonts();
 };
 
 
@@ -62,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 );
 
@@ -183,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 )
@@ -232,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;
                 }
             }
         }
@@ -269,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 )
@@ -284,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 )
@@ -295,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
@@ -350,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 );
             }
@@ -361,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;
@@ -362,9 +354,6 @@ VECTOR2I OUTLINE_FONT::getTextAsGlyphsUnlocked( BOX2I* aBBox,
 
     VECTOR2I cursor( 0, 0 );
 
-    if( aGlyphs )
-        aGlyphs->reserve( glyphCount );
-
     for( unsigned int i = 0; i < glyphCount; i++ )
     {
         // Don't process glyphs that were already included in a previous cluster
@@ -377,13 +366,13 @@ 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
                 matrix.yy = (FT_Fixed) ( 1 * 0x10000L );
 
-                FT_Set_Transform( face, &matrix, 0 );
+                FT_Set_Transform(face, &matrix,0);
             }
 
             FT_Load_Glyph( face, glyphInfo[i].codepoint, FT_LOAD_NO_BITMAP );
@@ -406,8 +395,6 @@ VECTOR2I OUTLINE_FONT::getTextAsGlyphsUnlocked( BOX2I* aBBox,
                 GLYPH_POINTS     points = c.m_Points;
                 SHAPE_LINE_CHAIN shape;
 
-                shape.ReservePoints( points.size() );
-
                 for( const VECTOR2D& v : points )
                 {
                     VECTOR2D pt( v + cursor );
@@ -452,6 +439,13 @@ VECTOR2I OUTLINE_FONT::getTextAsGlyphsUnlocked( BOX2I* aBBox,
                 }
             }
 
+            // FONT TODO we might not want to do Fracture() here;
+            // knockout text (eg. silkscreen labels with a background) will
+            // need to do that after the contours have been turned into holes
+            // and vice versa
+            if( glyph->HasHoles() )
+                glyph->Fracture( SHAPE_POLY_SET::PM_FAST ); // FONT TODO verify aFastMode
+
             aGlyphs->push_back( std::move( glyph ) );
         }
 
@@ -461,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 );
 
@@ -492,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();