haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make SVG import a CMake option (experimental) 

This allows too turn it on for work without an additional patch.

Also fix a bug in the disable code - when the SVG is enabled,
allow to select SVG files.
This commit is contained in:
John Beard 2018-12-04 13:48:47 +00:00 committed by jean-pierre charras
parent 8757fcf676
commit bb18c9201b
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcbnew/CMakeLists.txt
View File

@ -852,3 +852,23 @@ if( APPLE )
) )
endif() endif()
endif() endif()
# Experimental feature flags
#
# Currently (Version 5.1) SVG import is disabled by default, to avoid issues
# SVG needs some enhancements.
# Especially, all SVG shapes are imported as curves and converted to a lot of segments.
# A better approach is to convert to polylines (not yet existing in Pcbnew) and keep
# arcs and circles as primitives (not yet possible with tinysvg library.
# So, until these issues are solved, disable SVG import option.
# Warning: enable svg import is currently only for developers.
option( KICAD_EXPERIMENTAL_ENABLE_SVG "Experimental: Enable SVG import" OFF)
if( NOT KICAD_EXPERIMENTAL_ENABLE_SVG )
set_property(
SOURCE import_gfx/dialog_import_gfx.cpp
PROPERTY COMPILE_DEFINITIONS DISABLE_SVG_IMPORT
APPEND
)
endif()

14
pcbnew/import_gfx/dialog_import_gfx.cpp
View File

@ -49,22 +49,12 @@
#define IMPORT_GFX_LINEWIDTH_UNITS_KEY "GfxImportLineWidthUnits" #define IMPORT_GFX_LINEWIDTH_UNITS_KEY "GfxImportLineWidthUnits"
#define IMPORT_GFX_LINEWIDTH_KEY "GfxImportLineWidth" #define IMPORT_GFX_LINEWIDTH_KEY "GfxImportLineWidth"
// Currently (Version 5.1) SVG import is disabled by default, to avoid issues
// SVG needs some enhancements.
// Especially, all SVG shapes are imported as curves and converted to a lot of segments.
// A better approach is to convert to polylines (not yet existing in Pcbnew) and keep
// arcs and circles as primitives (not yet possible with tinysvg library.
// So, until these issues are solved, disable SVG import option.
// Warning: enable svg import is currently only for developers.
#define DISABLE_SVG_IMPORT
// Static members of DIALOG_IMPORT_GFX, to remember // Static members of DIALOG_IMPORT_GFX, to remember
// the user's choices during the session // the user's choices during the session
wxString DIALOG_IMPORT_GFX::m_filename; wxString DIALOG_IMPORT_GFX::m_filename;
bool DIALOG_IMPORT_GFX::m_placementInteractive = true; bool DIALOG_IMPORT_GFX::m_placementInteractive = true;
LAYER_NUM DIALOG_IMPORT_GFX::m_layer = Dwgs_User; LAYER_NUM DIALOG_IMPORT_GFX::m_layer = Dwgs_User;
double DIALOG_IMPORT_GFX::m_scaleImport = 1.0; // Do not change the imported items siaz double DIALOG_IMPORT_GFX::m_scaleImport = 1.0; // Do not change the imported items size
DIALOG_IMPORT_GFX::DIALOG_IMPORT_GFX( PCB_BASE_FRAME* aParent, bool aImportAsFootprintGraphic ) DIALOG_IMPORT_GFX::DIALOG_IMPORT_GFX( PCB_BASE_FRAME* aParent, bool aImportAsFootprintGraphic )
: DIALOG_IMPORT_GFX_BASE( aParent ) : DIALOG_IMPORT_GFX_BASE( aParent )
@ -250,8 +240,6 @@ void DIALOG_IMPORT_GFX::onBrowseFiles( wxCommandEvent& event )
for( auto pluginType : GRAPHICS_IMPORT_MGR::GFX_FILE_TYPES ) for( auto pluginType : GRAPHICS_IMPORT_MGR::GFX_FILE_TYPES )
{ {
if( !pluginType == GRAPHICS_IMPORT_MGR::GFX_FILE_T::DXF )
continue;
auto plugin = GRAPHICS_IMPORT_MGR::GetPlugin( pluginType ); auto plugin = GRAPHICS_IMPORT_MGR::GetPlugin( pluginType );
const auto wildcards = plugin->GetWildcards(); const auto wildcards = plugin->GetWildcards();