Fix MSVC build error for VC 17.13+

(cherry picked from commit 7eb07c00a2)

50171749 Fix MSVC build in 17.13.2

Co-authored-by: Jan Wichmann <j-wichmann@gmx.net>

.gitlab/Windows-CI.yml

@@ -4,16 +4,16 @@
 win64_build:
   stage: build
   tags:
-    - kicad-windows-1809
+    - kicad-windows-ltsc2022
   interruptible: false
-  image: registry.gitlab.com/kicad/kicad-ci/windows-build-image/win1809-msvc:latest
+  image: registry.gitlab.com/kicad/kicad-ci/windows-build-image/ltsc2022-msvc:latest
   variables:
     VCPKG_BINARY_SOURCES: 'nuget,kicad,readwrite'
     # Switch the compressor to fastzip and reduce the compression level
     FF_USE_FASTZIP: "true"
     CACHE_COMPRESSION_LEVEL: "fast"
   cache:
-    key: win64-vcpkg-"$CI_COMMIT_REF_SLUG"
+    key: win64-vcpkg-$CI_COMMIT_REF_SLUG
     paths:
       - build\windows\vcpkg_installed
       - .vcpkgCache

.gitlab/macOS-CI.yml

@@ -15,7 +15,7 @@ macos_build:
     - cd build/macos
     - cmake
       -G Ninja
-      -DCMAKE_TOOLCHAIN_FILE=/Users/ci/kicad-mac-builder/toolchain/kicad-mac-builder.cmake
+      -DCMAKE_TOOLCHAIN_FILE=/Users/$USER/kicad-mac-builder/toolchain/kicad-mac-builder.cmake
       ../../
     - cmake --build . 2>&1 | tee compilation_log.txt
     - cd ../../

3d-viewer/3d_canvas/board_adapter.cpp

@@ -229,7 +229,7 @@ void BOARD_ADAPTER::ReloadColorSettings() noexcept
 
     try
     {
-        cfg = Pgm().GetSettingsManager().GetAppSettings<PCBNEW_SETTINGS>();
+        cfg = Pgm().GetSettingsManager().GetAppSettings<PCBNEW_SETTINGS>( "pcbnew" );
     }
     catch( const std::runtime_error& e )
     {

3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp

@@ -98,6 +98,7 @@ void BOARD_ADAPTER::addText( const EDA_TEXT* aText, CONTAINER_2D_BASE* aContaine
     TEXT_ATTRIBUTES            attrs = aText->GetAttributes();
     float                      penWidth_3DU = TO_3DU( aText->GetEffectiveTextPenWidth() );
     KIFONT::FONT*              font = aText->GetFont();
+    wxString                   shownText = aText->GetShownText( true );
 
     if( !font )
         font = KIFONT::FONT::GetFont( wxEmptyString, aText->IsBold(), aText->IsItalic() );
@@ -132,8 +133,15 @@ void BOARD_ADAPTER::addText( const EDA_TEXT* aText, CONTAINER_2D_BASE* aContaine
 
         attrs.m_Angle = aText->GetDrawRotation();
 
-        font->Draw( &callback_gal, aText->GetShownText( true ), aText->GetDrawPos(), attrs,
-                    aOwner->GetFontMetrics() );
+        if( auto* cache = aText->GetRenderCache( font, shownText ) )
+        {
+            callback_gal.DrawGlyphs( *cache );
+        }
+        else
+        {
+            font->Draw( &callback_gal, shownText, aText->GetDrawPos(), attrs,
+                        aOwner->GetFontMetrics() );
+        }
     }
 }
 

3d-viewer/3d_canvas/create_layer_items.cpp

@@ -643,12 +643,33 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
             // add also this shape to the plated copper polygon list if required
             if( cfg.differentiate_plated_copper )
             {
-                if( layer == F_Cu )
-                    item->TransformShapeToPolygon( *m_frontPlatedCopperPolys, F_Cu,
-                                                    0, maxError, ERROR_INSIDE );
-                else if( layer == B_Cu )
-                    item->TransformShapeToPolygon( *m_backPlatedCopperPolys, B_Cu,
-                                                    0, maxError, ERROR_INSIDE );
+                // Note: for TEXT and TEXTBOX, TransformShapeToPolygon returns the bounding
+                // box shape, not the exact text shape. So it is not used for these items
+                if( layer == F_Cu || layer == B_Cu )
+                {
+                    SHAPE_POLY_SET* platedCopperPolys = layer == F_Cu
+                                                            ? m_frontPlatedCopperPolys
+                                                            : m_backPlatedCopperPolys;
+
+                    if( item->Type() == PCB_TEXTBOX_T )
+                    {
+                        PCB_TEXTBOX* text_box = static_cast<PCB_TEXTBOX*>( item );
+                        text_box->TransformTextToPolySet( *platedCopperPolys,
+                                                           0, maxError, ERROR_INSIDE );
+                        // Add box outlines
+                        text_box->PCB_SHAPE::TransformShapeToPolygon( *platedCopperPolys, layer,
+                                                                       0, maxError, ERROR_INSIDE );
+                    }
+                    else if( item->Type() == PCB_TEXT_T )
+                    {
+                        static_cast<PCB_TEXT*>( item )->TransformTextToPolySet(
+                                                                *platedCopperPolys,
+                                                                0, maxError, ERROR_INSIDE );
+                    }
+                    else
+                        item->TransformShapeToPolygon( *platedCopperPolys, layer,
+                                                        0, maxError, ERROR_INSIDE );
+                }
             }
         }
     }

3d-viewer/3d_canvas/eda_3d_canvas.cpp

@@ -752,6 +752,11 @@ void EDA_3D_CANVAS::OnLeftDown( wxMouseEvent& event )
     SetFocus();
     stop_editingTimeOut_Timer();
 
+    // Ensure m_camera.m_lastPosition (current mouse position) is up to date for
+    // future drag events (can be not the case when left clicking after
+    // opening a context menu)
+    OnMouseMoveCamera( event );
+
     if( !event.Dragging() && ( m_3d_render_raytracing != nullptr ) )
     {
         RAY mouseRay = getRayAtCurrentMousePosition();

3d-viewer/3d_canvas/eda_3d_canvas.h

@@ -216,6 +216,8 @@ public:
      */
     void DoRePaint();
 
+    void OnCloseWindow( wxCloseEvent& event );
+
 private:
     // The wxPaintEvent event. mainly calls DoRePaint()
     void OnPaint( wxPaintEvent& aEvent );
@@ -226,14 +228,13 @@ private:
 
     void OnMouseWheel( wxMouseEvent& event );
 
-    void   OnMagnify( wxMouseEvent& event );
+    void OnMagnify( wxMouseEvent& event );
     void OnMouseMove( wxMouseEvent& event );
     void OnLeftDown( wxMouseEvent& event );
     void OnLeftUp( wxMouseEvent& event );
     void OnMiddleUp( wxMouseEvent& event );
     void OnMiddleDown( wxMouseEvent& event );
     void OnTimerTimeout_Editing( wxTimerEvent& event );
-    void OnCloseWindow( wxCloseEvent& event );
     void OnResize( wxSizeEvent& event );
     void OnTimerTimeout_Redraw( wxTimerEvent& event );
 

3d-viewer/3d_navlib/CMakeLists.txt

@@ -1,6 +1,8 @@
     add_library(3d-viewer_navlib STATIC
 	    "nl_3d_viewer_plugin.cpp"
 	    "nl_3d_viewer_plugin_impl.cpp"
+        "nl_footprint_properties_plugin.cpp"
+        "nl_footprint_properties_plugin_impl.cpp"
     )
 
     # 3d-viewer_navlib depends on make_lexer outputs in common

3d-viewer/3d_navlib/nl_3d_viewer_plugin.cpp

@@ -25,20 +25,17 @@
 
 
 NL_3D_VIEWER_PLUGIN::NL_3D_VIEWER_PLUGIN( EDA_3D_CANVAS* aViewport )
- : m_impl( nullptr )
 {
     if( ADVANCED_CFG::GetCfg().m_Use3DConnexionDriver
         && KIPLATFORM::DRIVERS::Valid3DConnexionDriverVersion() )
     {
-        m_impl = new NL_3D_VIEWER_PLUGIN_IMPL( aViewport );
+        m_impl = std::make_unique<NL_3D_VIEWER_PLUGIN_IMPL>( aViewport, "KiCAD 3D" );
+        m_impl->Connect();
     }
 }
 
 
-NL_3D_VIEWER_PLUGIN::~NL_3D_VIEWER_PLUGIN()
-{
-    delete m_impl;
-}
+NL_3D_VIEWER_PLUGIN::~NL_3D_VIEWER_PLUGIN() = default;
 
 
 void NL_3D_VIEWER_PLUGIN::SetFocus( bool focus )

3d-viewer/3d_navlib/nl_3d_viewer_plugin.h

@@ -26,6 +26,8 @@
 #ifndef NL_3D_VIEWER_PLUGIN_H_
 #define NL_3D_VIEWER_PLUGIN_H_
 
+#include <memory>
+
 // Forward declarations.
 class EDA_3D_CANVAS;
 class NL_3D_VIEWER_PLUGIN_IMPL;
@@ -54,7 +56,7 @@ public:
     void SetFocus( bool aFocus = true );
 
 private:
-    NL_3D_VIEWER_PLUGIN_IMPL* m_impl;
+    std::unique_ptr<NL_3D_VIEWER_PLUGIN_IMPL> m_impl;
 };
 
 #endif // NL_3D_VIEWER_PLUGIN_H_

3d-viewer/3d_navlib/nl_3d_viewer_plugin_impl.cpp

@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2021 3Dconnexion
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2024 3Dconnexion
+ * Copyright (C) 2024 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -27,6 +27,7 @@
 // KiCAD includes
 #include <tool/action_manager.h>
 #include <tool/tool_manager.h>
+#include <tool/tools_holder.h>
 
 // stdlib
 #include <map>
@@ -72,7 +73,7 @@ bool equals( glm::mat<L, C, T, Q> const& aFirst, glm::mat<L, C, T, Q> const& aSe
 }
 
 
-NL_3D_VIEWER_PLUGIN_IMPL::NL_3D_VIEWER_PLUGIN_IMPL( EDA_3D_CANVAS* aCanvas ) :
+NL_3D_VIEWER_PLUGIN_IMPL::NL_3D_VIEWER_PLUGIN_IMPL( EDA_3D_CANVAS* aCanvas, const std::string& aProfileHint ) :
         NAV_3D( false, false ),
         m_canvas( aCanvas ),
         m_capIsMoving( false ),
@@ -80,12 +81,7 @@ NL_3D_VIEWER_PLUGIN_IMPL::NL_3D_VIEWER_PLUGIN_IMPL( EDA_3D_CANVAS* aCanvas ) :
 {
     m_camera = dynamic_cast<TRACK_BALL*>( m_canvas->GetCamera() );
 
-    PutProfileHint( "KiCAD 3D" );
-
-    EnableNavigation( true );
-    PutFrameTimingSource( TimingSource::SpaceMouse );
-
-    exportCommandsAndImages();
+    PutProfileHint( aProfileHint );
 }
 
 
@@ -101,8 +97,19 @@ void NL_3D_VIEWER_PLUGIN_IMPL::SetFocus( bool aFocus )
     NAV_3D::Write( navlib::focus_k, aFocus );
 }
 
-// temporary store for the categories
-typedef std::map<std::string, TDx::CCommandTreeNode*> CATEGORY_STORE;
+
+EDA_3D_CANVAS* NL_3D_VIEWER_PLUGIN_IMPL::GetCanvas() const
+{
+    return m_canvas;
+}
+
+
+void NL_3D_VIEWER_PLUGIN_IMPL::Connect()
+{
+   EnableNavigation(true);
+   PutFrameTimingSource(TimingSource::SpaceMouse);
+   exportCommandsAndImages();
+}
 
 /**
  * Add a category to the store.
@@ -571,7 +578,7 @@ long NL_3D_VIEWER_PLUGIN_IMPL::SetActiveCommand( std::string commandId )
 
         if( parent->IsEnabled() )
         {
-            TOOL_MANAGER* tool_manager = static_cast<PCB_BASE_FRAME*>( parent )->GetToolManager();
+            TOOL_MANAGER* tool_manager = dynamic_cast<TOOLS_HOLDER*>( parent )->GetToolManager();
 
             if( tool_manager == nullptr )
             {

3d-viewer/3d_navlib/nl_3d_viewer_plugin_impl.h

@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2021 3Dconnexion
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2024 3Dconnexion
+ * Copyright (C) 2024 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -42,6 +42,11 @@
 class EDA_3D_CANVAS;
 class TRACK_BALL;
 
+// temporary store for the categories
+typedef std::map<std::string, TDx::CCommandTreeNode*> CATEGORY_STORE;
+
+CATEGORY_STORE::iterator add_category( std::string aCategoryPath, CATEGORY_STORE& aCategoryStore );
+
 // Convenience typedef.
 typedef TDx::SpaceMouse::Navigation3D::CNavigation3D NAV_3D;
 
@@ -56,8 +61,9 @@ public:
      * Initializes a new instance of the NL_3DVIEWER_PLUGIN.
      *
      *  @param aCanvas is the viewport to be navigated.
+     *  @param aProfileHint tells the 3DConnexion UI which profile to use.
      */
-    NL_3D_VIEWER_PLUGIN_IMPL( EDA_3D_CANVAS* aCanvas );
+    NL_3D_VIEWER_PLUGIN_IMPL( EDA_3D_CANVAS* aCanvas, const std::string& aProfileHint );
 
     virtual ~NL_3D_VIEWER_PLUGIN_IMPL();
 
@@ -69,11 +75,21 @@ public:
      */
     void SetFocus( bool aFocus = true );
 
+    /**
+     * Get the m_canvas pointer.
+     */
+    EDA_3D_CANVAS* GetCanvas() const;
+
+    /**
+     * Connect plugin implementation to the driver.
+     */
+    void Connect();
+
 private:
     /**
       * Export the invocable actions and images to the 3Dconnexion UI.
       */
-    void exportCommandsAndImages();
+    virtual void exportCommandsAndImages();
 
     long GetCameraMatrix( navlib::matrix_t& aMatrix ) const override;
     long GetPointerPosition( navlib::point_t& aPosition ) const override;
@@ -111,6 +127,7 @@ private:
     long GetCoordinateSystem( navlib::matrix_t& aMatrix ) const override;
     long GetIsViewRotatable( navlib::bool_t& isRotatable ) const override;
 
+
 private:
     EDA_3D_CANVAS* m_canvas;
     TRACK_BALL*    m_camera;

3d-viewer/3d_navlib/nl_footprint_properties_plugin.cpp

@@ -0,0 +1,45 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2024 3Dconnexion
+ * Copyright (C) 2024 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "nl_footprint_properties_plugin.h"
+#include "nl_footprint_properties_plugin_impl.h"
+#include <advanced_config.h>
+#include <kiplatform/drivers.h>
+
+
+NL_FOOTPRINT_PROPERTIES_PLUGIN::NL_FOOTPRINT_PROPERTIES_PLUGIN( EDA_3D_CANVAS* aViewport )
+{
+    if( ADVANCED_CFG::GetCfg().m_Use3DConnexionDriver
+        && KIPLATFORM::DRIVERS::Valid3DConnexionDriverVersion() )
+    {
+        m_impl = std::make_unique<NL_FOOTPRINT_PROPERTIES_PLUGIN_IMPL>( aViewport );
+        m_impl->Connect();
+    }
+}
+
+
+NL_FOOTPRINT_PROPERTIES_PLUGIN::~NL_FOOTPRINT_PROPERTIES_PLUGIN() = default;
+
+
+void NL_FOOTPRINT_PROPERTIES_PLUGIN::SetFocus( bool focus )
+{
+    if( m_impl )
+        m_impl->SetFocus( focus );
+}

3d-viewer/3d_navlib/nl_footprint_properties_plugin.h

@@ -0,0 +1,62 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2024 3Dconnexion
+ * Copyright (C) 2024 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @file  nl_footprint_properties_plugin.h
+ * @brief declaration of the nl_footprint_properties_plugin class
+ */
+
+#ifndef NL_FOOTPRINT_PROPERTIES_PLUGIN_H_
+#define NL_FOOTPRINT_PROPERTIES_PLUGIN_H_
+
+#include <memory>
+
+// Forward declarations.
+class EDA_3D_CANVAS;
+class NL_FOOTPRINT_PROPERTIES_PLUGIN_IMPL;
+
+/**
+ * The class that implements the public interface to the SpaceMouse plug-in.
+ */
+class NL_FOOTPRINT_PROPERTIES_PLUGIN
+{
+public:
+    /**
+     * Initializes a new instance of the NL_FOOTPRINT_PROPERTIES_PLUGIN.
+     *
+     *  @param aViewport is the viewport to be navigated.
+     */
+    NL_FOOTPRINT_PROPERTIES_PLUGIN( EDA_3D_CANVAS* aViewport );
+
+    virtual ~NL_FOOTPRINT_PROPERTIES_PLUGIN();
+
+    /**
+     * Set the connection to the 3Dconnexion driver to the focus state so that
+     * 3DMouse data is routed here.
+     *
+     * @param aFocus is true to set the connection active.
+     */
+    void SetFocus( bool aFocus = true );
+
+private:
+    std::unique_ptr<NL_FOOTPRINT_PROPERTIES_PLUGIN_IMPL> m_impl;
+};
+
+#endif // NL_FOOTPRINT_PROPERTIES_PLUGIN_H_

3d-viewer/3d_navlib/nl_footprint_properties_plugin_impl.cpp

@@ -0,0 +1,162 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2024 3Dconnexion
+ * Copyright (C) 2024 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "nl_footprint_properties_plugin_impl.h"
+#include <3d-viewer/3d_canvas/eda_3d_canvas.h>
+
+// KiCAD includes
+#include <tool/action_manager.h>
+#include <tool/tool_manager.h>
+#include <tool/tools_holder.h>
+
+#include <wx/mstream.h>
+
+#define BOUNDING_BOX_SCALE_FACTOR 1.3f
+
+/**
+ * Flag to enable the NL_FOOTPRINT_PROPERTIES_PLUGIN debug tracing.
+ *
+ * Use "KI_TRACE_NL_FOOTPRINT_PROPERTIES_PLUGIN" to enable.
+ *
+ * @ingroup trace_env_vars
+ */
+const wxChar* NL_FOOTPRINT_PROPERTIES_PLUGIN_IMPL::m_logTrace =
+        wxT( "KI_TRACE_NL_FOOTPRINT_PROPERTIES_PLUGIN" );
+
+
+NL_FOOTPRINT_PROPERTIES_PLUGIN_IMPL::NL_FOOTPRINT_PROPERTIES_PLUGIN_IMPL(EDA_3D_CANVAS* aCanvas) :
+  NL_3D_VIEWER_PLUGIN_IMPL(aCanvas, "KiCAD Footprint Properties")
+{}
+
+
+long NL_FOOTPRINT_PROPERTIES_PLUGIN_IMPL::GetModelExtents( navlib::box_t& extents ) const
+{
+    SFVEC3F min = NL_3D_VIEWER_PLUGIN_IMPL::GetCanvas()->GetBoardAdapter().GetBBox().Min();
+    SFVEC3F max = NL_3D_VIEWER_PLUGIN_IMPL::GetCanvas()->GetBoardAdapter().GetBBox().Max();
+
+    SFVEC3F diff = ( BOUNDING_BOX_SCALE_FACTOR - 1.f ) / 2.f * ( max - min );
+
+    min -= diff;
+    max += diff;
+
+    extents = { min.x, min.y, min.z, max.x, max.y, max.z };
+
+    return 0;
+}
+
+
+void NL_FOOTPRINT_PROPERTIES_PLUGIN_IMPL::exportCommandsAndImages()
+{
+    std::list<TOOL_ACTION*> actions = ACTION_MANAGER::GetActionList();
+
+    if( actions.size() == 0 )
+    {
+        return;
+    }
+
+    using TDx::SpaceMouse::CCommand;
+    using TDx::SpaceMouse::CCommandSet;
+
+    // The root action set node
+    CCommandSet commandSet( "EDA_3D_CANVAS", "3D Viewer" );
+
+    // Activate the command set
+    NAV_3D::PutActiveCommands( commandSet.GetId() );
+
+    // temporary store for the categories
+    CATEGORY_STORE categoryStore;
+
+    std::vector<TDx::CImage> vImages;
+
+    // add the action set to the category_store
+    categoryStore.insert( categoryStore.end(), CATEGORY_STORE::value_type( ".", &commandSet ) );
+
+    std::list<TOOL_ACTION*>::const_iterator it;
+
+    for( it = actions.begin(); it != actions.end(); ++it )
+    {
+        const TOOL_ACTION* action = *it;
+        std::string        label = action->GetMenuLabel().ToStdString();
+
+        if( label.empty() )
+        {
+            continue;
+        }
+
+        std::string name = action->GetName();
+
+        // Do no export commands for the pcbnew app.
+        if( name.rfind( "pcbnew.", 0 ) == 0 )
+        {
+            continue;
+        }
+
+        // Exclude commands which can't be used in the footprint properties.
+        if( name.rfind( "3DViewer.Control.pivotCenter", 0 ) == 0
+            || name.rfind( "3DViewer.Control.material", 0 ) == 0
+            || name.rfind( "3DViewer.Control.attribute", 0 ) == 0
+            || name.rfind( "3DViewer.Control.show", 0 ) == 0 )
+        {
+            continue;
+        }
+
+        std::string              strCategory = action->GetToolName();
+        CATEGORY_STORE::iterator iter = categoryStore.find( strCategory );
+
+        if( iter == categoryStore.end() )
+        {
+            iter = add_category( std::move( strCategory ), categoryStore );
+        }
+
+        std::string description = action->GetDescription().ToStdString();
+
+        // Arbitrary 8-bit data stream
+        wxMemoryOutputStream imageStream;
+
+        if( action->GetIcon() != BITMAPS::INVALID_BITMAP )
+        {
+            wxImage image = KiBitmap( action->GetIcon() ).ConvertToImage();
+            image.SaveFile( imageStream, wxBitmapType::wxBITMAP_TYPE_PNG );
+            image.Destroy();
+
+            if( imageStream.GetSize() )
+            {
+                wxStreamBuffer* streamBuffer = imageStream.GetOutputStreamBuffer();
+                TDx::CImage     tdxImage = TDx::CImage::FromData( "", 0, name.c_str() );
+                tdxImage.AssignImage( std::string( reinterpret_cast<const char*>(
+                                                           streamBuffer->GetBufferStart() ),
+                                                   streamBuffer->GetBufferSize() ),
+                                      0 );
+
+                wxLogTrace( m_logTrace, wxT( "Adding image for : %s" ), name );
+                vImages.push_back( std::move( tdxImage ) );
+            }
+        }
+
+        wxLogTrace( m_logTrace, wxT( "Inserting command: %s,  description: %s,  in category:  %s" ),
+                    name, description, iter->first );
+
+        iter->second->push_back(
+                CCommand( std::move( name ), std::move( label ), std::move( description ) ) );
+    }
+
+    NAV_3D::AddCommandSet( commandSet );
+    NAV_3D::AddImages( vImages );
+}

3d-viewer/3d_navlib/nl_footprint_properties_plugin_impl.h

@@ -0,0 +1,68 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2024 3Dconnexion
+ * Copyright (C) 2024 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @file  nl_footprint_properties_plugin_impl.h
+ * @brief declaration of the nl_footprint_properties_plugin_impl class
+ */
+
+#ifndef NL_FOOTPRINT_PROPERTIES_PLUGIN_IMPL_H_
+#define NL_FOOTPRINT_PROPERTIES_PLUGIN_IMPL_H_
+
+#include "nl_3d_viewer_plugin_impl.h"
+// TDxWare SDK.
+#include <SpaceMouse/CNavigation3D.hpp>
+
+/**
+ * The class that adjusts NL_3D_VIEWER_PLUGIN_IMPL implementation for 3D Model preview in footprint properties dialog.
+ */
+class NL_FOOTPRINT_PROPERTIES_PLUGIN_IMPL : public NL_3D_VIEWER_PLUGIN_IMPL
+{
+public:
+    /**
+     * Initializes a new instance of the NL_FOOTPRINT_PROPERTIES_PLUGIN.
+     *
+     *  @param aCanvas is the viewport to be navigated.
+     */
+    NL_FOOTPRINT_PROPERTIES_PLUGIN_IMPL( EDA_3D_CANVAS* aCanvas );
+
+private:
+    /**
+     * Get Footprint 3D Model extents.
+     *
+     *  @param extents is the box around the 3D model.
+     */
+    long GetModelExtents( navlib::box_t& extents ) const override;
+
+    /**
+     * Export the invocable actions and images to the 3Dconnexion UI.
+     */
+    void exportCommandsAndImages() override;
+
+private:
+    /**
+     *  Trace mask used to enable or disable the trace output of this class.
+     *  The debug output can be turned on by setting the WXTRACE environment variable to
+     *  "KI_TRACE_NL_FOOTPRINT_PROPERTIES_PLUGIN".  See the wxWidgets documentation on wxLogTrace for
+     *  more information.
+     */
+    static const wxChar* m_logTrace;
+};
+#endif // NL_FOOTPRINT_PROPERTIES_PLUGIN_IMPL_H_

3d-viewer/3d_rendering/color_rgb.cpp

@@ -38,6 +38,12 @@ COLOR_RGB::COLOR_RGB( const SFVEC3F& aColor )
 }
 
 
