Tag stable version 9.0.4.

Currently translated at 86.1% (8666 of 10065 strings)

Translation: KiCad EDA/v9
Translate-URL: https://hosted.weblate.org/projects/kicad/v9/es/

.gitignore

@@ -24,7 +24,6 @@ common/template_fieldnames_lexer.h
 eeschema/schematic_keywords.*
 pcbnew/pcb_plot_params_keywords.cpp
 pcbnew/pcb_plot_params_lexer.h
-pcbnew/dialogs/panel_setup_rules_help_*.h
 Makefile
 CMakeUserPresets.json
 CMakeCache.txt

3d-viewer/3d_canvas/board_adapter.cpp

@@ -475,26 +475,18 @@ void BOARD_ADAPTER::InitSettings( REPORTER* aStatusReporter, REPORTER* aWarningR
     const float zpos_copperTop_front = m_layerZcoordTop[F_Cu];
 
     // Fill not copper layers zpos
-    for( int layer_id = 0; layer_id < PCB_LAYER_ID_COUNT; layer_id++ )
+    for( int layer = 0; layer < PCB_LAYER_ID_COUNT; layer++ )
     {
-        if( IsCopperLayer( (PCB_LAYER_ID)layer_id ) )
+        PCB_LAYER_ID layer_id = ToLAYER_ID( layer );
+
+        if( IsCopperLayer( layer_id ) )
             continue;
 
-        float zposBottom = zpos_copperTop_front + 2.0f * zpos_offset;
-        float zposTop = zposBottom + m_frontCopperThickness3DU;
+        float zposBottom;
+        float zposTop;
 
         switch( layer_id )
         {
-        case B_Adhes:
-            zposBottom = zpos_copperTop_back - 2.0f * zpos_offset;
-            zposTop    = zposBottom - m_nonCopperLayerThickness3DU;
-            break;
-
-        case F_Adhes:
-            zposBottom = zpos_copperTop_front + 2.0f * zpos_offset;
-            zposTop    = zposBottom + m_nonCopperLayerThickness3DU;
-            break;
-
         case B_Mask:
             zposBottom = zpos_copperTop_back;
             zposTop    = zpos_copperTop_back - m_nonCopperLayerThickness3DU;
@@ -526,11 +518,21 @@ void BOARD_ADAPTER::InitSettings( REPORTER* aStatusReporter, REPORTER* aWarningR
             break;
 
         default:
+            if( m_board->IsBackLayer( layer_id ) )
+            {
+                zposBottom = zpos_copperTop_back - 2.0f * zpos_offset;
+                zposTop    = zposBottom - m_nonCopperLayerThickness3DU;
+            }
+            else
+            {
+                zposBottom = zpos_copperTop_front + 2.0f * zpos_offset;
+                zposTop    = zposBottom + m_nonCopperLayerThickness3DU;
+            }
             break;
         }
 
-        m_layerZcoordTop[(PCB_LAYER_ID)layer_id] = zposTop;
-        m_layerZcoordBottom[(PCB_LAYER_ID)layer_id] = zposBottom;
+        m_layerZcoordTop[layer_id] = zposTop;
+        m_layerZcoordBottom[layer_id] = zposBottom;
     }
 
     m_boardCenter = SFVEC3F( m_boardPos.x * m_biuTo3Dunits, m_boardPos.y * m_biuTo3Dunits, 0.0f );
@@ -784,7 +786,7 @@ std::bitset<LAYER_3D_END> BOARD_ADAPTER::GetVisibleLayers() const
 {
     std::bitset<LAYER_3D_END> ret;
 
-    if( m_board && m_board->IsFootprintHolder() )
+    if( m_IsPreviewer )
     {
         if( m_Cfg->m_Render.preview_show_board_body )
         {

3d-viewer/3d_canvas/create_layer_items.cpp

@@ -671,6 +671,9 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
                 addShape( static_cast<PCB_DIMENSION_BASE*>( item ), layerContainer, item );
                 break;
 
+            case PCB_REFERENCE_IMAGE_T:     // ignore
+                break;
+
             default:
                 wxLogTrace( m_logTrace, wxT( "createLayers: item type: %d not implemented" ), item->Type() );
                 break;
@@ -696,7 +699,7 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
                     PCB_TEXT* text = static_cast<PCB_TEXT*>( item );
                     text->TransformTextToPolySet( *copperPolys, 0, maxError, ERROR_INSIDE );
                 }
-                else
+                else if( item->Type() != PCB_REFERENCE_IMAGE_T )
                 {
                     item->TransformShapeToPolygon( *copperPolys, layer, 0, maxError, ERROR_INSIDE );
                 }
@@ -770,6 +773,9 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
                     break;
                 }
 
+                case PCB_REFERENCE_IMAGE_T:     // ignore
+                    break;
+
                 default:
                     wxLogTrace( m_logTrace, wxT( "createLayers: item type: %d not implemented" ), item->Type() );
                     break;

3d-viewer/3d_navlib/nl_3d_viewer_plugin_impl.cpp

@@ -544,9 +544,7 @@ long NL_3D_VIEWER_PLUGIN_IMPL::SetHitSelectionOnly( bool onlySelection )
 long NL_3D_VIEWER_PLUGIN_IMPL::SetActiveCommand( std::string commandId )
 {
     if( commandId.empty() )
-    {
         return 0;
-    }
 
     std::list<TOOL_ACTION*> actions = ACTION_MANAGER::GetActionList();
     TOOL_ACTION*            context = nullptr;
@@ -557,9 +555,7 @@ long NL_3D_VIEWER_PLUGIN_IMPL::SetActiveCommand( std::string commandId )
         std::string  nm = action->GetName();
 
         if( commandId == nm )
-        {
             context = action;
-        }
     }
 
     if( context != nullptr )
@@ -568,27 +564,21 @@ long NL_3D_VIEWER_PLUGIN_IMPL::SetActiveCommand( std::string commandId )
 
         // Only allow command execution if the window is enabled. i.e. there is not a modal dialog
         // currently active.
-        TOOLS_HOLDER* tools_holder = nullptr;
-
-        if( parent->IsEnabled() && ( tools_holder = dynamic_cast<TOOLS_HOLDER*>( parent ) ) )
+        if( parent && parent->IsEnabled() )
         {
-            TOOL_MANAGER* tool_manager = tools_holder->GetToolManager();
+            TOOLS_HOLDER* tools_holder = dynamic_cast<TOOLS_HOLDER*>( parent );
+            TOOL_MANAGER* tool_manager = tools_holder ? tools_holder->GetToolManager() : nullptr;
 
-            if( tool_manager == nullptr )
-            {
+            if( !tool_manager )
                 return navlib::make_result_code( navlib::navlib_errc::invalid_operation );
-            }
 
             // Get the selection to use to test if the action is enabled
             SELECTION& sel = tool_manager->GetToolHolder()->GetCurrentSelection();
 
             bool runAction = true;
 
-            if( const ACTION_CONDITIONS* aCond =
-                        tool_manager->GetActionManager()->GetCondition( *context ) )
-            {
+            if( const ACTION_CONDITIONS* aCond = tool_manager->GetActionManager()->GetCondition( *context ) )
                 runAction = aCond->enableCondition( sel );
-            }
 
             if( runAction )
             {

3d-viewer/3d_rendering/raytracing/accelerators/bvh_pbrt.h

@@ -115,6 +115,11 @@ public:
 
     ~BVH_PBRT();
 
+    // We own at least one list of raw pointers.  Don't let the compiler fill in copy c'tors that
+    // will only land us in trouble.
+    BVH_PBRT( const BVH_PBRT& ) = delete;
+    BVH_PBRT& operator=( const BVH_PBRT& ) = delete;
+
     bool Intersect( const RAY& aRay, HITINFO& aHitInfo ) const override;
     bool Intersect( const RAY& aRay, HITINFO& aHitInfo, unsigned int aAccNodeInfo ) const override;
     bool Intersect( const RAYPACKET& aRayPacket, HITINFO_PACKET* aHitInfoPacket ) const override;

3d-viewer/3d_rendering/raytracing/accelerators/container_2d.h

@@ -22,12 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-/**
- * @file  container_2d.h
- */
-
-#ifndef _CONTAINER_2D_H_
-#define _CONTAINER_2D_H_
+#pragma once
 
 #include "../shapes2D/object_2d.h"
 #include <list>
@@ -71,8 +66,7 @@ public:
      * @param aBBox The bounding box to test.
      * @param aOutList The list of objects that intersects the bounding box.
      */
-    virtual void GetIntersectingObjects( const BBOX_2D& aBBox,
-                                         CONST_LIST_OBJECT2D& aOutList ) const = 0;
+    virtual void GetIntersectingObjects( const BBOX_2D& aBBox, CONST_LIST_OBJECT2D& aOutList ) const = 0;
 
     /**
      * Intersect and check if a segment ray hits a object or is inside it.
@@ -83,11 +77,11 @@ public:
     virtual bool IntersectAny( const RAYSEG2D& aSegRay ) const = 0;
 
 protected:
-    BBOX_2D m_bbox;
+    BBOX_2D       m_bbox;
     LIST_OBJECT2D m_objects;
 
 private:
-    std::mutex m_lock;
+    std::mutex    m_lock;
 };
 
 
@@ -96,8 +90,7 @@ class CONTAINER_2D : public CONTAINER_2D_BASE
 public:
     CONTAINER_2D();
 
-    void GetIntersectingObjects( const BBOX_2D& aBBox,
-                                 CONST_LIST_OBJECT2D& aOutList ) const override;
+    void GetIntersectingObjects( const BBOX_2D& aBBox, CONST_LIST_OBJECT2D& aOutList ) const override;
 
     bool IntersectAny( const RAYSEG2D& aSegRay ) const override;
 };
@@ -119,28 +112,30 @@ public:
     BVH_CONTAINER_2D();
     ~BVH_CONTAINER_2D();
 
+    // We own at least one list of raw pointers.  Don't let the compiler fill in copy c'tors that
+    // will only land us in trouble.
+    BVH_CONTAINER_2D( const BVH_CONTAINER_2D& ) = delete;
+    BVH_CONTAINER_2D& operator=( const BVH_CONTAINER_2D& ) = delete;
+
     void BuildBVH();
 
     void Clear() override;
 
-    void GetIntersectingObjects( const BBOX_2D& aBBox,
-                                 CONST_LIST_OBJECT2D& aOutList ) const override;
+    void GetIntersectingObjects( const BBOX_2D& aBBox, CONST_LIST_OBJECT2D& aOutList ) const override;
 
     bool IntersectAny( const RAYSEG2D& aSegRay ) const override;
 
 private:
     void destroy();
     void recursiveBuild_MIDDLE_SPLIT( BVH_CONTAINER_NODE_2D* aNodeParent );
-    void recursiveGetListObjectsIntersects( const BVH_CONTAINER_NODE_2D* aNode,
-                                            const BBOX_2D& aBBox,
+    void recursiveGetListObjectsIntersects( const BVH_CONTAINER_NODE_2D* aNode, const BBOX_2D& aBBox,
                                             CONST_LIST_OBJECT2D& aOutList ) const;
-    bool recursiveIntersectAny( const BVH_CONTAINER_NODE_2D* aNode,
-                                const RAYSEG2D& aSegRay ) const;
+    bool recursiveIntersectAny( const BVH_CONTAINER_NODE_2D* aNode, const RAYSEG2D& aSegRay ) const;
 
-    bool m_isInitialized;
+private:
+    bool                              m_isInitialized;
     std::list<BVH_CONTAINER_NODE_2D*> m_elementsToDelete;
-    BVH_CONTAINER_NODE_2D* m_tree;
+    BVH_CONTAINER_NODE_2D*            m_tree;
 
 };
 
-#endif // _CONTAINER_2D_H_

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

@@ -23,12 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-/**
- * @file layer_item_2d.h
- */
-
-#ifndef _LAYER_ITEM_2D_H_
-#define _LAYER_ITEM_2D_H_
+#pragma once
 
 #include "object_2d.h"
 #include <vector>
@@ -84,6 +79,11 @@ public:
 
     ~LAYER_ITEM_2D();
 
+    // We own at least one list of raw pointers.  Don't let the compiler fill in copy c'tors that
+    // will only land us in trouble.
+    LAYER_ITEM_2D( const LAYER_ITEM_2D& ) = delete;
+    LAYER_ITEM_2D& operator=( const LAYER_ITEM_2D& ) = delete;
+
     // Imported from OBJECT_2D
     bool Overlaps( const BBOX_2D& aBBox ) const override;
     bool Intersects( const BBOX_2D& aBBox ) const override;
@@ -97,4 +97,3 @@ private:
     const OBJECT_2D*                m_objectC;
 };
 
-#endif // _LAYER_ITEM_2D_H_

3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp

@@ -574,11 +574,25 @@ void EDA_3D_VIEWER_FRAME::LoadSettings( APP_SETTINGS_BASE *aCfg )
     {
         applySettings( cfg );
 
-        if( !GetBoard()->GetProject() )
-            GetBoard()->SetProject( &Prj() );
-
         m_boardAdapter.SetBoard( GetBoard() );
 
+        wxString legacyColorsPresetName = _( "legacy colors" );
+
+        if( LAYER_PRESET_3D* preset = cfg->FindPreset( legacyColorsPresetName ) )
+        {
+            // Something corrupts the legacy colours in 9.0, so just make sure that it always
+            // has the correct values.
+            *preset = { legacyColorsPresetName,
+                        GetAdapter().GetDefaultVisibleLayers(),
+                        GetAdapter().GetDefaultColors() };
+        }
+        else
+        {
+            cfg->m_LayerPresets.emplace_back( legacyColorsPresetName,
+                                              GetAdapter().GetDefaultVisibleLayers(),
+                                              GetAdapter().GetDefaultColors() );
+        }
+
         // When opening the 3D viewer, we use the OpenGL mode, never the ray tracing engine
         // because the ray tracing is very time consuming, and can be seen as not working
         // (freeze window) with large boards.
@@ -586,17 +600,7 @@ void EDA_3D_VIEWER_FRAME::LoadSettings( APP_SETTINGS_BASE *aCfg )
 
         if( cfg->m_CurrentPreset == LEGACY_PRESET_FLAG )
         {
-            wxString legacyColorsPresetName = _( "legacy colors" );
-
             cfg->m_UseStackupColors = false;
-
-            if( !cfg->FindPreset( legacyColorsPresetName ) )
-            {
-                cfg->m_LayerPresets.emplace_back( legacyColorsPresetName,
-                                                  GetAdapter().GetDefaultVisibleLayers(),
-                                                  GetAdapter().GetDefaultColors() );
-            }
-
             cfg->m_CurrentPreset = FOLLOW_PLOT_SETTINGS;
         }
 

3d-viewer/dialogs/appearance_controls_3D.cpp

@@ -236,7 +236,7 @@ APPEARANCE_CONTROLS_3D::~APPEARANCE_CONTROLS_3D()
 wxSize APPEARANCE_CONTROLS_3D::GetBestSize() const
 {
     DPI_SCALING_COMMON dpi( nullptr, m_frame );
-    wxSize      size( 220 * dpi.GetScaleFactor(), 480 * dpi.GetScaleFactor() );
+    wxSize      size( 228 * dpi.GetScaleFactor(), 480 * dpi.GetScaleFactor() );
     return size;
 }
 
@@ -499,10 +499,27 @@ void APPEARANCE_CONTROLS_3D::onColorSwatchChanged( COLOR_SWATCH* aSwatch )
 
     colors[ layer ] = newColor;
 
+    // The internals of the 3D viewer only supports a single color for copper, which must
+    // be applied to all copper layers.
+    COLOR_SWATCH* otherSwatch = nullptr;
+
     if( layer == LAYER_3D_COPPER_TOP )
+    {
         colors[ LAYER_3D_COPPER_BOTTOM ] = newColor;
+        otherSwatch = m_layerSettingsMap[LAYER_3D_COPPER_BOTTOM]->m_Ctl_color;
+    }
     else if( layer == LAYER_3D_COPPER_BOTTOM )
+    {
         colors[ LAYER_3D_COPPER_TOP ] = newColor;
+        otherSwatch = m_layerSettingsMap[LAYER_3D_COPPER_TOP]->m_Ctl_color;
+    }
+
+    if( otherSwatch )
+    {
+        // Don't send an event, because that will cause an event loop
+        otherSwatch->SetSwatchColor( newColor, false );
+    }
+
 
     m_frame->GetAdapter().SetLayerColors( colors );
 
@@ -874,7 +891,8 @@ void APPEARANCE_CONTROLS_3D::onLayerPresetChanged( wxCommandEvent& aEvent )
             if( cfg->m_CurrentPreset == name )
                 cfg->m_CurrentPreset = wxEmptyString;
 
-            m_presetMRU.Remove( name );
+            if( m_presetMRU.Index( name ) >= 0 )
+                m_presetMRU.Remove( name );
         }
 
         resetSelection();
@@ -957,7 +975,9 @@ void APPEARANCE_CONTROLS_3D::onViewportChanged( wxCommandEvent& aEvent )
 
         if( !viewport->name.IsEmpty() )
         {
-            m_viewportMRU.Remove( viewport->name );
+            if( m_viewportMRU.Index( viewport->name ) != wxNOT_FOUND )
+                m_viewportMRU.Remove( viewport->name );
+
             m_viewportMRU.Insert( viewport->name, 0 );
         }
     }
@@ -993,7 +1013,9 @@ void APPEARANCE_CONTROLS_3D::onViewportChanged( wxCommandEvent& aEvent )
         {
             m_viewports[name].matrix = m_frame->GetCurrentCamera().GetViewMatrix();
             index = m_cbViewports->FindString( name );
-            m_viewportMRU.Remove( name );
+
+            if( m_viewportMRU.Index( name ) != wxNOT_FOUND )
+                m_viewportMRU.Remove( name );
         }
 
         m_cbViewports->SetSelection( index );
@@ -1028,8 +1050,10 @@ void APPEARANCE_CONTROLS_3D::onViewportChanged( wxCommandEvent& aEvent )
             {
                 m_viewports.erase( viewportName );
                 m_cbViewports->Delete( idx );
-                m_viewportMRU.Remove( viewportName );
             }
+
+            if( m_viewportMRU.Index( viewportName ) != wxNOT_FOUND )
+                m_viewportMRU.Remove( viewportName );
         }
 
         if( m_lastSelectedViewport )

3d-viewer/dialogs/appearance_controls_3D.h

@@ -18,8 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef APPEARANCE_CONTROLS_3D_H
-#define APPEARANCE_CONTROLS_3D_H
+#pragma once
 
 #include <vector>
 
@@ -113,6 +112,11 @@ public:
     APPEARANCE_CONTROLS_3D( EDA_3D_VIEWER_FRAME* aParent, wxWindow* aFocusOwner );
     ~APPEARANCE_CONTROLS_3D();
 
+    // We own at least one list of raw pointers.  Don't let the compiler fill in copy c'tors that
+    // will only land us in trouble.
+    APPEARANCE_CONTROLS_3D( const APPEARANCE_CONTROLS_3D& ) = delete;
+    APPEARANCE_CONTROLS_3D& operator=( const APPEARANCE_CONTROLS_3D& ) = delete;
+
     wxSize GetBestSize() const;
     void OnDarkModeToggle();
     void OnLayerVisibilityChanged( int aLayer, bool isVisible );
@@ -189,5 +193,3 @@ private:
     wxCheckBox*                    m_cbUseBoardStackupColors;
     wxCheckBox*                    m_cbUseBoardEditorCopperColors;
 };
-
-#endif

AUTHORS.txt

@@ -168,9 +168,9 @@
  Thomas Gambier
  Ashutosh Gangwar
  Alessandro Gatti
+ Zenn Geeraerts
  Alex Gellen
  Robert Antoni Buj Gelonch
- Robert Antoni Buj Genlonch
  Hal Gentz
  Lucas Gerads
  Davide Gerhard
@@ -228,6 +228,7 @@
  Mario Hros
  Hubert Hu
  Josue Huaroto
+ Eli Hughes
  Huibean
  Matt Huszagh
  José Ignacio
@@ -621,7 +622,7 @@
  欠陥電気
  木 王
  郝弘毅
- Eli Hughes
+
 
 See git repo on GitLab for contributors at
 https://gitlab.com/kicad/code/kicad/-/graphs/master

api/proto/board/board_commands.proto

@@ -189,6 +189,42 @@ message PadShapeAsPolygonResponse
   repeated kiapi.common.types.PolygonWithHoles polygons = 2;
 }
 
+// Tests if the given set of items with padstacks (pads or vias) has content on the given set of layers.
+// This is a dynamic call rather than a property of the padstack because pads and vias can be set to only include
+// shapes on connected copper layers, and whether or not the pad is connected can't be determined in isolation.
+// To optimize API call performance, multiple items and multiple layers to test may be passed in with this
+// command message.  The return will include the results for each valid item on each valid layer.
+// Note that not all layers make sense for a given item (for example, testing against BL_UNDEFINED never makes
+// sense).  In general, the internal KiCad APIs will not return an error when testing non-sensical layers for a given
+// item, and instead will return a default of "true" for any such layers.
+message CheckPadstackPresenceOnLayers
+{
+  kiapi.common.types.DocumentSpecifier board = 1;
+
+  repeated kiapi.common.types.KIID items = 2;
+
+  repeated kiapi.board.types.BoardLayer layers = 3;
+}
+
+enum PadstackPresence
+{
+  PSP_UNKNOWN = 0;
+  PSP_PRESENT = 1;      // The padstack has a shape on a given layer (is flashed)
+  PSP_NOT_PRESENT = 2;  // The padstack has no shape on a given layer (is not flashed)
+}
+
+message PadstackPresenceEntry
+{
+  kiapi.common.types.KIID item = 1;
+  kiapi.board.types.BoardLayer layer = 2;
+  PadstackPresence presence = 3;
+}
+
+message PadstackPresenceResponse
+{
+  repeated PadstackPresenceEntry entries = 1;
+}
+
 // PCB editor commands
 
 // returns BoardLayers

api/proto/board/board_types.proto

@@ -478,6 +478,9 @@ message Pad
 
   // Copper-to-copper clearance override
   kiapi.common.types.Distance copper_clearance_override = 8;
+
+  // Since: 9.0.4
+  kiapi.common.types.Distance pad_to_die_length = 9;
 }
 
 enum ZoneType
@@ -896,4 +899,7 @@ message FootprintInstance
 
   FootprintAttributes attributes = 11;
   FootprintDesignRuleOverrides overrides  = 12;
+
+  // The sheet path to the associated symbol for this footprint instance, if one exists
+  kiapi.common.types.SheetPath symbol_path = 13;
 }

bitmap2component/bitmap2cmp_panel.cpp

@@ -30,11 +30,15 @@
 #include <common.h>
 #include <math/util.h>      // for KiROUND
 #include <potracelib.h>
+#include <vector>
+#include <wx/arrstr.h>
 #include <wx/clipbrd.h>
+#include <wx/dnd.h>
 #include <wx/rawbmp.h>
 #include <wx/msgdlg.h>
 #include <wx/dcclient.h>
 #include <wx/log.h>
+#include <wx/string.h>
 
 #define DEFAULT_DPI 300     // the image DPI used in formats that do not define a DPI
 
@@ -58,8 +62,11 @@ BITMAP2CMP_PANEL::BITMAP2CMP_PANEL( BITMAP2CMP_FRAME* aParent ) :
 
     m_buttonExportFile->Enable( false );
     m_buttonExportClipboard->Enable( false );
-}
 
+    m_InitialPicturePanel->SetDropTarget( new DROP_FILE( this ) );
+    m_GreyscalePicturePanel->SetDropTarget( new DROP_FILE( this ) );
+    m_BNPicturePanel->SetDropTarget( new DROP_FILE( this ) );
+}
 
 wxWindow* BITMAP2CMP_PANEL::GetCurrentPage()
 {
@@ -562,3 +569,33 @@ void BITMAP2CMP_PANEL::OnFormatChange( wxCommandEvent& event )
     m_layerLabel->Enable( m_rbFootprint->GetValue() );
     m_layerCtrl->Enable( m_rbFootprint->GetValue() );
 }
+
+
+DROP_FILE::DROP_FILE( BITMAP2CMP_PANEL* panel ) :
+        m_panel( panel )
+{
+}
+
+
+bool DROP_FILE::OnDropFiles( wxCoord x, wxCoord y, const wxArrayString& filenames )
+{
+    m_panel->SetFocus();
+
+    // If a file is already loaded
+    if( m_panel->GetOutputSizeX().GetOriginalSizePixels() != 0 )
+    {
+        wxString        cap = _( "Replace Loaded File?" );
+        wxString        msg = _( "There is already a file loaded. Do you want to replace it?" );
+        wxMessageDialog acceptFileDlg( m_panel, msg, cap, wxYES_NO | wxICON_QUESTION | wxYES_DEFAULT );
+        int             replace = acceptFileDlg.ShowModal();
+
+        if( replace == wxID_NO )
+            return false;
+    }
+
+    std::vector<wxString> fNameVec;
+    fNameVec.insert( fNameVec.begin(), filenames.begin(), filenames.end() );
+    m_panel->OpenProjectFiles( fNameVec );
+
+    return true;
+}

