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

GenCAD exporter fixes 

Fixes: lp:1461147
* https://bugs.launchpad.net/kicad/+bug/1461147
This commit is contained in:
Maciej Suminski 2017-10-24 23:11:17 +02:00
parent cffe1b51e2 bbe947e0f8
commit 43c00ead16
7 changed files with 801 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/CMakeLists.txt
View File

@ -252,6 +252,7 @@ set( COMMON_SRCS
filter_reader.cpp filter_reader.cpp
footprint_info.cpp footprint_info.cpp
footprint_filter.cpp footprint_filter.cpp
hash_eda.cpp
lib_id.cpp lib_id.cpp
lib_table_keywords.cpp lib_table_keywords.cpp
# findkicadhelppath.cpp.notused deprecated, use searchhelpfilefullpath.cpp # findkicadhelppath.cpp.notused deprecated, use searchhelpfilefullpath.cpp

188
common/hash_eda.cpp Normal file
View File

@ -0,0 +1,188 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2017 CERN
* @author Maciej Suminski <maciej.suminski@cern.ch>
*
* 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
*/
#include <hash_eda.h>
#include <class_module.h>
#include <class_text_mod.h>
#include <class_edge_mod.h>
#include <class_pad.h>
#include <functional>
using namespace std;
// Common calculation part for all BOARD_ITEMs
static inline size_t hash_board_item( const BOARD_ITEM* aItem, int aFlags )
{
size_t ret = 0;
if( aFlags & LAYER )
ret ^= hash<unsigned long long>{}( aItem->GetLayerSet().to_ullong() );
return ret;
}
size_t hash_eda( const EDA_ITEM* aItem, int aFlags )
{
size_t ret = 0xa82de1c0;
switch( aItem->Type() )
{
case PCB_MODULE_T:
{
const MODULE* module = static_cast<const MODULE*>( aItem );
ret ^= hash_board_item( module, aFlags );
if( aFlags & POSITION )
{
ret ^= hash<int>{}( module->GetPosition().x );
ret ^= hash<int>{}( module->GetPosition().y );
}
if( aFlags & ROTATION )
ret ^= hash<double>{}( module->GetOrientation() );
for( const BOARD_ITEM* i = module->GraphicalItemsList(); i; i = i->Next() )
ret ^= hash_eda( i, aFlags );
for( const D_PAD* i = module->PadsList(); i; i = i->Next() )
ret ^= hash_eda( i, aFlags );
}
break;
case PCB_PAD_T:
{
const D_PAD* pad = static_cast<const D_PAD*>( aItem );
ret ^= hash_board_item( pad, aFlags );
ret ^= hash<int>{}( pad->GetShape() << 16 );
ret ^= hash<int>{}( pad->GetDrillShape() << 18 );
ret ^= hash<int>{}( pad->GetSize().x << 8 );
ret ^= hash<int>{}( pad->GetSize().y << 9 );
ret ^= hash<int>{}( pad->GetOffset().x << 6 );
ret ^= hash<int>{}( pad->GetOffset().y << 7 );
ret ^= hash<int>{}( pad->GetDelta().x << 4 );
ret ^= hash<int>{}( pad->GetDelta().y << 5 );
if( aFlags & POSITION )
{
if( aFlags & REL_COORD )
{
ret ^= hash<int>{}( pad->GetPos0().x );
ret ^= hash<int>{}( pad->GetPos0().y );
}
else
{
ret ^= hash<int>{}( pad->GetPosition().x );
ret ^= hash<int>{}( pad->GetPosition().y );
}
}
if( aFlags & ROTATION )
ret ^= hash<double>{}( pad->GetOrientation() );
if( aFlags & NET )
ret ^= hash<int>{}( pad->GetNetCode() << 6 );
}
break;
case PCB_MODULE_TEXT_T:
{
const TEXTE_MODULE* text = static_cast<const TEXTE_MODULE*>( aItem );
if( !( aFlags & REFERENCE ) && text->GetType() == TEXTE_MODULE::TEXT_is_REFERENCE )
break;
if( !( aFlags & VALUE ) && text->GetType() == TEXTE_MODULE::TEXT_is_VALUE )
break;
ret ^= hash_board_item( text, aFlags );
ret ^= hash<string>{}( text->GetText().ToStdString() );
ret ^= hash<bool>{}( text->IsItalic() );
ret ^= hash<bool>{}( text->IsBold() );
ret ^= hash<bool>{}( text->IsMirrored() );
ret ^= hash<int>{}( text->GetTextWidth() );
ret ^= hash<int>{}( text->GetTextHeight() );
ret ^= hash<int>{}( text->GetHorizJustify() );
ret ^= hash<int>{}( text->GetVertJustify() );
if( aFlags & POSITION )
{
if( aFlags & REL_COORD )
{
ret ^= hash<int>{}( text->GetPos0().x );
ret ^= hash<int>{}( text->GetPos0().y );
}
else
{
ret ^= hash<int>{}( text->GetPosition().x );
ret ^= hash<int>{}( text->GetPosition().y );
}
}
if( aFlags & ROTATION )
ret ^= hash<double>{}( text->GetTextAngle() );
}
break;
case PCB_MODULE_EDGE_T:
{
const EDGE_MODULE* segment = static_cast<const EDGE_MODULE*>( aItem );
ret ^= hash_board_item( segment, aFlags );
ret ^= hash<int>{}( segment->GetType() );
ret ^= hash<int>{}( segment->GetShape() );
ret ^= hash<int>{}( segment->GetWidth() );
ret ^= hash<int>{}( segment->GetRadius() );
if( aFlags & POSITION )
{
if( aFlags & REL_COORD )
{
ret ^= hash<int>{}( segment->GetStart0().x );
ret ^= hash<int>{}( segment->GetStart0().y );
ret ^= hash<int>{}( segment->GetEnd0().x );
ret ^= hash<int>{}( segment->GetEnd0().y );
}
else
{
ret ^= hash<int>{}( segment->GetStart().x );
ret ^= hash<int>{}( segment->GetStart().y );
ret ^= hash<int>{}( segment->GetEnd().x );
ret ^= hash<int>{}( segment->GetEnd().y );
}
}
if( aFlags & ROTATION )
ret ^= hash<double>{}( segment->GetAngle() );
}
break;
default:
wxASSERT_MSG( false, "Unhandled type in function hashModItem() (exporter_gencad.cpp)" );
}
return ret;
}

54
include/hash_eda.h Normal file
View File

@ -0,0 +1,54 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2017 CERN
* @author Maciej Suminski <maciej.suminski@cern.ch>
*
* 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
*/
/**
* @brief Hashing functions for EDA_ITEMs.
*/
#include <cstdlib>
class EDA_ITEM;
///> Enables/disables properties that will be used for calculating the hash.
///> The properties might be combined using the bitwise 'or' operator.
enum HASH_FLAGS
{
POSITION = 0x01,
///> use coordinates relative to the parent object
REL_COORD = 0x02,
ROTATION = 0x04,
LAYER = 0x08,
NET = 0x10,
REFERENCE = 0x20,
VALUE = 0x40,
ALL = 0xff
};
/*
* Calculates hash of an EDA_ITEM.
* @param aItem is the item for which the hash will be computed.
* @return Hash value.
*/
std::size_t hash_eda( const EDA_ITEM* aItem, int aFlags = HASH_FLAGS::ALL );

1
pcbnew/CMakeLists.txt
View File

@ -89,6 +89,7 @@ set( PCBNEW_DIALOGS
dialogs/dialog_fp_plugin_options.cpp dialogs/dialog_fp_plugin_options.cpp
dialogs/dialog_freeroute_exchange.cpp dialogs/dialog_freeroute_exchange.cpp
dialogs/dialog_freeroute_exchange_base.cpp dialogs/dialog_freeroute_exchange_base.cpp
dialogs/dialog_gencad_export_options.cpp
dialogs/dialog_gendrill.cpp dialogs/dialog_gendrill.cpp
dialogs/dialog_gendrill_base.cpp dialogs/dialog_gendrill_base.cpp
dialogs/dialog_gen_module_position_file_base.cpp dialogs/dialog_gen_module_position_file_base.cpp

156
pcbnew/dialogs/dialog_gencad_export_options.cpp Normal file
View File

@ -0,0 +1,156 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2017 CERN
* @author Maciej Suminski <maciej.suminski@cern.ch>
*
* 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
*/
#include "dialog_gencad_export_options.h"
#include <wxPcbStruct.h>
#include <class_board.h>
#include <project.h>
#include <confirm.h>
#include <wx/statline.h>
#include <wx/button.h>
DIALOG_GENCAD_EXPORT_OPTIONS::DIALOG_GENCAD_EXPORT_OPTIONS( PCB_EDIT_FRAME* aParent )
: DIALOG_SHIM( aParent, wxID_ANY, _( "Export to GenCAD settings" ) )
{
// Obtain a potential filename for the exported file
wxFileName fn = aParent->GetBoard()->GetFileName();
fn.SetExt( "cad" );
// Create widgets
SetSizeHints( wxSize( 500, 200 ), wxDefaultSize );
wxBoxSizer* m_mainSizer= new wxBoxSizer( wxVERTICAL );
wxBoxSizer* m_fileSizer = new wxBoxSizer( wxHORIZONTAL );
m_filePath = new wxTextCtrl( this, wxID_ANY, fn.GetFullPath() );
m_fileSizer->Add( m_filePath, 1, wxALL, 5 );
wxButton* m_browseBtn = new wxButton( this, wxID_ANY, _( "Browse" ) );
m_browseBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED,
wxCommandEventHandler( DIALOG_GENCAD_EXPORT_OPTIONS::onBrowse ), NULL, this );
m_fileSizer->Add( m_browseBtn, 0, wxALL, 5 );
m_mainSizer->Add( m_fileSizer, 0, wxEXPAND, 5 );
m_optsSizer = new wxGridSizer( 0, 1, 0, 0 );
createOptCheckboxes();
m_mainSizer->Add( m_optsSizer, 1, wxEXPAND, 5 );
wxSizer* stdButtons = CreateSeparatedButtonSizer( wxOK | wxCANCEL );
m_mainSizer->Add( stdButtons, 0, wxEXPAND, 5 );
SetSizer( m_mainSizer );
Layout();
m_mainSizer->Fit( this );
Centre( wxBOTH );
}
DIALOG_GENCAD_EXPORT_OPTIONS::~DIALOG_GENCAD_EXPORT_OPTIONS()
{
}
bool DIALOG_GENCAD_EXPORT_OPTIONS::GetOption( GENCAD_EXPORT_OPT aOption ) const
{
auto it = m_options.find( aOption );
if( it == m_options.end() )
{
wxASSERT_MSG( false, "Missing checkbox for an option" );
return false;
}
return it->second->IsChecked();
}
std::map<GENCAD_EXPORT_OPT, bool> DIALOG_GENCAD_EXPORT_OPTIONS::GetAllOptions() const
{
std::map<GENCAD_EXPORT_OPT, bool> retVal;
for( const auto& option : m_options )
retVal[option.first] = option.second->IsChecked();
return retVal;
}
wxString DIALOG_GENCAD_EXPORT_OPTIONS::GetFileName() const
{
return m_filePath->GetValue();
}
bool DIALOG_GENCAD_EXPORT_OPTIONS::TransferDataFromWindow()
{
if( !wxDialog::TransferDataFromWindow() )
return false;
wxString fn = GetFileName();
if( wxFile::Exists( fn ) )
return IsOK( this, wxString::Format( _( "File %s already exists. Overwrite?" ), fn ) );
return true;
}
void DIALOG_GENCAD_EXPORT_OPTIONS::createOptCheckboxes()
{
std::map<GENCAD_EXPORT_OPT, wxString> opts =
{
{ FLIP_BOTTOM_PADS, _( "Flip bottom components padstacks" ) },
{ UNIQUE_PIN_NAMES, _( "Generate unique pin names" ) },
{ INDIVIDUAL_SHAPES, _( "Generate a new shape for each component (do not reuse shapes)" ) }
};
for( const auto& option : opts )
{
wxCheckBox* chkbox = new wxCheckBox( this, wxID_ANY, option.second );
m_options[option.first] = chkbox;
m_optsSizer->Add( chkbox, 0, wxALL, 5 );
}
}
void DIALOG_GENCAD_EXPORT_OPTIONS::onBrowse( wxCommandEvent& aEvent )
{
wxFileDialog dlg( this, _( "Save GenCAD Board File" ),
wxPathOnly( Prj().GetProjectFullName() ),
m_filePath->GetValue(),
_( "GenCAD 1.4 board files (.cad)|*.cad" ),
wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
if( dlg.ShowModal() == wxID_CANCEL )
return;
m_filePath->SetValue( dlg.GetPath() );
}

73
pcbnew/dialogs/dialog_gencad_export_options.h Normal file
View File

@ -0,0 +1,73 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2017 CERN
* @author Maciej Suminski <maciej.suminski@cern.ch>
*
* 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
*/
#ifndef __DIALOG_GENCAD_EXPORT_OPTIONS_H__
#define __DIALOG_GENCAD_EXPORT_OPTIONS_H__
#include <dialog_shim.h>
class PCB_EDIT_FRAME;
class wxTextCtrl;
///> Settings for GenCAD exporter
enum GENCAD_EXPORT_OPT
{
FLIP_BOTTOM_PADS, // flip bottom components padstacks geometry
UNIQUE_PIN_NAMES, // generate unique pin names
INDIVIDUAL_SHAPES // generate a shape for each component
};
class DIALOG_GENCAD_EXPORT_OPTIONS : public DIALOG_SHIM
{
public:
DIALOG_GENCAD_EXPORT_OPTIONS( PCB_EDIT_FRAME* aParent );
~DIALOG_GENCAD_EXPORT_OPTIONS();
///> Checks whether an option has been selected
bool GetOption( GENCAD_EXPORT_OPT aOption ) const;
///> Returns all export settings
std::map<GENCAD_EXPORT_OPT, bool> GetAllOptions() const;
///> Returns the selected file path
wxString GetFileName() const;
protected:
bool TransferDataFromWindow() override;
///> Creates checkboxes for GenCAD export options
void createOptCheckboxes();
///> Browse output file event handler
void onBrowse( wxCommandEvent& aEvent );
std::map<GENCAD_EXPORT_OPT, wxCheckBox*> m_options;
// Widgets
wxGridSizer* m_optsSizer;
wxTextCtrl* m_filePath;
};
#endif //__DIALOG_GENCAD_EXPORT_OPTIONS_H__

508
pcbnew/exporters/export_gencad.cpp
View File

@ -40,12 +40,14 @@
#include <macros.h> #include <macros.h>
#include <pcbnew.h> #include <pcbnew.h>
#include <dialogs/dialog_gencad_export_options.h>
#include <class_board.h> #include <class_board.h>
#include <class_module.h> #include <class_module.h>
#include <class_track.h> #include <class_track.h>
#include <class_edge_mod.h> #include <class_edge_mod.h>
#include <hash_eda.h>
static bool CreateHeaderInfoData( FILE* aFile, PCB_EDIT_FRAME* frame ); static bool CreateHeaderInfoData( FILE* aFile, PCB_EDIT_FRAME* frame );
static void CreateArtworksSection( FILE* aFile ); static void CreateArtworksSection( FILE* aFile );
@ -57,7 +59,7 @@ static void CreateRoutesSection( FILE* aFile, BOARD* aPcb );
static void CreateSignalsSection( FILE* aFile, BOARD* aPcb ); static void CreateSignalsSection( FILE* aFile, BOARD* aPcb );
static void CreateShapesSection( FILE* aFile, BOARD* aPcb ); static void CreateShapesSection( FILE* aFile, BOARD* aPcb );
static void CreatePadsShapesSection( FILE* aFile, BOARD* aPcb ); static void CreatePadsShapesSection( FILE* aFile, BOARD* aPcb );
static void FootprintWriteShape( FILE* File, MODULE* module ); static void FootprintWriteShape( FILE* File, MODULE* module, const wxString& aShapeName );
// layer names for Gencad export // layer names for Gencad export
@ -205,6 +207,13 @@ static std::string GenCADLayerNameFlipped( int aCuCount, PCB_LAYER_ID aId )
}; };
static wxString escapeString( const wxString& aString )
{
wxString copy( aString );
copy.Replace( "\"", "\\\"" );
return copy;
}
#endif #endif
static std::string fmt_mask( LSET aSet ) static std::string fmt_mask( LSET aSet )
@ -216,14 +225,37 @@ static std::string fmt_mask( LSET aSet )
#endif #endif
} }
// Export options
static bool flipBottomPads;
static bool uniquePins;
static bool individualShapes;
// These are the export origin (the auxiliary axis) // These are the export origin (the auxiliary axis)
static int GencadOffsetX, GencadOffsetY; static int GencadOffsetX, GencadOffsetY;
// Association between shape names (using shapeName index) and components
static std::map<MODULE*, int> componentShapes;
static std::map<int, wxString> shapeNames;
static const wxString& getShapeName( MODULE* aModule )
{
static const wxString invalid( "invalid" );
if( individualShapes )
return aModule->GetReference();
auto itShape = componentShapes.find( aModule );
wxCHECK( itShape != componentShapes.end(), invalid );
auto itName = shapeNames.find( itShape->second );
wxCHECK( itName != shapeNames.end(), invalid );
return itName->second;
}
// GerbTool chokes on units different than INCH so this is the conversion factor // GerbTool chokes on units different than INCH so this is the conversion factor
const static double SCALE_FACTOR = 1000.0 * IU_PER_MILS; const static double SCALE_FACTOR = 1000.0 * IU_PER_MILS;
/* Two helper functions to calculate coordinates of modules in gencad values /* Two helper functions to calculate coordinates of modules in gencad values
* (GenCAD Y axis from bottom to top) * (GenCAD Y axis from bottom to top)
*/ */
@ -242,31 +274,25 @@ static double MapYTo( int aY )
/* Driver function: processing starts here */ /* Driver function: processing starts here */
void PCB_EDIT_FRAME::ExportToGenCAD( wxCommandEvent& aEvent ) void PCB_EDIT_FRAME::ExportToGenCAD( wxCommandEvent& aEvent )
{ {
wxFileName fn = GetBoard()->GetFileName(); DIALOG_GENCAD_EXPORT_OPTIONS optionsDialog( this );
FILE* file;
wxString ext = wxT( "cad" ); if( optionsDialog.ShowModal() == wxID_CANCEL )
wxString wildcard = _( "GenCAD 1.4 board files (.cad)|*.cad" );
fn.SetExt( ext );
wxString pro_dir = wxPathOnly( Prj().GetProjectFullName() );
wxFileDialog dlg( this, _( "Save GenCAD Board File" ), pro_dir,
fn.GetFullName(), wildcard,
wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
if( dlg.ShowModal() == wxID_CANCEL )
return; return;
if( ( file = wxFopen( dlg.GetPath(), wxT( "wt" ) ) ) == NULL ) FILE* file = wxFopen( optionsDialog.GetFileName(), "wt" );
{
wxString msg;
msg.Printf( _( "Unable to create <%s>" ), GetChars( dlg.GetPath() ) ); if( !file )
DisplayError( this, msg ); return; {
DisplayError( this, wxString::Format( _( "Unable to create <%s>" ),
GetChars( optionsDialog.GetFileName() ) ) );
return;
} }
// Get options
flipBottomPads = optionsDialog.GetOption( FLIP_BOTTOM_PADS );
uniquePins = optionsDialog.GetOption( UNIQUE_PIN_NAMES );
individualShapes = optionsDialog.GetOption( INDIVIDUAL_SHAPES );
// Switch the locale to standard C (needed to print floating point numbers) // Switch the locale to standard C (needed to print floating point numbers)
LOCALE_IO toggle; LOCALE_IO toggle;
@ -333,6 +359,9 @@ void PCB_EDIT_FRAME::ExportToGenCAD( wxCommandEvent& aEvent )
module->SetFlag( 0 ); module->SetFlag( 0 );
} }
} }
componentShapes.clear();
shapeNames.clear();
} }
@ -422,7 +451,7 @@ static void CreatePadsShapesSection( FILE* aFile, BOARD* aPcb )
viastacks.push_back( via ); viastacks.push_back( via );
fprintf( aFile, "PAD V%d.%d.%s ROUND %g\nCIRCLE 0 0 %g\n", fprintf( aFile, "PAD V%d.%d.%s ROUND %g\nCIRCLE 0 0 %g\n",
via->GetWidth(), via->GetDrillValue(), via->GetWidth(), via->GetDrillValue(),
fmt_mask( via->GetLayerSet() ).c_str(), fmt_mask( via->GetLayerSet() & master_layermask ).c_str(),
via->GetDrillValue() / SCALE_FACTOR, via->GetDrillValue() / SCALE_FACTOR,
via->GetWidth() / (SCALE_FACTOR * 2) ); via->GetWidth() / (SCALE_FACTOR * 2) );
} }
@ -434,6 +463,7 @@ static void CreatePadsShapesSection( FILE* aFile, BOARD* aPcb )
for( unsigned i = 0; i<pads.size(); ++i ) for( unsigned i = 0; i<pads.size(); ++i )
{ {
D_PAD* pad = pads[i]; D_PAD* pad = pads[i];
const wxPoint& off = pad->GetOffset();
pad->SetSubRatsnest( pad_name_number ); pad->SetSubRatsnest( pad_name_number );
@ -454,13 +484,16 @@ static void CreatePadsShapesSection( FILE* aFile, BOARD* aPcb )
switch( pad->GetShape() ) switch( pad->GetShape() )
{ {
default: default:
wxASSERT_MSG( false, "Pad type not implemented" );
// fall-through
case PAD_SHAPE_CIRCLE: case PAD_SHAPE_CIRCLE:
fprintf( aFile, " ROUND %g\n", fprintf( aFile, " ROUND %g\n",
pad->GetDrillSize().x / SCALE_FACTOR ); pad->GetDrillSize().x / SCALE_FACTOR );
/* Circle is center, radius */ /* Circle is center, radius */
fprintf( aFile, "CIRCLE %g %g %g\n", fprintf( aFile, "CIRCLE %g %g %g\n",
pad->GetOffset().x / SCALE_FACTOR, off.x / SCALE_FACTOR,
-pad->GetOffset().y / SCALE_FACTOR, -off.y / SCALE_FACTOR,
pad->GetSize().x / (SCALE_FACTOR * 2) ); pad->GetSize().x / (SCALE_FACTOR * 2) );
break; break;
@ -470,87 +503,140 @@ static void CreatePadsShapesSection( FILE* aFile, BOARD* aPcb )
// Rectangle is begin, size *not* begin, end! // Rectangle is begin, size *not* begin, end!
fprintf( aFile, "RECTANGLE %g %g %g %g\n", fprintf( aFile, "RECTANGLE %g %g %g %g\n",
(-dx + pad->GetOffset().x ) / SCALE_FACTOR, (-dx + off.x ) / SCALE_FACTOR,
(-dy - pad->GetOffset().y ) / SCALE_FACTOR, (-dy - off.y ) / SCALE_FACTOR,
dx / (SCALE_FACTOR / 2), dy / (SCALE_FACTOR / 2) ); dx / (SCALE_FACTOR / 2), dy / (SCALE_FACTOR / 2) );
break; break;
case PAD_SHAPE_OVAL: // Create outline by 2 lines and 2 arcs case PAD_SHAPE_ROUNDRECT:
case PAD_SHAPE_OVAL:
{ {
// OrCAD Layout call them OVAL or OBLONG - GenCAD call them FINGERs const wxSize& size = pad->GetSize();
fprintf( aFile, " FINGER %g\n", int radius;
pad->GetDrillSize().x / SCALE_FACTOR );
int dr = dx - dy;
if( dr >= 0 ) // Horizontal oval if( pad->GetShape() == PAD_SHAPE_ROUNDRECT )
radius = pad->GetRoundRectCornerRadius();
else
radius = std::min( size.x, size.y ) / 2;
int lineX = size.x / 2 - radius;
int lineY = size.y / 2 - radius;
fprintf( aFile, " POLYGON %g\n", pad->GetDrillSize().x / SCALE_FACTOR );
// bottom left arc
fprintf( aFile, "ARC %g %g %g %g %g %g\n",
( off.x - lineX - radius ) / SCALE_FACTOR,
( -off.y - lineY ) / SCALE_FACTOR, ( off.x - lineX ) / SCALE_FACTOR,
( -off.y - lineY - radius ) / SCALE_FACTOR,
( off.x - lineX ) / SCALE_FACTOR, ( -off.y - lineY ) / SCALE_FACTOR );
// bottom line
if( lineX > 0 )
{ {
int radius = dy;
fprintf( aFile, "LINE %g %g %g %g\n", fprintf( aFile, "LINE %g %g %g %g\n",
(-dr + pad->GetOffset().x) / SCALE_FACTOR, ( off.x - lineX ) / SCALE_FACTOR,
(-pad->GetOffset().y - radius) / SCALE_FACTOR, ( -off.y - lineY - radius ) / SCALE_FACTOR,
(dr + pad->GetOffset().x ) / SCALE_FACTOR, ( off.x + lineX ) / SCALE_FACTOR,
(-pad->GetOffset().y - radius) / SCALE_FACTOR ); ( -off.y - lineY - radius ) / SCALE_FACTOR );
// GenCAD arcs are (start, end, center)
fprintf( aFile, "ARC %g %g %g %g %g %g\n",
(dr + pad->GetOffset().x) / SCALE_FACTOR,
(-pad->GetOffset().y - radius) / SCALE_FACTOR,
(dr + pad->GetOffset().x) / SCALE_FACTOR,
(-pad->GetOffset().y + radius) / SCALE_FACTOR,
(dr + pad->GetOffset().x) / SCALE_FACTOR,
-pad->GetOffset().y / SCALE_FACTOR );
fprintf( aFile, "LINE %g %g %g %g\n",
(dr + pad->GetOffset().x) / SCALE_FACTOR,
(-pad->GetOffset().y + radius) / SCALE_FACTOR,
(-dr + pad->GetOffset().x) / SCALE_FACTOR,
(-pad->GetOffset().y + radius) / SCALE_FACTOR );
fprintf( aFile, "ARC %g %g %g %g %g %g\n",
(-dr + pad->GetOffset().x) / SCALE_FACTOR,
(-pad->GetOffset().y + radius) / SCALE_FACTOR,
(-dr + pad->GetOffset().x) / SCALE_FACTOR,
(-pad->GetOffset().y - radius) / SCALE_FACTOR,
(-dr + pad->GetOffset().x) / SCALE_FACTOR,
-pad->GetOffset().y / SCALE_FACTOR );
} }
else // Vertical oval
{
dr = -dr;
int radius = dx;
fprintf( aFile, "LINE %g %g %g %g\n",
(-radius + pad->GetOffset().x) / SCALE_FACTOR,
(-pad->GetOffset().y - dr) / SCALE_FACTOR,
(-radius + pad->GetOffset().x ) / SCALE_FACTOR,
(-pad->GetOffset().y + dr) / SCALE_FACTOR );
fprintf( aFile, "ARC %g %g %g %g %g %g\n",
(-radius + pad->GetOffset().x ) / SCALE_FACTOR,
(-pad->GetOffset().y + dr) / SCALE_FACTOR,
(radius + pad->GetOffset().x ) / SCALE_FACTOR,
(-pad->GetOffset().y + dr) / SCALE_FACTOR,
pad->GetOffset().x / SCALE_FACTOR,
(-pad->GetOffset().y + dr) / SCALE_FACTOR );
// bottom right arc
fprintf( aFile, "ARC %g %g %g %g %g %g\n",
( off.x + lineX ) / SCALE_FACTOR,
( -off.y - lineY - radius ) / SCALE_FACTOR,
( off.x + lineX + radius ) / SCALE_FACTOR,
( -off.y - lineY ) / SCALE_FACTOR, ( off.x + lineX ) / SCALE_FACTOR,
( -off.y - lineY ) / SCALE_FACTOR );
// right line
if( lineY > 0 )
{
fprintf( aFile, "LINE %g %g %g %g\n", fprintf( aFile, "LINE %g %g %g %g\n",
(radius + pad->GetOffset().x) / SCALE_FACTOR, ( off.x + lineX + radius ) / SCALE_FACTOR,
(-pad->GetOffset().y + dr) / SCALE_FACTOR, ( -off.y + lineY ) / SCALE_FACTOR,
(radius + pad->GetOffset().x) / SCALE_FACTOR, ( off.x + lineX + radius ) / SCALE_FACTOR,
(-pad->GetOffset().y - dr) / SCALE_FACTOR ); ( -off.y - lineY ) / SCALE_FACTOR );
fprintf( aFile, "ARC %g %g %g %g %g %g\n", }
(radius + pad->GetOffset().x) / SCALE_FACTOR,
(-pad->GetOffset().y - dr) / SCALE_FACTOR, // top right arc
(-radius + pad->GetOffset().x) / SCALE_FACTOR, fprintf( aFile, "ARC %g %g %g %g %g %g\n",
(-pad->GetOffset().y - dr) / SCALE_FACTOR, ( off.x + lineX + radius ) / SCALE_FACTOR,
pad->GetOffset().x / SCALE_FACTOR, ( -off.y + lineY ) / SCALE_FACTOR, ( off.x + lineX ) / SCALE_FACTOR,
(-pad->GetOffset().y - dr) / SCALE_FACTOR ); ( -off.y + lineY + radius ) / SCALE_FACTOR,
( off.x + lineX ) / SCALE_FACTOR, ( -off.y + lineY ) / SCALE_FACTOR );
// top line
if( lineX > 0 )
{
fprintf( aFile, "LINE %g %g %g %g\n"
, ( off.x - lineX ) / SCALE_FACTOR,
( -off.y + lineY + radius ) / SCALE_FACTOR,
( off.x + lineX ) / SCALE_FACTOR,
( -off.y + lineY + radius ) / SCALE_FACTOR );
}
// top left arc
fprintf( aFile, "ARC %g %g %g %g %g %g\n",
( off.x - lineX ) / SCALE_FACTOR,
( -off.y + lineY + radius ) / SCALE_FACTOR,
( off.x - lineX - radius ) / SCALE_FACTOR,
( -off.y + lineY ) / SCALE_FACTOR, ( off.x - lineX ) / SCALE_FACTOR,
( -off.y + lineY ) / SCALE_FACTOR );
// left line
if( lineY > 0 )
{
fprintf( aFile, "LINE %g %g %g %g\n",
( off.x - lineX - radius ) / SCALE_FACTOR,
( -off.y - lineY ) / SCALE_FACTOR,
( off.x - lineX - radius ) / SCALE_FACTOR,
( -off.y + lineY ) / SCALE_FACTOR );
} }
} }
break; break;
case PAD_SHAPE_TRAPEZOID: case PAD_SHAPE_TRAPEZOID:
fprintf( aFile, " POLYGON %g\n", {
pad->GetDrillSize().x / SCALE_FACTOR ); fprintf( aFile, " POLYGON %g\n", pad->GetDrillSize().x / SCALE_FACTOR );
// XXX TO BE IMPLEMENTED! and I don't know if it could be actually imported by something wxPoint poly[4];
pad->BuildPadPolygon( poly, wxSize( 0, 0 ), 0 );
for( int cur = 0; cur < 4; ++cur )
{
int next = ( cur + 1 ) % 4;
fprintf( aFile, "LINE %g %g %g %g\n",
( off.x + poly[cur].x ) / SCALE_FACTOR,
( -off.y - poly[cur].y ) / SCALE_FACTOR,
( off.x + poly[next].x ) / SCALE_FACTOR,
( -off.y - poly[next].y ) / SCALE_FACTOR );
}
}
break;
case PAD_SHAPE_CUSTOM:
{
fprintf( aFile, " POLYGON %g\n", pad->GetDrillSize().x / SCALE_FACTOR );
const SHAPE_POLY_SET& outline = pad->GetCustomShapeAsPolygon();
for( int jj = 0; jj < outline.OutlineCount(); ++jj )
{
const SHAPE_LINE_CHAIN& poly = outline.COutline( jj );
int pointCount = poly.PointCount();
for( int ii = 0; ii < pointCount; ii++ )
{
int next = ( ii + 1 ) % pointCount;
fprintf( aFile, "LINE %g %g %g %g\n",
( off.x + poly.CPoint( ii ).x ) / SCALE_FACTOR,
( -off.y - poly.CPoint( ii ).y ) / SCALE_FACTOR,
( off.x + poly.CPoint( next ).x ) / SCALE_FACTOR,
( -off.y - poly.CPoint( next ).y ) / SCALE_FACTOR );
}
}
}
break; break;
} }
} }
@ -585,10 +671,10 @@ static void CreatePadsShapesSection( FILE* aFile, BOARD* aPcb )
} }
/* Component padstacks /* Component padstacks
* CAM350 don't apply correctly the FLIP semantics for padstacks, i.e. doesn't * Older versions of CAM350 don't apply correctly the FLIP semantics for
* swap the top and bottom layers... so I need to define the shape as MIRRORX * padstacks, i.e. doesn't swap the top and bottom layers... so I need to
* and define a separate 'flipped' padstack... until it appears yet another * define the shape as MIRRORX and define a separate 'flipped' padstack...
* noncompliant importer */ * until it appears yet another noncompliant importer */
for( unsigned i = 1; i < padstacks.size(); i++ ) for( unsigned i = 1; i < padstacks.size(); i++ )
{ {
D_PAD* pad = padstacks[i]; D_PAD* pad = padstacks[i];
@ -607,14 +693,17 @@ static void CreatePadsShapesSection( FILE* aFile, BOARD* aPcb )
} }
// Flipped padstack // Flipped padstack
fprintf( aFile, "PADSTACK PAD%uF %g\n", i, pad->GetDrillSize().x / SCALE_FACTOR ); if( flipBottomPads )
// the normal PCB_LAYER_ID sequence is inverted from gc_seq[]
for( LSEQ seq = pad_set.Seq(); seq; ++seq )
{ {
PCB_LAYER_ID layer = *seq; fprintf( aFile, "PADSTACK PAD%uF %g\n", i, pad->GetDrillSize().x / SCALE_FACTOR );
fprintf( aFile, "PAD P%u %s 0 0\n", i, GenCADLayerNameFlipped( cu_count, layer ).c_str() ); // the normal PCB_LAYER_ID sequence is inverted from gc_seq[]
for( LSEQ seq = pad_set.Seq(); seq; ++seq )
{
PCB_LAYER_ID layer = *seq;
fprintf( aFile, "PAD P%u %s 0 0\n", i, GenCADLayerNameFlipped( cu_count, layer ).c_str() );
}
} }
} }
@ -622,6 +711,23 @@ static void CreatePadsShapesSection( FILE* aFile, BOARD* aPcb )
} }
/// Compute hashes for modules without taking into account their position, rotation or layer
static size_t hashModule( const MODULE* aModule )
{
size_t ret = 0x11223344;
constexpr int flags = HASH_FLAGS::POSITION | HASH_FLAGS::REL_COORD
| HASH_FLAGS::ROTATION | HASH_FLAGS::LAYER;
for( const BOARD_ITEM* i = aModule->GraphicalItemsList(); i; i = i->Next() )
ret ^= hash_eda( i, flags );
for( const D_PAD* i = aModule->PadsList(); i; i = i->Next() )
ret ^= hash_eda( i, flags );
return ret;
}
/* Creates the footprint shape list. /* Creates the footprint shape list.
* Since module shape is customizable after the placement we cannot share them; * Since module shape is customizable after the placement we cannot share them;
* instead we opt for the one-module-one-shape-one-component-one-device approach * instead we opt for the one-module-one-shape-one-component-one-device approach
@ -633,46 +739,102 @@ static void CreateShapesSection( FILE* aFile, BOARD* aPcb )
const char* layer; const char* layer;
wxString pinname; wxString pinname;
const char* mirror = "0"; const char* mirror = "0";
std::map<wxString, size_t> shapes;
fputs( "$SHAPES\n", aFile ); fputs( "$SHAPES\n", aFile );
const LSET all_cu = LSET::AllCuMask();
for( module = aPcb->m_Modules; module; module = module->Next() ) for( module = aPcb->m_Modules; module; module = module->Next() )
{ {
FootprintWriteShape( aFile, module ); if( !individualShapes )
{
// Check if such shape has been already generated, and if so - reuse it
// It is necessary to compute hash (i.e. check all children objects) as
// certain components instances might have been modified on the board.
// In such case the shape will be different despite the same LIB_ID.
wxString shapeName = module->GetFPID().Format();
auto shapeIt = shapes.find( shapeName );
size_t modHash = hashModule( module );
if( shapeIt != shapes.end() )
{
if( modHash != shapeIt->second )
{
// there is an entry for this footprint, but it has a modified shape,
// so we need to create a new entry
wxString newShapeName;
int suffix = 0;
// find an unused name or matching entry
do
{
newShapeName = wxString::Format( "%s_%d", shapeName, suffix );
shapeIt = shapes.find( newShapeName );
++suffix;
}
while( shapeIt != shapes.end() && shapeIt->second != modHash );
shapeName = newShapeName;
}
if( shapeIt != shapes.end() && modHash == shapeIt->second )
{
// shape found, so reuse it
componentShapes[module] = modHash;
continue;
}
}
// new shape
componentShapes[module] = modHash;
shapeNames[modHash] = shapeName;
shapes[shapeName] = modHash;
FootprintWriteShape( aFile, module, shapeName );
}
else // individual shape for each component
{
FootprintWriteShape( aFile, module, module->GetReference() );
}
// set of already emitted pins to check for duplicates
std::set<wxString> pins;
for( pad = module->PadsList(); pad; pad = pad->Next() ) for( pad = module->PadsList(); pad; pad = pad->Next() )
{ {
/* Funny thing: GenCAD requires the pad side even if you use /* Padstacks are defined using the correct layers for the pads, therefore to
* padstacks (which are theorically optional but gerbtools * all pads need to be marked as TOP to use the padstack information correctly.
*requires* them). Now the trouble thing is that 'BOTTOM' */
* is interpreted by someone as a padstack flip even layer = "TOP";
* if the spec explicitly says it's not... */
layer = "ALL";
if( ( pad->GetLayerSet() & all_cu ) == LSET( B_Cu ) )
{
layer = module->GetFlag() ? "TOP" : "BOTTOM";
}
else if( ( pad->GetLayerSet() & all_cu ) == LSET( F_Cu ) )
{
layer = module->GetFlag() ? "BOTTOM" : "TOP";
}
pinname = pad->GetName(); pinname = pad->GetName();
if( pinname.IsEmpty() ) if( pinname.IsEmpty() )
pinname = wxT( "none" ); pinname = wxT( "none" );
if( uniquePins )
{
int suffix = 0;
wxString origPinname( pinname );
auto it = pins.find( pinname );
while( it != pins.end() )
{
pinname = wxString::Format( "%s_%d", origPinname, suffix );
++suffix;
it = pins.find( pinname );
}
pins.insert( pinname );
}
double orient = pad->GetOrientation() - module->GetOrientation(); double orient = pad->GetOrientation() - module->GetOrientation();
NORMALIZE_ANGLE_POS( orient ); NORMALIZE_ANGLE_POS( orient );
// Bottom side modules use the flipped padstack // Bottom side modules use the flipped padstack
fprintf( aFile, (module->GetFlag()) ? fprintf( aFile, ( flipBottomPads && module->GetFlag() ) ?
"PIN %s PAD%dF %g %g %s %g %s\n" : "PIN \"%s\" PAD%dF %g %g %s %g %s\n" :
"PIN %s PAD%d %g %g %s %g %s\n", "PIN \"%s\" PAD%d %g %g %s %g %s\n",
TO_UTF8( pinname ), pad->GetSubRatsnest(), TO_UTF8( escapeString( pinname ) ), pad->GetSubRatsnest(),
pad->GetPos0().x / SCALE_FACTOR, pad->GetPos0().x / SCALE_FACTOR,
-pad->GetPos0().y / SCALE_FACTOR, -pad->GetPos0().y / SCALE_FACTOR,
layer, orient / 10.0, mirror ); layer, orient / 10.0, mirror );
@ -702,7 +864,7 @@ static void CreateComponentsSection( FILE* aFile, BOARD* aPcb )
if( module->GetFlag() ) if( module->GetFlag() )
{ {
mirror = "0"; mirror = "MIRRORX";
flip = "FLIP"; flip = "FLIP";
NEGATE_AND_NORMALIZE_ANGLE_POS( fp_orient ); NEGATE_AND_NORMALIZE_ANGLE_POS( fp_orient );
} }
@ -712,20 +874,19 @@ static void CreateComponentsSection( FILE* aFile, BOARD* aPcb )
flip = "0"; flip = "0";
} }
fprintf( aFile, "\nCOMPONENT %s\n", fprintf( aFile, "\nCOMPONENT \"%s\"\n",
TO_UTF8( module->GetReference() ) ); TO_UTF8( escapeString( module->GetReference() ) ) );
fprintf( aFile, "DEVICE %s_%s\n", fprintf( aFile, "DEVICE \"DEV_%s\"\n",
TO_UTF8( module->GetReference() ), TO_UTF8( escapeString( getShapeName( module ) ) ) );
TO_UTF8( module->GetValue() ) );
fprintf( aFile, "PLACE %g %g\n", fprintf( aFile, "PLACE %g %g\n",
MapXTo( module->GetPosition().x ), MapXTo( module->GetPosition().x ),
MapYTo( module->GetPosition().y ) ); MapYTo( module->GetPosition().y ) );
fprintf( aFile, "LAYER %s\n", fprintf( aFile, "LAYER %s\n",
(module->GetFlag()) ? "BOTTOM" : "TOP" ); module->GetFlag() ? "BOTTOM" : "TOP" );
fprintf( aFile, "ROTATION %g\n", fprintf( aFile, "ROTATION %g\n",
fp_orient / 10.0 ); fp_orient / 10.0 );
fprintf( aFile, "SHAPE %s %s %s\n", fprintf( aFile, "SHAPE \"%s\" %s %s\n",
TO_UTF8( module->GetReference() ), TO_UTF8( escapeString( getShapeName( module ) ) ),
mirror, flip ); mirror, flip );
// Text on silk layer: RefDes and value (are they actually useful?) // Text on silk layer: RefDes and value (are they actually useful?)
@ -733,8 +894,8 @@ static void CreateComponentsSection( FILE* aFile, BOARD* aPcb )
for( int ii = 0; ii < 2; ii++ ) for( int ii = 0; ii < 2; ii++ )
{ {
double txt_orient = textmod->GetTextAngle(); double txt_orient = textmod->GetTextAngle();
std::string layer = GenCADLayerName( cu_count, module->GetFlag() ? B_SilkS : F_SilkS ); std::string layer = GenCADLayerName( cu_count, module->GetFlag() ? B_SilkS : F_SilkS );
fprintf( aFile, "TEXT %g %g %g %g %s %s \"%s\"", fprintf( aFile, "TEXT %g %g %g %g %s %s \"%s\"",
textmod->GetPos0().x / SCALE_FACTOR, textmod->GetPos0().x / SCALE_FACTOR,
@ -743,7 +904,7 @@ static void CreateComponentsSection( FILE* aFile, BOARD* aPcb )
txt_orient / 10.0, txt_orient / 10.0,
mirror, mirror,
layer.c_str(), layer.c_str(),
TO_UTF8( textmod->GetText() ) ); TO_UTF8( escapeString( textmod->GetText() ) ) );
// Please note, the width is approx // Please note, the width is approx
fprintf( aFile, " 0 0 %g %g\n", fprintf( aFile, " 0 0 %g %g\n",
@ -787,7 +948,7 @@ static void CreateSignalsSection( FILE* aFile, BOARD* aPcb )
if( net->GetNet() <= 0 ) // dummy netlist (no connection) if( net->GetNet() <= 0 ) // dummy netlist (no connection)
continue; continue;
msg = wxT( "SIGNAL " ) + net->GetNetname(); msg = wxT( "SIGNAL \"" ) + escapeString( net->GetNetname() ) + "\"";
fputs( TO_UTF8( msg ), aFile ); fputs( TO_UTF8( msg ), aFile );
fputs( "\n", aFile ); fputs( "\n", aFile );
@ -799,9 +960,9 @@ static void CreateSignalsSection( FILE* aFile, BOARD* aPcb )
if( pad->GetNetCode() != net->GetNet() ) if( pad->GetNetCode() != net->GetNet() )
continue; continue;
msg.Printf( wxT( "NODE %s %s" ), msg.Printf( wxT( "NODE \"%s\" \"%s\"" ),
GetChars( module->GetReference() ), GetChars( escapeString( module->GetReference() ) ),
GetChars( pad->GetName() ) ); GetChars( escapeString( pad->GetName() ) ) );
fputs( TO_UTF8( msg ), aFile ); fputs( TO_UTF8( msg ), aFile );
fputs( "\n", aFile ); fputs( "\n", aFile );
@ -942,7 +1103,7 @@ static void CreateRoutesSection( FILE* aFile, BOARD* aPcb )
else else
netname = wxT( "_noname_" ); netname = wxT( "_noname_" );
fprintf( aFile, "ROUTE %s\n", TO_UTF8( netname ) ); fprintf( aFile, "ROUTE \"%s\"\n", TO_UTF8( escapeString( netname ) ) );
} }
if( old_width != track->GetWidth() ) if( old_width != track->GetWidth() )
@ -992,15 +1153,22 @@ static void CreateRoutesSection( FILE* aFile, BOARD* aPcb )
*/ */
static void CreateDevicesSection( FILE* aFile, BOARD* aPcb ) static void CreateDevicesSection( FILE* aFile, BOARD* aPcb )
{ {
MODULE* module; std::set<wxString> emitted;
fputs( "$DEVICES\n", aFile ); fputs( "$DEVICES\n", aFile );
for( module = aPcb->m_Modules; module; module = module->Next() ) for( const auto& componentShape : componentShapes )
{ {
fprintf( aFile, "DEVICE \"%s\"\n", TO_UTF8( module->GetReference() ) ); const wxString& shapeName = shapeNames[componentShape.second];
fprintf( aFile, "PART \"%s\"\n", TO_UTF8( module->GetValue() ) ); bool newDevice;
fprintf( aFile, "PACKAGE \"%s\"\n", module->GetFPID().Format().c_str() ); std::tie( std::ignore, newDevice ) = emitted.insert( shapeName );
if( !newDevice ) // do not repeat device definitions
continue;
const MODULE* module = componentShape.first;
fprintf( aFile, "\nDEVICE \"DEV_%s\"\n", TO_UTF8( escapeString( shapeName ) ) );
fprintf( aFile, "PART \"%s\"\n", TO_UTF8( escapeString( module->GetValue() ) ) );
fprintf( aFile, "PACKAGE \"%s\"\n", TO_UTF8( escapeString( module->GetFPID().Format() ) ) );
// The TYPE attribute is almost freeform // The TYPE attribute is almost freeform
const char* ty = "TH"; const char* ty = "TH";
@ -1119,20 +1287,13 @@ static void CreateTracksInfoData( FILE* aFile, BOARD* aPcb )
* It's almost guaranteed that the silk layer will be imported wrong but * It's almost guaranteed that the silk layer will be imported wrong but
* the shape also contains the pads! * the shape also contains the pads!
*/ */
static void FootprintWriteShape( FILE* aFile, MODULE* module ) static void FootprintWriteShape( FILE* aFile, MODULE* module, const wxString& aShapeName )
{ {
EDGE_MODULE* PtEdge; EDGE_MODULE* PtEdge;
EDA_ITEM* PtStruct; EDA_ITEM* PtStruct;
// Control Y axis change sign for flipped modules
int Yaxis_sign = -1;
// Flip for bottom side components
if( module->GetFlag() )
Yaxis_sign = 1;
/* creates header: */ /* creates header: */
fprintf( aFile, "\nSHAPE %s\n", TO_UTF8( module->GetReference() ) ); fprintf( aFile, "\nSHAPE \"%s\"\n", TO_UTF8( escapeString( aShapeName ) ) );
if( module->GetAttributes() & MOD_VIRTUAL ) if( module->GetAttributes() & MOD_VIRTUAL )
{ {
@ -1189,10 +1350,10 @@ static void FootprintWriteShape( FILE* aFile, MODULE* module )
{ {
case S_SEGMENT: case S_SEGMENT:
fprintf( aFile, "LINE %g %g %g %g\n", fprintf( aFile, "LINE %g %g %g %g\n",
(PtEdge->m_Start0.x) / SCALE_FACTOR, PtEdge->m_Start0.x / SCALE_FACTOR,
(Yaxis_sign * PtEdge->m_Start0.y) / SCALE_FACTOR, -PtEdge->m_Start0.y / SCALE_FACTOR,
(PtEdge->m_End0.x) / SCALE_FACTOR, PtEdge->m_End0.x / SCALE_FACTOR,
(Yaxis_sign * PtEdge->m_End0.y ) / SCALE_FACTOR ); -PtEdge->m_End0.y / SCALE_FACTOR );
break; break;
case S_CIRCLE: case S_CIRCLE:
@ -1201,7 +1362,7 @@ static void FootprintWriteShape( FILE* aFile, MODULE* module )
PtEdge->m_Start0 ) ); PtEdge->m_Start0 ) );
fprintf( aFile, "CIRCLE %g %g %g\n", fprintf( aFile, "CIRCLE %g %g %g\n",
PtEdge->m_Start0.x / SCALE_FACTOR, PtEdge->m_Start0.x / SCALE_FACTOR,
Yaxis_sign * PtEdge->m_Start0.y / SCALE_FACTOR, -PtEdge->m_Start0.y / SCALE_FACTOR,
radius / SCALE_FACTOR ); radius / SCALE_FACTOR );
break; break;
} }
@ -1214,27 +1375,14 @@ static void FootprintWriteShape( FILE* aFile, MODULE* module )
RotatePoint( &arcendx, &arcendy, -PtEdge->GetAngle() ); RotatePoint( &arcendx, &arcendy, -PtEdge->GetAngle() );
arcendx += PtEdge->GetStart0().x; arcendx += PtEdge->GetStart0().x;
arcendy += PtEdge->GetStart0().y; arcendy += PtEdge->GetStart0().y;
if( Yaxis_sign == -1 )
{ fprintf( aFile, "ARC %g %g %g %g %g %g\n",
// Flipping Y flips the arc direction too PtEdge->m_End0.x / SCALE_FACTOR,
fprintf( aFile, "ARC %g %g %g %g %g %g\n", -PtEdge->GetEnd0().y / SCALE_FACTOR,
(arcendx) / SCALE_FACTOR, arcendx / SCALE_FACTOR,
(Yaxis_sign * arcendy) / SCALE_FACTOR, -arcendy / SCALE_FACTOR,
(PtEdge->m_End0.x) / SCALE_FACTOR, PtEdge->GetStart0().x / SCALE_FACTOR,
(Yaxis_sign * PtEdge->GetEnd0().y) / SCALE_FACTOR, -PtEdge->GetStart0().y / SCALE_FACTOR );
(PtEdge->GetStart0().x) / SCALE_FACTOR,
(Yaxis_sign * PtEdge->GetStart0().y) / SCALE_FACTOR );
}
else
{
fprintf( aFile, "ARC %g %g %g %g %g %g\n",
(PtEdge->GetEnd0().x) / SCALE_FACTOR,
(Yaxis_sign * PtEdge->GetEnd0().y) / SCALE_FACTOR,
(arcendx) / SCALE_FACTOR,
(Yaxis_sign * arcendy) / SCALE_FACTOR,
(PtEdge->GetStart0().x) / SCALE_FACTOR,
(Yaxis_sign * PtEdge->GetStart0().y) / SCALE_FACTOR );
}
break; break;
} }