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

Cleanup.

This commit is contained in:
Jeff Young 2019-07-16 02:31:07 +01:00
parent ceb6a49f0c
commit 27aacb26f8
1 changed files with 12 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pcbnew/import_gfx/dialog_import_gfx.cpp
View File

@ -1,8 +1,3 @@
/**
* @file dialog_gfx_import.cpp
* @brief Dialog to import a vector graphics file on a given board layer.
*/
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
@ -28,18 +23,12 @@
*/ */
#include "dialog_import_gfx.h" #include "dialog_import_gfx.h"
#include <advanced_config.h>
#include <convert_to_biu.h>
#include <kiface_i.h> #include <kiface_i.h>
#include <pcb_layer_box_selector.h> #include <pcb_layer_box_selector.h>
#include <wildcards_and_files_ext.h> #include <wildcards_and_files_ext.h>
#include <class_board.h> #include <class_board.h>
#include <class_module.h>
#include <class_edge_mod.h> #include <class_edge_mod.h>
#include <class_text_mod.h> #include <class_text_mod.h>
#include <class_pcb_text.h>
// Configuration path (group) to store entry keys below. // Configuration path (group) to store entry keys below.
#define IMPORT_GFX_GROUP "ImportGraphics" #define IMPORT_GFX_GROUP "ImportGraphics"
@ -82,10 +71,10 @@ DIALOG_IMPORT_GFX::DIALOG_IMPORT_GFX( PCB_BASE_FRAME* aParent, bool aImportAsFoo
// To disable SVG import, enable these 2 lines // To disable SVG import, enable these 2 lines
// if( !ADVANCED_CFG::GetCfg().m_enableSvgImport ) // if( !ADVANCED_CFG::GetCfg().m_enableSvgImport )
// blacklist.push_back( GRAPHICS_IMPORT_MGR::SVG ); // blacklist.push_back( GRAPHICS_IMPORT_MGR::SVG );
// The SVG import has currently a flaw: // The SVG import has currently a flaw: all SVG shapes are imported as curves and
// All SVG shapes are imported as curves and converted to a lot of segments. // converted to a lot of segments. A better approach is to convert to polylines
// A better approach is to convert to polylines (not yet existing in Pcbnew) and keep // (not yet existing in Pcbnew) and keep arcs and circles as primitives (not yet
// arcs and circles as primitives (not yet possible with tinysvg library). // possible with tinysvg library).
m_gfxImportMgr = std::make_unique<GRAPHICS_IMPORT_MGR>( blacklist ); m_gfxImportMgr = std::make_unique<GRAPHICS_IMPORT_MGR>( blacklist );
} }
@ -182,16 +171,9 @@ double DIALOG_IMPORT_GFX::getPCBdefaultLineWidthMM()
switch( m_lineWidthUnits ) switch( m_lineWidthUnits )
{ {
default: default:
case 0: // display units = mm case 0: break; // display units = mm
break; case 1: value *= 25.4 / 1000; break; // display units = mil
case 2: value *= 25.4; break; // display units = inch
case 1: // display units = mil
value *= 25.4 / 1000;
break;
case 2: // display units = inch
value *= 25.4;
break;
} }
return value; // value is in mm return value; // value is in mm
@ -229,17 +211,9 @@ void DIALOG_IMPORT_GFX::showPCBdefaultLineWidth()
switch( m_lineWidthUnits ) switch( m_lineWidthUnits )
{ {
default: default:
case 0: // display units = mm case 0: value = m_lineWidth; break; // display units = mm
value = m_lineWidth; case 1: value = m_lineWidth / 25.4 * 1000; break; // display units = mil
break; case 2: value = m_lineWidth / 25.4; break; // display units = inch
case 1: // display units = mil
value = m_lineWidth / 25.4 * 1000;
break;
case 2: // display units = inch
value = m_lineWidth / 25.4;
break;
} }
m_textCtrlLineWidth->SetValue( wxString::Format( "%f", value ) ); m_textCtrlLineWidth->SetValue( wxString::Format( "%f", value ) );
@ -273,8 +247,8 @@ void DIALOG_IMPORT_GFX::onBrowseFiles( wxCommandEvent& event )
wildcardsDesc = _( "All supported formats|" ) + allWildcards + wildcardsDesc; wildcardsDesc = _( "All supported formats|" ) + allWildcards + wildcardsDesc;
wxFileDialog dlg( m_parent, _( "Open File" ), path, filename, wxFileDialog dlg( m_parent, _( "Open File" ), path, filename, wildcardsDesc,
wildcardsDesc, wxFD_OPEN|wxFD_FILE_MUST_EXIST ); wxFD_OPEN | wxFD_FILE_MUST_EXIST );
if( dlg.ShowModal() != wxID_OK ) if( dlg.ShowModal() != wxID_OK )
return; return;
@ -371,11 +345,7 @@ void DIALOG_IMPORT_GFX::updatePcbImportOffsets_mm()
m_origin.y = DoubleValueFromString( UNSCALED_UNITS, m_DxfPcbYCoord->GetValue() ); m_origin.y = DoubleValueFromString( UNSCALED_UNITS, m_DxfPcbYCoord->GetValue() );
if( m_originUnits ) // Units are inches if( m_originUnits ) // Units are inches
{
m_origin = m_origin * 25.4; m_origin = m_origin * 25.4;
}
return;
} }