bitmap2component/bitmap2cmp_panel.h

@@ -25,7 +25,7 @@
 
 #include <bitmap2cmp_panel_base.h>
 #include <eda_units.h>
-
+#include <wx/dnd.h>
 
 class BITMAP2CMP_FRAME;
 class BITMAP2CMP_SETTINGS;
@@ -134,4 +134,18 @@ private:
     bool              m_negative;
     double            m_aspectRatio;
 };
+
+
+class DROP_FILE : public wxFileDropTarget
+{
+public:
+    DROP_FILE( BITMAP2CMP_PANEL* panel );
+    DROP_FILE() = delete;
+
+    bool OnDropFiles( wxCoord x, wxCoord y, const wxArrayString& filenames ) override;
+
+private:
+    BITMAP2CMP_PANEL* m_panel;
+};
+
 #endif// BITMAP2CMP_PANEL

cmake/KiCadVersion.cmake

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

common/advanced_config.cpp

@@ -128,6 +128,8 @@ static const wxChar NetInspectorBulkUpdateOptimisationThreshold[] =
         wxT( "NetInspectorBulkUpdateOptimisationThreshold" );
 static const wxChar ExcludeFromSimulationLineWidth[] = wxT( "ExcludeFromSimulationLineWidth" );
 static const wxChar GitIconRefreshInterval[] = wxT( "GitIconRefreshInterval" );
+static const wxChar MaxPastedTextLength[] = wxT( "MaxPastedTextLength" );
+static const wxChar PNSProcessClusterTimeout[] = wxT( "PNSProcessClusterTimeout" );
 
 } // namespace KEYS
 
@@ -311,6 +313,10 @@ ADVANCED_CFG::ADVANCED_CFG()
 
     m_GitIconRefreshInterval = 10000;
 
+    m_MaxPastedTextLength = 100;
+
+    m_PNSProcessClusterTimeout = 100; // Default: 100 ms
+
     loadFromConfigFile();
 }
 
@@ -601,6 +607,13 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
                                                &m_GitIconRefreshInterval,
                                                m_GitIconRefreshInterval, 0, 100000 ) );
 
+    configParams.push_back( new PARAM_CFG_INT( true, AC_KEYS::MaxPastedTextLength,
+                                                  &m_MaxPastedTextLength,
+                                                  m_MaxPastedTextLength, 0, 100000 ) );
+
+    configParams.push_back( new PARAM_CFG_INT( true, AC_KEYS::PNSProcessClusterTimeout,
+                                               &m_PNSProcessClusterTimeout, 100, 10, 10000 ) );
+
     // 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/api/api_handler_common.cpp

@@ -178,7 +178,7 @@ HANDLER_RESULT<types::Box2> API_HANDLER_COMMON::handleGetTextExtents(
 
     types::Box2 response;
 
-    BOX2I bbox = text.GetTextBox();
+    BOX2I bbox = text.GetTextBox( nullptr );
     EDA_ANGLE angle = text.GetTextAngle();
 
     if( !angle.IsZero() )

common/api/api_utils.cpp

@@ -21,6 +21,7 @@
 #include <magic_enum.hpp>
 #include <api/api_utils.h>
 #include <geometry/shape_poly_set.h>
+#include <kiid.h>
 #include <wx/log.h>
 
 const wxChar* const traceApi = wxT( "KICAD_API" );
@@ -232,4 +233,12 @@ KICOMMON_API KIGFX::COLOR4D UnpackColor( const types::Color& aInput )
     return KIGFX::COLOR4D( r, g, b, a );
 }
 
+KICOMMON_API void PackSheetPath( types::SheetPath& aOutput, const KIID_PATH& aInput )
+{
+    aOutput.clear_path();
+
+    for( const KIID& entry : aInput )
+        aOutput.add_path()->set_value( entry.AsStdString() );
+}
+
 } // namespace kiapi::common

common/build_version.cpp

@@ -31,6 +31,7 @@
 #include <build_version.h>
 
 #include <tuple>
+#include <mutex>
 
 // kicad_curl.h must be included before wx headers, to avoid
 // conflicts for some defines, at least on Windows
@@ -51,6 +52,9 @@ extern std::string GetCurlLibVersion();
 #include <kicad_build_version.h>
 #undef INCLUDE_KICAD_VERSION
 
+// Mutex for wxPlatformInfo
+static std::recursive_mutex s_platformInfoMutex;
+
 // Remember OpenGL info
 static wxString s_glVendor;
 static wxString s_glRenderer;
@@ -66,8 +70,10 @@ void SetOpenGLInfo( const char* aVendor, const char* aRenderer, const char* aVer
 
 wxString GetPlatformGetBitnessName()
 {
-    wxPlatformInfo platform;
-    return platform.GetBitnessName();
+    // wxPlatformInfo is not thread-safe, so protect it
+    std::unique_lock lock(s_platformInfoMutex);
+
+    return wxPlatformInfo().GetBitnessName();
 }
 
 
@@ -157,7 +163,6 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief )
 #endif
             << " build";
 
-    wxPlatformInfo platform;
     aMsg << "Application: " << aTitle;
     aMsg << " " << wxGetCpuArchitectureName() << " on " << wxGetNativeCpuArchitectureName();
 
@@ -187,14 +192,19 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief )
     // Linux uses the lsb-release program to get the description of the OS, if lsb-release
     // isn't installed, then the string will be empty and we fallback to the method used on
     // the other platforms (to at least get the kernel/uname info).
-     if( osDescription.empty() )
-         osDescription = wxGetOsDescription();
+    if( osDescription.empty() )
+        osDescription = wxGetOsDescription();
 
-    aMsg << "Platform: "
-         << osDescription << ", "
-         << GetPlatformGetBitnessName() << ", "
-         << platform.GetEndiannessName() << ", "
-         << platform.GetPortIdName();
+    {
+        // wxPlatformInfo is not thread-safe, so protect it
+        std::unique_lock lock( s_platformInfoMutex );
+
+        aMsg << "Platform: "
+            << osDescription << ", "
+            << GetPlatformGetBitnessName() << ", "
+            << wxPlatformInfo().GetEndiannessName() << ", "
+            << wxPlatformInfo().GetPortIdName();
+    }
 
 #ifdef __WXGTK__
     if( wxTheApp && wxTheApp->IsGUI() )
@@ -240,11 +250,15 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief )
 
     // Get the GTK+ version where possible.
 #ifdef __WXGTK__
-    int major, minor;
+    {
+        // wxPlatformInfo is not thread-safe, so protect it
+        std::unique_lock lock( s_platformInfoMutex );
+        int              major, minor;
 
-    major = wxPlatformInfo().Get().GetToolkitMajorVersion();
-    minor = wxPlatformInfo().Get().GetToolkitMinorVersion();
-    aMsg << " GTK+ " <<  major << "." << minor;
+        major = wxPlatformInfo().GetToolkitMajorVersion();
+        minor = wxPlatformInfo().GetToolkitMinorVersion();
+        aMsg << " GTK+ " << major << "." << minor;
+    }
 #endif
 
     aMsg << eol;

common/commit.cpp

@@ -127,6 +127,26 @@ COMMIT& COMMIT::Stage( const PICKED_ITEMS_LIST &aItems, UNDO_REDO aModFlag, BASE
 }
 
 