+COLOR_RGB::operator SFVEC3F() const
+{
+    return SFVEC3F( r / 255.0f, g / 255.0f, b / 255.0f );
+}
+
+
 COLOR_RGB BlendColor( const COLOR_RGB& aC1, const COLOR_RGB& aC2 )
 {
     const unsigned int r = aC1.r + aC2.r;

3d-viewer/3d_rendering/color_rgb.h

@@ -50,6 +50,8 @@ union COLOR_RGB
         g = aG;
         b = aB;
     }
+
+    operator SFVEC3F() const;
 };
 
 

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

@@ -429,7 +429,7 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe
 
             boardPolyCopy.Fracture( SHAPE_POLY_SET::PM_FAST );
 
-            for( int ii = 0; ii < outlineCount; ii++ )
+            for( int ii = 0; ii < boardPolyCopy.OutlineCount(); ii++ )
             {
                 ConvertPolygonToBlocks( boardPolyCopy, *m_outlineBoard2dObjects,
                                         m_boardAdapter.BiuTo3dUnits(), divFactor,
@@ -1243,8 +1243,6 @@ void RENDER_3D_RAYTRACE::load3DModels( CONTAINER_3D& aDstContainer, bool aSkipMa
                     fpMatrix, SFVEC3F( modelunit_to_3d_units_factor, modelunit_to_3d_units_factor,
                                        modelunit_to_3d_units_factor ) );
 
-            BOARD_ITEM* boardItem = dynamic_cast<BOARD_ITEM*>( fp );
-
             // Get the list of model files for this model
             S3D_CACHE* cacheMgr = m_boardAdapter.Get3dCacheManager();
             auto       sM       = fp->Models().begin();
@@ -1304,7 +1302,7 @@ void RENDER_3D_RAYTRACE::load3DModels( CONTAINER_3D& aDstContainer, bool aSkipMa
                                 SFVEC3F( sM->m_Scale.x, sM->m_Scale.y, sM->m_Scale.z ) );
 
                         addModels( aDstContainer, modelPtr, modelMatrix, (float) sM->m_Opacity,
-                                   aSkipMaterialInformation, boardItem );
+                                   aSkipMaterialInformation, fp );
                     }
                 }
 

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

@@ -42,10 +42,15 @@ void FRUSTUM::GenerateFrustum( const RAY& topLeft, const RAY& topRight, const RA
     m_point[2] = bottomLeft.m_Origin;
     m_point[3] = topLeft.m_Origin;
 
-    m_normals[0] = glm::cross( topRight.m_Dir,    topLeft.m_Dir );              // TOP
-    m_normals[1] = glm::cross( bottomRight.m_Dir, topRight.m_Dir );             // RIGHT
-    m_normals[2] = glm::cross( bottomLeft.m_Dir,  bottomRight.m_Dir );          // BOTTOM
-    m_normals[3] = glm::cross( topLeft.m_Dir,     bottomLeft.m_Dir );           // LEFT
+    SFVEC3F tl_tr = topRight.m_Origin - topLeft.m_Origin;
+    SFVEC3F tr_br = bottomRight.m_Origin - topRight.m_Origin;
+    SFVEC3F br_bl = bottomLeft.m_Origin - bottomRight.m_Origin;
+    SFVEC3F bl_tl = topLeft.m_Origin - bottomLeft.m_Origin;
+
+    m_normals[0] = glm::cross( tl_tr, topLeft.m_Dir );     // TOP
+    m_normals[1] = glm::cross( tr_br, topRight.m_Dir );    // RIGHT
+    m_normals[2] = glm::cross( br_bl, bottomRight.m_Dir ); // BOTTOM
+    m_normals[3] = glm::cross( bl_tl, bottomLeft.m_Dir );  // LEFT
 }
 
 

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

@@ -39,6 +39,41 @@
 #include <wx/log.h>
 
 
+#ifdef USE_SRGB_SPACE
+
+/// @todo This should be removed in future when KiCad supports a greater version of glm lib.
+#define SRGB_GAMA 2.4f
+
+
+// This function implements the conversion from linear RGB to sRGB
+// https://github.com/g-truc/glm/blob/master/glm/gtc/color_space.inl#L12
+static SFVEC3F convertLinearToSRGB( const SFVEC3F& aRGBcolor )
+{
+    const float gammaCorrection = 1.0f / SRGB_GAMA;
+    const SFVEC3F clampedColor = glm::clamp( aRGBcolor, SFVEC3F( 0.0f ), SFVEC3F( 1.0f ) );
+
+    return glm::mix( glm::pow( clampedColor, SFVEC3F(gammaCorrection) ) * 1.055f - 0.055f,
+                     clampedColor * 12.92f,
+                     glm::lessThan( clampedColor, SFVEC3F(0.0031308f) ) );
+}
+
+
+// This function implements the conversion from sRGB to linear RGB
+// https://github.com/g-truc/glm/blob/master/glm/gtc/color_space.inl#L35
+SFVEC3F ConvertSRGBToLinear( const SFVEC3F& aSRGBcolor )
+{
+    const float gammaCorrection = SRGB_GAMA;
+
+    return glm::mix( glm::pow( ( aSRGBcolor + SFVEC3F( 0.055f ) )
+                               * SFVEC3F( 0.94786729857819905213270142180095f ),
+                               SFVEC3F( gammaCorrection ) ),
+                     aSRGBcolor * SFVEC3F( 0.07739938080495356037151702786378f ),
+                     glm::lessThanEqual( aSRGBcolor, SFVEC3F( 0.04045f ) ) );
+}
+
+#endif
+
+
 RENDER_3D_RAYTRACE::RENDER_3D_RAYTRACE( EDA_3D_CANVAS* aCanvas, BOARD_ADAPTER& aAdapter, CAMERA& aCamera ) :
     RENDER_3D_BASE( aCanvas, aAdapter, aCamera ),
     m_postShaderSsao( aCamera )
@@ -145,6 +180,19 @@ static inline void SetPixel( GLubyte* p, const COLOR_RGB& v )
 }
 
 
+static void SetPixelSRGB( uint8_t* p, const COLOR_RGB& v )
+{
+    SFVEC3F color = v;
+
+#ifdef USE_SRGB_SPACE
+    color = convertLinearToSRGB( color );
+#endif
+
+    COLOR_RGB rgb( color );
+    SetPixel( p, rgb );
+}
+
+
 bool RENDER_3D_RAYTRACE::Redraw( bool aIsMoving, REPORTER* aStatusReporter,
                                  REPORTER* aWarningReporter )
 {
@@ -406,41 +454,6 @@ void RENDER_3D_RAYTRACE::renderTracing( GLubyte* ptrPBO, REPORTER* aStatusReport
 }
 
 
-#ifdef USE_SRGB_SPACE
-
-/// @todo This should be removed in future when KiCad supports a greater version of glm lib.
-#define SRGB_GAMA 2.4f
-
-
-// This function implements the conversion from linear RGB to sRGB
-// https://github.com/g-truc/glm/blob/master/glm/gtc/color_space.inl#L12
-static SFVEC3F convertLinearToSRGB( const SFVEC3F& aRGBcolor )
-{
-    const float gammaCorrection = 1.0f / SRGB_GAMA;
-    const SFVEC3F clampedColor = glm::clamp( aRGBcolor, SFVEC3F( 0.0f ), SFVEC3F( 1.0f ) );
-
-    return glm::mix( glm::pow( clampedColor, SFVEC3F(gammaCorrection) ) * 1.055f - 0.055f,
-                     clampedColor * 12.92f,
-                     glm::lessThan( clampedColor, SFVEC3F(0.0031308f) ) );
-}
-
-
-// This function implements the conversion from sRGB to linear RGB
-// https://github.com/g-truc/glm/blob/master/glm/gtc/color_space.inl#L35
-SFVEC3F ConvertSRGBToLinear( const SFVEC3F& aSRGBcolor )
-{
-    const float gammaCorrection = SRGB_GAMA;
-
-    return glm::mix( glm::pow( ( aSRGBcolor + SFVEC3F( 0.055f ) )
-                               * SFVEC3F( 0.94786729857819905213270142180095f ),
-                               SFVEC3F( gammaCorrection ) ),
-                     aSRGBcolor * SFVEC3F( 0.07739938080495356037151702786378f ),
-                     glm::lessThanEqual( aSRGBcolor, SFVEC3F( 0.04045f ) ) );
-}
-
-#endif
-
-
 void RENDER_3D_RAYTRACE::renderFinalColor( GLubyte* ptrPBO, const SFVEC3F& rgbColor,
                                          bool applyColorSpaceConversion )
 {
@@ -946,6 +959,9 @@ void RENDER_3D_RAYTRACE::renderPreview( GLubyte* ptrPBO )
 {
     m_isPreview = true;
 
+    m_backgroundColorTop = ConvertSRGBToLinear( m_boardAdapter.m_BgColorTop );
+    m_backgroundColorBottom = ConvertSRGBToLinear( m_boardAdapter.m_BgColorBot );
+
     std::atomic<size_t> nextBlock( 0 );
     std::atomic<size_t> threadsFinished( 0 );
 
@@ -982,13 +998,16 @@ void RENDER_3D_RAYTRACE::renderPreview( GLubyte* ptrPBO )
                 // Calculate background gradient color
                 SFVEC3F bgColor[RAYPACKET_DIM];
 
+                SFVEC3F bgTopColor = m_backgroundColorTop;
+                SFVEC3F bgBotColor = m_backgroundColorBottom;
+
                 for( unsigned int y = 0; y < RAYPACKET_DIM; ++y )
                 {
                     const float posYfactor =
                             (float) ( windowsPos.y + y * 4.0f ) / (float) m_windowSize.y;
 
-                    bgColor[y] = (SFVEC3F) m_boardAdapter.m_BgColorTop * SFVEC3F( posYfactor )
-                                 + (SFVEC3F) m_boardAdapter.m_BgColorBot
+                    bgColor[y] = (SFVEC3F) bgTopColor * SFVEC3F( posYfactor )
+                                 + (SFVEC3F) bgBotColor
                                            * ( SFVEC3F( 1.0f ) - SFVEC3F( posYfactor ) );
                 }
 
@@ -1499,28 +1518,29 @@ void RENDER_3D_RAYTRACE::renderPreview( GLubyte* ptrPBO )
                                 &ptrPBO[( 4 * x + m_blockPositionsFast[iBlock].x
                                           + m_realBufferSize.x
                                           * ( m_blockPositionsFast[iBlock].y + 4 * y ) ) * 4];
-                        SetPixel( ptr + 0, cLT );
-                        SetPixel( ptr +  4, BlendColor( cLT, cLRT, cLTC ) );
-                        SetPixel( ptr +  8, cLRT );
-                        SetPixel( ptr + 12, BlendColor( cLRT, cRT, cRTC ) );
+
+                        SetPixelSRGB( ptr +  0, cLT );
+                        SetPixelSRGB( ptr +  4, BlendColor( cLT, cLRT, cLTC ) );
+                        SetPixelSRGB( ptr +  8, cLRT );
+                        SetPixelSRGB( ptr + 12, BlendColor( cLRT, cRT, cRTC ) );
 
                         ptr += m_realBufferSize.x * 4;
-                        SetPixel( ptr +  0, BlendColor( cLT , cLTB, cLTC ) );
-                        SetPixel( ptr +  4, BlendColor( cLTC, BlendColor( cLT , cC ) ) );
-                        SetPixel( ptr +  8, BlendColor( cC, BlendColor( cLRT, cLTC, cRTC ) ) );
-                        SetPixel( ptr + 12, BlendColor( cRTC, BlendColor( cRT , cC ) ) );
+                        SetPixelSRGB( ptr +  0, BlendColor( cLT , cLTB, cLTC ) );
+                        SetPixelSRGB( ptr +  4, BlendColor( cLTC, BlendColor( cLT , cC ) ) );
+                        SetPixelSRGB( ptr +  8, BlendColor( cC, BlendColor( cLRT, cLTC, cRTC ) ) );
+                        SetPixelSRGB( ptr + 12, BlendColor( cRTC, BlendColor( cRT , cC ) ) );
 
                         ptr += m_realBufferSize.x * 4;
-                        SetPixel( ptr +  0, cLTB );
-                        SetPixel( ptr +  4, BlendColor( cC, BlendColor( cLTB, cLTC, cLBC ) ) );
-                        SetPixel( ptr +  8, cC );
-                        SetPixel( ptr + 12, BlendColor( cC, BlendColor( cRTB, cRTC, cRBC ) ) );
+                        SetPixelSRGB( ptr +  0, cLTB );
+                        SetPixelSRGB( ptr +  4, BlendColor( cC, BlendColor( cLTB, cLTC, cLBC ) ) );
+                        SetPixelSRGB( ptr +  8, cC );
+                        SetPixelSRGB( ptr + 12, BlendColor( cC, BlendColor( cRTB, cRTC, cRBC ) ) );
 
                         ptr += m_realBufferSize.x * 4;
-                        SetPixel( ptr +  0, BlendColor( cLB , cLTB, cLBC ) );
-                        SetPixel( ptr +  4, BlendColor( cLBC, BlendColor( cLB , cC ) ) );
-                        SetPixel( ptr +  8, BlendColor( cC, BlendColor( cLRB, cLBC, cRBC ) ) );
-                        SetPixel( ptr + 12, BlendColor( cRBC, BlendColor( cRB , cC ) ) );
+                        SetPixelSRGB( ptr +  0, BlendColor( cLB , cLTB, cLBC ) );
+                        SetPixelSRGB( ptr +  4, BlendColor( cLBC, BlendColor( cLB , cC ) ) );
+                        SetPixelSRGB( ptr +  8, BlendColor( cC, BlendColor( cLRB, cLBC, cRBC ) ) );
+                        SetPixelSRGB( ptr + 12, BlendColor( cRBC, BlendColor( cRB , cC ) ) );
                     }
                 }
             }
@@ -1572,9 +1592,6 @@ SFVEC3F RENDER_3D_RAYTRACE::shadeHit( const SFVEC3F& aBgColor, const RAY& aRay,
 
         light->GetLightParameters( hitPoint, vectorToLight, colorOfLight, distToLight );
 
-        if( m_isPreview )
-            colorOfLight = SFVEC3F( 1.0f );
-
         const float NdotL = glm::dot( aHitInfo.m_HitNormal, vectorToLight );
 
         // Only calc shade if the normal is facing the direction of light,
@@ -1641,10 +1658,6 @@ SFVEC3F RENDER_3D_RAYTRACE::shadeHit( const SFVEC3F& aBgColor, const RAY& aRay,
             outColor += objMaterial->Shade( aRay, aHitInfo, NdotL, diffuseColorObj, vectorToLight,
                                             colorOfLight, shadow_att_factor_light );
         }
-
-        // Only use the headlight for preview
-        if( m_isPreview )
-            break;
     }
 
     // Improvement: this is not taking in account the lightcolor

3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp

