Better Dxf import dialog:
Better look. Better management of user offset settings (used only in Legacy mode). The default width of lines and circle can be set.
This commit is contained in:
jean-pierre charras
parent
d5290bdfe0
commit
78fa31315c
|
|
@ -39,12 +39,14 @@
|
|||
#include <class_pcb_text.h>
|
||||
|
||||
// Keys to store setup in config
|
||||
#define DXF_IMPORT_LAYER_OPTION_KEY "DxfImportBrdLayer"
|
||||
#define DXF_IMPORT_COORD_ORIGIN_KEY "DxfImportCoordOrigin"
|
||||
#define DXF_IMPORT_LAST_FILE_KEY "DxfImportLastFile"
|
||||
#define DXF_IMPORT_GRID_UNITS_KEY "DxfImportGridUnits"
|
||||
#define DXF_IMPORT_GRID_OFFSET_X_KEY "DxfImportGridOffsetX"
|
||||
#define DXF_IMPORT_GRID_OFFSET_Y_KEY "DxfImportGridOffsetY"
|
||||
#define DXF_IMPORT_LAYER_OPTION_KEY "DxfImportBrdLayer"
|
||||
#define DXF_IMPORT_COORD_ORIGIN_KEY "DxfImportCoordOrigin"
|
||||
#define DXF_IMPORT_LAST_FILE_KEY "DxfImportLastFile"
|
||||
#define DXF_IMPORT_IMPORT_UNITS_KEY "DxfImportOffsetUnits"
|
||||
#define DXF_IMPORT_IMPORT_OFFSET_X_KEY "DxfImportOffsetX"
|
||||
#define DXF_IMPORT_IMPORT_OFFSET_Y_KEY "DxfImportOffsetY"
|
||||
#define DXF_IMPORT_LINEWIDTH_UNITS_KEY "DxfImportLineWidthUnits"
|
||||
#define DXF_IMPORT_LINEWIDTH_KEY "DxfImportLineWidth"
|
||||
|
||||
|
||||
// Static members of DIALOG_DXF_IMPORT, to remember
|
||||
|
|
@ -54,33 +56,34 @@ int DIALOG_DXF_IMPORT::m_offsetSelection = 0;
|
|||
LAYER_NUM DIALOG_DXF_IMPORT::m_layer = Dwgs_User;
|
||||
|
||||
|
||||
DIALOG_DXF_IMPORT::DIALOG_DXF_IMPORT( PCB_BASE_FRAME* aParent, bool aUseModuleItems )
|
||||
DIALOG_DXF_IMPORT::DIALOG_DXF_IMPORT( PCB_BASE_FRAME* aParent, bool aImportAsFootprintGraphic )
|
||||
: DIALOG_DXF_IMPORT_BASE( aParent )
|
||||
{
|
||||
m_parent = aParent;
|
||||
m_dxfImporter.UseModuleItems( aUseModuleItems );
|
||||
m_dxfImporter.ImportAsFootprintGraphic( aImportAsFootprintGraphic );
|
||||
m_config = Kiface().KifaceSettings();
|
||||
m_PCBGridUnits = 0;
|
||||
m_PCBGridOffsetX = 0.0;
|
||||
m_PCBGridOffsetY = 0.0;
|
||||
m_PcbImportUnits = 0;
|
||||
m_PcbImportOffsetX = 0.0; // always in mm
|
||||
m_PcbImportOffsetY = 0.0; // always in mm
|
||||
|
||||
if( m_config )
|
||||
{
|
||||
m_layer = m_config->Read( DXF_IMPORT_LAYER_OPTION_KEY, (long)Dwgs_User );
|
||||
m_offsetSelection = m_config->Read( DXF_IMPORT_COORD_ORIGIN_KEY, (long)0 );
|
||||
m_dxfFilename = m_config->Read( DXF_IMPORT_LAST_FILE_KEY, wxEmptyString );
|
||||
m_config->Read( DXF_IMPORT_GRID_UNITS_KEY, &m_PCBGridUnits, 0 );
|
||||
m_config->Read( DXF_IMPORT_GRID_OFFSET_X_KEY, &m_PCBGridOffsetX, 0.0 );
|
||||
m_config->Read( DXF_IMPORT_GRID_OFFSET_Y_KEY, &m_PCBGridOffsetY, 0.0 );
|
||||
m_config->Read( DXF_IMPORT_IMPORT_UNITS_KEY, &m_PcbImportUnits, 0 );
|
||||
m_config->Read( DXF_IMPORT_IMPORT_OFFSET_X_KEY, &m_PcbImportOffsetX, 0.0 );
|
||||
m_config->Read( DXF_IMPORT_IMPORT_OFFSET_Y_KEY, &m_PcbImportOffsetY, 0.0 );
|
||||
m_config->Read( DXF_IMPORT_LINEWIDTH_UNITS_KEY, &m_PCBLineWidthUnits, 0 );
|
||||
m_config->Read( DXF_IMPORT_LINEWIDTH_KEY, &m_PCBdefaultLineWidth, 0.2 );
|
||||
}
|
||||
|
||||
m_DXFPCBGridUnits->SetSelection( m_PCBGridUnits );
|
||||
wxString tmpStr;
|
||||
tmpStr << m_PCBGridOffsetX;
|
||||
m_DXFPCBXCoord->SetValue( tmpStr );
|
||||
tmpStr = "";
|
||||
tmpStr << m_PCBGridOffsetY;
|
||||
m_DXFPCBYCoord->SetValue( tmpStr );
|
||||
m_choiceUnitLineWidth->SetSelection( m_PCBLineWidthUnits );
|
||||
showPCBdefaultLineWidth();
|
||||
m_dxfImporter.SetDefaultLineWidthMM( m_PCBdefaultLineWidth );
|
||||
|
||||
m_DxfPcbPositionUnits->SetSelection( m_PcbImportUnits );
|
||||
showPcbImportOffsets();
|
||||
|
||||
m_textCtrlFileName->SetValue( m_dxfFilename );
|
||||
m_rbOffsetOption->SetSelection( m_offsetSelection );
|
||||
|
|
@ -97,7 +100,7 @@ DIALOG_DXF_IMPORT::DIALOG_DXF_IMPORT( PCB_BASE_FRAME* aParent, bool aUseModuleIt
|
|||
m_SelLayerBox->SetLayerSelection( m_layer );
|
||||
}
|
||||
|
||||
m_sdbSizer1OK->SetDefault();
|
||||
m_sdbSizerOK->SetDefault();
|
||||
GetSizer()->Fit( this );
|
||||
GetSizer()->SetSizeHints( this );
|
||||
Centre();
|
||||
|
|
@ -107,6 +110,7 @@ DIALOG_DXF_IMPORT::DIALOG_DXF_IMPORT( PCB_BASE_FRAME* aParent, bool aUseModuleIt
|
|||
DIALOG_DXF_IMPORT::~DIALOG_DXF_IMPORT()
|
||||
{
|
||||
m_offsetSelection = m_rbOffsetOption->GetSelection();
|
||||
getPcbImportOffsets();
|
||||
m_layer = m_SelLayerBox->GetLayerSelection();
|
||||
|
||||
if( m_config )
|
||||
|
|
@ -115,13 +119,103 @@ DIALOG_DXF_IMPORT::~DIALOG_DXF_IMPORT()
|
|||
m_config->Write( DXF_IMPORT_COORD_ORIGIN_KEY, m_offsetSelection );
|
||||
m_config->Write( DXF_IMPORT_LAST_FILE_KEY, m_dxfFilename );
|
||||
|
||||
m_config->Write( DXF_IMPORT_GRID_UNITS_KEY, GetPCBGridUnits() );
|
||||
m_config->Write( DXF_IMPORT_GRID_OFFSET_X_KEY, m_DXFPCBXCoord->GetValue() );
|
||||
m_config->Write( DXF_IMPORT_GRID_OFFSET_Y_KEY, m_DXFPCBYCoord->GetValue() );
|
||||
m_config->Write( DXF_IMPORT_IMPORT_UNITS_KEY, m_PcbImportUnits );
|
||||
m_config->Write( DXF_IMPORT_IMPORT_OFFSET_X_KEY, m_PcbImportOffsetX );
|
||||
m_config->Write( DXF_IMPORT_IMPORT_OFFSET_Y_KEY, m_PcbImportOffsetY );
|
||||
|
||||
m_config->Write( DXF_IMPORT_LINEWIDTH_UNITS_KEY, m_PCBLineWidthUnits );
|
||||
m_PCBLineWidthUnits = getPCBdefaultLineWidthMM();
|
||||
m_config->Write( DXF_IMPORT_LINEWIDTH_KEY, m_PCBdefaultLineWidth );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void DIALOG_DXF_IMPORT::DIALOG_DXF_IMPORT::onUnitPositionSelection( wxCommandEvent& event )
|
||||
{
|
||||
// Collect last entered values:
|
||||
getPcbImportOffsets();
|
||||
|
||||
m_PcbImportUnits = m_DxfPcbPositionUnits->GetSelection();;
|
||||
showPcbImportOffsets();
|
||||
}
|
||||
|
||||
|
||||
double DIALOG_DXF_IMPORT::getPCBdefaultLineWidthMM()
|
||||
{
|
||||
double value = DoubleValueFromString( UNSCALED_UNITS, m_textCtrlLineWidth->GetValue() );
|
||||
|
||||
switch( m_PCBLineWidthUnits )
|
||||
{
|
||||
default:
|
||||
case 0: // display units = mm
|
||||
break;
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
|
||||
void DIALOG_DXF_IMPORT::onUnitWidthSelection( wxCommandEvent& event )
|
||||
{
|
||||
m_PCBdefaultLineWidth = getPCBdefaultLineWidthMM();
|
||||
|
||||
// Switch to new units
|
||||
m_PCBLineWidthUnits = m_choiceUnitLineWidth->GetSelection();
|
||||
showPCBdefaultLineWidth();
|
||||
}
|
||||
|
||||
|
||||
void DIALOG_DXF_IMPORT::showPcbImportOffsets()
|
||||
{
|
||||
// Display m_PcbImportOffsetX and m_PcbImportOffsetY values according to
|
||||
// the unit selection:
|
||||
double xoffset = m_PcbImportOffsetX;
|
||||
double yoffset = m_PcbImportOffsetY;
|
||||
|
||||
if( m_PcbImportUnits ) // Units are inches
|
||||
{
|
||||
xoffset /= 25.4;
|
||||
yoffset /= 25.4;
|
||||
}
|
||||
|
||||
m_DxfPcbXCoord->SetValue( wxString::Format( "%f", xoffset ) );
|
||||
m_DxfPcbYCoord->SetValue( wxString::Format( "%f", yoffset ) );
|
||||
|
||||
}
|
||||
|
||||
|
||||
void DIALOG_DXF_IMPORT::showPCBdefaultLineWidth()
|
||||
{
|
||||
double value;
|
||||
|
||||
switch( m_PCBLineWidthUnits )
|
||||
{
|
||||
default:
|
||||
case 0: // display units = mm
|
||||
value = m_PCBdefaultLineWidth;
|
||||
break;
|
||||
|
||||
case 1: // display units = mil
|
||||
value = m_PCBdefaultLineWidth / 25.4 * 1000;
|
||||
break;
|
||||
|
||||
case 2: // display units = inch
|
||||
value = m_PCBdefaultLineWidth / 25.4;
|
||||
break;
|
||||
}
|
||||
|
||||
m_textCtrlLineWidth->SetValue( wxString::Format( "%f", value ) );
|
||||
}
|
||||
|
||||
|
||||
void DIALOG_DXF_IMPORT::OnBrowseDxfFiles( wxCommandEvent& event )
|
||||
{
|
||||
wxString path;
|
||||
|
|
@ -153,12 +247,15 @@ void DIALOG_DXF_IMPORT::OnBrowseDxfFiles( wxCommandEvent& event )
|
|||
}
|
||||
|
||||
|
||||
void DIALOG_DXF_IMPORT::OnOKClick( wxCommandEvent& event )
|
||||
bool DIALOG_DXF_IMPORT::TransferDataFromWindow()
|
||||
{
|
||||
m_dxfFilename = m_textCtrlFileName->GetValue();
|
||||
|
||||
if( m_dxfFilename.IsEmpty() )
|
||||
return;
|
||||
{
|
||||
wxMessageBox( _( "Error: No DXF filename!" ) );
|
||||
return false;
|
||||
}
|
||||
|
||||
double offsetX = 0;
|
||||
double offsetY = 0;
|
||||
|
|
@ -184,13 +281,9 @@ void DIALOG_DXF_IMPORT::OnOKClick( wxCommandEvent& event )
|
|||
break;
|
||||
|
||||
case 4:
|
||||
GetPCBGridOffsets( offsetX, offsetY );
|
||||
|
||||
if( GetPCBGridUnits() )
|
||||
{
|
||||
offsetX *= 25.4;
|
||||
offsetY *= 25.4;
|
||||
}
|
||||
getPcbImportOffsets();
|
||||
offsetX = m_PcbImportOffsetX;
|
||||
offsetY = m_PcbImportOffsetY;
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -198,11 +291,13 @@ void DIALOG_DXF_IMPORT::OnOKClick( wxCommandEvent& event )
|
|||
m_dxfImporter.SetOffset( offsetX, offsetY );
|
||||
m_layer = m_SelLayerBox->GetLayerSelection();
|
||||
m_dxfImporter.SetBrdLayer( m_layer );
|
||||
m_PCBdefaultLineWidth = getPCBdefaultLineWidthMM();
|
||||
m_dxfImporter.SetDefaultLineWidthMM( m_PCBdefaultLineWidth );
|
||||
|
||||
// Read dxf file:
|
||||
m_dxfImporter.ImportDxfFile( m_dxfFilename );
|
||||
|
||||
EndModal( wxID_OK );
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -265,21 +360,22 @@ void DIALOG_DXF_IMPORT::OriginOptionOnUpdateUI( wxUpdateUIEvent& event )
|
|||
{
|
||||
bool enable = m_rbOffsetOption->GetSelection() == 4;
|
||||
|
||||
m_DXFPCBGridUnits->Enable( enable );
|
||||
m_DXFPCBXCoord->Enable( enable );
|
||||
m_DXFPCBYCoord->Enable( enable );
|
||||
m_DxfPcbPositionUnits->Enable( enable );
|
||||
m_DxfPcbXCoord->Enable( enable );
|
||||
m_DxfPcbYCoord->Enable( enable );
|
||||
}
|
||||
|
||||
|
||||
int DIALOG_DXF_IMPORT::GetPCBGridUnits( void )
|
||||
void DIALOG_DXF_IMPORT::getPcbImportOffsets()
|
||||
{
|
||||
return m_DXFPCBGridUnits->GetSelection();
|
||||
}
|
||||
m_PcbImportOffsetX = DoubleValueFromString( UNSCALED_UNITS, m_DxfPcbXCoord->GetValue() );
|
||||
m_PcbImportOffsetY = DoubleValueFromString( UNSCALED_UNITS, m_DxfPcbYCoord->GetValue() );
|
||||
|
||||
if( m_PcbImportUnits ) // Units are inches
|
||||
{
|
||||
m_PcbImportOffsetX *= 25.4;
|
||||
m_PcbImportOffsetY *= 25.4;
|
||||
}
|
||||
|
||||
void DIALOG_DXF_IMPORT::GetPCBGridOffsets( double &aXOffset, double &aYOffset )
|
||||
{
|
||||
aXOffset = DoubleValueFromString( UNSCALED_UNITS, m_DXFPCBXCoord->GetValue() );
|
||||
aYOffset = DoubleValueFromString( UNSCALED_UNITS, m_DXFPCBYCoord->GetValue() );
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,21 +44,29 @@ public:
|
|||
|
||||
private:
|
||||
PCB_BASE_FRAME* m_parent;
|
||||
wxConfigBase* m_config; // Current config
|
||||
wxConfigBase* m_config; // Current config
|
||||
DXF2BRD_CONVERTER m_dxfImporter;
|
||||
int m_PCBGridUnits;
|
||||
double m_PCBGridOffsetX;
|
||||
double m_PCBGridOffsetY;
|
||||
int m_PcbImportUnits;
|
||||
double m_PcbImportOffsetX; // Always in mm
|
||||
double m_PcbImportOffsetY; // Always in mm
|
||||
|
||||
static wxString m_dxfFilename;
|
||||
static int m_offsetSelection;
|
||||
static LAYER_NUM m_layer;
|
||||
double m_PCBdefaultLineWidth; // in mm
|
||||
int m_PCBLineWidthUnits;
|
||||
|
||||
// Virtual event handlers
|
||||
void OnCancelClick( wxCommandEvent& event ) override { event.Skip(); }
|
||||
void OnOKClick( wxCommandEvent& event ) override;
|
||||
void onUnitPositionSelection( wxCommandEvent& event ) override;
|
||||
void onUnitWidthSelection( wxCommandEvent& event ) override;
|
||||
void OnBrowseDxfFiles( wxCommandEvent& event ) override;
|
||||
void OriginOptionOnUpdateUI( wxUpdateUIEvent& event ) override;
|
||||
int GetPCBGridUnits( void );
|
||||
void GetPCBGridOffsets( double &aXOffset, double &aYOffset );
|
||||
|
||||
void getPcbImportOffsets();
|
||||
double getPCBdefaultLineWidthMM();
|
||||
void showPCBdefaultLineWidth();
|
||||
void showPcbImportOffsets();
|
||||
|
||||
// Automatically called by OK button:
|
||||
bool TransferDataFromWindow() override;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
///////////////////////////////////////////////////////////////////////////
|
||||
// C++ code generated with wxFormBuilder (version Aug 4 2017)
|
||||
// C++ code generated with wxFormBuilder (version Jul 2 2017)
|
||||
// http://www.wxformbuilder.org/
|
||||
//
|
||||
// PLEASE DO "NOT" EDIT THIS FILE!
|
||||
|
|
@ -21,9 +21,9 @@ DIALOG_DXF_IMPORT_BASE::DIALOG_DXF_IMPORT_BASE( wxWindow* parent, wxWindowID id,
|
|||
wxBoxSizer* bSizerFile;
|
||||
bSizerFile = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
||||
m_staticText37 = new wxStaticText( this, wxID_ANY, _("File:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticText37->Wrap( -1 );
|
||||
bSizerFile->Add( m_staticText37, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
m_staticTextFile = new wxStaticText( this, wxID_ANY, _("File:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticTextFile->Wrap( -1 );
|
||||
bSizerFile->Add( m_staticTextFile, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
|
||||
m_textCtrlFileName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_textCtrlFileName->SetMinSize( wxSize( 300,-1 ) );
|
||||
|
|
@ -36,112 +36,160 @@ DIALOG_DXF_IMPORT_BASE::DIALOG_DXF_IMPORT_BASE( wxWindow* parent, wxWindowID id,
|
|||
|
||||
bSizerMain->Add( bSizerFile, 0, wxALL|wxEXPAND, 5 );
|
||||
|
||||
wxBoxSizer* bSizer3;
|
||||
bSizer3 = new wxBoxSizer( wxHORIZONTAL );
|
||||
wxBoxSizer* bSizerMiddle;
|
||||
bSizerMiddle = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
||||
wxString m_rbOffsetOptionChoices[] = { _("Center of page"), _("Upper left corner of page"), _("Center left side of page"), _("Lower left corner of page"), _("User defined position") };
|
||||
int m_rbOffsetOptionNChoices = sizeof( m_rbOffsetOptionChoices ) / sizeof( wxString );
|
||||
m_rbOffsetOption = new wxRadioBox( this, wxID_ORIGIN_SELECT, _("Place DXF origin (0,0) point:"), wxDefaultPosition, wxDefaultSize, m_rbOffsetOptionNChoices, m_rbOffsetOptionChoices, 1, wxRA_SPECIFY_COLS );
|
||||
m_rbOffsetOption->SetSelection( 0 );
|
||||
bSizer3->Add( m_rbOffsetOption, 0, wxALL|wxEXPAND, 5 );
|
||||
bSizerMiddle->Add( m_rbOffsetOption, 1, wxALL, 5 );
|
||||
|
||||
wxBoxSizer* bSizer4;
|
||||
bSizer4 = new wxBoxSizer( wxVERTICAL );
|
||||
wxBoxSizer* bSizerUserPos;
|
||||
bSizerUserPos = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
wxBoxSizer* bSizer6;
|
||||
bSizer6 = new wxBoxSizer( wxHORIZONTAL );
|
||||
wxBoxSizer* bSizerPosSettings;
|
||||
bSizerPosSettings = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
m_staticText4 = new wxStaticText( this, wxID_ANY, _("X Position:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticText4->Wrap( -1 );
|
||||
bSizer6->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
m_staticText6 = new wxStaticText( this, wxID_ANY, _("User defined position:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticText6->Wrap( -1 );
|
||||
bSizerPosSettings->Add( m_staticText6, 0, wxALL, 5 );
|
||||
|
||||
m_DXFPCBXCoord = new wxTextCtrl( this, wxID_ANY, _("0.0"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
wxFlexGridSizer* fgSizerUserPosition;
|
||||
fgSizerUserPosition = new wxFlexGridSizer( 0, 3, 0, 0 );
|
||||
fgSizerUserPosition->AddGrowableCol( 2 );
|
||||
fgSizerUserPosition->SetFlexibleDirection( wxBOTH );
|
||||
fgSizerUserPosition->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
||||
|
||||
|
||||
fgSizerUserPosition->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
|
||||
|
||||
m_staticTextXpos = new wxStaticText( this, wxID_ANY, _("X Position:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticTextXpos->Wrap( -1 );
|
||||
fgSizerUserPosition->Add( m_staticTextXpos, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
|
||||
m_DxfPcbXCoord = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
#ifdef __WXGTK__
|
||||
if ( !m_DXFPCBXCoord->HasFlag( wxTE_MULTILINE ) )
|
||||
if ( !m_DxfPcbXCoord->HasFlag( wxTE_MULTILINE ) )
|
||||
{
|
||||
m_DXFPCBXCoord->SetMaxLength( 10 );
|
||||
m_DxfPcbXCoord->SetMaxLength( 10 );
|
||||
}
|
||||
#else
|
||||
m_DXFPCBXCoord->SetMaxLength( 10 );
|
||||
m_DxfPcbXCoord->SetMaxLength( 10 );
|
||||
#endif
|
||||
m_DXFPCBXCoord->SetToolTip( _("DXF origin on PCB Grid, X Coordinate") );
|
||||
m_DxfPcbXCoord->SetToolTip( _("DXF origin on PCB Grid, X Coordinate") );
|
||||
|
||||
bSizer6->Add( m_DXFPCBXCoord, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
fgSizerUserPosition->Add( m_DxfPcbXCoord, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
|
||||
|
||||
|
||||
bSizer4->Add( bSizer6, 1, wxEXPAND, 5 );
|
||||
fgSizerUserPosition->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
|
||||
|
||||
m_staticTextYpos = new wxStaticText( this, wxID_ANY, _("Y Position:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticTextYpos->Wrap( -1 );
|
||||
fgSizerUserPosition->Add( m_staticTextYpos, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
|
||||
m_DxfPcbYCoord = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
#ifdef __WXGTK__
|
||||
if ( !m_DxfPcbYCoord->HasFlag( wxTE_MULTILINE ) )
|
||||
{
|
||||
m_DxfPcbYCoord->SetMaxLength( 10 );
|
||||
}
|
||||
#else
|
||||
m_DxfPcbYCoord->SetMaxLength( 10 );
|
||||
#endif
|
||||
m_DxfPcbYCoord->SetToolTip( _("DXF origin on PCB Grid, Y Coordinate") );
|
||||
|
||||
fgSizerUserPosition->Add( m_DxfPcbYCoord, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
|
||||
|
||||
|
||||
fgSizerUserPosition->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
|
||||
|
||||
m_staticTextUnits = new wxStaticText( this, wxID_ANY, _("Position Units:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticTextUnits->Wrap( -1 );
|
||||
fgSizerUserPosition->Add( m_staticTextUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
|
||||
wxString m_DxfPcbPositionUnitsChoices[] = { _("mm"), _("inch") };
|
||||
int m_DxfPcbPositionUnitsNChoices = sizeof( m_DxfPcbPositionUnitsChoices ) / sizeof( wxString );
|
||||
m_DxfPcbPositionUnits = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_DxfPcbPositionUnitsNChoices, m_DxfPcbPositionUnitsChoices, 0 );
|
||||
m_DxfPcbPositionUnits->SetSelection( 0 );
|
||||
m_DxfPcbPositionUnits->SetToolTip( _("Select PCB grid units") );
|
||||
|
||||
fgSizerUserPosition->Add( m_DxfPcbPositionUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
|
||||
|
||||
|
||||
bSizerPosSettings->Add( fgSizerUserPosition, 1, wxEXPAND, 5 );
|
||||
|
||||
|
||||
bSizerUserPos->Add( bSizerPosSettings, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 );
|
||||
|
||||
|
||||
bSizerMiddle->Add( bSizerUserPos, 1, 0, 5 );
|
||||
|
||||
|
||||
bSizerMain->Add( bSizerMiddle, 1, wxALL|wxEXPAND, 5 );
|
||||
|
||||
wxBoxSizer* bSizerLayer;
|
||||
bSizerLayer = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
|
||||
bSizerLayer->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 );
|
||||
|
||||
m_staticTextPrms = new wxStaticText( this, wxID_ANY, _("Import parameters:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticTextPrms->Wrap( -1 );
|
||||
bSizerLayer->Add( m_staticTextPrms, 0, wxALL, 5 );
|
||||
|
||||
wxBoxSizer* bSizer7;
|
||||
bSizer7 = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
||||
m_staticText5 = new wxStaticText( this, wxID_ANY, _("Y Position:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticText5->Wrap( -1 );
|
||||
bSizer7->Add( m_staticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
|
||||
m_DXFPCBYCoord = new wxTextCtrl( this, wxID_ANY, _("0.0"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
#ifdef __WXGTK__
|
||||
if ( !m_DXFPCBYCoord->HasFlag( wxTE_MULTILINE ) )
|
||||
{
|
||||
m_DXFPCBYCoord->SetMaxLength( 10 );
|
||||
}
|
||||
#else
|
||||
m_DXFPCBYCoord->SetMaxLength( 10 );
|
||||
#endif
|
||||
m_DXFPCBYCoord->SetToolTip( _("DXF origin on PCB Grid, Y Coordinate") );
|
||||
bSizer7->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
|
||||
|
||||
bSizer7->Add( m_DXFPCBYCoord, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
wxFlexGridSizer* fgSizerImportSettings;
|
||||
fgSizerImportSettings = new wxFlexGridSizer( 0, 3, 0, 0 );
|
||||
fgSizerImportSettings->AddGrowableCol( 1 );
|
||||
fgSizerImportSettings->SetFlexibleDirection( wxBOTH );
|
||||
fgSizerImportSettings->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
||||
|
||||
m_staticTextLineWidth = new wxStaticText( this, wxID_ANY, _("Default Line Width:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticTextLineWidth->Wrap( -1 );
|
||||
fgSizerImportSettings->Add( m_staticTextLineWidth, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||
|
||||
bSizer4->Add( bSizer7, 1, wxEXPAND, 5 );
|
||||
m_textCtrlLineWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizerImportSettings->Add( m_textCtrlLineWidth, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
|
||||
|
||||
wxBoxSizer* bSizer5;
|
||||
bSizer5 = new wxBoxSizer( wxHORIZONTAL );
|
||||
wxString m_choiceUnitLineWidthChoices[] = { _("mm"), _("mils"), _("inches") };
|
||||
int m_choiceUnitLineWidthNChoices = sizeof( m_choiceUnitLineWidthChoices ) / sizeof( wxString );
|
||||
m_choiceUnitLineWidth = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitLineWidthNChoices, m_choiceUnitLineWidthChoices, 0 );
|
||||
m_choiceUnitLineWidth->SetSelection( 0 );
|
||||
fgSizerImportSettings->Add( m_choiceUnitLineWidth, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||
|
||||
m_staticText3 = new wxStaticText( this, wxID_ANY, _("Units:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticText3->Wrap( -1 );
|
||||
bSizer5->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
|
||||
wxString m_DXFPCBGridUnitsChoices[] = { _("mm"), _("inch") };
|
||||
int m_DXFPCBGridUnitsNChoices = sizeof( m_DXFPCBGridUnitsChoices ) / sizeof( wxString );
|
||||
m_DXFPCBGridUnits = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_DXFPCBGridUnitsNChoices, m_DXFPCBGridUnitsChoices, 0 );
|
||||
m_DXFPCBGridUnits->SetSelection( 0 );
|
||||
m_DXFPCBGridUnits->SetToolTip( _("Select PCB grid units") );
|
||||
|
||||
bSizer5->Add( m_DXFPCBGridUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
|
||||
|
||||
bSizer4->Add( bSizer5, 1, wxEXPAND, 5 );
|
||||
|
||||
|
||||
bSizer3->Add( bSizer4, 1, 0, 5 );
|
||||
|
||||
|
||||
bSizerMain->Add( bSizer3, 1, wxALL|wxEXPAND, 5 );
|
||||
|
||||
wxBoxSizer* bSizer8;
|
||||
bSizer8 = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
||||
m_staticTextBrdlayer = new wxStaticText( this, wxID_ANY, _("Layer:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticTextBrdlayer = new wxStaticText( this, wxID_ANY, _("Graphic Layer:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticTextBrdlayer->Wrap( -1 );
|
||||
bSizer8->Add( m_staticTextBrdlayer, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP, 5 );
|
||||
fgSizerImportSettings->Add( m_staticTextBrdlayer, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP, 5 );
|
||||
|
||||
m_SelLayerBox = new PCB_LAYER_BOX_SELECTOR( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
|
||||
bSizer8->Add( m_SelLayerBox, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
fgSizerImportSettings->Add( m_SelLayerBox, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
|
||||
|
||||
|
||||
bSizerMain->Add( bSizer8, 0, wxALL|wxEXPAND, 5 );
|
||||
bSizer7->Add( fgSizerImportSettings, 1, wxEXPAND, 5 );
|
||||
|
||||
m_staticline8 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
|
||||
bSizerMain->Add( m_staticline8, 0, wxALL|wxEXPAND, 5 );
|
||||
|
||||
m_sdbSizer1 = new wxStdDialogButtonSizer();
|
||||
m_sdbSizer1OK = new wxButton( this, wxID_OK );
|
||||
m_sdbSizer1->AddButton( m_sdbSizer1OK );
|
||||
m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );
|
||||
m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
|
||||
m_sdbSizer1->Realize();
|
||||
bSizerLayer->Add( bSizer7, 1, wxEXPAND, 5 );
|
||||
|
||||
bSizerMain->Add( m_sdbSizer1, 0, wxALIGN_RIGHT|wxBOTTOM|wxLEFT|wxRIGHT, 5 );
|
||||
|
||||
bSizerMain->Add( bSizerLayer, 0, wxALL|wxEXPAND, 5 );
|
||||
|
||||
m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
|
||||
bSizerMain->Add( m_staticline, 0, wxALL|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, wxALIGN_RIGHT|wxBOTTOM|wxLEFT|wxRIGHT, 5 );
|
||||
|
||||
|
||||
this->SetSizer( bSizerMain );
|
||||
|
|
@ -152,8 +200,8 @@ DIALOG_DXF_IMPORT_BASE::DIALOG_DXF_IMPORT_BASE( wxWindow* parent, wxWindowID id,
|
|||
// Connect Events
|
||||
m_buttonBrowse->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DXF_IMPORT_BASE::OnBrowseDxfFiles ), NULL, this );
|
||||
m_rbOffsetOption->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_DXF_IMPORT_BASE::OriginOptionOnUpdateUI ), NULL, this );
|
||||
m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DXF_IMPORT_BASE::OnCancelClick ), NULL, this );
|
||||
m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DXF_IMPORT_BASE::OnOKClick ), NULL, this );
|
||||
m_DxfPcbPositionUnits->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_DXF_IMPORT_BASE::onUnitPositionSelection ), NULL, this );
|
||||
m_choiceUnitLineWidth->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_DXF_IMPORT_BASE::onUnitWidthSelection ), NULL, this );
|
||||
}
|
||||
|
||||
DIALOG_DXF_IMPORT_BASE::~DIALOG_DXF_IMPORT_BASE()
|
||||
|
|
@ -161,7 +209,7 @@ DIALOG_DXF_IMPORT_BASE::~DIALOG_DXF_IMPORT_BASE()
|
|||
// Disconnect Events
|
||||
m_buttonBrowse->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DXF_IMPORT_BASE::OnBrowseDxfFiles ), NULL, this );
|
||||
m_rbOffsetOption->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_DXF_IMPORT_BASE::OriginOptionOnUpdateUI ), NULL, this );
|
||||
m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DXF_IMPORT_BASE::OnCancelClick ), NULL, this );
|
||||
m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DXF_IMPORT_BASE::OnOKClick ), NULL, this );
|
||||
m_DxfPcbPositionUnits->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_DXF_IMPORT_BASE::onUnitPositionSelection ), NULL, this );
|
||||
m_choiceUnitLineWidth->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_DXF_IMPORT_BASE::onUnitWidthSelection ), NULL, this );
|
||||
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,5 @@
|
|||
///////////////////////////////////////////////////////////////////////////
|
||||
// C++ code generated with wxFormBuilder (version Aug 4 2017)
|
||||
// C++ code generated with wxFormBuilder (version Jul 2 2017)
|
||||
// http://www.wxformbuilder.org/
|
||||
//
|
||||
// PLEASE DO "NOT" EDIT THIS FILE!
|
||||
|
|
@ -27,8 +27,8 @@ class PCB_LAYER_BOX_SELECTOR;
|
|||
#include <wx/radiobox.h>
|
||||
#include <wx/valtext.h>
|
||||
#include <wx/choice.h>
|
||||
#include <wx/bmpcbox.h>
|
||||
#include <wx/statline.h>
|
||||
#include <wx/bmpcbox.h>
|
||||
#include <wx/dialog.h>
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -43,33 +43,39 @@ class DIALOG_DXF_IMPORT_BASE : public DIALOG_SHIM
|
|||
private:
|
||||
|
||||
protected:
|
||||
wxStaticText* m_staticText37;
|
||||
wxStaticText* m_staticTextFile;
|
||||
wxTextCtrl* m_textCtrlFileName;
|
||||
wxButton* m_buttonBrowse;
|
||||
wxRadioBox* m_rbOffsetOption;
|
||||
wxStaticText* m_staticText4;
|
||||
wxTextCtrl* m_DXFPCBXCoord;
|
||||
wxStaticText* m_staticText5;
|
||||
wxTextCtrl* m_DXFPCBYCoord;
|
||||
wxStaticText* m_staticText3;
|
||||
wxChoice* m_DXFPCBGridUnits;
|
||||
wxStaticText* m_staticText6;
|
||||
wxStaticText* m_staticTextXpos;
|
||||
wxTextCtrl* m_DxfPcbXCoord;
|
||||
wxStaticText* m_staticTextYpos;
|
||||
wxTextCtrl* m_DxfPcbYCoord;
|
||||
wxStaticText* m_staticTextUnits;
|
||||
wxChoice* m_DxfPcbPositionUnits;
|
||||
wxStaticLine* m_staticline2;
|
||||
wxStaticText* m_staticTextPrms;
|
||||
wxStaticText* m_staticTextLineWidth;
|
||||
wxTextCtrl* m_textCtrlLineWidth;
|
||||
wxChoice* m_choiceUnitLineWidth;
|
||||
wxStaticText* m_staticTextBrdlayer;
|
||||
PCB_LAYER_BOX_SELECTOR* m_SelLayerBox;
|
||||
wxStaticLine* m_staticline8;
|
||||
wxStdDialogButtonSizer* m_sdbSizer1;
|
||||
wxButton* m_sdbSizer1OK;
|
||||
wxButton* m_sdbSizer1Cancel;
|
||||
wxStaticLine* m_staticline;
|
||||
wxStdDialogButtonSizer* m_sdbSizer;
|
||||
wxButton* m_sdbSizerOK;
|
||||
wxButton* m_sdbSizerCancel;
|
||||
|
||||
// Virtual event handlers, overide them in your derived class
|
||||
virtual void OnBrowseDxfFiles( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void OriginOptionOnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
|
||||
virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void OnOKClick( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void onUnitPositionSelection( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void onUnitWidthSelection( wxCommandEvent& event ) { event.Skip(); }
|
||||
|
||||
|
||||
public:
|
||||
|
||||
DIALOG_DXF_IMPORT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Import DXF File"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 455,297 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
|
||||
DIALOG_DXF_IMPORT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Import DXF File"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 475,388 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
|
||||
~DIALOG_DXF_IMPORT_BASE();
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -56,13 +56,12 @@
|
|||
|
||||
DXF2BRD_CONVERTER::DXF2BRD_CONVERTER() : DRW_Interface()
|
||||
{
|
||||
m_xOffset = 0.0; // X coord offset for conversion (in mm)
|
||||
m_yOffset = 0.0; // Y coord offset for conversion (in mm)
|
||||
m_DXF2mm = 1.0; // The scale factor to convert DXF units to mm
|
||||
m_version = 0;
|
||||
m_defaultThickness = 0.1;
|
||||
m_brdLayer = Dwgs_User;
|
||||
m_useModuleItems = true;
|
||||
m_xOffset = 0.0; // X coord offset for conversion (in mm)
|
||||
m_yOffset = 0.0; // Y coord offset for conversion (in mm)
|
||||
m_DXF2mm = 1.0; // The scale factor to convert DXF units to mm
|
||||
m_version = 0; // the dxf version, not yet used
|
||||
m_brdLayer = Dwgs_User; // The default import layer
|
||||
m_importAsfootprintGraphicItems = true;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -90,6 +89,15 @@ int DXF2BRD_CONVERTER::mapDim( double aDxfValue )
|
|||
}
|
||||
|
||||
|
||||
int DXF2BRD_CONVERTER::mapWidth( double aDxfWidth )
|
||||
{
|
||||
// mapWidth returns the aDxfValue if aDxfWidth > 0 m_defaultThickness
|
||||
if( aDxfWidth > 0.0 )
|
||||
return Millimeter2iu( aDxfWidth * m_DXF2mm );
|
||||
|
||||
return Millimeter2iu( m_defaultThickness );
|
||||
}
|
||||
|
||||
bool DXF2BRD_CONVERTER::ImportDxfFile( const wxString& aFile )
|
||||
{
|
||||
LOCALE_IO locale;
|
||||
|
|
@ -114,7 +122,7 @@ void DXF2BRD_CONVERTER::addLayer( const DRW_Layer& aData )
|
|||
|
||||
void DXF2BRD_CONVERTER::addLine( const DRW_Line& aData )
|
||||
{
|
||||
DRAWSEGMENT* segm = ( m_useModuleItems ) ?
|
||||
DRAWSEGMENT* segm = ( m_importAsfootprintGraphicItems ) ?
|
||||
static_cast< DRAWSEGMENT* >( new EDGE_MODULE( NULL ) ) : new DRAWSEGMENT;
|
||||
|
||||
segm->SetLayer( ToLAYER_ID( m_brdLayer ) );
|
||||
|
|
@ -122,8 +130,7 @@ void DXF2BRD_CONVERTER::addLine( const DRW_Line& aData )
|
|||
segm->SetStart( start );
|
||||
wxPoint end( mapX( aData.secPoint.x ), mapY( aData.secPoint.y ) );
|
||||
segm->SetEnd( end );
|
||||
segm->SetWidth( mapDim( aData.thickness == 0 ? m_defaultThickness / m_DXF2mm
|
||||
: aData.thickness ) );
|
||||
segm->SetWidth( mapWidth( aData.thickness ) );
|
||||
m_newItemsList.push_back( segm );
|
||||
}
|
||||
|
||||
|
|
@ -139,8 +146,7 @@ void DXF2BRD_CONVERTER::addPolyline(const DRW_Polyline& aData )
|
|||
wxRealPoint seg_start;
|
||||
wxRealPoint poly_start;
|
||||
double bulge = 0.0;
|
||||
int lineWidth = mapDim( aData.thickness == 0 ? m_defaultThickness / m_DXF2mm
|
||||
: aData.thickness );
|
||||
int lineWidth = mapWidth( aData.thickness );
|
||||
|
||||
for( unsigned ii = 0; ii < aData.vertlist.size(); ii++ )
|
||||
{
|
||||
|
|
@ -188,8 +194,7 @@ void DXF2BRD_CONVERTER::addLWPolyline(const DRW_LWPolyline& aData )
|
|||
wxRealPoint seg_start;
|
||||
wxRealPoint poly_start;
|
||||
double bulge = 0.0;
|
||||
int lineWidth = mapDim( aData.thickness == 0 ? m_defaultThickness / m_DXF2mm
|
||||
: aData.thickness );
|
||||
int lineWidth = mapWidth( aData.thickness );
|
||||
|
||||
for( unsigned ii = 0; ii < aData.vertlist.size(); ii++ )
|
||||
{
|
||||
|
|
@ -228,7 +233,7 @@ void DXF2BRD_CONVERTER::addLWPolyline(const DRW_LWPolyline& aData )
|
|||
|
||||
void DXF2BRD_CONVERTER::addCircle( const DRW_Circle& aData )
|
||||
{
|
||||
DRAWSEGMENT* segm = ( m_useModuleItems ) ?
|
||||
DRAWSEGMENT* segm = ( m_importAsfootprintGraphicItems ) ?
|
||||
static_cast< DRAWSEGMENT* >( new EDGE_MODULE( NULL ) ) : new DRAWSEGMENT;
|
||||
|
||||
segm->SetLayer( ToLAYER_ID( m_brdLayer ) );
|
||||
|
|
@ -237,8 +242,7 @@ void DXF2BRD_CONVERTER::addCircle( const DRW_Circle& aData )
|
|||
segm->SetCenter( center );
|
||||
wxPoint circle_start( mapX( aData.basePoint.x + aData.radious ), mapY( aData.basePoint.y ) );
|
||||
segm->SetArcStart( circle_start );
|
||||
segm->SetWidth( mapDim( aData.thickness == 0 ? m_defaultThickness / m_DXF2mm
|
||||
: aData.thickness ) );
|
||||
segm->SetWidth( mapWidth( aData.thickness ) );
|
||||
m_newItemsList.push_back( segm );
|
||||
}
|
||||
|
||||
|
|
@ -248,7 +252,7 @@ void DXF2BRD_CONVERTER::addCircle( const DRW_Circle& aData )
|
|||
*/
|
||||
void DXF2BRD_CONVERTER::addArc( const DRW_Arc& data )
|
||||
{
|
||||
DRAWSEGMENT* segm = ( m_useModuleItems ) ?
|
||||
DRAWSEGMENT* segm = ( m_importAsfootprintGraphicItems ) ?
|
||||
static_cast< DRAWSEGMENT* >( new EDGE_MODULE( NULL ) ) : new DRAWSEGMENT;
|
||||
|
||||
segm->SetLayer( ToLAYER_ID( m_brdLayer ) );
|
||||
|
|
@ -277,8 +281,7 @@ void DXF2BRD_CONVERTER::addArc( const DRW_Arc& data )
|
|||
|
||||
segm->SetAngle( angle );
|
||||
|
||||
segm->SetWidth( mapDim( data.thickness == 0 ? m_defaultThickness / m_DXF2mm
|
||||
: data.thickness ) );
|
||||
segm->SetWidth( mapWidth( data.thickness ) );
|
||||
m_newItemsList.push_back( segm );
|
||||
}
|
||||
|
||||
|
|
@ -288,7 +291,7 @@ void DXF2BRD_CONVERTER::addText( const DRW_Text& aData )
|
|||
BOARD_ITEM* brdItem;
|
||||
EDA_TEXT* textItem;
|
||||
|
||||
if( m_useModuleItems )
|
||||
if( m_importAsfootprintGraphicItems )
|
||||
{
|
||||
TEXTE_MODULE* modText = new TEXTE_MODULE( NULL );
|
||||
brdItem = static_cast< BOARD_ITEM* >( modText );
|
||||
|
|
@ -388,8 +391,7 @@ void DXF2BRD_CONVERTER::addText( const DRW_Text& aData )
|
|||
// The 0.8 factor gives a better height/width ratio with our font
|
||||
textItem->SetTextWidth( mapDim( aData.height * 0.8 ) );
|
||||
textItem->SetTextHeight( mapDim( aData.height ) );
|
||||
textItem->SetThickness( mapDim( aData.thickness == 0 ? m_defaultThickness / m_DXF2mm
|
||||
: aData.thickness ) );
|
||||
textItem->SetThickness( mapWidth( aData.thickness ) );
|
||||
textItem->SetText( text );
|
||||
|
||||
m_newItemsList.push_back( static_cast< BOARD_ITEM* >( brdItem ) );
|
||||
|
|
@ -429,7 +431,7 @@ void DXF2BRD_CONVERTER::addMText( const DRW_MText& aData )
|
|||
BOARD_ITEM* brdItem;
|
||||
EDA_TEXT* textItem;
|
||||
|
||||
if( m_useModuleItems )
|
||||
if( m_importAsfootprintGraphicItems )
|
||||
{
|
||||
TEXTE_MODULE* modText = new TEXTE_MODULE( NULL );
|
||||
brdItem = static_cast< BOARD_ITEM* >( modText );
|
||||
|
|
@ -451,8 +453,7 @@ void DXF2BRD_CONVERTER::addMText( const DRW_MText& aData )
|
|||
// The 0.8 factor gives a better height/width ratio with our font
|
||||
textItem->SetTextWidth( mapDim( aData.height * 0.8 ) );
|
||||
textItem->SetTextHeight( mapDim( aData.height ) );
|
||||
textItem->SetThickness( mapDim( aData.thickness == 0 ? m_defaultThickness / m_DXF2mm
|
||||
: aData.thickness ) );
|
||||
textItem->SetThickness( mapWidth( aData.thickness ) );
|
||||
textItem->SetText( text );
|
||||
|
||||
// Initialize text justifications:
|
||||
|
|
@ -730,7 +731,7 @@ void DXF2BRD_CONVERTER::addTextStyle( const DRW_Textstyle& aData )
|
|||
void DXF2BRD_CONVERTER::insertLine( const wxRealPoint& aSegStart,
|
||||
const wxRealPoint& aSegEnd, int aWidth )
|
||||
{
|
||||
DRAWSEGMENT* segm = ( m_useModuleItems ) ?
|
||||
DRAWSEGMENT* segm = ( m_importAsfootprintGraphicItems ) ?
|
||||
static_cast< DRAWSEGMENT* >( new EDGE_MODULE( NULL ) ) : new DRAWSEGMENT;
|
||||
wxPoint segment_startpoint( Millimeter2iu( aSegStart.x ), Millimeter2iu( aSegStart.y ) );
|
||||
wxPoint segment_endpoint( Millimeter2iu( aSegEnd.x ), Millimeter2iu( aSegEnd.y ) );
|
||||
|
|
@ -748,7 +749,7 @@ void DXF2BRD_CONVERTER::insertLine( const wxRealPoint& aSegStart,
|
|||
void DXF2BRD_CONVERTER::insertArc( const wxRealPoint& aSegStart, const wxRealPoint& aSegEnd,
|
||||
double aBulge, int aWidth )
|
||||
{
|
||||
DRAWSEGMENT* segm = ( m_useModuleItems ) ?
|
||||
DRAWSEGMENT* segm = ( m_importAsfootprintGraphicItems ) ?
|
||||
static_cast< DRAWSEGMENT* >( new EDGE_MODULE( NULL ) ) : new DRAWSEGMENT;
|
||||
|
||||
wxPoint segment_startpoint( Millimeter2iu( aSegStart.x ), Millimeter2iu( aSegStart.y ) );
|
||||
|
|
|
|||
|
|
@ -42,25 +42,45 @@ class BOARD_ITEM;
|
|||
class DXF2BRD_CONVERTER : public DRW_Interface
|
||||
{
|
||||
private:
|
||||
std::list<BOARD_ITEM*> m_newItemsList; // The list of new items added to the board
|
||||
double m_xOffset; // X coord offset for conversion (in mm)
|
||||
double m_yOffset; // Y coord offset for conversion (in mm)
|
||||
std::list<BOARD_ITEM*> m_newItemsList; // The list of new items added to the board
|
||||
double m_xOffset; // X coord offset for conversion (in mm)
|
||||
double m_yOffset; // Y coord offset for conversion (in mm)
|
||||
double m_defaultThickness; // default line thickness for conversion (in mm)
|
||||
double m_DXF2mm; // The scale factor to convert DXF units to mm
|
||||
int m_brdLayer; // The board layer to place imported DXF items
|
||||
int m_version; // the dxf version, not used here
|
||||
std::string m_codePage; // The code page, not used here
|
||||
bool m_useModuleItems; // Use module items instead of board items when true.
|
||||
double m_DXF2mm; // The scale factor to convert DXF units to mm
|
||||
int m_brdLayer; // The board layer to place imported DXF items
|
||||
int m_version; // the dxf version, not used here
|
||||
std::string m_codePage; // The code page, not used here
|
||||
bool m_importAsfootprintGraphicItems; // Use module items instead of board items when true.
|
||||
// true when the items are imported in the footprint editor
|
||||
|
||||
public:
|
||||
DXF2BRD_CONVERTER();
|
||||
~DXF2BRD_CONVERTER();
|
||||
|
||||
bool IsUsingModuleItems() const { return m_useModuleItems; }
|
||||
void UseModuleItems( bool aUseModuleItems = true ) { m_useModuleItems = aUseModuleItems; }
|
||||
/**
|
||||
* Allows the import DXF items converted to board graphic items or footprint
|
||||
* graphic items.
|
||||
* @param aImportAsFootprintGraphic = true to import in a footprint, false to import on a board
|
||||
*/
|
||||
void ImportAsFootprintGraphic( bool aImportAsFootprintGraphic )
|
||||
{
|
||||
m_importAsfootprintGraphicItems = aImportAsFootprintGraphic;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set the coordinate offset between the importede dxf items
|
||||
* Set the default line width when importing dxf items like lines to Pcbnew.
|
||||
* because dxf files have no line width explicit parameter, it will be most
|
||||
* of time the line width of imported lines
|
||||
* @param aWidth = line width in mm
|
||||
*/
|
||||
void SetDefaultLineWidthMM( double aWidth )
|
||||
{
|
||||
m_defaultThickness = aWidth;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the coordinate offset between the imported dxf items
|
||||
* and Pcbnew.
|
||||
* because dxf files have the Y axis from bottom to top;
|
||||
* aOffsetX = 0, and aOffsetY = - vertical page size to import a full page
|
||||
|
|
@ -100,6 +120,9 @@ private:
|
|||
int mapX( double aDxfCoordX );
|
||||
int mapY( double aDxfCoordY );
|
||||
int mapDim( double aDxfValue );
|
||||
// mapWidth returns ( in internal units) the aDxfValue if aDxfWidth > 0
|
||||
// or m_defaultThickness
|
||||
int mapWidth( double aDxfWidth );
|
||||
|
||||
// Functions to aid in the creation of a LWPolyline
|
||||
void insertLine( const wxRealPoint& aSegStart, const wxRealPoint& aSegEnd, int aWidth );
|
||||
|
|
|
|||
Loading…
Reference in New Issue