Fix compatibility with some old V4 schematic files.

From master branch, commit #bfe59581

.gitignore

@@ -1,5 +1,6 @@
-boost_root
 .downloads-by-cmake
+.gdb_history
+boost_root
 Build*
 build*
 common/fp_lib_table_keywords.cpp
@@ -95,3 +96,20 @@ pcbnew/Info.plist
 .cproject
 .pydevproject
 __pycache__
+
+# Visual Studio
+.vs/
+.editorconfig
+CMakeSettings.json
+
+# Sublime Text
+*.sublime-*
+
+# KDevelop
+.kdev4/
+*.kdev4
+
+# Translations
+*.mo
+i18n_status.svg
+i18n_status.csv

3d-viewer/3d_cache/dialogs/panel_prev_3d_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun  5 2018)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -9,209 +9,209 @@
 
 ///////////////////////////////////////////////////////////////////////////
 
-PANEL_PREV_3D_BASE::PANEL_PREV_3D_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
+PANEL_PREV_3D_BASE::PANEL_PREV_3D_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
 {
 	wxBoxSizer* bSizermain;
 	bSizermain = new wxBoxSizer( wxHORIZONTAL );
-	
+
 	wxBoxSizer* bSizerLeft;
 	bSizerLeft = new wxBoxSizer( wxVERTICAL );
-	
+
 	wxStaticBoxSizer* sbSizerScale;
 	sbSizerScale = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Scale") ), wxVERTICAL );
-	
+
 	wxFlexGridSizer* fgSizerScale;
 	fgSizerScale = new wxFlexGridSizer( 0, 3, 0, 0 );
 	fgSizerScale->SetFlexibleDirection( wxBOTH );
 	fgSizerScale->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
+
 	m_staticText1 = new wxStaticText( sbSizerScale->GetStaticBox(), wxID_ANY, _("X:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText1->Wrap( -1 );
 	fgSizerScale->Add( m_staticText1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	xscale = new wxTextCtrl( sbSizerScale->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerScale->Add( xscale, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	m_spinXscale = new wxSpinButton( sbSizerScale->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL );
 	fgSizerScale->Add( m_spinXscale, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_staticText2 = new wxStaticText( sbSizerScale->GetStaticBox(), wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText2->Wrap( -1 );
 	fgSizerScale->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	yscale = new wxTextCtrl( sbSizerScale->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerScale->Add( yscale, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	m_spinYscale = new wxSpinButton( sbSizerScale->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL );
 	fgSizerScale->Add( m_spinYscale, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_staticText3 = new wxStaticText( sbSizerScale->GetStaticBox(), wxID_ANY, _("Z:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText3->Wrap( -1 );
 	fgSizerScale->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
-	
+
 	zscale = new wxTextCtrl( sbSizerScale->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerScale->Add( zscale, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
-	
+
 	m_spinZscale = new wxSpinButton( sbSizerScale->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL );
 	fgSizerScale->Add( m_spinZscale, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-	
-	
+
+
 	sbSizerScale->Add( fgSizerScale, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 );
-	
-	
+
+
 	bSizerLeft->Add( sbSizerScale, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
+
 	wxStaticBoxSizer* sbSizerRotation;
 	sbSizerRotation = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Rotation") ), wxVERTICAL );
-	
+
 	wxFlexGridSizer* fgSizerRotate;
 	fgSizerRotate = new wxFlexGridSizer( 0, 3, 0, 0 );
 	fgSizerRotate->SetFlexibleDirection( wxBOTH );
 	fgSizerRotate->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
+
 	m_staticText11 = new wxStaticText( sbSizerRotation->GetStaticBox(), wxID_ANY, _("X:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText11->Wrap( -1 );
 	fgSizerRotate->Add( m_staticText11, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	xrot = new wxTextCtrl( sbSizerRotation->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRotate->Add( xrot, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	m_spinXrot = new wxSpinButton( sbSizerRotation->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL );
 	fgSizerRotate->Add( m_spinXrot, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_staticText21 = new wxStaticText( sbSizerRotation->GetStaticBox(), wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText21->Wrap( -1 );
 	fgSizerRotate->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	yrot = new wxTextCtrl( sbSizerRotation->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRotate->Add( yrot, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	m_spinYrot = new wxSpinButton( sbSizerRotation->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL );
 	fgSizerRotate->Add( m_spinYrot, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_staticText31 = new wxStaticText( sbSizerRotation->GetStaticBox(), wxID_ANY, _("Z:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText31->Wrap( -1 );
 	fgSizerRotate->Add( m_staticText31, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
-	
+
 	zrot = new wxTextCtrl( sbSizerRotation->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRotate->Add( zrot, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
-	
+
 	m_spinZrot = new wxSpinButton( sbSizerRotation->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL );
 	fgSizerRotate->Add( m_spinZrot, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-	
-	
+
+
 	sbSizerRotation->Add( fgSizerRotate, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 );
-	
-	
+
+
 	bSizerLeft->Add( sbSizerRotation, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
+
 	wxStaticBoxSizer* sbSizerOffset;
 	sbSizerOffset = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Offset") ), wxVERTICAL );
-	
+
 	wxFlexGridSizer* fgSizerOffset;
 	fgSizerOffset = new wxFlexGridSizer( 0, 3, 0, 0 );
 	fgSizerOffset->SetFlexibleDirection( wxBOTH );
 	fgSizerOffset->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
+
 	m_staticText12 = new wxStaticText( sbSizerOffset->GetStaticBox(), wxID_ANY, _("X:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText12->Wrap( -1 );
 	fgSizerOffset->Add( m_staticText12, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	xoff = new wxTextCtrl( sbSizerOffset->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerOffset->Add( xoff, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	m_spinXoffset = new wxSpinButton( sbSizerOffset->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL );
 	fgSizerOffset->Add( m_spinXoffset, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_staticText22 = new wxStaticText( sbSizerOffset->GetStaticBox(), wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText22->Wrap( -1 );
 	fgSizerOffset->Add( m_staticText22, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	yoff = new wxTextCtrl( sbSizerOffset->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerOffset->Add( yoff, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	m_spinYoffset = new wxSpinButton( sbSizerOffset->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL );
 	fgSizerOffset->Add( m_spinYoffset, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_staticText32 = new wxStaticText( sbSizerOffset->GetStaticBox(), wxID_ANY, _("Z:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText32->Wrap( -1 );
 	fgSizerOffset->Add( m_staticText32, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
-	
+
 	zoff = new wxTextCtrl( sbSizerOffset->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerOffset->Add( zoff, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
-	
+
 	m_spinZoffset = new wxSpinButton( sbSizerOffset->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL );
 	fgSizerOffset->Add( m_spinZoffset, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-	
-	
+
+
 	sbSizerOffset->Add( fgSizerOffset, 0, wxEXPAND|wxLEFT|wxRIGHT, 10 );
-	
-	
+
+
 	bSizerLeft->Add( sbSizerOffset, 0, wxEXPAND|wxALL, 5 );
-	
-	
+
+
 	bSizermain->Add( bSizerLeft, 0, 0, 5 );
-	
+
 	wxBoxSizer* bSizerRight;
 	bSizerRight = new wxBoxSizer( wxVERTICAL );
-	
+
 	wxStaticText* staticPreviewLabel;
 	staticPreviewLabel = new wxStaticText( this, wxID_ANY, _("Preview"), wxDefaultPosition, wxDefaultSize, 0 );
 	staticPreviewLabel->Wrap( -1 );
 	staticPreviewLabel->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-	
-	bSizerRight->Add( staticPreviewLabel, 0, wxLEFT, 15 );
-	
+
+	bSizerRight->Add( staticPreviewLabel, 0, wxALL, 5 );
+
 	m_SizerPanelView = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizerRight->Add( m_SizerPanelView, 1, wxEXPAND|wxBOTTOM, 8 );
-	
-	
+
+
+	bSizerRight->Add( m_SizerPanelView, 1, wxEXPAND|wxBOTTOM, 5 );
+
+
 	bSizermain->Add( bSizerRight, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 4 );
-	
+
 	wxBoxSizer* bSizer3DButtons;
 	bSizer3DButtons = new wxBoxSizer( wxVERTICAL );
-	
-	
+
+
 	bSizer3DButtons->Add( 0, 0, 0, wxEXPAND|wxTOP, 4 );
-	
-	m_bpvISO = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+
+	m_bpvISO = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
 	m_bpvISO->SetToolTip( _("Change to isometric perspective") );
-	
+
 	bSizer3DButtons->Add( m_bpvISO, 0, wxTOP|wxBOTTOM, 5 );
-	
-	m_bpvLeft = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+
+	m_bpvLeft = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
 	bSizer3DButtons->Add( m_bpvLeft, 0, 0, 5 );
-	
-	m_bpvRight = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizer3DButtons->Add( m_bpvRight, 0, 0, 5 );
-	
-	m_bpvFront = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizer3DButtons->Add( m_bpvFront, 0, 0, 5 );
-	
-	m_bpvBack = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizer3DButtons->Add( m_bpvBack, 0, 0, 5 );
-	
-	m_bpvTop = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizer3DButtons->Add( m_bpvTop, 0, 0, 5 );
-	
-	m_bpvBottom = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizer3DButtons->Add( m_bpvBottom, 0, 0, 5 );
-	
-	m_bpUpdate = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+
+	m_bpvRight = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer3DButtons->Add( m_bpvRight, 0, wxTOP, 5 );
+
+	m_bpvFront = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer3DButtons->Add( m_bpvFront, 0, wxTOP, 5 );
+
+	m_bpvBack = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer3DButtons->Add( m_bpvBack, 0, wxTOP, 5 );
+
+	m_bpvTop = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer3DButtons->Add( m_bpvTop, 0, wxTOP, 5 );
+
+	m_bpvBottom = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer3DButtons->Add( m_bpvBottom, 0, wxTOP, 5 );
+
+	m_bpUpdate = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
 	m_bpUpdate->SetToolTip( _("Reload board and 3D models") );
-	
+
 	bSizer3DButtons->Add( m_bpUpdate, 0, wxTOP, 5 );
-	
-	
+
+
 	bSizermain->Add( bSizer3DButtons, 0, wxALL|wxEXPAND, 5 );
-	
-	
+
+
 	this->SetSizer( bSizermain );
 	this->Layout();
 	bSizermain->Fit( this );
-	
+
 	// Connect Events
 	xscale->Connect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( PANEL_PREV_3D_BASE::onMouseWheelScale ), NULL, this );
 	xscale->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_PREV_3D_BASE::updateOrientation ), NULL, this );
@@ -306,5 +306,5 @@ PANEL_PREV_3D_BASE::~PANEL_PREV_3D_BASE()
 	m_bpvTop->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREV_3D_BASE::View3DTop ), NULL, this );
 	m_bpvBottom->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREV_3D_BASE::View3DBottom ), NULL, this );
 	m_bpUpdate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREV_3D_BASE::View3DUpdate ), NULL, this );
-	
+
 }

3d-viewer/3d_cache/dialogs/panel_prev_3d_base.h

@@ -1,12 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun  5 2018)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#ifndef __PANEL_PREV_3D_BASE_H__
-#define __PANEL_PREV_3D_BASE_H__
+#pragma once
 
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
@@ -21,10 +20,10 @@
 #include <wx/spinbutt.h>
 #include <wx/sizer.h>
 #include <wx/statbox.h>
+#include <wx/bmpbuttn.h>
 #include <wx/bitmap.h>
 #include <wx/image.h>
 #include <wx/icon.h>
-#include <wx/bmpbuttn.h>
 #include <wx/button.h>
 #include <wx/panel.h>
 
@@ -34,10 +33,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 /// Class PANEL_PREV_3D_BASE
 ///////////////////////////////////////////////////////////////////////////////
-class PANEL_PREV_3D_BASE : public wxPanel 
+class PANEL_PREV_3D_BASE : public wxPanel
 {
 	private:
-	
+
 	protected:
 		wxStaticText* m_staticText1;
 		wxTextCtrl* xscale;
@@ -74,7 +73,7 @@ class PANEL_PREV_3D_BASE : public wxPanel
 		wxBitmapButton* m_bpvTop;
 		wxBitmapButton* m_bpvBottom;
 		wxBitmapButton* m_bpUpdate;
-		
+
 		// Virtual event handlers, overide them in your derived class
 		virtual void onMouseWheelScale( wxMouseEvent& event ) { event.Skip(); }
 		virtual void updateOrientation( wxCommandEvent& event ) { event.Skip(); }
@@ -94,14 +93,13 @@ class PANEL_PREV_3D_BASE : public wxPanel
 		virtual void View3DTop( wxCommandEvent& event ) { event.Skip(); }
 		virtual void View3DBottom( wxCommandEvent& event ) { event.Skip(); }
 		virtual void View3DUpdate( wxCommandEvent& event ) { event.Skip(); }
-		
-	
+
+
 	public:
 		wxTextCtrl* yoff;
-		
-		PANEL_PREV_3D_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
+
+		PANEL_PREV_3D_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
 		~PANEL_PREV_3D_BASE();
-	
+
 };
 
-#endif //__PANEL_PREV_3D_BASE_H__

3d-viewer/3d_cache/sg/CMakeLists.txt

@@ -44,7 +44,7 @@ if( APPLE )
 endif()
 
 find_file( S3DSG_VERSION_FILE sg_version.h
-        PATHS ${CMAKE_SOURCE_DIR}/include/plugins/3dapi NO_DEFAULT_PATH )
+        PATHS ${CMAKE_SOURCE_DIR}/include/plugins/3dapi NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
 
 if( NOT ${S3DSG_VERSION_FILE} STREQUAL "S3DSG_VERSION_FILE-NOTFOUND" )
 
@@ -95,8 +95,12 @@ target_compile_definitions( kicad_3dsg PRIVATE -DCOMPILE_SGLIB )
 
 target_link_libraries( kicad_3dsg ${wxWidgets_LIBRARIES} )
 
+# Don't specify the ARCHIVE DESTINATION parameter to prevent
+# the install of the import library on Windows
+# https://cmake.org/pipermail/cmake/2011-November/047746.html
 install( TARGETS
     kicad_3dsg
-    DESTINATION ${KICAD_LIB}
+    RUNTIME DESTINATION ${KICAD_LIB}
+    LIBRARY DESTINATION ${KICAD_LIB}
     COMPONENT binary
     )

3d-viewer/3d_canvas/cinfo3d_visu.cpp

@@ -272,13 +272,9 @@ void CINFO3D_VISU::InitSettings( REPORTER *aStatusTextReporter )
 {
     wxLogTrace( m_logTrace, wxT( "CINFO3D_VISU::InitSettings" ) );
 
-    // Calculates the board bounding box
-    // First, use only the board outlines
-    EDA_RECT bbbox = m_board->ComputeBoundingBox( true );
-
-    // If no outlines, use the board with items
-    if( ( bbbox.GetWidth() == 0 ) && ( bbbox.GetHeight() == 0 ) )
-        bbbox = m_board->ComputeBoundingBox( false );
+    // Calculates the board bounding box (board outlines + items)
+    // to ensure any item, even outside the board outlines can be seen
+    EDA_RECT bbbox = m_board->ComputeBoundingBox( false );
 
     // Gives a non null size to avoid issues in zoom / scale calculations
     if( ( bbbox.GetWidth() == 0 ) && ( bbbox.GetHeight() == 0 ) )

3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp

@@ -386,9 +386,22 @@ void CINFO3D_VISU::createNewPadWithClearance( const D_PAD* aPad,
     case PAD_SHAPE_RECT:
     {
         // see pcbnew/board_items_to_polygon_shape_transform.cpp
-
         wxPoint corners[4];
-        aPad->BuildPadPolygon( corners, wxSize( 0, 0), aPad->GetOrientation() );
+        bool drawOutline;
+
+        // For aClearanceValue.x == aClearanceValue.y and > 0 we use the pad shape
+        // and draw outlines with thicknes = aClearanceValue.
+        // Otherwise we draw only the inflated/deflated shape
+        if( aClearanceValue.x > 0 && aClearanceValue.x == aClearanceValue.y )
+        {
+            drawOutline = true;
+            aPad->BuildPadPolygon( corners, wxSize( 0, 0 ), aPad->GetOrientation() );
+        }
+        else
+        {
+            drawOutline = false;
+            aPad->BuildPadPolygon( corners, aClearanceValue, aPad->GetOrientation() );
+        }
 
         SFVEC2F corners3DU[4];
 
@@ -416,20 +429,23 @@ void CINFO3D_VISU::createNewPadWithClearance( const D_PAD* aPad,
         // Add the PAD contours
         // Round segments cannot have 0-length elements, so we approximate them
         // as a small circle
-        for( int i = 1; i <= 4; i++ )
+        if( drawOutline )
         {
-            if( Is_segment_a_circle( corners3DU[i - 1], corners3DU[i & 3] ) )
+            for( int i = 1; i <= 4; i++ )
             {
-                aDstContainer->Add( new CFILLEDCIRCLE2D( corners3DU[i - 1],
-                                        aClearanceValue.x * m_biuTo3Dunits,
-                                        *aPad ) );
-            }
-            else
-            {
-                aDstContainer->Add( new CROUNDSEGMENT2D( corners3DU[i - 1],
-                                                         corners3DU[i & 3],
-                                                         aClearanceValue.x * 2.0f * m_biuTo3Dunits,
-                                                         *aPad ) );
+                if( Is_segment_a_circle( corners3DU[i - 1], corners3DU[i & 3] ) )
+                {
+                    aDstContainer->Add( new CFILLEDCIRCLE2D( corners3DU[i - 1],
+                                            aClearanceValue.x * m_biuTo3Dunits,
+                                            *aPad ) );
+                }
+                else
+                {
+                    aDstContainer->Add( new CROUNDSEGMENT2D( corners3DU[i - 1],
+                                                             corners3DU[i & 3],
+                                                             aClearanceValue.x * 2.0f * m_biuTo3Dunits,
+                                                             *aPad ) );
+                }
             }
         }
     }

3d-viewer/3d_canvas/eda_3d_canvas.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2015-2016 Mario Luzeiro <mrluzeiro@ua.pt>
- * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -57,6 +57,9 @@ const wxChar * EDA_3D_CANVAS::m_logTrace = wxT( "KI_TRACE_EDA_3D_CANVAS" );
 
 const float EDA_3D_CANVAS::m_delta_move_step_factor = 0.7f;
 
+// A custom event, used to call DoRePaint during an idle time
+wxDEFINE_EVENT( wxEVT_REFRESH_CUSTOM_COMMAND, wxEvent);
+
 
 BEGIN_EVENT_TABLE( EDA_3D_CANVAS, wxGLCanvas )
     EVT_PAINT( EDA_3D_CANVAS::OnPaint )
@@ -78,6 +81,7 @@ BEGIN_EVENT_TABLE( EDA_3D_CANVAS, wxGLCanvas )
 
     // other events
     EVT_ERASE_BACKGROUND( EDA_3D_CANVAS::OnEraseBackground )
+    EVT_CUSTOM(wxEVT_REFRESH_CUSTOM_COMMAND, ID_CUSTOM_EVENT_1, EDA_3D_CANVAS::OnRefreshRequest )
     EVT_MENU_RANGE( ID_POPUP_3D_VIEW_START,
                     ID_POPUP_3D_VIEW_END, EDA_3D_CANVAS::OnPopUpMenu )
 
@@ -312,17 +316,22 @@ void EDA_3D_CANVAS::DisplayStatus()
 }
 
 
-void EDA_3D_CANVAS::OnPaint( wxPaintEvent &event )
+void EDA_3D_CANVAS::OnPaint( wxPaintEvent& aEvent )
 {
     // Please have a look at:
     // https://lists.launchpad.net/kicad-developers/msg25149.html
     // wxPaintDC( this );
-    // event.Skip( false );
+    // aEvent.Skip( false );
+    DoRePaint();
+}
 
+
+void EDA_3D_CANVAS::DoRePaint()
+{
     // SwapBuffer requires the window to be shown before calling
     if( !IsShownOnScreen() )
     {
-        wxLogTrace( m_logTrace, "EDA_3D_CANVAS::OnPaint !IsShown" );
+        wxLogTrace( m_logTrace, "EDA_3D_CANVAS::DoRePaint !IsShown" );
         return;
     }
 
@@ -856,13 +865,13 @@ void EDA_3D_CANVAS::restart_editingTimeOut_Timer()
 
 void EDA_3D_CANVAS::OnTimerTimeout_Redraw( wxTimerEvent &event )
 {
-    (void)event;
+    Request_refresh( true );
+}
 
-    //Refresh();
-    //Update();
 
-    wxPaintEvent redrawEvent;
-    wxPostEvent( this, redrawEvent );
+void EDA_3D_CANVAS::OnRefreshRequest( wxEvent& aEvent )
+{
+   DoRePaint();
 }
 
 
@@ -870,22 +879,12 @@ void EDA_3D_CANVAS::Request_refresh( bool aRedrawImmediately )
 {
     if( aRedrawImmediately )
     {
-        // On some systems, just calling Refresh does not work always
-        // (Issue experienced on Win7 MSYS2)
-        //Refresh();
-        //Update();
-
-        // Using PostEvent will take priority to other events, like
-        // mouse movements, keys, etc.
-        wxPaintEvent redrawEvent;
+        // Just calling Refresh() does not work always
+        // Using an event to call DoRepaint ensure the repaint code will be executed,
+        // and PostEvent will take priority to other events like mouse movements, keys, etc.
+        // and is executed during the next idle time
+        wxCommandEvent redrawEvent( wxEVT_REFRESH_CUSTOM_COMMAND, ID_CUSTOM_EVENT_1 );
         wxPostEvent( this, redrawEvent );
-
-        // This behaves the same
-        // wxQueueEvent( this,
-                        // From wxWidget documentation: "The heap-allocated and
-                        // non-NULL event to queue, the function takes ownership of it."
-        //               new wxPaintEvent()
-        //               );
     }
     else
     {
@@ -1085,7 +1084,10 @@ bool EDA_3D_CANVAS::SetView3D( int aKeycode )
         m_settings.CameraGet().SetT0_and_T1_current_T();
         m_settings.CameraGet().Reset_T1();
         m_settings.CameraGet().RotateX_T1( glm::radians(  -90.0f ) );
-        m_settings.CameraGet().RotateZ_T1( glm::radians( -180.0f ) );
+        // The rotation angle should be 180.
+        // We use 179.999 (180 - epsilon) to avoid a full 360 deg rotation when
+        // using 180 deg if the previous rotated position was already 180 deg
+        m_settings.CameraGet().RotateZ_T1( glm::radians( -179.999f ) );
         request_start_moving_camera();
         return true;
 
@@ -1101,7 +1103,7 @@ bool EDA_3D_CANVAS::SetView3D( int aKeycode )
         m_settings.CameraGet().SetInterpolateMode( INTERPOLATION_BEZIER );
         m_settings.CameraGet().SetT0_and_T1_current_T();
         m_settings.CameraGet().Reset_T1();
-        m_settings.CameraGet().RotateY_T1( glm::radians( 180.0f ) );
+        m_settings.CameraGet().RotateY_T1( glm::radians( 179.999f ) ); // Rotation = 180-epsilon
         request_start_moving_camera(
                     glm::min( glm::max( m_settings.CameraGet().ZoomGet(), 0.5f ), 1.125f ) );
         return true;

3d-viewer/3d_canvas/eda_3d_canvas.h

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2015-2016 Mario Luzeiro <mrluzeiro@ua.pt>
- * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -135,10 +135,21 @@ class EDA_3D_CANVAS : public HIDPI_GL_CANVAS
 
 private:
 
-    void OnPaint( wxPaintEvent &event );
+    /** Called by a wxPaintEvent event
+     */
+    void OnPaint( wxPaintEvent& aEvent );
+
+    /**
+     * The actual function to repaint the canvas.
+     * It is usually called by OnPaint() but because it does not use a wxPaintDC
+     * it can be called outside a wxPaintEvent
+     */
+    void DoRePaint();
 
     void OnEraseBackground( wxEraseEvent &event );
 
+    void OnRefreshRequest( wxEvent& aEvent );
+
     void OnMouseWheel( wxMouseEvent &event );
 
 #if wxCHECK_VERSION( 3, 1, 0 ) || defined( USE_OSX_MAGNIFY_EVENT )

3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp

@@ -286,7 +286,9 @@ void C3D_RENDER_RAYTRACING::reload( REPORTER *aStatusTextReporter )
 
     m_outlineBoard2dObjects = new CCONTAINER2D;
 
-    if( ((const SHAPE_POLY_SET &)m_settings.GetBoardPoly()).OutlineCount() == 1 )
+    const int outlineCount = m_settings.GetBoardPoly().OutlineCount();
+
+    if( outlineCount > 0 )
     {
         float divFactor = 0.0f;
 
@@ -299,12 +301,16 @@ void C3D_RENDER_RAYTRACING::reload( REPORTER *aStatusTextReporter )
         SHAPE_POLY_SET boardPolyCopy = m_settings.GetBoardPoly();
         boardPolyCopy.Fracture( SHAPE_POLY_SET::PM_FAST );
 
-        Convert_path_polygon_to_polygon_blocks_and_dummy_blocks(
-                    boardPolyCopy,
-                    *m_outlineBoard2dObjects,
-                    m_settings.BiuTo3Dunits(),
-                    divFactor,
-                    (const BOARD_ITEM &)*m_settings.GetBoard() );
+        for( int iOutlinePolyIdx = 0; iOutlinePolyIdx < outlineCount; iOutlinePolyIdx++ )
+        {
+            Convert_path_polygon_to_polygon_blocks_and_dummy_blocks(
+                        boardPolyCopy,
+                        *m_outlineBoard2dObjects,
+                        m_settings.BiuTo3Dunits(),
+                        divFactor,
+                        *dynamic_cast<const BOARD_ITEM*>( m_settings.GetBoard() ),
+                        iOutlinePolyIdx );
+        }
 
         if( m_settings.GetFlag( FL_SHOW_BOARD_BODY ) )
         {
@@ -443,6 +449,10 @@ void C3D_RENDER_RAYTRACING::reload( REPORTER *aStatusTextReporter )
          ++ii )
     {
         PCB_LAYER_ID layer_id = static_cast<PCB_LAYER_ID>(ii->first);
+        const CBVHCONTAINER2D *container2d = static_cast<const CBVHCONTAINER2D *>(ii->second);
+
+        if( !container2d )
+            continue;
 
         // Mask kayers are not processed here because they are a special case
         if( (layer_id == B_Mask) || (layer_id == F_Mask) )
@@ -503,7 +513,6 @@ void C3D_RENDER_RAYTRACING::reload( REPORTER *aStatusTextReporter )
             break;
         }
 
-        const CBVHCONTAINER2D *container2d = static_cast<const CBVHCONTAINER2D *>(ii->second);
         const LIST_OBJECT2D &listObject2d = container2d->GetList();
 
         for( LIST_OBJECT2D::const_iterator itemOnLayer = listObject2d.begin();
@@ -649,6 +658,9 @@ void C3D_RENDER_RAYTRACING::reload( REPORTER *aStatusTextReporter )
             const CBVHCONTAINER2D *containerLayer2d =
                     static_cast<const CBVHCONTAINER2D *>(ii->second);
 
+            if( !containerLayer2d )
+                continue;
+
             // Only get the Solder mask layers
             if( !((layer_id == B_Mask) || (layer_id == F_Mask)) )
                 continue;

3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon2d.cpp

@@ -408,17 +408,16 @@ void Convert_path_polygon_to_polygon_blocks_and_dummy_blocks(
         CGENERICCONTAINER2D &aDstContainer,
         float aBiuTo3DunitsScale,
         float aDivFactor,
-        const BOARD_ITEM &aBoardItem )
+        const BOARD_ITEM &aBoardItem,
+        int aPolyIndex )
 {
-    BOX2I pathBounds = aMainPath.BBox();
-
     // Get the path
 
-    wxASSERT( aMainPath.OutlineCount() == 1 );
-    const SHAPE_POLY_SET::POLYGON& curr_polywithholes = aMainPath.CPolygon( 0 );
+    wxASSERT( aPolyIndex < aMainPath.OutlineCount() );
 
-    wxASSERT( curr_polywithholes.size() == 1 );
-    const SHAPE_LINE_CHAIN& path = curr_polywithholes[0];   // a simple polygon
+    const SHAPE_LINE_CHAIN& path = aMainPath.COutline( aPolyIndex );
+
+    BOX2I pathBounds = path.BBox();
 
     // Convert the points to segments class
     CBBOX2D bbox;
@@ -430,8 +429,10 @@ void Convert_path_polygon_to_polygon_blocks_and_dummy_blocks(
     // Contains a closed polygon used to calc if points are inside
     SEGMENTS segments;
 
-    segments_and_normals.resize( path.PointCount() );
-    segments.resize( path.PointCount() );
+    segments_and_normals.reserve( path.PointCount() );
+    segments.reserve( path.PointCount() );
+
+    SFVEC2F prevPoint;
 
     for( int i = 0; i < path.PointCount(); i++ )
     {
@@ -440,9 +441,23 @@ void Convert_path_polygon_to_polygon_blocks_and_dummy_blocks(
         const SFVEC2F point ( (float)( a.x) * aBiuTo3DunitsScale,
                               (float)(-a.y) * aBiuTo3DunitsScale );
 
-        bbox.Union( point );
-        segments_and_normals[i].m_Start = point;
-        segments[i].m_Start = point;
+        // Only add points that are not coincident
+        if( (i == 0) ||
+            (fabs(prevPoint.x - point.x) > FLT_EPSILON) ||
+            (fabs(prevPoint.y - point.y) > FLT_EPSILON) )
+        {
+            prevPoint = point;
+
+            bbox.Union( point );
+
+            SEGMENT_WITH_NORMALS sn;
+            sn.m_Start = point;
+            segments_and_normals.push_back( sn );
+
+            POLYSEGMENT ps;
+            ps.m_Start = point;
+            segments.push_back( ps );
+        }
     }
 
     bbox.ScaleNextUp();
@@ -518,13 +533,13 @@ void Convert_path_polygon_to_polygon_blocks_and_dummy_blocks(
             segments_and_normals[i].m_Normals.m_Start = normalSeg;
         else
             segments_and_normals[i].m_Normals.m_Start =
-                glm::normalize( (((normalBeforeSeg * dotBefore ) + normalSeg) * 0.5f) );
+                glm::normalize( (normalBeforeSeg * dotBefore ) + normalSeg );
 
         if( dotAfter < 0.7f )
             segments_and_normals[i].m_Normals.m_End = normalSeg;
         else
             segments_and_normals[i].m_Normals.m_End =
-                glm::normalize( (((normalAfterSeg  * dotAfter  ) + normalSeg) * 0.5f) );
+                glm::normalize( (normalAfterSeg * dotAfter ) + normalSeg );
     }
 
     if( aDivFactor == 0.0f )

3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon2d.h

@@ -148,7 +148,8 @@ void Convert_path_polygon_to_polygon_blocks_and_dummy_blocks(
         CGENERICCONTAINER2D &aDstContainer,
         float aBiuTo3DunitsScale,
         float aDivFactor,
-        const BOARD_ITEM &aBoardItem );
+        const BOARD_ITEM &aBoardItem,
+        int aPolyIndex );
 
 void Polygon2d_TestModule();
 

3d-viewer/3d_rendering/ccamera.cpp

@@ -31,6 +31,17 @@
 #include <wx/log.h>
 
 
+// A helper function to normalize aAngle between -2PI and +2PI
+inline void normalise2PI( float& aAngle )
+{
+    while( aAngle > 0.0 )
+        aAngle -= M_PI*2;
+
+    while( aAngle < 0.0 )
+        aAngle += M_PI*2;
+}
+
+
 /**
  *  Trace mask used to enable or disable the trace output of this class.
  *  The debug output can be turned on by setting the WXTRACE environment variable to
@@ -95,6 +106,20 @@ void CCAMERA::Reset_T1()
     m_zoom_t1              = 1.0f;
     m_rotate_aux_t1        = SFVEC3F( 0.0f );
     m_lookat_pos_t1        = m_board_lookat_pos_init;
+
+
+    // Since 0 = 2pi, we want to reset the angle to be the closest
+    // one to where we currently are. That ensures that we rotate
+    // the board around the smallest distance getting there.
+    if( m_rotate_aux_t0.x > M_PI )
+        m_rotate_aux_t1.x = 2*M_PI;
+
+    if( m_rotate_aux_t0.y > M_PI )
+        m_rotate_aux_t1.y = 2*M_PI;
+
+    if( m_rotate_aux_t0.z > M_PI )
+        m_rotate_aux_t1.z = 2*M_PI;
+
 }
 
 
@@ -111,14 +136,17 @@ void CCAMERA::updateRotationMatrix()
     m_rotationMatrixAux = glm::rotate( glm::mat4( 1.0f ),
                                        m_rotate_aux.x,
                                        SFVEC3F( 1.0f, 0.0f, 0.0f ) );
+    normalise2PI( m_rotate_aux.x );
 
     m_rotationMatrixAux = glm::rotate( m_rotationMatrixAux,
                                        m_rotate_aux.y,
                                        SFVEC3F( 0.0f, 1.0f, 0.0f ) );
+    normalise2PI( m_rotate_aux.y );
 
     m_rotationMatrixAux = glm::rotate( m_rotationMatrixAux,
                                        m_rotate_aux.z,
                                        SFVEC3F( 0.0f, 0.0f, 1.0f ) );
+    normalise2PI( m_rotate_aux.z );
 
     m_parametersChanged = true;
 
@@ -163,7 +191,7 @@ void CCAMERA::rebuildProjection()
 
         m_projectionMatrixInv = glm::inverse( m_projectionMatrix );
 
-        m_frustum.tang = glm::tan( glm::radians( m_frustum.angle ) * 0.5f ) ;
+        m_frustum.tang = glm::tan( glm::radians( m_frustum.angle ) * 0.5f );
 
         m_focalLen.x = ( (float)m_windowSize.y / (float)m_windowSize.x ) / m_frustum.tang;
         m_focalLen.y = 1.0f / m_frustum.tang;
@@ -178,19 +206,21 @@ void CCAMERA::rebuildProjection()
 
         m_frustum.nearD = -m_frustum.farD; // Use a symmetrical clip plane for ortho projection
 
-        const float orthoReductionFactor = m_zoom / 75.0f;
+        // This formula was found by trial and error
+        const float orthoReductionFactor = glm::length( m_camera_pos_init ) *
+                                           m_zoom * m_zoom * 0.5f;
 
         // Initialize Projection Matrix for Ortographic View
-        m_projectionMatrix = glm::ortho( -m_windowSize.x * orthoReductionFactor,
-                                          m_windowSize.x * orthoReductionFactor,
-                                         -m_windowSize.y * orthoReductionFactor,
-                                          m_windowSize.y * orthoReductionFactor,
+        m_projectionMatrix = glm::ortho( -m_frustum.ratio * orthoReductionFactor,
+                                          m_frustum.ratio * orthoReductionFactor,
+                                         -orthoReductionFactor,
+                                          orthoReductionFactor,
                                           m_frustum.nearD, m_frustum.farD );
 
         m_projectionMatrixInv = glm::inverse( m_projectionMatrix );
 
-        m_frustum.nw = m_windowSize.x * orthoReductionFactor * 2.0f;
-        m_frustum.nh = m_windowSize.y * orthoReductionFactor * 2.0f;
+        m_frustum.nw = orthoReductionFactor * 2.0f * m_frustum.ratio;
+        m_frustum.nh = orthoReductionFactor * 2.0f;
         m_frustum.fw = m_frustum.nw;
         m_frustum.fh = m_frustum.nh;
 

3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jul 11 2018)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -12,251 +12,252 @@
 DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
 {
 	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
+
 	wxBoxSizer* bSizerMain;
 	bSizerMain = new wxBoxSizer( wxVERTICAL );
-	
+
 	wxBoxSizer* bSizerUpper;
 	bSizerUpper = new wxBoxSizer( wxHORIZONTAL );
-	
+
 	wxBoxSizer* bSizeLeft;
 	bSizeLeft = new wxBoxSizer( wxVERTICAL );
-	
+
 	m_staticText3DRenderOpts = new wxStaticText( this, wxID_ANY, _("Render options:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText3DRenderOpts->Wrap( -1 );
 	m_staticText3DRenderOpts->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-	
+
 	bSizeLeft->Add( m_staticText3DRenderOpts, 0, wxALL, 5 );
-	
+
 	wxFlexGridSizer* fgSizerRenderOptions;
 	fgSizerRenderOptions = new wxFlexGridSizer( 0, 3, 0, 0 );
 	fgSizerRenderOptions->SetFlexibleDirection( wxBOTH );
 	fgSizerRenderOptions->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
+
+
 	fgSizerRenderOptions->Add( 0, 0, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapRealisticMode = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_bitmapRealisticMode, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxRealisticMode = new wxCheckBox( this, wxID_ANY, _("Realistic mode"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_checkBoxRealisticMode, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fgSizerRenderOptions->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapBoardBody = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_bitmapBoardBody, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxBoardBody = new wxCheckBox( this, wxID_ANY, _("Show board body"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_checkBoxBoardBody, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fgSizerRenderOptions->Add( 0, 0, 1, wxEXPAND, 5 );
-	
+
 	m_bitmapCuThickness = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_bitmapCuThickness, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxCuThickness = new wxCheckBox( this, wxID_ANY, _("Show copper thickness"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_checkBoxCuThickness, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fgSizerRenderOptions->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapBoundingBoxes = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_bitmapBoundingBoxes, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxBoundingBoxes = new wxCheckBox( this, wxID_ANY, _("Show model bounding boxes"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_checkBoxBoundingBoxes, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fgSizerRenderOptions->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapAreas = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_bitmapAreas, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxAreas = new wxCheckBox( this, wxID_ANY, _("Show filled areas in zones"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_checkBoxAreas, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	wxFlexGridSizer* fgSizer3;
 	fgSizer3 = new wxFlexGridSizer( 0, 2, 0, 0 );
 	fgSizer3->SetFlexibleDirection( wxBOTH );
 	fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
+
+
 	fgSizerRenderOptions->Add( fgSizer3, 1, wxEXPAND, 5 );
-	
-	
+
+
 	bSizeLeft->Add( fgSizerRenderOptions, 0, wxEXPAND|wxBOTTOM, 5 );
-	
-	
+
+
 	bSizeLeft->Add( 0, 10, 0, 0, 5 );
-	
+
 	m_staticText3DmodelVisibility = new wxStaticText( this, wxID_ANY, _("3D model visibility:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText3DmodelVisibility->Wrap( -1 );
 	m_staticText3DmodelVisibility->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-	
+
 	bSizeLeft->Add( m_staticText3DmodelVisibility, 0, wxALL, 5 );
-	
+
 	wxFlexGridSizer* fgSizer3DVisibility;
 	fgSizer3DVisibility = new wxFlexGridSizer( 0, 3, 0, 0 );
 	fgSizer3DVisibility->SetFlexibleDirection( wxBOTH );
 	fgSizer3DVisibility->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
+
+
 	fgSizer3DVisibility->Add( 0, 0, 1, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmap3DshapesTH = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer3DVisibility->Add( m_bitmap3DshapesTH, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBox3DshapesTH = new wxCheckBox( this, wxID_ANY, _("Show 3D through hole models"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer3DVisibility->Add( m_checkBox3DshapesTH, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fgSizer3DVisibility->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmap3DshapesSMD = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer3DVisibility->Add( m_bitmap3DshapesSMD, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBox3DshapesSMD = new wxCheckBox( this, wxID_ANY, _("Show 3D SMD models"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer3DVisibility->Add( m_checkBox3DshapesSMD, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fgSizer3DVisibility->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmap3DshapesVirtual = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer3DVisibility->Add( m_bitmap3DshapesVirtual, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBox3DshapesVirtual = new wxCheckBox( this, wxID_ANY, _("Show 3D virtual models"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer3DVisibility->Add( m_checkBox3DshapesVirtual, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	bSizeLeft->Add( fgSizer3DVisibility, 0, wxEXPAND, 5 );
-	
-	
+
+
 	bSizerUpper->Add( bSizeLeft, 1, wxEXPAND, 5 );
-	
+
 	m_staticlineVertical = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
 	bSizerUpper->Add( m_staticlineVertical, 0, wxEXPAND | wxALL, 5 );
-	
+
 	wxBoxSizer* bSizerRight;
 	bSizerRight = new wxBoxSizer( wxHORIZONTAL );
-	
+
 	wxBoxSizer* bSizeLayer;
 	bSizeLayer = new wxBoxSizer( wxVERTICAL );
-	
+
 	m_staticTextBoardLayers = new wxStaticText( this, wxID_ANY, _("Board layers:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextBoardLayers->Wrap( -1 );
 	m_staticTextBoardLayers->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-	
+
 	bSizeLayer->Add( m_staticTextBoardLayers, 0, wxALL, 5 );
-	
+
 	wxFlexGridSizer* fgSizerShowBrdLayersOpts;
 	fgSizerShowBrdLayersOpts = new wxFlexGridSizer( 0, 3, 0, 0 );
 	fgSizerShowBrdLayersOpts->SetFlexibleDirection( wxBOTH );
 	fgSizerShowBrdLayersOpts->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
+
+
 	fgSizerShowBrdLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapSilkscreen = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowBrdLayersOpts->Add( m_bitmapSilkscreen, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxSilkscreen = new wxCheckBox( this, wxID_ANY, _("Show silkscreen layers"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowBrdLayersOpts->Add( m_checkBoxSilkscreen, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
+
+
 	fgSizerShowBrdLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapSolderMask = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowBrdLayersOpts->Add( m_bitmapSolderMask, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxSolderMask = new wxCheckBox( this, wxID_ANY, _("Show solder mask layers"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowBrdLayersOpts->Add( m_checkBoxSolderMask, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fgSizerShowBrdLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapSolderPaste = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowBrdLayersOpts->Add( m_bitmapSolderPaste, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxSolderpaste = new wxCheckBox( this, wxID_ANY, _("Show solder paste layers"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowBrdLayersOpts->Add( m_checkBoxSolderpaste, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fgSizerShowBrdLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapAdhesive = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowBrdLayersOpts->Add( m_bitmapAdhesive, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxAdhesive = new wxCheckBox( this, wxID_ANY, _("Show adhesive layers"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowBrdLayersOpts->Add( m_checkBoxAdhesive, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	bSizeLayer->Add( fgSizerShowBrdLayersOpts, 0, wxEXPAND, 5 );
-	
-	
+
+
 	bSizeLayer->Add( 0, 10, 0, 0, 5 );
-	
+
 	m_staticTextUserLayers = new wxStaticText( this, wxID_ANY, _("User layers (not shown in realistic mode):"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextUserLayers->Wrap( -1 );
 	m_staticTextUserLayers->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-	
+
 	bSizeLayer->Add( m_staticTextUserLayers, 0, wxALL, 5 );
-	
+
 	wxFlexGridSizer* fgSizerShowUserLayersOpts;
 	fgSizerShowUserLayersOpts = new wxFlexGridSizer( 0, 3, 0, 0 );
 	fgSizerShowUserLayersOpts->SetFlexibleDirection( wxBOTH );
 	fgSizerShowUserLayersOpts->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
+
+
 	fgSizerShowUserLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapComments = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowUserLayersOpts->Add( m_bitmapComments, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxComments = new wxCheckBox( this, wxID_ANY, _("Show comments and drawings layers"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowUserLayersOpts->Add( m_checkBoxComments, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fgSizerShowUserLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapECO = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowUserLayersOpts->Add( m_bitmapECO, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxECO = new wxCheckBox( this, wxID_ANY, _("Show ECO layers"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowUserLayersOpts->Add( m_checkBoxECO, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	bSizeLayer->Add( fgSizerShowUserLayersOpts, 0, wxEXPAND, 5 );
-	
-	
+
+
 	bSizerRight->Add( bSizeLayer, 1, wxEXPAND, 5 );
-	
-	
+
+
 	bSizerUpper->Add( bSizerRight, 1, wxEXPAND, 5 );
-	
-	
+
+
 	bSizerMain->Add( bSizerUpper, 1, wxEXPAND, 5 );
-	
+
 	m_staticlineH = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
 	bSizerMain->Add( m_staticlineH, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
+
 	m_sdbSizer = new wxStdDialogButtonSizer();
 	m_sdbSizerOK = new wxButton( this, wxID_OK );
 	m_sdbSizer->AddButton( m_sdbSizerOK );
 	m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );
 	m_sdbSizer->AddButton( m_sdbSizerCancel );
 	m_sdbSizer->Realize();
-	
+
 	bSizerMain->Add( m_sdbSizer, 0, wxALL|wxALIGN_RIGHT, 5 );
-	
-	
+
+
 	this->SetSizer( bSizerMain );
 	this->Layout();
-	
+	bSizerMain->Fit( this );
+
 	this->Centre( wxBOTH );
-	
+
 	// Connect Events
 	m_checkBoxRealisticMode->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnCheckRealisticMode ), NULL, this );
 }
@@ -265,5 +266,5 @@ DIALOG_3D_VIEW_OPTIONS_BASE::~DIALOG_3D_VIEW_OPTIONS_BASE()
 {
 	// Disconnect Events
 	m_checkBoxRealisticMode->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnCheckRealisticMode ), NULL, this );
-	
+
 }

3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h

@@ -1,12 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jul 11 2018)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#ifndef __DIALOG_3D_VIEW_OPTION_BASE_H__
-#define __DIALOG_3D_VIEW_OPTION_BASE_H__
+#pragma once
 
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
@@ -37,7 +36,7 @@
 class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM
 {
 	private:
-	
+
 	protected:
 		wxStaticText* m_staticText3DRenderOpts;
 		wxStaticBitmap* m_bitmapRealisticMode;
@@ -76,16 +75,15 @@ class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM
 		wxStdDialogButtonSizer* m_sdbSizer;
 		wxButton* m_sdbSizerOK;
 		wxButton* m_sdbSizerCancel;
-		
+
 		// Virtual event handlers, overide them in your derived class
 		virtual void OnCheckRealisticMode( wxCommandEvent& event ) { event.Skip(); }
-		
-	
+
+
 	public:
-		
-		DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("3D Display Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 571,372 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+
+		DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("3D Display Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 		~DIALOG_3D_VIEW_OPTIONS_BASE();
-	
+
 };
 
-#endif //__DIALOG_3D_VIEW_OPTION_BASE_H__

3d-viewer/3d_viewer/eda_3d_viewer.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2015-2016 Mario Luzeiro <mrluzeiro@ua.pt>
- * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,11 +22,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-/**
- * @file  eda_3d_viewer.cpp
- * @brief Implements a 3d viewer windows GUI
- */
-
+#include <wx/colordlg.h>
+#include <wx/colour.h>
+#include <wx/filename.h>
+#include <wx/string.h>
+#include <wx/wupdlock.h>
+#include <wx/clipbrd.h>
 #include "eda_3d_viewer.h"
 
 #include "../3d_viewer_id.h"
@@ -271,6 +272,7 @@ void EDA_3D_VIEWER::OnCloseWindow( wxCloseEvent &event )
     event.Skip( true );
 }
 
+
 #define ROT_ANGLE 10.0
 
 void EDA_3D_VIEWER::Process_Special_Functions( wxCommandEvent &event )
@@ -292,7 +294,7 @@ void EDA_3D_VIEWER::Process_Special_Functions( wxCommandEvent &event )
         break;
 
     case ID_ROTATE3D_X_POS:
-        m_settings.CameraGet().RotateX( glm::radians(ROT_ANGLE) );
+        m_settings.CameraGet().RotateX( glm::radians( ROT_ANGLE ) );
 
         if( m_settings.RenderEngineGet() == RENDER_ENGINE_OPENGL_LEGACY )
             m_canvas->Request_refresh();
@@ -302,7 +304,7 @@ void EDA_3D_VIEWER::Process_Special_Functions( wxCommandEvent &event )
         break;
 
     case ID_ROTATE3D_X_NEG:
-        m_settings.CameraGet().RotateX( -glm::radians(ROT_ANGLE) );
+        m_settings.CameraGet().RotateX( -glm::radians( ROT_ANGLE ) );
 
         if( m_settings.RenderEngineGet() == RENDER_ENGINE_OPENGL_LEGACY )
             m_canvas->Request_refresh();
@@ -369,7 +371,11 @@ void EDA_3D_VIEWER::Process_Special_Functions( wxCommandEvent &event )
 
     case ID_ORTHO:
         m_settings.CameraGet().ToggleProjection();
-        m_canvas->Request_refresh();
+
+        if( m_settings.RenderEngineGet() == RENDER_ENGINE_OPENGL_LEGACY )
+            m_canvas->Request_refresh();
+        else
+            m_canvas->RenderRaytracingRequest();
         return;
 
     case ID_TOOL_SCREENCOPY_TOCLIBBOARD:
@@ -677,11 +683,11 @@ void EDA_3D_VIEWER::OnDisableRayTracing( wxCommandEvent& aEvent )
 }
 
 
-void EDA_3D_VIEWER::OnActivate( wxActivateEvent &event )
+void EDA_3D_VIEWER::OnActivate( wxActivateEvent &aEvent )
 {
     wxLogTrace( m_logTrace, "EDA_3D_VIEWER::OnActivate" );
 
-    if( m_canvas )
+    if( aEvent.GetActive() && m_canvas )
     {
         // Reload data if 3D frame shows a board,
         // because it can be changed since last frame activation
@@ -692,17 +698,17 @@ void EDA_3D_VIEWER::OnActivate( wxActivateEvent &event )
         m_canvas->SetFocus();
     }
 
-    event.Skip();    // required under wxMAC
+    aEvent.Skip(); // required under wxMAC
 }
 
 
-void EDA_3D_VIEWER::OnSetFocus(wxFocusEvent &event)
+void EDA_3D_VIEWER::OnSetFocus( wxFocusEvent& aEvent )
 {
     // Activates again the focus of the canvas so it will catch mouse and key events
     if( m_canvas )
         m_canvas->SetFocus();
 
-    event.Skip();
+    aEvent.Skip();
 }
 
 
@@ -985,6 +991,17 @@ void EDA_3D_VIEWER::takeScreenshot( wxCommandEvent& event )
 
         fullFileName = m_defaultSaveScreenshotFileName.GetFullPath();
 
+        wxFileName fn = fullFileName;
+
+        if( !fn.IsDirWritable() )
+        {
+            wxString msg;
+
+            msg.Printf( _( "Insufficient permissions required to save file\n%s" ), fullFileName );
+            wxMessageBox( msg, _( "Error" ), wxOK | wxICON_ERROR, this );
+            return;
+        }
+
         // Be sure the screen area destroyed by the file dialog is redrawn
         // before making a screen copy.
         // Without this call, under Linux the screen refresh is made to late.

3d-viewer/3d_viewer_id.h

@@ -103,6 +103,8 @@ enum id_3dview_frm
 
     ID_DISABLE_RAY_TRACING,
 
+    ID_CUSTOM_EVENT_1,      // A id for a custom event (canvas refresh request)
+
     ID_POPUP_3D_VIEW_START,
     ID_POPUP_ZOOMIN,
     ID_POPUP_ZOOMOUT,

AUTHORS.txt

@@ -46,9 +46,10 @@ Russell Oliver <roliver8143[at]gmail-dot-com>
 Seth Hillbrand <hillbrand[at]ucdavis-dot-edu>
 Jeff Young <jeff[at]rokeby-dot-ie>
 Kevin Cozens <kevin[at]ve3syb-dot-ca>
+Ian McInerney <ian.s.mcinerney[at]ieee-dot-org>
 
-See git repo on launchpad for contributors at
-https://code.launchpad.net/~kicad-product-committers/kicad/+git/product-git/+ref/master.
+See git repo on GitLab for contributors at
+https://gitlab.com/kicad/code/kicad/-/graphs/master
 
 
 == Document Writers
@@ -75,6 +76,7 @@ Spanish (ES) Pedro Martin del Valle <pkicad[at]yahoo-dot-es>
 Spanish (ES) Iñigo Zuluaga <inigo_zuluaga[at]yahoo-dot-es>
 German (DE) Rafael Sokolowski <Rafael.Sokolowski[at]web-dot-de
 Japanese (JA) Kenta Yonekura <yoneken[at]kicad-dot-jp>
+Simplified Chinese (zh_CN) taotieren <admin[at]taotieren-dot-com>
 
 Remy Halvick, David Briscoe, Dominique Laigle, Paul Burke
 

CMakeLists.txt

@@ -21,14 +21,7 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #
 
-cmake_minimum_required( VERSION 2.8.12 FATAL_ERROR )
-# because of http://public.kitware.com/Bug/view.php?id=10395
-
-# See https://gitlab.kitware.com/cmake/cmake/issues/15943
-# Remove as soon as 3.1 is minimum required version
-if(POLICY CMP0025)
-  cmake_policy(SET CMP0025 NEW) # CMake 3.0
-endif()
+cmake_minimum_required( VERSION 3.2 FATAL_ERROR )
 
 # Default to CMAKE_BUILD_TYPE = Release unless overridden on command line
 # http://www.cmake.org/pipermail/cmake/2008-September/023808.html
@@ -91,12 +84,12 @@ option( KICAD_SCRIPTING_ACTION_MENU
     ON )
 
 option( KICAD_USE_OCE
-    "Build tools and plugins related to OpenCascade Community Edition (default ON)"
-    ON )
+    "Build tools and plugins related to OpenCascade Community Edition (default OFF)"
+    OFF )
 
 option( KICAD_USE_OCC
-    "Build tools and plugins related to OpenCascade Technology (overrides KICAD_USE_OCE, default OFF)"
-    OFF )
+    "Build tools and plugins related to OpenCascade Technology (overrides KICAD_USE_OCE, default ON)"
+    ON )
 
 option( KICAD_INSTALL_DEMOS
     "Install KiCad demos and examples (default ON)"
@@ -200,24 +193,6 @@ include( PerformFeatureChecks )
 perform_feature_checks()
 
 
-# Workaround: CMake < 3.1 does not support CMAKE_CXX_STANDARD
-if( NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1 )
-    message( FATAL_ERROR "Remove compatibility code" )
-endif()
-
-if( CMAKE_VERSION VERSION_LESS 3.1 AND ( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) )
-    include(CheckCXXCompilerFlag)
-
-    CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
-
-    if(COMPILER_SUPPORTS_CXX11)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-    else()
-        message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
-    endif()
-endif()
-
-
 # Warn about missing override specifiers, if supported
 if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
     include(CheckCXXCompilerFlag)
@@ -413,7 +388,7 @@ endif()
 if( KICAD_USE_OCC )
     add_definitions( -DKICAD_USE_OCC )
     remove_definitions( -DKICAD_USE_OCE )
-    unset( KICAD_USE_OCE )
+    unset( KICAD_USE_OCE CACHE )
 endif()
 
 if( KICAD_USE_CUSTOM_PADS )
@@ -894,6 +869,16 @@ add_custom_target( uninstall
     "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" )
 
 
+#################################################
+# Generate platform metadata files
+#################################################
+if( APPLE )
+    include( ${CMAKE_MODULE_PATH}/WritePlatformMetadata_macos.cmake )
+elseif( UNIX )
+    include( ${CMAKE_MODULE_PATH}/WritePlatformMetadata_linux.cmake )
+endif()
+
+
 #================================================
 # Installation
 #================================================
@@ -919,7 +904,7 @@ if( UNIX AND NOT APPLE )
     set( UNIX_MIME_FILES ${UNIX_MIME_DIR}/mime )
     set( UNIX_ICON_FILES ${UNIX_MIME_DIR}/icons )
     set( UNIX_APPLICATIONS_FILES ${UNIX_MIME_DIR}/applications )
-    set( UNIX_APPDATA_FILES resources/linux/appdata )
+    set( UNIX_APPDATA_FILES ${PROJECT_BINARY_DIR}/resources/linux/appdata )
 
     # Install Mime directory
     install( DIRECTORY ${UNIX_ICON_FILES}
@@ -943,6 +928,9 @@ if( UNIX AND NOT APPLE )
     install( DIRECTORY ${UNIX_APPDATA_FILES}
         DESTINATION share
         COMPONENT resources
+        FILES_MATCHING
+        PATTERN "*appdata.xml"
+        PATTERN "*.in" EXCLUDE
         )
 endif()
 
@@ -988,7 +976,10 @@ add_subdirectory( plugins )             # 3D plugins must be built before kicad
 add_subdirectory( kicad )               # should follow pcbnew, eeschema
 add_subdirectory( tools )
 add_subdirectory( utils )
-add_subdirectory( qa )
+
+if( KICAD_BUILD_QA_TESTS )
+    add_subdirectory( qa )
+endif()
 
 # Resources
 if ( KICAD_INSTALL_DEMOS )

CMakeModules/CreateGitVersionHeader.cmake

@@ -27,6 +27,8 @@ macro( create_git_version_header _git_src_path )
     find_package( Git )
 
     if( GIT_FOUND )
+        message( STATUS "Using Git to determine build version string." )
+
         set( _Git_SAVED_LC_ALL "$ENV{LC_ALL}" )
         set( ENV{LC_ALL} C )
 

CMakeModules/FindPythonInterp.cmake

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

CMakeModules/FindPythonLibs.cmake

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

CMakeModules/FindSWIG.cmake

@@ -55,7 +55,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-find_program(SWIG_EXECUTABLE NAMES swig3.0 swig2.0 swig)
+find_program(SWIG_EXECUTABLE NAMES swig4.0 swig3.0 swig2.0 swig)
 
 if(SWIG_EXECUTABLE)
   execute_process(COMMAND ${SWIG_EXECUTABLE} -swiglib

CMakeModules/Findngspice.cmake

@@ -1,6 +1,8 @@
 # CMake script for finding libngspice
 
 # Copyright (C) 2016 CERN
+# Copyright (C) 2020 Kicad Developers, see AUTHORS.txt for contributors.
+#
 # Author: Maciej Suminski <maciej.suminski@cern.ch>
 #
 # This program is free software; you can redistribute it and/or
@@ -20,21 +22,108 @@
 # or you may write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
+# Usage:
+#
+# ngspice uses pkg-config to gather the configuration information so the pkg-config
+# information is used to populate the CMake find_* commands.  When pkg-config is not
+# available, the fallback is the default platform search paths set up by CMake.  The
+# default search paths can be overridden by user.  The order of precedence is as
+# follows:
+#
+# User defined root path NGSPICE_ROOT_DIR on CMake command line.
+# User defined root path environment variable NGSPICE_ROOT_DIR.
+# Paths generated by pkg-config.
+# The default system paths configured by CMake
+#
+# For a specific ngspice include path not defined above set NGSPICE_INCLUDE_PATH.
+#
+# For a specific ngspice library path not defined above set NGSPICE_LIBRARY_PATH.
+
+# Use pkg-config if it's available.
+find_package(PkgConfig)
+
+if( PKG_CONFIG_FOUND )
+    pkg_check_modules( _NGSPICE ngspice )
+
+    if( _NGSPICE_FOUND )
+        set( NGSPICE_BUILD_VERSION "${_NGSPICE_VERSION}" CACHE STRING
+             "ngspice version returned by pkg-config" )
+    endif()
+endif()
+
 find_path( NGSPICE_INCLUDE_DIR ngspice/sharedspice.h
-    PATHS ${NGSPICE_ROOT_DIR} $ENV{NGSPICE_ROOT_DIR} ${NGSPICE_INCLUDE_PATH}
-          ${NGSPICE_ROOT_DIR}/include
-    PATH_SUFFIXES src/include share/ngspice/include share/ngspice/include/ngspice
+    PATHS
+        ${NGSPICE_ROOT_DIR}
+        $ENV{NGSPICE_ROOT_DIR}
+        ${NGSPICE_INCLUDE_PATH}
+        ${_NGSPICE_INCLUDE_DIRS}
+    PATH_SUFFIXES
+        include
+        src/include
+        share/ngspice/include
+        share/ngspice/include/ngspice
 )
 
-find_library( NGSPICE_LIBRARY ngspice
-    PATHS ${NGSPICE_ROOT_DIR} $ENV{NGSPICE_ROOT_DIR} ${NGSPICE_LIBRARY_PATH}
-    PATH_SUFFIXES src/.libs lib
+if( UNIX )
+    set( NGSPICE_LIB_NAME libngspice.so.0 CACHE STRING "Optionally versioned name of the shared library" )
+else()
+    set( NGSPICE_LIB_NAME ngspice CACHE STRING "Optionally versioned name of the shared library" )
+endif()
+
+find_library( NGSPICE_LIBRARY ${NGSPICE_LIB_NAME}
+    PATHS
+        ${NGSPICE_ROOT_DIR}
+        $ENV{NGSPICE_ROOT_DIR}
+        ${NGSPICE_LIBRARY_PATH}
+        ${_NGSPICE_LIBRARY_DIRS}
+    PATH_SUFFIXES
+        src/.libs
+        lib
 )
 
+# If the ngspice version is not set by pkg-config, see if ngspice/config.h is available.
+if( NOT NGSPICE_BUILD_VERSION )
+    find_file( NGSPICE_CONFIG_H ngspice/config.h
+        PATHS
+            ${NGSPICE_ROOT_DIR}
+            $ENV{NGSPICE_ROOT_DIR}
+            ${NGSPICE_INCLUDE_PATH}
+            ${_NGSPICE_INCLUDE_DIRS}
+        PATH_SUFFIXES
+            include
+            src/include
+            share/ngspice/include
+            share/ngspice/include/ngspice
+        )
+
+    if( NOT NGSPICE_CONFIG_H-NOTFOUND )
+        message( STATUS "ngspice configuration file ${NGSPICE_CONFIG_H} found." )
+        set( NGSPICE_HAVE_CONFIG_H "1" CACHE STRING "ngspice/config.h header found." )
+    endif()
+endif()
+
 if( WIN32 AND MSYS )
     # NGSPICE_LIBRARY points to libngspice.dll.a on Windows,
     # but the goal is to find out the DLL name.
     find_library( NGSPICE_DLL NAMES libngspice-0.dll libngspice-1.dll )
+
+    # Some msys versions do not find xxx.dll lib files, only xxx.dll.a files
+    # so try a find_file in exec paths
+    if( NGSPICE_DLL STREQUAL "NGSPICE_DLL-NOTFOUND" )
+        find_file( NGSPICE_DLL NAMES libngspice-0.dll libngspice-1.dll
+            PATHS
+                ${NGSPICE_ROOT_DIR}
+            PATH_SUFFIXES
+                bin
+                lib
+            )
+    endif()
+
+    if( NGSPICE_DLL STREQUAL "NGSPICE_DLL-NOTFOUND" )
+        message( ERROR ":\n***** libngspice-x.dll not found in any executable path *****\n\n" )
+    else()
+        message( STATUS ": libngspice shared lib found: ${NGSPICE_DLL}\n" )
+    endif()
 else()
     set( NGSPICE_DLL "${NGSPICE_LIBRARY}" )
 endif()
@@ -62,4 +151,6 @@ mark_as_advanced(
     NGSPICE_INCLUDE_DIR
     NGSPICE_LIBRARY
     NGSPICE_DLL
+    NGSPICE_BUILD_VERSION
+    NGSPICE_HAVE_CONFIG_H
 )

CMakeModules/KiCadFullVersion.cmake

@@ -0,0 +1,40 @@
+#
+#  This program source code file is part of KICAD, a free EDA CAD application.
+#
+#  Copyright (C) 2019 Ian McInerney <Ian.S.McInerney@ieee.org>
+#  Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors.
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, you may find one here:
+#  http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#  or you may search the http://www.gnu.org website for the version 2 license,
+#  or you may write to the Free Software Foundation, Inc.,
+#  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+#
+
+# This file will create the full KiCad version string. The base of this string
+# will be either the git tag followed by the commit hash (if built inside a git
+# repository), or the version from KiCadVersion.cmake. The user-provided
+# KICAD_VERSION_EXTRA is then appended to the base version string.
+
+# Use git to determine the version string if it's available.
+include( ${CMAKE_MODULE_PATH}/CreateGitVersionHeader.cmake )
+create_git_version_header( ${SRC_PATH} )
+
+# $KICAD_VERSION is set in KiCadVersion.cmake or by git (if it is available).
+set( KICAD_VERSION_FULL "${KICAD_VERSION}" )
+
+# Optional user version information defined at configuration.
+if( KICAD_VERSION_EXTRA )
+    set( KICAD_VERSION_FULL "${KICAD_VERSION_FULL}-${KICAD_VERSION_EXTRA}" )
+endif()

CMakeModules/KiCadVersion.cmake

@@ -2,7 +2,7 @@
 #  This program source code file is part of KICAD, a free EDA CAD application.
 #
 #  Copyright (C) 2016 Wayne Stambaugh <stambaughw@gmail.com>
-#  Copyright (C) 2016 - 2019 KiCad Developers, see AUTHORS.txt for contributors.
+#  Copyright (C) 2016 - 2021 KiCad Developers, see AUTHORS.txt for contributors.
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License
@@ -35,4 +35,4 @@
 # be set after each version tag is added to the git repo.  This will
 # give developers a reasonable idea where which branch was used to build
 # KiCad.
-set( KICAD_VERSION "5.1.5" )
+set( KICAD_VERSION "5.1.12-unknown" )

CMakeModules/WritePlatformMetadata_linux.cmake

@@ -0,0 +1,46 @@
+#
+#  This program source code file is part of KICAD, a free EDA CAD application.
+#
+#  Copyright (C) 2019 Ian McInerney <Ian.S.McInerney@ieee.org>
+#  Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors.
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, you may find one here:
+#  http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#  or you may search the http://www.gnu.org website for the version 2 license,
+#  or you may write to the Free Software Foundation, Inc.,
+#  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+#
+
+# This file will configure the linux appdata.xml file to include the version
+# and build date.
+
+message( STATUS "Creating linux metadata" )
+
+# Create the KiCad version strings
+set( SRC_PATH ${PROJECT_SOURCE_DIR} )
+include( ${CMAKE_MODULE_PATH}/KiCadVersion.cmake )
+include( ${CMAKE_MODULE_PATH}/KiCadFullVersion.cmake )
+
+# Create the date of the configure
+string( TIMESTAMP KICAD_CONFIG_TIMESTAMP "%Y-%m-%d" )
+
+# Configure the KiCad appdata file
+configure_file( ${PROJECT_SOURCE_DIR}/resources/linux/appdata/kicad.appdata.xml.in
+                ${PROJECT_BINARY_DIR}/resources/linux/appdata/kicad.appdata.xml
+                @ONLY )
+
+# Ensure the file was configured successfully
+if( NOT EXISTS ${PROJECT_BINARY_DIR}/resources/linux/appdata/kicad.appdata.xml )
+    message( FATAL_ERROR "Configuration failed to write file kicad.appdata.xml." )
+endif()

CMakeModules/WritePlatformMetadata_macos.cmake

@@ -0,0 +1,63 @@
+#
+#  This program source code file is part of KICAD, a free EDA CAD application.
+#
+#  Copyright (C) 2019 Ian McInerney <Ian.S.McInerney@ieee.org>
+#  Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors.
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, you may find one here:
+#  http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#  or you may search the http://www.gnu.org website for the version 2 license,
+#  or you may write to the Free Software Foundation, Inc.,
+#  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+#
+
+# This file will configure the MacOS info.plist files to include the version
+# and build date.
+
+message( STATUS "Creating MacOS metadata" )
+
+# Create the KiCad version strings
+set( SRC_PATH ${PROJECT_SOURCE_DIR} )
+include( ${CMAKE_MODULE_PATH}/KiCadVersion.cmake )
+include( ${CMAKE_MODULE_PATH}/KiCadFullVersion.cmake )
+
+
+# Configure each plist file from the respurces directory and store it in the build directory
+configure_file( ${PROJECT_SOURCE_DIR}/resources/macos/plist/bitmap2component.Info.plist.in
+                ${PROJECT_BINARY_DIR}/bitmap2component/Info.plist
+                @ONLY )
+
+configure_file( ${PROJECT_SOURCE_DIR}/resources/macos/plist/eeschema.Info.plist.in
+                ${PROJECT_BINARY_DIR}/eeschema/Info.plist
+                @ONLY )
+
+configure_file( ${PROJECT_SOURCE_DIR}/resources/macos/plist/gerbview.Info.plist.in
+                ${PROJECT_BINARY_DIR}/gerbview/Info.plist
+                @ONLY )
+
+configure_file( ${PROJECT_SOURCE_DIR}/resources/macos/plist/kicad.Info.plist.in
+                ${PROJECT_BINARY_DIR}/kicad/Info.plist
+                @ONLY )
+
+configure_file( ${PROJECT_SOURCE_DIR}/resources/macos/plist/pcb_calculator.Info.plist.in
+                ${PROJECT_BINARY_DIR}/pcb_calculator/Info.plist
+                @ONLY )
+
+configure_file( ${PROJECT_SOURCE_DIR}/resources/macos/plist/pcbnew.Info.plist.in
+                ${PROJECT_BINARY_DIR}/pcbnew/Info.plist
+                @ONLY )
+
+configure_file( ${PROJECT_SOURCE_DIR}/resources/macos/plist/pleditor.Info.plist.in
+                ${PROJECT_BINARY_DIR}/pagelayout_editor/Info.plist
+                @ONLY )

CMakeModules/WriteVersionHeader.cmake

@@ -22,25 +22,9 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #
 
-# Automagically create version header file if the version string was
-# not defined during the build configuration.  If CreateGitVersionHeader
-# cannot determine the current repo version, a version.h file is still
-# created with KICAD_VERSION set in KiCadVersion.cmake.
+# Create the KiCad version strings
 include( ${CMAKE_MODULE_PATH}/KiCadVersion.cmake )
-
-# Always use git if it's available to determine the version string.
-message( STATUS "Using Git to determine build version string." )
-include( ${CMAKE_MODULE_PATH}/CreateGitVersionHeader.cmake )
-create_git_version_header( ${SRC_PATH} )
-
-# $KICAD_VERSION will always be set to something.  Even if it is the default
-# value set in KiCadVersion.cmake
-set( KICAD_VERSION_FULL "${KICAD_VERSION}" )
-
-# Optional user version information defined at configuration.
-if( KICAD_VERSION_EXTRA )
-    set( KICAD_VERSION_FULL "${KICAD_VERSION_FULL}-${KICAD_VERSION_EXTRA}" )
-endif()
+include( ${CMAKE_MODULE_PATH}/KiCadFullVersion.cmake )
 
 set( _wvh_new_version_text
 "/* Do not modify this file, it was automatically generated by CMake. */

CMakeModules/config.h.cmake

@@ -75,4 +75,10 @@
 /// Allows scripts install directory to be referenced by the program code.
 #define PYTHON_DEST                     "@PYTHON_DEST@"
 
+/// ngspice version string detected by pkg-config when available.
+#cmakedefine NGSPICE_BUILD_VERSION           "@NGSPICE_BUILD_VERSION@"
+
+/// When pkg-config config is not available for ngspice, use ngspice/config.h for version.
+#cmakedefine NGSPICE_HAVE_CONFIG_H
+
 #endif  // CONFIG_H_

Documentation/development/compiling.md

@@ -222,7 +222,7 @@ and can cause Pcbnew to crash if Python scripts create an invalid object state w
 
 The KiCad version string is defined by the output of `git describe --dirty` when git is available
 or the version string defined in CMakeModules/KiCadVersion.cmake with the value of
-KICAD_VERSION_EXTRA appended to the former.  If the KICAD_VERSION_EXTRA variable is not define,
+KICAD_VERSION_EXTRA appended to the former.  If the KICAD_VERSION_EXTRA variable is not defined,
 it is not appended to the version string.  If the KICAD_VERSION_EXTRA  variable is defined it
 is appended along with a leading '-' to the full version string as follows:
 
@@ -471,8 +471,8 @@ to download and [build Boost][] from source.  If you are building Boost on windo
 you will have to apply the Boost patches in the KiCad source [patches folder][].
 
 
-[download]: http://kicad-pcb.org/download/
-[KiCad website]: http://kicad-pcb.org/
+[download]: http://kicad.org/download/
+[KiCad website]: http://kicad.org/
 [KiCad Launchpad]: https://launchpad.net/kicad
 [GNU GCC]: https://gcc.gnu.org/
 [Clang]: http://clang.llvm.org/

Documentation/development/pcbnew-plugins.md

@@ -19,11 +19,11 @@ interpreter installed on the system.
 The Pcbnew Python API can be used stand-alone, i.e. no instance of Pcbnew is
 running and the board project to be manipulated is loaded and saved from and to
 file.  This approach is shown with some examples in the [user's
-documentation](http://docs.kicad-pcb.org/stable/en/pcbnew.html#_kicad_scripting_reference).
+documentation](http://docs.kicad.org/stable/en/pcbnew.html#_kicad_scripting_reference).
 
 Another documentation source is the auto-generated Doxygen reference of the
 API. It can be found
-[here](http://docs.kicad-pcb.org/doxygen-python/namespacepcbnew.html).
+[here](http://docs.kicad.org/doxygen-python/namespacepcbnew.html).
 
 # `Action Plugin` Support # {#ppi_action_pi}
 Besides the stand-alone usage of the generated Python plugin interface,

Documentation/development/road-map.md

@@ -101,5 +101,5 @@ capabilities.
 - In progress.
 
 
-[kicad-website]:http://kicad-pcb.org/
-[kicad-docs]:http://ci.kicad-pcb.org/job/kicad-doxygen/ws/Documentation/doxygen/html/index.html
+[kicad-website]:http://kicad.org/
+[kicad-docs]:http://ci.kicad.org/job/kicad-doxygen/ws/Documentation/doxygen/html/index.html

Documentation/development/stable-release-policy.md

@@ -71,7 +71,7 @@ GitHub plugin.
 
 To provide a convenient method for system packagers to build KiCad from known stable sources,
 source archives in the most common formats along with the resulting md5sum checksum will be
-added to either the KiCad developer's site on Launchpad or the main website at www.kicad-pcb.org.
+added to either the KiCad developer's site on Launchpad or the main website at www.kicad.org.
 
 # Stable Release Announcement # {#announcement}
 

Documentation/development/testing.md

@@ -304,6 +304,6 @@ Issues are still welcome for defects discovered.
 [Boost Unit Test framework]: https://www.boost.org/doc/libs/1_68_0/libs/test/doc/html/index.html
 [boost-test-functions]: https://www.boost.org/doc/libs/1_68_0/libs/test/doc/html/boost_test/utf_reference/testing_tool_ref.html
 [AFL fuzzing tool]: http://lcamtuf.coredump.cx/afl/
-[trace mask documentation]: http://docs.kicad-pcb.org/doxygen/group__trace__env__vars.html
-[trace mask documentation]: http://docs.kicad-pcb.org/doxygen/group__trace__env__vars.html
-[advanced config documentation]: http://docs.kicad-pcb.org/doxygen/namespaceAC__KEYS.html
+[trace mask documentation]: http://docs.kicad.org/doxygen/group__trace__env__vars.html
+[trace mask documentation]: http://docs.kicad.org/doxygen/group__trace__env__vars.html
+[advanced config documentation]: http://docs.kicad.org/doxygen/namespaceAC__KEYS.html

bitmap2component/CMakeLists.txt

@@ -37,7 +37,7 @@ if( APPLE )
         MACOSX_PACKAGE_LOCATION Resources
         )
     set( MACOSX_BUNDLE_ICON_FILE bitmap2component.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad.kicad )
     set( MACOSX_BUNDLE_NAME bitmap2component )
 endif()
 
@@ -54,11 +54,8 @@ target_link_libraries( bitmap2component
     )
 
 if( APPLE )
-    include( ${CMAKE_MODULE_PATH}/KiCadVersion.cmake )
-    configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist @ONLY )
-
     set_target_properties( bitmap2component PROPERTIES
-        MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
+        MACOSX_BUNDLE_INFO_PLIST ${PROJECT_BINARY_DIR}/bitmap2component/Info.plist
         )
 
     # put individual bundle outside of main bundle as a first step

bitmap2component/Info.plist.in

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDocumentTypes</key>
-	<array/>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>bitmap2component</string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
-	<key>CFBundleIconFile</key>
-	<string>bitmap2component.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.kicad-pcb.bitmap2component</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleLongVersionString</key>
-    <string>@KICAD_VERSION_FULL@</string>
-	<key>CFBundleName</key>
-	<string>Bitmap 2 Component</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>@KICAD_VERSION@</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>@KICAD_VERSION_FULL@</string>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-	<key>LSRequiresCarbon</key>
-	<true/>
-	<key>NSRequiresAquaSystemAppearance</key>
-	<true/>
-	<key>NSHumanReadableCopyright</key>
-	<string></string>
-        <key>NSHighResolutionCapable</key>
-        <string>True</string>
-</dict>
-</plist>

bitmap2component/bitmap2cmp_gui_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jan 17 2019)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -38,7 +38,7 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS
 	brightSizer = new wxBoxSizer( wxVERTICAL );
 
 	wxStaticBoxSizer* sbSizerInfo;
-	sbSizerInfo = new wxStaticBoxSizer( new wxStaticBox( m_panelRight, wxID_ANY, _("Bitmap Info:") ), wxVERTICAL );
+	sbSizerInfo = new wxStaticBoxSizer( new wxStaticBox( m_panelRight, wxID_ANY, _("Bitmap Info") ), wxVERTICAL );
 
 	wxFlexGridSizer* fgSizerInfo;
 	fgSizerInfo = new wxFlexGridSizer( 0, 4, 0, 0 );
@@ -99,12 +99,12 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS
 	fgSizerInfo->Add( m_staticTextBPI, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
 	m_DPIValueX = new wxTextCtrl( sbSizerInfo->GetStaticBox(), wxID_ANY, _("300"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_DPIValueX->SetMinSize( wxSize( 40,-1 ) );
+	m_DPIValueX->SetMinSize( wxSize( 45,-1 ) );
 
 	fgSizerInfo->Add( m_DPIValueX, 0, wxBOTTOM|wxRIGHT, 5 );
 
 	m_DPIValueY = new wxTextCtrl( sbSizerInfo->GetStaticBox(), wxID_ANY, _("300"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_DPIValueY->SetMinSize( wxSize( 40,-1 ) );
+	m_DPIValueY->SetMinSize( wxSize( 45,-1 ) );
 
 	fgSizerInfo->Add( m_DPIValueY, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
 
@@ -128,12 +128,12 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS
 
 	wxString m_radioBoxFormatChoices[] = { _("Eeschema (.lib file)"), _("Pcbnew (.kicad_mod file)"), _("Postscript (.ps file)"), _("Logo for title block (.kicad_wks file)") };
 	int m_radioBoxFormatNChoices = sizeof( m_radioBoxFormatChoices ) / sizeof( wxString );
-	m_radioBoxFormat = new wxRadioBox( m_panelRight, wxID_ANY, _("Format:"), wxDefaultPosition, wxDefaultSize, m_radioBoxFormatNChoices, m_radioBoxFormatChoices, 1, wxRA_SPECIFY_COLS );
+	m_radioBoxFormat = new wxRadioBox( m_panelRight, wxID_ANY, _("Format"), wxDefaultPosition, wxDefaultSize, m_radioBoxFormatNChoices, m_radioBoxFormatChoices, 1, wxRA_SPECIFY_COLS );
 	m_radioBoxFormat->SetSelection( 1 );
 	brightSizer->Add( m_radioBoxFormat, 0, wxEXPAND|wxALL, 5 );
 
 	wxStaticBoxSizer* sbSizer2;
-	sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_panelRight, wxID_ANY, _("Image Options:") ), wxVERTICAL );
+	sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_panelRight, wxID_ANY, _("Image Options") ), wxVERTICAL );
 
 	m_ThresholdText = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Black / White Threshold:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_ThresholdText->Wrap( -1 );
@@ -152,7 +152,7 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS
 
 	wxString m_radio_PCBLayerChoices[] = { _("Front silk screen"), _("Front solder mask"), _("User layer Eco1"), _("User layer Eco2") };
 	int m_radio_PCBLayerNChoices = sizeof( m_radio_PCBLayerChoices ) / sizeof( wxString );
-	m_radio_PCBLayer = new wxRadioBox( m_panelRight, wxID_ANY, _("Board Layer for Outline:"), wxDefaultPosition, wxDefaultSize, m_radio_PCBLayerNChoices, m_radio_PCBLayerChoices, 1, wxRA_SPECIFY_COLS );
+	m_radio_PCBLayer = new wxRadioBox( m_panelRight, wxID_ANY, _("Board Layer for Outline"), wxDefaultPosition, wxDefaultSize, m_radio_PCBLayerNChoices, m_radio_PCBLayerChoices, 1, wxRA_SPECIFY_COLS );
 	m_radio_PCBLayer->SetSelection( 3 );
 	m_radio_PCBLayer->SetToolTip( _("Choose the board layer to place the outline.\nThe 2 invisible fields reference and value are always placed on the silk screen layer.") );
 
@@ -167,6 +167,7 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS
 
 	this->SetSizer( bMainSizer );
 	this->Layout();
+	bMainSizer->Fit( this );
 	m_statusBar = this->CreateStatusBar( 1, wxSTB_SIZEGRIP, wxID_ANY );
 
 	// Connect Events

bitmap2component/bitmap2cmp_gui_base.fbp

@@ -14,6 +14,7 @@
         <property name="file">bitmap2cmp_gui_base</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
+        <property name="image_path_wrapper_function_name"></property>
         <property name="indent_with_spaces"></property>
         <property name="internationalize">1</property>
         <property name="name">bitmap2cmp_gui</property>
@@ -25,6 +26,7 @@
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
         <property name="ui_table">UI</property>
+        <property name="use_array_enum">0</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Frame" expanded="1">
@@ -45,7 +47,7 @@
             <property name="minimum_size"></property>
             <property name="name">BM2CMP_FRAME_BASE</property>
             <property name="pos"></property>
-            <property name="size">733,634</property>
+            <property name="size">-1,-1</property>
             <property name="style">wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER</property>
             <property name="subclass">KIWAY_PLAYER; kiway_player.h</property>
             <property name="title">Bitmap to Component Converter</property>
@@ -364,7 +366,7 @@
                                 <property name="proportion">0</property>
                                 <object class="wxStaticBoxSizer" expanded="1">
                                     <property name="id">wxID_ANY</property>
-                                    <property name="label">Bitmap Info:</property>
+                                    <property name="label">Bitmap Info</property>
                                     <property name="minimum_size"></property>
                                     <property name="name">sbSizerInfo</property>
                                     <property name="orient">wxVERTICAL</property>
@@ -1166,7 +1168,7 @@
                                                     <property name="maxlength"></property>
                                                     <property name="min_size"></property>
                                                     <property name="minimize_button">0</property>
-                                                    <property name="minimum_size">40,-1</property>
+                                                    <property name="minimum_size">45,-1</property>
                                                     <property name="moveable">1</property>
                                                     <property name="name">m_DPIValueX</property>
                                                     <property name="pane_border">1</property>
@@ -1232,7 +1234,7 @@
                                                     <property name="maxlength"></property>
                                                     <property name="min_size"></property>
                                                     <property name="minimize_button">0</property>
-                                                    <property name="minimum_size">40,-1</property>
+                                                    <property name="minimum_size">45,-1</property>
                                                     <property name="moveable">1</property>
                                                     <property name="name">m_DPIValueY</property>
                                                     <property name="pane_border">1</property>
@@ -1338,6 +1340,7 @@
                                     <property name="aui_name"></property>
                                     <property name="aui_position"></property>
                                     <property name="aui_row"></property>
+                                    <property name="auth_needed">0</property>
                                     <property name="best_size"></property>
                                     <property name="bg"></property>
                                     <property name="bitmap"></property>
@@ -1411,6 +1414,7 @@
                                     <property name="aui_name"></property>
                                     <property name="aui_position"></property>
                                     <property name="aui_row"></property>
+                                    <property name="auth_needed">0</property>
                                     <property name="best_size"></property>
                                     <property name="bg"></property>
                                     <property name="bitmap"></property>
@@ -1504,7 +1508,7 @@
                                     <property name="gripper">0</property>
                                     <property name="hidden">0</property>
                                     <property name="id">wxID_ANY</property>
-                                    <property name="label">Format:</property>
+                                    <property name="label">Format</property>
                                     <property name="majorDimension">1</property>
                                     <property name="max_size"></property>
                                     <property name="maximize_button">0</property>
@@ -1544,7 +1548,7 @@
                                 <property name="proportion">0</property>
                                 <object class="wxStaticBoxSizer" expanded="1">
                                     <property name="id">wxID_ANY</property>
-                                    <property name="label">Image Options:</property>
+                                    <property name="label">Image Options</property>
                                     <property name="minimum_size"></property>
                                     <property name="name">sbSizer2</property>
                                     <property name="orient">wxVERTICAL</property>
@@ -1777,7 +1781,7 @@
                                     <property name="gripper">0</property>
                                     <property name="hidden">0</property>
                                     <property name="id">wxID_ANY</property>
-                                    <property name="label">Board Layer for Outline:</property>
+                                    <property name="label">Board Layer for Outline</property>
                                     <property name="majorDimension">1</property>
                                     <property name="max_size"></property>
                                     <property name="maximize_button">0</property>

bitmap2component/bitmap2cmp_gui_base.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jan 17 2019)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -89,7 +89,7 @@ class BM2CMP_FRAME_BASE : public KIWAY_PLAYER
 
 	public:
 
-		BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Bitmap to Component Converter"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 733,634 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
+		BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Bitmap to Component Converter"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
 
 		~BM2CMP_FRAME_BASE();
 

bitmap2component/bitmap2component.cpp

@@ -490,9 +490,9 @@ void BITMAPCONV_INFO::CreateOutputFile( BMP2CMP_MOD_LAYER aModLayer )
         if( paths->next == NULL || paths->next->sign == '+' )
         {
             // Substract holes to main polygon:
-            polyset_areas.Simplify( SHAPE_POLY_SET::PM_FAST );
-            polyset_holes.Simplify( SHAPE_POLY_SET::PM_FAST );
-            polyset_areas.BooleanSubtract( polyset_holes, SHAPE_POLY_SET::PM_FAST );
+            polyset_areas.Simplify( SHAPE_POLY_SET::PM_STRICTLY_SIMPLE );
+            polyset_holes.Simplify( SHAPE_POLY_SET::PM_STRICTLY_SIMPLE );
+            polyset_areas.BooleanSubtract( polyset_holes, SHAPE_POLY_SET::PM_STRICTLY_SIMPLE );
             polyset_areas.Fracture( SHAPE_POLY_SET::PM_STRICTLY_SIMPLE );
 
             // Output current resulting polygon(s)

common/CMakeLists.txt

@@ -153,10 +153,10 @@ install( TARGETS lib_kicad
 endif()
 
 
-# KiCad build version string defaults to "no-vcs-found" which forces the build version header
-# command to look for git to create the version string header when the .git path is found in
-# the source path.
-set( KICAD_BRANCH_NAME "" CACHE STRING "KiCad repository name." )
+# The build version string defaults to the value in the KiCadVersion.cmake file.
+# If being built inside a git repository, the git tag and commit hash are used to create
+# a new version string instead. The user can supply an additional string to be appended
+# to the end inside the KICAD_VERSION_EXTRA variable
 set( KICAD_VERSION_EXTRA "" CACHE STRING
     "User defined configuration string to append to KiCad version." )
 
@@ -164,14 +164,13 @@ set( KICAD_VERSION_EXTRA "" CACHE STRING
 add_custom_target(
     version_header ALL
     COMMAND ${CMAKE_COMMAND}
-        -DKICAD_VERSION=${KICAD_VERSION}
-        -DKICAD_BRANCH_NAME=${KICAD_BRANCH_NAME}
         -DKICAD_VERSION_EXTRA=${KICAD_VERSION_EXTRA}
         -DOUTPUT_FILE=${CMAKE_BINARY_DIR}/kicad_build_version.h
         -DSRC_PATH=${PROJECT_SOURCE_DIR}
         -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
         -P ${CMAKE_MODULE_PATH}/WriteVersionHeader.cmake
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    BYPRODUCTS ${CMAKE_BINARY_DIR}/kicad_build_version.h
     COMMENT "Generating version string header"
     )
 
@@ -278,6 +277,7 @@ set( COMMON_SRCS
     ${PLOTTERS_CONTROL_SRCS}
     advanced_config.cpp
     array_options.cpp
+    base64.cpp
     base_struct.cpp
     bezier_curves.cpp
     bin_mod.cpp
@@ -327,6 +327,7 @@ set( COMMON_SRCS
     kiway_express.cpp
     kiway_holder.cpp
     kiway_player.cpp
+    launch_ext.cpp
     lib_id.cpp
     lib_table_base.cpp
     lib_table_keywords.cpp

common/base64.cpp

@@ -0,0 +1,157 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * @author Seth Hillbrand <seth@kipro-pcb.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <base64.h>
+
+#include <cstdint>
+#include <cstddef>
+#include <limits>
+#include <vector>
+
+namespace {
+
+static const uint8_t ENCODE_BASE64[64] = {
+    0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
+    0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50,
+    0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
+    0x59, 0x5A, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66,
+    0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E,
+    0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76,
+    0x77, 0x78, 0x79, 0x7A, 0x30, 0x31, 0x32, 0x33,
+    0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2B, 0x2F,
+};
+
+static const uint8_t E = -1;
+
+static const uint8_t DECODE_BASE64[128] = {
+/*  0x0 0x1 0x2 0x3 0x4 0x5 0x6 0x7 0x8 0x9 0xA 0xB 0xC 0xD 0xE 0xF */
+     E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,
+     E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,
+     E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E, 62,  E,  E,  E, 63,
+    52, 53, 54, 55, 56, 57, 58, 59, 60, 61,  E,  E,  E,  E,  E,  E,
+     E,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
+    15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,  E,  E,  E,  E,  E,
+     E, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+    41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,  E,  E,  E,  E,  E,
+};
+
+} // namespace
+
+namespace base64
+{
+    size_t encode_length( size_t aInputLen )
+    {
+        return 4 * ( ( aInputLen + 2 ) / 3 ) + ( aInputLen + 2 ) % 3 - 2;
+    }
+
+
+    size_t decode_length( size_t aInputLen )
+    {
+        if( aInputLen % 4 == 1 )
+            return 0;
+        else
+            return 3 * ( ( aInputLen + 2 ) / 4 ) + ( aInputLen + 2 ) % 4 - 2;
+    }
+
+
+    void encode( const std::vector<uint8_t>& aInput, std::vector<uint8_t>& aOutput )
+    {
+        size_t end = ( aInput.size() / 3 ) * 3;
+        aOutput.reserve( encode_length( aInput.size() ) );
+
+        for( size_t i = 0; i < end; i += 3 )
+        {
+            unsigned value = ( aInput[i] << 16 ) | ( aInput[i + 1] << 8 ) | aInput[i + 2] ;
+
+            aOutput.emplace_back( ENCODE_BASE64[( value >> 18 ) & 0x3F] );
+            aOutput.emplace_back( ENCODE_BASE64[( value >> 12 ) & 0x3F] );
+            aOutput.emplace_back( ENCODE_BASE64[( value >> 6 ) & 0x3F] );
+            aOutput.emplace_back( ENCODE_BASE64[value & 0x3F] );
+        }
+
+        size_t remainder = aInput.size() - end;
+
+        if( remainder )
+        {
+            unsigned value = aInput[end];
+
+            if( remainder == 2 )
+            {
+                value = ( value << 10 ) | ( aInput[end + 1] << 2 );
+                aOutput.emplace_back( ENCODE_BASE64[( value >> 12 ) & 0x3F] );
+            }
+            else
+            {
+                value <<= 4;
+            }
+
+            aOutput.emplace_back( ENCODE_BASE64[( value >> 6 ) & 0x3F] );
+            aOutput.emplace_back( ENCODE_BASE64[value & 0x3F] );
+        }
+    }
+
+
+    void decode(const std::vector<uint8_t>& aInput, std::vector<uint8_t>& aOutput )
+    {
+        size_t end = ( aInput.size() / 4 ) * 4;
+        size_t decode_size = decode_length( aInput.size() );
+
+        if( !decode_size )
+            return;
+
+        aOutput.reserve( decode_size );
+
+        for( size_t i = 0; i < end; i++ )
+        {
+            unsigned value = ( DECODE_BASE64[aInput[i] & 0x7F] << 18 ) |
+                             ( DECODE_BASE64[aInput[i + 1] & 0x7F] << 12 ) |
+                             ( DECODE_BASE64[aInput[i + 2] & 0x7F] << 6 ) |
+                               DECODE_BASE64[aInput[i + 3] & 0x7F];
+
+            aOutput.emplace_back( ( value >> 16 ) & 0xff );
+            aOutput.emplace_back( ( value >> 8 ) & 0xff );
+            aOutput.emplace_back( value & 0xff );
+        }
+
+        size_t remainder = aInput.size() - end;
+
+        if( remainder )
+        {
+            unsigned value = ( ( DECODE_BASE64[aInput[end] & 0x7F] ) << 6 ) |
+                             ( DECODE_BASE64[aInput[end + 1] & 0x7F] );
+
+            if( remainder == 3 )
+            {
+                value = ( value << 6 ) | ( DECODE_BASE64[aInput[end + 2] & 0x7F] );
+                value >>= 2;
+
+                aOutput.emplace_back( ( value >> 8 ) & 0xff );
+            }
+            else
+            {
+                value >>= 4;
+            }
+            aOutput[0] = value & 0xff ;
+        }
+    }
+
+} // base64

common/bezier_curves.cpp

@@ -1,8 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2014-2017 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 2014-2019 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -26,362 +25,69 @@
 /* routines to handle bezier curves */
 /************************************/
 
-#include <fctsys.h>
 #include <bezier_curves.h>
 
-
-static inline double calc_sq_distance( int x1, int y1, int x2, int y2 )
+BEZIER_POLY::BEZIER_POLY( const std::vector<wxPoint>& aControlPoints )
 {
-    int dx = x2 - x1;
-    int dy = y2 - y1;
+    for( unsigned ii = 0; ii < aControlPoints.size(); ++ii )
+        m_ctrlPts.emplace_back( VECTOR2D( aControlPoints[ii] ) );
 
-    return (double)dx * dx + (double)dy * dy;
-}
-
-
-static inline double sqrt_len( int dx, int dy )
-{
-    return ((double)dx * dx) + ((double)dy * dy);
+    m_minSegLen = 0.0;
 }
 
 
 void BEZIER_POLY::GetPoly( std::vector<wxPoint>& aOutput, int aMinSegLen )
 {
-    wxCHECK( !m_ctrlPts.empty(), /* void */ );
-    m_minSegLen = std::max( 1, aMinSegLen );
-    m_output = &aOutput;
-    m_output->clear();
-    m_output->push_back( wxPoint( m_ctrlPts.front() ) );
+    aOutput.clear();
+    std::vector<VECTOR2D> buffer;
+    GetPoly( buffer, double( aMinSegLen ) );
 
-    // Only quadratic and cubic Bezier curves are handled
-    if( m_ctrlPts.size() == 3 )
-        recursiveBezier( m_ctrlPts[0].x, m_ctrlPts[0].y,
-                m_ctrlPts[1].x, m_ctrlPts[1].y,
-                m_ctrlPts[2].x, m_ctrlPts[2].y, 0 );
-
-    else if( m_ctrlPts.size() == 4 )
-        recursiveBezier( m_ctrlPts[0].x, m_ctrlPts[0].y,
-                m_ctrlPts[1].x, m_ctrlPts[1].y,
-                m_ctrlPts[2].x, m_ctrlPts[2].y,
-                m_ctrlPts[3].x, m_ctrlPts[3].y, 0 );
-
-    m_output->push_back( wxPoint( m_ctrlPts.back() ) );
+    for( unsigned ii = 0; ii < buffer.size(); ++ii )
+        aOutput.emplace_back( wxPoint( int( buffer[ii].x ), int( buffer[ii].y ) ) );
 }
 
 
-void BEZIER_POLY::recursiveBezier( int x1, int y1, int x2, int y2,
-        int x3, int y3, unsigned int level )
+void BEZIER_POLY::GetPoly( std::vector<VECTOR2D>& aOutput, double aMinSegLen )
 {
-    if( level > recursion_limit )
-        return;
+    wxASSERT( m_ctrlPts.size() == 4 );
+    // FIXME Brute force method, use a better (recursive?) algorithm
+    // with a max error value.
+    // to optimize the number of segments
+    #define CURVE_POINTS 32
+    double dt = 1.0 / CURVE_POINTS;
 
-    // Calculate all the mid-points of the line segments
-    //----------------------
-    int    x12  = (x1 + x2) / 2;
-    int    y12  = (y1 + y2) / 2;
-    int    x23  = (x2 + x3) / 2;
-    int    y23  = (y2 + y3) / 2;
-    int    x123 = (x12 + x23) / 2;
-    int    y123 = (y12 + y23) / 2;
+    aOutput.clear();
+    aOutput.push_back( m_ctrlPts[0] );
 
-    int    dx = x3 - x1;
-    int    dy = y3 - y1;
-    double d  = fabs( ((double) (x2 - x3) * dy) - ((double) (y2 - y3) * dx ) );
-    double da;
+    // If the Bezier curve is degenerated (straight line), skip intermediate points:
+    bool degenerated = m_ctrlPts[0] == m_ctrlPts[1] && m_ctrlPts[2] == m_ctrlPts[3];
 
-    if( d > curve_collinearity_epsilon )
+    if( !degenerated )
     {
-        // Regular case
-        //-----------------
-        if( d * d <= distance_tolerance_square * (dx * dx + dy * dy) )
+        for( int ii = 1; ii < CURVE_POINTS; ii++ )
         {
-            // If the curvature doesn't exceed the distance_tolerance value
-            // we tend to finish subdivisions.
-            //----------------------
-            if( angle_tolerance < curve_angle_tolerance_epsilon )
-            {
-                addSegment( wxPoint( x123, y123 ) );
-                return;
-            }
+            double t = dt * ii;
+            double omt  = 1.0 - t;
+            double omt2 = omt * omt;
+            double omt3 = omt * omt2;
+            double t2   = t * t;
+            double t3   = t * t2;
 
-            // Angle & Cusp Condition
-            //----------------------
-            da = fabs( atan2( (double) ( y3 - y2 ), (double) ( x3 - x2 ) ) -
-                       atan2( (double) ( y2 - y1 ), (double) ( x2 - x1 ) ) );
-            if( da >=M_PI )
-                da = 2 * M_PI - da;
+            VECTOR2D vertex = omt3 * m_ctrlPts[0]
+                              + 3.0 * t * omt2 * m_ctrlPts[1]
+                              + 3.0 * t2 * omt * m_ctrlPts[2]
+                              + t3 * m_ctrlPts[3];
 
-            if( da < angle_tolerance )
-            {
-                // Finally we can stop the recursion
-                //----------------------
-                addSegment( wxPoint( x123, y123 ) );
-                return;
-            }
-        }
-    }
-    else
-    {
-        // Collinear case
-        //------------------
-        da = sqrt_len(dx, dy);
-        if( da == 0 )
-        {
-            d = calc_sq_distance( x1, y1, x2, y2 );
-        }
-        else
-        {
-            d = ( (double)(x2 - x1) * dx + (double)(y2 - y1) * dy ) / da;
-            if( d > 0 && d < 1 )
-            {
-                // Simple collinear case, 1---2---3
-                // We can leave just two endpoints
-                return;
-            }
-            if( d <= 0 )
-                d = calc_sq_distance( x2, y2, x1, y1 );
-            else if( d >= 1 )
-                d = calc_sq_distance( x2, y2, x3, y3 );
-            else
-                d = calc_sq_distance( x2, y2, x1 + (int) d * dx,
-                                      y1 + (int) d * dy );
-        }
-        if( d < distance_tolerance_square )
-        {
-            addSegment( wxPoint( x2, y2 ) );
-            return;
+            // a minimal filter on the lenght of the segment being created:
+            // The offset from last point:
+            VECTOR2D delta = vertex - aOutput.back();
+            double dist = delta.EuclideanNorm();
+
+            if( dist > aMinSegLen )
+                aOutput.push_back( vertex );
         }
     }
 
-    // Continue subdivision
-    //----------------------
-    recursiveBezier( x1, y1, x12, y12, x123, y123, level + 1 );
-    recursiveBezier( x123, y123, x23, y23, x3, y3, level + 1 );
-}
-
-
-void BEZIER_POLY::recursiveBezier( int x1, int y1, int x2, int y2,
-        int x3, int y3, int x4, int y4, unsigned int level )
-{
-    if( level > recursion_limit )
-        return;
-
-    // Calculate all the mid-points of the line segments
-    //----------------------
-    int x12   = (x1 + x2) / 2;
-    int y12   = (y1 + y2) / 2;
-    int x23   = (x2 + x3) / 2;
-    int y23   = (y2 + y3) / 2;
-    int x34   = (x3 + x4) / 2;
-    int y34   = (y3 + y4) / 2;
-    int x123  = (x12 + x23) / 2;
-    int y123  = (y12 + y23) / 2;
-    int x234  = (x23 + x34) / 2;
-    int y234  = (y23 + y34) / 2;
-    int x1234 = (x123 + x234) / 2;
-    int y1234 = (y123 + y234) / 2;
-
-
-    // Try to approximate the full cubic curve by a single straight line
-    //------------------
-    int    dx = x4 - x1;
-    int    dy = y4 - y1;
-
-    double d2 = fabs( (double) ( (x2 - x4) * dy - (y2 - y4) * dx ) );
-    double d3 = fabs( (double) ( (x3 - x4) * dy - (y3 - y4) * dx ) );
-    double da1, da2, k;
-
-    switch( (int(d2 > curve_collinearity_epsilon) << 1) +
-           int(d3 > curve_collinearity_epsilon) )
-    {
-    case 0:
-
-        // All collinear OR p1==p4
-        //----------------------
-        k = dx * dx + dy * dy;
-        if( k == 0 )
-        {
-            d2 = calc_sq_distance( x1, y1, x2, y2 );
-            d3 = calc_sq_distance( x4, y4, x3, y3 );
-        }
-        else
-        {
-            k   = 1 / k;
-            da1 = x2 - x1;
-            da2 = y2 - y1;
-            d2  = k * (da1 * dx + da2 * dy);
-            da1 = x3 - x1;
-            da2 = y3 - y1;
-            d3  = k * (da1 * dx + da2 * dy);
-            if( d2 > 0 && d2 < 1 && d3 > 0 && d3 < 1 )
-            {
-                // Simple collinear case, 1---2---3---4
-                // We can leave just two endpoints
-                return;
-            }
-            if( d2 <= 0 )
-                d2 = calc_sq_distance( x2, y2, x1, y1 );
-            else if( d2 >= 1 )
-                d2 = calc_sq_distance( x2, y2, x4, y4 );
-            else
-                d2 = calc_sq_distance( x2, y2, x1 + (int) d2 * dx,
-                                       y1 + (int) d2 * dy );
-
-            if( d3 <= 0 )
-                d3 = calc_sq_distance( x3, y3, x1, y1 );
-            else if( d3 >= 1 )
-                d3 = calc_sq_distance( x3, y3, x4, y4 );
-            else
-                d3 = calc_sq_distance( x3, y3, x1 + (int) d3 * dx,
-                                       y1 + (int) d3 * dy );
-        }
-        if( d2 > d3 )
-        {
-            if( d2 < distance_tolerance_square )
-            {
-                addSegment( wxPoint( x2, y2 ) );
-                return;
-            }
-        }
-        else
-        {
-            if( d3 < distance_tolerance_square )
-            {
-                addSegment( wxPoint( x3, y3 ) );
-                return;
-            }
-        }
-        break;
-
-    case 1:
-
-        // p1,p2,p4 are collinear, p3 is significant
-        //----------------------
-        if( d3 * d3 <= distance_tolerance_square * sqrt_len(dx, dy) )
-        {
-            if( angle_tolerance < curve_angle_tolerance_epsilon )
-            {
-                addSegment( wxPoint( x23, y23 ) );
-                return;
-            }
-
-            // Angle Condition
-            //----------------------
-            da1 = fabs( atan2( (double) ( y4 - y3 ), (double) ( x4 - x3 ) ) -
-                        atan2( (double) ( y3 - y2 ), (double) ( x3 - x2 ) ) );
-            if( da1 >= M_PI )
-                da1 = 2 * M_PI - da1;
-
-            if( da1 < angle_tolerance )
-            {
-                addSegment( wxPoint( x2, y2 ) );
-                addSegment( wxPoint( x3, y3 ) );
-                return;
-            }
-
-            if( cusp_limit != 0.0 )
-            {
-                if( da1 > cusp_limit )
-                {
-                    addSegment( wxPoint( x3, y3 ) );
-                    return;
-                }
-            }
-        }
-        break;
-
-    case 2:
-
-        // p1,p3,p4 are collinear, p2 is significant
-        //----------------------
-        if( d2 * d2 <= distance_tolerance_square * sqrt_len(dx, dy) )
-        {
-            if( angle_tolerance < curve_angle_tolerance_epsilon )
-            {
-                addSegment( wxPoint( x23, y23 ) );
-                return;
-            }
-
-            // Angle Condition
-            //----------------------
-            da1 = fabs( atan2( (double) ( y3 - y2 ), (double) ( x3 - x2 ) ) -
-                        atan2( (double) ( y2 - y1 ), (double) ( x2 - x1 ) ) );
-            if( da1 >= M_PI )
-                da1 = 2 * M_PI - da1;
-
-            if( da1 < angle_tolerance )
-            {
-                addSegment( wxPoint( x2, y2 ) );
-                addSegment( wxPoint( x3, y3 ) );
-                return;
-            }
-
-            if( cusp_limit != 0.0 )
-            {
-                if( da1 > cusp_limit )
-                {
-                    addSegment( wxPoint( x2, y2 ) );
-                    return;
-                }
-            }
-        }
-        break;
-
-    case 3:
-
-        // Regular case
-        //-----------------
-        if( (d2 + d3) * (d2 + d3) <= distance_tolerance_square * sqrt_len(dx, dy) )
-        {
-            // If the curvature doesn't exceed the distance_tolerance value
-            // we tend to finish subdivisions.
-            //----------------------
-            if( angle_tolerance < curve_angle_tolerance_epsilon )
-            {
-                addSegment( wxPoint( x23, y23 ) );
-                return;
-            }
-
-            // Angle & Cusp Condition
-            //----------------------
-            k   = atan2( (double) ( y3 - y2 ), (double) ( x3 - x2 ) );
-            da1 = fabs( k - atan2( (double) ( y2 - y1 ),
-                                   (double) ( x2 - x1 ) ) );
-            da2 = fabs( atan2( (double) ( y4 - y3 ),
-                               (double) ( x4 - x3 ) ) - k );
-            if( da1 >= M_PI )
-                da1 = 2 * M_PI - da1;
-            if( da2 >= M_PI )
-                da2 = 2 * M_PI - da2;
-
-            if( da1 + da2 < angle_tolerance )
-            {
-                // Finally we can stop the recursion
-                //----------------------
-                addSegment( wxPoint( x23, y23 ) );
-                return;
-            }
-
-            if( cusp_limit != 0.0 )
-            {
-                if( da1 > cusp_limit )
-                {
-                    addSegment( wxPoint( x2, y2 ) );
-                    return;
-                }
-
-                if( da2 > cusp_limit )
-                {
-                    addSegment( wxPoint( x3, y3 ) );
-                    return;
-                }
-            }
-        }
-        break;
-    }
-
-    // Continue subdivision
-    //----------------------
-    recursiveBezier( x1, y1, x12, y12, x123, y123, x1234, y1234, level + 1 );
-    recursiveBezier( x1234, y1234, x234, y234, x34, y34, x4, y4, level + 1 );
+    if( aOutput.back() != m_ctrlPts[3] )
+        aOutput.push_back( m_ctrlPts[3] );
 }

common/bitmap_base.cpp

@@ -240,18 +240,23 @@ void BITMAP_BASE::DrawBitmap( wxDC* aDC, const wxPoint& aPos )
     aDC->SetLogicalOrigin( logicalOriginX / GetScalingFactor(),
                            logicalOriginY / GetScalingFactor() );
 
+    pos.x  = KiROUND( pos.x / GetScalingFactor() );
+    pos.y  = KiROUND( pos.y / GetScalingFactor() );
+    size.x = KiROUND( size.x / GetScalingFactor() );
+    size.y = KiROUND( size.y / GetScalingFactor() );
+    aDC->SetClippingRegion( pos, size );
+
     if( GetGRForceBlackPenState() )
     {
         wxBitmap result( m_bitmap->ConvertToImage().ConvertToGreyscale() );
-        aDC->DrawBitmap( result, KiROUND( pos.x / GetScalingFactor() ),
-                KiROUND( pos.y / GetScalingFactor() ), true );
+        aDC->DrawBitmap( result, pos.x, pos.y, true );
     }
     else
     {
-        aDC->DrawBitmap( *m_bitmap, KiROUND( pos.x / GetScalingFactor() ),
-                KiROUND( pos.y / GetScalingFactor() ), true );
+        aDC->DrawBitmap( *m_bitmap, pos.x, pos.y, true );
     }
 
+    aDC->DestroyClippingRegion();
     aDC->SetUserScale( scale, scale );
     aDC->SetLogicalOrigin( logicalOriginX, logicalOriginY );
 }

common/common.cpp

@@ -42,6 +42,7 @@
 #include <wx/url.h>
 
 #include <pgm_base.h>
+#include <clocale>
 
 using KIGFX::COLOR4D;
 
@@ -57,33 +58,63 @@ using KIGFX::COLOR4D;
 COLOR4D        g_GhostColor;
 
 
+// When reading/writing files, we need to swtich to setlocale( LC_NUMERIC, "C" ).
+// Works fine to read/write files with floating point numbers.
+// We can call setlocale( LC_NUMERIC, "C" ) or wxLocale( "C", "C", "C", false )
+// wxWidgets discourage a direct call to setlocale
+// However, for us, calling wxLocale( "C", "C", "C", false ) has a unwanted effect:
+// The I18N translations are no longer active, because the English dictionary is selected.
+// To read files, this is not a major issues, but the resul can differ
+// from using setlocale(xx, "C").
+// Previouly, we used only setlocale( LC_NUMERIC, "C" )
+//
+// Known issues are
+// on MSW
+//    using setlocale( LC_NUMERIC, "C" ) generates an alert message in debug mode,
+//    and this message ("Decimal separator mismatch") must be disabled.
+//    But calling wxLocale( "C", "C", "C", false ) works fine
+// On unix:
+//    calling wxLocale( "C", "C", "C", false ) breaks env vars containing non ASCII7 chars.
+//    these env vars return a empty string from wxGetEnv() in many cases, and if such a
+//    var must be read after calling wxLocale( "C", "C", "C", false ), it looks like empty
+//
+// So use wxLocale on Windows and setlocale on unix
+
+
+// set USE_WXLOCALE 0 to use setlocale, 1 to use wxLocale:
+#if defined( _WIN32 )
+#define USE_WXLOCALE 1
+#else
+#define USE_WXLOCALE 0
+#endif
+
+// On Windows, when using setlocale, a wx alert is generated
+// in some cases (reading a bitmap for instance)
+// So we disable alerts during the time a file is read or written
+#if !USE_WXLOCALE
 #if defined( _WIN32 ) && defined( DEBUG )
 // a wxAssertHandler_t function to filter wxWidgets alert messages when reading/writing a file
 // when switching the locale to LC_NUMERIC, "C"
 // It is used in class LOCALE_IO to hide a useless (in kicad) wxWidgets alert message
 void KiAssertFilter( const wxString &file, int line,
-                                  const wxString &func, const wxString &cond,
-                                  const wxString &msg)
+                     const wxString &func, const wxString &cond,
+                     const wxString &msg)
 {
     if( !msg.Contains( "Decimal separator mismatch" ) )
-        wxTheApp->OnAssertFailure( file, line, func, cond, msg );
+        wxTheApp->OnAssertFailure( file.c_str(), line, func.c_str(), cond.c_str(), msg.c_str() );
 }
 #endif
-
+#endif
 
 std::atomic<unsigned int> LOCALE_IO::m_c_count( 0 );
-
-
-// Note on Windows, setlocale( LC_NUMERIC, "C" ) works fine to read/write
-// files with floating point numbers, but generates a overzealous wx alert
-// in some cases (reading a bitmap for instance)
-// So we disable alerts during the time a file is read or written
-
-LOCALE_IO::LOCALE_IO()
+LOCALE_IO::LOCALE_IO() : m_wxLocale( nullptr )
 {
     // use thread safe, atomic operation
     if( m_c_count++ == 0 )
     {
+#if USE_WXLOCALE
+        m_wxLocale = new wxLocale( "C", "C", "C", false );
+#else
         // Store the user locale name, to restore this locale later, in dtor
         m_user_locale = setlocale( LC_NUMERIC, nullptr );
 #if defined( _WIN32 ) && defined( DEBUG )
@@ -92,6 +123,7 @@ LOCALE_IO::LOCALE_IO()
 #endif
         // Switch the locale to C locale, to read/write files with fp numbers
         setlocale( LC_NUMERIC, "C" );
+#endif
     }
 }
 
@@ -102,10 +134,15 @@ LOCALE_IO::~LOCALE_IO()
     if( --m_c_count == 0 )
     {
         // revert to the user locale
+#if USE_WXLOCALE
+        delete m_wxLocale;      // Deleting m_wxLocale restored previous locale
+        m_wxLocale = nullptr;
+#else
         setlocale( LC_NUMERIC, m_user_locale.c_str() );
 #if defined( _WIN32 ) && defined( DEBUG )
         // Enable wxWidgets alerts
         wxSetDefaultAssertHandler();
+#endif
 #endif
     }
 }
@@ -425,7 +462,7 @@ wxString KIwxExpandEnvVars(const wxString& str)
                     if( !expanded )
                         strResult << (wxChar)bracket;
 
-                    str_m = str[++m];
+                    m++;
                 }
             }
 
@@ -450,6 +487,11 @@ wxString KIwxExpandEnvVars(const wxString& str)
         }
     }
 
+#ifndef __WINDOWS__
+    if( strResult.StartsWith( "~" ) )
+        strResult.Replace( "~", wxGetHomeDir(), false );
+#endif // __WINDOWS__
+
     return strResult;
 }
 

common/confirm.cpp

@@ -89,10 +89,10 @@ bool KIDIALOG::Show( bool aShow )
             return it->second;
     }
 
-    bool ret = wxRichMessageDialog::Show( aShow );
+    int ret = wxRichMessageDialog::Show( aShow );
 
-    // Has the user asked not to show the dialog again
-    if( IsCheckBoxChecked() )
+    // Has the user asked not to show the dialog again and it was confirmed
+    if( IsCheckBoxChecked() && ret != wxID_CANCEL )
         doNotShowAgainDlgs[m_hash] = ret;
 
     return ret;
@@ -110,7 +110,7 @@ int KIDIALOG::ShowModal()
     int ret = wxRichMessageDialog::ShowModal();
 
     // Has the user asked not to show the dialog again
-    if( IsCheckBoxChecked() )
+    if( IsCheckBoxChecked() && ret != wxID_CANCEL )
         doNotShowAgainDlgs[m_hash] = ret;
 
     return ret;

common/dialog_about/AboutDialog_main.cpp

@@ -64,7 +64,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
     aInfo.SetAppName( Pgm().App().GetAppName() );
 
     /* Copyright information */
-    aInfo.SetCopyright( "(C) 1992-2019 KiCad Developers Team" );
+    aInfo.SetCopyright( "(C) 1992-2020 KiCad Developers Team" );
 
     /* KiCad build version */
     wxString version;
@@ -130,11 +130,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
     description << "<ul>";
     description << "<li>"
                 << _( "The official KiCad website - " )
-                << HtmlHyperlink( "http://www.kicad-pcb.org" )
-                << "</li>";
-    description << "<li>"
-                << _( "Developer website on Launchpad - " )
-                << HtmlHyperlink( "https://launchpad.net/kicad" )
+                << HtmlHyperlink( "https://www.kicad.org" )
                 << "</li>";
 
     description << "<li>"
@@ -152,8 +148,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
     description << "<ul>";
     description << "<li>"
                 << _( "Report or examine bugs - " )
-                << HtmlHyperlink( "https://bugs.launchpad.net/kicad/+bugs?orderby=-id&start=0",
-                                  "https://bugs.launchpad.net/kicad" )
+                << HtmlHyperlink( "https://gitlab.com/kicad/code/kicad/issues" )
                 << "</li>";
     description << "</ul></p>";
 
@@ -164,7 +159,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
     description << "<ul>";
     description << "<li>"
                 << _( "KiCad forum - " )
-                << HtmlHyperlink( "https://forum.kicad.info" )
+                << HtmlHyperlink( "https://go.kicad.org/forum" )
                 << "</li>";
 
     description << "</ul></p>";

common/dialogs/dialog_color_picker.cpp

@@ -23,6 +23,18 @@
 
 #define ALPHA_MAX 100   // the max value returned by the alpha (opacity) slider
 
+
+// Configure the spin controls contained inside the dialog
+void configureSpinCtrl( wxSpinCtrl* aCtrl )
+{
+    wxSize textLength = aCtrl->GetTextExtent( "999" );
+    wxSize ctrlSize   = aCtrl->GetSizeFromTextSize( textLength );
+
+    aCtrl->SetMinSize( ctrlSize );
+    aCtrl->SetSize( ctrlSize );
+}
+
+
 DIALOG_COLOR_PICKER::DIALOG_COLOR_PICKER( wxWindow* aParent, KIGFX::COLOR4D& aCurrentColor,
                                           bool aAllowOpacityControl, CUSTOM_COLORS_LIST* aUserColors )
 	: DIALOG_COLOR_PICKER_BASE( aParent )
@@ -131,6 +143,13 @@ bool DIALOG_COLOR_PICKER::TransferDataToWindow()
     SetEditVals( ALL_CHANGED );
     drawAll();
 
+    // Configure the spin control sizes
+    configureSpinCtrl( m_spinCtrlGreen );
+    configureSpinCtrl( m_spinCtrlBlue );
+    configureSpinCtrl( m_spinCtrlRed );
+    configureSpinCtrl( m_spinCtrlHue );
+    configureSpinCtrl( m_spinCtrlSaturation );
+
     m_notebook->GetPage( 0 )->Layout();
     m_notebook->GetPage( 1 )->Layout();
 

common/dialogs/dialog_color_picker_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Mar 28 2019)
+// C++ code generated with wxFormBuilder (version Oct 26 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -56,18 +56,12 @@ DIALOG_COLOR_PICKER_BASE::DIALOG_COLOR_PICKER_BASE( wxWindow* parent, wxWindowID
 	fgSizerRGB->Add( m_staticTextB, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
 	m_spinCtrlRed = new wxSpinCtrl( sbSizerViewRGB->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 255, 128 );
-	m_spinCtrlRed->SetMinSize( wxSize( 80,-1 ) );
-
 	fgSizerRGB->Add( m_spinCtrlRed, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 	m_spinCtrlGreen = new wxSpinCtrl( sbSizerViewRGB->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 255, 128 );
-	m_spinCtrlGreen->SetMinSize( wxSize( 80,-1 ) );
-
 	fgSizerRGB->Add( m_spinCtrlGreen, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 	m_spinCtrlBlue = new wxSpinCtrl( sbSizerViewRGB->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 255, 128 );
-	m_spinCtrlBlue->SetMinSize( wxSize( 80,-1 ) );
-
 	fgSizerRGB->Add( m_spinCtrlBlue, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
@@ -103,13 +97,9 @@ DIALOG_COLOR_PICKER_BASE::DIALOG_COLOR_PICKER_BASE( wxWindow* parent, wxWindowID
 	fgSizerHSV->Add( m_staticTextSat, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
 	m_spinCtrlHue = new wxSpinCtrl( sbSizerViewHSV->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 0, 359, 0 );
-	m_spinCtrlHue->SetMinSize( wxSize( 80,-1 ) );
-
 	fgSizerHSV->Add( m_spinCtrlHue, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 	m_spinCtrlSaturation = new wxSpinCtrl( sbSizerViewHSV->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 255, 128 );
-	m_spinCtrlSaturation->SetMinSize( wxSize( 80,-1 ) );
-
 	fgSizerHSV->Add( m_spinCtrlSaturation, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 

common/dialogs/dialog_color_picker_base.fbp

@@ -14,7 +14,6 @@
         <property name="file">dialog_color_picker_base</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
-        <property name="image_path_wrapper_function_name"></property>
         <property name="indent_with_spaces"></property>
         <property name="internationalize">1</property>
         <property name="name">DIALOG_COLOR_PICKER_BASE</property>
@@ -26,7 +25,6 @@
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
         <property name="ui_table">UI</property>
-        <property name="use_array_enum">0</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Dialog" expanded="1">
@@ -506,7 +504,7 @@
                                                                             <property name="min">0</property>
                                                                             <property name="min_size"></property>
                                                                             <property name="minimize_button">0</property>
-                                                                            <property name="minimum_size">80,-1</property>
+                                                                            <property name="minimum_size">-1,-1</property>
                                                                             <property name="moveable">1</property>
                                                                             <property name="name">m_spinCtrlRed</property>
                                                                             <property name="pane_border">1</property>
@@ -569,7 +567,7 @@
                                                                             <property name="min">0</property>
                                                                             <property name="min_size"></property>
                                                                             <property name="minimize_button">0</property>
-                                                                            <property name="minimum_size">80,-1</property>
+                                                                            <property name="minimum_size">-1,-1</property>
                                                                             <property name="moveable">1</property>
                                                                             <property name="name">m_spinCtrlGreen</property>
                                                                             <property name="pane_border">1</property>
@@ -632,7 +630,7 @@
                                                                             <property name="min">0</property>
                                                                             <property name="min_size"></property>
                                                                             <property name="minimize_button">0</property>
-                                                                            <property name="minimum_size">80,-1</property>
+                                                                            <property name="minimum_size">-1,-1</property>
                                                                             <property name="moveable">1</property>
                                                                             <property name="name">m_spinCtrlBlue</property>
                                                                             <property name="pane_border">1</property>
@@ -918,7 +916,7 @@
                                                                                     <property name="min">0</property>
                                                                                     <property name="min_size"></property>
                                                                                     <property name="minimize_button">0</property>
-                                                                                    <property name="minimum_size">80,-1</property>
+                                                                                    <property name="minimum_size">-1,-1</property>
                                                                                     <property name="moveable">1</property>
                                                                                     <property name="name">m_spinCtrlHue</property>
                                                                                     <property name="pane_border">1</property>
@@ -981,7 +979,7 @@
                                                                                     <property name="min">0</property>
                                                                                     <property name="min_size"></property>
                                                                                     <property name="minimize_button">0</property>
-                                                                                    <property name="minimum_size">80,-1</property>
+                                                                                    <property name="minimum_size">-1,-1</property>
                                                                                     <property name="moveable">1</property>
                                                                                     <property name="name">m_spinCtrlSaturation</property>
                                                                                     <property name="pane_border">1</property>

common/dialogs/dialog_color_picker_base.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Mar 28 2019)
+// C++ code generated with wxFormBuilder (version Oct 26 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!

common/dialogs/dialog_configure_paths.cpp

@@ -221,14 +221,17 @@ bool DIALOG_CONFIGURE_PATHS::TransferDataFromWindow()
 
     for( int row = 0; row < m_EnvVars->GetNumberRows(); ++row )
     {
-        wxString name = m_EnvVars->GetCellValue( row, EV_NAME_COL );
-        wxString path = m_EnvVars->GetCellValue( row, EV_PATH_COL );
-        wxString external = m_EnvVars->GetCellValue( row, EV_FLAG_COL );
+        wxString     name = m_EnvVars->GetCellValue( row, EV_NAME_COL );
+        wxString     path = m_EnvVars->GetCellValue( row, EV_PATH_COL );
+        wxString     external = m_EnvVars->GetCellValue( row, EV_FLAG_COL );
+        ENV_VAR_ITEM var( path );
 
         if( external.Length() )
-            continue;
-
-        if( name.IsEmpty() )
+        {
+            // Don't check for consistency on external variables, just use them as-is
+            var.SetDefinedExternally( true );
+        }
+        else if( name.IsEmpty() )
         {
             m_errorGrid = m_EnvVars;
             m_errorRow = row;
@@ -245,7 +248,7 @@ bool DIALOG_CONFIGURE_PATHS::TransferDataFromWindow()
             return false;
         }
 
-        envVarMap[ name ] = ENV_VAR_ITEM( path );
+        envVarMap[ name ] = var;
     }
 
     Pgm().SetLocalEnvVariables( envVarMap );

common/dialogs/dialog_configure_paths_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec 30 2017)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -14,22 +14,22 @@
 DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
 {
 	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
-	
+
 	wxBoxSizer* bSizerMain;
 	bSizerMain = new wxBoxSizer( wxVERTICAL );
-	
+
 	wxStaticBoxSizer* sbEnvVars;
 	sbEnvVars = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Environment Variables") ), wxVERTICAL );
-	
+
 	m_EnvVars = new WX_GRID( sbEnvVars->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	
+
 	// Grid
 	m_EnvVars->CreateGrid( 1, 2 );
 	m_EnvVars->EnableEditing( true );
 	m_EnvVars->EnableGridLines( true );
 	m_EnvVars->EnableDragGridSize( false );
 	m_EnvVars->SetMargins( 0, 0 );
-	
+
 	// Columns
 	m_EnvVars->SetColSize( 0, 150 );
 	m_EnvVars->SetColSize( 1, 454 );
@@ -38,54 +38,50 @@ DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWi
 	m_EnvVars->SetColLabelSize( 22 );
 	m_EnvVars->SetColLabelValue( 0, _("Name") );
 	m_EnvVars->SetColLabelValue( 1, _("Path") );
-	m_EnvVars->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
+	m_EnvVars->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
+
 	// Rows
 	m_EnvVars->EnableDragRowSize( true );
 	m_EnvVars->SetRowLabelSize( 0 );
-	m_EnvVars->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
+	m_EnvVars->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
+
 	// Label Appearance
-	
+
 	// Cell Defaults
 	m_EnvVars->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
 	m_EnvVars->SetMinSize( wxSize( 604,170 ) );
-	
-	sbEnvVars->Add( m_EnvVars, 1, wxEXPAND|wxBOTTOM, 5 );
-	
+
+	sbEnvVars->Add( m_EnvVars, 1, wxBOTTOM|wxEXPAND|wxLEFT, 5 );
+
 	wxBoxSizer* bSizerEnvVarBtns;
 	bSizerEnvVarBtns = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_btnAddEnvVar = new wxBitmapButton( sbEnvVars->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_btnAddEnvVar->SetMinSize( wxSize( 30,29 ) );
-	
-	bSizerEnvVarBtns->Add( m_btnAddEnvVar, 0, wxRIGHT, 5 );
-	
-	
+
+	m_btnAddEnvVar = new wxBitmapButton( sbEnvVars->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizerEnvVarBtns->Add( m_btnAddEnvVar, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
+
+
 	bSizerEnvVarBtns->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	m_btnDeleteEnvVar = new wxBitmapButton( sbEnvVars->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_btnDeleteEnvVar->SetMinSize( wxSize( 30,29 ) );
-	
-	bSizerEnvVarBtns->Add( m_btnDeleteEnvVar, 0, wxRIGHT|wxLEFT, 5 );
-	
-	
+
+	m_btnDeleteEnvVar = new wxBitmapButton( sbEnvVars->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizerEnvVarBtns->Add( m_btnDeleteEnvVar, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
+
+
 	sbEnvVars->Add( bSizerEnvVarBtns, 0, wxEXPAND, 5 );
-	
-	
+
+
 	bSizerMain->Add( sbEnvVars, 1, wxEXPAND|wxALL, 5 );
-	
+
 	m_sb3DSearchPaths = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("3D Search Paths") ), wxVERTICAL );
-	
+
 	m_SearchPaths = new WX_GRID( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	
+
 	// Grid
 	m_SearchPaths->CreateGrid( 1, 3 );
 	m_SearchPaths->EnableEditing( true );
 	m_SearchPaths->EnableGridLines( true );
 	m_SearchPaths->EnableDragGridSize( false );
 	m_SearchPaths->SetMargins( 0, 0 );
-	
+
 	// Columns
 	m_SearchPaths->SetColSize( 0, 150 );
 	m_SearchPaths->SetColSize( 1, 300 );
@@ -96,54 +92,46 @@ DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWi
 	m_SearchPaths->SetColLabelValue( 0, _("Alias") );
 	m_SearchPaths->SetColLabelValue( 1, _("Path") );
 	m_SearchPaths->SetColLabelValue( 2, _("Description") );
-	m_SearchPaths->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
+	m_SearchPaths->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
+
 	// Rows
 	m_SearchPaths->AutoSizeRows();
 	m_SearchPaths->EnableDragRowSize( false );
 	m_SearchPaths->SetRowLabelSize( 0 );
-	m_SearchPaths->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
+	m_SearchPaths->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
+
 	// Label Appearance
-	
+
 	// Cell Defaults
 	m_SearchPaths->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
 	m_SearchPaths->SetMinSize( wxSize( 604,150 ) );
-	
-	m_sb3DSearchPaths->Add( m_SearchPaths, 1, wxEXPAND|wxBOTTOM, 5 );
-	
+
+	m_sb3DSearchPaths->Add( m_SearchPaths, 1, wxBOTTOM|wxEXPAND|wxLEFT, 5 );
+
 	wxBoxSizer* bSizerSearchPathBtns;
 	bSizerSearchPathBtns = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_btnAddSearchPath = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_btnAddSearchPath->SetMinSize( wxSize( 30,29 ) );
-	
-	bSizerSearchPathBtns->Add( m_btnAddSearchPath, 0, wxRIGHT, 5 );
-	
-	m_btnMoveUp = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_btnMoveUp->SetMinSize( wxSize( 30,29 ) );
-	
-	bSizerSearchPathBtns->Add( m_btnMoveUp, 0, wxRIGHT, 5 );
-	
-	m_btnMoveDown = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_btnMoveDown->SetMinSize( wxSize( 30,29 ) );
-	
-	bSizerSearchPathBtns->Add( m_btnMoveDown, 0, wxRIGHT, 5 );
-	
-	
+
+	m_btnAddSearchPath = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizerSearchPathBtns->Add( m_btnAddSearchPath, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
+
+	m_btnMoveUp = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizerSearchPathBtns->Add( m_btnMoveUp, 0, wxBOTTOM|wxRIGHT, 5 );
+
+	m_btnMoveDown = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizerSearchPathBtns->Add( m_btnMoveDown, 0, wxBOTTOM|wxRIGHT, 5 );
+
+
 	bSizerSearchPathBtns->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	m_btnDeleteSearchPath = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_btnDeleteSearchPath->SetMinSize( wxSize( 30,29 ) );
-	
-	bSizerSearchPathBtns->Add( m_btnDeleteSearchPath, 0, wxRIGHT|wxLEFT, 5 );
-	
-	
+
+	m_btnDeleteSearchPath = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizerSearchPathBtns->Add( m_btnDeleteSearchPath, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
+
+
 	m_sb3DSearchPaths->Add( bSizerSearchPathBtns, 0, wxEXPAND, 5 );
-	
-	
+
+
 	bSizerMain->Add( m_sb3DSearchPaths, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
+
 	m_sdbSizer = new wxStdDialogButtonSizer();
 	m_sdbSizerOK = new wxButton( this, wxID_OK );
 	m_sdbSizer->AddButton( m_sdbSizerOK );
@@ -152,16 +140,16 @@ DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWi
 	m_sdbSizerHelp = new wxButton( this, wxID_HELP );
 	m_sdbSizer->AddButton( m_sdbSizerHelp );
 	m_sdbSizer->Realize();
-	
+
 	bSizerMain->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 );
-	
-	
+
+
 	this->SetSizer( bSizerMain );
 	this->Layout();
 	bSizerMain->Fit( this );
-	
+
 	this->Centre( wxBOTH );
-	
+
 	// Connect Events
 	this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_CONFIGURE_PATHS_BASE::OnUpdateUI ) );
 	m_EnvVars->Connect( wxEVT_GRID_CELL_CHANGED, wxGridEventHandler( DIALOG_CONFIGURE_PATHS_BASE::OnGridCellChange ), NULL, this );
@@ -192,5 +180,5 @@ DIALOG_CONFIGURE_PATHS_BASE::~DIALOG_CONFIGURE_PATHS_BASE()
 	m_btnMoveDown->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_CONFIGURE_PATHS_BASE::OnSearchPathMoveDown ), NULL, this );
 	m_btnDeleteSearchPath->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_CONFIGURE_PATHS_BASE::OnDeleteSearchPath ), NULL, this );
 	m_sdbSizerHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_CONFIGURE_PATHS_BASE::OnHelp ), NULL, this );
-	
+
 }

common/dialogs/dialog_configure_paths_base.fbp

@@ -14,6 +14,7 @@
         <property name="file">dialog_configure_paths_base</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
+        <property name="image_path_wrapper_function_name"></property>
         <property name="indent_with_spaces"></property>
         <property name="internationalize">1</property>
         <property name="name">DIALOG_CONFIGURE_PATHS_BASE</property>
@@ -25,6 +26,7 @@
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
         <property name="ui_table">UI</property>
+        <property name="use_array_enum">0</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Dialog" expanded="1">
@@ -73,7 +75,7 @@
                         <property name="permission">none</property>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxEXPAND|wxBOTTOM</property>
+                            <property name="flag">wxBOTTOM|wxEXPAND|wxLEFT</property>
                             <property name="proportion">1</property>
                             <object class="wxGrid" expanded="1">
                                 <property name="BottomDockable">1</property>
@@ -172,7 +174,7 @@
                                 <property name="permission">none</property>
                                 <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxRIGHT</property>
+                                    <property name="flag">wxBOTTOM|wxLEFT|wxRIGHT</property>
                                     <property name="proportion">0</property>
                                     <object class="wxBitmapButton" expanded="1">
                                         <property name="BottomDockable">1</property>
@@ -183,6 +185,7 @@
                                         <property name="aui_name"></property>
                                         <property name="aui_position"></property>
                                         <property name="aui_row"></property>
+                                        <property name="auth_needed">0</property>
                                         <property name="best_size"></property>
                                         <property name="bg"></property>
                                         <property name="bitmap"></property>
@@ -215,7 +218,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">30,29</property>
+                                        <property name="minimum_size">-1,-1</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_btnAddEnvVar</property>
                                         <property name="pane_border">1</property>
@@ -255,7 +258,7 @@
                                 </object>
                                 <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxRIGHT|wxLEFT</property>
+                                    <property name="flag">wxBOTTOM|wxLEFT|wxRIGHT</property>
                                     <property name="proportion">0</property>
                                     <object class="wxBitmapButton" expanded="1">
                                         <property name="BottomDockable">1</property>
@@ -266,6 +269,7 @@
                                         <property name="aui_name"></property>
                                         <property name="aui_position"></property>
                                         <property name="aui_row"></property>
+                                        <property name="auth_needed">0</property>
                                         <property name="best_size"></property>
                                         <property name="bg"></property>
                                         <property name="bitmap"></property>
@@ -298,7 +302,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">30,29</property>
+                                        <property name="minimum_size">-1,-1</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_btnDeleteEnvVar</property>
                                         <property name="pane_border">1</property>
@@ -344,7 +348,7 @@
                         <property name="permission">protected</property>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxEXPAND|wxBOTTOM</property>
+                            <property name="flag">wxBOTTOM|wxEXPAND|wxLEFT</property>
                             <property name="proportion">1</property>
                             <object class="wxGrid" expanded="1">
                                 <property name="BottomDockable">1</property>
@@ -443,7 +447,7 @@
                                 <property name="permission">none</property>
                                 <object class="sizeritem" expanded="0">
                                     <property name="border">5</property>
-                                    <property name="flag">wxRIGHT</property>
+                                    <property name="flag">wxBOTTOM|wxLEFT|wxRIGHT</property>
                                     <property name="proportion">0</property>
                                     <object class="wxBitmapButton" expanded="0">
                                         <property name="BottomDockable">1</property>
@@ -454,6 +458,7 @@
                                         <property name="aui_name"></property>
                                         <property name="aui_position"></property>
                                         <property name="aui_row"></property>
+                                        <property name="auth_needed">0</property>
                                         <property name="best_size"></property>
                                         <property name="bg"></property>
                                         <property name="bitmap"></property>
@@ -486,7 +491,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">30,29</property>
+                                        <property name="minimum_size">-1,-1</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_btnAddSearchPath</property>
                                         <property name="pane_border">1</property>
@@ -516,7 +521,7 @@
                                 </object>
                                 <object class="sizeritem" expanded="0">
                                     <property name="border">5</property>
-                                    <property name="flag">wxRIGHT</property>
+                                    <property name="flag">wxBOTTOM|wxRIGHT</property>
                                     <property name="proportion">0</property>
                                     <object class="wxBitmapButton" expanded="0">
                                         <property name="BottomDockable">1</property>
@@ -527,6 +532,7 @@
                                         <property name="aui_name"></property>
                                         <property name="aui_position"></property>
                                         <property name="aui_row"></property>
+                                        <property name="auth_needed">0</property>
                                         <property name="best_size"></property>
                                         <property name="bg"></property>
                                         <property name="bitmap"></property>
@@ -559,7 +565,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">30,29</property>
+                                        <property name="minimum_size">-1,-1</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_btnMoveUp</property>
                                         <property name="pane_border">1</property>
@@ -589,7 +595,7 @@
                                 </object>
                                 <object class="sizeritem" expanded="0">
                                     <property name="border">5</property>
-                                    <property name="flag">wxRIGHT</property>
+                                    <property name="flag">wxBOTTOM|wxRIGHT</property>
                                     <property name="proportion">0</property>
                                     <object class="wxBitmapButton" expanded="0">
                                         <property name="BottomDockable">1</property>
@@ -600,6 +606,7 @@
                                         <property name="aui_name"></property>
                                         <property name="aui_position"></property>
                                         <property name="aui_row"></property>
+                                        <property name="auth_needed">0</property>
                                         <property name="best_size"></property>
                                         <property name="bg"></property>
                                         <property name="bitmap"></property>
@@ -632,7 +639,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">30,29</property>
+                                        <property name="minimum_size">-1,-1</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_btnMoveDown</property>
                                         <property name="pane_border">1</property>
@@ -672,7 +679,7 @@
                                 </object>
                                 <object class="sizeritem" expanded="0">
                                     <property name="border">5</property>
-                                    <property name="flag">wxRIGHT|wxLEFT</property>
+                                    <property name="flag">wxBOTTOM|wxLEFT|wxRIGHT</property>
                                     <property name="proportion">0</property>
                                     <object class="wxBitmapButton" expanded="0">
                                         <property name="BottomDockable">1</property>
@@ -683,6 +690,7 @@
                                         <property name="aui_name"></property>
                                         <property name="aui_position"></property>
                                         <property name="aui_row"></property>
+                                        <property name="auth_needed">0</property>
                                         <property name="best_size"></property>
                                         <property name="bg"></property>
                                         <property name="bitmap"></property>
@@ -715,7 +723,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">30,29</property>
+                                        <property name="minimum_size">-1,-1</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_btnDeleteSearchPath</property>
                                         <property name="pane_border">1</property>

common/dialogs/dialog_configure_paths_base.h

@@ -1,12 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec 30 2017)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#ifndef __DIALOG_CONFIGURE_PATHS_BASE_H__
-#define __DIALOG_CONFIGURE_PATHS_BASE_H__
+#pragma once
 
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
@@ -20,10 +19,10 @@ class WX_GRID;
 #include <wx/font.h>
 #include <wx/grid.h>
 #include <wx/gdicmn.h>
+#include <wx/bmpbuttn.h>
 #include <wx/bitmap.h>
 #include <wx/image.h>
 #include <wx/icon.h>
-#include <wx/bmpbuttn.h>
 #include <wx/button.h>
 #include <wx/sizer.h>
 #include <wx/statbox.h>
@@ -38,7 +37,7 @@ class WX_GRID;
 class DIALOG_CONFIGURE_PATHS_BASE : public DIALOG_SHIM
 {
 	private:
-	
+
 	protected:
 		WX_GRID* m_EnvVars;
 		wxBitmapButton* m_btnAddEnvVar;
@@ -53,7 +52,7 @@ class DIALOG_CONFIGURE_PATHS_BASE : public DIALOG_SHIM
 		wxButton* m_sdbSizerOK;
 		wxButton* m_sdbSizerCancel;
 		wxButton* m_sdbSizerHelp;
-		
+
 		// Virtual event handlers, overide them in your derived class
 		virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
 		virtual void OnGridCellChange( wxGridEvent& event ) { event.Skip(); }
@@ -66,13 +65,12 @@ class DIALOG_CONFIGURE_PATHS_BASE : public DIALOG_SHIM
 		virtual void OnSearchPathMoveDown( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnDeleteSearchPath( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnHelp( wxCommandEvent& event ) { event.Skip(); }
-		
-	
+
+
 	public:
-		
-		DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure Paths"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+
+		DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure Paths"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 		~DIALOG_CONFIGURE_PATHS_BASE();
-	
+
 };
 
-#endif //__DIALOG_CONFIGURE_PATHS_BASE_H__

common/dialogs/panel_common_settings.cpp

@@ -174,6 +174,7 @@ bool PANEL_COMMON_SETTINGS::TransferDataFromWindow()
 void PANEL_COMMON_SETTINGS::OnScaleSlider( wxScrollEvent& aEvent )
 {
     m_iconScaleAuto->SetValue( false );
+    aEvent.Skip();
 }
 
 

common/dialogs/panel_common_settings_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 10 2018)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -97,8 +97,6 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind
 	gridHelperApps->Add( m_textEditorPath, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
 
 	m_textEditorBtn = new wxBitmapButton( sizerHelperApps->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-	m_textEditorBtn->SetMinSize( wxSize( 29,29 ) );
-
 	gridHelperApps->Add( m_textEditorBtn, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
 
 	m_defaultPDFViewer = new wxRadioButton( sizerHelperApps->GetStaticBox(), wxID_ANY, _("System default PDF viewer"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -113,8 +111,6 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind
 	gridHelperApps->Add( m_PDFViewerPath, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
 
 	m_pdfViewerBtn = new wxBitmapButton( sizerHelperApps->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-	m_pdfViewerBtn->SetMinSize( wxSize( 29,29 ) );
-
 	gridHelperApps->Add( m_pdfViewerBtn, wxGBPosition( 3, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
 
 

common/dialogs/panel_common_settings_base.fbp

@@ -14,6 +14,7 @@
         <property name="file">panel_common_settings_base</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
+        <property name="image_path_wrapper_function_name"></property>
         <property name="indent_with_spaces"></property>
         <property name="internationalize">1</property>
         <property name="name">PanelCommonSettings</property>
@@ -25,6 +26,7 @@
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
         <property name="ui_table">UI</property>
+        <property name="use_array_enum">0</property>
         <property name="use_enum">1</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Panel" expanded="1">
@@ -846,6 +848,7 @@
                                                 <property name="aui_name"></property>
                                                 <property name="aui_position"></property>
                                                 <property name="aui_row"></property>
+                                                <property name="auth_needed">0</property>
                                                 <property name="best_size"></property>
                                                 <property name="bg"></property>
                                                 <property name="bitmap"></property>
@@ -878,7 +881,7 @@
                                                 <property name="maximum_size"></property>
                                                 <property name="min_size"></property>
                                                 <property name="minimize_button">0</property>
-                                                <property name="minimum_size">29,29</property>
+                                                <property name="minimum_size">-1,-1</property>
                                                 <property name="moveable">1</property>
                                                 <property name="name">m_textEditorBtn</property>
                                                 <property name="pane_border">1</property>
@@ -1124,6 +1127,7 @@
                                                 <property name="aui_name"></property>
                                                 <property name="aui_position"></property>
                                                 <property name="aui_row"></property>
+                                                <property name="auth_needed">0</property>
                                                 <property name="best_size"></property>
                                                 <property name="bg"></property>
                                                 <property name="bitmap"></property>
@@ -1156,7 +1160,7 @@
                                                 <property name="maximum_size"></property>
                                                 <property name="min_size"></property>
                                                 <property name="minimize_button">0</property>
-                                                <property name="minimum_size">29,29</property>
+                                                <property name="minimum_size">-1,-1</property>
                                                 <property name="moveable">1</property>
                                                 <property name="name">m_pdfViewerBtn</property>
                                                 <property name="pane_border">1</property>

common/dialogs/panel_common_settings_base.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 10 2018)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!

common/dialogs/wx_html_report_panel.cpp

@@ -26,6 +26,7 @@
 #include <wildcards_and_files_ext.h>
 #include <gal/color4d.h>
 #include <wx/clipbrd.h>
+#include <kicad_string.h>
 
 WX_HTML_REPORT_PANEL::WX_HTML_REPORT_PANEL( wxWindow*      parent,
                                             wxWindowID     id,
@@ -402,7 +403,10 @@ void WX_HTML_REPORT_PANEL::onBtnSaveToFile( wxCommandEvent& event )
 
     for( const REPORT_LINE& l : m_report )
     {
-        f.Write( generatePlainText( l ) );
+        wxString s = generatePlainText( l );
+
+        ConvertSmartQuotesAndDashes( &s );
+        f.Write( s );
     }
 
     f.Close();

common/displlst.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2007 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2013 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
- * Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -23,10 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-/**
- * @file displlst.cpp
- */
-
 #include <fctsys.h>
 #include <macros.h>
 #include <draw_frame.h>
@@ -46,11 +42,9 @@ EDA_LIST_DIALOG::EDA_LIST_DIALOG( EDA_DRAW_FRAME* aParent, const wxString& aTitl
                                   const std::vector<wxArrayString>& aItemList,
                                   const wxString& aSelection,
                                   void( *aCallBackFunction )( wxString&, void* ),
-                                  void* aCallBackFunctionData,
-                                  bool aSortList, bool aShowHeaders ) :
+                                  void* aCallBackFunctionData ) :
     EDA_LIST_DIALOG_BASE( aParent, wxID_ANY, aTitle )
 {
-    m_sortList    = aSortList;
     m_cb_func     = aCallBackFunction;
     m_cb_data     = aCallBackFunctionData;
     m_itemsListCp = &aItemList;
@@ -59,9 +53,6 @@ EDA_LIST_DIALOG::EDA_LIST_DIALOG( EDA_DRAW_FRAME* aParent, const wxString& aTitl
 
     initDialog( aItemHeaders, aSelection );
 
-    if( !aShowHeaders )
-        m_listBox->SetSingleStyle( wxLC_NO_HEADER, true );
-
     // DIALOG_SHIM needs a unique hash_key because classname is not sufficient
     // because so many dialogs share this same class, with different numbers of
     // columns, different column names, and column widths.
@@ -111,15 +102,10 @@ void EDA_LIST_DIALOG::initDialog( const wxArrayString& aItemHeaders, const wxStr
 }
 
 
-void EDA_LIST_DIALOG::SetFilterHint( const wxString& aHint )
-{
-    m_filterBox->SetHint( aHint );
-}
-
-
 void EDA_LIST_DIALOG::SetListLabel( const wxString& aLabel )
 {
     m_listLabel->SetLabel( aLabel );
+    m_listBox->SetSingleStyle( wxLC_NO_HEADER, true );
 }
 
 
@@ -148,8 +134,7 @@ void EDA_LIST_DIALOG::textChangeInFilterBox( wxCommandEvent& event )
         }
     }
 
-    if( m_sortList )
-        sortList();
+    sortList();
 }
 
 
@@ -219,8 +204,7 @@ void EDA_LIST_DIALOG::InsertItems( const std::vector< wxArrayString >& itemList,
         }
     }
 
-    if( m_sortList )
-        sortList();
+    sortList();
 }
 
 

common/draw_panel_gal.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2013-2017 CERN
- * Copyright (C) 2013-2017 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2013-2020 KiCad Developers, see AUTHORS.txt for contributors.
  * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
  * @author Maciej Suminski <maciej.suminski@cern.ch>
  *
@@ -76,7 +76,7 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin
     EnableScrolling( false, false );    // otherwise Zoom Auto disables GAL canvas
 
     Connect( wxEVT_SIZE, wxSizeEventHandler( EDA_DRAW_PANEL_GAL::onSize ), NULL, this );
-    Connect( wxEVT_ENTER_WINDOW, wxEventHandler( EDA_DRAW_PANEL_GAL::onEnter ), NULL, this );
+    Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( EDA_DRAW_PANEL_GAL::onEnter ), NULL, this );
     Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( EDA_DRAW_PANEL_GAL::onLostFocus ), NULL, this );
 
     const wxEventType events[] =
@@ -132,15 +132,6 @@ EDA_DRAW_PANEL_GAL::~EDA_DRAW_PANEL_GAL()
 
 void EDA_DRAW_PANEL_GAL::SetFocus()
 {
-// Windows has a strange manner on bringing up and activating windows
-// containing a GAL canvas just after moving the mouse cursor into its area.
-// Feel free to uncomment or extend the following #ifdef if you experience
-// similar problems on your platform.
-#ifdef __WINDOWS__
-    if( !GetParent()->IsDescendant( wxWindow::FindFocus() ) )
-        return;
-#endif
-
     wxScrolledCanvas::SetFocus();
     m_lostFocus = false;
 }
@@ -148,6 +139,16 @@ void EDA_DRAW_PANEL_GAL::SetFocus()
 
 void EDA_DRAW_PANEL_GAL::onPaint( wxPaintEvent& WXUNUSED( aEvent ) )
 {
+    DoRePaint();
+}
+
+
+void EDA_DRAW_PANEL_GAL::DoRePaint()
+{
+    // Repaint the canvas, and fix scrollbar cursors
+    // Usually called by a OnPaint event, but because it does not use a wxPaintDC,
+    // it can be called outside a wxPaintEvent.
+
     // Update current zoom settings if the canvas is managed by a EDA frame
     // (i.e. not by a preview panel in a dialog)
     if( GetParentEDAFrame() && GetParentEDAFrame()->GetScreen() )
@@ -231,7 +232,7 @@ void EDA_DRAW_PANEL_GAL::onPaint( wxPaintEvent& WXUNUSED( aEvent ) )
 
 #ifdef __WXDEBUG__
     totalRealTime.Stop();
-    wxLogTrace( "GAL_PROFILE", "EDA_DRAW_PANEL_GAL::onPaint(): %.1f ms", totalRealTime.msecs() );
+    wxLogTrace( "GAL_PROFILE", "EDA_DRAW_PANEL_GAL::DoRePaint(): %.1f ms", totalRealTime.msecs() );
 #endif /* PROFILE */
 
     m_lastRefresh = wxGetLocalTimeMillis();
@@ -255,37 +256,32 @@ void EDA_DRAW_PANEL_GAL::onSize( wxSizeEvent& aEvent )
 
 void EDA_DRAW_PANEL_GAL::Refresh( bool aEraseBackground, const wxRect* aRect )
 {
-    if( m_pendingRefresh )
-        return;
-
-    m_pendingRefresh = true;
-
-#ifdef __WXMAC__
-    // Timers on OS X may have a high latency (seen up to 500ms and more) which
-    // makes repaints jerky. No negative impact seen without throttling, so just
-    // do an unconditional refresh for OS X.
-    ForceRefresh();
-#else
     wxLongLong t = wxGetLocalTimeMillis();
     wxLongLong delta = t - m_lastRefresh;
 
+    // If it has been too long since the last frame (possible depending on platform timer latency),
+    // just do a refresh.  Otherwise, start the refresh timer if it hasn't already been started.
+    // This ensures that we will render often enough but not too often.
     if( delta >= MinRefreshPeriod )
     {
-        ForceRefresh();
+        if( !m_pendingRefresh )
+            ForceRefresh();
+
+        m_refreshTimer.Start( MinRefreshPeriod, true );
     }
-    else
+    else if( !m_refreshTimer.IsRunning() )
     {
-        // One shot timer
         m_refreshTimer.Start( ( MinRefreshPeriod - delta ).ToLong(), true );
     }
-#endif
 }
 
 
 void EDA_DRAW_PANEL_GAL::ForceRefresh()
 {
-    wxPaintEvent redrawEvent;
-    wxPostEvent( this, redrawEvent );
+    //wxPaintEvent redrawEvent;
+    //wxPostEvent( this, redrawEvent );
+    m_pendingRefresh = true;
+    DoRePaint();
 }
 
 
@@ -377,21 +373,23 @@ bool EDA_DRAW_PANEL_GAL::SwitchBackend( GAL_TYPE aGalType )
         switch( aGalType )
         {
         case GAL_TYPE_OPENGL:
-            try
+        {
+            wxString errormsg = KIGFX::OPENGL_GAL::CheckFeatures( m_options );
+
+            if( errormsg.empty() )
             {
                 new_gal = new KIGFX::OPENGL_GAL( m_options, this, this, this );
-                break;
             }
-            catch( std::runtime_error& err )
+            else
             {
                 aGalType = GAL_TYPE_CAIRO;
                 DisplayInfoMessage( m_parent,
-                        _( "Could not use OpenGL, falling back to software rendering" ),
-                        wxString( err.what() ) );
+                        _( "Could not use OpenGL, falling back to software rendering" ), errormsg );
+                new_gal = new KIGFX::CAIRO_GAL( m_options, this, this, this );
             }
 
-            new_gal = new KIGFX::CAIRO_GAL( m_options, this, this, this );
             break;
+        }
 
         case GAL_TYPE_CAIRO:
             new_gal = new KIGFX::CAIRO_GAL( m_options, this, this, this );
@@ -446,7 +444,15 @@ bool EDA_DRAW_PANEL_GAL::SwitchBackend( GAL_TYPE aGalType )
 
 void EDA_DRAW_PANEL_GAL::OnEvent( wxEvent& aEvent )
 {
-    if( m_lostFocus && m_stealsFocus )
+    bool shouldSetFocus = m_lostFocus && m_stealsFocus;
+
+#if defined( _WIN32 )
+    // Ensure we are the active foreground window before we attempt to steal focus
+    // mouse events are generated on Win32 regardless if window is active
+    shouldSetFocus = shouldSetFocus && ( m_edaFrame->GetHWND() == GetForegroundWindow() );
+#endif
+
+    if( shouldSetFocus )
         SetFocus();
 
     if( !m_eventDispatcher )
@@ -458,10 +464,18 @@ void EDA_DRAW_PANEL_GAL::OnEvent( wxEvent& aEvent )
 }
 
 
-void EDA_DRAW_PANEL_GAL::onEnter( wxEvent& aEvent )
+void EDA_DRAW_PANEL_GAL::onEnter( wxMouseEvent& aEvent )
 {
+    bool shouldSetFocus = m_stealsFocus;
+
+#if defined( _WIN32 )
+    // Ensure we are the active foreground window before we attempt to steal focus
+    // mouse events are generated on Win32 regardless if window is active
+    shouldSetFocus = shouldSetFocus && ( m_edaFrame->GetHWND() == GetForegroundWindow() );
+#endif
+
     // Getting focus is necessary in order to receive key events properly
-    if( m_stealsFocus )
+    if( shouldSetFocus )
         SetFocus();
 
     aEvent.Skip();
@@ -495,8 +509,9 @@ void EDA_DRAW_PANEL_GAL::onRefreshTimer( wxTimerEvent& aEvent )
         }
     }
 
-    wxPaintEvent redrawEvent;
-    wxPostEvent( this, redrawEvent );
+    //wxPaintEvent redrawEvent;
+    //wxPostEvent( this, redrawEvent );
+    DoRePaint();
 }
 
 

common/eda_base_frame.cpp

@@ -47,7 +47,7 @@
 /// The default auto save interval is 10 minutes.
 #define DEFAULT_AUTO_SAVE_INTERVAL 600
 
-#define URL_GET_INVOLVED "http://kicad-pcb.org/contribute/"
+#define URL_GET_INVOLVED "https://www.kicad.org/contribute/"
 
 ///@{
 /// \ingroup config
@@ -68,6 +68,12 @@ static const wxString entrySizeX = "Size_x"; ///< Width of frame, in pixels (suf
 static const wxString entryMaximized = "Maximized";  ///< Nonzero iff frame is maximized (suffix)
 ///@}
 
+
+BEGIN_EVENT_TABLE( EDA_BASE_FRAME, wxFrame )
+    EVT_MOVE( EDA_BASE_FRAME::OnMove )
+END_EVENT_TABLE()
+
+
 EDA_BASE_FRAME::EDA_BASE_FRAME( wxWindow* aParent, FRAME_T aFrameType,
         const wxString& aTitle, const wxPoint& aPos, const wxSize& aSize,
         long aStyle, const wxString& aFrameName ) :
@@ -279,20 +285,39 @@ void EDA_BASE_FRAME::LoadSettings( wxConfigBase* aCfg )
         aCfg->Read( text, &m_autoSaveInterval, DEFAULT_AUTO_SAVE_INTERVAL );
     }
 
-    // Ensure the window is on a connected display, and is visible.
-    // (at least a corner of the frame must be visible on screen)
-    // Sometimes, if a window was moved on an auxiliary display, and when this
-    // display is no more available, it is not the case.
-    wxRect rect( m_FramePos, m_FrameSize );
+    // Ensure window isn't bigger than can be displayed
+    int displayIndex = wxDisplay::GetFromPoint( m_FramePos );
 
-    if( wxDisplay::GetFromPoint( rect.GetTopLeft() ) == wxNOT_FOUND &&
-        wxDisplay::GetFromPoint( rect.GetTopRight() ) == wxNOT_FOUND &&
-        wxDisplay::GetFromPoint( rect.GetBottomLeft() ) == wxNOT_FOUND &&
-        wxDisplay::GetFromPoint( rect.GetBottomRight() ) == wxNOT_FOUND )
+    if( displayIndex == wxNOT_FOUND )
     {
+        displayIndex = 0;
         m_FramePos = wxDefaultPosition;
     }
 
+    wxDisplay display( displayIndex );
+    wxRect clientSize = display.GetClientArea();
+
+    // The window may have been saved on a display that is no longer present.
+    // First, check the window origin and move it if it's off the chosen display
+
+    if( m_FramePos.x >= clientSize.x + clientSize.width ||
+        m_FramePos.y >= clientSize.y + clientSize.height )
+        m_FramePos = wxDefaultPosition;
+
+    // Now, fix up the size if needed
+
+    if( m_FrameSize.x + m_FramePos.x > clientSize.x + clientSize.width )
+    {
+        m_FrameSize.x = clientSize.width;
+        m_FramePos.x = 0;
+    }
+
+    if( m_FrameSize.y + m_FramePos.y > clientSize.y + clientSize.height )
+    {
+        m_FrameSize.y = clientSize.height;
+        m_FramePos.y = 0;
+    }
+
     // Ensure Window title bar is visible
 #if defined( __WXMAC__ )
     // for macOSX, the window must be below system (macOSX) toolbar
@@ -302,7 +327,12 @@ void EDA_BASE_FRAME::LoadSettings( wxConfigBase* aCfg )
     int Ypos_min = 0;
 #endif
     if( m_FramePos.y < Ypos_min )
+    {
+        if( m_FrameSize.y + ( Ypos_min - m_FramePos.y ) > clientSize.height)
+            m_FrameSize.y = clientSize.height - Ypos_min;
+
         m_FramePos.y = Ypos_min;
+    }
 
     if( maximized )
         Maximize();

common/filename_resolver.cpp

@@ -185,9 +185,9 @@ bool FILENAME_RESOLVER::createPathList()
 
     if( GetKicadPaths( epaths ) )
     {
-        for( const auto& i : epaths )
+        for( const wxString& curr_path : epaths )
         {
-            wxString pathVal = ExpandEnvVarSubstitutions( i );
+            wxString pathVal = ExpandEnvVarSubstitutions( curr_path );
 
             if( pathVal.empty() )
             {
@@ -200,8 +200,8 @@ bool FILENAME_RESOLVER::createPathList()
                 lpath.m_pathexp = fndummy.GetFullPath();
             }
 
-            lpath.m_alias =  i;
-            lpath.m_pathvar = i;
+            lpath.m_alias =  curr_path;
+            lpath.m_pathvar = curr_path;
 
             if( !lpath.m_pathexp.empty() && psep == *lpath.m_pathexp.rbegin() )
                 lpath.m_pathexp.erase( --lpath.m_pathexp.end() );
@@ -219,9 +219,8 @@ bool FILENAME_RESOLVER::createPathList()
 #ifdef DEBUG
     wxLogTrace( MASK_3D_RESOLVER, " * [3D model] search paths:\n" );
     std::list< SEARCH_PATH >::const_iterator sPL = m_Paths.begin();
-    std::list< SEARCH_PATH >::const_iterator ePL = m_Paths.end();
 
-    while( sPL != ePL )
+    while( sPL != m_Paths.end() )
     {
         wxLogTrace( MASK_3D_RESOLVER, "   + %s : '%s'\n", (*sPL).m_alias.GetData(),
             (*sPL).m_pathexp.GetData() );
@@ -636,9 +635,9 @@ bool FILENAME_RESOLVER::writePathList()
 
     // skip all ${ENV_VAR} alias names
     std::list< SEARCH_PATH >::const_iterator sPL = m_Paths.begin();
-    std::list< SEARCH_PATH >::const_iterator ePL = m_Paths.end();
 
-    while( sPL != ePL && ( sPL->m_alias.StartsWith( "${" ) || sPL->m_alias.StartsWith( "$(" ) ) )
+    while( sPL != m_Paths.end() &&
+           ( sPL->m_alias.StartsWith( "${" ) || sPL->m_alias.StartsWith( "$(" ) ) )
         ++sPL;
 
     wxFileName cfgpath( m_ConfigDir, RESOLVER_CONFIG );
@@ -662,7 +661,7 @@ bool FILENAME_RESOLVER::writePathList()
     cfgFile << "#V" << CFGFILE_VERSION << "\n";
     std::string tstr;
 
-    while( sPL != ePL )
+    while( sPL != m_Paths.end() )
     {
         tstr = sPL->m_alias.ToUTF8();
         cfgFile << "\"" << tstr.size() << ":" << tstr << "\",";
@@ -762,10 +761,9 @@ wxString FILENAME_RESOLVER::ShortenPath( const wxString& aFullPathName )
 
     wxCriticalSectionLocker lock( lock_resolver );
     std::list< SEARCH_PATH >::const_iterator sL = m_Paths.begin();
-    std::list< SEARCH_PATH >::const_iterator eL = m_Paths.end();
     size_t idx;
 
-    while( sL != eL )
+    while( sL != m_Paths.end() )
     {
         // undefined paths do not participate in the
         // file name shortening procedure
@@ -949,7 +947,7 @@ static bool getHollerith( const std::string& aString, size_t& aIndex, wxString&
 
     if( nchars > 0 )
     {
-        aResult = aString.substr( i2, nchars );
+        aResult = wxString::FromUTF8( aString.substr( i2, nchars ).c_str() );
         i2 += nchars;
     }
 

common/footprint_info.cpp

@@ -143,8 +143,7 @@ FOOTPRINT_LIST* FOOTPRINT_LIST::GetInstance( KIWAY& aKiway )
 
     if( !footprintInfo->GetCount() )
     {
-        wxTextFile footprintInfoCache( aKiway.Prj().GetProjectPath() + "fp-info-cache" );
-        footprintInfo->ReadCacheFromFile( &footprintInfoCache );
+        footprintInfo->ReadCacheFromFile( aKiway.Prj().GetProjectPath() + "fp-info-cache" );
     }
 
     return footprintInfo;

common/gal/cairo/cairo_gal.cpp

@@ -78,6 +78,9 @@ CAIRO_GAL_BASE::~CAIRO_GAL_BASE()
 
     if( context )
         cairo_destroy( context );
+
+    for( auto imageSurface : imageSurfaces )
+        cairo_surface_destroy( imageSurface );
 }
 
 
@@ -424,8 +427,11 @@ void CAIRO_GAL_BASE::DrawPolygon( const SHAPE_LINE_CHAIN& aPolygon )
 
 
 void CAIRO_GAL_BASE::DrawCurve( const VECTOR2D& aStartPoint, const VECTOR2D& aControlPointA,
-                           const VECTOR2D& aControlPointB, const VECTOR2D& aEndPoint )
+                                const VECTOR2D& aControlPointB, const VECTOR2D& aEndPoint,
+                                double aFilterValue )
 {
+    // Note: aFilterValue is not used because the cubic Bezier curve is
+    // supported by Cairo.
     syncLineWidth();
 
     const auto sp = roundp( xform( aStartPoint ) );
@@ -499,7 +505,9 @@ void CAIRO_GAL_BASE::DrawBitmap( const BITMAP_BASE& aBitmap )
     cairo_surface_mark_dirty( image );
     cairo_set_source_surface( currentContext, image, 0, 0 );
     cairo_paint( currentContext );
-    cairo_surface_destroy( image );
+
+    // store the image handle so it can be destroyed later
+    imageSurfaces.push_back( image );
 
     isElementAdded = true;
 
@@ -920,6 +928,11 @@ void CAIRO_GAL_BASE::EnableDepthTest( bool aEnabled )
 
 void CAIRO_GAL_BASE::resetContext()
 {
+    for( auto imageSurface : imageSurfaces )
+        cairo_surface_destroy( imageSurface );
+
+    imageSurfaces.clear();
+
     ClearScreen();
 
     // Compute the world <-> screen transformations
@@ -1256,10 +1269,13 @@ void CAIRO_GAL::endDrawing()
 
     // Now translate the raw context data from the format stored
     // by cairo into a format understood by wxImage.
-    pixman_image_t* dstImg = pixman_image_create_bits( PIXMAN_r8g8b8,
+
+    pixman_image_t* dstImg = pixman_image_create_bits(
+            wxPlatformInfo::Get().GetEndianness() == wxENDIAN_LITTLE ? PIXMAN_b8g8r8 :
+                                                                       PIXMAN_r8g8b8,
             screenSize.x, screenSize.y, (uint32_t*) wxOutput, wxBufferWidth * 3 );
-    pixman_image_t* srcImg = pixman_image_create_bits( PIXMAN_a8b8g8r8,
-            screenSize.x, screenSize.y, (uint32_t*) bitmapBuffer, wxBufferWidth * 4 );
+    pixman_image_t* srcImg = pixman_image_create_bits( PIXMAN_a8r8g8b8, screenSize.x, screenSize.y,
+            (uint32_t*) bitmapBuffer, wxBufferWidth * 4 );
 
     pixman_image_composite( PIXMAN_OP_SRC, srcImg, NULL, dstImg,
             0, 0, 0, 0, 0, 0, screenSize.x, screenSize.y );
@@ -1281,6 +1297,16 @@ void CAIRO_GAL::endDrawing()
 }
 
 
+void CAIRO_GAL::PostPaint( wxPaintEvent& aEvent )
+{
+    // posts an event to m_paint_listener to ask for redraw the canvas.
+    if( paintListener )
+    {
+        wxPostEvent( paintListener, aEvent );
+    }
+}
+
+
 void CAIRO_GAL::ResizeScreen( int aWidth, int aHeight )
 {
     CAIRO_GAL_BASE::ResizeScreen( aWidth, aHeight );
@@ -1486,9 +1512,9 @@ void CAIRO_GAL::setCompositor()
 }
 
 
-void CAIRO_GAL::onPaint( wxPaintEvent& WXUNUSED( aEvent ) )
+void CAIRO_GAL::onPaint( wxPaintEvent& aEvent )
 {
-    PostPaint();
+    PostPaint( aEvent );
 }
 
 

common/gal/cairo/cairo_print.cpp

@@ -135,14 +135,6 @@ CAIRO_PRINT_GAL::CAIRO_PRINT_GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions,
 }
 
 
-void CAIRO_PRINT_GAL::SetLineWidth( float aLineWidth )
-{
-    storePath();
-    lineWidth = aLineWidth;
-    cairo_set_line_width( currentContext, aLineWidth );
-}
-
-
 void CAIRO_PRINT_GAL::ComputeWorldScreenMatrix()
 {
     worldScale = screenDPI * worldUnitLength * zoomFactor;

common/gal/gal_display_options.cpp

@@ -64,6 +64,7 @@ static const wxChar* traceGalDispOpts = wxT( "KICAD_GAL_DISPLAY_OPTIONS" );
 GAL_DISPLAY_OPTIONS::GAL_DISPLAY_OPTIONS()
     : gl_antialiasing_mode( OPENGL_ANTIALIASING_MODE::NONE ),
       cairo_antialiasing_mode( CAIRO_ANTIALIASING_MODE::NONE ),
+      m_dpi( nullptr, nullptr ),
       m_gridStyle( GRID_STYLE::DOTS ),
       m_gridLineWidth( 1.0 ),
       m_gridMinSpacing( 10.0 ),
@@ -109,12 +110,10 @@ void GAL_DISPLAY_OPTIONS::ReadCommonConfig( wxConfigBase& aCommonConfig, wxWindo
             CAIRO_ANTIALIASING_MODE_KEY, &temp, (int) KIGFX::CAIRO_ANTIALIASING_MODE::NONE );
     cairo_antialiasing_mode = (KIGFX::CAIRO_ANTIALIASING_MODE) temp;
 
-    {
-        const DPI_SCALING dpi{ &aCommonConfig, aWindow };
-        m_scaleFactor = dpi.GetScaleFactor();
-    }
+    m_dpi = DPI_SCALING( &aCommonConfig, aWindow );
 
-    NotifyChanged();
+    // Also calls NotifyChanged
+    UpdateScaleFactor();
 }
 
 
@@ -146,6 +145,13 @@ void GAL_DISPLAY_OPTIONS::WriteConfig( wxConfigBase& aCfg, const wxString& aBase
 }
 
 
+void GAL_DISPLAY_OPTIONS::UpdateScaleFactor()
+{
+    m_scaleFactor = m_dpi.GetScaleFactor();
+    NotifyChanged();
+}
+
+
 void GAL_DISPLAY_OPTIONS::NotifyChanged()
 {
     wxLogTrace( traceGalDispOpts, "Change notification" );

common/gal/opengl/cached_container_gpu.cpp

@@ -65,7 +65,8 @@ CACHED_CONTAINER_GPU::~CACHED_CONTAINER_GPU()
     if( m_isMapped )
         Unmap();
 
-    glDeleteBuffers( 1, &m_glBufferHandle );
+    if( glDeleteBuffers )
+        glDeleteBuffers( 1, &m_glBufferHandle );
 }
 
 
@@ -73,6 +74,10 @@ void CACHED_CONTAINER_GPU::Map()
 {
     wxCHECK( !IsMapped(), /*void*/ );
 
+    // OpenGL version might suddenly stop being available in Windows when an RDP session is started
+    if( !glBindBuffer )
+        throw std::runtime_error( "OpenGL no longer available!" );
+
     glBindBuffer( GL_ARRAY_BUFFER, m_glBufferHandle );
     m_vertices = static_cast<VERTEX*>( glMapBuffer( GL_ARRAY_BUFFER, GL_READ_WRITE ) );
 

common/gal/opengl/cached_container_ram.cpp

@@ -51,7 +51,9 @@ CACHED_CONTAINER_RAM::CACHED_CONTAINER_RAM( unsigned int aSize ) :
 
 CACHED_CONTAINER_RAM::~CACHED_CONTAINER_RAM()
 {
-    glDeleteBuffers( 1, &m_verticesBuffer );
+    if( glDeleteBuffers )
+        glDeleteBuffers( 1, &m_verticesBuffer );
+
     free( m_vertices );
 }
 

common/gal/opengl/gl_builtin_shaders.cpp

@@ -282,7 +282,6 @@ const float SHADER_FILLED_CIRCLE        = 2.0;
 const float SHADER_STROKED_CIRCLE       = 3.0;
 const float SHADER_FONT                 = 4.0;
 const float SHADER_LINE_A               = 5.0;
-const float SHADER_LINE_B               = 6.0;
 
 varying vec4 shaderParams;
 varying vec2 circleCoords;
@@ -302,12 +301,6 @@ void filledCircle( vec2 aCoord )
 
 float pixelSegDistance( vec2 aCoord )
 {
-    if( shaderParams[0] == SHADER_LINE_B )
-    {
-        gl_FragColor = gl_Color;
-        return 0.0;
-    }
-
     float aspect = shaderParams[1];
     float dist;
     vec2 v = vec2( 1.0 - ( aspect - abs( aCoord.s ) ), aCoord.t );
@@ -361,19 +354,23 @@ float median( vec3 v )
 
 void main()
 {
-    if( shaderParams[0] == SHADER_LINE_A )
+    // VS to FS pipeline does math that means we can't rely on the mode
+    // parameter being bit-exact without rounding it first.
+    float mode = floor( shaderParams[0] + 0.5 );
+
+    if( mode == SHADER_LINE_A )
     {
         drawLine( gl_TexCoord[0].st );
     }
-    else if( shaderParams[0] == SHADER_FILLED_CIRCLE )
+    else if( mode == SHADER_FILLED_CIRCLE )
     {
         filledCircle( circleCoords );
     }
-    else if( shaderParams[0] == SHADER_STROKED_CIRCLE )
+    else if( mode == SHADER_STROKED_CIRCLE )
     {
         strokedCircle( circleCoords, shaderParams[2], shaderParams[3] );
     }
-    else if( shaderParams[0] == SHADER_FONT )
+    else if( mode == SHADER_FONT )
     {
         vec2 tex           = shaderParams.yz;
 

common/gal/opengl/gpu_manager.cpp

@@ -85,8 +85,11 @@ GPU_CACHED_MANAGER::~GPU_CACHED_MANAGER()
 {
     if( m_buffersInitialized )
     {
-        glBindBuffer( GL_ARRAY_BUFFER, 0 );
-        glDeleteBuffers( 1, &m_indicesBuffer );
+        if( glBindBuffer )
+            glBindBuffer( GL_ARRAY_BUFFER, 0 );
+
+        if( glDeleteBuffers )
+            glDeleteBuffers( 1, &m_indicesBuffer );
     }
 }
 

common/gal/opengl/opengl_compositor.cpp

@@ -399,8 +399,11 @@ void OPENGL_COMPOSITOR::clean()
 
     m_buffers.clear();
 
-    glDeleteFramebuffersEXT( 1, &m_mainFbo );
-    glDeleteRenderbuffersEXT( 1, &m_depthBuffer );
+    if( glDeleteFramebuffersEXT )
+        glDeleteFramebuffersEXT( 1, &m_mainFbo );
+
+    if( glDeleteRenderbuffersEXT )
+        glDeleteRenderbuffersEXT( 1, &m_depthBuffer );
 
     m_initialized = false;
 }

common/gal/opengl/opengl_gal.cpp

@@ -33,6 +33,7 @@
 #include <geometry/shape_poly_set.h>
 #include <text_utils.h>
 #include <bitmap_base.h>
+#include <bezier_curves.h>
 
 #include <macros.h>
 
@@ -197,30 +198,16 @@ OPENGL_GAL::OPENGL_GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions, wxWindow* aParent,
     isContextLocked( false ),
     lockClientCookie( 0 )
 {
-// IsDisplayAttr() handles WX_GL_{MAJOR,MINOR}_VERSION correctly only in 3.0.4
-// starting with 3.1.0 one should use wxGLContext::IsOk() (done by GL_CONTEXT_MANAGER)
-#if wxCHECK_VERSION( 3, 0, 3 ) and !wxCHECK_VERSION( 3, 1, 0 )
-    const int attr[] = { WX_GL_MAJOR_VERSION, 2, WX_GL_MINOR_VERSION, 1, 0 };
-
-    if( !IsDisplaySupported( attr ) )
-        throw std::runtime_error( "OpenGL 2.1 or higher is required!" );
-#endif /* wxCHECK_VERSION( 3, 0, 3 ) */
 
     if( glMainContext == NULL )
     {
         glMainContext = GL_CONTEXT_MANAGER::Get().CreateCtx( this );
 
-        if( !glMainContext )
-            throw std::runtime_error( "Could not create the main OpenGL context" );
-
         glPrivContext = glMainContext;
     }
     else
     {
         glPrivContext = GL_CONTEXT_MANAGER::Get().CreateCtx( this, glMainContext );
-
-        if( !glPrivContext )
-            throw std::runtime_error( "Could not create a private OpenGL context" );
     }
 
     shader = new SHADER();
@@ -271,9 +258,6 @@ OPENGL_GAL::OPENGL_GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions, wxWindow* aParent,
     tesselator = gluNewTess();
     InitTesselatorCallbacks( tesselator );
 
-    if( tesselator == NULL )
-        throw std::runtime_error( "Could not create the tesselator" );
-
     gluTessProperty( tesselator, GLU_TESS_WINDING_RULE, GLU_TESS_WINDING_POSITIVE );
 
     SetTarget( TARGET_NONCACHED );
@@ -325,6 +309,46 @@ OPENGL_GAL::~OPENGL_GAL()
 }
 
 
+void OPENGL_GAL::PostPaint( wxPaintEvent& aEvent )
+{
+    // posts an event to m_paint_listener to ask for redraw the canvas.
+    if( paintListener )
+    {
+        wxPostEvent( paintListener, aEvent );
+    }
+}
+
+
+wxString OPENGL_GAL::CheckFeatures( GAL_DISPLAY_OPTIONS& aOptions )
+{
+    wxString retVal = wxEmptyString;
+
+    wxFrame* testFrame = new wxFrame( NULL, wxID_ANY, wxT( "" ), wxDefaultPosition, wxSize( 1, 1 ),
+                                      wxFRAME_TOOL_WINDOW | wxNO_BORDER );
+
+    KIGFX::OPENGL_GAL* opengl_gal = new KIGFX::OPENGL_GAL( aOptions, testFrame );
+
+    testFrame->Raise();
+    testFrame->Show();
+
+    try
+    {
+        GAL_CONTEXT_LOCKER lock( opengl_gal );
+        opengl_gal->init();
+    }
+    catch( std::runtime_error& err )
+    {
+        //Test failed
+        retVal = wxString( err.what() );
+    }
+
+    delete opengl_gal;
+    delete testFrame;
+
+    return retVal;
+}
+
+
 bool OPENGL_GAL::updatedGalDisplayOptions( const GAL_DISPLAY_OPTIONS& aOptions )
 {
     bool refresh = false;
@@ -602,7 +626,12 @@ void OPENGL_GAL::DrawLine( const VECTOR2D& aStartPoint, const VECTOR2D& aEndPoin
 void OPENGL_GAL::DrawSegment( const VECTOR2D& aStartPoint, const VECTOR2D& aEndPoint,
                               double aWidth )
 {
-    if( aStartPoint == aEndPoint )  // 0 length segments are just a circle.
+    VECTOR2D startEndVector = aEndPoint - aStartPoint;
+    double lineLength = startEndVector.EuclideanNorm();
+
+    // segments having a length <= 1 are just a circle.
+    // Moreover trying to draw them as a segment does not work fine.
+    if( lineLength <= 1 )
     {
         DrawCircle( aStartPoint, aWidth/2 );
         return;
@@ -617,10 +646,8 @@ void OPENGL_GAL::DrawSegment( const VECTOR2D& aStartPoint, const VECTOR2D& aEndP
     }
     else
     {
-        auto startEndVector = aEndPoint - aStartPoint;
         auto lineAngle      = startEndVector.Angle();
         // Outlined tracks
-        double lineLength = startEndVector.EuclideanNorm();
 
         SetLineWidth( 1.0 );
         currentManager->Color( strokeColor.r, strokeColor.g, strokeColor.b, strokeColor.a );
@@ -1034,34 +1061,21 @@ void OPENGL_GAL::DrawPolygon( const SHAPE_LINE_CHAIN& aPolygon )
 
 
 void OPENGL_GAL::DrawCurve( const VECTOR2D& aStartPoint, const VECTOR2D& aControlPointA,
-                            const VECTOR2D& aControlPointB, const VECTOR2D& aEndPoint )
+                            const VECTOR2D& aControlPointB, const VECTOR2D& aEndPoint,
+                            double aFilterValue )
 {
-    // FIXME The drawing quality needs to be improved
-    // FIXME Perhaps choose a quad/triangle strip instead?
-    // FIXME Brute force method, use a better (recursive?) algorithm
+    std::vector<VECTOR2D> output;
+    std::vector<VECTOR2D> pointCtrl;
 
-    std::deque<VECTOR2D> pointList;
+    pointCtrl.push_back( aStartPoint );
+    pointCtrl.push_back( aControlPointA );
+    pointCtrl.push_back( aControlPointB );
+    pointCtrl.push_back( aEndPoint );
 
-    double t  = 0.0;
-    double dt = 1.0 / (double) CURVE_POINTS;
+    BEZIER_POLY converter( pointCtrl );
+    converter.GetPoly( output, aFilterValue );
 
-    for( int i = 0; i <= CURVE_POINTS; i++ )
-    {
-        double omt  = 1.0 - t;
-        double omt2 = omt * omt;
-        double omt3 = omt * omt2;
-        double t2   = t * t;
-        double t3   = t * t2;
-
-        VECTOR2D vertex = omt3 * aStartPoint + 3.0 * t * omt2 * aControlPointA
-                          + 3.0 * t2 * omt * aControlPointB + t3 * aEndPoint;
-
-        pointList.push_back( vertex );
-
-        t += dt;
-    }
-
-    DrawPolyline( pointList );
+    DrawPolyline( &output[0], output.size() );
 }
 
 
@@ -1923,9 +1937,9 @@ std::pair<VECTOR2D, float> OPENGL_GAL::computeBitmapTextSize( const UTF8& aText
 }
 
 
-void OPENGL_GAL::onPaint( wxPaintEvent& WXUNUSED( aEvent ) )
+void OPENGL_GAL::onPaint( wxPaintEvent& aEvent )
 {
-    PostPaint();
+    PostPaint( aEvent );
 }
 
 
@@ -1989,6 +2003,26 @@ void OPENGL_GAL::init()
 
     wxASSERT_MSG( isContextLocked, "This should only be called from within a locked context." );
 
+// IsDisplayAttr() handles WX_GL_{MAJOR,MINOR}_VERSION correctly only in 3.0.4
+// starting with 3.1.0 one should use wxGLContext::IsOk() (done by GL_CONTEXT_MANAGER)
+#if wxCHECK_VERSION( 3, 0, 3 ) and !wxCHECK_VERSION( 3, 1, 0 )
+    const int attr[] = { WX_GL_MAJOR_VERSION, 2, WX_GL_MINOR_VERSION, 1, 0 };
+
+    if( !IsDisplaySupported( attr ) )
+        throw std::runtime_error( "OpenGL 2.1 or higher is required!" );
+#endif /* wxCHECK_VERSION( 3, 0, 3 ) */
+
+    // Check correct initialization from the constructor
+    if( !glMainContext )
+        throw std::runtime_error( "Could not create the main OpenGL context" );
+
+    if( !glPrivContext )
+        throw std::runtime_error( "Could not create a private OpenGL context" );
+
+    if( tesselator == NULL )
+        throw std::runtime_error( "Could not create the tesselator" );
+    // End initialzation checks
+
     GLenum err = glewInit();
 
     if( GLEW_OK != err )

common/gal/opengl/shader.cpp

@@ -59,20 +59,23 @@ SHADER::~SHADER()
 
     if( isProgramCreated )
     {
-        // Delete the shaders and the program
-        for( std::deque<GLuint>::iterator it = shaderNumbers.begin();
-                it != shaderNumbers.end(); ++it )
+        if( glIsShader )
         {
-            GLuint shader = *it;
-
-            if( glIsShader( shader ) )
+            // Delete the shaders and the program
+            for( std::deque<GLuint>::iterator it = shaderNumbers.begin(); it != shaderNumbers.end();
+                    ++it )
             {
-                glDetachShader( programNumber, shader );
-                glDeleteShader( shader );
-            }
-        }
+                GLuint shader = *it;
 
-        glDeleteProgram( programNumber );
+                if( glIsShader( shader ) )
+                {
+                    glDetachShader( programNumber, shader );
+                    glDeleteShader( shader );
+                }
+            }
+
+            glDeleteProgram( programNumber );
+        }
     }
 }
 

common/gbr_metadata.cpp

@@ -268,33 +268,78 @@ std::string GBR_APERTURE_METADATA::FormatAttribute( GBR_APERTURE_ATTRIB aAttribu
     return full_attribute_string;
 }
 
+
+// Helper function to convert a ascii hex char to its integer value
+// If the char is not a hexa char, return -1
+int char2Hex( unsigned aCode )
+{
+    if( aCode >= '0' && aCode <= '9' )
+        return aCode - '0';
+
+    if( aCode >= 'A' && aCode <= 'F' )
+        return aCode - 'A' + 10;
+
+    if( aCode >= 'a' && aCode <= 'f' )
+        return aCode - 'a' + 10;
+
+    return -1;
+}
+
+
 wxString FormatStringFromGerber( const wxString& aString )
 {
     // make the inverse conversion of formatStringToGerber()
     // It converts a "normalized" gerber string and convert it to a 16 bits sequence unicode
     // and return a wxString (unicode 16) from the gerber string
+    // Note the initial gerber string can already contain unicode chars.
     wxString txt;
 
-    for( unsigned ii = 0; ii < aString.Length(); ++ii )
+    unsigned count = aString.Length();
+
+    for( unsigned ii = 0; ii < count; ++ii )
     {
         unsigned code = aString[ii];
 
-        if( code == '\\' )
+        if( code == '\\' && ii < count-5 && aString[ii+1] == 'u' )
         {
-            // Convert 4 hexadecimal digits to a 16 bit unicode
+            // Note the latest Gerber X2 spec (2019 06) uses \uXXXX to encode
+            // the unicode XXXX hexadecimal value
+            // If 4 chars next to 'u' are hexadecimal chars,
+            // convert these 4 hexadecimal digits to a 16 bit unicode
             // (Gerber allows only 4 hexadecimal digits)
+            // If an error occurs, the escape sequence is not translated,
+            // and used "as this"
             long value = 0;
+            bool error = false;
 
             for( int jj = 0; jj < 4; jj++ )
             {
                 value <<= 4;
-                code = aString[++ii];
-                // Very basic conversion, but it expects a valid gerber file
-                int hexa = (code <= '9' ? code - '0' : code - 'A' + 10) & 0xF;
-                value += hexa;
+                code = aString[ii+jj+2];
+
+                int hexa = char2Hex( code );
+
+                if( hexa >= 0 )
+                    value += hexa;
+                else
+                {
+                    error = true;
+                    break;
+                }
             }
 
-            txt.Append( wxChar( value ) );
+            if( !error )
+            {
+                if( value >= ' ' )  // Is a valid wxChar ?
+                    txt.Append( wxChar( value ) );
+
+                ii += 5;
+            }
+            else
+            {
+                txt.Append( aString[ii] );
+                continue;
+            }
         }
         else
             txt.Append( aString[ii] );
@@ -334,12 +379,10 @@ std::string formatStringToGerber( const wxString& aString )
 
         if( convert || code > 0x7F )
         {
-            txt += '\\';
-
             // Convert code to 4 hexadecimal digit
             // (Gerber allows only 4 hexadecimal digit)
             char hexa[32];
-            sprintf( hexa,"%4.4X", code & 0xFFFF);
+            sprintf( hexa,"\\u%4.4X", code & 0xFFFF);
             txt += hexa;
         }
         else

common/geometry/geometry_utils.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -54,6 +54,25 @@ int GetArcToSegmentCount( int aRadius, int aErrorMax, double aArcAngleDegree )
 }
 
 
+// When creating polygons to create a clearance polygonal area, the polygon must
+// be same or bigger than the original shape.
+// Polygons are bigger if the original shape has arcs (round rectangles, ovals, circles...)
+// In some cases (in fact only one: when building layer solder mask) modifying
+// shapes when converting them to polygons is not acceptable (the modification
+// can break calculations)
+// so one can disable the shape expansion by calling KeepPolyInsideShape( true )
+// Important: calling KeepPolyInsideShape( false ) after calculations is
+// mandatory to break oher calculations
+static bool s_disable_arc_correction = false;
+
+// Enable (aInside = false) or disable (aInside = true) polygonal shape expansion
+// when converting pads shapes and other items shapes to polygons:
+void DisableArcRadiusCorrection( bool aDisable )
+{
+    s_disable_arc_correction = aDisable;
+}
+
+
 double GetCircletoPolyCorrectionFactor( int aSegCountforCircle )
 {
     /* calculates the coeff to compensate radius reduction of circle
@@ -66,7 +85,7 @@ double GetCircletoPolyCorrectionFactor( int aSegCountforCircle )
     if( aSegCountforCircle < MIN_SEGCOUNT_FOR_CIRCLE )
         aSegCountforCircle = MIN_SEGCOUNT_FOR_CIRCLE;
 
-    return 1.0 / cos( M_PI / aSegCountforCircle );
+    return s_disable_arc_correction ? 1.0 : 1.0 / cos( M_PI / aSegCountforCircle );
 }
 
 

common/geometry/seg.cpp

@@ -33,6 +33,7 @@ int sgn( T aVal )
 
 bool SEG::PointCloserThan( const VECTOR2I& aP, int aDist ) const
 {
+    // See http://geomalgorithms.com/a02-_lines.html for some explanations and ideas.
     VECTOR2I d = B - A;
     ecoord dist_sq = (ecoord) aDist * aDist;
 
@@ -44,9 +45,17 @@ bool SEG::PointCloserThan( const VECTOR2I& aP, int aDist ) const
     else if( t >= l_squared )
         return ( aP - B ).SquaredEuclideanNorm() < dist_sq;
 
-    int dxdy = abs( d.x ) - abs( d.y );
+    // JPC: This code is not trivial and is not commented
+    // and does not work for d.x or d.y = -1...1
+    // I am guessing it is here for calculation time optimization.
+    // if someone can understand it, please fix it.
+    // It can be tested with a segment having d.x or d.y value
+    // is -1 or +1 ("this" is a quasi vertical or horizontal segment)
+    int dxdy = std::abs( d.x ) - std::abs( d.y );
 
-    if( ( dxdy >= -1 && dxdy <= 1 ) || abs( d.x ) <= 1 || abs( d.y ) <= 1 )
+    if( ( dxdy >= -1 && dxdy <= 1 )     // quasi 45 deg segment
+        /*|| std::abs( d.x ) <= 1       // quasi horizontal segment
+          || std::abs( d.y ) <= 1       // quasi vertical segment */ )
     {
         int ca = -sgn( d.y );
         int cb = sgn( d.x );

common/geometry/shape_poly_set.cpp

@@ -458,6 +458,8 @@ int SHAPE_POLY_SET::AddHole( const SHAPE_LINE_CHAIN& aHole, int aOutline )
 
     POLYGON& poly = m_polys[aOutline];
 
+    assert( aOutline < (int)m_polys.size() );
+
     assert( poly.size() );
 
     poly.push_back( aHole );

common/gestfich.cpp

@@ -351,7 +351,12 @@ bool OpenPDF( const wxString& file )
 
     if( !Pgm().UseSystemPdfBrowser() )    //  Run the preferred PDF Browser
     {
+#ifdef __WXMSW__
+        // Windows requires double quotes around the filename to handle spaces
+        command = Pgm().GetPdfBrowserName() + wxT( " \"" ) + filename + wxT( "\"" );
+#else
         command = Pgm().GetPdfBrowserName() + wxT( " '" ) + filename + wxT( "'" );
+#endif
     }
     else
     {

common/gr_basic.cpp

@@ -1148,45 +1148,16 @@ void ClipAndDrawPoly( EDA_RECT* aClipBox, wxDC* aDC, wxPoint aPoints[], int n )
 }
 
 
-void GRBezier( EDA_RECT* ClipBox,
-               wxDC*     DC,
-               int       x1,
-               int       y1,
-               int       x2,
-               int       y2,
-               int       x3,
-               int       y3,
-               int       width,
-               COLOR4D   Color )
+void GRBezier( EDA_RECT* aClipBox, wxDC* aDC,
+               std::vector<wxPoint>& aPoint,
+               int aWidth, COLOR4D aColor )
 {
-    std::vector<wxPoint> points;
+    std::vector<wxPoint> output;
 
-    BEZIER_POLY converter( x1, y1, x2, y2, x3, y3 );
-    converter.GetPoly( points );
+    BEZIER_POLY converter( aPoint );
+    converter.GetPoly( output, aWidth );
 
-    GRPoly( ClipBox, DC, points.size(), &points[0], false, width, Color, Color );
-}
-
-
-void GRBezier( EDA_RECT* ClipBox,
-               wxDC*     DC,
-               int       x1,
-               int       y1,
-               int       x2,
-               int       y2,
-               int       x3,
-               int       y3,
-               int       x4,
-               int       y4,
-               int       width,
-               COLOR4D   Color )
-{
-    std::vector<wxPoint> points;
-
-    BEZIER_POLY converter( x1, y1, x2, y2, x3, y3, x4, y4 );
-    converter.GetPoly( points );
-
-    GRPoly( ClipBox, DC, points.size(), &points[0], false, width, Color, Color );
+    GRPoly( aClipBox, aDC, output.size(), &output[0], false, aWidth, aColor, aColor );
 }
 
 

common/grid_tricks.cpp

@@ -500,7 +500,7 @@ void GRID_TRICKS::onUpdateUI( wxUpdateUIEvent& event )
             }
         }
 
-        if( !cursorInSelectedRow )
+        if( !cursorInSelectedRow && cursorRow >= 0 )
             m_grid->SelectRow( cursorRow );
     }
 }

common/launch_ext.cpp

@@ -0,0 +1,42 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2020 Jon Evans <jon@craftyjon.com>
+ * Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <gestfich.h>
+#include <launch_ext.h>
+
+
+void LaunchExternal( const wxString& aPath )
+{
+#ifdef __WXMAC__
+    wxExecute( wxString::Format( "open \"%s\"", aPath ) );
+#else
+    wxString path( aPath );
+
+#if !wxCHECK_VERSION( 3, 1, 0 )
+    // Quote in case there are spaces in the path.
+    // Not needed on 3.1.4, but needed in 3.0 versions
+    // Moreover, on Linux, on 3.1.4 wx version, adding quotes breaks
+    // wxLaunchDefaultApplication
+    AddDelimiterString( path );
+#endif
+
+    wxLaunchDefaultApplication( path );
+#endif
+}

common/legacy_gal/eda_draw_frame.cpp

@@ -268,6 +268,7 @@ bool EDA_DRAW_FRAME::LockFile( const wxString& aFileName )
 
 void EDA_DRAW_FRAME::unitsChangeRefresh()
 {
+    ReCreateAuxiliaryToolbar();
     UpdateStatusBar();
     UpdateMsgPanel();
 }
@@ -298,6 +299,8 @@ void EDA_DRAW_FRAME::CommonSettingsChanged()
     m_canvas->SetEnableAutoPan( option );
 
     m_galDisplayOptions.ReadCommonConfig( *settings, this );
+
+    ReCreateAuxiliaryToolbar();
 }
 
 
@@ -428,6 +431,7 @@ void EDA_DRAW_FRAME::OnUpdateUnits( wxUpdateUIEvent& aEvent )
 
     aEvent.Check( enable );
     DisplayUnitsMsg();
+    ReCreateAuxiliaryToolbar();
 }
 
 
@@ -672,6 +676,23 @@ void EDA_DRAW_FRAME::OnSize( wxSizeEvent& SizeEv )
 }
 
 
+void EDA_DRAW_FRAME::OnMove( wxMoveEvent& aEvent )
+{
+    // If the window is moved to a different display, the scaling factor may change
+    double oldFactor = m_galDisplayOptions.m_scaleFactor;
+    m_galDisplayOptions.UpdateScaleFactor();
+
+    if( oldFactor != m_galDisplayOptions.m_scaleFactor )
+    {
+        wxSize clientSize = GetClientSize();
+        GetGalCanvas()->GetGAL()->ResizeScreen( clientSize.x, clientSize.y );
+        GetGalCanvas()->GetView()->MarkDirty();
+    }
+
+    aEvent.Skip();
+}
+
+
 void EDA_DRAW_FRAME::SetToolID( int aId, int aCursor, const wxString& aToolMsg )
 {
     // Keep default cursor in toolbars
@@ -1070,6 +1091,11 @@ void EDA_DRAW_FRAME::UseGalCanvas( bool aEnable )
 
 bool EDA_DRAW_FRAME::SwitchCanvas( EDA_DRAW_PANEL_GAL::GAL_TYPE aCanvasType )
 {
+#ifdef __WXMAC__
+    // Cairo is unsupported on Mac
+    if( aCanvasType == EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO )
+        aCanvasType = EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL;
+#endif
     auto galCanvas = GetGalCanvas();
     wxCHECK( galCanvas, false );
     bool use_gal = galCanvas->SwitchBackend( aCanvasType );
@@ -1099,6 +1125,12 @@ EDA_DRAW_PANEL_GAL::GAL_TYPE EDA_DRAW_FRAME::LoadCanvasTypeSetting()
         canvasType = EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE;
     }
 
+#ifdef __WXMAC__
+    // Did Cairo get saved on Mac?  Force OpenGL; Cairo doesn't work on Retina displays
+    if( canvasType == EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO )
+        canvasType = EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL;
+#endif
+
     // Coerce the value into a GAL type when Legacy is not available
     // Default to Cairo, and on the first, user will be prompted for OpenGL
     if( canvasType == EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE

common/legacy_wx/eda_draw_frame.cpp

@@ -271,6 +271,7 @@ bool EDA_DRAW_FRAME::LockFile( const wxString& aFileName )
 
 void EDA_DRAW_FRAME::unitsChangeRefresh()
 {
+    ReCreateAuxiliaryToolbar();
     UpdateStatusBar();
     UpdateMsgPanel();
 }
@@ -300,6 +301,8 @@ void EDA_DRAW_FRAME::CommonSettingsChanged()
     m_canvas->SetEnableAutoPan( option );
 
     m_galDisplayOptions.ReadCommonConfig( *settings, this );
+
+    ReCreateAuxiliaryToolbar();
 }
 
 
@@ -687,6 +690,12 @@ void EDA_DRAW_FRAME::OnSize( wxSizeEvent& SizeEv )
 }
 
 
+void EDA_DRAW_FRAME::OnMove( wxMoveEvent& aEvent )
+{
+    aEvent.Skip();
+}
+
+
 void EDA_DRAW_FRAME::SetToolID( int aId, int aCursor, const wxString& aToolMsg )
 {
     // Keep default cursor in toolbars

common/lib_tree_model.cpp

@@ -21,6 +21,7 @@
 
 #include <lib_tree_model.h>
 
+#include <algorithm>
 #include <eda_pattern_match.h>
 #include <lib_tree_item.h>
 #include <make_unique.h>

common/lib_tree_model_adapter.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2017 Chris Pavlina <pavlina.chris@gmail.com>
  * Copyright (C) 2014 Henner Zeller <h.zeller@acm.org>
- * Copyright (C) 2014-2017 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2014-2020 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -136,38 +136,53 @@ void LIB_TREE_MODEL_ADAPTER::DoAddLibrary( wxString const& aNodeName, wxString c
 }
 
 
-void LIB_TREE_MODEL_ADAPTER::UpdateSearchString( wxString const& aSearch )
+void LIB_TREE_MODEL_ADAPTER::UpdateSearchString( wxString const& aSearch, bool aState )
 {
-    m_tree.ResetScore();
-
-    wxStringTokenizer tokenizer( aSearch );
-
-    while( tokenizer.HasMoreTokens() )
-    {
-        const wxString term = tokenizer.GetNextToken().Lower();
-        EDA_COMBINED_MATCHER matcher( term );
-
-        m_tree.UpdateScore( matcher );
-    }
-
-    m_tree.SortNodes();
-
     {
         wxWindowUpdateLocker updateLock( m_widget );
 
-        // Even with the updateLock, wxWidgets sometimes ties its knickers in
-        // a knot when trying to run a wxdataview_selection_changed_callback()
-        // on a row that has been deleted.
+        // Even with the updateLock, wxWidgets sometimes ties its knickers in a knot trying to
+        // run a wxdataview_selection_changed_callback() on a row that has been deleted.
         // https://bugs.launchpad.net/kicad/+bug/1756255
         m_widget->UnselectAll();
 
-        Cleared();
-#ifndef __WINDOWS__
-        // The fastest method to update wxDataViewCtrl is to rebuild from
-        // scratch by calling Cleared(). Linux requires to reassociate model to
-        // display data, but Windows will create multiple associations.
-        AttachTo( m_widget );
-#endif
+        // This collapse is required before the call to "Freeze()" below.  Once Freeze()
+        // is called, GetParent() will return nullptr.  While this works for some calls, it
+        // segfaults when we have any expanded elements b/c the sub units in the tree don't
+        // have explicit references that are maintained over a search
+        // The tree will be expanded again below when we get our matches
+        //
+        // Also note that this cannot happen when we have deleted a symbol as GTK will also
+        // iterate over the tree in this case and find a symbol that has an invalid link
+        // and crash https://gitlab.com/kicad/code/kicad/-/issues/6910
+        if( !aState && m_tree.Children.size() )
+        {
+            for( std::unique_ptr<LIB_TREE_NODE>& child: m_tree.Children )
+                m_widget->Collapse( wxDataViewItem( &*child ) );
+        }
+
+        // DO NOT REMOVE THE FREEZE/THAW. This freeze/thaw is a flag for this model adapter
+        // that tells it when it shouldn't trust any of the data in the model. When set, it will
+        // not return invalid data to the UI, since this invalid data can cause crashes.
+        // This is different than the update locker, which locks the UI aspects only.
+        Freeze();
+        BeforeReset();
+
+        m_tree.ResetScore();
+
+        wxStringTokenizer tokenizer( aSearch );
+
+        while( tokenizer.HasMoreTokens() )
+        {
+            const wxString term = tokenizer.GetNextToken().Lower();
+            EDA_COMBINED_MATCHER matcher( term );
+
+            m_tree.UpdateScore( matcher );
+        }
+
+        m_tree.SortNodes();
+        AfterReset();
+        Thaw();
     }
 
     LIB_TREE_NODE* bestMatch = ShowResults();
@@ -310,6 +325,9 @@ bool LIB_TREE_MODEL_ADAPTER::IsContainer( wxDataViewItem const& aItem ) const
 
 wxDataViewItem LIB_TREE_MODEL_ADAPTER::GetParent( wxDataViewItem const& aItem ) const
 {
+    if( m_freeze )
+        return ToItem( nullptr );
+
     auto node = ToNode( aItem );
     auto parent = node ? node->Parent : nullptr;
 
@@ -451,7 +469,7 @@ LIB_TREE_NODE* LIB_TREE_MODEL_ADAPTER::ShowResults()
                    []( LIB_TREE_NODE const* n )
                    {
                        // return leaf nodes with some level of matching
-                       return n->Children.size() == 0 && n->Score > 1;
+                       return n->Type == LIB_TREE_NODE::TYPE::LIBID && n->Score > 1;
                    },
                    &highScore );
 

common/lib_tree_model_adapter.h

@@ -171,8 +171,9 @@ public:
      * Set the search string provided by the user.
      *
      * @param aSearch   full, unprocessed search text
+     * @param aState    Are we keeping the selection/search state?
      */
-    void UpdateSearchString( wxString const& aSearch );
+    void UpdateSearchString( wxString const& aSearch, bool aState );
 
     /**
      * Attach to a wxDataViewCtrl and initialize it. This will set up columns

common/lset.cpp

@@ -286,17 +286,20 @@ std::string LSET::FmtHex() const
 
     static const char hex[] = "0123456789abcdef";
 
-    int     nibble_count = ( size() + 3 ) / 4;
+    unsigned nibble_count = ( size() + 3 ) / 4;
 
-    for( int nibble=0;  nibble<nibble_count;  ++nibble )
+    for( unsigned nibble = 0; nibble < nibble_count; ++nibble )
     {
         unsigned ndx = 0;
 
         // test 4 consecutive bits and set ndx to 0-15:
-        for( int nibble_bit=0;  nibble_bit<4;  ++nibble_bit )
+        for( unsigned nibble_bit = 0; nibble_bit < 4; ++nibble_bit )
         {
-            if( (*this)[nibble_bit + nibble*4] )
-                ndx |= (1 << nibble_bit);
+            if( ( nibble_bit + nibble * 4 ) >= size() )
+                break;
+
+            if( (*this)[nibble_bit + nibble * 4] )
+                ndx |= ( 1 << nibble_bit );
         }
 
         if( nibble && !( nibble % 8 ) )

common/md5_hash.cpp

@@ -92,6 +92,34 @@ bool MD5_HASH::operator!=( const MD5_HASH& aOther ) const
 }
 
 
+std::string MD5_HASH::Format( bool aCompactForm )
+{
+    std::string data;
+
+    // Build a hexadecimal string from the 16 bytes of MD5_HASH:
+    for( int ii = 0; ii < 16; ++ii )
+    {
+        char lsb = ( m_hash[ii] & 0x0F ) + '0';
+
+        if( lsb > '9' )
+            lsb += 'A'-'9';
+
+        char msb = ( ( m_hash[ii] >> 4 ) & 0x0F ) + '0';
+
+        if( msb > '9' )
+            msb += 'A'-'9';
+
+         data += msb;
+         data += lsb;
+
+        if( !aCompactForm )
+            data += ' ';
+    }
+
+    return data;
+}
+
+
 void MD5_HASH::md5_transform(MD5_CTX *ctx, uint8_t data[])
 {
    uint32_t a,b,c,d,m[16],i,j;

common/msgpanel.cpp

@@ -43,6 +43,10 @@ EDA_MSG_PANEL::EDA_MSG_PANEL( wxWindow* aParent, int aId,
 {
     SetFont( wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ) );
     SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    // informs wx not to paint the background itself as we will paint it later in erase()
+    SetBackgroundStyle( wxBG_STYLE_PAINT );
+
     m_last_x = 0;
 
     m_fontSize = computeFontSize();

common/page_layout/page_layout_reader.cpp

@@ -128,6 +128,14 @@ void PAGE_LAYOUT_READER_PARSER::Parse( WORKSHEET_LAYOUT* aLayout )
         if( token == T_LEFT )
             token = NextTok();
 
+        if( token == T_kicad_wks || token == T_drawing_sheet )
+        {
+            THROW_PARSE_ERROR( _( "KiCad was unable to open this file because it was created with "
+                                  "a more recent version than the one you are running.\n\n"
+                                  "To open it you will need to upgrade KiCad to 5.99 or later." ),
+                               CurSource(), CurLine(), CurLineNumber(), CurOffset() );
+        }
+
         if( token == T_page_layout )
             continue;
 

common/page_layout/page_layout_reader.keywords

@@ -1,3 +1,5 @@
+drawing_sheet
+kicad_wks
 page_layout
 setup
 left_margin

common/plotters/GERBER_plotter.cpp

@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2019 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2020 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -170,9 +170,8 @@ bool GERBER_PLOTTER::StartPlot()
 
     finalFile = outputFile;     // the actual gerber file will be created later
 
-    // Create a temporary filename to store gerber file
-    // note tmpfile() does not work under Vista and W7 in user mode
-    m_workFilename = filename + wxT(".tmp");
+    // Create a temp file in system temp to avoid potential network share buffer issues for the final read and save
+    m_workFilename = wxFileName::CreateTempFileName( "" );
     workFile   = wxFopen( m_workFilename, wxT( "wt" ));
     outputFile = workFile;
     wxASSERT( outputFile );
@@ -217,6 +216,10 @@ bool GERBER_PLOTTER::StartPlot()
     // Be sure the usual dark polarity is selected:
     fputs( "%LPD*%\n", outputFile );
 
+    // Set initial interpolation mode: always G01 (linear):
+    fputs( "G01*\n", outputFile );
+
+    // Set aperture list starting point:
     fputs( "G04 APERTURE LIST*\n", outputFile );
 
     return true;
@@ -327,10 +330,7 @@ void GERBER_PLOTTER::selectAperture( const wxSize&           aSize,
                   ( currentAperture->m_Type != aType ) ||
                   ( currentAperture->m_Size != aSize );
 
-    if( !m_useNetAttributes )
-        aApertureAttribute = 0;
-    else
-        change = change || ( currentAperture->m_ApertureAttribute != aApertureAttribute );
+    change = change || ( currentAperture->m_ApertureAttribute != aApertureAttribute );
 
     if( change )
     {
@@ -474,21 +474,34 @@ void GERBER_PLOTTER::Arc( const wxPoint& aCenter, double aStAngle, double aEndAn
 {
     SetCurrentLineWidth( aWidth );
 
+    // aFill is not used here.
+    plotArc( aCenter, aStAngle, aEndAngle, aRadius, false );
+}
+
+
+void GERBER_PLOTTER::plotArc( const wxPoint& aCenter, double aStAngle, double aEndAngle,
+                  int aRadius, bool aPlotInRegion )
+{
     wxPoint start, end;
     start.x = aCenter.x + KiROUND( cosdecideg( aRadius, aStAngle ) );
     start.y = aCenter.y - KiROUND( sindecideg( aRadius, aStAngle ) );
-    MoveTo( start );
+
+    if( !aPlotInRegion )
+        MoveTo( start );
+    else
+        LineTo( start );
+
     end.x = aCenter.x + KiROUND( cosdecideg( aRadius, aEndAngle ) );
     end.y = aCenter.y - KiROUND( sindecideg( aRadius, aEndAngle ) );
     DPOINT devEnd = userToDeviceCoordinates( end );
     DPOINT devCenter = userToDeviceCoordinates( aCenter ) - userToDeviceCoordinates( start );
 
-    fprintf( outputFile, "G75*\n" ); // Multiquadrant (360 degrees) mode
+    fprintf( outputFile, "G75*\n" );        // Multiquadrant (360 degrees) mode
 
     if( aStAngle < aEndAngle )
-        fprintf( outputFile, "G03" );
+        fprintf( outputFile, "G03*\n" );    // Active circular interpolation, CCW
     else
-        fprintf( outputFile, "G02" );
+        fprintf( outputFile, "G02*\n" );    // Active circular interpolation, CW
 
     fprintf( outputFile, "X%dY%dI%dJ%dD01*\n",
              KiROUND( devEnd.x ), KiROUND( devEnd.y ),
@@ -736,33 +749,28 @@ void GERBER_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, doub
     else    // Plot pad as region.
             // Only regions and flashed items accept a object attribute TO.P for the pin name
     {
-        if( size.x > size.y )
-        {
-            std::swap( size.x, size.y );
-
-            if( orient < 2700 )
-                orient += 900;
-            else
-                orient -= 2700;
-        }
-
         if( trace_mode == FILLED )
         {
-            // TODO: use an aperture macro to declare the rotated pad
-            // to be able to flash the shape
-            // For now, the pad is drawn as segment
-
-            // The pad is reduced to an segment with dy > dx
-            int delta = size.y - size.x;
-            wxPoint p0( 0, -delta / 2 );
-            wxPoint p1( 0, delta / 2 );
-            RotatePoint( &p0.x, &p0.y, orient );
-            RotatePoint( &p1.x, &p1.y, orient );
-
-            ThickSegment( pos + p0, pos + p1, size.x, trace_mode, gbr_metadata );
+            // Draw the oval as round rect pad with a radius = 50% min size)
+            // In gerber file, it will be drawn as a region with arcs, and can be
+            // detected as pads (similar to a flashed pad)
+            FlashPadRoundRect( pos, aSize, std::min( aSize.x, aSize.y ) /2,
+                               orient, FILLED, aData );
         }
-        else
+        else    // Non filled shape: plot outlines:
+        {
+            if( size.x > size.y )
+            {
+                std::swap( size.x, size.y );
+
+                if( orient < 2700 )
+                    orient += 900;
+                else
+                    orient -= 2700;
+            }
+
             sketchOval( pos, size, orient, -1 );
+        }
     }
 }
 
@@ -840,36 +848,194 @@ void GERBER_PLOTTER::FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aS
                                      EDA_DRAW_MODE_T aTraceMode, void* aData )
 
 {
-    GBR_METADATA *gbr_metadata = static_cast<GBR_METADATA*>( aData );
-
-    // Currently, a Pad RoundRect is plotted as polygon.
-    // TODO: use Aperture macro and flash it
-    SHAPE_POLY_SET outline;
-    const int segmentToCircleCount = 64;
-    TransformRoundRectToPolygon( outline, aPadPos, aSize, aOrient,
-                                 aCornerRadius, segmentToCircleCount );
+    GBR_METADATA* gbr_metadata = static_cast<GBR_METADATA*>( aData );
 
     if( aTraceMode != FILLED )
     {
+        SHAPE_POLY_SET outline;
+        const int segmentToCircleCount = 64;
+        TransformRoundRectToPolygon( outline, aPadPos, aSize, aOrient,
+                                     aCornerRadius, segmentToCircleCount );
+
         SetCurrentLineWidth( USE_DEFAULT_LINE_WIDTH, &gbr_metadata );
         outline.Inflate( -GetCurrentLineWidth()/2, 16 );
+
+        std::vector< wxPoint > cornerList;
+        // TransformRoundRectToPolygon creates only one convex polygon
+        SHAPE_LINE_CHAIN& poly = outline.Outline( 0 );
+        cornerList.reserve( poly.PointCount() + 1 );
+
+        for( int ii = 0; ii < poly.PointCount(); ++ii )
+            cornerList.emplace_back( poly.CPoint( ii ).x, poly.CPoint( ii ).y );
+
+        // Close polygon
+        cornerList.push_back( cornerList[0] );
+
+        // plot outlines
+        PlotPoly( cornerList, NO_FILL, GetCurrentLineWidth(), gbr_metadata );
+    }
+    else
+    {
+        // A Pad RoundRect is plotted as a Gerber region.
+        // Initialize region metadata:
+        bool clearTA_AperFunction = false;     // true if a TA.AperFunction is used
+
+        if( gbr_metadata )
+        {
+            formatNetAttribute( &gbr_metadata->m_NetlistMetadata );
+            std::string attrib = gbr_metadata->m_ApertureMetadata.FormatAttribute( !m_useX2format );
+
+            if( !attrib.empty() )
+            {
+                fputs( attrib.c_str(), outputFile );
+                clearTA_AperFunction = true;
+            }
+        }
+
+        // Plot the region using arcs in corners.
+        plotRoundRectAsRegion( aPadPos, aSize, aCornerRadius, aOrient );
+
+        // Clear the TA attribute, to avoid the next item to inherit it:
+        if( clearTA_AperFunction )
+        {
+            if( m_useX2format )
+            {
+                fputs( "%TD.AperFunction*%\n", outputFile );
+            }
+            else
+            {
+                fputs( "G04 #@! TD.AperFunction*\n", outputFile );
+            }
+        }
+    }
+}
+
+
+void GERBER_PLOTTER::plotRoundRectAsRegion( const wxPoint& aRectCenter, const wxSize& aSize,
+                                            int aCornerRadius, double aOrient )
+{
+    // The region outline is generated by 4 sides and 4 90 deg arcs
+    //  1 --- 2
+    //  |  c  |
+    //  4 --- 3
+
+    // Note also in user coordinates the Y axis is from top to bottom
+    // for historical reasons.
+
+    // A helper structure to handle outlines coordinates (segments and arcs)
+    // in user coordinates
+    struct RR_EDGE
+    {
+        wxPoint m_start;
+        wxPoint m_end;
+        wxPoint m_center;
+        // in decidegrees: angle start. angle end = m_arc_angle_start+arc_angle
+        double  m_arc_angle_start;
+    };
+
+    const double arc_angle = -900.0;    // in decidegrees
+    int hsizeX = aSize.x/2;
+    int hsizeY = aSize.y/2;
+
+    RR_EDGE curr_edge;
+    std::vector<RR_EDGE> rr_outline;
+
+    // Build outline coordinates, relative to rectangle center, rotation 0:
+
+    // Top left corner 1 (and 4 to 1 left vertical side @ x=-hsizeX)
+    curr_edge.m_start.x = -hsizeX;
+    curr_edge.m_start.y = hsizeY - aCornerRadius;
+    curr_edge.m_end.x = curr_edge.m_start.x;
+    curr_edge.m_end.y = -hsizeY + aCornerRadius;
+    curr_edge.m_center.x = -hsizeX + aCornerRadius;
+    curr_edge.m_center.y = curr_edge.m_end.y;
+    curr_edge.m_arc_angle_start = aOrient + 1800.0;     // En decidegree
+
+    rr_outline.push_back( curr_edge );
+
+    // Top right corner 2 (and 1 to 2 top horizontal side @ y=-hsizeY)
+    curr_edge.m_start.x = -hsizeX + aCornerRadius;
+    curr_edge.m_start.y = -hsizeY;
+    curr_edge.m_end.x = hsizeX - aCornerRadius;
+    curr_edge.m_end.y = curr_edge.m_start.y;
+    curr_edge.m_center.x = curr_edge.m_end.x;
+    curr_edge.m_center.y = -hsizeY + aCornerRadius;
+    curr_edge.m_arc_angle_start = aOrient + 900.0;     // En decidegree
+
+    rr_outline.push_back( curr_edge );
+
+    // bottom right corner 3 (and 2 to 3 right vertical side @ x=hsizeX)
+    curr_edge.m_start.x = hsizeX;
+    curr_edge.m_start.y = -hsizeY + aCornerRadius;
+    curr_edge.m_end.x =  curr_edge.m_start.x;
+    curr_edge.m_end.y = hsizeY - aCornerRadius;
+    curr_edge.m_center.x = hsizeX - aCornerRadius;
+    curr_edge.m_center.y = curr_edge.m_end.y;
+    curr_edge.m_arc_angle_start = aOrient + 0.0;     // En decidegree
+
+    rr_outline.push_back( curr_edge );
+
+    // bottom left corner 4 (and 3 to 4 bottom horizontal side @ y=hsizeY)
+    curr_edge.m_start.x = hsizeX - aCornerRadius;
+    curr_edge.m_start.y = hsizeY;
+    curr_edge.m_end.x =  -hsizeX + aCornerRadius;
+    curr_edge.m_end.y = curr_edge.m_start.y;
+    curr_edge.m_center.x = curr_edge.m_end.x;
+    curr_edge.m_center.y = hsizeY - aCornerRadius;
+    curr_edge.m_arc_angle_start = aOrient - 900.0;     // En decidegree
+
+    rr_outline.push_back( curr_edge );
+
+    // Move relative coordinates to the actual location and rotation:
+    wxPoint arc_last_center;
+    int arc_last_angle = curr_edge.m_arc_angle_start+arc_angle;
+
+    for( RR_EDGE& rr_edge: rr_outline )
+    {
+        RotatePoint( &rr_edge.m_start, aOrient );
+        RotatePoint( &rr_edge.m_end, aOrient );
+        RotatePoint( &rr_edge.m_center, aOrient );
+        rr_edge.m_start += aRectCenter;
+        rr_edge.m_end += aRectCenter;
+        rr_edge.m_center += aRectCenter;
+        arc_last_center = rr_edge.m_center;
     }
 
-    std::vector< wxPoint > cornerList;
-    // TransformRoundRectToPolygon creates only one convex polygon
-    SHAPE_LINE_CHAIN& poly = outline.Outline( 0 );
-    cornerList.reserve( poly.PointCount() + 1 );
+    // Ensure the region is a closed polygon, i.e. the end point of last segment
+    // (end of arc) is the same as the first point. Rounding issues can create a
+    // small difference, mainly for rotated pads.
+    // calculate last point (end of last arc):
+    wxPoint last_pt;
+    last_pt.x = arc_last_center.x + KiROUND( cosdecideg( aCornerRadius, arc_last_angle ) );
+    last_pt.y = arc_last_center.y - KiROUND( sindecideg( aCornerRadius, arc_last_angle ) );
 
-    for( int ii = 0; ii < poly.PointCount(); ++ii )
-        cornerList.push_back( wxPoint( poly.Point( ii ).x, poly.Point( ii ).y ) );
+    wxPoint first_pt = rr_outline[0].m_start;
 
-    // Close polygon
-    cornerList.push_back( cornerList[0] );
+#if 0    // For test only:
+    if( last_pt != first_pt )
+        wxLogMessage( "first pt %d %d last pt %d %d",
+                      first_pt.x, first_pt.y, last_pt.x, last_pt.y );
+#endif
 
-    if( aTraceMode == SKETCH )
-        PlotPoly( cornerList, NO_FILL, GetCurrentLineWidth(), gbr_metadata );
-    else
-        PlotGerberRegion( cornerList, gbr_metadata );
+    fputs( "G36*\n", outputFile );  // Start region
+    fputs( "G01*\n", outputFile );  // Set linear interpolation.
+    first_pt = last_pt;
+    MoveTo( first_pt );             // Start point of region, must be same as end point
+
+    for( RR_EDGE& rr_edge: rr_outline )
+    {
+        if( aCornerRadius )     // Guard: ensure we do not create arcs with radius = 0
+        {
+            // LineTo( rr_edge.m_end ); // made in plotArc()
+            plotArc( rr_edge.m_center,
+                     rr_edge.m_arc_angle_start, rr_edge.m_arc_angle_start+arc_angle,
+                     aCornerRadius, true );
+        }
+        else
+            LineTo( rr_edge.m_end );
+    }
+
+    fputs( "G37*\n", outputFile );      // Close region
 }
 
 

common/plotters/PDF_plotter.cpp

@@ -495,7 +495,7 @@ int PDF_PLOTTER::startPdfStream(int handle)
              "stream\n", handle + 1 );
 
     // Open a temporary file to accumulate the stream
-    workFilename = filename + wxT(".tmp");
+    workFilename = wxFileName::CreateTempFileName( "" );
     workFile = wxFopen( workFilename, wxT( "w+b" ));
     wxASSERT( workFile );
     return handle;
@@ -755,8 +755,7 @@ bool PDF_PLOTTER::EndPlot()
              "/Producer (KiCAD PDF)\n"
              "/CreationDate (%s)\n"
              "/Creator (%s)\n"
-             "/Title (%s)\n"
-             "/Trapped false\n",
+             "/Title (%s)\n",
              date_buf,
              TO_UTF8( creator ),
              TO_UTF8( title ) );

common/plotters/SVG_plotter.cpp

@@ -6,8 +6,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2020 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -90,6 +90,8 @@
  * flag_sweep : 0 = CCW, 1 = CW
  * The center of ellipse is automatically calculated.
  */
+
+#include <base64.h>
 #include <fctsys.h>
 #include <trigo.h>
 #include <eda_base_frame.h>
@@ -100,6 +102,8 @@
 #include <macros.h>
 #include <kicad_string.h>
 
+#include <cstdint>
+#include <wx/mstream.h>
 
 
 /**
@@ -499,7 +503,7 @@ void SVG_PLOTTER::Arc( const wxPoint& centre, double StAngle, double EndAngle, i
 
     setFillMode( NO_FILL );
     SetCurrentLineWidth( width );
-    fprintf( outputFile, "<path d=\"M%g %g A%g %g 0.0 %d %d %g %g \" />\n",
+    fprintf( outputFile, "<path d=\"M%g %g A%g %g 0.0 %d %d %g %g\" />\n",
              start.x, start.y, radius_dev, radius_dev,
              flg_arc, flg_sweep,
              end.x, end.y  );
@@ -554,12 +558,51 @@ void SVG_PLOTTER::PlotPoly( const std::vector<wxPoint>& aCornerList,
 void SVG_PLOTTER::PlotImage( const wxImage& aImage, const wxPoint& aPos,
                              double aScaleFactor )
 {
-    // in svg file we must insert a link to a png image file to plot an image
-    // the image itself is not included in the svg file.
-    // So we prefer skip the image, and just draw a rectangle,
-    // like other plotters which do not support images
+    wxSize pix_size( aImage.GetWidth(), aImage.GetHeight() );
+
+    // Requested size (in IUs)
+    DPOINT drawsize( aScaleFactor * pix_size.x,
+                     aScaleFactor * pix_size.y );
+
+    // calculate the bitmap start position
+    wxPoint start( aPos.x - drawsize.x / 2,
+                   aPos.y - drawsize.y / 2);
+
+    // Rectangles having a 0 size value for height or width are just not drawn on Inscape,
+    // so use a line when happens.
+    if( drawsize.x == 0.0 || drawsize.y == 0.0 )    // Draw a line
+    {
+        PLOTTER::PlotImage( aImage, aPos, aScaleFactor );
+    }
+    else
+    {
+        wxMemoryOutputStream img_stream;
+
+        aImage.SaveFile( img_stream, wxBITMAP_TYPE_PNG );
+        size_t input_len = img_stream.GetOutputStreamBuffer()->GetBufferSize();
+        std::vector<uint8_t> buffer( input_len );
+        std::vector<uint8_t> encoded;
+
+        img_stream.CopyTo( buffer.data(), buffer.size() );
+        base64::encode( buffer, encoded );
+
+        fprintf( outputFile,
+                 "<image x=\"%g\" y=\"%g\" xlink:href=\"data:image/png;base64,",
+                 userToDeviceSize( start.x ), userToDeviceSize( start.y )
+                 );
+
+        for( size_t i = 0; i < encoded.size(); i++ )
+        {
+            fprintf( outputFile, "%c", static_cast<char>( encoded[i] ) );
+
+            if( ( i % 64 )  == 63 )
+                fprintf( outputFile, "\n" );
+        }
+
+        fprintf( outputFile, "\"\npreserveAspectRatio=\"none\" width=\"%g\" height=\"%g\" />",
+                userToDeviceSize( drawsize.x ), userToDeviceSize( drawsize.y ) );
+    }
 
-    PLOTTER::PlotImage( aImage, aPos, aScaleFactor );
 
 }
 
@@ -620,7 +663,11 @@ bool SVG_PLOTTER::StartPlot()
         "<?xml version=\"1.0\" standalone=\"no\"?>\n",
         " <!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \n",
         " \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\"> \n",
-        "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" \n",
+        "<svg\n"
+        "  xmlns:svg=\"http://www.w3.org/2000/svg\"\n"
+        "  xmlns=\"http://www.w3.org/2000/svg\"\n",
+        "  xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n",
+        "  version=\"1.1\"\n",
         NULL
     };
 
@@ -633,7 +680,7 @@ bool SVG_PLOTTER::StartPlot()
     // Write viewport pos and size
     wxPoint origin;    // TODO set to actual value
     fprintf( outputFile,
-             "    width=\"%gcm\" height=\"%gcm\" viewBox=\"%d %d %d %d \">\n",
+             "  width=\"%fcm\" height=\"%fcm\" viewBox=\"%d %d %d %d\">\n",
              (double) paperSize.x / m_IUsPerDecimil * 2.54 / 10000,
              (double) paperSize.y / m_IUsPerDecimil * 2.54 / 10000,
              origin.x, origin.y,
@@ -660,7 +707,7 @@ bool SVG_PLOTTER::StartPlot()
              m_brush_rgb_color, opacity, m_pen_rgb_color, opacity );
 
     // output the pen cap and line joint
-    fputs( "stroke-linecap:round; stroke-linejoin:round; \"\n", outputFile );
+    fputs( "stroke-linecap:round; stroke-linejoin:round;\"\n", outputFile );
     fputs( " transform=\"translate(0 0) scale(1 1)\">\n", outputFile );
     return true;
 }
@@ -734,8 +781,10 @@ void SVG_PLOTTER::Text( const wxPoint&              aPos,
     }
 
     wxSize text_size;
-    text_size.x = GraphicTextWidth( aText, aSize, aItalic, width );
-    text_size.y = aSize.x * 4/3; // Hershey font height to em size conversion
+    // aSize.x or aSize.y is < 0 for mirrored texts.
+    // The actual text size value is the absolue value
+    text_size.x = std::abs( GraphicTextWidth( aText, aSize, aItalic, width ) );
+    text_size.y = std::abs( aSize.x * 4/3 ); // Hershey font height to em size conversion
     DPOINT anchor_pos_dev = userToDeviceCoordinates( aPos );
     DPOINT text_pos_dev = userToDeviceCoordinates( text_pos );
     DPOINT sz_dev = userToDeviceSize( text_size );
@@ -747,10 +796,15 @@ void SVG_PLOTTER::Text( const wxPoint&              aPos,
     }
 
     fprintf( outputFile,
-             "<text x=\"%g\" y=\"%g\"\n"
+             "<text x=\"%g\" y=\"%g\"\n", text_pos_dev.x, text_pos_dev.y );
+
+    /// If the text is mirrored, we should also mirror the hidden text to match
+    if( aSize.x < 0 )
+        fprintf( outputFile, "transform=\"scale(-1 1) translate(%f 0)\"\n", -2 * text_pos_dev.x );
+
+    fprintf( outputFile,
              "textLength=\"%g\" font-size=\"%g\" lengthAdjust=\"spacingAndGlyphs\"\n"
              "text-anchor=\"%s\" opacity=\"0\">%s</text>\n",
-             text_pos_dev.x, text_pos_dev.y,
              sz_dev.x, sz_dev.y,
              hjust, TO_UTF8( XmlEsc( aText ) ) );
 

common/plotters/plotter.cpp

@@ -478,9 +478,16 @@ void PLOTTER::ThickSegment( const wxPoint& start, const wxPoint& end, int width,
 {
     if( tracemode == FILLED )
     {
-        SetCurrentLineWidth( width );
-        MoveTo( start );
-        FinishTo( end );
+        if( start == end )
+        {
+            Circle( start, width, FILLED_SHAPE, 0 );
+        }
+        else
+        {
+            SetCurrentLineWidth( width );
+            MoveTo( start );
+            FinishTo( end );
+        }
     }
     else
     {

common/preview_items/polygon_item.cpp

@@ -31,7 +31,7 @@
 
 using namespace KIGFX::PREVIEW;
 
-const double POLYGON_ITEM::POLY_LINE_WIDTH = 150000.0;
+const double POLYGON_ITEM::POLY_LINE_WIDTH = 1;
 
 POLYGON_ITEM::POLYGON_ITEM():
         SIMPLE_OVERLAY_ITEM()
@@ -61,7 +61,7 @@ void POLYGON_ITEM::drawPreviewShape( KIGFX::VIEW* aView ) const
     auto& gal = *aView->GetGAL();
     auto rs = static_cast<KIGFX::PCB_RENDER_SETTINGS*>( aView->GetPainter()->GetSettings() );
 
-    gal.SetLineWidth( POLY_LINE_WIDTH );
+    gal.SetLineWidth( (float) aView->ToWorld( POLY_LINE_WIDTH ) );
     gal.DrawPolyline( m_lockedChain );
 
     // draw the leader line in a different color