@@ -113,7 +113,7 @@ EDA_3D_VIEWER_FRAME::EDA_3D_VIEWER_FRAME( KIWAY* aKiway, PCB_BASE_FRAME* aParent
     SetStatusWidths( arrayDim( status_dims ), status_dims );
 
     SETTINGS_MANAGER&       mgr = Pgm().GetSettingsManager();
-    EDA_3D_VIEWER_SETTINGS* cfg = mgr.GetAppSettings<EDA_3D_VIEWER_SETTINGS>();
+    EDA_3D_VIEWER_SETTINGS* cfg = mgr.GetAppSettings<EDA_3D_VIEWER_SETTINGS>( "3d_viewer" );
     ANTIALIASING_MODE       aaMode = static_cast<ANTIALIASING_MODE>( cfg->m_Render.opengl_AA_mode );
 
     m_canvas = new EDA_3D_CANVAS( this, OGL_ATT_LIST::GetAttributesList( aaMode ), m_boardAdapter,
@@ -479,7 +479,7 @@ void EDA_3D_VIEWER_FRAME::Process_Special_Functions( wxCommandEvent &event )
 
     case ID_MENU3D_RESET_DEFAULTS:
     {
-        auto cfg = Pgm().GetSettingsManager().GetAppSettings<EDA_3D_VIEWER_SETTINGS>();
+        auto cfg = Pgm().GetSettingsManager().GetAppSettings<EDA_3D_VIEWER_SETTINGS>( "3d_viewer" );
         cfg->ResetToDefaults();
         LoadSettings( cfg );
 
@@ -561,8 +561,8 @@ void EDA_3D_VIEWER_FRAME::LoadSettings( APP_SETTINGS_BASE *aCfg )
 {
     EDA_BASE_FRAME::LoadSettings( aCfg );
 
-    EDA_3D_VIEWER_SETTINGS* cfg = dynamic_cast<EDA_3D_VIEWER_SETTINGS*>( aCfg );
-    wxASSERT( cfg );
+    // Dynamic_cast here will fail on Mac when called from CvPCB.
+    EDA_3D_VIEWER_SETTINGS* cfg = static_cast<EDA_3D_VIEWER_SETTINGS*>( aCfg );
 
     wxLogTrace( m_logTrace, wxT( "EDA_3D_VIEWER_FRAME::LoadSettings" ) );
 
@@ -570,6 +570,9 @@ void EDA_3D_VIEWER_FRAME::LoadSettings( APP_SETTINGS_BASE *aCfg )
     {
         applySettings( cfg );
 
+        if( !GetBoard()->GetProject() )
+            GetBoard()->SetProject( &Prj() );
+
         m_boardAdapter.SetBoard( GetBoard() );
 
         // When opening the 3D viewer, we use the OpenGL mode, never the ray tracing engine
@@ -603,7 +606,7 @@ void EDA_3D_VIEWER_FRAME::LoadSettings( APP_SETTINGS_BASE *aCfg )
 
 void EDA_3D_VIEWER_FRAME::SaveSettings( APP_SETTINGS_BASE *aCfg )
 {
-    auto cfg = Pgm().GetSettingsManager().GetAppSettings<EDA_3D_VIEWER_SETTINGS>();
+    auto cfg = Pgm().GetSettingsManager().GetAppSettings<EDA_3D_VIEWER_SETTINGS>( "3d_viewer" );
 
     EDA_BASE_FRAME::SaveSettings( cfg );
 
@@ -639,7 +642,7 @@ void EDA_3D_VIEWER_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTex
     ReCreateMainToolbar();
 
     loadCommonSettings();
-    applySettings( Pgm().GetSettingsManager().GetAppSettings<EDA_3D_VIEWER_SETTINGS>() );
+    applySettings( Pgm().GetSettingsManager().GetAppSettings<EDA_3D_VIEWER_SETTINGS>( "3d_viewer" ) );
 
     m_appearancePanel->CommonSettingsChanged();
 
@@ -670,7 +673,7 @@ void EDA_3D_VIEWER_FRAME::ShowChangedLanguage()
 void EDA_3D_VIEWER_FRAME::ToggleAppearanceManager()
 {
     SETTINGS_MANAGER&       mgr = Pgm().GetSettingsManager();
-    EDA_3D_VIEWER_SETTINGS* cfg = mgr.GetAppSettings<EDA_3D_VIEWER_SETTINGS>();
+    EDA_3D_VIEWER_SETTINGS* cfg = mgr.GetAppSettings<EDA_3D_VIEWER_SETTINGS>( "3d_viewer" );
     wxAuiPaneInfo&          layersManager = m_auimgr.GetPane( "LayersManager" );
 
     // show auxiliary Vertical layers and visibility manager toolbar

3d-viewer/dialogs/panel_preview_3d_model.cpp

@@ -44,6 +44,8 @@
 #include <eda_3d_viewer_settings.h>
 #include <board_design_settings.h>
 
+#include <3d_navlib/nl_footprint_properties_plugin.h>
+
 PANEL_PREVIEW_3D_MODEL::PANEL_PREVIEW_3D_MODEL( wxWindow* aParent, PCB_BASE_FRAME* aFrame,
                                                 FOOTPRINT* aFootprint,
                                                 std::vector<FP_3DMODEL>* aParentModelList ) :
@@ -125,6 +127,9 @@ PANEL_PREVIEW_3D_MODEL::PANEL_PREVIEW_3D_MODEL( wxWindow* aParent, PCB_BASE_FRAM
                                        OGL_ATT_LIST::GetAttributesList( ANTIALIASING_MODE::AA_8X ),
                                        m_boardAdapter, m_currentCamera, PROJECT_PCB::Get3DCacheManager( &aFrame->Prj() ) );
 
+    m_spaceMouse = new NL_FOOTPRINT_PROPERTIES_PLUGIN( m_previewPane );
+    m_spaceMouse->SetFocus( true );
+
     m_boardAdapter.SetBoard( m_dummyBoard );
     m_boardAdapter.m_IsBoardView = false;
     m_boardAdapter.m_IsPreviewer = true;   // Force display 3D models, regardless the 3D viewer options
@@ -162,6 +167,8 @@ PANEL_PREVIEW_3D_MODEL::PANEL_PREVIEW_3D_MODEL( wxWindow* aParent, PCB_BASE_FRAM
                      wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL::onUnitsChanged ),
                      nullptr, this );
 
+    Bind( wxCUSTOM_PANEL_SHOWN_EVENT, &PANEL_PREVIEW_3D_MODEL::onPanelShownEvent, this );
+
 #ifdef __WXOSX__
     // Call layout once to get the proper button sizes after the bitmaps have been set
     Layout();
@@ -190,6 +197,7 @@ PANEL_PREVIEW_3D_MODEL::~PANEL_PREVIEW_3D_MODEL()
     if( m_boardAdapter.m_Cfg )
         m_boardAdapter.m_Cfg->m_Render = m_initialRender;
 
+    delete m_spaceMouse;
     delete m_dummyBoard;
     delete m_previewPane;
 }
@@ -213,7 +221,7 @@ void PANEL_PREVIEW_3D_MODEL::loadSettings()
     // TODO(JE) use all control options
     m_boardAdapter.m_MousewheelPanning = settings->m_Input.scroll_modifier_zoom != 0;
 
-    EDA_3D_VIEWER_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<EDA_3D_VIEWER_SETTINGS>();
+    auto* cfg = Pgm().GetSettingsManager().GetAppSettings<EDA_3D_VIEWER_SETTINGS>( "3d_viewer" );
 
     if( cfg )
     {
@@ -620,6 +628,17 @@ void PANEL_PREVIEW_3D_MODEL::onUnitsChanged( wxCommandEvent& aEvent )
 }
 
 
+void PANEL_PREVIEW_3D_MODEL::onPanelShownEvent( wxCommandEvent& aEvent )
+{
+    if( m_spaceMouse != nullptr )
+    {
+        m_spaceMouse->SetFocus( static_cast<bool>( aEvent.GetInt() ) );
+    }
+
+    aEvent.Skip();
+}
+
+
 void PANEL_PREVIEW_3D_MODEL::UpdateDummyFootprint( bool aReloadRequired )
 {
     m_dummyFootprint->Models().clear();

3d-viewer/dialogs/panel_preview_3d_model.h

@@ -34,6 +34,7 @@
 #include <3d_canvas/eda_3d_canvas.h>
 #include <3d_viewer_id.h>
 #include <3d_rendering/track_ball.h>
+#include <wx/event.h>
 
 // Define min and max parameter values
 #define MAX_SCALE          10000.0
@@ -52,6 +53,7 @@
 #define OFFSET_INCREMENT_MIL       25.0
 #define OFFSET_INCREMENT_MIL_FINE  5.0
 
+wxDECLARE_EVENT( wxCUSTOM_PANEL_SHOWN_EVENT, wxCommandEvent );
 
 // Declared classes to create pointers
 class WX_INFOBAR;
@@ -60,6 +62,7 @@ class FILENAME_RESOLVER;
 class BOARD;
 class BOARD_ADAPTER;
 class FOOTPRINT;
+class NL_FOOTPRINT_PROPERTIES_PLUGIN;
 
 class PANEL_PREVIEW_3D_MODEL: public EDA_3D_BOARD_HOLDER, public TOOLS_HOLDER, public PANEL_PREVIEW_3D_MODEL_BASE
 {
@@ -139,6 +142,7 @@ private:
     void doIncrementOffset( wxSpinEvent& aEvent, double aSign );
 
     void onUnitsChanged( wxCommandEvent& aEvent );
+    void onPanelShownEvent( wxCommandEvent& aEvent );
 
     wxString formatScaleValue( double aValue );
     wxString formatRotationValue( double aValue );
@@ -211,6 +215,8 @@ private:
     bool                     m_bodyStyleShowAll;    /// true if the board body is show
     /// The 3d viewer Render initial settings (must be saved and restored)
     EDA_3D_VIEWER_SETTINGS::RENDER_SETTINGS m_initialRender;
+
+    NL_FOOTPRINT_PROPERTIES_PLUGIN*     m_spaceMouse;
 };
 
 #endif  // PANEL_PREVIEW_3D_MODEL_H

CMakeLists.txt

@@ -573,6 +573,9 @@ if( MSVC )
     if( KICAD_WIN32_BUILD_PARALLEL_CL_MP )
         string( APPEND CMAKE_CXX_FLAGS " /MP" )
     endif()
+
+    set( CMAKE_INSTALL_UCRT_LIBRARIES TRUE )
+    include( InstallRequiredSystemLibraries )
 endif()
 
 # KIFACE_SUFFIX is the file extension used for top level program modules which

cmake/KiCadVersion.cmake

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

common/advanced_config.cpp

@@ -109,9 +109,10 @@ static const wxChar OcePluginAngularDeflection[] = wxT( "OcePluginAngularDeflect
 static const wxChar TriangulateSimplificationLevel[] = wxT( "TriangulateSimplificationLevel" );
 static const wxChar TriangulateMinimumArea[] = wxT( "TriangulateMinimumArea" );
 static const wxChar EnableCacheFriendlyFracture[] = wxT( "EnableCacheFriendlyFracture" );
+static const wxChar MinParallelAngle[] = wxT( "MinParallelAngle" );
+static const wxChar ResolveTextRecursionDepth[] = wxT( "ResolveTextRecursionDepth" );
 } // namespace KEYS
 
-
 /**
  * List of known groups for advanced configuration options.
  *
@@ -261,6 +262,10 @@ ADVANCED_CFG::ADVANCED_CFG()
 
     m_EnableCacheFriendlyFracture = true;
 
+    m_MinParallelAngle = 0.001;
+
+    m_ResolveTextRecursionDepth = 3;
+
     loadFromConfigFile();
 }
 
@@ -477,6 +482,14 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
                                                 &m_EnableCacheFriendlyFracture,
                                                 m_EnableCacheFriendlyFracture ) );
 
+    configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::MinParallelAngle,
+                                                  &m_MinParallelAngle, m_MinParallelAngle,
+                                                  0.0, 45.0 ) );
+
+    configParams.push_back( new PARAM_CFG_INT( true, AC_KEYS::ResolveTextRecursionDepth,
+                                                  &m_ResolveTextRecursionDepth,
+                                                  m_ResolveTextRecursionDepth, 0, 10 ) );
+
     // Special case for trace mask setting...we just grab them and set them immediately
     // Because we even use wxLogTrace inside of advanced config
     wxString traceMasks;

common/background_jobs_monitor.cpp

@@ -182,7 +182,7 @@ BACKGROUND_JOB_REPORTER::BACKGROUND_JOB_REPORTER( BACKGROUND_JOBS_MONITOR* aMoni
 
 bool BACKGROUND_JOB_REPORTER::updateUI()
 {
-    return true;
+    return !m_cancelled;
 }
 
 
@@ -265,7 +265,11 @@ void BACKGROUND_JOBS_MONITOR::Remove( std::shared_ptr<BACKGROUND_JOB> aJob )
                                       return job == aJob;
                                } ) );
 
-    if( m_jobs.size() == 0 )
+    if( m_jobs.size() > 0 )
+    {
+        jobUpdated( m_jobs.front() );
+    }
+    else
     {
         for( KISTATUSBAR* statusBar : m_statusBars )
         {

common/commit.cpp

@@ -162,6 +162,9 @@ void COMMIT::makeEntry( EDA_ITEM* aItem, CHANGE_TYPE aType, EDA_ITEM* aCopy, BAS
     ent.m_copy = aCopy;
     ent.m_screen = aScreen;
 
+    // N.B. Do not throw an assertion for multiple changed items.  An item can be changed multiple times
+    // in a single commit such as when importing graphics and grouping them.
+
     m_changedItems.insert( aItem );
     m_changes.push_back( ent );
 }

common/common.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2014-2020 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2008 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 1992-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2023, 2024 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -347,18 +347,11 @@ const wxString ExpandEnvVarSubstitutions( const wxString& aString, const PROJECT
 }
 
 
-const wxString ResolveUriByEnvVars( const wxString& aUri, PROJECT* aProject )
+const wxString ResolveUriByEnvVars( const wxString& aUri, const PROJECT* aProject )
 {
     wxString uri = ExpandTextVars( aUri, aProject );
 
-    // URL-like URI: return as is.
-    wxURL url( uri );
-
-    if( url.GetError() == wxURL_NOERR )
-        return uri;
-
-    // Otherwise, the path points to a local file. Resolve environment variables if any.
-    return ExpandEnvVarSubstitutions( aUri, aProject );
+    return ExpandEnvVarSubstitutions( uri, aProject );
 }
 
 

common/database/database_connection.cpp

@@ -18,6 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <boost/algorithm/string.hpp>
 #include <boost/locale.hpp>
 #include <fmt/core.h>
 #include <nanodbc/nanodbc.h>
@@ -236,7 +237,7 @@ bool DATABASE_CONNECTION::CacheTableInfo( const std::string& aTable,
             {
                 std::string columnKey = toUTF8( columns.column_name() );
 
-                if( aColumns.count( columnKey ) )
+                if( aColumns.count( boost::to_lower_copy( columnKey ) ) )
                     m_columnCache[key][columnKey] = columns.data_type();
             }
 
@@ -627,7 +628,13 @@ bool DATABASE_CONNECTION::selectAllAndCache( const std::string& aTable, const st
             }
         }
 
-        wxASSERT( result.count( aKey ) );
+        if( !result.count( aKey ) )
+        {
+            wxLogTrace( traceDatabase,
+                  wxT( "selectAllAndCache: warning: key %s not found in result set" ), aKey );
+            continue;
+        }
+
         std::string keyStr = std::any_cast<std::string>( result.at( aKey ) );
         cacheEntry[keyStr] = result;
     }

common/dialog_shim.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
  * Copyright (C) 2023 CERN
- * Copyright (C) 2012-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2012-2023, 2024 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -465,6 +465,19 @@ void DIALOG_SHIM::OnModify()
 }
 
 
+int DIALOG_SHIM::ShowModal()
+{
+    // Apple in its infinite wisdom will raise a disabled window before even passing
+    // us the event, so we have no way to stop it.  Instead, we must set an order on
+    // the windows so that the modal will be pushed in front of the disabled
+    // window when it is raised.
+    KIPLATFORM::UI::ReparentModal( this );
+
+    // Call the base class ShowModal() method
+    return wxDialog::ShowModal();
+}
+
+
 /*
     Quasi-Modal Mode Explained:
 
@@ -520,7 +533,7 @@ int DIALOG_SHIM::ShowQuasiModal()
     // us the event, so we have no way to stop it.  Instead, we must set an order on
     // the windows so that the quasi-modal will be pushed in front of the disabled
     // window when it is raised.
-    KIPLATFORM::UI::ReparentQuasiModal( this );
+    KIPLATFORM::UI::ReparentModal( this );
 
     Show( true );
 
@@ -557,6 +570,8 @@ void DIALOG_SHIM::EndQuasiModal( int retCode )
         return;
     }
 
+    TearDownQuasiModal();
+
     if( m_qmodal_loop )
     {
         if( m_qmodal_loop->IsRunning() )

common/dialogs/dialog_color_picker.cpp

@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2018-2022 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2018-2024 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -28,6 +28,7 @@
 #include <wx/dcmemory.h>
 
 #define ALPHA_MAX 100   // the max value returned by the alpha (opacity) slider
+#define SLOPE_AXIS ( bmsize.y / 5.28 ) // was 50 at 264 size
 
 using KIGFX::COLOR4D;
 
@@ -52,13 +53,17 @@ DIALOG_COLOR_PICKER::DIALOG_COLOR_PICKER( wxWindow* aParent, const COLOR4D& aCur
     m_allowOpacityCtrl = aAllowOpacityControl;
     m_previousColor4D = aCurrentColor;
     m_newColor4D = aCurrentColor;
-    m_cursorsSize = 8;      // Size of square cursors drawn on color bitmaps
     m_newColor4D.ToHSV( m_hue, m_sat, m_val, true );
     m_bitmapRGB = nullptr;
     m_bitmapHSV = nullptr;
     m_selectedCursor = nullptr;
     m_defaultColor = aDefaultColor;
 
+    updateHandleSize();
+
+    m_OldColorRect->SetMinSize( FromDIP( wxSize( 24, 24 ) ) );
+    m_NewColorRect->SetMinSize( FromDIP( wxSize( 24, 24 ) ) );
+
     if( !m_allowOpacityCtrl )
     {
         m_SizerTransparency->Show( false );
@@ -121,16 +126,15 @@ void DIALOG_COLOR_PICKER::updatePreview( wxStaticBitmap* aStaticBitmap, COLOR4D&
     wxBitmap newBm = COLOR_SWATCH::MakeBitmap( aColor4D, COLOR4D::WHITE, aStaticBitmap->GetSize(),
                                                ConvertDialogToPixels( CHECKERBOARD_SIZE_DU ),
                                                aStaticBitmap->GetParent()->GetBackgroundColour() );
+
+    newBm.SetScaleFactor( GetDPIScaleFactor() );
     aStaticBitmap->SetBitmap( newBm );
 }
 
 
 bool DIALOG_COLOR_PICKER::TransferDataToWindow()
 {
-    // Draw all bitmaps, with colors according to the color 4D
-    updatePreview( m_OldColorRect, m_previousColor4D );
     SetEditVals( ALL_CHANGED, false );
-    drawAll();
 
     // Configure the spin control sizes
     configureSpinCtrl( m_spinCtrlGreen );
@@ -144,6 +148,10 @@ bool DIALOG_COLOR_PICKER::TransferDataToWindow()
 
     finishDialogSettings();
 
+    // Draw all bitmaps, with colors according to the color 4D
+    updatePreview( m_OldColorRect, m_previousColor4D );
+    drawAll();
+
     return true;
 }
 
@@ -171,6 +179,8 @@ void DIALOG_COLOR_PICKER::initDefinedColors( CUSTOM_COLORS_LIST* aPredefinedColo
             {
                 wxBitmap bm = COLOR_SWATCH::MakeBitmap( aColor, COLOR4D::WHITE, swatchSize,
                                                         checkerboardSize, checkboardBackground );
+
+                bm.SetScaleFactor( GetDPIScaleFactor() );
                 wxStaticBitmap* swatch = new wxStaticBitmap( m_panelDefinedColors, aId, bm );
 
                 m_fgridColor->Add( swatch, 0, wxALIGN_CENTER_VERTICAL, 5 );
@@ -245,7 +255,6 @@ void DIALOG_COLOR_PICKER::createRGBBitmap()
 
     // Red blue area in X Z 3d axis
     double inc = 255.0 / half_size;
-    #define SLOPE_AXIS 50.0
     double slope = SLOPE_AXIS/half_size;
     color.g = 0.0;
 
@@ -315,6 +324,7 @@ void DIALOG_COLOR_PICKER::createRGBBitmap()
 
     delete m_bitmapRGB;
     m_bitmapRGB = new wxBitmap( img, 24 );
+    m_bitmapRGB->SetScaleFactor( m_RgbBitmap->GetDPIScaleFactor() );
     m_RgbBitmap->SetBitmap( *m_bitmapRGB );
 }
 
@@ -379,6 +389,7 @@ void DIALOG_COLOR_PICKER::createHSVBitmap()
 
     delete m_bitmapHSV;
     m_bitmapHSV = new wxBitmap( img, 24 );
+    m_bitmapHSV->SetScaleFactor( m_HsvBitmap->GetDPIScaleFactor() );
     m_HsvBitmap->SetBitmap( *m_bitmapHSV );
 }
 
@@ -413,8 +424,7 @@ void DIALOG_COLOR_PICKER::drawRGBPalette()
     bitmapDC.SetBrush( brush );
     int half_csize = m_cursorsSize / 2;
 
-    #define SLOPE_AXIS 50.0
-    double slope = SLOPE_AXIS / half_size;
+    double slope = SLOPE_AXIS / ( half_size );
 
     // Red axis cursor (Z 3Daxis):
     m_cursorBitmapRed.x = 0;
@@ -539,8 +549,15 @@ void DIALOG_COLOR_PICKER::SetEditVals( CHANGED_COLOR aChanged, bool aCheckTransp
 }
 
 
+void DIALOG_COLOR_PICKER::updateHandleSize()
+{
+    m_cursorsSize = FromDIP( 8 ); // Size of square cursors drawn on color bitmaps
+}
+
+
 void DIALOG_COLOR_PICKER::drawAll()
 {
+    updateHandleSize();
     m_NewColorRect->Freeze();   // Avoid flicker
     m_HsvBitmap->Freeze();
     m_RgbBitmap->Freeze();
@@ -699,6 +716,14 @@ void DIALOG_COLOR_PICKER::onHSVMouseDrag( wxMouseEvent& event )
 }
 
 
+void DIALOG_COLOR_PICKER::onSize( wxSizeEvent& event )
+{
+    drawAll();
+
+    event.Skip();
+}
+
+
 void DIALOG_COLOR_PICKER::OnColorValueText( wxCommandEvent& event )
 {
     if( m_newColor4D.SetFromHexString( m_colorValue->GetValue() ) )

common/dialogs/dialog_color_picker_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -33,7 +33,10 @@ DIALOG_COLOR_PICKER_BASE::DIALOG_COLOR_PICKER_BASE( wxWindow* parent, wxWindowID
 	m_RgbBitmap = new wxStaticBitmap( sbSizerViewRGB->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 264,264 ), 0 );
 	m_RgbBitmap->SetMinSize( wxSize( 264,264 ) );
 
-	sbSizerViewRGB->Add( m_RgbBitmap, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	sbSizerViewRGB->Add( m_RgbBitmap, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND|wxSHAPED, 5 );
+
+
+	sbSizerViewRGB->Add( 0, 0, 1, wxEXPAND, 5 );
 
 	wxFlexGridSizer* fgSizerRGB;
 	fgSizerRGB = new wxFlexGridSizer( 0, 3, 0, 0 );
@@ -68,18 +71,18 @@ DIALOG_COLOR_PICKER_BASE::DIALOG_COLOR_PICKER_BASE( wxWindow* parent, wxWindowID
 	sbSizerViewRGB->Add( fgSizerRGB, 0, wxEXPAND, 5 );
 
 
-	bSizerPanels->Add( sbSizerViewRGB, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizerPanels->Add( sbSizerViewRGB, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
 
 	wxStaticBoxSizer* sbSizerViewHSV;
-	sbSizerViewHSV = new wxStaticBoxSizer( new wxStaticBox( m_panelFreeColors, wxID_ANY, _("HSV") ), wxHORIZONTAL );
-
-	wxBoxSizer* bSizer10;
-	bSizer10 = new wxBoxSizer( wxVERTICAL );
+	sbSizerViewHSV = new wxStaticBoxSizer( new wxStaticBox( m_panelFreeColors, wxID_ANY, _("HSV") ), wxVERTICAL );
 
 	m_HsvBitmap = new wxStaticBitmap( sbSizerViewHSV->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 264,264 ), 0 );
 	m_HsvBitmap->SetMinSize( wxSize( 264,264 ) );
 
-	bSizer10->Add( m_HsvBitmap, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	sbSizerViewHSV->Add( m_HsvBitmap, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND|wxSHAPED, 5 );
+
+
+	sbSizerViewHSV->Add( 0, 0, 1, wxEXPAND, 5 );
 
 	wxFlexGridSizer* fgSizerHSV;
 	fgSizerHSV = new wxFlexGridSizer( 0, 2, 0, 0 );
@@ -103,26 +106,23 @@ DIALOG_COLOR_PICKER_BASE::DIALOG_COLOR_PICKER_BASE( wxWindow* parent, wxWindowID
 	fgSizerHSV->Add( m_spinCtrlSaturation, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-	bSizer10->Add( fgSizerHSV, 0, wxEXPAND, 5 );
+	sbSizerViewHSV->Add( fgSizerHSV, 0, wxEXPAND, 5 );
 
 
-	sbSizerViewHSV->Add( bSizer10, 0, wxEXPAND, 5 );
+	bSizerPanels->Add( sbSizerViewHSV, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 	wxBoxSizer* bSizerBright;
 	bSizerBright = new wxBoxSizer( wxVERTICAL );
 
-	m_staticTextBright = new wxStaticText( sbSizerViewHSV->GetStaticBox(), wxID_ANY, _("Value:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBright = new wxStaticText( m_panelFreeColors, wxID_ANY, _("Value:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextBright->Wrap( -1 );
 	bSizerBright->Add( m_staticTextBright, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-	m_sliderBrightness = new wxSlider( sbSizerViewHSV->GetStaticBox(), wxID_ANY, 255, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_INVERSE|wxSL_LABELS|wxSL_LEFT|wxSL_VERTICAL );
+	m_sliderBrightness = new wxSlider( m_panelFreeColors, wxID_ANY, 255, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_INVERSE|wxSL_LABELS|wxSL_LEFT|wxSL_VERTICAL );
 	bSizerBright->Add( m_sliderBrightness, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxTOP, 5 );
 
 
-	sbSizerViewHSV->Add( bSizerBright, 0, wxEXPAND, 5 );
-
-
-	bSizerPanels->Add( sbSizerViewHSV, 0, wxEXPAND|wxBOTTOM|wxRIGHT, 5 );
+	bSizerPanels->Add( bSizerBright, 0, wxALL|wxEXPAND, 5 );
 
 
 	bSizerUpperFreeColors->Add( bSizerPanels, 1, wxEXPAND, 5 );
@@ -153,7 +153,7 @@ DIALOG_COLOR_PICKER_BASE::DIALOG_COLOR_PICKER_BASE( wxWindow* parent, wxWindowID
 	m_SizerDefinedColors->Fit( m_panelDefinedColors );
 	m_notebook->AddPage( m_panelDefinedColors, _("Defined Colors"), false );
 
-	bSizerUpperMain->Add( m_notebook, 0, wxEXPAND | wxALL, 5 );
+	bSizerUpperMain->Add( m_notebook, 1, wxEXPAND | wxALL, 5 );
 
 	m_SizerTransparency = new wxBoxSizer( wxVERTICAL );
 
@@ -171,35 +171,29 @@ DIALOG_COLOR_PICKER_BASE::DIALOG_COLOR_PICKER_BASE( wxWindow* parent, wxWindowID
 	bSizerUpperMain->Add( m_SizerTransparency, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
 
 
-	bSizerUpperMain->Add( 0, 0, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-
-	bSizerMain->Add( bSizerUpperMain, 0, wxEXPAND, 5 );
+	bSizerMain->Add( bSizerUpperMain, 1, wxEXPAND, 5 );
 
 	wxBoxSizer* bButtonsSizer;
 	bButtonsSizer = new wxBoxSizer( wxHORIZONTAL );
 
 	m_staticTextOldColor = new wxStaticText( this, wxID_ANY, _("Preview (old/new):"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextOldColor->Wrap( -1 );
-	bButtonsSizer->Add( m_staticTextOldColor, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	bButtonsSizer->Add( m_staticTextOldColor, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
 
 	m_OldColorRect = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
 	m_OldColorRect->SetMinSize( wxSize( 24,24 ) );
 
-	bButtonsSizer->Add( m_OldColorRect, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	bButtonsSizer->Add( m_OldColorRect, 0, wxALIGN_CENTER_VERTICAL|wxSHAPED, 5 );
 
 	m_NewColorRect = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
 	m_NewColorRect->SetMinSize( wxSize( 24,24 ) );
 
-	bButtonsSizer->Add( m_NewColorRect, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-	bButtonsSizer->Add( 10, 0, 0, wxEXPAND, 5 );
+	bButtonsSizer->Add( m_NewColorRect, 0, wxALIGN_CENTER_VERTICAL|wxSHAPED, 5 );
 
 	m_colorValue = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	m_colorValue->SetMinSize( wxSize( 176,-1 ) );
 
-	bButtonsSizer->Add( m_colorValue, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bButtonsSizer->Add( m_colorValue, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
 
 	bButtonsSizer->Add( 20, 0, 0, wxEXPAND, 5 );
@@ -217,7 +211,7 @@ DIALOG_COLOR_PICKER_BASE::DIALOG_COLOR_PICKER_BASE( wxWindow* parent, wxWindowID
 	bButtonsSizer->Add( m_sdbSizer, 1, wxALL, 5 );
 
 
-	bSizerMain->Add( bButtonsSizer, 1, wxEXPAND|wxLEFT, 10 );
+	bSizerMain->Add( bButtonsSizer, 0, wxEXPAND|wxLEFT, 10 );
 
 
 	this->SetSizer( bSizerMain );
@@ -234,6 +228,7 @@ DIALOG_COLOR_PICKER_BASE::DIALOG_COLOR_PICKER_BASE( wxWindow* parent, wxWindowID
 	m_spinCtrlBlue->Connect( wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler( DIALOG_COLOR_PICKER_BASE::OnChangeEditBlue ), NULL, this );
 	m_HsvBitmap->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( DIALOG_COLOR_PICKER_BASE::onHSVMouseClick ), NULL, this );
 	m_HsvBitmap->Connect( wxEVT_MOTION, wxMouseEventHandler( DIALOG_COLOR_PICKER_BASE::onHSVMouseDrag ), NULL, this );
+	m_HsvBitmap->Connect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_COLOR_PICKER_BASE::onSize ), NULL, this );
 	m_spinCtrlHue->Connect( wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler( DIALOG_COLOR_PICKER_BASE::OnChangeEditHue ), NULL, this );
 	m_spinCtrlSaturation->Connect( wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler( DIALOG_COLOR_PICKER_BASE::OnChangeEditSat ), NULL, this );
 	m_sliderBrightness->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DIALOG_COLOR_PICKER_BASE::OnChangeBrightness ), NULL, this );
@@ -268,6 +263,7 @@ DIALOG_COLOR_PICKER_BASE::~DIALOG_COLOR_PICKER_BASE()
 	m_spinCtrlBlue->Disconnect( wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler( DIALOG_COLOR_PICKER_BASE::OnChangeEditBlue ), NULL, this );
 	m_HsvBitmap->Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( DIALOG_COLOR_PICKER_BASE::onHSVMouseClick ), NULL, this );
 	m_HsvBitmap->Disconnect( wxEVT_MOTION, wxMouseEventHandler( DIALOG_COLOR_PICKER_BASE::onHSVMouseDrag ), NULL, this );
+	m_HsvBitmap->Disconnect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_COLOR_PICKER_BASE::onSize ), NULL, this );
 	m_spinCtrlHue->Disconnect( wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler( DIALOG_COLOR_PICKER_BASE::OnChangeEditHue ), NULL, this );
 	m_spinCtrlSaturation->Disconnect( wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler( DIALOG_COLOR_PICKER_BASE::OnChangeEditSat ), NULL, this );
 	m_sliderBrightness->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( DIALOG_COLOR_PICKER_BASE::OnChangeBrightness ), NULL, this );

common/dialogs/dialog_color_picker_base.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -81,6 +81,7 @@ class DIALOG_COLOR_PICKER_BASE : public DIALOG_SHIM
 		virtual void OnChangeEditBlue( wxSpinEvent& event ) { event.Skip(); }
 		virtual void onHSVMouseClick( wxMouseEvent& event ) { event.Skip(); }
 		virtual void onHSVMouseDrag( wxMouseEvent& event ) { event.Skip(); }
+		virtual void onSize( wxSizeEvent& event ) { event.Skip(); }
 		virtual void OnChangeEditHue( wxSpinEvent& event ) { event.Skip(); }
 		virtual void OnChangeEditSat( wxSpinEvent& event ) { event.Skip(); }
 		virtual void OnChangeBrightness( wxScrollEvent& event ) { event.Skip(); }

common/dialogs/dialog_migrate_settings.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2020 Jon Evans <jon@craftyjon.com>
- * Copyright (C) 2020-2022 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2020-2022, 2024 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -39,7 +39,8 @@ DIALOG_MIGRATE_SETTINGS::DIALOG_MIGRATE_SETTINGS( SETTINGS_MANAGER* aManager ) :
 
     SetupStandardButtons();
 
-    GetSizer()->SetSizeHints( this );
+    Layout();
+    m_sizer->Fit( this );
     Centre();
 }
 

common/dialogs/dialog_migrate_settings_base.cpp

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

common/dialogs/dialog_migrate_settings_base.fbp

@@ -1,34 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <wxFormBuilder_Project>
-  <FileVersion major="1" minor="17"/>
+  <FileVersion major="1" minor="18"/>
   <object class="Project" expanded="true">
-    <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="cpp_class_decoration">; </property>
+    <property name="cpp_disconnect_events">1</property>
+    <property name="cpp_event_generation">connect</property>
+    <property name="cpp_help_provider">none</property>
+    <property name="cpp_namespace"></property>
+    <property name="cpp_precompiled_header"></property>
+    <property name="cpp_use_array_enum">0</property>
+    <property name="cpp_use_enum">0</property>
     <property name="embedded_files_path">res</property>
     <property name="encoding">UTF-8</property>
-    <property name="event_generation">connect</property>
     <property name="file">dialog_migrate_settings_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="lua_skip_events">1</property>
+    <property name="lua_ui_table">UI</property>
     <property name="name">DIALOG_MIGRATE_SETTINGS</property>
-    <property name="namespace"></property>
     <property name="path">.</property>
-    <property name="precompiled_header"></property>
+    <property name="php_disconnect_events">0</property>
+    <property name="php_disconnect_mode">source_name</property>
+    <property name="php_skip_events">1</property>
+    <property name="python_disconnect_events">0</property>
+    <property name="python_disconnect_mode">source_name</property>
+    <property name="python_image_path_wrapper_function_name"></property>
+    <property name="python_indent_with_spaces"></property>
+    <property name="python_skip_events">1</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>
+    <property name="use_native_eol">0</property>
     <object class="Dialog" expanded="true">
       <property name="aui_managed">0</property>
       <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
@@ -49,7 +51,7 @@
       <property name="name">DIALOG_MIGRATE_SETTINGS_BASE</property>
       <property name="pos"></property>
       <property name="size"></property>
-      <property name="style">wxCAPTION</property>
+      <property name="style">wxCAPTION|wxRESIZE_BORDER</property>
       <property name="subclass">DIALOG_SHIM; dialog_shim.h; forward_declare</property>
       <property name="title">Configure KiCad Settings Path</property>
       <property name="tooltip"></property>
@@ -80,10 +82,10 @@
                 <property name="LeftDockable">1</property>
                 <property name="RightDockable">1</property>
                 <property name="TopDockable">1</property>
-                <property name="aui_layer"></property>
+                <property name="aui_layer">0</property>
                 <property name="aui_name"></property>
-                <property name="aui_position"></property>
-                <property name="aui_row"></property>
+                <property name="aui_position">0</property>
+                <property name="aui_row">0</property>
                 <property name="best_size"></property>
                 <property name="bg"></property>
                 <property name="caption"></property>
@@ -152,10 +154,10 @@
                 <property name="LeftDockable">1</property>
                 <property name="RightDockable">1</property>
                 <property name="TopDockable">1</property>
-                <property name="aui_layer"></property>
+                <property name="aui_layer">0</property>
                 <property name="aui_name"></property>
-                <property name="aui_position"></property>
-                <property name="aui_row"></property>
+                <property name="aui_position">0</property>
+                <property name="aui_row">0</property>
                 <property name="best_size"></property>
                 <property name="bg"></property>
                 <property name="caption"></property>
@@ -214,10 +216,10 @@
                 <property name="LeftDockable">1</property>
                 <property name="RightDockable">1</property>
                 <property name="TopDockable">1</property>
-                <property name="aui_layer"></property>
+                <property name="aui_layer">0</property>
                 <property name="aui_name"></property>
-                <property name="aui_position"></property>
-                <property name="aui_row"></property>
+                <property name="aui_position">0</property>
+                <property name="aui_row">0</property>
                 <property name="best_size"></property>
                 <property name="bg"></property>
                 <property name="caption"></property>
@@ -299,10 +301,10 @@
                     <property name="LeftDockable">1</property>
                     <property name="RightDockable">1</property>
                     <property name="TopDockable">1</property>
-                    <property name="aui_layer"></property>
+                    <property name="aui_layer">0</property>
                     <property name="aui_name"></property>
-                    <property name="aui_position"></property>
-                    <property name="aui_row"></property>
+                    <property name="aui_position">0</property>
+                    <property name="aui_row">0</property>
                     <property name="best_size"></property>
                     <property name="bg"></property>
                     <property name="caption"></property>
@@ -368,10 +370,10 @@
                     <property name="LeftDockable">1</property>
                     <property name="RightDockable">1</property>
                     <property name="TopDockable">1</property>
-                    <property name="aui_layer"></property>
+                    <property name="aui_layer">0</property>
                     <property name="aui_name"></property>
-                    <property name="aui_position"></property>
-                    <property name="aui_row"></property>
+                    <property name="aui_position">0</property>
+                    <property name="aui_row">0</property>
                     <property name="auth_needed">0</property>
                     <property name="best_size"></property>
                     <property name="bg"></property>
@@ -445,10 +447,10 @@
                 <property name="LeftDockable">1</property>
                 <property name="RightDockable">1</property>
                 <property name="TopDockable">1</property>
-                <property name="aui_layer"></property>
+                <property name="aui_layer">0</property>
                 <property name="aui_name"></property>
-                <property name="aui_position"></property>
-                <property name="aui_row"></property>
+                <property name="aui_position">0</property>
+                <property name="aui_row">0</property>
                 <property name="best_size"></property>
                 <property name="bg"></property>
                 <property name="caption"></property>
@@ -507,10 +509,10 @@
                 <property name="LeftDockable">1</property>
                 <property name="RightDockable">1</property>
                 <property name="TopDockable">1</property>
-                <property name="aui_layer"></property>
+                <property name="aui_layer">0</property>
                 <property name="aui_name"></property>
-                <property name="aui_position"></property>
-                <property name="aui_row"></property>
+                <property name="aui_position">0</property>
+                <property name="aui_row">0</property>
                 <property name="best_size"></property>
                 <property name="bg"></property>
                 <property name="caption"></property>
@@ -572,10 +574,10 @@
                 <property name="LeftDockable">1</property>
                 <property name="RightDockable">1</property>
                 <property name="TopDockable">1</property>
-                <property name="aui_layer"></property>
+                <property name="aui_layer">0</property>
                 <property name="aui_name"></property>
-                <property name="aui_position"></property>
-                <property name="aui_row"></property>
+                <property name="aui_position">0</property>
+                <property name="aui_row">0</property>
                 <property name="best_size"></property>
                 <property name="bg"></property>
                 <property name="caption"></property>

common/dialogs/dialog_migrate_settings_base.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -32,7 +32,6 @@ class STD_BITMAP_BUTTON;
 
 ///////////////////////////////////////////////////////////////////////////
 
-
 ///////////////////////////////////////////////////////////////////////////////
 /// Class DIALOG_MIGRATE_SETTINGS_BASE
 ///////////////////////////////////////////////////////////////////////////////
@@ -64,7 +63,7 @@ class DIALOG_MIGRATE_SETTINGS_BASE : public DIALOG_SHIM
 
 	public:
 
-		DIALOG_MIGRATE_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure KiCad Settings Path"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxCAPTION );
+		DIALOG_MIGRATE_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure KiCad Settings Path"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxCAPTION|wxRESIZE_BORDER );
 
 		~DIALOG_MIGRATE_SETTINGS_BASE();
 

common/dialogs/dialog_unit_entry.cpp

@@ -57,6 +57,10 @@ WX_PT_ENTRY_DIALOG::WX_PT_ENTRY_DIALOG( EDA_DRAW_FRAME* aParent, const wxString&
 {
     m_labelX->SetLabel( aLabelX );
     m_labelY->SetLabel( aLabelY );
+
+    m_unit_binder_x.SetCoordType( ORIGIN_TRANSFORMS::ABS_X_COORD );
+    m_unit_binder_y.SetCoordType( ORIGIN_TRANSFORMS::ABS_Y_COORD );
+
     m_unit_binder_x.SetValue( aDefaultValue.x );
     m_unit_binder_y.SetValue( aDefaultValue.y );
 

common/dialogs/panel_color_settings.cpp

@@ -191,20 +191,16 @@ void PANEL_COLOR_SETTINGS::OnThemeChanged( wxCommandEvent& event )
 void PANEL_COLOR_SETTINGS::updateSwatches()
 {
     if( m_swatches.empty() )
-    {
         createSwatches();
-    }
-    else
-    {
-        bool    isReadOnly = m_currentSettings->IsReadOnly();
-        COLOR4D background = m_currentSettings->GetColor( m_backgroundLayer );
 
-        for( std::pair<int, COLOR_SWATCH*> pair : m_swatches )
-        {
-            pair.second->SetSwatchBackground( background );
-            pair.second->SetSwatchColor( m_currentSettings->GetColor( pair.first ), false );
-            pair.second->SetReadOnly( isReadOnly );
-        }
+    bool    isReadOnly = m_currentSettings->IsReadOnly();
+    COLOR4D background = m_currentSettings->GetColor( m_backgroundLayer );
+
+    for( std::pair<int, COLOR_SWATCH*> pair : m_swatches )
+    {
+        pair.second->SetSwatchBackground( background );
+        pair.second->SetSwatchColor( m_currentSettings->GetColor( pair.first ), false );
+        pair.second->SetReadOnly( isReadOnly );
     }
 }
 

common/eda_draw_frame.cpp

@@ -114,7 +114,6 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame
     m_drawBgColor         = COLOR4D( BLACK );   // the background color of the draw canvas:
                                                 // BLACK for Pcbnew, BLACK or WHITE for Eeschema
     m_colorSettings       = nullptr;
-    m_msgFrameHeight      = EDA_MSG_PANEL::GetRequiredHeight( this );
     m_polarCoords         = false;
     m_findReplaceData     = std::make_unique<EDA_SEARCH_DATA>();
     m_hotkeyPopup         = nullptr;
@@ -170,15 +169,16 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame
         stsbar->SetFont( KIUI::GetStatusFont( this ) );
     }
 
+    m_messagePanel = new EDA_MSG_PANEL( this, -1, wxPoint( 0, m_frameSize.y ), wxDefaultSize );
+    m_messagePanel->SetBackgroundColour( COLOR4D( LIGHTGRAY ).ToColour() );
+    m_msgFrameHeight = m_messagePanel->GetBestSize().y;
+
     // Create child subwindows.
     GetClientSize( &m_frameSize.x, &m_frameSize.y );
     m_framePos.x   = m_framePos.y = 0;
     m_frameSize.y -= m_msgFrameHeight;
 
-    m_messagePanel  = new EDA_MSG_PANEL( this, -1, wxPoint( 0, m_frameSize.y ),
-                                         wxSize( m_frameSize.x, m_msgFrameHeight ) );
-
-    m_messagePanel->SetBackgroundColour( COLOR4D( LIGHTGRAY ).ToColour() );
+    m_messagePanel->SetSize( m_frameSize.x, m_msgFrameHeight );
 
     Bind( wxEVT_DPI_CHANGED,
           [&]( wxDPIChangedEvent& )
@@ -190,11 +190,13 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame
               // 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_msgFrameHeight = m_messagePanel->GetBestSize().y;
               m_frameSize.y -= m_msgFrameHeight;
 
               m_messagePanel->SetPosition( wxPoint( 0, m_frameSize.y ) );
               m_messagePanel->SetSize( m_frameSize.x, m_msgFrameHeight );
+
+              // Don't skip, otherwise the frame gets too big
           } );
 }
 

common/eda_item.cpp

@@ -34,7 +34,8 @@
 #include <wx/fdrepdlg.h>
 #include <eda_pattern_match.h>
 
-EDA_ITEM::EDA_ITEM( EDA_ITEM* parent, KICAD_T idType ) :
+EDA_ITEM::EDA_ITEM( EDA_ITEM* parent, KICAD_T idType, bool isSCH_ITEM, bool isBOARD_ITEM ) :
+        KIGFX::VIEW_ITEM( isSCH_ITEM, isBOARD_ITEM ),
         m_parent( parent ),
         m_forceVisible( false ),
         m_flags( 0 ),
@@ -42,7 +43,8 @@ EDA_ITEM::EDA_ITEM( EDA_ITEM* parent, KICAD_T idType ) :
 { }
 
 
-EDA_ITEM::EDA_ITEM( KICAD_T idType ) :
+EDA_ITEM::EDA_ITEM( KICAD_T idType, bool isSCH_ITEM, bool isBOARD_ITEM ) :
+        KIGFX::VIEW_ITEM( isSCH_ITEM, isBOARD_ITEM ),
         m_parent( nullptr ),
         m_forceVisible( false ),
         m_flags( 0 ),
@@ -51,6 +53,7 @@ EDA_ITEM::EDA_ITEM( KICAD_T idType ) :
 
 
 EDA_ITEM::EDA_ITEM( const EDA_ITEM& base ) :
+        KIGFX::VIEW_ITEM( base.IsSCH_ITEM(), base.IsBOARD_ITEM() ),
         m_Uuid( base.m_Uuid ),
         m_parent( base.m_parent ),
         m_forceVisible( base.m_forceVisible ),

common/eda_pattern_match.cpp

@@ -476,6 +476,12 @@ int EDA_COMBINED_MATCHER::ScoreTerms( std::vector<SEARCH_TERM>& aWeightedTerms )
         if( !term.Normalized )
         {
             term.Text = term.Text.MakeLower().Trim( false ).Trim( true );
+
+            // Don't cause KiCad to hang if someone accidentally pastes the PCB or schematic
+            // into the search box.
+            if( term.Text.Length() > 1000 )
+                term.Text = term.Text.Left( 1000 );
+
             term.Normalized = true;
         }
 

common/eda_shape.cpp

@@ -182,6 +182,32 @@ void EDA_SHAPE::SetLength( const double& aLength )
     }
 }
 
+void EDA_SHAPE::SetRectangleHeight( const int& aHeight )
+{
+    switch ( m_shape )
+    {
+    case SHAPE_T::RECTANGLE:
+        m_rectangleHeight = aHeight;
+        SetEndY( GetStartY() + m_rectangleHeight );
+        break;
+
+    default: UNIMPLEMENTED_FOR( SHAPE_T_asString() );
+    }
+}
+
+void EDA_SHAPE::SetRectangleWidth( const int& aWidth )
+{
+    switch ( m_shape )
+    {
+    case SHAPE_T::RECTANGLE:
+        m_rectangleWidth = aWidth;
+        SetEndX( GetStartX() + m_rectangleWidth );
+        break;
+
+    default: UNIMPLEMENTED_FOR( SHAPE_T_asString() );
+    }
+}
+
 void EDA_SHAPE::SetRectangle( const long long int& aHeight, const long long int& aWidth )
 {
     switch ( m_shape )
@@ -243,12 +269,18 @@ void EDA_SHAPE::move( const VECTOR2I& aMoveVector )
     switch ( m_shape )
     {
     case SHAPE_T::ARC:
+        m_arcCenter += aMoveVector;
+        m_arcMidData.center += aMoveVector;
+        m_arcMidData.start += aMoveVector;
+        m_arcMidData.end += aMoveVector;
+        m_arcMidData.mid += aMoveVector;
+        KI_FALLTHROUGH;
+
     case SHAPE_T::SEGMENT:
     case SHAPE_T::RECTANGLE:
     case SHAPE_T::CIRCLE:
         m_start += aMoveVector;
         m_end += aMoveVector;
-        m_arcCenter += aMoveVector;
         break;
 
     case SHAPE_T::POLY:
@@ -342,6 +374,10 @@ void EDA_SHAPE::rotate( const VECTOR2I& aRotCentre, const EDA_ANGLE& aAngle )
         RotatePoint( m_start, aRotCentre, aAngle );
         RotatePoint( m_end, aRotCentre, aAngle );
         RotatePoint( m_arcCenter, aRotCentre, aAngle );
+        RotatePoint( m_arcMidData.start, aRotCentre, aAngle );
+        RotatePoint( m_arcMidData.end, aRotCentre, aAngle );
+        RotatePoint( m_arcMidData.mid, aRotCentre, aAngle );
+        RotatePoint( m_arcMidData.center, aRotCentre, aAngle );
         break;
 
     case SHAPE_T::RECTANGLE:
@@ -1971,6 +2007,15 @@ static struct EDA_SHAPE_DESC
             return false;
         };
 
+        auto isRectangle = []( 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::RECTANGLE;
+
+            return false;
+        };
+
         const wxString shapeProps = _HKI( "Shape Properties" );
 
         auto shape = new PROPERTY_ENUM<EDA_SHAPE, SHAPE_T>( _HKI( "Shape" ),
@@ -2018,6 +2063,18 @@ static struct EDA_SHAPE_DESC
                     shapeProps )
                 .SetAvailableFunc( isNotPolygonOrCircle );
 
+        propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "Width" ),
+                    &EDA_SHAPE::SetRectangleWidth, &EDA_SHAPE::GetRectangleWidth, PROPERTY_DISPLAY::PT_COORD,
+                    ORIGIN_TRANSFORMS::ABS_Y_COORD ),
+                    shapeProps )
+                .SetAvailableFunc( isRectangle );
+
+        propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "Height" ),
+                    &EDA_SHAPE::SetRectangleHeight, &EDA_SHAPE::GetRectangleHeight, PROPERTY_DISPLAY::PT_COORD,
+                    ORIGIN_TRANSFORMS::ABS_Y_COORD ),
+                    shapeProps )
+                .SetAvailableFunc( isRectangle );
+
         propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "Line Width" ),
                     &EDA_SHAPE::SetWidth, &EDA_SHAPE::GetWidth, PROPERTY_DISPLAY::PT_SIZE ),
                     shapeProps );
@@ -2070,9 +2127,17 @@ static struct EDA_SHAPE_DESC
                     shapeProps )
                 .SetAvailableFunc( fillAvailable );
 
-        propMgr.AddProperty( new PROPERTY<EDA_SHAPE, COLOR4D>( _HKI( "Fill Color" ),
-                    &EDA_SHAPE::SetFillColor, &EDA_SHAPE::GetFillColor ),
-                    shapeProps )
+        auto fillColor = new PROPERTY<EDA_SHAPE, COLOR4D>( _HKI( "Fill Color" ),
+                        &EDA_SHAPE::SetFillColor, &EDA_SHAPE::GetFillColor );
+        fillColor->SetWriteableFunc(
+                [=]( INSPECTABLE* aItem ) -> bool
+                {
+                    if( EDA_SHAPE* edaShape = dynamic_cast<EDA_SHAPE*>( aItem ) )
+                        return edaShape->GetFillMode() == FILL_T::FILLED_WITH_COLOR;
+
+                    return true;
+                } );
+        propMgr.AddProperty( fillColor, shapeProps )
                 .SetAvailableFunc( fillAvailable )
                 .SetIsHiddenFromRulesEditor();
     }

common/eda_text.cpp

@@ -212,6 +212,26 @@ void EDA_TEXT::SetTextAngle( const EDA_ANGLE& aAngle )
 
 
 void EDA_TEXT::SetItalic( bool aItalic )
+{
+    if( m_attributes.m_Italic != aItalic )
+    {
+        const KIFONT::FONT* font = GetFont();
+
+        if( !font || font->IsStroke() )
+        {
+            // For stroke fonts, just need to set the attribute.
+        }
+        else
+        {
+            // For outline fonts, italic-ness is determined by the font itself.
+            SetFont( KIFONT::FONT::GetFont( font->GetName(), IsBold(), aItalic ) );
+        }
+    }
+
+    SetItalicFlag( aItalic );
+}
+
+void EDA_TEXT::SetItalicFlag( bool aItalic )
 {
     m_attributes.m_Italic = aItalic;
     ClearRenderCache();
@@ -223,12 +243,38 @@ void EDA_TEXT::SetBold( bool aBold )
 {
     if( m_attributes.m_Bold != aBold )
     {
-        int size = std::min( m_attributes.m_Size.x, m_attributes.m_Size.y );
+        const KIFONT::FONT* font = GetFont();
 
-        if( aBold )
-            m_attributes.m_StrokeWidth = GetPenSizeForBold( size );
+        if( !font || font->IsStroke() )
+        {
+            // For stroke fonts, boldness is determined by the pen size.
+            const int size = std::min( m_attributes.m_Size.x, m_attributes.m_Size.y );
+
+            if( aBold )
+            {
+                m_attributes.m_StoredStrokeWidth = m_attributes.m_StrokeWidth;
+                m_attributes.m_StrokeWidth = GetPenSizeForBold( size );
+            }
+            else
+            {
+                // Restore the original stroke width from `m_StoredStrokeWidth` if it was previously stored,
+                // resetting the width after unbolding.
+                if( m_attributes.m_StoredStrokeWidth )
+                    m_attributes.m_StrokeWidth = m_attributes.m_StoredStrokeWidth;
+                else
+                {
+                    m_attributes.m_StrokeWidth = GetPenSizeForNormal( size );
+                    // Sets `m_StrokeWidth` to the normal pen size and stores it in `m_StoredStrokeWidth`
+                    // as the default, but only if the bold option was applied before this feature was implemented.
+                    m_attributes.m_StoredStrokeWidth = m_attributes.m_StrokeWidth;
+                }
+            }
+        }
         else
-            m_attributes.m_StrokeWidth = GetPenSizeForNormal( size );
+        {
+            // For outline fonts, boldness is determined by the font itself.
+            SetFont( KIFONT::FONT::GetFont( font->GetName(), aBold, IsItalic() ) );
+        }
     }
 
     SetBoldFlag( aBold );

common/font/outline_font.cpp

@@ -267,6 +267,7 @@ struct GLYPH_CACHE_KEY {
     bool           fakeItalic;
     bool           fakeBold;
     bool           mirror;
+    bool           supersub;
     EDA_ANGLE      angle;
 
     bool operator==(const GLYPH_CACHE_KEY& rhs ) const
@@ -278,6 +279,7 @@ struct GLYPH_CACHE_KEY {
                 && fakeItalic == rhs.fakeItalic
                 && fakeBold == rhs.fakeBold
                 && mirror == rhs.mirror
+                && supersub == rhs.supersub
                 && angle == rhs.angle;
     }
 };
@@ -296,6 +298,7 @@ namespace std
                         ^ hash<int>()( k.fakeItalic )
                         ^ hash<int>()( k.fakeBold )
                         ^ hash<int>()( k.mirror )
+                        ^ hash<int>()( k.supersub )
                         ^ hash<int>()( k.angle.AsTenthsOfADegree() );
         }
     };
@@ -312,11 +315,10 @@ VECTOR2I OUTLINE_FONT::getTextAsGlyphsUnlocked( BOX2I* aBBox,
     VECTOR2D glyphSize = aSize;
     FT_Face  face = m_face;
     double   scaler = faceSize();
+    bool     supersub = IsSuperscript( aTextStyle ) || IsSubscript( aTextStyle );
 
-    if( IsSubscript( aTextStyle ) || IsSuperscript( aTextStyle ) )
-    {
+    if( supersub )
         scaler = subscriptSize();
-    }
 
     // set glyph resolution so that FT_Load_Glyph() results are good enough for decomposing
     FT_Set_Char_Size( face, 0, scaler, GLYPH_RESOLUTION, 0 );
@@ -355,7 +357,7 @@ VECTOR2I OUTLINE_FONT::getTextAsGlyphsUnlocked( BOX2I* aBBox,
         if( aGlyphs )
         {
             GLYPH_CACHE_KEY key = { face, glyphInfo[i].codepoint, scaler, m_forDrawingSheet,
-                                    m_fakeItal, m_fakeBold, aMirror, aAngle };
+                                    m_fakeItal, m_fakeBold, aMirror, supersub, aAngle };
             GLYPH_DATA&     glyphData = s_glyphCache[ key ];
 
             if( glyphData.m_Contours.empty() )
@@ -452,6 +454,8 @@ VECTOR2I OUTLINE_FONT::getTextAsGlyphsUnlocked( BOX2I* aBBox,
 
             for( SHAPE_LINE_CHAIN& hole : holes )
             {
+                bool added_hole = false;
+
                 if( hole.PointCount() )
                 {
                     for( int ii = 0; ii < glyph->OutlineCount(); ++ii )
@@ -459,9 +463,15 @@ VECTOR2I OUTLINE_FONT::getTextAsGlyphsUnlocked( BOX2I* aBBox,
                         if( glyph->Outline( ii ).PointInside( hole.GetPoint( 0 ) ) )
                         {
                             glyph->AddHole( std::move( hole ), ii );
+                            added_hole = true;
                             break;
                         }
                     }
+
+                    // Some lovely TTF fonts decided that winding didn't matter for outlines that
+                    // don't have holes, so holes that don't fit in any outline are added as outlines
+                    if( !added_hole )
+                        glyph->AddOutline( std::move( hole ) );
                 }
             }
 

common/font/text_attributes.cpp

@@ -35,7 +35,8 @@ TEXT_ATTRIBUTES::TEXT_ATTRIBUTES( KIFONT::FONT* aFont ) :
     m_Visible( true ),
     m_Mirrored( false ),
     m_Multiline( true ),
-    m_KeepUpright( false )
+    m_KeepUpright( false ),
+    m_StoredStrokeWidth( 0 )
 {
 }
 

common/gestfich.cpp

@@ -275,25 +275,6 @@ bool OpenPDF( const wxString& file )
 }
 
 
-void OpenFile( const wxString& file )
-{
-    wxFileName  fileName( file );
-    wxFileType* filetype = wxTheMimeTypesManager->GetFileTypeFromExtension( fileName.GetExt() );
-
-    if( !filetype )
-        return;
-
-    wxString    command;
-    wxFileType::MessageParameters params( file );
-
-    filetype->GetOpenCommand( &command, params );
-    delete filetype;
-
-    if( !command.IsEmpty() )
-        wxExecute( command );
-}
-
-
 void KiCopyFile( const wxString& aSrcPath, const wxString& aDestPath, wxString& aErrors )
 {
     if( !wxCopyFile( aSrcPath, aDestPath ) )

common/grid_tricks.cpp

@@ -693,7 +693,14 @@ void GRID_TRICKS::paste_clipboard()
 
             wxTheClipboard->GetData( data );
 
-            paste_text( data.GetText() );
+            wxString text = data.GetText();
+
+#ifdef __WXMAC__
+            // Some editors use windows linefeeds (\r\n), which wx re-writes to \n\n
+            text.Replace( "\n\n", "\n" );
+#endif
+
+            paste_text( text );
         }
 
         wxTheClipboard->Close();
@@ -802,6 +809,14 @@ void GRID_TRICKS::paste_text( const wxString& cb_text )
             {
                 tbl->SetValue( row, col, cellTxt );
 
+                wxGridEvent evt( m_grid->GetId(), wxEVT_GRID_CELL_CHANGED, m_grid, row, col );
+                m_grid->GetEventHandler()->ProcessEvent( evt );
+            }
+            // Allow paste to any cell that can accept a boolean value
+            else if( tbl->CanSetValueAs( row, col, wxGRID_VALUE_BOOL ) )
+            {
+                tbl->SetValueAsBool( row, col, cellTxt == wxT( "1" ) );
+
                 wxGridEvent evt( m_grid->GetId(), wxEVT_GRID_CELL_CHANGED, m_grid, row, col );
                 m_grid->GetEventHandler()->ProcessEvent( evt );
             }

common/http_lib/http_lib_connection.cpp

@@ -143,8 +143,15 @@ bool HTTP_LIB_CONNECTION::syncCategories()
         {
             HTTP_LIB_CATEGORY category;
 
-            category.id = item.value()["id"].get<std::string>();
-            category.name = item.value()["name"].get<std::string>();
+            auto& value = item.value();
+            category.id = value["id"].get<std::string>();
+            category.name = value["name"].get<std::string>();
+
+            if( value.contains( "description" ) )
+            {
+                category.description = value["description"].get<std::string>();
+                m_categoryDescriptions[category.name] = category.description;
+            }
 
             m_categories.push_back( category );
         }
@@ -179,12 +186,12 @@ bool HTTP_LIB_CONNECTION::SelectOne( const std::string& aPartID, HTTP_LIB_PART&
     if( m_cachedParts.find( aPartID ) != m_cachedParts.end() )
     {
         // check if it's outdated, if so re-fetch
-        if( std::difftime( std::time( nullptr ), m_cachedParts[aPartID].lastCached ) < m_source.timeout_parts )
+        if( std::difftime( std::time( nullptr ), m_cachedParts[aPartID].lastCached )
+            < m_source.timeout_parts )
         {
             aFetchedPart = m_cachedParts[aPartID];
             return true;
         }
-
     }
 
     std::string res = "";
@@ -203,7 +210,7 @@ bool HTTP_LIB_CONNECTION::SelectOne( const std::string& aPartID, HTTP_LIB_PART&
             return false;
         }
 
-        nlohmann::json response = nlohmann::json::parse( res );
+        nlohmann::ordered_json response = nlohmann::ordered_json::parse( res );
         std::string    key = "";
         std::string    value = "";
 
@@ -252,6 +259,9 @@ bool HTTP_LIB_CONNECTION::SelectOne( const std::string& aPartID, HTTP_LIB_PART&
             aFetchedPart.exclude_from_sim = boolFromString( exclude, false );
         }
 
+        // remove previously loaded fields
+        aFetchedPart.fields.clear();
+
         // Extract available fields
         for( const auto& field : response.at( "fields" ).items() )
         {
@@ -273,10 +283,8 @@ bool HTTP_LIB_CONNECTION::SelectOne( const std::string& aPartID, HTTP_LIB_PART&
             }
 
             // Add field to fields list
-            if( key.length() )
-            {
-                aFetchedPart.fields[key] = std::make_tuple( value, visible );
-            }
+            aFetchedPart.fields.push_back(
+                    std::make_pair( key, std::make_tuple( value, visible ) ) );
         }
     }
     catch( const std::exception& e )
@@ -297,7 +305,7 @@ bool HTTP_LIB_CONNECTION::SelectOne( const std::string& aPartID, HTTP_LIB_PART&
 }
 
 
-bool HTTP_LIB_CONNECTION::SelectAll( const HTTP_LIB_CATEGORY& aCategory,
+bool HTTP_LIB_CONNECTION::SelectAll( const HTTP_LIB_CATEGORY&    aCategory,
                                      std::vector<HTTP_LIB_PART>& aParts )
 {
     if( !IsValidEndpoint() )
@@ -319,8 +327,6 @@ bool HTTP_LIB_CONNECTION::SelectAll( const HTTP_LIB_CATEGORY& aCategory,
         res = curl->GetBuffer();
 
         nlohmann::json response = nlohmann::json::parse( res );
-        std::string    key = "";
-        std::string    value = "";
 
         for( nlohmann::json& item : response )
         {
@@ -332,7 +338,8 @@ bool HTTP_LIB_CONNECTION::SelectAll( const HTTP_LIB_CATEGORY& aCategory,
             if( item.contains( "description" ) )
             {
                 // At this point we don't display anything so just set it to false
-                part.fields["description"] = std::make_tuple( item.at( "description" ), false );
+                part.fields.push_back( std::make_pair(
+                        "description", std::make_tuple( item.at( "description" ), false ) ) );
             }
 
             // API might not want to return an optional name.

common/import_gfx/dxf_import_plugin.cpp

@@ -98,7 +98,7 @@ DXF_IMPORT_PLUGIN::DXF_IMPORT_PLUGIN() : DL_CreationAdapter()
     m_brdLayer         = Dwgs_User;    // The default import layer
     m_importAsFPShapes = true;
     m_minX             = m_minY = std::numeric_limits<double>::max();
-    m_maxX             = m_maxY = std::numeric_limits<double>::min();
+    m_maxX             = m_maxY = std::numeric_limits<double>::lowest();
     m_currentUnit      = DXF_IMPORT_UNITS::DEFAULT;
 
     m_importCoordinatePrecision = 4;    // initial value per dxf spec
@@ -131,7 +131,7 @@ bool DXF_IMPORT_PLUGIN::Load( const wxString& aFileName )
 
         m_internalImporter.ClearShapes();
 
-        reportMsg( _( "Memory was exhausted trying to load the DXF, it may be too large." ) );
+        ReportMsg( _( "Memory was exhausted trying to load the DXF, it may be too large." ) );
         return false;
     }
 }
@@ -151,7 +151,7 @@ bool DXF_IMPORT_PLUGIN::LoadFromMemory( const wxMemoryBuffer& aMemBuffer )
 
         m_internalImporter.ClearShapes();
 
-        reportMsg( _( "Memory was exhausted trying to load the DXF, it may be too large." ) );
+        ReportMsg( _( "Memory was exhausted trying to load the DXF, it may be too large." ) );
         return false;
     }
 }
@@ -247,7 +247,7 @@ bool DXF_IMPORT_PLUGIN::ImportDxfFile( const wxMemoryBuffer& aMemBuffer )
 }
 
 
-void DXF_IMPORT_PLUGIN::reportMsg( const wxString& aMessage )
+void DXF_IMPORT_PLUGIN::ReportMsg( const wxString& aMessage )
 {
     // Add message to keep trace of not handled dxf entities
     m_messages += aMessage;
@@ -1411,8 +1411,8 @@ void DXF_IMPORT_PLUGIN::insertSpline( double aWidth )
         ctrlp.push_back( m_curr_entity.m_SplineControlPointList[ii].m_y );
     }
 
-    std::vector<double> coords;
     tinyspline::BSpline beziers;
+    std::vector<double> coords;
 
     try
     {
@@ -1421,15 +1421,18 @@ void DXF_IMPORT_PLUGIN::insertSpline( double aWidth )
 
 	    dxfspline.setControlPoints( ctrlp );
 	    dxfspline.setKnots( m_curr_entity.m_SplineKnotsList );
-        beziers = tinyspline::BSpline( dxfspline.toBeziers() );
 
+        if( dxfspline.degree() < 3 )
+            dxfspline = dxfspline.elevateDegree( 3 - dxfspline.degree() );
+
+        beziers = dxfspline.toBeziers();
         coords = beziers.controlPoints();
     }
     catch( const std::runtime_error& )  // tinyspline throws everything including data validation
                                         // as runtime errors
     {
         // invalid spline definition, drop this block
-        reportMsg( _( "Invalid spline definition encountered" ) );
+        ReportMsg( _( "Invalid spline definition encountered" ) );
         return;
     }
 
@@ -1446,14 +1449,14 @@ void DXF_IMPORT_PLUGIN::insertSpline( double aWidth )
         // not sure why this happens, but it seems to sometimes slip degree on the final bezier
         VECTOR2D bezierControl2;
 
-        if( ii + 4 >= coords.size() )
+        if( ii + 5 >= coords.size() )
             bezierControl2 = bezierControl1;
         else
             bezierControl2 = VECTOR2D( mapX( coords[ii + 4] ), mapY( coords[ii + 5] ) );
 
         VECTOR2D end;
 
-        if( ii + 6 >= coords.size() )
+        if( ii + 7 >= coords.size() )
             end = bezierControl2;
         else
             end = VECTOR2D( mapX( coords[ii + 6] ), mapY( coords[ii + 7] ) );

common/import_gfx/dxf_import_plugin.h

@@ -320,10 +320,10 @@ public:
     {
         return m_messages;
     }
+    // report message to keep trace of not supported dxf entities:
+    void ReportMsg( const wxString& aMessage ) override;
 
 private:
-    // report message to keep trace of not supported dxf entities:
-    void reportMsg( const wxString& aMessage );
 
     // coordinate conversions from dxf file to mm
     double mapX( double aDxfCoordX );
@@ -455,77 +455,77 @@ private:
     // Not yet handled DXF entities:
     virtual void addXLine( const DL_XLineData& ) override
     {
-        reportMsg( _( "DXF construction lines not currently supported." ) );
+        ReportMsg( _( "DXF construction lines not currently supported." ) );
     }
     virtual void addRay( const DL_RayData& ) override
     {
-        reportMsg( _( "DXF construction lines not currently supported." ) );
+        ReportMsg( _( "DXF construction lines not currently supported." ) );
     }
 
     virtual void addArcAlignedText( const DL_ArcAlignedTextData& ) override
     {
-        reportMsg( _( "DXF arc-aligned text not currently supported." ) );
+        ReportMsg( _( "DXF arc-aligned text not currently supported." ) );
     }
 
     virtual void addDimAlign( const DL_DimensionData&, const DL_DimAlignedData& ) override
     {
-        reportMsg( _( "DXF dimensions not currently supported." ) );
+        ReportMsg( _( "DXF dimensions not currently supported." ) );
     }
     virtual void addDimLinear( const DL_DimensionData&, const DL_DimLinearData& ) override
     {
-        reportMsg( _( "DXF dimensions not currently supported." ) );
+        ReportMsg( _( "DXF dimensions not currently supported." ) );
     }
     virtual void addDimRadial( const DL_DimensionData&, const DL_DimRadialData& ) override
     {
-        reportMsg( _( "DXF dimensions not currently supported." ) );
+        ReportMsg( _( "DXF dimensions not currently supported." ) );
     }
     virtual void addDimDiametric( const DL_DimensionData&, const DL_DimDiametricData& ) override
     {
-        reportMsg( _( "DXF dimensions not currently supported." ) );
+        ReportMsg( _( "DXF dimensions not currently supported." ) );
     }
     virtual void addDimAngular( const DL_DimensionData&, const DL_DimAngular2LData& ) override
     {
-        reportMsg( _( "DXF dimensions not currently supported." ) );
+        ReportMsg( _( "DXF dimensions not currently supported." ) );
     }
     virtual void addDimAngular3P( const DL_DimensionData&, const DL_DimAngular3PData& ) override
     {
-        reportMsg( _( "DXF dimensions not currently supported." ) );
+        ReportMsg( _( "DXF dimensions not currently supported." ) );
     }
     virtual void addDimOrdinate( const DL_DimensionData&, const DL_DimOrdinateData& ) override
     {
-        reportMsg( _( "DXF dimensions not currently supported." ) );
+        ReportMsg( _( "DXF dimensions not currently supported." ) );
     }
     virtual void addLeader( const DL_LeaderData& ) override
     {
-        reportMsg( _( "DXF dimensions not currently supported." ) );
+        ReportMsg( _( "DXF dimensions not currently supported." ) );
     }
     virtual void addLeaderVertex( const DL_LeaderVertexData& ) override { }
 
     virtual void addHatch( const DL_HatchData& ) override
     {
-        reportMsg( _( "DXF hatches not currently supported." ) );
+        ReportMsg( _( "DXF hatches not currently supported." ) );
     }
     virtual void addHatchLoop( const DL_HatchLoopData& ) override { }
     virtual void addHatchEdge( const DL_HatchEdgeData& ) override { }
 
     virtual void addTrace( const DL_TraceData& ) override
     {
-        reportMsg( _( "DXF traces not currently supported." ) );
+        ReportMsg( _( "DXF traces not currently supported." ) );
     }
 
     virtual void add3dFace( const DL_3dFaceData& ) override
     {
-        reportMsg( _( "DXF 3dfaces not currently supported." ) );
+        ReportMsg( _( "DXF 3dfaces not currently supported." ) );
     }
 
     virtual void addSolid( const DL_SolidData& ) override
     {
-        reportMsg( _( "DXF solids not currently supported." ) );
+        ReportMsg( _( "DXF solids not currently supported." ) );
     }
 
     virtual void addImage( const DL_ImageData& ) override
     {
-        reportMsg( _( "DXF images not currently supported." ) );
+        ReportMsg( _( "DXF images not currently supported." ) );
     }
     virtual void linkImage( const DL_ImageDefData& ) override {}
 

common/import_gfx/graphics_import_plugin.h

@@ -131,6 +131,8 @@ public:
      */
     const virtual wxString& GetMessages() const = 0;
 
+    virtual void ReportMsg( const wxString& aMessage ) = 0;
+
 protected:
     ///< Importer used to create objects representing the imported shapes.
     GRAPHICS_IMPORTER* m_importer;

common/import_gfx/graphics_importer.h

@@ -125,6 +125,11 @@ public:
         return m_plugin->GetMessages();
     }
 
+    void ReportMsg( const wxString& aMessage )
+    {
+        m_plugin->ReportMsg( aMessage );
+    }
+
     /**
      * Get original image Width.
      *

common/import_gfx/graphics_importer_buffer.cpp

@@ -98,6 +98,92 @@ void GRAPHICS_IMPORTER_BUFFER::AddShape( std::unique_ptr<IMPORTED_SHAPE>& aShape
 
 void GRAPHICS_IMPORTER_BUFFER::ImportTo( GRAPHICS_IMPORTER& aImporter )
 {
+    BOX2D boundingBox;
+
+    for( std::unique_ptr<IMPORTED_SHAPE>& shape : m_shapes )
+    {
+        BOX2D box = shape->GetBoundingBox();
+
+        if( box.IsValid() )
+            boundingBox.Merge( box );
+    }
+
+    boundingBox.SetOrigin( boundingBox.GetPosition().x * aImporter.GetScale().x,
+                           boundingBox.GetPosition().y * aImporter.GetScale().y );
+    boundingBox.SetSize( boundingBox.GetSize().x * aImporter.GetScale().x,
+                         boundingBox.GetSize().y * aImporter.GetScale().y );
+
+    // Check that the scaled graphics fit in the KiCad numeric limits
+    if( boundingBox.GetSize().x * aImporter.GetMillimeterToIuFactor() > std::numeric_limits<int>::max() ||
+        boundingBox.GetSize().y * aImporter.GetMillimeterToIuFactor() > std::numeric_limits<int>::max() )
+    {
+        double scale_factor = std::numeric_limits<int>::max() / ( aImporter.GetMillimeterToIuFactor() + 100 );
+        double max_scale = std::max( scale_factor / boundingBox.GetSize().x,
+                                     scale_factor / boundingBox.GetSize().y );
+        aImporter.ReportMsg( wxString::Format( _( "Imported graphic is too large. Maximum scale is %f" ),
+                                             max_scale ) );
+        return;
+    }
+    // They haven't set the import offset, so we set it to the bounding box origin to keep the graphics
+    // in the KiCad drawing area
+    else if( aImporter.GetImportOffsetMM() == VECTOR2D( 0, 0 ) )
+    {
+        if( boundingBox.GetRight() > std::numeric_limits<int>::max()
+            || boundingBox.GetBottom() > std::numeric_limits<int>::max()
+            || boundingBox.GetLeft() < std::numeric_limits<int>::min()
+            || boundingBox.GetTop() < std::numeric_limits<int>::min() )
+        {
+            VECTOR2D offset = boundingBox.GetOrigin();
+            aImporter.SetImportOffsetMM( -offset );
+        }
+    }
+    else
+    {
+        double   total_scale_x = aImporter.GetScale().x * aImporter.GetMillimeterToIuFactor();
+        double   total_scale_y = aImporter.GetScale().y * aImporter.GetMillimeterToIuFactor();
+
+        double max_offset_x =
+                ( aImporter.GetImportOffsetMM().x + boundingBox.GetRight() ) * total_scale_x;
+        double max_offset_y =
+                ( aImporter.GetImportOffsetMM().y + boundingBox.GetBottom() ) * total_scale_y;
+        double min_offset_x =
+                ( aImporter.GetImportOffsetMM().x + boundingBox.GetLeft() ) * total_scale_x;
+        double min_offset_y =
+                ( aImporter.GetImportOffsetMM().y + boundingBox.GetTop() ) * total_scale_y;
+
+        VECTOR2D newOffset = aImporter.GetImportOffsetMM();
+        bool needsAdjustment = false;
+
+        if( max_offset_x >= std::numeric_limits<int>::max() )
+        {
+            newOffset.x -= ( max_offset_x - std::numeric_limits<int>::max() + 100.0 ) / total_scale_x;
+            needsAdjustment = true;
+        }
+        else if( min_offset_x <= std::numeric_limits<int>::min() )
+        {
+            newOffset.x -= ( min_offset_x - std::numeric_limits<int>::min() - 100 ) / total_scale_x;
+            needsAdjustment = true;
+        }
+
+        if( max_offset_y >= std::numeric_limits<int>::max() )
+        {
+            newOffset.y -= ( max_offset_y - std::numeric_limits<int>::max() + 100 ) / total_scale_y;
+            needsAdjustment = true;
+        }
+        else if( min_offset_y <= std::numeric_limits<int>::min() )
+        {
+            newOffset.y -= ( min_offset_y - std::numeric_limits<int>::min() - 100 ) / total_scale_y;
+            needsAdjustment = true;
+        }
+
+        if( needsAdjustment )
+        {
+            aImporter.ReportMsg( wxString::Format( _( "Import offset adjusted to (%f, %f) to fit within numeric limits" ),
+                                                   newOffset.x, newOffset.y ) );
+            aImporter.SetImportOffsetMM( newOffset );
+        }
+    }
+
     for( std::unique_ptr<IMPORTED_SHAPE>& shape : m_shapes )
         shape->ImportTo( aImporter );
 }

common/import_gfx/graphics_importer_buffer.h

@@ -30,6 +30,7 @@
 #include "graphics_importer.h"
 
 #include <math/matrix3x3.h>
+#include <math/box2.h>
 #include <list>
 
 
@@ -46,6 +47,8 @@ public:
     void SetParentShapeIndex( int aIndex ) { m_parentShapeIndex = aIndex; }
     int  GetParentShapeIndex() const { return m_parentShapeIndex; }
 
+    virtual BOX2D GetBoundingBox() const = 0;
+
 protected:
     int m_parentShapeIndex = -1;
 };
@@ -75,6 +78,14 @@ public:
         m_end = aTransform * m_end + aTranslation;
     }
 
+    BOX2D GetBoundingBox() const override
+    {
+        BOX2D box;
+        box.Merge( m_start );
+        box.Merge( m_end );
+        return box;
+    }
+
 private:
     VECTOR2D        m_start;
     VECTOR2D        m_end;
@@ -113,6 +124,14 @@ public:
         m_radius = newRadius.EuclideanNorm();
     }
 
+    BOX2D GetBoundingBox() const override
+    {
+        BOX2D box;
+        box.Merge( m_center - VECTOR2D( m_radius, m_radius ) );
+        box.Merge( m_center + VECTOR2D( m_radius, m_radius ) );
+        return box;
+    }
+
 private:
     VECTOR2D        m_center;
     double          m_radius;
@@ -148,6 +167,26 @@ public:
         m_center = aTransform * m_center + aTranslation;
     }
 
+    BOX2D GetBoundingBox() const override
+    {
+        BOX2D box;
+
+        box.Merge( m_start + m_stroke.GetWidth() );
+        box.Merge( m_start - m_stroke.GetWidth() );
+
+        for( double angle = 0; angle < m_angle.AsDegrees(); angle += 5 )
+        {
+            EDA_ANGLE ang = EDA_ANGLE( angle );
+            VECTOR2D start = m_center + m_start;
+            VECTOR2D pt = {start.x * ang.Cos() + start.y * ang.Sin(),
+                           start.x * ang.Sin() - start.y * ang.Cos()};
+
+            box.Merge( pt );
+        }
+
+        return box;
+    }
+
 private:
     VECTOR2D        m_center;
     VECTOR2D        m_start;
@@ -192,6 +231,16 @@ public:
 
     const IMPORTED_STROKE& GetStroke() const { return m_stroke; }
 
+    BOX2D GetBoundingBox() const override
+    {
+        BOX2D box;
+
+        for( const VECTOR2D& vert : m_vertices )
+            box.Merge( vert );
+
+        return box;
+    }
+
 private:
     std::vector<VECTOR2D> m_vertices;
     IMPORTED_STROKE       m_stroke;
@@ -227,6 +276,19 @@ public:
     void Transform( const MATRIX3x3D& aTransform, const VECTOR2D& aTranslation ) override
     {
         m_origin = aTransform * m_origin + aTranslation;
+
+        VECTOR2D textSize = aTransform * VECTOR2D( m_width, m_height );
+        m_width = textSize.x;
+        m_height = textSize.y;
+    }
+
+    BOX2D GetBoundingBox() const override
+    {
+        BOX2D box;
+        box.Merge( m_origin );
+        box.Merge( m_origin + VECTOR2D( m_width * m_text.length(), m_height ) );
+
+        return box;
     }
 
 private:
@@ -272,6 +334,14 @@ public:
         m_end = aTransform * m_end + aTranslation;
     }
 
+    BOX2D GetBoundingBox() const override
+    {
+        BOX2D box;
+        box.Merge( m_start );
+        box.Merge( m_end );
+        return box;
+    }
+
 private:
     VECTOR2D        m_start;
     VECTOR2D        m_bezierControl1;

common/import_gfx/svg_import_plugin.cpp

@@ -426,3 +426,11 @@ static float distanceFromPointToLine( const VECTOR2D& aPoint, const VECTOR2D& aL
 
     return fabs( distance );
 }
+
+
+void SVG_IMPORT_PLUGIN::ReportMsg( const wxString& aMessage )
+{
+    // Add message to keep trace of not handled svg entities
+    m_messages += aMessage;
+    m_messages += '\n';
+}

common/import_gfx/svg_import_plugin.h

@@ -62,6 +62,8 @@ public:
         return m_messages;
     }
 
+    void ReportMsg( const wxString& aMessage ) override;
+
     bool Import() override;
     bool Load( const wxString& aFileName ) override;
     bool LoadFromMemory( const wxMemoryBuffer& aMemBuffer ) override;

common/io/altium/altium_ascii_parser.cpp

@@ -117,7 +117,8 @@ std::map<wxString, wxString> ALTIUM_ASCII_PARSER::ReadProperties()
             if( canonicalKey == wxT( "DESIGNATOR" ) || canonicalKey == wxT( "NAME" )
                 || canonicalKey == wxT( "TEXT" ) )
             {
-                value = AltiumPropertyToKiCadString( value );
+                if( kv[ wxT( "RECORD" ) ] != wxT( "4" ) )
+                    value = AltiumPropertyToKiCadString( value );
             }
         }
 

common/io/altium/altium_binary_parser.cpp

@@ -493,7 +493,8 @@ std::map<wxString, wxString> ALTIUM_BINARY_PARSER::ReadProperties(
                 || canonicalKey == wxT( "NAME" )
                 || canonicalKey == wxT( "TEXT" ) )
         {
-            value = AltiumPropertyToKiCadString( value.Trim() );
+            if( kv[ wxT( "RECORD" ) ] != wxT( "4" ) )
+                value = AltiumPropertyToKiCadString( value.Trim() );
         }
 
         kv.insert( { canonicalKey, value.Trim() } );

common/io/altium/altium_parser_utils.cpp

@@ -45,40 +45,52 @@ LIB_ID AltiumToKiCadLibID( const wxString& aLibName, const wxString& aLibReferen
 
 wxString AltiumPropertyToKiCadString( const wxString& aString )
 {
-    wxString converted;
-    bool     inOverbar = false;
+    wxString  output;
+    wxString  tempString;
+    bool      hasPrev = false;
+    wxUniChar prev;
 
-    for( wxString::const_iterator chIt = aString.begin(); chIt != aString.end(); ++chIt )
+    for( wxString::const_iterator it = aString.begin(); it != aString.end(); ++it )
     {
-        wxString::const_iterator lookahead = chIt + 1;
+        char ch = 0;
 
-        if( lookahead != aString.end() && *lookahead == '\\' )
+        if( (*it).GetAsChar( &ch ) )
         {
-            if( !inOverbar )
+            if( ch == '\\' )
             {
-                converted += "~{";
-                inOverbar = true;
+                if( hasPrev )
+                {
+                    tempString += prev;
+                    hasPrev = false;
+                }
+
+                continue; // Backslash is ignored and not added to the output
+            }
+        }
+
+        if( hasPrev ) // Two letters in a row with no backslash
+        {
+            if( !tempString.empty() )
+            {
+                output += "~{" + tempString + "}";
+                tempString.Clear();
             }
 
-            converted += *chIt;
-            chIt = lookahead;
+            output += prev;
         }
-        else
-        {
-            if( inOverbar )
-            {
-                converted += "}";
-                inOverbar = false;
-            }
 
-            converted += *chIt;
-        }
+        prev = *it;
+        hasPrev = true;
     }
 
-    if( inOverbar )
-        converted += "}";
+    // Append any leftover escaped string
+    if( !tempString.IsEmpty() )
+        output += "~{" + tempString + "}";
 
-    return converted;
+    if( hasPrev )
+        output += prev;
+
+    return output;
 }
 
 
@@ -148,9 +160,7 @@ wxString AltiumPcbSpecialStringsToKiCadStrings( const wxString&
                                                 const std::map<wxString, wxString>& aOverrides )
 {
     if( aString.IsEmpty() )
-    {
         return aString;
-    }
 
     // special case: string starts with dot -> whole string is special string
     if( aString.at( 0 ) == '.' )
@@ -174,57 +184,15 @@ wxString AltiumPcbSpecialStringsToKiCadStrings( const wxString&
 
 wxString AltiumPinNamesToKiCad( wxString& aString )
 {
-    wxString  output;
-    wxString  tempString;
-    bool      hasPrev = false;
-    wxUniChar prev;
+    if( aString.IsEmpty() )
+        return wxEmptyString;
 
+    wxString rest;
 
-    for( wxString::const_iterator it = aString.begin(); it != aString.end(); ++it )
-    {
-        char ch = 0;
+    if( aString.StartsWith( '\\', &rest ) && !rest.Contains( '\\' ) )
+        return "~{" + rest + "}";
 
-        if( (*it).GetAsChar( &ch ) )
-        {
-            if( ch == '\\' )
-            {
-                if( hasPrev )
-                {
-                    tempString += prev;
-                    hasPrev = false;
-                }
-
-                continue; // Backslash is ignored and not added to the output
-            }
-        }
-
-        if( hasPrev ) // Two letters in a row with no backslash
-        {
-            if( !tempString.empty() )
-            {
-                output += "~{" + tempString + "}";
-                tempString.Clear();
-            }
-
-            output += prev;
-        }
-
-        prev = *it;
-        hasPrev = true;
-    }
-
-    // Append any leftover escaped string
-    if( !tempString.IsEmpty() )
-    {
-        output += "~{" + tempString + "}";
-    }
-
-    if( hasPrev )
-    {
-        output += prev;
-    }
-
-    return output;
+    return AltiumPropertyToKiCadString( aString );
 }
 
 VECTOR2I AltiumGetEllipticalPos( double aMajor, double aMinor, double aAngleRadians )

common/io/eagle/eagle_parser.cpp

@@ -34,6 +34,7 @@
 
 #include <functional>
 #include <cstdio>
+#include <array>
 
 constexpr auto DEFAULT_ALIGNMENT = ETEXT::BOTTOM_LEFT;
 
@@ -190,10 +191,10 @@ ECOORD::ECOORD( const wxString& aValue, enum ECOORD::EAGLE_UNIT aUnit )
 {
     // This array is used to adjust the fraction part value basing on the number of digits
     // in the fraction.
-    constexpr int DIVIDERS[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000 };
-    constexpr unsigned int DIVIDERS_MAX_IDX = sizeof( DIVIDERS ) / sizeof( DIVIDERS[0] ) - 1;
+    static std::array<int, 9> DIVIDERS = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000 };
 
-    int integer, fraction, pre_fraction, post_fraction;
+    int integer, pre_fraction, post_fraction;
+    long long unsigned fraction;
 
     // The following check is needed to handle correctly negative fractions where the integer
     // part == 0.
@@ -201,7 +202,7 @@ ECOORD::ECOORD( const wxString& aValue, enum ECOORD::EAGLE_UNIT aUnit )
 
     // %n is used to find out how many digits contains the fraction part, e.g. 0.001 contains 3
     // digits.
-    int ret = sscanf( aValue.c_str(), "%d.%n%d%n", &integer, &pre_fraction, &fraction,
+    int ret = sscanf( aValue.c_str(), "%d.%n%llu%n", &integer, &pre_fraction, &fraction,
                       &post_fraction );
 
     if( ret == 0 )
@@ -217,11 +218,11 @@ ECOORD::ECOORD( const wxString& aValue, enum ECOORD::EAGLE_UNIT aUnit )
 
         // adjust the number of digits if necessary as we cannot handle anything smaller than
         // nanometers (rounding).
-        if( (unsigned) digits > DIVIDERS_MAX_IDX )
+        if( digits >= static_cast<int>( DIVIDERS.size() ) )
         {
-            int diff = digits - DIVIDERS_MAX_IDX;
-            digits = DIVIDERS_MAX_IDX;
-            fraction /= DIVIDERS[diff];
+            long long unsigned denom = pow( 10, digits - DIVIDERS.size() + 1 );
+            digits = DIVIDERS.size() - 1;
+            fraction /= denom;
         }
 
         int frac_value = ConvertToNm( fraction, aUnit ) / DIVIDERS[digits];
@@ -815,11 +816,11 @@ EPAD::EPAD( wxXmlNode* aPad )
           >
     */
 
-    // #REQUIRED says DTD, throw exception if not found
-    drill        = parseRequiredAttribute<ECOORD>( aPad, "drill" );
+    // #REQUIRED says DTD, but DipTrace doesn't write it sometimes
+    drill = parseOptionalAttribute<ECOORD>( aPad, "drill" );
 
     // Optional attributes
-    diameter     = parseOptionalAttribute<ECOORD>( aPad, "diameter" );
+    diameter = parseOptionalAttribute<ECOORD>( aPad, "diameter" );
 
     opt_wxString s = parseOptionalAttribute<wxString>( aPad, "shape" );
 

common/io/eagle/eagle_parser.h

@@ -711,7 +711,7 @@ struct EPAD_COMMON
 /// Eagle thru hole pad
 struct EPAD : public EPAD_COMMON
 {
-    ECOORD     drill;
+    opt_ecoord drill;
     opt_ecoord diameter;
 
     // for shape: (square | round | octagon | long | offset)

common/io/easyedapro/easyedapro_import_utils.cpp

@@ -307,3 +307,20 @@ EASYEDAPRO::ParseJsonLinesWithSeparation( wxInputStream& aInput, const wxString&
 
     return lineBlocks;
 }
+
+
+std::map<wxString, wxString>
+EASYEDAPRO::AnyMapToStringMap( const std::map<wxString, nlohmann::json>& aInput )
+{
+    std::map<wxString, wxString> stringMap;
+
+    for( auto& [key, value] : aInput )
+    {
+        if( value.is_string() )
+            stringMap[key] = value.get<wxString>();
+        else if( value.is_number() )
+            stringMap[key] = wxString::FromCDouble( value.get<double>() );
+    }
+
+    return stringMap;
+}

common/io/easyedapro/easyedapro_import_utils.h

@@ -63,6 +63,8 @@ std::vector<nlohmann::json> ParseJsonLines( wxInputStream& aInput, const wxStrin
 std::vector<std::vector<nlohmann::json>> ParseJsonLinesWithSeparation( wxInputStream&  aInput,
                                                                        const wxString& aSource );
 
+std::map<wxString, wxString> AnyMapToStringMap( const std::map<wxString, nlohmann::json>& aInput );
+
 } // namespace EASYEDAPRO
 
 

common/io/easyedapro/easyedapro_parser.cpp

@@ -29,6 +29,7 @@
 #include <nlohmann/json.hpp>
 #include <core/json_serializers.h>
 #include <string_utils.h>
+#include <io/easyedapro/easyedapro_import_utils.h>
 
 
 void EASYEDAPRO::from_json( const nlohmann::json& j, EASYEDAPRO::SCH_ATTR& d )
@@ -273,7 +274,7 @@ void EASYEDAPRO::from_json( const nlohmann::json& j, EASYEDAPRO::PRJ_DEVICE& d )
         d.custom_tags = j.at( "custom_tags" );
 
     if( j.at( "attributes" ).is_object() )
-        d.attributes = j.at( "attributes" );
+        d.attributes = AnyMapToStringMap( j.at( "attributes" ) );
 }
 
 void EASYEDAPRO::from_json( const nlohmann::json& j, EASYEDAPRO::BLOB& d )

common/kicad_curl/kicad_curl_easy.cpp

@@ -118,7 +118,8 @@ static int progressinfo( void* aProgress, double aDLtotal, double aDLnow, double
 
 
 KICAD_CURL_EASY::KICAD_CURL_EASY() :
-        m_headers( nullptr )
+        m_headers( nullptr ),
+        m_curlSharedLock( KICAD_CURL::Mutex() )
 {
     m_CURL = curl_easy_init();
 
@@ -194,12 +195,6 @@ KICAD_CURL_EASY::~KICAD_CURL_EASY()
 
 int KICAD_CURL_EASY::Perform()
 {
-    std::shared_lock lock( KICAD_CURL::Mutex(), std::try_to_lock );
-
-    // If can't lock, we should be in the process of tearing down.
-    if( !lock )
-        return CURLE_ABORTED_BY_CALLBACK;
-
     if( m_headers )
         curl_easy_setopt( m_CURL, CURLOPT_HTTPHEADER, m_headers );
 

common/kiid.cpp

@@ -37,6 +37,8 @@
 
 #include <cctype>
 #include <mutex>
+#include <utility>
+#include <stdlib.h>
 
 #include <wx/log.h>
 
@@ -113,7 +115,7 @@ KIID::KIID( const std::string& aString ) :
         m_uuid(),
         m_cached_timestamp( 0 )
 {
-    if( aString.length() == 8
+    if( !aString.empty() && aString.length() <= 8
         && std::all_of( aString.begin(), aString.end(),
                         []( unsigned char c )
                         {
@@ -123,9 +125,15 @@ KIID::KIID( const std::string& aString ) :
         // A legacy-timestamp-based UUID has only the last 4 octets filled in.
         // Convert them individually to avoid stepping in the little-endian/big-endian
         // doo-doo.
-        for( int i = 0; i < 4; ++i )
+        for( int i = 0; i < 4; i++ )
         {
-            std::string octet = aString.substr( i * 2, 2 );
+            int start = static_cast<int>( aString.length() ) - 8 + i * 2;
+            int end = start + 2;
+
+            start = std::max( 0, start );
+            int len = std::max( 0, end - start );
+
+            std::string octet = aString.substr( start, len );
             m_uuid.data[i + 12] = strtol( octet.data(), nullptr, 16 );
         }
 

common/lib_table_base.cpp

@@ -33,6 +33,7 @@
 #include <lib_table_lexer.h>
 #include <macros.h>
 #include <string_utils.h>
+#include <build_version.h>
 
 #define OPT_SEP     '|'         ///< options separator character
 
@@ -434,9 +435,17 @@ bool LIB_TABLE::migrate()
         wxString uri = row.GetFullURI( true );
 
         // If the uri still has a variable in it, that means that the user does not have
-        // these vars defined.  We update the old vars to the KICAD7 versions on load
-        row_updated |= ( uri.Replace( wxS( "${KICAD5_" ), wxS( "${KICAD7_" ), false ) > 0 );
-        row_updated |= ( uri.Replace( wxS( "${KICAD6_" ), wxS( "${KICAD7_" ), false ) > 0 );
+        // these vars defined.  We update the old vars to the current versions on load
+
+        static wxString fmtStr = wxS( "${KICAD%d_" );
+        int version = 0;
+        std::tie(version, std::ignore, std::ignore) = GetMajorMinorPatchTuple();
+
+        for( int ii = 5; ii < version - 1; ++ii )
+        {
+            row_updated |= ( uri.Replace( wxString::Format( fmtStr, ii ),
+                                          wxString::Format( fmtStr, version ), false ) > 0 );
+        }
 
         if( row_updated )
         {

common/lib_tree_model_adapter.cpp

@@ -281,17 +281,21 @@ void LIB_TREE_MODEL_ADAPTER::UpdateSearchString( const wxString& aSearch, bool a
 
         m_tree.ResetScore();
 
-        wxStringTokenizer tokenizer( aSearch );
-        bool              firstTerm = true;
+        // Don't cause KiCad to hang if someone accidentally pastes the PCB or schematic into
+        // the search box.
+        constexpr int MAX_TERMS = 100;
 
-        while( tokenizer.HasMoreTokens() )
+        wxStringTokenizer tokenizer( aSearch );
+        int               termCount = 0;
+
+        while( tokenizer.HasMoreTokens() && termCount < MAX_TERMS )
         {
             // First search for the full token, in case it appears in a search string
             wxString             term = tokenizer.GetNextToken().Lower();
             EDA_COMBINED_MATCHER termMatcher( term, CTX_LIBITEM );
 
-            m_tree.UpdateScore( &termMatcher, wxEmptyString, firstTerm ? m_filter : nullptr );
-            firstTerm = false;
+            m_tree.UpdateScore( &termMatcher, wxEmptyString, m_filter );
+            termCount++;
 
             if( term.Contains( ":" ) )
             {
@@ -304,7 +308,7 @@ void LIB_TREE_MODEL_ADAPTER::UpdateSearchString( const wxString& aSearch, bool a
             }
         }
 
-        if( firstTerm )
+        if( termCount == 0 )
         {
             // No terms processed; just run the filter
             m_tree.UpdateScore( nullptr, wxEmptyString, m_filter );

common/libeval/numeric_evaluator.cpp

@@ -273,7 +273,7 @@ NUMERIC_EVALUATOR::Token NUMERIC_EVALUATOR::getToken()
                     }
 
                     ch = m_token.input[ ++m_token.pos ];
-                } while( isdigit( ch ) || isDecimalSeparator( ch ) );
+                } while( isdigit( (unsigned char) ch ) || isDecimalSeparator( ch ) );
 
                 m_token.token[ idx ] = 0;
             };
@@ -373,7 +373,7 @@ NUMERIC_EVALUATOR::Token NUMERIC_EVALUATOR::getToken()
     {
         /* End of input */
     }
-    else if( isdigit( ch ) || isDecimalSeparator( ch ) )
+    else if( isdigit( (unsigned char) ch ) || isDecimalSeparator( ch ) )
     {
         // VALUE
         extractNumber( &siScaler );

common/lset.cpp

@@ -1092,3 +1092,35 @@ GAL_SET GAL_SET::DefaultVisible()
     static const GAL_SET saved( visible, arrayDim( visible ) );
     return saved;
 }
+
+
+/// The layers the user has control over the visibility of, stored in project local settings
+GAL_SET GAL_SET::UserVisbilityLayers()
+{
+    static const GAL_LAYER_ID layers[] = {
+        LAYER_TRACKS,
+        LAYER_VIAS,
+        LAYER_PADS,
+        LAYER_ZONES,
+        LAYER_DRAW_BITMAPS,
+        LAYER_FOOTPRINTS_FR,
+        LAYER_FOOTPRINTS_BK,
+        LAYER_PADS_TH,
+        LAYER_FP_VALUES,
+        LAYER_FP_REFERENCES,
+        LAYER_FP_TEXT,
+        LAYER_HIDDEN_TEXT,
+        LAYER_ANCHOR,
+        LAYER_RATSNEST,
+        LAYER_DRC_WARNING,
+        LAYER_DRC_ERROR,
+        LAYER_DRC_EXCLUSION,
+        LAYER_LOCKED_ITEM_SHADOW,
+        LAYER_CONFLICTS_SHADOW,
+        LAYER_DRAWINGSHEET,
+        LAYER_GRID,
+    };
+
+    static const GAL_SET saved( layers, arrayDim( layers ) );
+    return saved;
+}

common/marker_base.cpp

@@ -107,6 +107,17 @@ bool MARKER_BASE::HitTestMarker( const VECTOR2I& aHitPosition, int aAccuracy ) c
 }
 
 
+bool MARKER_BASE::HitTestMarker( const BOX2I& aRect, bool aContained, int aAccuracy ) const
+{
+    const BOX2I bbox = GetBoundingBoxMarker().Inflate( aAccuracy );
+
+    if( aContained )
+        return aRect.Contains( bbox );
+
+    return aRect.Intersects( bbox );
+}
+
+
 void MARKER_BASE::ShapeToPolygon( SHAPE_LINE_CHAIN& aPolygon, int aScale ) const
 {
     if( aScale < 0 )

common/pgm_base.cpp

@@ -491,8 +491,15 @@ bool PGM_BASE::InitPgm( bool aHeadless, bool aSkipPyInit, bool aIsUnitTest )
     }
 #endif
 
+    // Ensure the instance checker directory exists
+    // It should be globally writable because it is shared between all users on Linux, and so on a
+    // multi-user machine, other need to be able to access it to check for the lock files or make
+    // their own lock files.
     wxString instanceCheckerDir = PATHS::GetInstanceCheckerPath();
     PATHS::EnsurePathExists( instanceCheckerDir );
+    wxChmod( instanceCheckerDir, wxPOSIX_USER_READ | wxPOSIX_USER_WRITE | wxPOSIX_USER_EXECUTE |
+                                 wxPOSIX_GROUP_READ | wxPOSIX_GROUP_WRITE | wxPOSIX_GROUP_EXECUTE |
+                                 wxPOSIX_OTHERS_READ | wxPOSIX_OTHERS_WRITE | wxPOSIX_OTHERS_EXECUTE );
 
     wxString instanceCheckerName = wxString::Format( wxS( "%s-%s" ), pgm_name,
                                                      GetMajorMinorVersion() );

common/plotters/PDF_plotter.cpp

@@ -7,7 +7,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 1992-2012 Lorenzo Marcantonio, l.marcantonio@logossrl.com
- * Copyright (C) 1992-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2023, 2024 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -37,7 +37,8 @@
 #include <wx/datstrm.h>
 
 #include <advanced_config.h>
-#include <eda_text.h> // for IsGotoPageHref
+#include <common.h>               // ResolveUriByEnvVars
+#include <eda_text.h>             // for IsGotoPageHref
 #include <font/font.h>
 #include <core/ignore.h>
 #include <macros.h>
@@ -400,12 +401,12 @@ void PDF_PLOTTER::PlotPoly( const std::vector<VECTOR2I>& aCornerList, FILL_T aFi
     SetCurrentLineWidth( aWidth );
 
     VECTOR2D pos = userToDeviceCoordinates( aCornerList[0] );
-    fprintf( m_workFile, "%g %g m\n", pos.x, pos.y );
+    fprintf( m_workFile, "%f %f m\n", pos.x, pos.y );
 
     for( unsigned ii = 1; ii < aCornerList.size(); ii++ )
     {
         pos = userToDeviceCoordinates( aCornerList[ii] );
-        fprintf( m_workFile, "%g %g l\n", pos.x, pos.y );
+        fprintf( m_workFile, "%f %f l\n", pos.x, pos.y );
     }
 
     // Close path and stroke and/or fill
@@ -438,7 +439,7 @@ void PDF_PLOTTER::PenTo( const VECTOR2I& pos, char plume )
     if( m_penState != plume || pos != m_penLastpos )
     {
         VECTOR2D pos_dev = userToDeviceCoordinates( pos );
-        fprintf( m_workFile, "%g %g %c\n",
+        fprintf( m_workFile, "%f %f %c\n",
                  pos_dev.x, pos_dev.y,
                  ( plume=='D' ) ? 'l' : 'm' );
     }
@@ -776,6 +777,14 @@ void PDF_PLOTTER::ClosePage()
                 VECTOR2D retval = VECTOR2D( aCoord ) * PTsPERMIL / ( m_IUsPerDecimil * 10 );
                 // PDF y=0 is at bottom of page, invert coordinate
                 retval.y = psPaperSize.y - retval.y;
+
+                // The pdf plot can be mirrored (from left to right). So mirror the
+                // x coordinate if m_plotMirror is set
+                if( m_plotMirror )
+                {
+                    retval.x = ( psPaperSize.x - retval.x );
+                }
+
                 return retval;
             };
 
@@ -1332,16 +1341,35 @@ bool PDF_PLOTTER::EndPlot()
                 {
                     wxString href = property.substr( property.Find( "http:" ) );
 
+                    if( m_project )
+                        href = ResolveUriByEnvVars( href, m_project );
+
                     js += wxString::Format( wxT( "[\"%s\", \"%s\"],\n" ),
-                                            EscapeString( property, CTX_JS_STR ),
+                                            EscapeString( href, CTX_JS_STR ),
                                             EscapeString( href, CTX_JS_STR ) );
                 }
                 else if( property.Find( "https:" ) >= 0 )
                 {
                     wxString href = property.substr( property.Find( "https:" ) );
 
+                    if( m_project )
+                        href = ResolveUriByEnvVars( href, m_project );
+
                     js += wxString::Format( wxT( "[\"%s\", \"%s\"],\n" ),
-                                            EscapeString( property, CTX_JS_STR ),
+                                            EscapeString( href, CTX_JS_STR ),
+                                            EscapeString( href, CTX_JS_STR ) );
+                }
+                else if( property.Find( "file:" ) >= 0 )
+                {
+                    wxString href = property.substr( property.Find( "file:" ) );
+
+                    if( m_project )
+                        href = ResolveUriByEnvVars( href, m_project );
+
+                    href = NormalizeFileUri( href );
+
+                    js += wxString::Format( wxT( "[\"%s\", \"%s\"],\n" ),
+                                            EscapeString( href, CTX_JS_STR ),
                                             EscapeString( href, CTX_JS_STR ) );
                 }
                 else
@@ -1367,13 +1395,22 @@ bool PDF_PLOTTER::EndPlot()
                     }
                 }
             }
-            else if( url.StartsWith( "http:" ) || url.StartsWith( "https:" ) )
+            else if( url.StartsWith( "http:" ) || url.StartsWith( "https:" )
+                   || url.StartsWith( "file:" ) )
             {
-                wxString menuText = wxString::Format( _( "Open %s" ), url );
+                wxString href = url;
+
+                if( m_project )
+                    href = ResolveUriByEnvVars( url, m_project );
+
+                if( url.StartsWith( "file:" ) )
+                    href = NormalizeFileUri( href );
+
+                wxString menuText = wxString::Format( _( "Open %s" ), href );
 
                 js += wxString::Format( wxT( "[\"%s\", \"%s\"],\n" ),
-                                        EscapeString( menuText, CTX_JS_STR ),
-                                        EscapeString( url, CTX_JS_STR ) );
+                                        EscapeString( href, CTX_JS_STR ),
+                                        EscapeString( href, CTX_JS_STR ) );
             }
         }
 
@@ -1413,6 +1450,7 @@ function ShM(aEntries) {
     var cChoice = app.popUpMenuEx.apply(app, aParams);
     if (cChoice != null && cChoice.substring(0, 1) == '#') this.pageNum = parseInt(cChoice.slice(1));
     else if (cChoice != null && cChoice.substring(0, 4) == 'http') app.launchURL(cChoice);
+    else if (cChoice != null && cChoice.substring(0, 4) == 'file') app.openDoc(cChoice.substring(7));
 }
 )JS";
 
@@ -1634,7 +1672,7 @@ void PDF_PLOTTER::Text( const VECTOR2I&        aPos,
            coordinate system will be used for the overlining. Also the %f
            for the trig part of the matrix to avoid %g going in exponential
            format (which is not supported) */
-        fprintf( m_workFile, "q %f %f %f %f %g %g cm BT %s %g Tf %d Tr %g Tz ",
+        fprintf( m_workFile, "q %f %f %f %f %f %f cm BT %s %g Tf %d Tr %g Tz ",
                  ctm_a, ctm_b, ctm_c, ctm_d, ctm_e, ctm_f,
                  fontname, heightFactor, render_mode, wideningFactor * 100 );
 

common/plotters/SVG_plotter.cpp

@@ -162,7 +162,8 @@ static wxString XmlEsc( const wxString& aStr, bool isAttribute = false )
 }
 
 
-SVG_PLOTTER::SVG_PLOTTER()
+SVG_PLOTTER::SVG_PLOTTER( const PROJECT* aProject ) :
+    PSLIKE_PLOTTER( aProject )
 {
     m_graphics_changed = true;
     SetTextMode( PLOT_TEXT_MODE::STROKE );

common/plotters/plotter.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2017-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2017-2023, 2024 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -44,7 +44,8 @@
 #include <callback_gal.h>
 #include <math/util.h>      // for KiROUND
 
-PLOTTER::PLOTTER( )
+PLOTTER::PLOTTER( const PROJECT* aProject ) :
+    m_project( aProject )
 {
     m_plotScale = 1;
     m_currentPenWidth = -1;       // To-be-set marker

common/project/project_archiver.cpp

@@ -174,12 +174,12 @@ bool PROJECT_ARCHIVER::Archive( const wxString& aSrcDir, const wxString& aDestFi
     wxArrayString files;
 
     for( unsigned ii = 0; ii < arrayDim( extensionList ); ii++ )
-        wxDir::GetAllFiles( aSrcDir, &files, extensionList[ii] );
+        wxDir::GetAllFiles( aSrcDir, &files, extensionList[ii], wxDIR_FILES | wxDIR_DIRS );
 
     if( aIncludeExtraFiles )
     {
         for( unsigned ii = 0; ii < arrayDim( extraExtensionList ); ii++ )
-            wxDir::GetAllFiles( aSrcDir, &files, extraExtensionList[ii] );
+            wxDir::GetAllFiles( aSrcDir, &files, extraExtensionList[ii], wxDIR_FILES | wxDIR_DIRS );
     }
 
     for( unsigned ii = 0; ii < files.GetCount(); ++ii )

common/project/project_file.cpp

@@ -41,7 +41,8 @@ PROJECT_FILE::PROJECT_FILE( const wxString& aFullPath ) :
         m_BoardSettings(),
         m_sheets(),
         m_boards(),
-        m_project( nullptr )
+        m_project( nullptr ),
+        m_wasMigrated( false )
 {
     // Keep old files around
     m_deleteLegacyAfterMigration = false;
@@ -588,7 +589,14 @@ bool PROJECT_FILE::SaveToFile( const wxString& aDirectory, bool aForce )
 
     Set( "meta.filename", m_project->GetProjectName() + "." + FILEEXT::ProjectFileExtension );
 
-    return JSON_SETTINGS::SaveToFile( aDirectory, aForce );
+    // Even if parameters were not modified, we should resave after migration
+    bool force = aForce || m_wasMigrated;
+
+    // If we're actually going ahead and doing the save, the flag that keeps code from doing the save
+    // should be cleared at this point
+    m_wasMigrated = false;
+
+    return JSON_SETTINGS::SaveToFile( aDirectory, force );
 }
 
 
@@ -630,6 +638,10 @@ bool PROJECT_FILE::SaveAs( const wxString& aDirectory, const wxString& aFile )
     updatePathByPtr( "schematic.ngspice.workbook_filename" );
     updatePathByPtr( "pcbnew.page_layout_descr_file" );
 
+    // If we're actually going ahead and doing the save, the flag that keeps code from doing the save
+    // should be cleared at this point
+    m_wasMigrated = false;
+
     // While performing Save As, we have already checked that we can write to the directory
     // so don't carry the previous flag
     SetReadOnly( false );

common/project/project_local_settings.cpp

@@ -42,7 +42,8 @@ PROJECT_LOCAL_SETTINGS::PROJECT_LOCAL_SETTINGS( PROJECT* aProject, const wxStrin
         m_ZoneOpacity( 0.6 ),
         m_ImageOpacity( 0.6 ),
         m_SelectionFilter(),
-        m_project( aProject )
+        m_project( aProject ),
+        m_wasMigrated( false )
 {
     // Keep old files around
     m_deleteLegacyAfterMigration = false;
@@ -77,20 +78,23 @@ PROJECT_LOCAL_SETTINGS::PROJECT_LOCAL_SETTINGS( PROJECT* aProject, const wxStrin
                     return;
                 }
 
-                m_VisibleItems.reset();
+                m_VisibleItems &= ~GAL_SET::UserVisbilityLayers();
+                GAL_SET visible;
 
                 for( const nlohmann::json& entry : aVal )
                 {
                     try
                     {
                         int i = entry.get<int>();
-                        m_VisibleItems.set( i );
+                        visible.set( i );
                     }
                     catch( ... )
                     {
                         // Non-integer or out of range entry in the array; ignore
                     }
                 }
+
+                m_VisibleItems |= GAL_SET::UserVisbilityLayers() & visible;
             },
             {} ) );
 
@@ -272,6 +276,8 @@ PROJECT_LOCAL_SETTINGS::PROJECT_LOCAL_SETTINGS( PROJECT* aProject, const wxStrin
                     {
                         At( "board" ).erase( "visible_items" );
                     }
+
+                    m_wasMigrated = true;
                 }
 
                 return true;
@@ -330,6 +336,7 @@ PROJECT_LOCAL_SETTINGS::PROJECT_LOCAL_SETTINGS( PROJECT* aProject, const wxStrin
                     }
 
                     At( "board" )["visible_items"] = visible;
+                    m_wasMigrated = true;
                 }
 
                 return true;
@@ -354,7 +361,14 @@ bool PROJECT_LOCAL_SETTINGS::SaveToFile( const wxString& aDirectory, bool aForce
 
     Set( "meta.filename", m_project->GetProjectName() + "." + FILEEXT::ProjectLocalSettingsFileExtension );
 
-    return JSON_SETTINGS::SaveToFile( aDirectory, aForce );
+    // Even if parameters were not modified, we should resave after migration
+    bool force = aForce || m_wasMigrated;
+
+    // If we're actually going ahead and doing the save, the flag that keeps code from doing the save
+    // should be cleared at this point
+    m_wasMigrated = false;
+
+    return JSON_SETTINGS::SaveToFile( aDirectory, force );
 }
 
 
@@ -363,6 +377,10 @@ bool PROJECT_LOCAL_SETTINGS::SaveAs( const wxString& aDirectory, const wxString&
     Set( "meta.filename", aFile + "." + FILEEXT::ProjectLocalSettingsFileExtension );
     SetFilename( aFile );
 
+    // If we're actually going ahead and doing the save, the flag that keeps code from doing the save
+    // should be cleared at this point
+    m_wasMigrated = false;
+
     return JSON_SETTINGS::SaveToFile( aDirectory, true );
 }
 

common/properties/pg_properties.cpp

@@ -540,8 +540,12 @@ wxValidator* PGPROPERTY_ANGLE::DoGetValidator() const
 
 wxSize PGPROPERTY_COLORENUM::OnMeasureImage( int aItem ) const
 {
-    // TODO(JE) calculate size from window metrics?
-    return wxSize( 16, 12 );
+    wxSize size( 16, -1 );
+
+    if( wxPropertyGrid* pg = GetGrid() )
+        size = pg->FromDIP( size );
+
+    return size;
 }
 
 

common/settings/common_settings.cpp

@@ -116,7 +116,7 @@ COMMON_SETTINGS::COMMON_SETTINGS() :
     m_params.emplace_back( new PARAM<int>( "auto_backup.min_interval",
             &m_Backup.min_interval, 300 ) );
 
-    m_params.emplace_back( new PARAM_LAMBDA<nlohmann::json>( "environment.vars",
+    auto envVarsParam = m_params.emplace_back( new PARAM_LAMBDA<nlohmann::json>( "environment.vars",
             [&]() -> nlohmann::json
             {
                 nlohmann::json ret = {};
@@ -212,6 +212,7 @@ COMMON_SETTINGS::COMMON_SETTINGS() :
                 }
             },
             {} ) );
+    envVarsParam->SetClearUnknownKeys();
 
     m_params.emplace_back( new PARAM<bool>( "input.focus_follow_sch_pcb",
             &m_Input.focus_follow_sch_pcb, false ) );

common/settings/json_settings.cpp

@@ -75,9 +75,11 @@ JSON_SETTINGS::JSON_SETTINGS( const wxString& aFilename, SETTINGS_LOC aLocation,
         m_createIfMissing( aCreateIfMissing ),
         m_createIfDefault( aCreateIfDefault ),
         m_writeFile( aWriteFile ),
+        m_modified( false ),
         m_deleteLegacyAfterMigration( true ),
         m_resetParamsIfMissing( true ),
         m_schemaVersion( aSchemaVersion ),
+        m_isFutureFormat( false ),
         m_manager( nullptr )
 {
     m_internals = std::make_unique<JSON_SETTINGS_INTERNALS>();
@@ -324,6 +326,7 @@ bool JSON_SETTINGS::LoadFromFile( const wxString& aDirectory )
                     wxLogTrace( traceSettings,
                                 wxT( "%s: warning: file version %d is newer than latest (%d)" ),
                                 GetFullFilename(), filever, m_schemaVersion );
+                    m_isFutureFormat = true;
                 }
             }
             else
@@ -353,6 +356,8 @@ bool JSON_SETTINGS::LoadFromFile( const wxString& aDirectory )
     wxLogTrace( traceSettings, wxT( "Loaded <%s> with schema %d" ), GetFullFilename(),
                 m_schemaVersion );
 
+    m_modified = false;
+
     // If we migrated, clean up the legacy file (with no extension)
     if( m_writeFile && ( legacy_migrated || migrated ) )
     {
@@ -373,15 +378,13 @@ bool JSON_SETTINGS::LoadFromFile( const wxString& aDirectory )
 
 bool JSON_SETTINGS::Store()
 {
-    bool modified = false;
-
     for( PARAM_BASE* param : m_params )
     {
-        modified |= !param->MatchesFile( this );
+        m_modified |= !param->MatchesFile( this );
         param->Store( this );
     }
 
-    return modified;
+    return m_modified;
 }
 
 
@@ -469,10 +472,12 @@ bool JSON_SETTINGS::SaveToFile( const wxString& aDirectory, bool aForce )
 
     for( PARAM_BASE* param : m_params )
     {
-        if( PARAM_WXSTRING_MAP* stringMap = dynamic_cast<PARAM_WXSTRING_MAP*>( param ) )
+        if( param->ClearUnknownKeys() )
         {
-            if( stringMap->ClearUnknownKeys() )
-                toSave[ stringMap->GetJsonPath() ] = nlohmann::json( {} );
+            nlohmann::json_pointer p
+                    = JSON_SETTINGS_INTERNALS::PointerFromString( param->GetJsonPath() );
+
+            toSave[p] = nlohmann::json( {} );
         }
     }
 
@@ -504,6 +509,9 @@ bool JSON_SETTINGS::SaveToFile( const wxString& aDirectory, bool aForce )
         success = false;
     }
 
+    if( success )
+        m_modified = false;
+
     return success;
 }
 
@@ -858,7 +866,7 @@ void JSON_SETTINGS::ReleaseNestedSettings( NESTED_SETTINGS* aSettings )
     if( it != m_nested_settings.end() )
     {
         wxLogTrace( traceSettings, wxT( "Flush and release %s" ), ( *it )->GetFilename() );
-        ( *it )->SaveToFile();
+        m_modified |= ( *it )->SaveToFile();
         m_nested_settings.erase( it );
     }
 

common/settings/settings_manager.cpp

@@ -46,6 +46,7 @@
 #include <settings/json_settings_internals.h>
 #include <settings/settings_manager.h>
 #include <wildcards_and_files_ext.h>
+#include <env_vars.h>
 
 
 SETTINGS_MANAGER::SETTINGS_MANAGER( bool aHeadless ) :
@@ -154,6 +155,13 @@ void SETTINGS_MANAGER::Save()
         if( dynamic_cast<COLOR_SETTINGS*>( settings.get() ) )
             continue;
 
+        // Never automatically save project settings, caller should use SaveProject or UnloadProject
+        if( dynamic_cast<PROJECT_FILE*>( settings.get() )
+            || dynamic_cast<PROJECT_LOCAL_SETTINGS*>( settings.get() ) )
+        {
+            continue;
+        }
+
         settings->SaveToFile( GetPathForSettingsFile( settings.get() ) );
     }
 }
@@ -343,7 +351,7 @@ void SETTINGS_MANAGER::loadAllColorSettings()
 
     wxFileName third_party_path;
     const ENV_VAR_MAP& env = Pgm().GetLocalEnvVariables();
-    auto               it = env.find( wxS( "KICAD7_3RD_PARTY" ) );
+    auto               it = env.find( ENV_VAR::GetVersionedEnvVarName( wxS( "3RD_PARTY" ) ) );
 
     if( it != env.end() && !it->second.GetValue().IsEmpty() )
         third_party_path.SetPath( it->second.GetValue() );
@@ -1177,6 +1185,9 @@ bool SETTINGS_MANAGER::unloadProjectFile( PROJECT* aProject, bool aSave )
 
     PROJECT_FILE* file = m_project_files[name];
 
+    if( !file->ShouldAutoSave() )
+        aSave = false;
+
     auto it = std::find_if( m_settings.begin(), m_settings.end(),
                             [&file]( const std::unique_ptr<JSON_SETTINGS>& aPtr )
                             {
@@ -1187,7 +1198,9 @@ bool SETTINGS_MANAGER::unloadProjectFile( PROJECT* aProject, bool aSave )
     {
         wxString projectPath = GetPathForSettingsFile( it->get() );
 
-        FlushAndRelease( &aProject->GetLocalSettings(), aSave );
+        bool saveLocalSettings = aSave && aProject->GetLocalSettings().ShouldAutoSave();
+
+        FlushAndRelease( &aProject->GetLocalSettings(), saveLocalSettings );
 
         if( aSave )
             ( *it )->SaveToFile( projectPath );

common/string_utils.cpp

@@ -28,11 +28,15 @@
 
 #include <clocale>
 #include <cmath>
+#include <map>
+#include <core/map_helpers.h>
 #include <fmt/core.h>
 #include <macros.h>
 #include <richio.h>                        // StrPrintf
 #include <string_utils.h>
+#include <wx_filename.h>
 #include <fmt/chrono.h>
+#include <wx/log.h>
 #include <wx/regex.h>
 #include "locale_io.h"
 
@@ -45,6 +49,34 @@
 static const char illegalFileNameChars[] = "\\/:\"<>|*?";
 
 
+// Checks if a full filename is valid, i.e. does not contains illegal chars
+bool IsFullFileNameValid( const wxString& aFullFilename )
+{
+
+    // Test for forbidden chars in aFullFilename.
+    // '\'and '/' are allowed here because aFullFilename can be a full path, and
+    // ':' is allowed on Windows as second char in string.
+    // So remove allowed separators from string to test
+    wxString filtered_fullpath = aFullFilename;
+
+#ifdef __WINDOWS__
+    // On MSW, the list returned by wxFileName::GetForbiddenChars() contains separators
+    // '\'and '/'
+    filtered_fullpath.Replace( "/", "_" );
+    filtered_fullpath.Replace( "\\", "_" );
+
+    // A disk identifier is allowed, and therefore remove its separator
+    if( filtered_fullpath.Length() > 1 && filtered_fullpath[1] == ':' )
+        filtered_fullpath[1] = ' ';
+#endif
+
+    if( wxString::npos != filtered_fullpath.find_first_of( wxFileName::GetForbiddenChars() ) )
+        return false;
+
+    return true;
+}
+
+
 wxString ConvertToNewOverbarNotation( const wxString& aOldStr )
 {
     wxString newStr;
@@ -540,22 +572,32 @@ wxString UnescapeHTML( const wxString& aString )
 {
     wxString converted = aString;
 
-    converted.Replace( wxS( "&quot;" ), wxS( "\"" ) );
-    converted.Replace( wxS( "&apos;" ), wxS( "'" ) );
-    converted.Replace( wxS( "&amp;" ), wxS( "&" ) );
-    converted.Replace( wxS( "&lt;" ), wxS( "<" ) );
-    converted.Replace( wxS( "&gt;" ), wxS( ">" ) );
+    // clang-format off
+    static const std::map<wxString, wxString> c_replacements = {
+        { wxS( "quot" ), wxS( "\"" ) },
+        { wxS( "apos" ), wxS( "'" ) },
+        { wxS( "amp" ), wxS( "&" ) },
+        { wxS( "lt" ), wxS( "<" ) },
+        { wxS( "gt" ), wxS( ">" ) }
+    };
+    // clang-format on
 
-    // Yes, &amp;#123; is going to give unexpected results.
+    // Construct regex
+    wxString regexStr = "&(#(\\d*)|#x([a-zA-Z0-9]{4})";
 
-    wxString result;
+    for( auto& [key, value] : c_replacements )
+        regexStr << '|' << key;
 
-    wxRegEx regex( "&#(\\d*);" );
+    regexStr << ");";
 
+    wxRegEx regex( regexStr );
+
+    // Process matches
     size_t start = 0;
     size_t len = 0;
 
-    wxString str = aString;
+    wxString result;
+    wxString str = converted;
 
     while( regex.Matches( str ) )
     {
@@ -564,12 +606,26 @@ wxString UnescapeHTML( const wxString& aString )
 
         result << str.Left( start );
 
-        unsigned long codeVal = 0;
-        wxString      code = regex.GetMatch( str, 1 );
-        code.ToCULong( &codeVal );
+        wxString code = regex.GetMatch( str, 1 );
+        wxString codeDec = regex.GetMatch( str, 2 );
+        wxString codeHex = regex.GetMatch( str, 3 );
 
-        if( codeVal != 0 )
-            result << wxUniChar( codeVal );
+        if( !codeDec.IsEmpty() || !codeHex.IsEmpty() )
+        {
+            unsigned long codeVal = 0;
+
+            if( !codeDec.IsEmpty() )
+                codeDec.ToCULong( &codeVal );
+            else if( !codeHex.IsEmpty() )
+                codeHex.ToCULong( &codeVal, 16 );
+
+            if( codeVal != 0 )
+                result << wxUniChar( codeVal );
+        }
+        else if( auto val = get_opt( c_replacements, code ) )
+        {
+            result << *val;
+        }
 
         str = str.Mid( start + len );
     }
@@ -1400,3 +1456,24 @@ wxString From_UTF8( const std::string& aString )
 
    return line;
 }
+
+
+wxString NormalizeFileUri( const wxString& aFileUri )
+{
+    wxString uriPathAndFileName;
+
+    wxCHECK( aFileUri.StartsWith( wxS( "file://" ), &uriPathAndFileName ), aFileUri );
+
+    wxString tmp = uriPathAndFileName;
+    wxString retv = wxS( "file://" );
+
+    tmp.Replace( wxS( "\\" ), wxS( "/" ) );
+    tmp.Replace( wxS( ":" ), wxS( "" ) );
+
+    if( !tmp.IsEmpty() && tmp[0] != '/' )
+        tmp = wxS( "/" ) + tmp;
+
+    retv += tmp;
+
+    return retv;
+}

common/tool/action_manager.cpp

@@ -48,7 +48,7 @@ ACTION_MANAGER::ACTION_MANAGER( TOOL_MANAGER* aToolManager ) :
         std::string groupName = "none";
 
         std::optional<TOOL_ACTION_GROUP> group = action->GetActionGroup();
-        
+
         if( group.has_value() )
         {
             groupID   = group.value().GetGroupID();
@@ -152,19 +152,21 @@ bool ACTION_MANAGER::RunHotKey( int aHotKey ) const
     // If no luck, try without Shift, to handle keys that require it
     // e.g. to get ? you need to press Shift+/ without US keyboard layout
     // Hardcoding ? as Shift+/ is a bad idea, as on another layout you may need to press a
-    // different combination
-    if( it == m_actionHotKeys.end() )
+    // different combination.
+    // This doesn't apply for letters, as we already handled case normalisation.
+    if( it == m_actionHotKeys.end() && !std::isalpha( key ) )
     {
         wxLogTrace( kicadTraceToolStack,
                     wxS( "ACTION_MANAGER::RunHotKey No actions found, searching with key: %s" ),
                     KeyNameFromKeyCode( key | ( mod & ~MD_SHIFT ) ) );
 
         it = m_actionHotKeys.find( key | ( mod & ~MD_SHIFT ) );
-
-        if( it == m_actionHotKeys.end() )
-            return false; // no appropriate action found for the hotkey
     }
 
+    // Still no luck, we're done without a match
+    if( it == m_actionHotKeys.end() )
+        return false; // no appropriate action found for the hotkey
+
     const std::list<TOOL_ACTION*>& actions = it->second;
 
     // Choose the action that has the highest priority on the active tools stack

common/validators.cpp

@@ -38,6 +38,8 @@
 #include <wx/textentry.h>
 #include <wx/log.h>
 #include <wx/combo.h>
+#include <wx/msgdlg.h>
+#include <refdes_utils.h>
 
 
 FOOTPRINT_NAME_VALIDATOR::FOOTPRINT_NAME_VALIDATOR( wxString* aValue ) :
@@ -355,18 +357,24 @@ bool FIELD_VALIDATOR::Validate( wxWindow* aParent )
         return false;
 
     wxString val( text->GetValue() );
+
+    return DoValidate( val, aParent );
+}
+
+bool FIELD_VALIDATOR::DoValidate( const wxString& aValue, wxWindow* aParent )
+{
     wxString msg;
 
-    if( HasFlag( wxFILTER_EMPTY ) && val.empty() )
+    if( HasFlag( wxFILTER_EMPTY ) && aValue.empty() )
         msg.Printf( _( "The value of the field cannot be empty." ) );
 
-    if( HasFlag( wxFILTER_EXCLUDE_CHAR_LIST ) && ContainsExcludedCharacters( val ) )
+    if( HasFlag( wxFILTER_EXCLUDE_CHAR_LIST ) && ContainsExcludedCharacters( aValue ) )
     {
         wxArrayString badCharsFound;
 
         for( const wxUniCharRef& excludeChar : GetCharExcludes() )
         {
-            if( val.Find( excludeChar ) != wxNOT_FOUND )
+            if( aValue.Find( excludeChar ) != wxNOT_FOUND )
             {
                 if( excludeChar == '\r' )
                     badCharsFound.Add( _( "carriage return" ) );
@@ -434,14 +442,19 @@ bool FIELD_VALIDATOR::Validate( wxWindow* aParent )
             break;
         };
     }
-    else if( m_fieldId == REFERENCE_FIELD && val.Contains( wxT( "${" ) ) )
+    else if( m_fieldId == REFERENCE_FIELD && aValue.Contains( wxT( "${" ) ) )
     {
         msg.Printf( _( "The reference designator cannot contain text variable references" ) );
     }
+    else if( m_fieldId == REFERENCE_FIELD && UTIL::GetRefDesPrefix( aValue ).IsEmpty() )
+    {
+        msg.Printf( _( "References must start with a letter." ) );
+    }
 
     if( !msg.empty() )
     {
-        m_validatorWindow->SetFocus();
+        if( m_validatorWindow )
+            m_validatorWindow->SetFocus();
 
         wxMessageBox( msg, _( "Field Validation Error" ), wxOK | wxICON_EXCLAMATION, aParent );
 

common/view/view.cpp

@@ -694,6 +694,8 @@ void VIEW::ReorderLayerData( std::unordered_map<int, int> aReorderMap )
     // Transfer reordered data (using the copy assignment operator ):
     m_layers = new_map;
 
+    sortLayers();
+
     for( VIEW_ITEM* item : *m_allItems )
     {
         VIEW_ITEM_DATA* viewData = item->viewPrivData();

common/widgets/footprint_preview_widget.cpp

@@ -36,9 +36,6 @@ FOOTPRINT_PREVIEW_WIDGET::FOOTPRINT_PREVIEW_WIDGET( wxWindow* aParent, KIWAY& aK
 {
     m_prev_panel = FOOTPRINT_PREVIEW_PANEL_BASE::Create( this, aKiway );
 
-    if( !m_prev_panel )
-        return;
-
     m_statusPanel = new wxPanel( this );
     m_status = new wxStaticText( m_statusPanel, wxID_ANY, wxEmptyString );
     m_statusSizer = new wxBoxSizer( wxVERTICAL );
@@ -47,19 +44,25 @@ FOOTPRINT_PREVIEW_WIDGET::FOOTPRINT_PREVIEW_WIDGET( wxWindow* aParent, KIWAY& aK
     m_statusSizer->Add( 0, 0, 1 );  // add a spacer
     m_statusPanel->SetSizer( m_statusSizer );
 
-    // Give the status panel the same color scheme as the canvas so it isn't jarring when
-    // switched to
-    m_statusPanel->SetBackgroundColour( m_prev_panel->GetBackgroundColor().ToColour() );
-    m_statusPanel->SetForegroundColour( m_prev_panel->GetForegroundColor().ToColour() );
-    m_status->SetForegroundColour( m_prev_panel->GetForegroundColor().ToColour() );
+    if( m_prev_panel )
+    {
+        // Give the status panel the same color scheme as the canvas so it isn't jarring when
+        // switched to
+        m_statusPanel->SetBackgroundColour( m_prev_panel->GetBackgroundColor().ToColour() );
+        m_statusPanel->SetForegroundColour( m_prev_panel->GetForegroundColor().ToColour() );
+        m_status->SetForegroundColour( m_prev_panel->GetForegroundColor().ToColour() );
 
-    // Set our background so wx doesn't render a normal control background momentarily when
-    // rapidly navigating with arrow keys
-    SetBackgroundColour( m_prev_panel->GetBackgroundColor().ToColour() );
-    SetForegroundColour( m_prev_panel->GetForegroundColor().ToColour() );
+        // Set our background so wx doesn't render a normal control background momentarily when
+        // rapidly navigating with arrow keys
+        SetBackgroundColour( m_prev_panel->GetBackgroundColor().ToColour() );
+        SetForegroundColour( m_prev_panel->GetForegroundColor().ToColour() );
+    }
 
     m_outerSizer = new wxBoxSizer( wxVERTICAL );
-    m_outerSizer->Add( m_prev_panel->GetWindow(), 1, wxALL | wxEXPAND, 0 );
+
+    if( m_prev_panel )
+        m_outerSizer->Add( m_prev_panel->GetWindow(), 1, wxALL | wxEXPAND, 0 );
+
     m_outerSizer->Add( m_statusPanel, 1, wxALL | wxEXPAND, 0 );
 
     SetSizer( m_outerSizer );
@@ -72,7 +75,10 @@ void FOOTPRINT_PREVIEW_WIDGET::SetStatusText( wxString const& aText )
 {
     m_status->SetLabel( aText );
     m_statusPanel->Show();
-    m_prev_panel->GetWindow()->Hide();
+
+    if( m_prev_panel )
+        m_prev_panel->GetWindow()->Hide();
+
     Layout();
 }
 
@@ -81,20 +87,25 @@ void FOOTPRINT_PREVIEW_WIDGET::ClearStatus()
 {
     m_status->SetLabel( wxEmptyString );
     m_statusPanel->Hide();
-    m_prev_panel->GetWindow()->Show();
+
+    if( m_prev_panel )
+        m_prev_panel->GetWindow()->Show();
+
     Layout();
 }
 
 
 void FOOTPRINT_PREVIEW_WIDGET::SetUserUnits( EDA_UNITS aUnits )
 {
-    m_prev_panel->SetUserUnits( aUnits );
+    if( m_prev_panel )
+        m_prev_panel->SetUserUnits( aUnits );
 }
 
 
 void FOOTPRINT_PREVIEW_WIDGET::SetPinFunctions( const std::map<wxString, wxString>& aPinFunctions )
 {
-    m_prev_panel->SetPinFunctions( aPinFunctions );
+    if( m_prev_panel )
+        m_prev_panel->SetPinFunctions( aPinFunctions );
 }
 
 
@@ -122,34 +133,32 @@ void FOOTPRINT_PREVIEW_WIDGET::DisplayFootprints( std::shared_ptr<FOOTPRINT> aFo
                                                   std::shared_ptr<FOOTPRINT> aFootprintB )
 {
     ClearStatus();
-    m_prev_panel->DisplayFootprints( aFootprintA, aFootprintB );
+
+    if( m_prev_panel )
+        m_prev_panel->DisplayFootprints( aFootprintA, aFootprintB );
 }
 
 
 void FOOTPRINT_PREVIEW_WIDGET::RefreshAll()
 {
-    m_prev_panel->RefreshAll();
+    if( m_prev_panel )
+        m_prev_panel->RefreshAll();
 }
 
 
 FOOTPRINT_PREVIEW_PANEL_BASE* FOOTPRINT_PREVIEW_PANEL_BASE::Create( wxWindow* aParent,
                                                                     KIWAY& aKiway )
 {
-    FOOTPRINT_PREVIEW_PANEL_BASE* panel = nullptr;
+    wxWindow* panel = nullptr;
 
     try
     {
-        KIFACE*   kiface = aKiway.KiFACE( KIWAY::FACE_PCB );
-        wxWindow* window = kiface->CreateKiWindow( aParent, FRAME_FOOTPRINT_PREVIEW, &aKiway );
-
-        panel = dynamic_cast<FOOTPRINT_PREVIEW_PANEL_BASE*>( window );
-
-        if( window && !panel )
-            delete window;
+        if( KIFACE* kiface = aKiway.KiFACE( KIWAY::FACE_PCB ) )
+            panel = kiface->CreateKiWindow( aParent, FRAME_FOOTPRINT_PREVIEW, &aKiway );
     }
     catch( ... )
     {
     }
 
-    return panel;
+    return dynamic_cast<FOOTPRINT_PREVIEW_PANEL_BASE*>( panel );
 }

common/widgets/grid_text_button_helpers.cpp

@@ -171,7 +171,7 @@ class TEXT_BUTTON_SYMBOL_CHOOSER : public wxComboCtrl
 public:
     TEXT_BUTTON_SYMBOL_CHOOSER( wxWindow* aParent, DIALOG_SHIM* aParentDlg,
                                 const wxString& aPreselect ) :
-            wxComboCtrl( aParent ),
+            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 0, 0 ) ),
             m_dlg( aParentDlg ),
             m_preselect( aPreselect )
     {
@@ -233,7 +233,7 @@ class TEXT_BUTTON_FP_CHOOSER : public wxComboCtrl
 public:
     TEXT_BUTTON_FP_CHOOSER( wxWindow* aParent, DIALOG_SHIM* aParentDlg,
                             const wxString& aSymbolNetlist, const wxString& aPreselect ) :
-            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,
+            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 0, 0 ),
                          wxTE_PROCESS_ENTER | wxBORDER_NONE ),
             m_dlg( aParentDlg ),
             m_preselect( aPreselect ),
@@ -324,7 +324,7 @@ class TEXT_BUTTON_URL : public wxComboCtrl
 {
 public:
     TEXT_BUTTON_URL( wxWindow* aParent, DIALOG_SHIM* aParentDlg, SEARCH_STACK* aSearchStack ) :
-            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,
+            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(0, 0),
                          wxTE_PROCESS_ENTER | wxBORDER_NONE ),
             m_dlg( aParentDlg ),
             m_searchStack( aSearchStack )
@@ -379,7 +379,7 @@ public:
                               wxString* aCurrentDir, const wxString& aFileFilter = wxEmptyString,
                               bool aNormalize = false,
                               const wxString& aNormalizeBasePath = wxEmptyString ) :
-            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,
+            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 0, 0 ),
                          wxTE_PROCESS_ENTER | wxBORDER_NONE ),
             m_dlg( aParentDlg ),
             m_grid( aGrid ),
@@ -399,7 +399,7 @@ public:
                               std::function<wxString( WX_GRID* grid, int row )> aFileFilterFn,
                               bool aNormalize = false,
                               const wxString& aNormalizeBasePath = wxEmptyString ) :
-            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,
+            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 0, 0 ),
                          wxTE_PROCESS_ENTER | wxBORDER_NONE ),
             m_dlg( aParentDlg ),
             m_grid( aGrid ),

common/widgets/grid_text_helpers.cpp

@@ -133,7 +133,7 @@ void GRID_CELL_STC_EDITOR::SetSize( const wxRect& aRect )
 
 void GRID_CELL_STC_EDITOR::Create( wxWindow* aParent, wxWindowID aId, wxEvtHandler* aEventHandler )
 {
-    m_control = new wxStyledTextCtrl( aParent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+    m_control = new wxStyledTextCtrl( aParent, wxID_ANY, wxDefaultPosition, wxSize( 0, 0 ),
                                       wxBORDER_NONE );
 
     stc_ctrl()->SetTabIndents( false );

common/widgets/msgpanel.cpp

@@ -34,6 +34,7 @@
 
 
 BEGIN_EVENT_TABLE( EDA_MSG_PANEL, wxPanel )
+    EVT_DPI_CHANGED( EDA_MSG_PANEL::OnDPIChanged )
     EVT_PAINT( EDA_MSG_PANEL::OnPaint )
 END_EVENT_TABLE()
 
@@ -50,7 +51,9 @@ EDA_MSG_PANEL::EDA_MSG_PANEL( wxWindow* aParent, int aId, const wxPoint& aPositi
 
     m_last_x = 0;
 
-    m_fontSize = GetTextExtent( wxT( "W" ) );
+    updateFontSize();
+
+    InvalidateBestSize();
 }
 
 
@@ -59,16 +62,31 @@ EDA_MSG_PANEL::~EDA_MSG_PANEL()
 }
 
 
-int EDA_MSG_PANEL::GetRequiredHeight( wxWindow* aWindow )
+void EDA_MSG_PANEL::updateFontSize()
 {
-    wxSize     fontSizeInPixels;
-    wxWindowDC dc( aWindow );
+    wxFont font = KIUI::GetControlFont( this );
+    GetTextExtent( wxT( "W" ), &m_fontSize.x, &m_fontSize.y, 0, 0, &font );
+}
 
-    dc.SetFont( KIUI::GetControlFont( aWindow ) );
-    dc.GetTextExtent( wxT( "W" ), &fontSizeInPixels.x, &fontSizeInPixels.y );
 
-    // make space for two rows of text plus a number of pixels between them.
-    return 2 * fontSizeInPixels.y + 0;
+wxSize EDA_MSG_PANEL::DoGetBestSize() const
+{
+    return wxSize( wxDefaultCoord, 2 * m_fontSize.y + 0 );
+}
+
+
+wxSize EDA_MSG_PANEL::DoGetBestClientSize() const
+{
+    return wxPanel::DoGetBestClientSize();
+}
+
+
+void EDA_MSG_PANEL::OnDPIChanged( wxDPIChangedEvent& aEvent )
+{
+    updateFontSize();
+    InvalidateBestSize();
+
+    aEvent.Skip();
 }
 
 

common/widgets/widget_hotkey_list.cpp

@@ -300,18 +300,6 @@ WIDGET_HOTKEY_CLIENT_DATA* WIDGET_HOTKEY_LIST::getHKClientData( wxTreeListItem a
 }
 
 
-WIDGET_HOTKEY_CLIENT_DATA* WIDGET_HOTKEY_LIST::getExpectedHkClientData( wxTreeListItem aItem )
-{
-    const auto hkdata = getHKClientData( aItem );
-
-    // This probably means a hotkey-only action is being attempted on
-    // a row that is not a hotkey (like a section heading)
-    wxASSERT_MSG( hkdata != nullptr, "No hotkey data found for list item" );
-
-    return hkdata;
-}
-
-
 void WIDGET_HOTKEY_LIST::updateFromClientData()
 {
     for( wxTreeListItem i = GetFirstItem(); i.IsOk(); i = GetNextItem( i ) )
@@ -369,7 +357,7 @@ void WIDGET_HOTKEY_LIST::changeHotkey( HOTKEY& aHotkey, long aKey, bool alternat
 
 void WIDGET_HOTKEY_LIST::editItem( wxTreeListItem aItem, int aEditId )
 {
-    WIDGET_HOTKEY_CLIENT_DATA* hkdata = getExpectedHkClientData( aItem );
+    WIDGET_HOTKEY_CLIENT_DATA* hkdata = getHKClientData( aItem );
 
     if( !hkdata )
         return;
@@ -403,7 +391,7 @@ void WIDGET_HOTKEY_LIST::editItem( wxTreeListItem aItem, int aEditId )
 
 void WIDGET_HOTKEY_LIST::resetItem( wxTreeListItem aItem, int aResetId )
 {
-    WIDGET_HOTKEY_CLIENT_DATA* hkdata = getExpectedHkClientData( aItem );
+    WIDGET_HOTKEY_CLIENT_DATA* hkdata = getHKClientData( aItem );
 
     if( !hkdata )
         return;

common/widgets/wx_infobar.cpp

@@ -58,12 +58,11 @@ WX_INFOBAR::WX_INFOBAR( wxWindow* aParent, wxAuiManager* aMgr, wxWindowID aWinid
 {
     m_showTimer = new wxTimer( this, ID_CLOSE_INFOBAR );
 
+    wxColour fg, bg;
+    KIPLATFORM::UI::GetInfoBarColours( fg, bg );
+    SetBackgroundColour( bg );
+    SetForegroundColour( fg );
 #ifdef __WXMAC__
-    // wxWidgets hard-codes wxSYS_COLOUR_INFOBK to { 0xFF, 0xFF, 0xD3 } on Mac.
-    if( KIPLATFORM::UI::IsDarkTheme() )
-        SetBackgroundColour( wxColour( 28, 27, 20 ) );
-    else
-        SetBackgroundColour( wxColour( 255, 249, 189 ) );
 
     // Infobar is broken on Mac without the effects
     SetShowHideEffects( wxSHOW_EFFECT_ROLL_TO_BOTTOM, wxSHOW_EFFECT_ROLL_TO_TOP );

common/wildcards_and_files_ext.cpp

@@ -125,6 +125,7 @@ wxString AddFileExtListToFilter( const std::vector<std::string>& aExts )
 const std::string FILEEXT::BackupFileSuffix( "-bak" );
 const std::string FILEEXT::LockFilePrefix( "~" );
 const std::string FILEEXT::LockFileExtension( "lck" );
+const std::string FILEEXT::AutoSaveFilePrefix( "_autosave-" );
 
 const std::string FILEEXT::KiCadSymbolLibFileExtension( "kicad_sym" );
 const std::string FILEEXT::SchematicSymbolFileExtension( "sym" );

cvpcb/display_footprints_frame.cpp

@@ -371,20 +371,20 @@ void DISPLAY_FOOTPRINTS_FRAME::SaveSettings( APP_SETTINGS_BASE* aCfg )
 
 WINDOW_SETTINGS* DISPLAY_FOOTPRINTS_FRAME::GetWindowSettings( APP_SETTINGS_BASE* aCfg )
 {
-    CVPCB_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<CVPCB_SETTINGS>();
+    CVPCB_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<CVPCB_SETTINGS>( "cvpcb" );
     return &cfg->m_FootprintViewer;
 }
 
 
 PCB_VIEWERS_SETTINGS_BASE* DISPLAY_FOOTPRINTS_FRAME::GetViewerSettingsBase() const
 {
-    return Pgm().GetSettingsManager().GetAppSettings<CVPCB_SETTINGS>();
+    return Pgm().GetSettingsManager().GetAppSettings<CVPCB_SETTINGS>( "cvpcb" );
 }
 
 
 MAGNETIC_SETTINGS* DISPLAY_FOOTPRINTS_FRAME::GetMagneticItemsSettings()
 {
-    CVPCB_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<CVPCB_SETTINGS>();
+    CVPCB_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<CVPCB_SETTINGS>( "cvpcb" );
     return &cfg->m_FootprintViewerMagneticSettings;
 }
 
@@ -525,6 +525,7 @@ void DISPLAY_FOOTPRINTS_FRAME::InitDisplay()
         }
 
         GetBoard()->Add( footprint );
+        GetCanvas()->GetView()->Update( footprint );
         m_currentFootprint = footprintName;
         m_currentComp = comp;
         setFPWatcher( footprint );
@@ -579,10 +580,10 @@ void DISPLAY_FOOTPRINTS_FRAME::UpdateMsgPanel()
 
 COLOR_SETTINGS* DISPLAY_FOOTPRINTS_FRAME::GetColorSettings( bool aForceRefresh ) const
 {
-    auto* settings = Pgm().GetSettingsManager().GetAppSettings<FOOTPRINT_EDITOR_SETTINGS>();
+    auto* cfg = Pgm().GetSettingsManager().GetAppSettings<FOOTPRINT_EDITOR_SETTINGS>( "fpedit" );
 
-    if( settings )
-        return Pgm().GetSettingsManager().GetColorSettings( settings->m_ColorTheme );
+    if( cfg )
+        return Pgm().GetSettingsManager().GetColorSettings( cfg->m_ColorTheme );
     else
         return Pgm().GetSettingsManager().GetColorSettings();
 }

eeschema/connection_graph.cpp

@@ -275,7 +275,9 @@ void CONNECTION_SUBGRAPH::getAllConnectedItems( std::set<std::pair<SCH_SHEET_PAT
 
     while( sg->m_absorbed_by )
     {
-        wxASSERT( sg->m_graph == sg->m_absorbed_by->m_graph );
+        // Using wxCHECK2 with continue statement causes a crash later in the connection
+        // graph rebuild.  See https://gitlab.com/kicad/code/kicad/-/issues/18136.
+        wxCHECK( sg->m_graph == sg->m_absorbed_by->m_graph, /* void */ );
         sg = sg->m_absorbed_by;
     }
 
@@ -453,7 +455,7 @@ const wxString CONNECTION_SUBGRAPH::GetNetclassForDriver( SCH_ITEM* aItem ) cons
 
 void CONNECTION_SUBGRAPH::Absorb( CONNECTION_SUBGRAPH* aOther )
 {
-    wxASSERT( m_sheet == aOther->m_sheet );
+    wxCHECK( m_sheet == aOther->m_sheet, /* void */ );
 
     for( SCH_ITEM* item : aOther->m_items )
     {
@@ -752,9 +754,9 @@ void CONNECTION_GRAPH::Recalculate( const SCH_SHEET_LIST& aSheetList, bool aUnco
             }
             else if( item->Type() == SCH_SHEET_T )
             {
-                SCH_SHEET* sheet = static_cast<SCH_SHEET*>( item );
+                SCH_SHEET* sheetItem = static_cast<SCH_SHEET*>( item );
 
-                for( SCH_SHEET_PIN* pin : sheet->GetPins() )
+                for( SCH_SHEET_PIN* pin : sheetItem->GetPins() )
                 {
                     if( pin->IsConnectivityDirty() )
                     {
@@ -827,14 +829,14 @@ std::set<std::pair<SCH_SHEET_PATH, SCH_ITEM*>> CONNECTION_GRAPH::ExtractAffected
         // Find the primary subgraph on this sheet
         while( aSubgraph->m_absorbed_by )
         {
-            wxASSERT( aSubgraph->m_graph == aSubgraph->m_absorbed_by->m_graph );
+            wxCHECK2( aSubgraph->m_graph == aSubgraph->m_absorbed_by->m_graph, continue );
             aSubgraph = aSubgraph->m_absorbed_by;
         }
 
         // Find the top most connected subgraph on all sheets
         while( aSubgraph->m_hier_parent )
         {
-            wxASSERT( aSubgraph->m_graph == aSubgraph->m_hier_parent->m_graph );
+            wxCHECK2( aSubgraph->m_graph == aSubgraph->m_hier_parent->m_graph, continue );
             aSubgraph = aSubgraph->m_hier_parent;
         }
 
@@ -848,9 +850,11 @@ std::set<std::pair<SCH_SHEET_PATH, SCH_ITEM*>> CONNECTION_GRAPH::ExtractAffected
 
         if( !item_sg )
         {
-            wxLogTrace( ConnTrace, wxT( "Item %s not found in connection graph" ), aItem->GetTypeDesc() );
+            wxLogTrace( ConnTrace, wxT( "Item %s not found in connection graph" ),
+                        aItem->GetTypeDesc() );
             return;
         }
+
         if( !item_sg->ResolveDrivers( true ) )
         {
             wxLogTrace( ConnTrace, wxT( "Item %s in subgraph %ld (%p) has no driver" ),
@@ -1333,12 +1337,12 @@ void CONNECTION_GRAPH::buildItemSubGraphs()
     // Recache all bus aliases for later use
     wxCHECK_RET( m_schematic, wxS( "Connection graph cannot be built without schematic pointer" ) );
 
-    SCH_SHEET_LIST all_sheets = m_schematic->GetSheets();
+    SCH_SCREENS screens( m_schematic->Root() );
 
-    for( unsigned i = 0; i < all_sheets.size(); i++ )
+    for( SCH_SCREEN* screen = screens.GetFirst(); screen; screen = screens.GetNext() )
     {
-        for( const std::shared_ptr<BUS_ALIAS>& alias : all_sheets[i].LastScreen()->GetBusAliases() )
-            m_bus_alias_cache[ alias->GetName() ] = alias;
+        for( const std::shared_ptr<BUS_ALIAS>& alias : screen->GetBusAliases() )
+            m_bus_alias_cache[alias->GetName()] = alias;
     }
 
     // Build subgraphs from items (on a per-sheet basis)
@@ -1386,7 +1390,7 @@ void CONNECTION_GRAPH::buildItemSubGraphs()
 
                     SCH_CONNECTION* connected_conn = connected_item->Connection( &sheet );
 
-                    wxASSERT( connected_conn );
+                    wxCHECK2( connected_conn, continue );
 
                     if( connected_conn->SubgraphCode() == 0 )
                     {
@@ -1536,7 +1540,7 @@ void CONNECTION_GRAPH::collectAllDriverValues()
             case SCH_PIN_T:
             {
                 SCH_PIN* pin = static_cast<SCH_PIN*>( driver );
-                wxASSERT( pin->IsGlobalPower() );
+                wxCHECK( pin->IsGlobalPower(), /* void */ );
                 m_global_label_cache[name].push_back( subgraph );
                 break;
             }
@@ -1972,9 +1976,10 @@ void CONNECTION_GRAPH::processSubGraphs()
                         }
                         else
                         {
-                            wxASSERT( driver->Type() == SCH_LABEL_T ||
+                            wxCHECK2( driver->Type() == SCH_LABEL_T ||
                                       driver->Type() == SCH_GLOBAL_LABEL_T ||
-                                      driver->Type() == SCH_HIER_LABEL_T );
+                                      driver->Type() == SCH_HIER_LABEL_T,
+                                      continue );
 
                             if( subgraph->GetNameForDriver( driver )  == test_name )
                             {
@@ -1996,7 +2001,7 @@ void CONNECTION_GRAPH::processSubGraphs()
                         subgraph->m_bus_neighbors[member].insert( candidate );
                         candidate->m_bus_parents[member].insert( subgraph );
                     }
-                    else if( connection->Type() == candidate->m_driver_connection->Type() )
+                    else if( !connection->IsBus() || connection->Type() == candidate->m_driver_connection->Type() )
                     {
                         wxLogTrace( ConnTrace, wxS( "%lu (%s) absorbs neighbor %lu (%s)" ),
                                     subgraph->m_code, connection->Name(),
@@ -2051,12 +2056,12 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
     // Recache all bus aliases for later use
     wxCHECK_RET( m_schematic, wxT( "Connection graph cannot be built without schematic pointer" ) );
 
-    SCH_SHEET_LIST all_sheets = m_schematic->GetSheets();
+    SCH_SCREENS screens( m_schematic->Root() );
 
-    for( unsigned i = 0; i < all_sheets.size(); i++ )
+    for( SCH_SCREEN* screen = screens.GetFirst(); screen; screen = screens.GetNext() )
     {
-        for( const std::shared_ptr<BUS_ALIAS>& alias : all_sheets[i].LastScreen()->GetBusAliases() )
-            m_bus_alias_cache[ alias->GetName() ] = alias;
+        for( const std::shared_ptr<BUS_ALIAS>& alias : screen->GetBusAliases() )
+            m_bus_alias_cache[alias->GetName()] = alias;
     }
 
     PROF_TIMER sub_graph( "buildItemSubGraphs" );
@@ -2154,18 +2159,19 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
                     if( !secondary_is_global && candidate->m_sheet != subgraph->m_sheet )
                         continue;
 
-                    SCH_CONNECTION* conn = candidate->m_driver_connection;
-
-                    if( conn->Name() == secondary_name )
+                    for( SCH_ITEM* candidate_driver : candidate->m_drivers )
                     {
-                        wxLogTrace( ConnTrace, wxS( "Global %lu (%s) promoted to %s" ),
-                                    candidate->m_code, conn->Name(),
-                                    subgraph->m_driver_connection->Name() );
+                        if( candidate->GetNameForDriver( candidate_driver ) == secondary_name )
+                        {
+                            wxLogTrace( ConnTrace, wxS( "Global %lu (%s) promoted to %s" ),
+                                        candidate->m_code, candidate->m_driver_connection->Name(),
+                                        subgraph->m_driver_connection->Name() );
 
-                        conn->Clone( *subgraph->m_driver_connection );
+                            candidate->m_driver_connection->Clone( *subgraph->m_driver_connection );
 
-                        candidate->m_dirty = false;
-                        propagateToNeighbors( candidate, false );
+                            candidate->m_dirty = false;
+                            propagateToNeighbors( candidate, false );
+                        }
                     }
                 }
             }
@@ -2197,7 +2203,7 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
     for( CONNECTION_SUBGRAPH* subgraph : m_driver_subgraphs )
     {
         // All SGs should have been processed by propagateToNeighbors above
-        wxASSERT_MSG( !subgraph->m_dirty,
+        wxCHECK2_MSG( !subgraph->m_dirty, continue,
                       wxS( "Subgraph not processed by propagateToNeighbors!" ) );
 
         if( subgraph->m_bus_parents.size() < 2 )
@@ -2208,7 +2214,7 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
         wxLogTrace( ConnTrace, wxS( "%lu (%s) has multiple bus parents" ),
                     subgraph->m_code, conn->Name() );
 
-        wxASSERT( conn->IsNet() );
+        wxCHECK2( conn->IsNet(), continue );
 
         for( const auto& ii : subgraph->m_bus_parents )
         {
@@ -2574,7 +2580,7 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph, boo
                         candidate->m_hier_parent = aParent;
                         aParent->m_hier_children.insert( candidate );
 
-                        wxASSERT( candidate->m_graph == aParent->m_graph );
+                        wxCHECK2( candidate->m_graph == aParent->m_graph, continue );
 
                         search_list.push_back( candidate );
                         break;
@@ -2692,7 +2698,7 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph, boo
                     continue;
 
                 // Safety check against infinite recursion
-                wxASSERT( neighbor_conn->IsNet() );
+                wxCHECK2( neighbor_conn->IsNet(), continue );
 
                 wxLogTrace( ConnTrace, wxS( "%lu (%s) connected to bus member %s (local %s)" ),
                             neighbor->m_code, neighbor_name, member->Name(), member->LocalName() );
@@ -2902,7 +2908,7 @@ std::shared_ptr<SCH_CONNECTION> CONNECTION_GRAPH::getDefaultConnection( SCH_ITEM
 SCH_CONNECTION* CONNECTION_GRAPH::matchBusMember( SCH_CONNECTION* aBusConnection,
                                                   SCH_CONNECTION* aSearch )
 {
-    wxASSERT( aBusConnection->IsBus() );
+    wxCHECK( aBusConnection->IsBus(), nullptr );
 
     SCH_CONNECTION* match = nullptr;
 
@@ -2984,7 +2990,7 @@ std::vector<const CONNECTION_SUBGRAPH*> CONNECTION_GRAPH::GetBusesNeedingMigrati
     for( CONNECTION_SUBGRAPH* subgraph : m_subgraphs )
     {
         // Graph is supposed to be up-to-date before calling this
-        wxASSERT( !subgraph->m_dirty );
+        wxCHECK2( !subgraph->m_dirty, continue );
 
         if( !subgraph->m_driver )
             continue;
@@ -3062,7 +3068,7 @@ CONNECTION_SUBGRAPH* CONNECTION_GRAPH::FindSubgraphByName( const wxString& aNetN
     for( CONNECTION_SUBGRAPH* sg : it->second )
     {
         // Cache is supposed to be valid by now
-        wxASSERT( sg && !sg->m_absorbed && sg->m_driver_connection );
+        wxCHECK2( sg && !sg->m_absorbed && sg->m_driver_connection, continue );
 
         if( sg->m_sheet == aPath && sg->m_driver_connection->Name() == aNetName )
             return sg;
@@ -3079,7 +3085,7 @@ CONNECTION_SUBGRAPH* CONNECTION_GRAPH::FindFirstSubgraphByName( const wxString&
     if( it == m_net_name_to_subgraphs_map.end() )
         return nullptr;
 
-    wxASSERT( !it->second.empty() );
+    wxCHECK( !it->second.empty(), nullptr );
 
     return it->second[0];
 }
@@ -3129,7 +3135,7 @@ int CONNECTION_GRAPH::RunERC()
         wxCHECK2( subgraph, continue );
 
         // Graph is supposed to be up-to-date before calling RunERC()
-        wxASSERT( !subgraph->m_dirty );
+        wxCHECK2( !subgraph->m_dirty, continue );
 
         if( subgraph->m_absorbed )
             continue;

eeschema/connection_graph.h

@@ -466,6 +466,18 @@ public:
     */
     void ExchangeItem( SCH_ITEM* aOldItem, SCH_ITEM* aNewItem );
 
+    /**
+     * We modify how we handle the connectivity graph for small graphs vs large
+     * graphs.  Partially this is to avoid unneeded complexity for small graphs,
+     * where the performance of the graph is not a concern.  This is considered
+     * a temporary solution until the connectivity graph is refactored with an
+     * eye toward partial updates
+    */
+    bool IsMinor() const
+    {
+        return m_items.size() < 10000;
+    }
+
 private:
     /**
      * Update the graphical connectivity between items (i.e. where they touch)