+void COMMIT::Unstage( EDA_ITEM* aItem, BASE_SCREEN* aScreen )
+{
+    std::erase_if( m_changes,
+                   [&]( COMMIT_LINE& line )
+                   {
+                       if( line.m_item == aItem && line.m_screen == aScreen )
+                       {
+                           // Only new items which have never been committed can be unstaged
+                           wxASSERT( line.m_item->IsNew() );
+
+                           delete line.m_item;
+                           delete line.m_copy;
+                           return true;
+                       }
+
+                       return false;
+                   } );
+}
+
+
 int COMMIT::GetStatus( EDA_ITEM* aItem, BASE_SCREEN *aScreen )
 {
     COMMIT_LINE* entry = findEntry( parentObject( aItem ), aScreen );

common/common.cpp

@@ -71,9 +71,8 @@ wxString ExpandTextVars( const wxString& aSource, const PROJECT* aProject, int a
 wxString ExpandTextVars( const wxString& aSource,
                          const std::function<bool( wxString* )>* aResolver, int aFlags )
 {
-    static wxRegEx userDefinedWarningError( wxS( "^(ERC|DRC)_(WARNING|ERROR).*$" ) );
-    wxString       newbuf;
-    size_t         sourceLen = aSource.length();
+    wxString newbuf;
+    size_t   sourceLen = aSource.length();
 
     newbuf.Alloc( sourceLen );  // best guess (improves performance)
 
@@ -94,7 +93,10 @@ wxString ExpandTextVars( const wxString& aSource,
             if( token.IsEmpty() )
                 continue;
 
-            if( ( aFlags & FOR_ERC_DRC ) == 0 && userDefinedWarningError.Matches( token ) )
+            if( ( aFlags & FOR_ERC_DRC ) == 0 && (   token.StartsWith( wxS( "ERC_WARNING" ) )
+                                                  || token.StartsWith( wxS( "ERC_ERROR" ) )
+                                                  || token.StartsWith( wxS( "DRC_WARNING" ) )
+                                                  || token.StartsWith( wxS( "DRC_ERROR" ) ) ) )
             {
                 // Only show user-defined warnings/errors during ERC/DRC
             }
@@ -433,7 +435,7 @@ wxString EnsureFileExtension( const wxString& aFilename, const wxString& aExtens
     // extension, such as "Schematic_1.1".
     if( newFilename.Lower().AfterLast( '.' ) != aExtension )
     {
-        if( newFilename.Last() != '.' )
+        if( !newFilename.EndsWith( '.' ) )
             newFilename.Append( '.' );
 
         newFilename.Append( aExtension );

common/design_block_info.cpp

@@ -37,6 +37,7 @@
 #include <utility>
 #include <wx/tokenzr.h>
 #include <kiface_base.h>
+#include <locale_io.h>
 
 DESIGN_BLOCK_INFO* DESIGN_BLOCK_LIST::GetDesignBlockInfo( const wxString& aLibNickname,
                                                           const wxString& aDesignBlockName )

common/design_block_info.h

@@ -42,6 +42,7 @@ class DESIGN_BLOCK_LIST_IMPL;
 class PROGRESS_REPORTER;
 class wxTopLevelWindow;
 class KIWAY;
+class LOCALE_IO;
 class wxTextFile;
 
 
@@ -113,7 +114,7 @@ protected:
     }
 
     /// lazily load stuff not filled in by constructor.  This may throw IO_ERRORS.
-    virtual void load(){};
+    virtual void load( const LOCALE_IO* locale = nullptr ) {};
 
 protected:
     DESIGN_BLOCK_LIST* m_owner;    ///< provides access to DESIGN_BLOCK_LIB_TABLE

common/design_block_info_impl.cpp

@@ -21,11 +21,9 @@
 #include <design_block_info_impl.h>
 
 #include <design_block.h>
-#include <design_block_info.h>
 #include <design_block_lib_table.h>
 #include <kiway.h>
 #include <locale_io.h>
-#include <lib_id.h>
 #include <progress_reporter.h>
 #include <string_utils.h>
 #include <thread_pool.h>
@@ -33,18 +31,18 @@
 
 #include <kiplatform/io.h>
 
-#include <wx/textfile.h>
 #include <wx/txtstrm.h>
 #include <wx/wfstream.h>
 
 
-void DESIGN_BLOCK_INFO_IMPL::load()
+void DESIGN_BLOCK_INFO_IMPL::load( const LOCALE_IO* locale )
 {
     DESIGN_BLOCK_LIB_TABLE* dbtable = m_owner->GetTable();
 
     wxASSERT( dbtable );
 
-    const DESIGN_BLOCK* design_block = dbtable->GetEnumeratedDesignBlock( m_nickname, m_dbname );
+    std::unique_ptr<const DESIGN_BLOCK> design_block( dbtable->GetEnumeratedDesignBlock( m_nickname, m_dbname,
+                                                                                         locale ) );
 
     if( design_block )
     {
@@ -128,7 +126,6 @@ bool DESIGN_BLOCK_LIST_IMPL::ReadDesignBlockFiles( DESIGN_BLOCK_LIB_TABLE* aTabl
             m_queue.push( nickname );
     }
 
-
     if( m_progress_reporter )
     {
         m_progress_reporter->SetMaxProgress( (int) m_queue.size() );
@@ -167,7 +164,7 @@ void DESIGN_BLOCK_LIST_IMPL::loadDesignBlocks()
     std::vector<std::future<size_t>> returns( num_elements );
 
     auto db_thread =
-            [ this, &queue_parsed ]() -> size_t
+            [ this, &queue_parsed, &toggle_locale ]() -> size_t
             {
                 wxString nickname;
 
@@ -179,7 +176,7 @@ void DESIGN_BLOCK_LIST_IMPL::loadDesignBlocks()
                 CatchErrors(
                         [&]()
                         {
-                            m_lib_table->DesignBlockEnumerate( dbnames, nickname, false );
+                            m_lib_table->DesignBlockEnumerate( dbnames, nickname, false, &toggle_locale );
                         } );
 
                 for( wxString dbname : dbnames )
@@ -187,7 +184,7 @@ void DESIGN_BLOCK_LIST_IMPL::loadDesignBlocks()
                     CatchErrors(
                             [&]()
                             {
-                                auto* dbinfo = new DESIGN_BLOCK_INFO_IMPL( this, nickname, dbname );
+                                auto* dbinfo = new DESIGN_BLOCK_INFO_IMPL( this, nickname, dbname, &toggle_locale );
                                 queue_parsed.move_push( std::unique_ptr<DESIGN_BLOCK_INFO>( dbinfo ) );
                             } );
 

common/design_block_info_impl.h

@@ -36,7 +36,7 @@ class KICOMMON_API DESIGN_BLOCK_INFO_IMPL : public DESIGN_BLOCK_INFO
 {
 public:
     DESIGN_BLOCK_INFO_IMPL( DESIGN_BLOCK_LIST* aOwner, const wxString& aNickname,
-                            const wxString& aDesignBlockName )
+                            const wxString& aDesignBlockName, const LOCALE_IO* aLocale )
     {
         m_nickname = aNickname;
         m_dbname = aDesignBlockName;
@@ -44,7 +44,7 @@ public:
 
         m_owner = aOwner;
         m_loaded = false;
-        load();
+        load( aLocale );
     }
 
     // A constructor for cached items
@@ -73,7 +73,7 @@ public:
     }
 
 protected:
-    virtual void load() override;
+    virtual void load( const LOCALE_IO* aLocale = nullptr ) override;
 };
 
 

common/design_block_lib_table.cpp

@@ -39,6 +39,7 @@
 
 #include <wx/dir.h>
 #include <wx/hash.h>
+#include <locale_io.h>
 
 #define OPT_SEP '|' ///< options separator character
 
@@ -315,13 +316,24 @@ long long DESIGN_BLOCK_LIB_TABLE::GenerateTimestamp( const wxString* aNickname )
 }
 
 
-void DESIGN_BLOCK_LIB_TABLE::DesignBlockEnumerate( wxArrayString&  aDesignBlockNames,
-                                                   const wxString& aNickname, bool aBestEfforts )
+void DESIGN_BLOCK_LIB_TABLE::DesignBlockEnumerate( wxArrayString&  aDesignBlockNames, const wxString& aNickname,
+                                                   bool aBestEfforts, const LOCALE_IO* aLocale )
 {
     const DESIGN_BLOCK_LIB_TABLE_ROW* row = FindRow( aNickname, true );
     wxASSERT( row->plugin );
-    row->plugin->DesignBlockEnumerate( aDesignBlockNames, row->GetFullURI( true ), aBestEfforts,
-                                       row->GetProperties() );
+
+    if( !aLocale )
+    {
+        LOCALE_IO toggle_locale;
+
+        row->plugin->DesignBlockEnumerate( aDesignBlockNames, row->GetFullURI( true ), aBestEfforts,
+                                           row->GetProperties() );
+    }
+    else
+    {
+        row->plugin->DesignBlockEnumerate( aDesignBlockNames, row->GetFullURI( true ), aBestEfforts,
+                                           row->GetProperties() );
+    }
 }
 
 
@@ -372,19 +384,34 @@ static void setLibNickname( DESIGN_BLOCK* aModule, const wxString& aNickname,
 
 const DESIGN_BLOCK*
 DESIGN_BLOCK_LIB_TABLE::GetEnumeratedDesignBlock( const wxString& aNickname,
-                                                  const wxString& aDesignBlockName )
+                                                  const wxString& aDesignBlockName,
+                                                  const LOCALE_IO* aLocale )
 {
     const DESIGN_BLOCK_LIB_TABLE_ROW* row = FindRow( aNickname, true );
     wxASSERT( row->plugin );
 
-    return row->plugin->GetEnumeratedDesignBlock( row->GetFullURI( true ), aDesignBlockName,
-                                                  row->GetProperties() );
+    if( !aLocale )
+    {
+        LOCALE_IO toggle_locale;
+
+        return row->plugin->GetEnumeratedDesignBlock( row->GetFullURI( true ), aDesignBlockName,
+                                                      row->GetProperties() );
+    }
+    else
+    {
+        return row->plugin->GetEnumeratedDesignBlock( row->GetFullURI( true ), aDesignBlockName,
+                                                      row->GetProperties() );
+    }
 }
 
 
 bool DESIGN_BLOCK_LIB_TABLE::DesignBlockExists( const wxString& aNickname,
                                                 const wxString& aDesignBlockName )
 {
+    // NOT THREAD-SAFE!  LOCALE_IO is global!
+
+    LOCALE_IO toggle_locale;
+
     try
     {
         const DESIGN_BLOCK_LIB_TABLE_ROW* row = FindRow( aNickname, true );
@@ -404,6 +431,10 @@ DESIGN_BLOCK* DESIGN_BLOCK_LIB_TABLE::DesignBlockLoad( const wxString& aNickname
                                                        const wxString& aDesignBlockName,
                                                        bool            aKeepUUID )
 {
+    // NOT THREAD-SAFE!  LOCALE_IO is global!
+
+    LOCALE_IO toggle_locale;
+
     const DESIGN_BLOCK_LIB_TABLE_ROW* row = FindRow( aNickname, true );
     wxASSERT( row->plugin );
 
@@ -420,6 +451,10 @@ DESIGN_BLOCK_LIB_TABLE::SAVE_T
 DESIGN_BLOCK_LIB_TABLE::DesignBlockSave( const wxString&     aNickname,
                                          const DESIGN_BLOCK* aDesignBlock, bool aOverwrite )
 {
+    // NOT THREAD-SAFE!  LOCALE_IO is global!
+
+    LOCALE_IO toggle_locale;
+
     const DESIGN_BLOCK_LIB_TABLE_ROW* row = FindRow( aNickname, true );
     wxASSERT( row->plugin );
 
@@ -433,7 +468,7 @@ DESIGN_BLOCK_LIB_TABLE::DesignBlockSave( const wxString&     aNickname,
         std::unique_ptr<DESIGN_BLOCK> design_block( row->plugin->DesignBlockLoad(
                 row->GetFullURI( true ), DesignBlockname, row->GetProperties() ) );
 
-        if( design_block.get() )
+        if( design_block )
             return SAVE_SKIPPED;
     }
 
@@ -537,13 +572,11 @@ public:
         // consider a directory to be a lib if it's name ends with the design block lib dir
         // extension it is under $KICADn_3RD_PARTY/design_blocks/<pkgid>/ i.e. has nested
         // level of at least +3.
-        if( dirPath.EndsWith( wxString::Format( wxS( ".%s" ),
-                                                FILEEXT::KiCadDesignBlockLibPathExtension ) )
+        if( dirPath.EndsWith( wxString::Format( wxS( ".%s" ), FILEEXT::KiCadDesignBlockLibPathExtension ) )
             && dir.GetDirCount() >= m_prefix_dir_count + 3 )
         {
             wxString versionedPath;
-            versionedPath.Printf( wxS( "${%s}" ),
-                                  ENV_VAR::GetVersionedEnvVarName( wxS( "3RD_PARTY" ) ) );
+            versionedPath.Printf( wxS( "${%s}" ), ENV_VAR::GetVersionedEnvVarName( wxS( "3RD_PARTY" ) ) );
 
             wxArrayString parts = dir.GetDirs();
             parts.RemoveAt( 0, m_prefix_dir_count );
@@ -572,9 +605,9 @@ public:
                     } while( m_lib_table.HasLibrary( nickname ) );
                 }
 
-                m_lib_table.InsertRow( new DESIGN_BLOCK_LIB_TABLE_ROW(
-                        nickname, libPath, wxT( "KiCad" ), wxEmptyString,
-                        _( "Added by Plugin and Content Manager" ) ) );
+                m_lib_table.InsertRow( new DESIGN_BLOCK_LIB_TABLE_ROW( nickname, libPath, wxT( "KiCad" ),
+                                                                       wxEmptyString,
+                                                                       _( "Added by Plugin and Content Manager" ) ) );
             }
         }
 
@@ -611,8 +644,7 @@ bool DESIGN_BLOCK_LIB_TABLE::LoadGlobalTable( DESIGN_BLOCK_LIB_TABLE& aTable )
         SystemDirsAppend( &ss );
 
         const ENV_VAR_MAP&      envVars = Pgm().GetLocalEnvVariables();
-        std::optional<wxString> v = ENV_VAR::GetVersionedEnvVarValue( envVars,
-                                                                      wxT( "TEMPLATE_DIR" ) );
+        std::optional<wxString> v = ENV_VAR::GetVersionedEnvVarValue( envVars, wxT( "TEMPLATE_DIR" ) );
 
         if( v && !v->IsEmpty() )
             ss.AddPaths( *v, 0 );
@@ -649,8 +681,7 @@ bool DESIGN_BLOCK_LIB_TABLE::LoadGlobalTable( DESIGN_BLOCK_LIB_TABLE& aTable )
 
         if( d.DirExists() )
         {
-            PCM_DESIGN_BLOCK_LIB_TRAVERSER traverser( packagesPath, aTable,
-                                                      settings->m_PcmLibPrefix );
+            PCM_DESIGN_BLOCK_LIB_TRAVERSER traverser( packagesPath, aTable, settings->m_PcmLibPrefix );
             wxDir                          dir( d.GetPath() );
 
             dir.Traverse( traverser );

common/dialog_shim.cpp

@@ -60,7 +60,9 @@ DIALOG_SHIM::DIALOG_SHIM( wxWindow* aParent, wxWindowID id, const wxString& titl
         m_qmodal_loop( nullptr ),
         m_qmodal_showing( false ),
         m_qmodal_parent_disabler( nullptr ),
-        m_parentFrame( nullptr )
+        m_parentFrame( nullptr ),
+        m_userPositioned( false ),
+        m_userResized( false )
 {
     KIWAY_HOLDER* kiwayHolder = nullptr;
     m_initialSize = size;
@@ -101,6 +103,8 @@ DIALOG_SHIM::DIALOG_SHIM( wxWindow* aParent, wxWindowID id, const wxString& titl
 
     Bind( wxEVT_CLOSE_WINDOW, &DIALOG_SHIM::OnCloseWindow, this );
     Bind( wxEVT_BUTTON, &DIALOG_SHIM::OnButton, this );
+    Bind( wxEVT_SIZE, &DIALOG_SHIM::OnSize, this );
+    Bind( wxEVT_MOVE, &DIALOG_SHIM::OnMove, this );
 
 #ifdef __WINDOWS__
     // On Windows, the app top windows can be brought to the foreground (at least temporarily)
@@ -121,29 +125,32 @@ DIALOG_SHIM::~DIALOG_SHIM()
     Unbind( wxEVT_CLOSE_WINDOW, &DIALOG_SHIM::OnCloseWindow, this );
     Unbind( wxEVT_BUTTON, &DIALOG_SHIM::OnButton, this );
     Unbind( wxEVT_PAINT, &DIALOG_SHIM::OnPaint, this );
+    Unbind( wxEVT_SIZE, &DIALOG_SHIM::OnSize, this );
+    Unbind( wxEVT_MOVE, &DIALOG_SHIM::OnMove, this );
 
-    std::function<void( wxWindowList& )> disconnectFocusHandlers = [&]( wxWindowList& children )
-    {
-        for( wxWindow* child : children )
-        {
-            if( wxTextCtrl* textCtrl = dynamic_cast<wxTextCtrl*>( child ) )
+    std::function<void( wxWindowList& )> disconnectFocusHandlers =
+            [&]( wxWindowList& children )
             {
-                textCtrl->Disconnect( wxEVT_SET_FOCUS,
-                                      wxFocusEventHandler( DIALOG_SHIM::onChildSetFocus ),
-                                      nullptr, this );
-            }
-            else if( wxStyledTextCtrl* scintilla = dynamic_cast<wxStyledTextCtrl*>( child ) )
-            {
-                scintilla->Disconnect( wxEVT_SET_FOCUS,
-                                       wxFocusEventHandler( DIALOG_SHIM::onChildSetFocus ),
-                                       nullptr, this );
-            }
-            else
-            {
-                disconnectFocusHandlers( child->GetChildren() );
-            }
-        }
-    };
+                for( wxWindow* child : children )
+                {
+                    if( wxTextCtrl* textCtrl = dynamic_cast<wxTextCtrl*>( child ) )
+                    {
+                        textCtrl->Disconnect( wxEVT_SET_FOCUS,
+                                              wxFocusEventHandler( DIALOG_SHIM::onChildSetFocus ),
+                                              nullptr, this );
+                    }
+                    else if( wxStyledTextCtrl* scintilla = dynamic_cast<wxStyledTextCtrl*>( child ) )
+                    {
+                        scintilla->Disconnect( wxEVT_SET_FOCUS,
+                                               wxFocusEventHandler( DIALOG_SHIM::onChildSetFocus ),
+                                               nullptr, this );
+                    }
+                    else
+                    {
+                        disconnectFocusHandlers( child->GetChildren() );
+                    }
+                }
+            };
 
     disconnectFocusHandlers( GetChildren() );
 
@@ -287,11 +294,24 @@ bool DIALOG_SHIM::Show( bool show )
         // shown on another display)
         if( wxDisplay::GetFromWindow( this ) == wxNOT_FOUND )
             Centre();
+
+        m_userPositioned = false;
+        m_userResized = false;
     }
     else
     {
-        // Save the dialog's position & size before hiding, using classname as key
-        class_map[ hash_key ] = wxRect( wxDialog::GetPosition(), wxDialog::GetSize() );
+        // Save the dialog's position & size before hiding, using classname as key.
+        // Be careful of rounding errors: only re-save if the user modified the value or
+        // it has not yet been saved.
+        wxRect rect = class_map[ hash_key ];
+
+        if( m_userPositioned || rect.GetPosition() == wxPoint() )
+            rect.SetPosition( wxDialog::GetPosition() );
+
+        if( m_userResized || rect.GetSize() == wxSize() )
+            rect.SetSize( wxDialog::GetSize() );
+
+        class_map[ hash_key ] = rect;
 
 #ifdef __WXMAC__
         if ( m_eventLoop )
@@ -333,6 +353,20 @@ void DIALOG_SHIM::resetSize()
 }
 
 
+void DIALOG_SHIM::OnSize( wxSizeEvent& aEvent )
+{
+    m_userResized = true;
+    aEvent.Skip();
+}
+
+
+void DIALOG_SHIM::OnMove( wxMoveEvent& aEvent )
+{
+    m_userPositioned = true;
+    aEvent.Skip();
+}
+
+
 bool DIALOG_SHIM::Enable( bool enable )
 {
     // so we can do logging of this state change:
@@ -565,8 +599,6 @@ void DIALOG_SHIM::EndQuasiModal( int retCode )
             m_qmodal_loop->Exit( 0 );
         else
             m_qmodal_loop->ScheduleExit( 0 );
-
-        m_qmodal_loop = nullptr;
     }
 
     delete m_qmodal_parent_disabler;
@@ -660,6 +692,13 @@ void DIALOG_SHIM::OnCharHook( wxKeyEvent& aEvt )
 
         if( wxTextCtrl* textCtrl = dynamic_cast<wxTextCtrl*>( eventSource ) )
         {
+            // If the text control is not multi-line, we want to close the dialog
+            if( !textCtrl->IsMultiLine() )
+            {
+                wxPostEvent( this, wxCommandEvent( wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK ) );
+                return;
+            }
+
 #if defined( __WXMAC__ ) || defined( __WXMSW__ )
             wxString eol = "\r\n";
 #else

common/dialogs/dialog_configure_paths.cpp

@@ -255,6 +255,9 @@ void DIALOG_CONFIGURE_PATHS::OnGridCellChanging( wxGridEvent& event )
     int      col = event.GetCol();
     wxString text = event.GetString();
 
+    text.Trim( true ).Trim( false ); // Trim from both sides
+    grid->SetCellValue( row, col, text ); // Update the grid with trimmed value
+
     if( text.IsEmpty() )
     {
         if( grid == m_EnvVars )

common/dialogs/dialog_locked_items_query.cpp

@@ -60,11 +60,17 @@ void DIALOG_LOCKED_ITEMS_QUERY::onOverrideLocks( wxCommandEvent& event )
 
 int DIALOG_LOCKED_ITEMS_QUERY::ShowModal()
 {
+    static int doNotShowValue = wxID_ANY;
+
+    if( doNotShowValue != wxID_ANY && m_lockingOptions.m_sessionSkipPrompts )
+        return doNotShowValue;
+
     int ret = DIALOG_SHIM::ShowModal();
 
     // Has the user asked not to show the dialog again this session?
     if( m_doNotShowBtn->IsChecked() && ret != wxID_CANCEL )
     {
+        doNotShowValue = ret;
         m_lockingOptions.m_sessionSkipPrompts = true;
     }
 

common/dialogs/dialog_page_settings.cpp

@@ -474,24 +474,17 @@ bool DIALOG_PAGES_SETTINGS::SavePageSettings()
     wxString msg;
     wxString fileName = GetWksFileName();
 
-    if( fileName != BASE_SCREEN::m_DrawingSheetFileName )
+    wxString fullFileName = m_filenameResolver->ResolvePath( fileName, m_projectPath, { m_embeddedFiles } );
+
+    BASE_SCREEN::m_DrawingSheetFileName = fileName;
+
+    if( !DS_DATA_MODEL::GetTheInstance().LoadDrawingSheet( fullFileName, &msg ) )
     {
-        wxString fullFileName = m_filenameResolver->ResolvePath( fileName, m_projectPath,
-                                                                 { m_embeddedFiles } );
-
-        BASE_SCREEN::m_DrawingSheetFileName = fileName;
-
-        if( !DS_DATA_MODEL::GetTheInstance().LoadDrawingSheet( fullFileName, &msg ) )
-        {
-            DisplayErrorMessage( this,
-                                 wxString::Format( _( "Error loading drawing sheet '%s'." ),
-                                                   fullFileName ),
-                                 msg );
-        }
-
-        m_localPrjConfigChanged = true;
+        DisplayErrorMessage( this, wxString::Format( _( "Error loading drawing sheet '%s'." ), fullFileName ), msg );
     }
 
+    m_localPrjConfigChanged = true;
+
     int idx = std::max( m_paperSizeComboBox->GetSelection(), 0 );
     const wxString paperType = m_pageFmt[idx];
 
@@ -823,7 +816,7 @@ void DIALOG_PAGES_SETTINGS::OnWksFileSelection( wxCommandEvent& event )
     if( m_embeddedFiles && customize.GetEmbed() )
     {
         fn.Assign( fileName );
-        EMBEDDED_FILES::EMBEDDED_FILE* result = m_embeddedFiles->AddFile( fn, false );
+        EMBEDDED_FILES::EMBEDDED_FILE* result = m_embeddedFiles->AddFile( fn, true );
         shortFileName = result->GetLink();
         fileName = m_embeddedFiles->GetTemporaryFileName( result->name ).GetFullPath();
     }

common/dialogs/git/panel_git_repos_base.cpp

@@ -17,7 +17,7 @@ PANEL_GIT_REPOS_BASE::PANEL_GIT_REPOS_BASE( wxWindow* parent, wxWindowID id, con
 	wxBoxSizer* bLeftSizer;
 	bLeftSizer = new wxBoxSizer( wxVERTICAL );
 
-	m_enableGit = new wxCheckBox( this, wxID_ANY, _("Enable Git Tracking"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_enableGit = new wxCheckBox( this, wxID_ANY, _("Enable Git tracking"), wxDefaultPosition, wxDefaultSize, 0 );
 	bLeftSizer->Add( m_enableGit, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 13 );
 
 	m_gitSizer = new wxBoxSizer( wxVERTICAL );

common/dialogs/git/panel_git_repositories_base.fbp

@@ -103,7 +103,7 @@
                 <property name="gripper">0</property>
                 <property name="hidden">0</property>
                 <property name="id">wxID_ANY</property>
-                <property name="label">Enable Git Tracking</property>
+                <property name="label">Enable Git tracking</property>
                 <property name="max_size"></property>
                 <property name="maximize_button">0</property>
                 <property name="maximum_size"></property>

common/dialogs/panel_color_settings.cpp

@@ -92,14 +92,18 @@ bool PANEL_COLOR_SETTINGS::Show( bool show )
     if( show )
     {
         // In case changes have been made to the current theme in another panel:
-        int idx = m_cbTheme->GetSelection();
-        COLOR_SETTINGS* settings = static_cast<COLOR_SETTINGS*>( m_cbTheme->GetClientData( idx ) );
+        int themeSel = m_cbTheme->GetSelection();
 
-        if( settings )
-            *m_currentSettings = *settings;
+        if( themeSel >= 0 )
+        {
+            COLOR_SETTINGS* settings = static_cast<COLOR_SETTINGS*>( m_cbTheme->GetClientData( themeSel ) );
 
-        onNewThemeSelected();
-        updateSwatches();
+            if( settings )
+                *m_currentSettings = *settings;
+
+            onNewThemeSelected();
+            updateSwatches();
+        }
     }
 
     return PANEL_COLOR_SETTINGS_BASE::Show( show );
@@ -282,49 +286,52 @@ void PANEL_COLOR_SETTINGS::createSwatch( int aLayer, const wxString& aName )
 
 void PANEL_COLOR_SETTINGS::ShowColorContextMenu( wxMouseEvent& aEvent, int aLayer )
 {
-    auto selected =
-            static_cast<COLOR_SETTINGS*>( m_cbTheme->GetClientData( m_cbTheme->GetSelection() ) );
+    int themeSel = m_cbTheme->GetSelection();
 
-    wxCHECK_RET( selected, wxT( "Invalid color theme selected" ) );
+    if( themeSel >= 0 )
+    {
+        COLOR_SETTINGS* selected = static_cast<COLOR_SETTINGS*>( m_cbTheme->GetClientData( themeSel ) );
 
-    COLOR4D current  = m_currentSettings->GetColor( aLayer );
-    COLOR4D saved    = selected->GetColor( aLayer );
-    bool    readOnly = m_currentSettings->IsReadOnly();
+        wxCHECK_RET( selected, wxT( "Invalid color theme selected" ) );
 
-    wxMenu menu;
+        COLOR4D current  = m_currentSettings->GetColor( aLayer );
+        COLOR4D saved    = selected->GetColor( aLayer );
+        bool    readOnly = m_currentSettings->IsReadOnly();
 
-    KIUI::AddMenuItem( &menu, ID_COPY, _( "Copy color" ), KiBitmap( BITMAPS::copy ) );
+        wxMenu menu;
 
-    if( !readOnly && m_copied != COLOR4D::UNSPECIFIED )
-        KIUI::AddMenuItem( &menu, ID_PASTE, _( "Paste color" ), KiBitmap( BITMAPS::paste ) );
+        KIUI::AddMenuItem( &menu, ID_COPY, _( "Copy color" ), KiBitmap( BITMAPS::copy ) );
 
-    if( !readOnly && current != saved )
-        KIUI::AddMenuItem( &menu, ID_REVERT, _( "Revert to saved color" ),
-                           KiBitmap( BITMAPS::undo ) );
+        if( !readOnly && m_copied != COLOR4D::UNSPECIFIED )
+            KIUI::AddMenuItem( &menu, ID_PASTE, _( "Paste color" ), KiBitmap( BITMAPS::paste ) );
 
-    menu.Bind( wxEVT_COMMAND_MENU_SELECTED,
-            [&]( wxCommandEvent& aCmd )
-            {
-                switch( aCmd.GetId() )
+        if( !readOnly && current != saved )
+            KIUI::AddMenuItem( &menu, ID_REVERT, _( "Revert to saved color" ), KiBitmap( BITMAPS::undo ) );
+
+        menu.Bind( wxEVT_COMMAND_MENU_SELECTED,
+                [&]( wxCommandEvent& aCmd )
                 {
-                case ID_COPY:
-                    m_copied = current;
-                    break;
+                    switch( aCmd.GetId() )
+                    {
+                    case ID_COPY:
+                        m_copied = current;
+                        break;
 
-                case ID_PASTE:
-                    updateColor( aLayer, m_copied );
-                    break;
+                    case ID_PASTE:
+                        updateColor( aLayer, m_copied );
+                        break;
 
-                case ID_REVERT:
-                    updateColor( aLayer, saved );
-                    break;
+                    case ID_REVERT:
+                        updateColor( aLayer, saved );
+                        break;
 
-                default:
-                    aCmd.Skip();
-                }
-            } );
+                    default:
+                        aCmd.Skip();
+                    }
+                } );
 
-    PopupMenu( &menu );
+        PopupMenu( &menu );
+    }
 }
 
 

common/dialogs/panel_design_block_lib_table.cpp

@@ -461,16 +461,15 @@ PANEL_DESIGN_BLOCK_LIB_TABLE::PANEL_DESIGN_BLOCK_LIB_TABLE( DIALOG_EDIT_LIBRARY_
         }
         else if( !desc.m_IsFile && !desc.m_ExtensionsInDir.empty() )
         {
-            wxString midPart = wxString::Format( _( "folder with %s files" ),
-                                                 joinExts( desc.m_ExtensionsInDir ) );
+            wxString midPart = wxString::Format( _( "folder with %s files" ), joinExts( desc.m_ExtensionsInDir ) );
 
             entryStr << wxString::Format( wxS( " (%s)" ), midPart );
         }
 
         browseMenu->Append( type, entryStr );
 
-        browseMenu->Bind( wxEVT_COMMAND_MENU_SELECTED,
-                          &PANEL_DESIGN_BLOCK_LIB_TABLE::browseLibrariesHandler, this, type );
+        browseMenu->Bind( wxEVT_COMMAND_MENU_SELECTED, &PANEL_DESIGN_BLOCK_LIB_TABLE::browseLibrariesHandler,
+                          this, type );
     }
 
     Layout();
@@ -487,11 +486,11 @@ PANEL_DESIGN_BLOCK_LIB_TABLE::~PANEL_DESIGN_BLOCK_LIB_TABLE()
 
     for( auto& [type, desc] : m_supportedDesignBlockFiles )
     {
-        browseMenu->Unbind( wxEVT_COMMAND_MENU_SELECTED,
-                            &PANEL_DESIGN_BLOCK_LIB_TABLE::browseLibrariesHandler, this, type );
+        browseMenu->Unbind( wxEVT_COMMAND_MENU_SELECTED, &PANEL_DESIGN_BLOCK_LIB_TABLE::browseLibrariesHandler,
+                            this, type );
     }
-    m_browseButton->Unbind( wxEVT_BUTTON, &PANEL_DESIGN_BLOCK_LIB_TABLE::browseLibrariesHandler,
-                            this );
+
+    m_browseButton->Unbind( wxEVT_BUTTON, &PANEL_DESIGN_BLOCK_LIB_TABLE::browseLibrariesHandler, this );
 
     // Delete the GRID_TRICKS.
     // Any additional event handlers should be popped before the window is deleted.
@@ -550,9 +549,8 @@ bool PANEL_DESIGN_BLOCK_LIB_TABLE::verifyTables()
                                             wxYES_NO | wxCENTER | wxICON_QUESTION | wxYES_DEFAULT );
                 badCellDlg.SetExtendedMessage( _( "Empty cells will result in all rows that are "
                                                   "invalid to be removed from the table." ) );
-                badCellDlg.SetYesNoLabels(
-                        wxMessageDialog::ButtonLabel( _( "Remove Invalid Cells" ) ),
-                        wxMessageDialog::ButtonLabel( _( "Cancel Table Update" ) ) );
+                badCellDlg.SetYesNoLabels( wxMessageDialog::ButtonLabel( _( "Remove Invalid Cells" ) ),
+                                           wxMessageDialog::ButtonLabel( _( "Cancel Table Update" ) ) );
 
                 if( badCellDlg.ShowModal() == wxID_NO )
                     return false;
@@ -561,19 +559,19 @@ bool PANEL_DESIGN_BLOCK_LIB_TABLE::verifyTables()
                 // This also updates the UI which could be slow, but there should only be a few
                 // rows to delete, unless the user fell asleep on the Add Row
                 // button.
+                model->GetView()->ClearSelection();
                 model->DeleteRows( r, 1 );
             }
             else if( ( illegalCh = LIB_ID::FindIllegalLibraryNameChar( nick ) ) )
             {
-                msg = wxString::Format( _( "Illegal character '%c' in nickname '%s'." ), illegalCh,
-                                        nick );
+                msg = wxString::Format( _( "Illegal character '%c' in nickname '%s'." ), illegalCh, nick );
 
                 // show the tabbed panel holding the grid we have flunked:
                 if( model != cur_model() )
                     m_notebook->SetSelection( model == global_model() ? 0 : 1 );
 
-                m_cur_grid->MakeCellVisible( r, 0 );
-                m_cur_grid->SetGridCursor( r, 1 );
+                model->GetView()->MakeCellVisible( r, 0 );
+                model->GetView()->SetGridCursor( r, 1 );
 
                 wxWindow* topLevelParent = wxGetTopLevelParent( this );
 
@@ -611,8 +609,7 @@ bool PANEL_DESIGN_BLOCK_LIB_TABLE::verifyTables()
 
                 if( nick1 == nick2 )
                 {
-                    msg = wxString::Format( _( "Multiple libraries cannot share the same "
-                                               "nickname ('%s')." ),
+                    msg = wxString::Format( _( "Multiple libraries cannot share the same nickname ('%s')." ),
                                             nick1 );
 
                     // show the tabbed panel holding the grid we have flunked:

common/dialogs/panel_embedded_files.cpp

@@ -31,12 +31,12 @@
 
 #include <wx/clipbrd.h>
 #include <wx/dirdlg.h>
-#include <wx/ffile.h>
 #include <wx/filedlg.h>
 #include <wx/filename.h>
 #include <wx/log.h>
 #include <wx/menu.h>
 #include <wx/wfstream.h>
+#include <wx/wupdlock.h>
 
 /* ---------- GRID_TRICKS for embedded files grid ---------- */
 
@@ -209,7 +209,8 @@ bool PANEL_EMBEDDED_FILES::TransferDataFromWindow()
 
 void PANEL_EMBEDDED_FILES::onFontEmbedClick( wxCommandEvent& event )
 {
-    Freeze();
+    wxWindowUpdateLocker updateLock( this );
+
     int row_pos = m_files_grid->GetGridCursorRow();
     int col_pos = m_files_grid->GetGridCursorCol();
     wxString row_name;
@@ -269,8 +270,6 @@ void PANEL_EMBEDDED_FILES::onFontEmbedClick( wxCommandEvent& event )
             }
         }
     }
-
-    Thaw();
 }
 
 

common/dialogs/panel_setup_netclasses.cpp

@@ -25,7 +25,7 @@
 
 #include <algorithm>
 #include <limits>
-
+#include <wx/wupdlock.h>
 #include <pgm_base.h>
 #include <eda_draw_frame.h>
 #include <bitmaps.h>
@@ -116,7 +116,8 @@ PANEL_SETUP_NETCLASSES::PANEL_SETUP_NETCLASSES( wxWindow* aParentWindow, EDA_DRA
     m_membershipPane->SetBorders( true, false, false, false );
 
     // Prevent Size events from firing before we are ready
-    Freeze();
+    wxWindowUpdateLocker updateLock( this );
+
     m_netclassGrid->BeginBatch();
     m_netclassGrid->SetUseNativeColLabels();
     m_assignmentGrid->BeginBatch();
@@ -243,7 +244,6 @@ PANEL_SETUP_NETCLASSES::PANEL_SETUP_NETCLASSES( wxWindow* aParentWindow, EDA_DRA
 
     m_netclassGrid->EndBatch();
     m_assignmentGrid->EndBatch();
-    Thaw();
 
     Bind( wxEVT_IDLE,
           [this]( wxIdleEvent& aEvent )

common/drawing_sheet/drawing_sheet_parser.cpp

@@ -51,9 +51,6 @@ public:
     void Parse( DS_DATA_MODEL* aLayout );
 
 private:
-    int m_requiredVersion;
-    wxString m_generatorVersion;
-
     /**
      * Parse the data specified at the very beginning of the file, like version and the
      * application used to create this file.
@@ -113,6 +110,10 @@ private:
     void parseCoordinate( POINT_COORD& aCoord);
     void readOption( DS_DATA_ITEM * aItem );
     void readPngdata( DS_DATA_ITEM_BITMAP * aItem );
+
+private:
+    int      m_requiredVersion;
+    wxString m_generatorVersion;
 };
 
 

common/drawing_sheet/ds_data_item.cpp

@@ -701,7 +701,7 @@ void DS_DATA_ITEM_TEXT::SetConstrainedTextSize()
         dummy.SetVertJustify( m_Vjustify );
         dummy.SetTextAngle( EDA_ANGLE( m_Orient, DEGREES_T ) );
 
-        BOX2I    rect = dummy.GetTextBox();
+        BOX2I    rect = dummy.GetTextBox( nullptr );
         VECTOR2D size;
         size.x = KiROUND( (int) rect.GetWidth() / FSCALE );
         size.y = KiROUND( (int) rect.GetHeight() / FSCALE );

common/drawing_sheet/ds_draw_item.cpp

@@ -221,7 +221,7 @@ const BOX2I DS_DRAW_ITEM_TEXT::GetApproxBBox()
 
 const BOX2I DS_DRAW_ITEM_TEXT::GetBoundingBox() const
 {
-    return EDA_TEXT::GetTextBox();
+    return EDA_TEXT::GetTextBox( nullptr );
 }
 
 

common/dsnlexer.cpp

@@ -46,62 +46,70 @@ void DSNLEXER::init()
     specctraMode = false;
     space_in_quoted_tokens = false;
     commentsAreTokens = false;
-
+    SetKnowsBar( true );    // default since version 20240706
     curOffset = 0;
 }
 
 
-DSNLEXER::DSNLEXER( const KEYWORD* aKeywordTable, unsigned aKeywordCount,
-                    const KEYWORD_MAP* aKeywordMap,
+DSNLEXER::DSNLEXER( const KEYWORD* aKeywordTable, unsigned aKeywordCount, const KEYWORD_MAP* aKeywordMap,
                     FILE* aFile, const wxString& aFilename ) :
     iOwnReaders( true ),
     start( nullptr ),
     next( nullptr ),
     limit( nullptr ),
     reader( nullptr ),
+    specctraMode( false ),
+    m_knowsBar( false ),
+    space_in_quoted_tokens( false ),
+    commentsAreTokens( false ),
     keywords( aKeywordTable ),
     keywordCount( aKeywordCount ),
     keywordsLookup( aKeywordMap )
 {
-    FILE_LINE_READER* fileReader = new FILE_LINE_READER( aFile, aFilename );
-    PushReader( fileReader );
+    PushReader( new FILE_LINE_READER( aFile, aFilename ) );
     init();
 }
 
 
-DSNLEXER::DSNLEXER( const KEYWORD* aKeywordTable, unsigned aKeywordCount,
-                    const KEYWORD_MAP* aKeywordMap,
+DSNLEXER::DSNLEXER( const KEYWORD* aKeywordTable, unsigned aKeywordCount, const KEYWORD_MAP* aKeywordMap,
                     const std::string& aClipboardTxt, const wxString& aSource ) :
-    iOwnReaders( true ),
-    start( nullptr ),
-    next( nullptr ),
-    limit( nullptr ),
-    reader( nullptr ),
-    keywords( aKeywordTable ),
-    keywordCount( aKeywordCount ),
-    keywordsLookup( aKeywordMap )
+        iOwnReaders( true ),
+        start( nullptr ),
+        next( nullptr ),
+        limit( nullptr ),
+        reader( nullptr ),
+        specctraMode( false ),
+        m_knowsBar( false ),
+        space_in_quoted_tokens( false ),
+        commentsAreTokens( false ),
+        keywords( aKeywordTable ),
+        keywordCount( aKeywordCount ),
+        keywordsLookup( aKeywordMap )
 {
-    STRING_LINE_READER* stringReader = new STRING_LINE_READER( aClipboardTxt, aSource.IsEmpty() ?
-                                        wxString( FMT_CLIPBOARD ) : aSource );
-    PushReader( stringReader );
+    PushReader( new STRING_LINE_READER( aClipboardTxt, aSource.IsEmpty() ? wxString( FMT_CLIPBOARD )
+                                                                         : aSource ) );
     init();
 }
 
 
-DSNLEXER::DSNLEXER( const KEYWORD* aKeywordTable, unsigned aKeywordCount,
-                    const KEYWORD_MAP* aKeywordMap,
+DSNLEXER::DSNLEXER( const KEYWORD* aKeywordTable, unsigned aKeywordCount, const KEYWORD_MAP* aKeywordMap,
                     LINE_READER* aLineReader ) :
-    iOwnReaders( false ),
-    start( nullptr ),
-    next( nullptr ),
-    limit( nullptr ),
-    reader( nullptr ),
-    keywords( aKeywordTable ),
-    keywordCount( aKeywordCount ),
-    keywordsLookup( aKeywordMap )
+        iOwnReaders( false ),
+        start( nullptr ),
+        next( nullptr ),
+        limit( nullptr ),
+        reader( nullptr ),
+        specctraMode( false ),
+        m_knowsBar( false ),
+        space_in_quoted_tokens( false ),
+        commentsAreTokens( false ),
+        keywords( aKeywordTable ),
+        keywordCount( aKeywordCount ),
+        keywordsLookup( aKeywordMap )
 {
     if( aLineReader )
         PushReader( aLineReader );
+
     init();
 }
 
@@ -109,18 +117,21 @@ DSNLEXER::DSNLEXER( const KEYWORD* aKeywordTable, unsigned aKeywordCount,
 static const KEYWORD empty_keywords[1] = {};
 
 DSNLEXER::DSNLEXER( const std::string& aSExpression, const wxString& aSource ) :
-    iOwnReaders( true ),
-    start( nullptr ),
-    next( nullptr ),
-    limit( nullptr ),
-    reader( nullptr ),
-    keywords( empty_keywords ),
-    keywordCount( 0 ),
-    keywordsLookup( nullptr )
+        iOwnReaders( true ),
+        start( nullptr ),
+        next( nullptr ),
+        limit( nullptr ),
+        reader( nullptr ),
+        specctraMode( false ),
+        m_knowsBar( false ),
+        space_in_quoted_tokens( false ),
+        commentsAreTokens( false ),
+        keywords( empty_keywords ),
+        keywordCount( 0 ),
+        keywordsLookup( nullptr )
 {
-    STRING_LINE_READER* stringReader = new STRING_LINE_READER( aSExpression, aSource.IsEmpty() ?
-                                        wxString( FMT_CLIPBOARD ) : aSource );
-    PushReader( stringReader );
+    PushReader( new STRING_LINE_READER( aSExpression, aSource.IsEmpty() ? wxString( FMT_CLIPBOARD )
+                                                                        : aSource ) );
     init();
 }
 
@@ -139,6 +150,7 @@ DSNLEXER::~DSNLEXER()
 void DSNLEXER::SetSpecctraMode( bool aMode )
 {
     specctraMode = aMode;
+
     if( aMode )
     {
         // specctra mode defaults, some of which can still be changed in this mode.
@@ -292,13 +304,9 @@ const char* DSNLEXER::GetTokenText( int aTok ) const
     const char* ret;
 
     if( aTok < 0 )
-    {
         return Syntax( aTok );
-    }
     else if( (unsigned) aTok < keywordCount )
-    {
         ret = keywords[aTok].name;
-    }
     else
         ret = "token too big";
 
@@ -325,6 +333,12 @@ bool DSNLEXER::IsSymbol( int aTok )
 }
 
 
+bool DSNLEXER::IsNumber( int aTok )
+{
+    return aTok == DSN_NUMBER;
+}
+
+
 void DSNLEXER::Expecting( int aTok ) const
 {
     wxString errText = wxString::Format(
@@ -368,6 +382,7 @@ void DSNLEXER::Unexpected( const char* text ) const
 void DSNLEXER::NeedLEFT()
 {
     int tok = NextTok();
+
     if( tok != DSN_LEFT )
         Expecting( DSN_LEFT );
 }
@@ -406,7 +421,7 @@ int DSNLEXER::NeedSYMBOLorNUMBER()
 {
     int  tok = NextTok();
 
-    if( !IsSymbol( tok ) && tok!=DSN_NUMBER )
+    if( !IsSymbol( tok ) && !IsNumber( tok ) )
         Expecting( "a symbol or number" );
 
     return tok;
@@ -417,7 +432,7 @@ int DSNLEXER::NeedNUMBER( const char* aExpectation )
 {
     int tok = NextTok();
 
-    if( tok != DSN_NUMBER )
+    if( !IsNumber( tok ) )
     {
         wxString errText = wxString::Format( _( "need a number for '%s'" ),
                                              wxString::FromUTF8( aExpectation ).GetData() );
@@ -462,9 +477,9 @@ inline bool isDigit( char cc )
 
 
 /// @return true if @a cc is an s-expression separator character.
-inline bool isSep( char cc )
+inline bool DSNLEXER::isSep( char cc )
 {
-    return isSpace( cc ) || cc == '(' || cc == ')' || cc == '|';
+    return isSpace( cc ) || cc == '(' || cc == ')' || ( m_knowsBar && cc == '|' );
 }
 
 
@@ -609,7 +624,7 @@ L_read:
         goto exit;
     }
 
-    if( *cur == '|' )
+    if( m_knowsBar && *cur == '|' )
     {
         curText = *cur;
         curTok = DSN_BAR;

common/eda_draw_frame.cpp

@@ -619,18 +619,27 @@ void EDA_DRAW_FRAME::AddStandardSubMenus( TOOL_MENU& aToolMenu )
 
 void EDA_DRAW_FRAME::DisplayToolMsg( const wxString& msg )
 {
+    if( m_isClosing )
+        return;
+
     SetStatusText( msg, 6 );
 }
 
 
 void EDA_DRAW_FRAME::DisplayConstraintsMsg( const wxString& msg )
 {
+    if( m_isClosing )
+        return;
+
     SetStatusText( msg, 7 );
 }
 
 
 void EDA_DRAW_FRAME::DisplayGridMsg()
 {
+    if( m_isClosing )
+        return;
+
     wxString msg;
 
     GRID_SETTINGS& gridSettings = m_toolManager->GetSettings()->m_Window.grid;
@@ -645,6 +654,9 @@ void EDA_DRAW_FRAME::DisplayGridMsg()
 
 void EDA_DRAW_FRAME::DisplayUnitsMsg()
 {
+    if( m_isClosing )
+        return;
+
     wxString msg;
 
     switch( GetUserUnits() )
@@ -712,6 +724,9 @@ void EDA_DRAW_FRAME::updateStatusBarWidths()
 
 void EDA_DRAW_FRAME::UpdateStatusBar()
 {
+    if( m_isClosing )
+        return;
+
     SetStatusText( GetZoomLevelIndicator(), 1 );
 
     // Absolute and relative cursor positions are handled by overloading this function and

common/eda_item.cpp

@@ -32,6 +32,7 @@
 #include <wx/log.h>
 
 #include <wx/fdrepdlg.h>
+#include <wx/regex.h>
 #include <eda_pattern_match.h>
 
 EDA_ITEM::EDA_ITEM( EDA_ITEM* parent, KICAD_T idType, bool isSCH_ITEM, bool isBOARD_ITEM ) :
@@ -182,6 +183,21 @@ bool EDA_ITEM::Matches( const wxString& aText, const EDA_SEARCH_DATA& aSearchDat
     {
         return text.Matches( searchText );
     }
+    else if( aSearchData.matchMode == EDA_SEARCH_MATCH_MODE::REGEX )
+    {
+        if( aSearchData.regex_string != searchText || !aSearchData.regex.IsValid() )
+        {
+            int flag = aSearchData.matchCase ? 0 : wxRE_ICASE;
+            wxLogNull noLogs;
+
+            if( !aSearchData.regex.Compile( searchText, flag ) )
+                return false;
+
+            aSearchData.regex_string = searchText;
+        }
+
+        return aSearchData.regex.Matches( text );
+    }
     else
     {
         return text.Find( searchText ) != wxNOT_FOUND;
@@ -196,6 +212,26 @@ bool EDA_ITEM::Replace( const EDA_SEARCH_DATA& aSearchData, wxString& aText )
     wxString result;
     bool     replaced = false;
 
+    if( aSearchData.matchMode == EDA_SEARCH_MATCH_MODE::REGEX )
+    {
+        if( aSearchData.regex_string != searchText || !aSearchData.regex.IsValid() )
+        {
+            int flag = aSearchData.matchCase ? 0 : wxRE_ICASE;
+            wxLogNull noLogs;
+
+            if( !aSearchData.regex.Compile( searchText, flag ) )
+                return false;
+
+            aSearchData.regex_string = searchText;
+        }
+
+        if( !aSearchData.regex.Replace( &text, aSearchData.replaceString ) )
+            return false;
+
+        aText = text;
+        return true;
+    }
+
     if( !aSearchData.matchCase )
     {
         text = text.Upper();

common/eda_shape.cpp

@@ -303,7 +303,7 @@ bool EDA_SHAPE::Deserialize( const google::protobuf::Any &aContainer )
         SetBezierC1( UnpackVector2( shape.bezier().control1() ) );
         SetBezierC2( UnpackVector2( shape.bezier().control2() ) );
         SetEnd( UnpackVector2( shape.bezier().end() ) );
-        RebuildBezierToSegmentsPointsList( ARC_HIGH_DEF );
+        RebuildBezierToSegmentsPointsList( getMaxError() );
     }
 
     return true;
@@ -435,7 +435,8 @@ void EDA_SHAPE::SetLength( const double& aLength )
     switch( m_shape )
     {
     case SHAPE_T::SEGMENT:
-        m_segmentLength = aLength; break;
+        m_segmentLength = aLength;
+        break;
 
     default:
         UNIMPLEMENTED_FOR( SHAPE_T_asString() );
@@ -622,7 +623,7 @@ void EDA_SHAPE::scale( double aScale )
         scalePt( m_end );
         scalePt( m_bezierC1 );
         scalePt( m_bezierC2 );
-        RebuildBezierToSegmentsPointsList( m_stroke.GetWidth() / 2 );
+        RebuildBezierToSegmentsPointsList( getMaxError() );
         break;
 
     default:
@@ -726,7 +727,7 @@ void EDA_SHAPE::flip( const VECTOR2I& aCentre, FLIP_DIRECTION aFlipDirection )
         MIRROR( m_bezierC1, aCentre, aFlipDirection );
         MIRROR( m_bezierC2, aCentre, aFlipDirection );
 
-        RebuildBezierToSegmentsPointsList( m_stroke.GetWidth() / 2 );
+        RebuildBezierToSegmentsPointsList( getMaxError() );
         break;
 
     default:
@@ -855,8 +856,20 @@ int EDA_SHAPE::GetRadius() const
         UNIMPLEMENTED_FOR( SHAPE_T_asString() );
     }
 
-    // don't allow degenerate circles/arcs
-    return std::max( 1, KiROUND( radius ) );
+    // Calculate maximum safe radius to prevent overflow in coordinate operations
+    // We need to ensure that any coordinate ± radius doesn't exceed INT_MAX
+    int max_coord = std::max( { std::abs( m_start.x ), std::abs( m_start.y ),
+                                std::abs( m_end.x ), std::abs( m_end.y ) } );
+
+    // Calculate maximum safe radius (with some margin)
+    double max_safe_radius = static_cast<double>( INT_MAX ) - max_coord - 1000;
+
+    if( radius > max_safe_radius )
+        radius = max_safe_radius;
+
+    int final_radius = KiROUND( radius );
+
+    return std::max( 1, final_radius );
 }
 
 
@@ -1638,7 +1651,7 @@ std::vector<SHAPE*> EDA_SHAPE::makeEffectiveShapes( bool aEdgeOnly, bool aLineCh
 
     case SHAPE_T::BEZIER:
     {
-        std::vector<VECTOR2I> bezierPoints = buildBezierToSegmentsPointsList( width / 2 );
+        std::vector<VECTOR2I> bezierPoints = buildBezierToSegmentsPointsList( getMaxError() );
         VECTOR2I              start_pt = bezierPoints[0];
 
         for( unsigned int jj = 1; jj < bezierPoints.size(); jj++ )
@@ -1741,7 +1754,7 @@ void EDA_SHAPE::beginEdit( const VECTOR2I& aPosition )
         SetBezierC2( aPosition );
         m_editState = 1;
 
-        RebuildBezierToSegmentsPointsList( GetWidth() / 2 );
+        RebuildBezierToSegmentsPointsList( getMaxError() );
         break;
 
     case SHAPE_T::POLY:
@@ -1823,7 +1836,7 @@ void EDA_SHAPE::calcEdit( const VECTOR2I& aPosition )
         case 3: SetBezierC2( aPosition ); break;
         }
 
-        RebuildBezierToSegmentsPointsList( GetWidth() / 2 );
+        RebuildBezierToSegmentsPointsList( getMaxError() );
     }
     break;
 

common/eda_text.cpp

@@ -631,12 +631,17 @@ void EDA_TEXT::cacheShownText()
 }
 
 
-KIFONT::FONT* EDA_TEXT::getDrawFont() const
+KIFONT::FONT* EDA_TEXT::GetDrawFont( const RENDER_SETTINGS* aSettings ) const
 {
     KIFONT::FONT* font = GetFont();
 
     if( !font )
-        font = KIFONT::FONT::GetFont( wxEmptyString, IsBold(), IsItalic() );
+    {
+        if( aSettings )
+            font = KIFONT::FONT::GetFont( aSettings->GetDefaultFont(), IsBold(), IsItalic() );
+        else
+            font = KIFONT::FONT::GetFont( wxEmptyString, IsBold(), IsItalic() );
+    }
 
     return font;
 }
@@ -714,13 +719,13 @@ void EDA_TEXT::AddRenderCacheGlyph( const SHAPE_POLY_SET& aPoly )
 }
 
 
-int EDA_TEXT::GetInterline() const
+int EDA_TEXT::GetInterline( const RENDER_SETTINGS* aSettings ) const
 {
-    return KiROUND( getDrawFont()->GetInterline( GetTextHeight(), getFontMetrics() ) );
+    return KiROUND( GetDrawFont( aSettings )->GetInterline( GetTextHeight(), getFontMetrics() ) );
 }
 
 
-BOX2I EDA_TEXT::GetTextBox( int aLine ) const
+BOX2I EDA_TEXT::GetTextBox( const RENDER_SETTINGS* aSettings, int aLine ) const
 {
     VECTOR2I drawPos = GetDrawPos();
 
@@ -748,12 +753,11 @@ BOX2I EDA_TEXT::GetTextBox( int aLine ) const
     }
 
     // calculate the H and V size
-    KIFONT::FONT* font = getDrawFont();
+    KIFONT::FONT* font = GetDrawFont( aSettings );
     VECTOR2D      fontSize( GetTextSize() );
     bool          bold = IsBold();
     bool          italic = IsItalic();
-    VECTOR2I      extents = font->StringBoundaryLimits( text, fontSize, thickness, bold, italic,
-                                                        getFontMetrics() );
+    VECTOR2I      extents = font->StringBoundaryLimits( text, fontSize, thickness, bold, italic, getFontMetrics() );
     int           overbarOffset = 0;
 
     // Creates bounding box (rectangle) for horizontal, left and top justified text. The
@@ -779,15 +783,13 @@ BOX2I EDA_TEXT::GetTextBox( int aLine ) const
         for( unsigned ii = 1; ii < strings.GetCount(); ii++ )
         {
             text = strings.Item( ii );
-            extents = font->StringBoundaryLimits( text, fontSize, thickness, bold, italic,
-                                                  getFontMetrics() );
+            extents = font->StringBoundaryLimits( text, fontSize, thickness, bold, italic, getFontMetrics() );
             textsize.x = std::max( textsize.x, extents.x );
         }
 
         // interline spacing is only *between* lines, so total height is the height of the first
         // line plus the interline distance (with interline spacing) for all subsequent lines
-        textsize.y += KiROUND( ( strings.GetCount() - 1 )
-                               * font->GetInterline( fontSize.y, getFontMetrics() ) );
+        textsize.y += KiROUND( ( strings.GetCount() - 1 ) * font->GetInterline( fontSize.y, getFontMetrics() ) );
     }
 
     textsize.y += overbarOffset;
@@ -852,7 +854,7 @@ BOX2I EDA_TEXT::GetTextBox( int aLine ) const
 
 bool EDA_TEXT::TextHitTest( const VECTOR2I& aPoint, int aAccuracy ) const
 {
-    const BOX2I    rect = GetTextBox().GetInflated( aAccuracy );
+    const BOX2I    rect = GetTextBox( nullptr ).GetInflated( aAccuracy );
     const VECTOR2I location = GetRotated( aPoint, GetDrawPos(), -GetDrawRotation() );
     return rect.Contains( location );
 }
@@ -863,9 +865,9 @@ bool EDA_TEXT::TextHitTest( const BOX2I& aRect, bool aContains, int aAccuracy )
     const BOX2I rect = aRect.GetInflated( aAccuracy );
 
     if( aContains )
-        return rect.Contains( GetTextBox() );
+        return rect.Contains( GetTextBox( nullptr ) );
 
-    return rect.Intersects( GetTextBox(), GetDrawRotation() );
+    return rect.Intersects( GetTextBox( nullptr ), GetDrawRotation() );
 }
 
 
@@ -880,7 +882,7 @@ void EDA_TEXT::Print( const RENDER_SETTINGS* aSettings, const VECTOR2I& aOffset,
 
         positions.reserve( strings.Count() );
 
-        GetLinePositions( positions, (int) strings.Count() );
+        GetLinePositions( aSettings, positions, (int) strings.Count() );
 
         for( unsigned ii = 0; ii < strings.Count(); ii++ )
             printOneLineOfText( aSettings, aOffset, aColor, aFillMode, strings[ii], positions[ii] );
@@ -893,14 +895,15 @@ void EDA_TEXT::Print( const RENDER_SETTINGS* aSettings, const VECTOR2I& aOffset,
 }
 
 
-void EDA_TEXT::GetLinePositions( std::vector<VECTOR2I>& aPositions, int aLineCount ) const
+void EDA_TEXT::GetLinePositions( const RENDER_SETTINGS* aSettings, std::vector<VECTOR2I>& aPositions,
+                                 int aLineCount ) const
 {
     VECTOR2I pos = GetDrawPos();    // Position of first line of the multiline text according
                                     // to the center of the multiline text block
 
     VECTOR2I offset;                // Offset to next line.
 
-    offset.y = GetInterline();
+    offset.y = GetInterline( aSettings );
 
     if( aLineCount > 1 )
     {
@@ -952,10 +955,7 @@ void EDA_TEXT::printOneLineOfText( const RENDER_SETTINGS* aSettings, const VECTO
     if( IsMirrored() )
         size.x = -size.x;
 
-    KIFONT::FONT* font = GetFont();
-
-    if( !font )
-        font = KIFONT::FONT::GetFont( aSettings->GetDefaultFont(), IsBold(), IsItalic() );
+    KIFONT::FONT* font = GetDrawFont( aSettings );
 
     GRPrintText( DC, aOffset + aPos, aColor, aText, GetDrawRotation(), size, GetHorizJustify(),
                  GetVertJustify(), penWidth, IsItalic(), IsBold(), font, getFontMetrics() );
@@ -1123,7 +1123,7 @@ std::shared_ptr<SHAPE_COMPOUND> EDA_TEXT::GetEffectiveTextShape( bool aTriangula
 {
     std::shared_ptr<SHAPE_COMPOUND> shape = std::make_shared<SHAPE_COMPOUND>();
     KIGFX::GAL_DISPLAY_OPTIONS      empty_opts;
-    KIFONT::FONT*                   font = getDrawFont();
+    KIFONT::FONT*                   font = GetDrawFont( nullptr );
     int                             penWidth = GetEffectiveTextPenWidth();
     wxString                        shownText( GetShownText( true ) );
     VECTOR2I                        drawPos = GetDrawPos();

common/eda_units.cpp

@@ -391,7 +391,7 @@ wxString EDA_UNIT_UTILS::UI::MessageTextFromValue( const EDA_IU_SCALE& aIuScale,
     {
     default:
     case EDA_UNITS::UM:       format = is_eeschema ? wxT( "%.0f" ) : wxT( "%.1f" ); break;
-    case EDA_UNITS::MM:       format = is_eeschema ? wxT( "%.2f" ) : wxT( "%.4f" ); break;
+    case EDA_UNITS::MM:       format = is_eeschema ? wxT( "%.3f" ) : wxT( "%.4f" ); break;
     case EDA_UNITS::CM:       format = is_eeschema ? wxT( "%.3f" ) : wxT( "%.5f" ); break;
     case EDA_UNITS::MILS:     format = is_eeschema ? wxT( "%.0f" ) : wxT( "%.2f" ); break;
     case EDA_UNITS::INCH:     format = is_eeschema ? wxT( "%.3f" ) : wxT( "%.4f" ); break;
@@ -401,6 +401,16 @@ wxString EDA_UNIT_UTILS::UI::MessageTextFromValue( const EDA_IU_SCALE& aIuScale,
 
     text.Printf( format, value );
 
+    // Trim to 2-1/2 digits after the decimal place for short-form mm
+    if( is_eeschema && aUnits == EDA_UNITS::MM )
+    {
+        struct lconv* lc = localeconv();
+        int           length = (int) text.Length();
+
+        if( length > 4 && text[length - 4] == *lc->decimal_point && text[length - 1] == '0' )
+            text = text.Left( length - 1 );
+    }
+
     if( aAddUnitsText )
         text += EDA_UNIT_UTILS::GetText( aUnits, aType );
 

common/embedded_files.cpp

@@ -328,6 +328,9 @@ EMBEDDED_FILES::RETURN_CODE EMBEDDED_FILES::DecompressAndDecode( EMBEDDED_FILE&
 // Parsing method
 void EMBEDDED_FILES_PARSER::ParseEmbedded( EMBEDDED_FILES* aFiles )
 {
+    // embedded files are version 20240706 and uses also Bars as separator
+    SetKnowsBar( true );
+
     if( !aFiles )
         THROW_PARSE_ERROR( "No embedded files object provided", CurSource(), CurLine(),
                            CurLineNumber(), CurOffset() );
@@ -547,6 +550,7 @@ const std::vector<wxString>* EMBEDDED_FILES::UpdateFontFiles()
     return &m_fontFiles;
 }
 
+
 // Move constructor
 EMBEDDED_FILES::EMBEDDED_FILES( EMBEDDED_FILES&& other ) noexcept :
         m_files( std::move( other.m_files ) ),
@@ -557,6 +561,7 @@ EMBEDDED_FILES::EMBEDDED_FILES( EMBEDDED_FILES&& other ) noexcept :
     other.m_embedFonts = false;
 }
 
+
 // Move assignment operator
 EMBEDDED_FILES& EMBEDDED_FILES::operator=(EMBEDDED_FILES&& other) noexcept
 {
@@ -569,33 +574,37 @@ EMBEDDED_FILES& EMBEDDED_FILES::operator=(EMBEDDED_FILES&& other) noexcept
         m_embedFonts = other.m_embedFonts;
         other.m_embedFonts = false;
     }
+
     return *this;
 }
 
+
 // Copy constructor
-EMBEDDED_FILES::EMBEDDED_FILES( const EMBEDDED_FILES& other ) : m_embedFonts( other.m_embedFonts )
+EMBEDDED_FILES::EMBEDDED_FILES( const EMBEDDED_FILES& other ) :
+        m_embedFonts( other.m_embedFonts )
 {
     for( const auto& [name, file] : other.m_files )
-    {
         m_files[name] = new EMBEDDED_FILE( *file );
-    }
+
     m_fontFiles = other.m_fontFiles;
     m_fileAddedCallback = other.m_fileAddedCallback;
 }
 
+
 // Copy assignment operator
 EMBEDDED_FILES& EMBEDDED_FILES::operator=( const EMBEDDED_FILES& other )
 {
     if( this != &other )
     {
         ClearEmbeddedFiles();
+
         for( const auto& [name, file] : other.m_files )
-        {
             m_files[name] = new EMBEDDED_FILE( *file );
-        }
+
         m_fontFiles = other.m_fontFiles;
         m_fileAddedCallback = other.m_fileAddedCallback;
         m_embedFonts = other.m_embedFonts;
     }
+
     return *this;
 }

common/env_vars.cpp

@@ -47,14 +47,8 @@ static const ENV_VAR::ENV_VAR_LIST predefinedEnvVars = {
 };
 
 
-const wxRegEx versionedEnvVarRegex( wxS( "KICAD[0-9]+_[A-Z0-9_]+(_DIR)?" ) );
-
-
 bool ENV_VAR::IsEnvVarImmutable( const wxString& aEnvVar )
 {
-    if( versionedEnvVarRegex.Matches( aEnvVar ) )
-        return true;
-
     for( const wxString& s : predefinedEnvVars )
     {
         if( s == aEnvVar )

common/filename_resolver.cpp

@@ -257,6 +257,11 @@ wxString FILENAME_RESOLVER::ResolvePath( const wxString& aFileName, const wxStri
     // first attempt to use the name as specified:
     wxString tname = aFileName;
 
+    // Swap separators for non-Windows, in case a Windows path is being passed
+#ifndef __WIN32__
+    tname.Replace( "\\", "/" );
+#endif
+
     // Note: variable expansion must preferably be performed via a threadsafe wrapper for the
     // getenv() system call. If we allow the wxFileName::Normalize() routine to perform expansion
     // then we will have a race condition since wxWidgets does not assure a threadsafe wrapper

common/footprint_info.cpp

@@ -39,6 +39,7 @@
 #include <utility>
 #include <wx/tokenzr.h>
 #include <kiface_base.h>
+#include <locale_io.h>
 
 FOOTPRINT_INFO* FOOTPRINT_LIST::GetFootprintInfo( const wxString& aLibNickname,
                                                   const wxString& aFootprintName )

common/fp_lib_table.cpp

@@ -40,6 +40,7 @@
 
 #include <wx/dir.h>
 #include <wx/hash.h>
+#include <locale_io.h>
 
 #define OPT_SEP     '|'         ///< options separator character
 
@@ -156,6 +157,7 @@ void FP_LIB_TABLE::Parse( LIB_TABLE_LEXER* in )
             case T_uri:
                 if( sawUri )
                     in->Duplicate( tok );
+
                 sawUri = true;
                 in->NeedSYMBOLorNUMBER();
                 row->SetFullURI( in->FromUTF8() );
@@ -164,6 +166,7 @@ void FP_LIB_TABLE::Parse( LIB_TABLE_LEXER* in )
             case T_type:
                 if( sawType )
                     in->Duplicate( tok );
+
                 sawType = true;
                 in->NeedSYMBOLorNUMBER();
                 row->SetType( in->FromUTF8() );
@@ -172,6 +175,7 @@ void FP_LIB_TABLE::Parse( LIB_TABLE_LEXER* in )
             case T_options:
                 if( sawOpts )
                     in->Duplicate( tok );
+
                 sawOpts = true;
                 in->NeedSYMBOLorNUMBER();
                 row->SetOptions( in->FromUTF8() );
@@ -180,6 +184,7 @@ void FP_LIB_TABLE::Parse( LIB_TABLE_LEXER* in )
             case T_descr:
                 if( sawDesc )
                     in->Duplicate( tok );
+
                 sawDesc = true;
                 in->NeedSYMBOLorNUMBER();
                 row->SetDescr( in->FromUTF8() );
@@ -188,6 +193,7 @@ void FP_LIB_TABLE::Parse( LIB_TABLE_LEXER* in )
             case T_disabled:
                 if( sawDisabled )
                     in->Duplicate( tok );
+
                 sawDisabled = true;
                 row->SetEnabled( false );
                 break;
@@ -307,12 +313,23 @@ long long FP_LIB_TABLE::GenerateTimestamp( const wxString* aNickname )
 
 
 void FP_LIB_TABLE::FootprintEnumerate( wxArrayString& aFootprintNames, const wxString& aNickname,
-                                       bool aBestEfforts )
+                                       bool aBestEfforts, const LOCALE_IO* aLocale )
 {
     const FP_LIB_TABLE_ROW* row = FindRow( aNickname, true );
     wxASSERT( row->plugin );
-    row->plugin->FootprintEnumerate( aFootprintNames, row->GetFullURI( true ), aBestEfforts,
-                                     row->GetProperties() );
+
+    if( !aLocale )
+    {
+        LOCALE_IO toggle_locale;
+
+        row->plugin->FootprintEnumerate( aFootprintNames, row->GetFullURI( true ), aBestEfforts,
+                                         row->GetProperties() );
+    }
+    else
+    {
+        row->plugin->FootprintEnumerate( aFootprintNames, row->GetFullURI( true ), aBestEfforts,
+                                         row->GetProperties() );
+    }
 }
 
 
@@ -362,18 +379,33 @@ static void setLibNickname( FOOTPRINT* aModule, const wxString& aNickname,
 
 
 const FOOTPRINT* FP_LIB_TABLE::GetEnumeratedFootprint( const wxString& aNickname,
-                                                       const wxString& aFootprintName )
+                                                       const wxString& aFootprintName,
+                                                       const LOCALE_IO* aLocale )
 {
     const FP_LIB_TABLE_ROW* row = FindRow( aNickname, true );
     wxASSERT( row->plugin );
 
-    return row->plugin->GetEnumeratedFootprint( row->GetFullURI( true ), aFootprintName,
-                                                row->GetProperties() );
+    if( !aLocale )
+    {
+        LOCALE_IO toggle_locale;
+
+        return row->plugin->GetEnumeratedFootprint( row->GetFullURI( true ), aFootprintName,
+                                                    row->GetProperties() );
+    }
+    else
+    {
+        return row->plugin->GetEnumeratedFootprint( row->GetFullURI( true ), aFootprintName,
+                                                    row->GetProperties() );
+    }
 }
 
 
 bool FP_LIB_TABLE::FootprintExists( const wxString& aNickname, const wxString& aFootprintName )
 {
+    // NOT THREAD-SAFE!  LOCALE_IO is global!
+
+    LOCALE_IO toggle_locale;
+
     try
     {
         const FP_LIB_TABLE_ROW* row = FindRow( aNickname, true );
@@ -392,6 +424,10 @@ bool FP_LIB_TABLE::FootprintExists( const wxString& aNickname, const wxString& a
 FOOTPRINT* FP_LIB_TABLE::FootprintLoad( const wxString& aNickname,
                                         const wxString& aFootprintName, bool aKeepUUID )
 {
+    // NOT THREAD-SAFE!  LOCALE_IO is global!
+
+    LOCALE_IO toggle_locale;
+
     const FP_LIB_TABLE_ROW* row = FindRow( aNickname, true );
     wxASSERT( row->plugin );
 
@@ -407,6 +443,10 @@ FOOTPRINT* FP_LIB_TABLE::FootprintLoad( const wxString& aNickname,
 FP_LIB_TABLE::SAVE_T FP_LIB_TABLE::FootprintSave( const wxString& aNickname,
                                                   const FOOTPRINT* aFootprint, bool aOverwrite )
 {
+    // NOT THREAD-SAFE!  LOCALE_IO is global!
+
+    LOCALE_IO toggle_locale;
+
     const FP_LIB_TABLE_ROW* row = FindRow( aNickname, true );
     wxASSERT( row->plugin );
 

common/gal/cairo/cairo_gal.cpp

@@ -1210,7 +1210,8 @@ void CAIRO_GAL_BASE::blitCursor( wxMemoryDC& clientDC )
 
 void CAIRO_GAL_BASE::drawPoly( const std::deque<VECTOR2D>& aPointList )
 {
-    wxCHECK( aPointList.size() > 1, /* void */ );
+    if( aPointList.size() <= 1 )
+        return;
 
     // Iterate over the point list and draw the segments
     std::deque<VECTOR2D>::const_iterator it = aPointList.begin();
@@ -1235,7 +1236,8 @@ void CAIRO_GAL_BASE::drawPoly( const std::deque<VECTOR2D>& aPointList )
 
 void CAIRO_GAL_BASE::drawPoly( const std::vector<VECTOR2D>& aPointList )
 {
-    wxCHECK( aPointList.size() > 1, /* void */ );
+    if( aPointList.size() <= 1 )
+        return;
 
     // Iterate over the point list and draw the segments
     std::vector<VECTOR2D>::const_iterator it = aPointList.begin();
@@ -1260,7 +1262,8 @@ void CAIRO_GAL_BASE::drawPoly( const std::vector<VECTOR2D>& aPointList )
 
 void CAIRO_GAL_BASE::drawPoly( const VECTOR2D aPointList[], int aListSize )
 {
-    wxCHECK( aListSize > 1, /* void */ );
+    if( aListSize <= 1 )
+        return;
 
     // Iterate over the point list and draw the segments
     const VECTOR2D* ptr = aPointList;
@@ -1284,7 +1287,8 @@ void CAIRO_GAL_BASE::drawPoly( const VECTOR2D aPointList[], int aListSize )
 
 void CAIRO_GAL_BASE::drawPoly( const SHAPE_LINE_CHAIN& aLineChain )
 {
-    wxCHECK( aLineChain.PointCount() > 1, /* void */ );
+    if( aLineChain.PointCount() <= 1 )
+        return;
 
     syncLineWidth();
 

common/gal/cairo/cairo_print.cpp

@@ -95,7 +95,8 @@ CAIRO_PRINT_CTX::CAIRO_PRINT_CTX( wxDC* aDC ) :
     m_hdc = g->GetHDC();
     m_surface = cairo_win32_printing_surface_create( static_cast<HDC>( m_hdc ) );
     m_ctx = cairo_create( m_surface );
-    m_dpi = GetDeviceCaps( static_cast<HDC>( m_hdc ), LOGPIXELSX );
+    wxASSERT( aDC->GetPPI().x == aDC->GetPPI().y );
+    m_dpi = aDC->GetPPI().x;
 #endif /* __WXMSW__ */
 
 #ifdef __WXMAC__

common/gal/opengl/opengl_gal.cpp

@@ -848,15 +848,16 @@ void OPENGL_GAL::drawSegment( const VECTOR2D& aStartPoint, const VECTOR2D& aEndP
     VECTOR2D startEndVector = aEndPoint - aStartPoint;
     double   lineLength = startEndVector.EuclideanNorm();
 
-    float startx = aStartPoint.x;
-    float starty = aStartPoint.y;
-    float endx = aStartPoint.x + lineLength;
-    float endy = aStartPoint.y + lineLength;
-
     // Be careful about floating point rounding.  As we draw segments in larger and larger
     // coordinates, the shader (which uses floats) will lose precision and stop drawing small
     // segments.  In this case, we need to draw a circle for the minimal segment.
-    if( startx == endx || starty == endy )
+    // Check if the coordinate differences can be accurately represented as floats
+    float startX = static_cast<float>( aStartPoint.x );
+    float startY = static_cast<float>( aStartPoint.y );
+    float endX = static_cast<float>( aEndPoint.x );
+    float endY = static_cast<float>( aEndPoint.y );
+
+    if( startX == endX && startY == endY )
     {
         drawCircle( aStartPoint, aWidth / 2, aReserve );
         return;
@@ -1465,7 +1466,8 @@ void OPENGL_GAL::DrawPolygon( const SHAPE_POLY_SET& aPolySet, bool aStrokeTriang
 
 void OPENGL_GAL::DrawPolygon( const SHAPE_LINE_CHAIN& aPolygon )
 {
-    wxCHECK( aPolygon.PointCount() >= 2, /* void */ );
+    if( aPolygon.PointCount() < 2 )
+        return;
 
     const int                   pointCount = aPolygon.SegmentCount() + 1;
     std::unique_ptr<GLdouble[]> points( new GLdouble[3 * pointCount] );
@@ -2407,18 +2409,17 @@ void OPENGL_GAL::drawSegmentChain( const std::function<VECTOR2D( int )>& aPointG
         auto start = aPointGetter( i - 1 );
         auto end = aPointGetter( i );
 
-        VECTOR2D startEndVector = end - start;
-        double   lineLength = startEndVector.EuclideanNorm();
-
         float startx = start.x;
         float starty = start.y;
-        float endx = start.x + lineLength;
-        float endy = start.y + lineLength;
+        float endx = end.x;
+        float endy = end.y;
 
         // Be careful about floating point rounding.  As we draw segments in larger and larger
         // coordinates, the shader (which uses floats) will lose precision and stop drawing small
         // segments.  In this case, we need to draw a circle for the minimal segment.
-        if( startx == endx || starty == endy )
+        // Check if the coordinate differences can be accurately represented as floats
+
+        if( startx == endx && starty == endy )
         {
             vertices += 3; // One circle
             continue;

common/gal/opengl/vertex_manager.cpp

@@ -89,10 +89,7 @@ bool VERTEX_MANAGER::Reserve( unsigned int aSize )
     {
         if( show_err_reserve )
         {
-            DisplayError(
-                    nullptr,
-                    wxT( "VERTEX_MANAGER::Reserve: Did not use all previous vertices allocated" ) );
-
+            DisplayError( nullptr, wxT( "VERTEX_MANAGER::Reserve: Did not use all previous vertices allocated" ) );
             show_err_reserve = false;
         }
     }

common/grid_tricks.cpp

@@ -508,7 +508,9 @@ void GRID_TRICKS::onCharHook( wxKeyEvent& ev )
                     stripped.Replace( COL_SEP, " " );
 
                     // Write to the CellEditControl if we can
-                    if( wxTextEntry* te = dynamic_cast<wxTextEntry*>( ev.GetEventObject() ) )
+                    wxTextEntry* te = dynamic_cast<wxTextEntry*>( ev.GetEventObject() );
+
+                    if( te && te->IsEditable() )
                         te->WriteText( stripped );
                     else
                         paste_text( stripped );

common/hash_eda.cpp

@@ -351,7 +351,7 @@ size_t hash_fp_item( const EDA_ITEM* aItem, int aFlags )
         break;
 
     default:
-        wxASSERT_MSG( false, "Unhandled type in function hash_fp_item() (exporter_gencad.cpp)" );
+        UNIMPLEMENTED_FOR( aItem->GetClass() );
     }
 
     return ret;

common/io/cadstar/cadstar_archive_parser.cpp

@@ -484,7 +484,7 @@ void CADSTAR_ARCHIVE_PARSER::VERTEX::Parse( XNODE* aNode, PARSER_CONTEXT* aConte
 
 void CADSTAR_ARCHIVE_PARSER::VERTEX::AppendToChain( SHAPE_LINE_CHAIN* aChainToAppendTo,
         const std::function<VECTOR2I( const VECTOR2I& )> aCadstarToKicadPointCallback,
-        double aAccuracy ) const
+        int aAccuracy ) const
 {
     if( Type == VERTEX_TYPE::POINT )
     {
@@ -598,7 +598,7 @@ void CADSTAR_ARCHIVE_PARSER::SHAPE::Parse( XNODE* aNode, PARSER_CONTEXT* aContex
 
 SHAPE_LINE_CHAIN CADSTAR_ARCHIVE_PARSER::SHAPE::OutlineAsChain(
         const std::function<VECTOR2I( const VECTOR2I& )> aCadstarToKicadPointCallback,
-        double aAccuracy  ) const
+        int aMaxError  ) const
 {
     SHAPE_LINE_CHAIN outline;
 
@@ -606,7 +606,7 @@ SHAPE_LINE_CHAIN CADSTAR_ARCHIVE_PARSER::SHAPE::OutlineAsChain(
         return outline;
 
     for( const auto& vertex : Vertices )
-        vertex.AppendToChain( &outline, aCadstarToKicadPointCallback, aAccuracy );
+        vertex.AppendToChain( &outline, aCadstarToKicadPointCallback, aMaxError );
 
     if( Type != SHAPE_TYPE::OPENSHAPE )
     {
@@ -622,14 +622,14 @@ SHAPE_LINE_CHAIN CADSTAR_ARCHIVE_PARSER::SHAPE::OutlineAsChain(
 
 SHAPE_POLY_SET CADSTAR_ARCHIVE_PARSER::SHAPE::ConvertToPolySet(
         const std::function<VECTOR2I( const VECTOR2I& )> aCadstarToKicadPointCallback,
-        double aAccuracy  ) const
+        int aMaxError ) const
 {
     SHAPE_POLY_SET polyset;
 
     // We shouldn't convert openshapes to polyset!
     wxCHECK( Type != SHAPE_TYPE::OPENSHAPE, polyset );
 
-    polyset.AddOutline( OutlineAsChain( aCadstarToKicadPointCallback, aAccuracy ) );
+    polyset.AddOutline( OutlineAsChain( aCadstarToKicadPointCallback, aMaxError ) );
 
     for( const auto& cutout : Cutouts )
     {
@@ -639,12 +639,12 @@ SHAPE_POLY_SET CADSTAR_ARCHIVE_PARSER::SHAPE::ConvertToPolySet(
             continue;
 
         for( const auto& cutoutVertex : cutout.Vertices )
-            cutoutVertex.AppendToChain( &hole, aCadstarToKicadPointCallback, aAccuracy );
+            cutoutVertex.AppendToChain( &hole, aCadstarToKicadPointCallback, aMaxError );
 
         hole.SetClosed( true );
 
         // Append after closing, to ensre first and last point remain the same
-        cutout.Vertices.at( 0 ).AppendToChain( &hole, aCadstarToKicadPointCallback, aAccuracy );
+        cutout.Vertices.at( 0 ).AppendToChain( &hole, aCadstarToKicadPointCallback, aMaxError );
 
         polyset.AddHole( hole );
     }
@@ -2785,7 +2785,7 @@ void CADSTAR_ARCHIVE_PARSER::FixTextPositionNoAlignment( EDA_TEXT* aKiCadTextIte
 {
     if( !aKiCadTextItem->GetText().IsEmpty() )
     {
-        VECTOR2I positionOffset( 0, aKiCadTextItem->GetInterline() );
+        VECTOR2I positionOffset( 0, aKiCadTextItem->GetInterline( nullptr ) );
         RotatePoint( positionOffset, aKiCadTextItem->GetTextAngle() );
 
         //Count num of additional lines

common/io/cadstar/cadstar_archive_parser.h

@@ -442,9 +442,10 @@ public:
      */
     struct VERTEX : PARSER
     {
-        VERTEX( VERTEX_TYPE aType = VERTEX_TYPE::POINT, POINT aEnd = POINT(),
-                POINT aCenter = POINT() ) :
-                Type( aType ), End( aEnd ), Center( aCenter )
+        VERTEX( VERTEX_TYPE aType = VERTEX_TYPE::POINT, POINT aEnd = POINT(), POINT aCenter = POINT() ) :
+                Type( aType ),
+                End( aEnd ),
+                Center( aCenter )
         {}
 
         VERTEX_TYPE Type;
@@ -455,12 +456,11 @@ public:
         void        Parse( XNODE* aNode, PARSER_CONTEXT* aContext ) override;
 
         void AppendToChain( SHAPE_LINE_CHAIN* aChainToAppendTo,
-                const std::function<VECTOR2I( const VECTOR2I& )> aCadstarToKicadPointCallback,
-                double aAccuracy ) const;
+                            const std::function<VECTOR2I( const VECTOR2I& )> aCadstarToKicadPointCallback,
+                            int aAccuracy ) const;
 
         SHAPE_ARC BuildArc( const VECTOR2I& aPrevPoint,
-                            const std::function<VECTOR2I( const VECTOR2I& )>
-                                    aCadstarToKicadPointCallback ) const;
+                            const std::function<VECTOR2I( const VECTOR2I& )> aCadstarToKicadPointCallback ) const;
     };
 
     /**
@@ -493,13 +493,11 @@ public:
         static bool IsShape( XNODE* aNode );
         void        Parse( XNODE* aNode, PARSER_CONTEXT* aContext ) override;
 
-        SHAPE_LINE_CHAIN OutlineAsChain( const std::function<VECTOR2I( const VECTOR2I& )>
-                                                 aCadstarToKicadPointCallback,
-                                         double aAccuracy ) const;
+        SHAPE_LINE_CHAIN OutlineAsChain( const std::function<VECTOR2I( const VECTOR2I& )> aCadstarToKicadPointCallback,
+                                         int aAccuracy ) const;
 
-        SHAPE_POLY_SET ConvertToPolySet( const std::function<VECTOR2I( const VECTOR2I& )>
-                                                 aCadstarToKicadPointCallback,
-                                         double aAccuracy  ) const;
+        SHAPE_POLY_SET ConvertToPolySet( const std::function<VECTOR2I( const VECTOR2I& )> aCadstarToKicadPointCallback,
+                                         int aAccuracy  ) const;
     };
 
 

common/io/eagle/eagle_parser.cpp

@@ -1917,11 +1917,13 @@ ESHEET::ESHEET( wxXmlNode* aSheet, IO_BASE* aIo ) :
     /*
      * <!ELEMENT sheet (description?, plain?, moduleinsts?, instances?, busses?, nets?)>
      */
-    description = parseOptionalAttribute<wxString>( aSheet, "description" );
-
     for( wxXmlNode* child = aSheet->GetChildren(); child; child = child->GetNext() )
     {
-        if( child->GetName() == "plain" )
+        if( child->GetName() == "description" )
+        {
+            description = std::make_optional<EDESCRIPTION>( child, aIo );
+        }
+        else if( child->GetName() == "plain" )
         {
             plain = std::make_unique<EPLAIN>( child, aIo );
         }
@@ -1932,8 +1934,7 @@ ESHEET::ESHEET( wxXmlNode* aSheet, IO_BASE* aIo ) :
             {
                 if( moduleinst->GetName() == "moduleinst" )
                 {
-                    std::unique_ptr<EMODULEINST> inst = std::make_unique<EMODULEINST>( moduleinst,
-                                                                                       aIo );
+                    std::unique_ptr<EMODULEINST> inst = std::make_unique<EMODULEINST>( moduleinst, aIo );
                     moduleinsts[ inst->name ] = std::move( inst );
                 }
             }
@@ -1942,8 +1943,7 @@ ESHEET::ESHEET( wxXmlNode* aSheet, IO_BASE* aIo ) :
         }
         else if( child->GetName() == "instances" )
         {
-            for( wxXmlNode* instance = child->GetChildren(); instance;
-                 instance = instance->GetNext() )
+            for( wxXmlNode* instance = child->GetChildren(); instance; instance = instance->GetNext() )
             {
                 if( instance->GetName() == "instance" )
                     instances.emplace_back( std::make_unique<EINSTANCE>( instance, aIo ) );

common/io/eagle/eagle_parser.h

@@ -1898,7 +1898,7 @@ struct ESHEET : public EAGLE_BASE
      * <!ELEMENT sheet (description?, plain?, moduleinsts?, instances?, busses?, nets?)>
      */
 
-    opt_wxString                                     description;
+    std::optional<EDESCRIPTION>                      description;
     std::unique_ptr<EPLAIN>                          plain;
     std::map<wxString, std::unique_ptr<EMODULEINST>> moduleinsts;
     std::vector<std::unique_ptr<EINSTANCE>>          instances;
@@ -1925,8 +1925,7 @@ struct EMODULE : public EAGLE_BASE
     ECOORD       dx;
     ECOORD       dy;
 
-    std::optional<EDESCRIPTION> description;
-
+    std::optional<EDESCRIPTION>                           description;
     std::map<wxString, std::unique_ptr<EPORT>>            ports;
     std::map<wxString, std::unique_ptr<EVARIANTDEF>>      variantdefs;
     std::map<wxString, std::unique_ptr<ESCHEMATIC_GROUP>> groups;

common/io/easyeda/easyeda_parser_base.cpp

@@ -108,7 +108,7 @@ void EASYEDA_PARSER_BASE::TransformTextToBaseline( EDA_TEXT*       textItem,
 
 
 std::vector<SHAPE_LINE_CHAIN>
-EASYEDA_PARSER_BASE::ParseLineChains( const wxString& data, int aArcMinSegLen, bool aForceClosed )
+EASYEDA_PARSER_BASE::ParseLineChains( const wxString& data, int aMaxError, bool aForceClosed )
 {
     std::vector<SHAPE_LINE_CHAIN> result;
 
@@ -211,41 +211,59 @@ EASYEDA_PARSER_BASE::ParseLineChains( const wxString& data, int aArcMinSegLen, b
         }
         else if( sym == 'A' )
         {
-            wxString radX, radY, unknown, farFlag, cwFlag, endX, endY;
+            // Arc command can have multiple consecutive arc parameter sets
+            while( true )
+            {
+                if( pos >= data.size() )
+                    break;
 
-            readNumber( radX );
-            readNumber( radY );
-            readNumber( unknown );
-            readNumber( farFlag );
-            readNumber( cwFlag );
-            readNumber( endX );
-            readNumber( endY );
+                wxUniChar ch = data[pos];
 
-            bool     isFar = farFlag == wxS( "1" );
-            bool     cw = cwFlag == wxS( "1" );
-            VECTOR2D rad( Convert( radX ), Convert( radY ) );
-            VECTOR2D end( Convert( endX ), Convert( endY ) );
+                while( ch == ' ' || ch == ',' )
+                {
+                    if( ++pos >= data.size() )
+                        break;
 
-            VECTOR2D start = prevPt;
-            VECTOR2D delta = end - start;
+                    ch = data[pos];
+                }
 
-            double d = delta.EuclideanNorm();
-            double h = sqrt( std::max( 0.0, rad.x * rad.x - d * d / 4 ) );
+                if( !isdigit( ch ) && ch != '-' )
+                    break;
 
-            //( !far && cw ) => h
-            //( far && cw ) => -h
-            //( !far && !cw ) => -h
-            //( far && !cw ) => h
-            VECTOR2D arcCenter =
-                    start + delta / 2 + delta.Perpendicular().Resize( ( isFar ^ cw ) ? h : -h );
+                wxString radX, radY, unknown, farFlag, cwFlag, endX, endY;
 
-            SHAPE_ARC arc;
-            arc.ConstructFromStartEndCenter( RelPos( start ), RelPos( end ), RelPos( arcCenter ),
-                                             !cw );
+                readNumber( radX );
+                readNumber( radY );
+                readNumber( unknown );
+                readNumber( farFlag );
+                readNumber( cwFlag );
+                readNumber( endX );
+                readNumber( endY );
 
-            chain.Append( arc, aArcMinSegLen );
+                bool     isFar = farFlag == wxS( "1" );
+                bool     cw = cwFlag == wxS( "1" );
+                VECTOR2D rad( Convert( radX ), Convert( radY ) );
+                VECTOR2D end( Convert( endX ), Convert( endY ) );
 
-            prevPt = end;
+                VECTOR2D start = prevPt;
+                VECTOR2D delta = end - start;
+
+                double d = delta.EuclideanNorm();
+                double h = sqrt( std::max( 0.0, rad.x * rad.x - d * d / 4 ) );
+
+                //( !far && cw ) => h
+                //( far && cw ) => -h
+                //( !far && !cw ) => -h
+                //( far && !cw ) => h
+                VECTOR2D arcCenter = start + delta / 2 + delta.Perpendicular().Resize( ( isFar ^ cw ) ? h : -h );
+
+                SHAPE_ARC arc;
+                arc.ConstructFromStartEndCenter( RelPos( start ), RelPos( end ), RelPos( arcCenter ), !cw );
+
+                chain.Append( arc, aMaxError );
+
+                prevPt = end;
+            }
         }
         else if( sym == 'C' )
         {
@@ -266,7 +284,7 @@ EASYEDA_PARSER_BASE::ParseLineChains( const wxString& data, int aArcMinSegLen, b
             BEZIER_POLY           converter( ctrlPoints );
 
             std::vector<VECTOR2I> bezierPoints;
-            converter.GetPoly( bezierPoints, aArcMinSegLen );
+            converter.GetPoly( bezierPoints, aMaxError );
 
             chain.Append( bezierPoints );
 

common/io/easyeda/easyeda_parser_base.h

@@ -62,8 +62,7 @@ public:
 
     void TransformTextToBaseline( EDA_TEXT* textItem, const wxString& baselineAlign );
 
-    std::vector<SHAPE_LINE_CHAIN> ParseLineChains( const wxString& aData, int aArcMinSegLen,
-                                                   bool aForceClosed );
+    std::vector<SHAPE_LINE_CHAIN> ParseLineChains( const wxString& aData, int aMaxError, bool aForceClosed );
 
 protected:
     VECTOR2D m_relOrigin;

common/jobs/job.h

@@ -185,6 +185,11 @@ public:
 
     virtual ~JOB();
 
+    // We own at least one list of raw pointers.  Don't let the compiler fill in copy c'tors that
+    // will only land us in trouble.
+    JOB( const JOB& ) = delete;
+    JOB& operator=( const JOB& ) = delete;
+
     const std::string& GetType() const { return m_type; };
 
     const std::map<wxString, wxString>& GetVarOverrides() const { return m_varOverrides; }

common/jobs/job_dispatcher.cpp

@@ -42,22 +42,20 @@ void JOB_DISPATCHER::Register( const std::string&             aJobTypeName,
 }
 
 
-int JOB_DISPATCHER::RunJob( JOB* job, REPORTER* aReporter )
+int JOB_DISPATCHER::RunJob( JOB* job, REPORTER* aReporter, PROGRESS_REPORTER* aProgressReporter )
 {
     int       result = CLI::EXIT_CODES::ERR_UNKNOWN;
     REPORTER* existingReporter = m_reporter;
 
     if( aReporter )
-    {
         m_reporter = aReporter;
-    }
+
+    m_progressReporter = aProgressReporter;
 
     job->ClearExistingOutputs();
 
     if( m_jobHandlers.count( job->GetType() ) )
-    {
         result = m_jobHandlers[job->GetType()]( job );
-    }
 
     m_reporter = existingReporter;
 

common/jobs/job_dispatcher.h

@@ -39,7 +39,7 @@ public:
     JOB_DISPATCHER( KIWAY* aKiway );
     void Register( const std::string& aJobTypeName, std::function<int( JOB* job )> aHandler,
                          std::function<bool( JOB* job, wxWindow* aParent )> aConfigHandler );
-    int  RunJob( JOB* aJob, REPORTER* aReporter );
+    int  RunJob( JOB* aJob, REPORTER* aReporter, PROGRESS_REPORTER* aProgressReporter );
     bool HandleJobConfig( JOB* aJob, wxWindow* aParent );
     void SetReporter( REPORTER* aReporter );
     void SetProgressReporter( PROGRESS_REPORTER* aReporter );

common/jobs/job_export_pcb_3d.cpp

@@ -82,8 +82,8 @@ JOB_EXPORT_PCB_3D::JOB_EXPORT_PCB_3D() :
         m_vrmlModelDir( wxEmptyString ),
         m_vrmlRelativePaths( false )
 {
-    m_params.emplace_back(
-            new JOB_PARAM<bool>( "overwrite", &m_3dparams.m_Overwrite, m_3dparams.m_Overwrite ) );
+    m_params.emplace_back( new JOB_PARAM<bool>( "overwrite", &m_3dparams.m_Overwrite,
+                                                m_3dparams.m_Overwrite ) );
     m_params.emplace_back( new JOB_PARAM<bool>( "use_grid_origin", &m_3dparams.m_UseGridOrigin,
                                                 m_3dparams.m_UseGridOrigin ) );
     m_params.emplace_back( new JOB_PARAM<bool>( "use_drill_origin", &m_3dparams.m_UseDrillOrigin,
@@ -92,10 +92,9 @@ JOB_EXPORT_PCB_3D::JOB_EXPORT_PCB_3D() :
                                                 m_3dparams.m_UseDefinedOrigin ) );
     m_params.emplace_back( new JOB_PARAM<bool>( "use_pcb_center_origin", &m_3dparams.m_UsePcbCenterOrigin,
                                                 m_3dparams.m_UsePcbCenterOrigin ) );
-    m_params.emplace_back(
-            new JOB_PARAM<bool>( "board_only", &m_3dparams.m_BoardOnly, m_3dparams.m_BoardOnly ) );
-    m_params.emplace_back( new JOB_PARAM<bool>( "include_unspecified",
-                                                &m_3dparams.m_IncludeUnspecified,
+    m_params.emplace_back( new JOB_PARAM<bool>( "board_only", &m_3dparams.m_BoardOnly,
+                                                m_3dparams.m_BoardOnly ) );
+    m_params.emplace_back( new JOB_PARAM<bool>( "include_unspecified", &m_3dparams.m_IncludeUnspecified,
                                                 m_3dparams.m_IncludeUnspecified ) );
     m_params.emplace_back( new JOB_PARAM<bool>( "include_dnp", &m_3dparams.m_IncludeDNP,
                                                 m_3dparams.m_IncludeDNP ) );
@@ -122,8 +121,7 @@ JOB_EXPORT_PCB_3D::JOB_EXPORT_PCB_3D() :
                                                 m_3dparams.m_ExportPads ) );
     m_params.emplace_back( new JOB_PARAM<bool>( "export_zones", &m_3dparams.m_ExportZones,
                                                 m_3dparams.m_ExportZones ) );
-    m_params.emplace_back( new JOB_PARAM<bool>( "export_inner_copper",
-                                                &m_3dparams.m_ExportInnerCopper,
+    m_params.emplace_back( new JOB_PARAM<bool>( "export_inner_copper", &m_3dparams.m_ExportInnerCopper,
                                                 m_3dparams.m_ExportInnerCopper ) );
     m_params.emplace_back( new JOB_PARAM<bool>( "export_silkscreen", &m_3dparams.m_ExportSilkscreen,
                                                 m_3dparams.m_ExportInnerCopper ) );
@@ -136,10 +134,9 @@ JOB_EXPORT_PCB_3D::JOB_EXPORT_PCB_3D() :
     m_params.emplace_back( new JOB_PARAM<wxString>( "vrml_model_dir", &m_vrmlModelDir, m_vrmlModelDir ) );
     m_params.emplace_back( new JOB_PARAM<bool>( "vrml_relative_paths", &m_vrmlRelativePaths,
                                                 m_vrmlRelativePaths ) );
-    m_params.emplace_back(
-            new JOB_PARAM<JOB_EXPORT_PCB_3D::FORMAT>( "format", &m_format, m_format ) );
-    m_params.emplace_back( new JOB_PARAM<EXPORTER_STEP_PARAMS::FORMAT>(
-            "occt_format", &m_3dparams.m_Format, m_3dparams.m_Format ) );
+    m_params.emplace_back( new JOB_PARAM<JOB_EXPORT_PCB_3D::FORMAT>( "format", &m_format, m_format ) );
+    m_params.emplace_back( new JOB_PARAM<EXPORTER_STEP_PARAMS::FORMAT>( "occt_format", &m_3dparams.m_Format,
+                                                                        m_3dparams.m_Format ) );
 }
 
 

common/jobs/job_pcb_render.cpp

@@ -84,6 +84,7 @@ JOB_PCB_RENDER::JOB_PCB_RENDER() :
         JOB( "render", false ), m_filename()
 {
     m_params.emplace_back( new JOB_PARAM<FORMAT>( "format", &m_format, m_format ) );
+    m_params.emplace_back( new JOB_PARAM<std::string>( "preset", &m_appearancePreset, m_appearancePreset ) );
     m_params.emplace_back( new JOB_PARAM<QUALITY>( "quality", &m_quality, m_quality ) );
     m_params.emplace_back( new JOB_PARAM<BG_STYLE>( "bg_style", &m_bgStyle, m_bgStyle ) );
     m_params.emplace_back( new JOB_PARAM<SIDE>( "side", &m_side, m_side ) );
@@ -91,6 +92,9 @@ JOB_PCB_RENDER::JOB_PCB_RENDER() :
     m_params.emplace_back( new JOB_PARAM<double>( "zoom", &m_zoom, m_zoom ) );
     m_params.emplace_back( new JOB_PARAM<bool>( "perspective", &m_perspective, m_perspective ) );
     m_params.emplace_back( new JOB_PARAM<bool>( "floor", &m_floor, m_floor ) );
+    m_params.emplace_back( new JOB_PARAM<bool>( "anti_alias", &m_antiAlias, m_antiAlias ) );
+    m_params.emplace_back( new JOB_PARAM<bool>( "post_process", &m_postProcess, m_postProcess ) );
+    m_params.emplace_back( new JOB_PARAM<bool>( "procedural_textures", &m_proceduralTextures, m_proceduralTextures ) );
 
     m_params.emplace_back( new JOB_PARAM<int>( "width", &m_width, m_width ) );
     m_params.emplace_back( new JOB_PARAM<int>( "height", &m_height, m_height ) );

common/jobs/job_pcb_render.h

@@ -60,7 +60,8 @@ public:
     {
         BASIC,
         HIGH,
-        USER
+        USER,
+        JOB_SETTINGS
     };
 
     enum class BG_STYLE
@@ -85,14 +86,17 @@ public:
     BG_STYLE    m_bgStyle = BG_STYLE::DEFAULT;
     int         m_width = 0;
     int         m_height = 0;
-    std::string m_colorPreset;
+    std::string m_appearancePreset;
     SIDE        m_side = SIDE::TOP;
     double      m_zoom = 1.0;
     bool        m_perspective = false;
     VECTOR3D    m_rotation;
     VECTOR3D    m_pan;
     VECTOR3D    m_pivot;
+    bool        m_proceduralTextures = false;
     bool        m_floor = false;
+    bool        m_antiAlias = true;
+    bool        m_postProcess = false;
     VECTOR3D    m_lightTopIntensity;
     VECTOR3D    m_lightBottomIntensity;
     VECTOR3D    m_lightCameraIntensity;

common/jobs/job_special_execute.h

@@ -24,6 +24,8 @@
 #include <wx/string.h>
 #include <jobs/job.h>
 
+#define OUTPUT_WORK_PATH_VAR_NAME wxT( "JOBSET_OUTPUT_WORK_PATH" )
+
 class KICOMMON_API JOB_SPECIAL_EXECUTE : public JOB
 {
 public:

common/jobs/jobset.cpp

@@ -32,11 +32,12 @@
 #include <reporter.h>
 
 #include <algorithm>
+#include <memory>
 
 const int jobsFileSchemaVersion = 1;
 
 
-KICOMMON_API std::map<JOBSET_DESTINATION_T, JOBSET_DESTINATION_T_INFO> JobsetDestinationTypeInfos = 
+KICOMMON_API std::map<JOBSET_DESTINATION_T, JOBSET_DESTINATION_T_INFO> JobsetDestinationTypeInfos =
 {
     { JOBSET_DESTINATION_T::FOLDER,
         { _HKI( "Folder" ), BITMAPS::small_folder, true, "" } },
@@ -134,24 +135,15 @@ JOBSET_DESTINATION::JOBSET_DESTINATION( const wxString& id, JOBSET_DESTINATION_T
 }
 
 
-JOBSET_DESTINATION::~JOBSET_DESTINATION()
-{
-    for( auto& [name, reporter] : m_lastRunReporters )
-        delete reporter;
-
-    m_lastRunReporters.clear();
-}
-
-
 void JOBSET_DESTINATION::InitOutputHandler()
 {
     if( m_type == JOBSET_DESTINATION_T::FOLDER )
     {
-        m_outputHandler = new JOBS_OUTPUT_FOLDER();
+        m_outputHandler = std::make_shared<JOBS_OUTPUT_FOLDER>( );
     }
     else if( m_type == JOBSET_DESTINATION_T::ARCHIVE )
     {
-        m_outputHandler = new JOBS_OUTPUT_ARCHIVE();
+        m_outputHandler = std::make_shared<JOBS_OUTPUT_ARCHIVE>( );
     }
 }
 
@@ -280,16 +272,24 @@ bool JOBSET::SaveToFile( const wxString& aDirectory, bool aForce )
 }
 
 
-JOBSET_DESTINATION* JOBSET::GetDestination( wxString& aDestination )
+JOBSET_DESTINATION* JOBSET::FindDestination( wxString& aDestinationStr )
 {
-    auto it = std::find_if( m_destinations.begin(), m_destinations.end(),
-                            [&]( const JOBSET_DESTINATION& destination )
-                            {
-                                if( destination.m_id == aDestination )
-                                    return true;
+    auto is_matching_dest = [&]( const JOBSET_DESTINATION& destination )
+    {
+        if( destination.m_id == aDestinationStr || destination.m_description == aDestinationStr )
+            return true;
 
-                                return false;
-                            } );
+        return false;
+    };
+
+    auto count = std::count_if( m_destinations.begin(), m_destinations.end(), is_matching_dest );
+
+    // we want to intentionally fail if more than one matching dest exists
+    // as theres no good way to handle it
+    if( count != 1 )
+        return nullptr;
+
+    auto it = std::find_if( m_destinations.begin(), m_destinations.end(), is_matching_dest );
 
     if( it != m_destinations.end() )
         return &(*it);

common/jobs/jobset.h

@@ -21,15 +21,52 @@
 #ifndef JOBS_FILE_H
 #define JOBS_FILE_H
 
+#include <reporter.h>
 #include <bitmaps/bitmaps_list.h>
 #include <jobs/job.h>
 #include <jobs/jobs_output.h>
 #include <settings/json_settings.h>
 #include <settings/parameters.h>
+#include <widgets/wx_progress_reporters.h>
 #include <ctime>
 #include <memory>
 
-class REPORTER;
+
+class JOBSET_OUTPUT_REPORTER : public WX_STRING_REPORTER
+{
+public:
+    JOBSET_OUTPUT_REPORTER( const wxString& aTempDirPath, PROGRESS_REPORTER* aProgressReporter ) :
+            m_tempDirPath( aTempDirPath ),
+            m_progressReporter( aProgressReporter )
+    {
+    }
+
+    REPORTER& Report( const wxString& aText, SEVERITY aSeverity ) override
+    {
+        wxString text( aText );
+
+        if( aSeverity == RPT_SEVERITY_DEBUG && !m_includeDebug )
+            return *this;
+
+        if( aSeverity == RPT_SEVERITY_ACTION )
+            text.Replace( m_tempDirPath, wxEmptyString );
+
+        if( m_progressReporter )
+        {
+            m_progressReporter->Report( text );
+            m_progressReporter->KeepRefreshing();
+        }
+
+        return WX_STRING_REPORTER::Report( text, aSeverity );
+    }
+
+private:
+    wxString           m_tempDirPath;
+    bool               m_includeDebug;
+    PROGRESS_REPORTER* m_progressReporter;
+};
+
+
 
 struct KICOMMON_API JOBSET_JOB
 {
@@ -79,26 +116,24 @@ struct KICOMMON_API JOBSET_DESTINATION
 
     JOBSET_DESTINATION( const wxString& id, JOBSET_DESTINATION_T type );
 
-    ~JOBSET_DESTINATION();
-
-    void                  InitOutputHandler();
-
-    wxString              m_id;
-    JOBSET_DESTINATION_T  m_type;
-    wxString              m_description;
-    JOBS_OUTPUT_HANDLER*  m_outputHandler;
-    std::vector<wxString> m_only;
+    void InitOutputHandler();
 
     wxString GetDescription() const;
     void SetDescription( const wxString& aDescription );
 
-    ///< Transient property, not stored for now
-    std::optional<bool>   m_lastRunSuccess;
-    std::unordered_map<wxString, std::optional<bool>> m_lastRunSuccessMap;
-    std::unordered_map<wxString, REPORTER*>           m_lastRunReporters;
-
     bool operator==( const JOBSET_DESTINATION& rhs ) const;
 
+public:
+    wxString              m_id;
+    JOBSET_DESTINATION_T  m_type;
+    wxString              m_description;
+    std::shared_ptr<JOBS_OUTPUT_HANDLER>  m_outputHandler;
+    std::vector<wxString> m_only;
+
+    ///< Transient property, not stored for now
+    std::optional<bool>                                                   m_lastRunSuccess;
+    std::unordered_map<wxString, std::optional<bool>>                     m_lastRunSuccessMap;
+    std::unordered_map<wxString, std::shared_ptr<JOBSET_OUTPUT_REPORTER>> m_lastRunReporters;
 };
 
 
@@ -118,7 +153,11 @@ public:
 
     std::vector<JOBSET_DESTINATION>& GetDestinations() { return m_destinations; }
 
-    JOBSET_DESTINATION* GetDestination( wxString& aDestination );
+    /**
+     * Attempts to find a destination based on the given string
+     * Both the uuid of the destination and description name are used
+     */
+    JOBSET_DESTINATION* FindDestination( wxString& aDestinationStr );
 
     bool SaveToFile( const wxString& aDirectory = "", bool aForce = false ) override;
 

common/kicad_curl/kicad_curl.cpp

@@ -28,11 +28,12 @@
 #include <kicad_curl/kicad_curl.h>
 
 #include <mutex>
+#include <atomic>
 #include <ki_exception.h>   // THROW_IO_ERROR
 
 
 static std::shared_mutex s_curlMutex;
-static bool              s_curlShuttingDown = false;
+static std::atomic<bool> s_curlShuttingDown = false;
 
 
 void KICAD_CURL::Init()
@@ -40,9 +41,7 @@ void KICAD_CURL::Init()
     s_curlShuttingDown = false;
 
     if( curl_global_init( CURL_GLOBAL_ALL ) != CURLE_OK )
-    {
         THROW_IO_ERROR( "curl_global_init() failed." );
-    }
 }
 
 

common/kicad_curl/kicad_curl_easy.cpp

@@ -84,6 +84,7 @@ static size_t stream_write_callback( void* aContents, size_t aSize, size_t aNmem
     return realsize;
 }
 
+
 #if LIBCURL_VERSION_NUM >= 0x072000 // 7.32.0
 
 static int xferinfo( void* aProgress, curl_off_t aDLtotal, curl_off_t aDLnow, curl_off_t aULtotal,
@@ -163,11 +164,9 @@ KICAD_CURL_EASY::KICAD_CURL_EASY() :
         curl_easy_setopt( m_CURL, CURLOPT_VERBOSE, 1L );
     }
 
-    wxPlatformInfo platformInfo;
     wxString application( wxS( "KiCad" ) );
     wxString version( GetBuildVersion() );
-    wxString platform = wxS( "(" ) + wxGetOsDescription() + wxS( ";" ) +
-                        GetPlatformGetBitnessName();
+    wxString platform = wxS( "(" ) + wxGetOsDescription() + wxS( ";" ) + GetPlatformGetBitnessName();
 
 #if defined( KICAD_BUILD_ARCH_X64 )
     platform << wxS( ";64-bit" );
@@ -181,8 +180,7 @@ KICAD_CURL_EASY::KICAD_CURL_EASY() :
 
     platform << wxS( ")" );
 
-    wxString user_agent = wxS( "KiCad/" ) + version + wxS( " " ) + platform + wxS( " " ) +
-                          application;
+    wxString user_agent = wxS( "KiCad/" ) + version + wxS( " " ) + platform + wxS( " " ) + application;
 
     user_agent << wxS( "/" ) << GetBuildDate();
     setOption<const char*>( CURLOPT_USERAGENT, user_agent.ToStdString().c_str() );
@@ -240,8 +238,7 @@ bool KICAD_CURL_EASY::SetUserAgent( const std::string& aAgent )
 }
 
 
-bool KICAD_CURL_EASY::SetPostFields(
-        const std::vector<std::pair<std::string, std::string>>& aFields )
+bool KICAD_CURL_EASY::SetPostFields( const std::vector<std::pair<std::string, std::string>>& aFields )
 {
     std::string postfields;
 
@@ -325,8 +322,8 @@ std::string KICAD_CURL_EASY::Escape( const std::string& aUrl )
 
 bool KICAD_CURL_EASY::SetTransferCallback( const TRANSFER_CALLBACK& aCallback, size_t aInterval )
 {
-    progress = std::make_unique<CURL_PROGRESS>( this, aCallback,
-                                                static_cast<curl_off_t>( aInterval ) );
+    progress = std::make_unique<CURL_PROGRESS>( this, aCallback, static_cast<curl_off_t>( aInterval ) );
+
 #if LIBCURL_VERSION_NUM >= 0x072000 // 7.32.0
     setOption( CURLOPT_XFERINFOFUNCTION, xferinfo );
     setOption( CURLOPT_XFERINFODATA, progress.get() );

common/kiway.cpp

@@ -452,8 +452,9 @@ KIWAY_PLAYER* KIWAY::Player( FRAME_T aFrameType, bool doCreate, wxTopLevelWindow
                                             m_ctl       // questionable need, these same flags
                                                         // were passed to KIFACE::OnKifaceStart()
                                             );
+            if( frame )
+                m_playerFrameId[aFrameType].store( frame->GetId() );
 
-            m_playerFrameId[aFrameType].store( frame->GetId() );
             return frame;
         }
         catch( ... )
@@ -708,11 +709,11 @@ bool KIWAY::ProcessEvent( wxEvent& aEvent )
 }
 
 
-int KIWAY::ProcessJob( KIWAY::FACE_T aFace, JOB* job, REPORTER* aReporter )
+int KIWAY::ProcessJob( KIWAY::FACE_T aFace, JOB* job, REPORTER* aReporter, PROGRESS_REPORTER* aProgressReporter )
 {
     KIFACE* kiface = KiFACE( aFace );
 
-    return kiface->HandleJob( job, aReporter );
+    return kiface->HandleJob( job, aReporter, aProgressReporter );
 }
 
 

common/lib_table_base.cpp

@@ -217,17 +217,14 @@ const wxString LIB_TABLE::GetDescription( const wxString& aNickname )
 
 bool LIB_TABLE::HasLibrary( const wxString& aNickname, bool aCheckEnabled ) const
 {
-    const LIB_TABLE_ROW* row = findRow( aNickname, aCheckEnabled );
-
-    if( row == nullptr )
-        return false;
-
-    return true;
+    return findRow( aNickname, aCheckEnabled ) != nullptr;
 }
 
 
 bool LIB_TABLE::HasLibraryWithPath( const wxString& aPath ) const
 {
+    std::shared_lock<std::shared_mutex> lock( m_mutex );
+
     for( const LIB_TABLE_ROW& row : m_rows )
     {
         if( row.GetFullURI() == aPath )
@@ -253,12 +250,12 @@ wxString LIB_TABLE::GetFullURI( const wxString& aNickname, bool aExpandEnvVars )
 
 LIB_TABLE_ROW* LIB_TABLE::findRow( const wxString& aNickName, bool aCheckIfEnabled ) const
 {
-    LIB_TABLE_ROW* row = nullptr;
-    LIB_TABLE* cur = (LIB_TABLE*) this;
+    const LIB_TABLE* cur = this;
 
     do
     {
         std::shared_lock<std::shared_mutex> lock( cur->m_mutex );
+        LIB_TABLE_ROW*                      row = nullptr;
 
         if( cur->m_rowsMap.count( aNickName ) )
             row = &*cur->m_rowsMap.at( aNickName );
@@ -296,16 +293,18 @@ LIB_TABLE_ROW* LIB_TABLE::findRow( const wxString& aNickName, bool aCheckIfEnabl
 
 const LIB_TABLE_ROW* LIB_TABLE::FindRowByURI( const wxString& aURI )
 {
-    LIB_TABLE* cur = this;
+    const LIB_TABLE* cur = this;
 
     do
     {
-        for( unsigned i = 0; i < cur->m_rows.size(); i++ )
+        std::shared_lock<std::shared_mutex> lock( cur->m_mutex );
+
+        for( const LIB_TABLE_ROW& row : cur->m_rows)
         {
-            const wxString tmp = cur->m_rows[i].GetFullURI( true );
+            const wxString tmp = row.GetFullURI( true );
 
             if( m_io->UrisAreEquivalent( tmp, aURI ) )
-                return &cur->m_rows[i];
+                return &row;
         }
 
         // not found, search fall back table(s), if any
@@ -326,6 +325,8 @@ std::vector<wxString> LIB_TABLE::GetLogicalLibs()
 
     do
     {
+        std::shared_lock<std::shared_mutex> lock( cur->m_mutex );
+
         for( const LIB_TABLE_ROW& row : cur->m_rows )
         {
             if( row.GetIsEnabled() )
@@ -337,8 +338,8 @@ std::vector<wxString> LIB_TABLE::GetLogicalLibs()
     ret.reserve( unique.size() );
 
     // return a sorted, unique set of nicknames in a std::vector<wxString> to caller
-    for( std::set< wxString >::const_iterator it = unique.begin();  it!=unique.end();  ++it )
-        ret.push_back( *it );
+    for( const wxString& nickname : unique )
+        ret.push_back( nickname );
 
     // We want to allow case-sensitive duplicates but sort by case-insensitive ordering
     std::sort( ret.begin(), ret.end(),
@@ -356,7 +357,6 @@ bool LIB_TABLE::InsertRow( LIB_TABLE_ROW* aRow, bool doReplace )
     std::lock_guard<std::shared_mutex> lock( m_mutex );
 
     doInsertRow( aRow, doReplace );
-    reindex();
 
     return true;
 }
@@ -540,9 +540,7 @@ void LIB_TABLE::Save( const wxString& aFileName ) const
     std::unique_ptr<OUTPUTFORMATTER> sf = m_io->GetWriter( aFileName );
 
     if( !sf )
-    {
         THROW_IO_ERROR( wxString::Format( _( "Failed to get writer for %s" ), aFileName ) );
-    }
 
     // Force the lib table version to 7 before saving
     m_version = 7;

common/lib_tree_model.cpp

@@ -30,15 +30,6 @@
 
 
 
-void LIB_TREE_NODE::ResetScore()
-{
-    for( std::unique_ptr<LIB_TREE_NODE>& child: m_Children )
-        child->ResetScore();
-
-    m_Score = 0;
-}
-
-
 void LIB_TREE_NODE::AssignIntrinsicRanks( bool presorted )
 {
     std::vector<LIB_TREE_NODE*> sort_buf;
@@ -174,17 +165,14 @@ LIB_TREE_NODE_UNIT::LIB_TREE_NODE_UNIT( LIB_TREE_NODE* aParent, LIB_TREE_ITEM* a
 void LIB_TREE_NODE_UNIT::UpdateScore( const std::vector<std::unique_ptr<EDA_COMBINED_MATCHER>>& aMatchers,
                                       std::function<bool( LIB_TREE_NODE& aNode )>* aFilter )
 {
+    m_Score = 1;
+
     // aMatchers test results are inherited from parent
     if( !aMatchers.empty() )
         m_Score = m_Parent->m_Score;
 
-    // aFilter test is subtractive
     if( aFilter && !(*aFilter)(*this) )
         m_Score = 0;
-
-    // show all nodes if no search/filter/etc. criteria are given
-    if( aMatchers.empty() && ( !aFilter || (*aFilter)(*this) ) )
-        m_Score = 1;
 }
 
 
@@ -246,19 +234,24 @@ void LIB_TREE_NODE_ITEM::Update( LIB_TREE_ITEM* aItem )
 void LIB_TREE_NODE_ITEM::UpdateScore( const std::vector<std::unique_ptr<EDA_COMBINED_MATCHER>>& aMatchers,
                                       std::function<bool( LIB_TREE_NODE& aNode )>* aFilter )
 {
-    m_Score = 0;
+    m_Score = 1;
 
     for( const std::unique_ptr<EDA_COMBINED_MATCHER>& matcher : aMatchers )
-        m_Score += matcher->ScoreTerms( m_SearchTerms );
+    {
+        int score = matcher->ScoreTerms( m_SearchTerms );
+
+        if( score == 0 )
+        {
+            m_Score = 0;
+            break;
+        }
+
+        m_Score += score;
+    }
 
-    // aFilter test is subtractive
     if( aFilter && !(*aFilter)(*this) )
         m_Score = 0;
 
-    // show all nodes if no search/filter/etc. criteria are given
-    if( aMatchers.empty() && ( !aFilter || (*aFilter)(*this) ) )
-        m_Score = 1;
-
     for( std::unique_ptr<LIB_TREE_NODE>& child: m_Children )
         child->UpdateScore( aMatchers, aFilter );
 }
@@ -290,25 +283,31 @@ void LIB_TREE_NODE_LIBRARY::UpdateScore( const std::vector<std::unique_ptr<EDA_C
 {
     if( m_Children.empty() )
     {
+        m_Score = 1;
+
         for( const std::unique_ptr<EDA_COMBINED_MATCHER>& matcher : aMatchers )
-            m_Score += matcher->ScoreTerms( m_SearchTerms );
+        {
+            int score = matcher->ScoreTerms( m_SearchTerms );
+
+            if( score == 0 )
+            {
+                m_Score = 0;
+                break;
+            }
+
+            m_Score += score;
+        }
     }
     else
     {
-        int maxChildScore = 0;
+        m_Score = 0;
 
         for( std::unique_ptr<LIB_TREE_NODE>& child: m_Children )
         {
             child->UpdateScore( aMatchers, aFilter );
-            maxChildScore = std::max( maxChildScore, child->m_Score );
+            m_Score = std::max( m_Score, child->m_Score );
         }
-
-        m_Score = std::max( m_Score, maxChildScore );
     }
-
-    // show all nodes if no search/filter/etc. criteria are given
-    if( m_Children.empty() && aMatchers.empty() && ( !aFilter || (*aFilter)(*this) ) )
-        m_Score = 1;
 }
 
 

common/lib_tree_model_adapter.cpp

@@ -286,8 +286,6 @@ void LIB_TREE_MODEL_ADAPTER::UpdateSearchString( const wxString& aSearch, bool a
         Freeze();
         BeforeReset();
 
-        m_tree.ResetScore();
-
         // Don't cause KiCad to hang if someone accidentally pastes the PCB or schematic into
         // the search box.
         constexpr int MAX_TERMS = 100;

common/libeval_compiler/libeval_compiler.cpp

@@ -60,7 +60,7 @@ namespace LIBEVAL
 
 TREE_NODE* newNode( LIBEVAL::COMPILER* compiler, int op, const T_TOKEN_VALUE& value )
 {
-    auto t2          = new TREE_NODE();
+    TREE_NODE* t2    = new TREE_NODE();
 
     t2->valid        = true;
     t2->value.str    = value.str ? new wxString( *value.str ) : nullptr;
@@ -88,16 +88,25 @@ static const wxString formatOpName( int op )
 {
     static const struct
     {
-        int         op;
+        int      op;
         wxString mnemonic;
     }
     simpleOps[] =
     {
-        { TR_OP_MUL, "MUL" }, { TR_OP_DIV, "DIV" }, { TR_OP_ADD, "ADD" },
-        { TR_OP_SUB, "SUB" }, { TR_OP_LESS, "LESS" }, { TR_OP_GREATER, "GREATER" },
-        { TR_OP_LESS_EQUAL, "LESS_EQUAL" }, { TR_OP_GREATER_EQUAL, "GREATER_EQUAL" },
-        { TR_OP_EQUAL, "EQUAL" }, { TR_OP_NOT_EQUAL, "NEQUAL" }, { TR_OP_BOOL_AND, "AND" },
-        { TR_OP_BOOL_OR, "OR" }, { TR_OP_BOOL_NOT, "NOT" }, { -1, "" }
+        { TR_OP_MUL, "MUL" },
+        { TR_OP_DIV, "DIV" },
+        { TR_OP_ADD, "ADD" },
+        { TR_OP_SUB, "SUB" },
+        { TR_OP_LESS, "LESS" },
+        { TR_OP_GREATER, "GREATER" },
+        { TR_OP_LESS_EQUAL, "LESS_EQUAL" },
+        { TR_OP_GREATER_EQUAL, "GREATER_EQUAL" },
+        { TR_OP_EQUAL, "EQUAL" },
+        { TR_OP_NOT_EQUAL, "NEQUAL" },
+        { TR_OP_BOOL_AND, "AND" },
+        { TR_OP_BOOL_OR, "OR" },
+        { TR_OP_BOOL_NOT, "NOT" },
+        { -1, "" }
     };
 
     for( int i = 0; simpleOps[i].op >= 0; i++ )
@@ -154,14 +163,12 @@ wxString UOP::Format() const
         break;
 
     case TR_UOP_PUSH_VALUE:
-    {
         if( !m_value )
             str = wxString::Format( "PUSH nullptr" );
         else if( m_value->GetType() == VT_NUMERIC )
             str = wxString::Format( "PUSH NUM [%.10f]", m_value->AsDouble() );
         else
             str = wxString::Format( "PUSH STR [%ls]", m_value->AsString() );
-    }
         break;
 
     case TR_OP_METHOD_CALL:
@@ -183,10 +190,8 @@ wxString UOP::Format() const
 
 UCODE::~UCODE()
 {
-    for ( auto op : m_ucode )
-    {
+    for( UOP* op : m_ucode )
         delete op;
-    }
 }
 
 
@@ -194,7 +199,7 @@ wxString UCODE::Dump() const
 {
     wxString rv;
 
-    for( auto op : m_ucode )
+    for( UOP* op : m_ucode )
     {
         rv += op->Format();
         rv += "\n";
@@ -253,7 +258,7 @@ bool TOKENIZER::MatchAhead( const wxString& match,
 
 
 COMPILER::COMPILER() :
-    m_lexerState( COMPILER::LS_DEFAULT )
+        m_lexerState( COMPILER::LS_DEFAULT )
 {
     m_localeDecimalSeparator = '.';
     m_sourcePos = 0;
@@ -295,10 +300,10 @@ void COMPILER::Clear()
 
     m_tree = nullptr;
 
-    for( auto tok : m_gcItems )
+    for( TREE_NODE* tok : m_gcItems )
         delete tok;
 
-    for( auto tok: m_gcStrings )
+    for( wxString* tok: m_gcStrings )
         delete tok;
 
     m_gcItems.clear();
@@ -393,6 +398,7 @@ T_TOKEN COMPILER::getToken()
         case LS_DEFAULT:
             done = lexDefault( rv );
             break;
+
         case LS_STRING:
             done = lexString( rv );
             break;
@@ -419,7 +425,11 @@ int COMPILER::resolveUnits()
 
     for( const wxString& unitName : m_unitResolver->GetSupportedUnits() )
     {
-        if( m_tokenizer.MatchAhead( unitName, []( int c ) -> bool { return !isalnum( c ); } ) )
+        if( m_tokenizer.MatchAhead( unitName,
+                                    []( int c ) -> bool
+                                    {
+                                        return !isalnum( c );
+                                    } ) )
         {
             libeval_dbg(10, "Match unit '%s'\n", unitName.c_str() );
             m_tokenizer.NextChar( unitName.length() );
@@ -486,7 +496,6 @@ bool COMPILER::lexDefault( T_TOKEN& aToken )
                 }
             };
 
-
     int ch;
 
     // Start processing of first/next token: Remove whitespace
@@ -586,8 +595,7 @@ bool COMPILER::lexDefault( T_TOKEN& aToken )
         case ',': retval.token = G_COMMA;        break;
 
         default:
-            reportError( CST_PARSE, wxString::Format( _( "Unrecognized character '%c'" ),
-                                                      (char) ch ) );
+            reportError( CST_PARSE, wxString::Format( _( "Unrecognized character '%c'" ), (char) ch ) );
             break;
         }
 
@@ -778,9 +786,7 @@ static std::vector<TREE_NODE*> squashParamList( TREE_NODE* root )
     std::vector<TREE_NODE*> args;
 
     if( !root )
-    {
         return args;
-    }
 
     if( root->op != TR_ARG_LIST && root->op != TR_NULL )
     {
@@ -798,9 +804,7 @@ static std::vector<TREE_NODE*> squashParamList( TREE_NODE* root )
         } while ( n && n->op == TR_ARG_LIST );
 
         if( n )
-        {
             args.push_back( n );
-        }
     }
 
     std::reverse( args.begin(), args.end() );
@@ -816,6 +820,9 @@ bool COMPILER::generateUCode( UCODE* aCode, CONTEXT* aPreflightContext )
 {
     std::vector<TREE_NODE*> stack;
     wxString                msg;
+    int                     numericValueCount = 0;
+    wxString                missingUnitsMsg;
+    int                     missingUnitsSrcPos = 0;
 
     if( !m_tree )
     {
@@ -838,8 +845,7 @@ bool COMPILER::generateUCode( UCODE* aCode, CONTEXT* aPreflightContext )
     {
         TREE_NODE* node = stack.back();
 
-        libeval_dbg( 4, "process node %p [op %d] [stack %lu]\n",
-                     node, node->op, (unsigned long)stack.size() );
+        libeval_dbg( 4, "process node %p [op %d] [stack %lu]\n", node, node->op, (unsigned long)stack.size() );
 
         // process terminal nodes first
         switch( node->op )
@@ -847,10 +853,7 @@ bool COMPILER::generateUCode( UCODE* aCode, CONTEXT* aPreflightContext )
         case TR_OP_FUNC_CALL:
             // Function call's uop was generated inside TR_STRUCT_REF
             if( !node->uop )
-            {
-                reportError( CST_CODEGEN,  _( "Unknown parent of function parameters" ),
-                             node->srcPos );
-            }
+                reportError( CST_CODEGEN,  _( "Unknown parent of function parameters" ), node->srcPos );
 
             node->isTerminal = true;
             break;
@@ -891,14 +894,12 @@ bool COMPILER::generateUCode( UCODE* aCode, CONTEXT* aPreflightContext )
                     if( !vref )
                     {
                         msg.Printf( _( "Unrecognized item '%s'" ), itemName );
-                        reportError( CST_CODEGEN, msg,
-                                     node->leaf[0]->srcPos - (int) itemName.length() );
+                        reportError( CST_CODEGEN, msg, node->leaf[0]->srcPos - (int) itemName.length() );
                     }
                     else if( vref->GetType() == VT_PARSE_ERROR )
                     {
                         msg.Printf( _( "Unrecognized property '%s'" ), propName );
-                        reportError( CST_CODEGEN, msg,
-                                     node->leaf[1]->srcPos - (int) propName.length() );
+                        reportError( CST_CODEGEN, msg, node->leaf[1]->srcPos - (int) propName.length() );
                     }
 
                     node->leaf[0]->isVisited = true;
@@ -921,8 +922,7 @@ bool COMPILER::generateUCode( UCODE* aCode, CONTEXT* aPreflightContext )
                     if( !vref )
                     {
                         msg.Printf( _( "Unrecognized item '%s'" ), itemName );
-                        reportError( CST_CODEGEN, msg,
-                                     node->leaf[0]->srcPos - (int) itemName.length() );
+                        reportError( CST_CODEGEN, msg, node->leaf[0]->srcPos - (int) itemName.length() );
                     }
 
                     wxString functionName = formatNode( node->leaf[1]->leaf[0] );
@@ -995,8 +995,7 @@ bool COMPILER::generateUCode( UCODE* aCode, CONTEXT* aPreflightContext )
                     if( !vref )
                     {
                         msg.Printf( _( "Unrecognized item '%s'" ), itemName );
-                        reportError( CST_CODEGEN, msg,
-                                     node->leaf[0]->srcPos - (int) itemName.length() );
+                        reportError( CST_CODEGEN, msg, node->leaf[0]->srcPos - (int) itemName.length() );
                     }
 
                     msg.Printf( _( "Unrecognized property '%s'" ), propName );
@@ -1038,10 +1037,10 @@ bool COMPILER::generateUCode( UCODE* aCode, CONTEXT* aPreflightContext )
             {
                 if( !m_unitResolver->GetSupportedUnitsMessage().empty() )
                 {
-                    msg.Printf( _( "Missing units for '%s'| (%s)" ),
-                                formatNode( node ),
-                                m_unitResolver->GetSupportedUnitsMessage() );
-                    reportError( CST_CODEGEN, msg, node->srcPos );
+                    missingUnitsMsg.Printf( _( "Missing units for '%s'| (%s)" ),
+                                            formatNode( node ),
+                                            m_unitResolver->GetSupportedUnitsMessage() );
+                    missingUnitsSrcPos = node->srcPos;
                 }
 
                 value = EDA_UNIT_UTILS::UI::DoubleValueFromString( formatNode( node ) );
@@ -1049,6 +1048,7 @@ bool COMPILER::generateUCode( UCODE* aCode, CONTEXT* aPreflightContext )
 
             node->SetUop( TR_UOP_PUSH_VALUE, value );
             node->isTerminal = true;
+            numericValueCount++;
             break;
         }
 
@@ -1111,6 +1111,17 @@ bool COMPILER::generateUCode( UCODE* aCode, CONTEXT* aPreflightContext )
         stack.pop_back();
     }
 
+    // Report the common error condition of a single numeric value with no units (which will result in
+    // nanometers, and rarely leads to anything useful).
+    // Reporting missing units with multiple numeric values is far more complicated as we have to
+    // separate comparison operators from multiplicative operators from additive operators.  Consider:
+    //   2 * 1.5mm
+    //   2mm + 105um
+    //   2mm > 20um
+    //   (2mm + 1.5mm) * 3
+    if( !missingUnitsMsg.IsEmpty() && numericValueCount == 1 )
+        reportError( CST_CODEGEN, missingUnitsMsg, missingUnitsSrcPos );
+
     libeval_dbg(2,"dump: \n%s\n", aCode->Dump().c_str() );
 
     return true;
@@ -1131,8 +1142,8 @@ void UOP::Exec( CONTEXT* ctx )
             value = ctx->AllocValue();
 
         ctx->Push( value );
-    }
         break;
+    }
 
     case TR_UOP_PUSH_VALUE:
         ctx->Push( m_value.get() );
@@ -1175,27 +1186,34 @@ void UOP::Exec( CONTEXT* ctx )
         case TR_OP_ADD:
             result = AS_DOUBLE( arg1 ) + AS_DOUBLE( arg2 );
             break;
+
         case TR_OP_SUB:
             result = AS_DOUBLE( arg1 ) - AS_DOUBLE( arg2 );
             break;
+
         case TR_OP_MUL:
             result = AS_DOUBLE( arg1 ) * AS_DOUBLE( arg2 );
             break;
+
         case TR_OP_DIV:
             result = AS_DOUBLE( arg1 ) / AS_DOUBLE( arg2 );
             break;
+
         case TR_OP_LESS_EQUAL:
             result = AS_DOUBLE( arg1 ) <= AS_DOUBLE( arg2 ) ? 1 : 0;
             break;
+
         case TR_OP_GREATER_EQUAL:
             result = AS_DOUBLE( arg1 ) >= AS_DOUBLE( arg2 ) ? 1 : 0;
             break;
+
         case TR_OP_LESS:
             result = AS_DOUBLE( arg1 ) < AS_DOUBLE( arg2 ) ? 1 : 0;
             break;
         case TR_OP_GREATER:
             result = AS_DOUBLE( arg1 ) > AS_DOUBLE( arg2 ) ? 1 : 0;
             break;
+
         case TR_OP_EQUAL:
             if( !arg1 || !arg2 )
                 result = arg1 == arg2 ? 1 : 0;
@@ -1204,6 +1222,7 @@ void UOP::Exec( CONTEXT* ctx )
             else
                 result = arg1->EqualTo( ctx, arg2 ) ? 1 : 0;
             break;
+
         case TR_OP_NOT_EQUAL:
             if( !arg1 || !arg2 )
                 result = arg1 != arg2 ? 1 : 0;
@@ -1212,18 +1231,21 @@ void UOP::Exec( CONTEXT* ctx )
             else
                 result = arg1->NotEqualTo( ctx, arg2 ) ? 1 : 0;
             break;
+
         case TR_OP_BOOL_AND:
             result = AS_DOUBLE( arg1 ) != 0.0 && AS_DOUBLE( arg2 ) != 0.0 ? 1 : 0;
             break;
+
         case TR_OP_BOOL_OR:
             result = AS_DOUBLE( arg1 ) != 0.0 || AS_DOUBLE( arg2 ) != 0.0 ? 1 : 0;
             break;
+
         default:
             result = 0.0;
             break;
         }
 
-        auto rp = ctx->AllocValue();
+        VALUE* rp = ctx->AllocValue();
         rp->Set( result );
         ctx->Push( rp );
         return;
@@ -1244,7 +1266,7 @@ void UOP::Exec( CONTEXT* ctx )
             break;
         }
 
-        auto rp = ctx->AllocValue();
+        VALUE* rp = ctx->AllocValue();
         rp->Set( result );
         ctx->Push( rp );
         return;
@@ -1254,8 +1276,6 @@ void UOP::Exec( CONTEXT* ctx )
 
 VALUE* UCODE::Run( CONTEXT* ctx )
 {
-    static VALUE g_false( 0 );
-
     try
     {
         for( UOP* op : m_ucode )
@@ -1264,7 +1284,8 @@ VALUE* UCODE::Run( CONTEXT* ctx )
     catch(...)
     {
         // rules which fail outright should not be fired
-        return &g_false;
+        std::unique_ptr<VALUE> temp_false = std::make_unique<VALUE>( 0 );
+        return ctx->StoreValue( temp_false.get() );
     }
 
     if( ctx->SP() == 1 )
@@ -1280,7 +1301,8 @@ VALUE* UCODE::Run( CONTEXT* ctx )
         wxASSERT( ctx->SP() == 1 );
 
         // non-well-formed rules should not be fired on a release build
-        return &g_false;
+        std::unique_ptr<VALUE> temp_false = std::make_unique<VALUE>( 0 );
+        return ctx->StoreValue( temp_false.get() );
     }
 }
 

common/lset.cpp

@@ -223,9 +223,10 @@ wxString LSET::Name( PCB_LAYER_ID aLayerId )
     case Rescue:            txt = wxT( "Rescue" );          break;
 
     default:
-
         if( aLayerId < 0 )
+        {
             txt = wxT( "UNDEFINED" );
+        }
         else if( static_cast<int>( aLayerId ) & 1 )
         {
             int offset = ( aLayerId - Rescue ) / 2;
@@ -236,8 +237,6 @@ wxString LSET::Name( PCB_LAYER_ID aLayerId )
             int offset = ( aLayerId - B_Cu ) / 2;
             txt = wxString::Format( wxT( "In%d.Cu" ), offset );
         }
-
-
     }
 
     return txt;
@@ -561,10 +560,10 @@ const LSET& LSET::BackAssembly()
 const LSET& LSET::InternalCuMask()
 {
     static LSET saved( { In1_Cu,  In2_Cu,  In3_Cu,  In4_Cu,  In5_Cu,  In6_Cu,
-                               In7_Cu,  In8_Cu,  In9_Cu,  In10_Cu, In11_Cu, In12_Cu,
-                               In13_Cu, In14_Cu, In15_Cu, In16_Cu, In17_Cu, In18_Cu,
-                               In19_Cu, In20_Cu, In21_Cu, In22_Cu, In23_Cu, In24_Cu,
-                               In25_Cu, In26_Cu, In27_Cu, In28_Cu, In29_Cu, In30_Cu } );
+                         In7_Cu,  In8_Cu,  In9_Cu,  In10_Cu, In11_Cu, In12_Cu,
+                         In13_Cu, In14_Cu, In15_Cu, In16_Cu, In17_Cu, In18_Cu,
+                         In19_Cu, In20_Cu, In21_Cu, In22_Cu, In23_Cu, In24_Cu,
+                         In25_Cu, In26_Cu, In27_Cu, In28_Cu, In29_Cu, In30_Cu } );
     return saved;
 }
 
@@ -582,20 +581,18 @@ LSET allCuMask( int aCuLayerCount )
 
 LSET LSET::AllCuMask( int aCuLayerCount )
 {
-    static LSET savedMax = allCuMask( MAX_CU_LAYERS );
-    static LSET cache;
-    static int  cacheCuLayerCount = -1;
-
     if( aCuLayerCount == MAX_CU_LAYERS )
-        return savedMax;
+        return AllCuMask();
 
-    if( aCuLayerCount != cacheCuLayerCount )
-    {
-        cache = allCuMask( aCuLayerCount );
-        cacheCuLayerCount = aCuLayerCount;
-    }
+    return allCuMask( aCuLayerCount );
+}
 
-    return cache;
+
+LSET LSET::AllCuMask()
+{
+    static LSET s_savedMax = allCuMask( MAX_CU_LAYERS );
+
+    return s_savedMax;
 }
 
 

common/netclass.cpp

@@ -278,7 +278,7 @@ bool NETCLASS::ContainsNetclassWithName( const wxString& netclass ) const
     return std::any_of( m_constituents.begin(), m_constituents.end(),
                         [&netclass]( const NETCLASS* nc )
                         {
-                            return nc->GetName() == netclass;
+                            return nc && nc->GetName() == netclass;
                         } );
 }
 
@@ -294,17 +294,23 @@ const wxString NETCLASS::GetHumanReadableName() const
 
     if( m_constituents.size() == 2 )
     {
-        name.Printf( _( "%s and %s" ), m_constituents[0]->GetName(), m_constituents[1]->GetName() );
+        name.Printf( _( "%s and %s" ),
+                     m_constituents[0]->GetName(),
+                     m_constituents[1]->GetName() );
     }
     else if( m_constituents.size() == 3 )
     {
-        name.Printf( _( "%s, %s and %s" ), m_constituents[0]->GetName(),
-                     m_constituents[1]->GetName(), m_constituents[2]->GetName() );
+        name.Printf( _( "%s, %s and %s" ),
+                     m_constituents[0]->GetName(),
+                     m_constituents[1]->GetName(),
+                     m_constituents[2]->GetName() );
     }
     else if( m_constituents.size() > 3 )
     {
-        name.Printf( _( "%s, %s and %d more" ), m_constituents[0]->GetName(),
-                     m_constituents[1]->GetName(), static_cast<int>( m_constituents.size() - 2 ) );
+        name.Printf( _( "%s, %s and %d more" ),
+                     m_constituents[0]->GetName(),
+                     m_constituents[1]->GetName(),
+                     static_cast<int>( m_constituents.size() - 2 ) );
     }
 
     return name;

common/paths.cpp

@@ -136,7 +136,7 @@ wxString PATHS::GetDefault3rdPartyPath()
 
     tmp.AppendDir( wxT( "3rdparty" ) );
 
-    return tmp.GetPath();
+    return tmp.GetAbsolutePath();
 }
 
 

common/plotters/DXF_plotter.cpp

@@ -111,6 +111,8 @@ static const char* getDXFLineType( LINE_STYLE aType )
         return "DOTTED";
     case LINE_STYLE::DASHDOT:
         return "DASHDOT";
+    case LINE_STYLE::DASHDOTDOT:
+        return "DIVIDE";
     default:
         wxFAIL_MSG( "Unhandled LINE_STYLE" );
         return "CONTINUOUS";

common/plotters/HPGL_plotter.cpp

@@ -211,7 +211,7 @@ static double dpoint_dist( const VECTOR2D& a, const VECTOR2D& b );
 // PM 2; ends the polygon definition and closes it if not closed
 // FP;   fills the polygon
 // EP;   draws the polygon outline. It usually gives a better look to the filled polygon
-static const char hpgl_end_polygon_cmd[] = "PM 2; FP; EP;\n";
+static const char hpgl_end_polygon_cmd[] = "PM 2; EP; FP;\n";
 
 
 // HPGL scale factor (1 Plotter Logical Unit = 1/40mm = 25 micrometers)

common/plotters/PDF_plotter.cpp

@@ -1658,9 +1658,8 @@ void PDF_PLOTTER::Text( const VECTOR2I&        aPos,
 
     wxStringTokenizer str_tok( aText, " ", wxTOKEN_RET_DELIMS );
 
-    // If aFont is not specilied (== nullptr), use the default kicad stroke font
     if( !aFont )
-        aFont = KIFONT::FONT::GetFont();
+        aFont = KIFONT::FONT::GetFont( m_renderSettings->GetDefaultFont() );
 
     VECTOR2I full_box( aFont->StringBoundaryLimits( aText, t_size, aWidth, aBold, aItalic,
                                                     aFontMetrics ) );

common/plotters/common_plot_functions.cpp

@@ -136,15 +136,9 @@ void PlotDrawingSheet( PLOTTER* plotter, const PROJECT* aProject, const TITLE_BL
         case WSG_TEXT_T:
         {
             DS_DRAW_ITEM_TEXT* text = (DS_DRAW_ITEM_TEXT*) item;
-            KIFONT::FONT*      font = text->GetFont();
+            KIFONT::FONT*      font = text->GetDrawFont( settings );
             COLOR4D            color = plotColor;
 
-            if( !font )
-            {
-                font = KIFONT::FONT::GetFont( settings->GetDefaultFont(), text->IsBold(),
-                                              text->IsItalic() );
-            }
-
             if( plotter->GetColorMode() && text->GetTextColor() != COLOR4D::UNSPECIFIED )
                 color = text->GetTextColor();
 
@@ -154,8 +148,8 @@ void PlotDrawingSheet( PLOTTER* plotter, const PROJECT* aProject, const TITLE_BL
                            text->GetTextAngle(), text->GetTextSize(), text->GetHorizJustify(),
                            text->GetVertJustify(), penWidth, text->IsItalic(), text->IsBold(),
                            text->IsMultilineAllowed(), font, text->GetFontMetrics() );
-        }
             break;
+        }
 
         case WSG_POLY_T:
         {

common/plotters/plotter.cpp

@@ -688,7 +688,7 @@ void PLOTTER::PlotPoly( const SHAPE_LINE_CHAIN& aCornerList, FILL_T aFill, int a
 }
 
 
-void PLOTTER::Text( const VECTOR2I&       aPos,
+void PLOTTER::Text( const VECTOR2I&        aPos,
                     const COLOR4D&         aColor,
                     const wxString&        aText,
                     const EDA_ANGLE&       aOrient,
@@ -745,7 +745,7 @@ void PLOTTER::Text( const VECTOR2I&       aPos,
     }
 
     if( !aFont )
-        aFont = KIFONT::FONT::GetFont();
+        aFont = KIFONT::FONT::GetFont( m_renderSettings->GetDefaultFont() );
 
     aFont->Draw( &callback_gal, aText, aPos, attributes, aFontMetrics );
 }
@@ -790,7 +790,7 @@ void PLOTTER::PlotText( const VECTOR2I&        aPos,
             } );
 
     if( !aFont )
-        aFont = KIFONT::FONT::GetFont();
+        aFont = KIFONT::FONT::GetFont( m_renderSettings->GetDefaultFont() );
 
     aFont->Draw( &callback_gal, aText, aPos, attributes, aFontMetrics );
 }

common/preview_items/polygon_geom_manager.cpp

@@ -107,7 +107,8 @@ bool POLYGON_GEOM_MANAGER::IsSelfIntersecting( bool aIncludeLeaderPts ) const
 
 void POLYGON_GEOM_MANAGER::SetCursorPosition( const VECTOR2I& aPos )
 {
-    updateTemporaryLines( aPos );
+    if( m_lockedPoints.PointCount() > 0 )
+        updateTemporaryLines( aPos );
 }
 
 

common/preview_items/ruler_item.cpp

@@ -338,14 +338,15 @@ void RULER_ITEM::ViewDraw( int aLayer, KIGFX::VIEW* aView ) const
     DrawTextNextToCursor( aView, end, -rulerVec, cursorStrings, drawingDropShadows );
 
     // basic tick size
-    const double minorTickLen = 5.0 / gal->GetWorldScale();
-    const double majorTickLen = minorTickLen * majorTickLengthFactor;
+    double minorTickLen = 5.0 / gal->GetWorldScale();
+    double majorTickLen = minorTickLen * majorTickLengthFactor;
+
+    minorTickLen = std::min( minorTickLen, (double) INT_MAX / 2.0 );
+    majorTickLen = std::min( majorTickLen, (double) INT_MAX / 2.0 );
 
     if( m_showTicks )
     {
-        drawTicksAlongLine( aView, origin, rulerVec, minorTickLen, m_iuScale, m_userUnits,
-                            drawingDropShadows );
-
+        drawTicksAlongLine( aView, origin, rulerVec, minorTickLen, m_iuScale, m_userUnits, drawingDropShadows );
         drawBacksideTicks( aView, origin, rulerVec, majorTickLen, 2, drawingDropShadows );
     }
 
@@ -388,11 +389,10 @@ wxArrayString RULER_ITEM::GetDimensionStrings() const
     cursorStrings.push_back( DimensionLabel( "x", temp.x, m_iuScale, m_userUnits ) );
     cursorStrings.push_back( DimensionLabel( "y", temp.y, m_iuScale, m_userUnits ) );
 
-    cursorStrings.push_back(
-            DimensionLabel( "r", rulerVec.EuclideanNorm(), m_iuScale, m_userUnits ) );
+    cursorStrings.push_back( DimensionLabel( "r", rulerVec.EuclideanNorm(), m_iuScale, m_userUnits ) );
 
     EDA_ANGLE angle = -EDA_ANGLE( rulerVec );
-    cursorStrings.push_back( DimensionLabel( wxString::FromUTF8( "θ" ), angle.AsDegrees(),
-                                             m_iuScale, EDA_UNITS::DEGREES ) );
+    cursorStrings.push_back( DimensionLabel( wxString::FromUTF8( "θ" ), angle.AsDegrees(), m_iuScale,
+                                             EDA_UNITS::DEGREES ) );
     return cursorStrings;
 }

common/project/net_settings.cpp

@@ -558,15 +558,12 @@ bool NET_SETTINGS::HasNetclassLabelAssignment( const wxString& netName ) const
 
 void NET_SETTINGS::SetNetclassPatternAssignment( const wxString& pattern, const wxString& netclass )
 {
-    // Replace existing assignment if we have one
+    // Avoid exact duplicates - these shouldn't cause problems, due to later de-duplication
+    // but they are unnecessary.
     for( auto& assignment : m_netClassPatternAssignments )
     {
-        if( assignment.first->GetPattern() == pattern )
-        {
-            assignment.second = netclass;
-            ClearAllCaches();
+        if( assignment.first->GetPattern() == pattern && assignment.second == netclass )
             return;
-        }
     }
 
     // No assignment, add a new one

common/project/project_local_settings.cpp

@@ -83,7 +83,7 @@ PROJECT_LOCAL_SETTINGS::PROJECT_LOCAL_SETTINGS( PROJECT* aProject, const wxStrin
             {
                 if( !aVal.is_array() || aVal.empty() )
                 {
-                    m_VisibleItems = GAL_SET::DefaultVisible();
+                    m_VisibleItems |= UserVisbilityLayers();
                     return;
                 }
 
@@ -439,7 +439,7 @@ PROJECT_LOCAL_SETTINGS::PROJECT_LOCAL_SETTINGS( PROJECT* aProject, const wxStrin
 
                 if( Contains( ptr ) )
                 {
-                    if( At( ptr ).is_array() )
+                    if( At( ptr ).is_array() && !At( ptr ).empty() )
                         At( ptr ).push_back( LAYER_FILLED_SHAPES - GAL_LAYER_ID_START );
                     else
                         At( "board" ).erase( "visible_items" );

common/rc_item.cpp

@@ -406,6 +406,9 @@ void RC_TREE_MODEL::GetValue( wxVariant&              aVariant,
                               wxDataViewItem const&   aItem,
                               unsigned int            aCol ) const
 {
+    if( !aItem.IsOk() || m_view->IsFrozen() )
+        return;
+
     const RC_TREE_NODE*            node = ToNode( aItem );
     const std::shared_ptr<RC_ITEM> rcItem = node->m_RcItem;
     MARKER_BASE*                   marker = rcItem->GetParent();
@@ -478,8 +481,10 @@ bool RC_TREE_MODEL::GetAttr( wxDataViewItem const&   aItem,
                              unsigned int            aCol,
                              wxDataViewItemAttr&     aAttr ) const
 {
+    if( !aItem.IsOk() || m_view->IsFrozen() )
+        return false;
+
     const RC_TREE_NODE* node = ToNode( aItem );
-    wxASSERT( node );
 
     bool ret = false;
     bool heading = node->m_Type == RC_TREE_NODE::MARKER;
@@ -737,6 +742,8 @@ void RC_TREE_MODEL::NextMarker()
 
 void RC_TREE_MODEL::SelectMarker( const MARKER_BASE* aMarker )
 {
+    wxCHECK( !m_view->IsFrozen(), /* void */ );
+
     for( RC_TREE_NODE* candidate : m_tree )
     {
         if( candidate->m_RcItem->GetParent() == aMarker )
@@ -750,6 +757,8 @@ void RC_TREE_MODEL::SelectMarker( const MARKER_BASE* aMarker )
 
 void RC_TREE_MODEL::CenterMarker( const MARKER_BASE* aMarker )
 {
+    wxCHECK( !m_view->IsFrozen(), /* void */ );
+
     for( RC_TREE_NODE* candidate : m_tree )
     {
         if( candidate->m_RcItem->GetParent() == aMarker )

common/reporter.cpp

@@ -130,6 +130,10 @@ REPORTER& CLI_REPORTER::Report( const wxString& aMsg, SEVERITY aSeverity )
     else
         wxFprintf( target, aMsg + wxS( "\n" ) );
 
+    // Needed  after wxPrintf (or printf) to be sure the message is immediately printed
+    // (i.e. not stored in some i/o buffer)
+    fflush( target );
+
     return *this;
 }
 

common/richio.cpp

@@ -95,6 +95,12 @@ std::string StrPrintf( const char* format, ... )
 
 wxString SafeReadFile( const wxString& aFilePath, const wxString& aReadType )
 {
+    // Check the path exists as a file first
+    // the IsOpened check would be logical, but on linux you can fopen (in read mode) a directory
+    // And then everything else in here will barf
+    if( !wxFileExists( aFilePath ) )
+        THROW_IO_ERROR( wxString::Format( _( "File '%s' does not exist." ), aFilePath ) );
+
     wxString contents;
     wxFFile  ff( aFilePath );
 

common/scintilla_tricks.cpp

@@ -201,6 +201,16 @@ void SCINTILLA_TRICKS::onModified( wxStyledTextEvent& aEvent )
                        } );
         }
     }
+
+    if( m_singleLine || m_te->GetCurrentLine() == 0 )
+    {
+        // If the font is larger than the height of a single-line text box we can get issues
+        // with the text disappearing every other character due to dodgy scrolling behaviour.
+        CallAfter( [this]()
+                   {
+                       m_te->ScrollToStart();
+                   } );
+    }
 }
 
 

common/settings/app_settings.cpp

@@ -29,6 +29,7 @@
 #include <settings/common_settings.h>
 #include <settings/grid_settings.h>
 #include <settings/parameters.h>
+#include <zoom_defines.h>
 
 
 APP_SETTINGS_BASE::APP_SETTINGS_BASE( const std::string& aFilename, int aSchemaVersion ) :
@@ -349,7 +350,8 @@ bool APP_SETTINGS_BASE::migrateWindowConfig( wxConfigBase* aCfg, const std::stri
 }
 
 
-void APP_SETTINGS_BASE::addParamsForWindow( WINDOW_SETTINGS* aWindow, const std::string& aJsonPath )
+void APP_SETTINGS_BASE::addParamsForWindow( WINDOW_SETTINGS* aWindow, const std::string& aJsonPath,
+                                            int aDefaultWidth, int aDefaultHeight )
 {
     m_params.emplace_back( new PARAM<bool>( aJsonPath + ".maximized",
             &aWindow->state.maximized, false ) );
@@ -357,9 +359,9 @@ void APP_SETTINGS_BASE::addParamsForWindow( WINDOW_SETTINGS* aWindow, const std:
     m_params.emplace_back( new PARAM<wxString>( aJsonPath + ".mru_path",
             &aWindow->mru_path, wxS( "" ) ) );
 
-    m_params.emplace_back( new PARAM<int>( aJsonPath + ".size_x", &aWindow->state.size_x, 0 ) );
+    m_params.emplace_back( new PARAM<int>( aJsonPath + ".size_x", &aWindow->state.size_x, aDefaultWidth ) );
 
-    m_params.emplace_back( new PARAM<int>( aJsonPath + ".size_y", &aWindow->state.size_y, 0 ) );
+    m_params.emplace_back( new PARAM<int>( aJsonPath + ".size_y", &aWindow->state.size_y, aDefaultHeight ) );
 
     m_params.emplace_back( new PARAM<wxString>( aJsonPath + ".perspective",
             &aWindow->perspective, wxS( "" ) ) );
@@ -369,10 +371,10 @@ void APP_SETTINGS_BASE::addParamsForWindow( WINDOW_SETTINGS* aWindow, const std:
     m_params.emplace_back( new PARAM<int>( aJsonPath + ".pos_y", &aWindow->state.pos_y, 0 ) );
 
     m_params.emplace_back( new PARAM<unsigned int>( aJsonPath + ".display",
-                                                    &aWindow->state.display, 0 ) );
+            &aWindow->state.display, 0 ) );
 
     m_params.emplace_back( new PARAM_LIST<double>( aJsonPath + ".zoom_factors",
-            &aWindow->zoom_factors, {} ) );
+            &aWindow->zoom_factors, DefaultZoomList(), true /* resetIfEmpty */ ) );
 
     m_params.emplace_back( new PARAM<bool>( aJsonPath + ".grid.axes_enabled",
             &aWindow->grid.axes_enabled, false ) );
@@ -393,7 +395,7 @@ void APP_SETTINGS_BASE::addParamsForWindow( WINDOW_SETTINGS* aWindow, const std:
     }
 
     m_params.emplace_back( new PARAM_LIST<GRID>( aJsonPath + ".grid.sizes", &aWindow->grid.grids,
-                                                 DefaultGridSizeList() ) );
+                                                 DefaultGridSizeList(), true /* resetIfEmpty */ ) );
 
     m_params.emplace_back( new PARAM<int>( aJsonPath + ".grid.last_size",
             &aWindow->grid.last_size_idx, defaultGridIdx ) );
@@ -487,6 +489,30 @@ void APP_SETTINGS_BASE::addParamsForWindow( WINDOW_SETTINGS* aWindow, const std:
 }
 
 
+const std::vector<double> APP_SETTINGS_BASE::DefaultZoomList() const
+{
+    if( m_filename == wxS( "eeschema" ) || m_filename == wxS( "symbol_editor" ) )
+    {
+        return { ZOOM_LIST_EESCHEMA };
+    }
+    else if( m_filename == wxS( "pl_editor" ) )
+    {
+        return { ZOOM_LIST_PL_EDITOR };
+    }
+    else if( m_filename == wxS( "gerbview" ) )
+    {
+        return { ZOOM_LIST_GERBVIEW };
+    }
+    else
+    {
+        if( ADVANCED_CFG::GetCfg().m_HyperZoom )
+            return { ZOOM_LIST_PCBNEW_HYPER };
+        else
+            return { ZOOM_LIST_PCBNEW };
+    }
+}
+
+
 const std::vector<GRID> APP_SETTINGS_BASE::DefaultGridSizeList() const
 {
     if( m_filename == wxS( "eeschema" ) || m_filename == wxS( "symbol_editor" ) )
@@ -496,6 +522,42 @@ const std::vector<GRID> APP_SETTINGS_BASE::DefaultGridSizeList() const
                  GRID{ wxEmptyString, wxS( "25 mil" ), wxS( "25 mil" ) },
                  GRID{ wxEmptyString, wxS( "10 mil" ), wxS( "10 mil" ) } };
     }
+    else if( m_filename == wxS( "pl_editor" ) )
+    {
+        return { GRID{ wxEmptyString, wxS( "5.00 mm" ), wxS( "5.00 mm" ) },
+                 GRID{ wxEmptyString, wxS( "2.50 mm" ), wxS( "2.50 mm" ) },
+                 GRID{ wxEmptyString, wxS( "2.00 mm" ), wxS( "2.00 mm" ) },
+                 GRID{ wxEmptyString, wxS( "1.00 mm" ), wxS( "1.00 mm" ) },
+                 GRID{ wxEmptyString, wxS( "0.50 mm" ), wxS( "0.50 mm" ) },
+                 GRID{ wxEmptyString, wxS( "0.25 mm" ), wxS( "0.25 mm" ) },
+                 GRID{ wxEmptyString, wxS( "0.20 mm" ), wxS( "0.20 mm" ) },
+                 GRID{ wxEmptyString, wxS( "0.10 mm" ), wxS( "0.10 mm" ) } };
+    }
+    else if( m_filename == wxS( "gerbview" ) )
+    {
+        return { GRID{ wxEmptyString, wxS( "100 mil" ), wxS( "100 mil" ) },
+                 GRID{ wxEmptyString, wxS( "50 mil" ), wxS( "50 mil" ) },
+                 GRID{ wxEmptyString, wxS( "25 mil" ), wxS( "25 mil" ) },
+                 GRID{ wxEmptyString, wxS( "20 mil" ), wxS( "20 mil" ) },
+                 GRID{ wxEmptyString, wxS( "10 mil" ), wxS( "10 mil" ) },
+                 GRID{ wxEmptyString, wxS( "5 mil" ), wxS( "5 mil" ) },
+                 GRID{ wxEmptyString, wxS( "2.5 mil" ), wxS( "2.5 mil" ) },
+                 GRID{ wxEmptyString, wxS( "2 mil" ), wxS( "2 mil" ) },
+                 GRID{ wxEmptyString, wxS( "1 mil" ), wxS( "1 mil" ) },
+                 GRID{ wxEmptyString, wxS( "0.5 mil" ), wxS( "0.5 mil" ) },
+                 GRID{ wxEmptyString, wxS( "0.2 mil" ), wxS( "0.2 mil" ) },
+                 GRID{ wxEmptyString, wxS( "0.1 mil" ), wxS( "0.1 mil" ) },
+                 GRID{ wxEmptyString, wxS( "5.0 mm" ), wxS( "5.0 mm" ) },
+                 GRID{ wxEmptyString, wxS( "1.5 mm" ), wxS( "2.5 mm" ) },
+                 GRID{ wxEmptyString, wxS( "1.0 mm" ), wxS( "1.0 mm" ) },
+                 GRID{ wxEmptyString, wxS( "0.5 mm" ), wxS( "0.5 mm" ) },
+                 GRID{ wxEmptyString, wxS( "0.25 mm" ), wxS( "0.25 mm" ) },
+                 GRID{ wxEmptyString, wxS( "0.2 mm" ), wxS( "0.2 mm" ) },
+                 GRID{ wxEmptyString, wxS( "0.1 mm" ), wxS( "0.1 mm" ) },
+                 GRID{ wxEmptyString, wxS( "0.05 mm" ), wxS( "0.0 mm" ) },
+                 GRID{ wxEmptyString, wxS( "0.025 mm" ), wxS( "0.0 mm" ) },
+                 GRID{ wxEmptyString, wxS( "0.01 mm" ), wxS( "0.0 mm" ) } };
+    }
     else
     {
         return { GRID{ wxEmptyString, wxS( "1000 mil" ), wxS( "1000 mil" ) },

common/settings/common_settings.cpp

@@ -142,6 +142,8 @@ COMMON_SETTINGS::COMMON_SETTINGS() :
 
                     wxString value = var.GetValue();
 
+                    value.Trim( true ).Trim( false ); // Trim from both sides
+
                     // Vars that existed in JSON are persisted, but if they were overridden
                     // externally, we persist the old value (i.e. the one that was loaded from JSON)
                     if( var.GetDefinedExternally() )
@@ -168,7 +170,7 @@ COMMON_SETTINGS::COMMON_SETTINGS() :
                                 wxS( "COMMON_SETTINGS: Saving env var %s = %s" ),
                                 var.GetKey(), value);
 
-                    std::string key( var.GetKey().ToUTF8() );
+                    std::string key( var.GetKey().Trim( true ).Trim( false ).ToUTF8() );
                     ret[ std::move( key ) ] = value;
                 }
 
@@ -181,8 +183,8 @@ COMMON_SETTINGS::COMMON_SETTINGS() :
 
                 for( const auto& entry : aJson.items() )
                 {
-                    wxString key = wxString( entry.key().c_str(), wxConvUTF8 );
-                    wxString val = entry.value().get<wxString>();
+                    wxString key = wxString( entry.key().c_str(), wxConvUTF8 ).Trim( true ).Trim( false );
+                    wxString val = entry.value().get<wxString>().Trim( true ).Trim( false );
 
                     if( m_Env.vars.count( key ) )
                     {

common/settings/cvpcb_settings.cpp

@@ -51,10 +51,10 @@ CVPCB_SETTINGS::CVPCB_SETTINGS() :
 
     addParamsForWindow( &m_FootprintViewer, "footprint_viewer" );
 
-    m_params.emplace_back( new PARAM<double>( "footprint_viewer.zoom", &m_FootprintViewerZoom,
-                                              1.0 ) );
+    m_params.emplace_back( new PARAM<double>( "footprint_viewer.zoom",
+            &m_FootprintViewerZoom, 1.0 ) );
     m_params.emplace_back( new PARAM<bool>( "footprint_viewer.autozoom",
-                                            &m_FootprintViewerAutoZoomOnSelect, true ) );
+            &m_FootprintViewerAutoZoomOnSelect, true ) );
 
     m_params.emplace_back( new PARAM<bool>( "footprint_viewer.use_45_limit",
             &m_ViewersDisplay.m_Use45Limit, true ) );

common/settings/json_settings.cpp

@@ -446,7 +446,11 @@ bool JSON_SETTINGS::SaveToFile( const wxString& aDirectory, bool aForce )
     bool modified = false;
 
     for( NESTED_SETTINGS* settings : m_nested_settings )
+    {
+        wxCHECK2( settings, continue );
+
         modified |= settings->SaveToFile();
+    }
 
     modified |= Store();