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

Fix kicad_plugin.cpp coding style fully broken by commit 4887 (patch from Orson, AKA maciej suminski).

This commit is contained in:
unknown 2014-05-26 08:21:25 +02:00 committed by jean-pierre charras
parent 0d5c7f4461
commit 3802629adc
1 changed files with 591 additions and 584 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

321
pcbnew/kicad_plugin.cpp
View File

@ -91,28 +91,17 @@ class FP_CACHE_ITEM
public: public:
FP_CACHE_ITEM( MODULE* aModule, const wxFileName& aFileName ); FP_CACHE_ITEM( MODULE* aModule, const wxFileName& aFileName );
wxString GetName() const wxString GetName() const { return m_file_name.GetDirs().Last(); }
{ wxFileName GetFileName() const { return m_file_name; }
return m_file_name.GetDirs().Last();
}
wxFileName GetFileName() const
{
return m_file_name;
}
/// Tell if the disk content or the lib_path has changed. /// Tell if the disk content or the lib_path has changed.
bool IsModified() const; bool IsModified() const;
MODULE* GetModule() const MODULE* GetModule() const { return m_module.get(); }
{ void UpdateModificationTime() { m_mod_time = m_file_name.GetModificationTime(); }
return m_module.get();
}
void UpdateModificationTime()
{
m_mod_time = m_file_name.GetModificationTime();
}
}; };
FP_CACHE_ITEM::FP_CACHE_ITEM( MODULE* aModule, const wxFileName& aFileName ) : FP_CACHE_ITEM::FP_CACHE_ITEM( MODULE* aModule, const wxFileName& aFileName ) :
m_module( aModule ) m_module( aModule )
{ {
@ -124,24 +113,27 @@ FP_CACHE_ITEM::FP_CACHE_ITEM( MODULE* aModule, const wxFileName& aFileName ) :
m_mod_time.Now(); m_mod_time.Now();
} }
bool FP_CACHE_ITEM::IsModified() const bool FP_CACHE_ITEM::IsModified() const
{ {
if( !m_file_name.FileExists() ) if( !m_file_name.FileExists() )
return false; return false;
wxLogTrace( traceFootprintLibrary, wxT( "File '%s', m_mod_time %s-%s, file mod time: %s-%s." ), wxLogTrace( traceFootprintLibrary, wxT( "File '%s', m_mod_time %s-%s, file mod time: %s-%s." ),
GetChars( m_file_name.GetFullPath() ), GetChars( m_mod_time.FormatDate() ), GetChars( m_file_name.GetFullPath() ),
GetChars( m_mod_time.FormatTime() ), GetChars( m_mod_time.FormatDate() ), GetChars( m_mod_time.FormatTime() ),
GetChars( m_file_name.GetModificationTime().FormatDate() ), GetChars( m_file_name.GetModificationTime().FormatDate() ),
GetChars( m_file_name.GetModificationTime().FormatTime() ) ); GetChars( m_file_name.GetModificationTime().FormatTime() ) );
return m_file_name.GetModificationTime() != m_mod_time; return m_file_name.GetModificationTime() != m_mod_time;
} }
typedef boost::ptr_map< std::string, FP_CACHE_ITEM > MODULE_MAP; typedef boost::ptr_map< std::string, FP_CACHE_ITEM > MODULE_MAP;
typedef MODULE_MAP::iterator MODULE_ITER; typedef MODULE_MAP::iterator MODULE_ITER;
typedef MODULE_MAP::const_iterator MODULE_CITER; typedef MODULE_MAP::const_iterator MODULE_CITER;
class FP_CACHE class FP_CACHE
{ {
PCB_IO* m_owner; /// Plugin object that owns the cache. PCB_IO* m_owner; /// Plugin object that owns the cache.
@ -152,22 +144,10 @@ class FP_CACHE
public: public:
FP_CACHE( PCB_IO* aOwner, const wxString& aLibraryPath ); FP_CACHE( PCB_IO* aOwner, const wxString& aLibraryPath );
wxString GetPath() const wxString GetPath() const { return m_lib_path.GetPath(); }
{ wxDateTime GetLastModificationTime() const { return m_mod_time; }
return m_lib_path.GetPath(); bool IsWritable() const { return m_lib_path.IsOk() && m_lib_path.IsDirWritable(); }
} MODULE_MAP& GetModules() { return m_modules; }
wxDateTime GetLastModificationTime() const
{
return m_mod_time;
}
bool IsWritable() const
{
return m_lib_path.IsOk() && m_lib_path.IsDirWritable();
}
MODULE_MAP& GetModules()
{
return m_modules;
}
// Most all functions in this class throw IO_ERROR exceptions. There are no // Most all functions in this class throw IO_ERROR exceptions. There are no
// error codes nor user interface calls from here, nor in any PLUGIN. // error codes nor user interface calls from here, nor in any PLUGIN.
@ -211,30 +191,31 @@ public:
bool IsPath( const wxString& aPath ) const; bool IsPath( const wxString& aPath ) const;
}; };
FP_CACHE::FP_CACHE( PCB_IO* aOwner, const wxString& aLibraryPath ) FP_CACHE::FP_CACHE( PCB_IO* aOwner, const wxString& aLibraryPath )
{ {
m_owner = aOwner; m_owner = aOwner;
m_lib_path.SetPath( aLibraryPath ); m_lib_path.SetPath( aLibraryPath );
} }
wxDateTime FP_CACHE::GetLibModificationTime() const wxDateTime FP_CACHE::GetLibModificationTime() const
{ {
return m_lib_path.GetModificationTime(); return m_lib_path.GetModificationTime();
} }
void FP_CACHE::Save() void FP_CACHE::Save()
{ {
if( !m_lib_path.DirExists() && !m_lib_path.Mkdir() ) if( !m_lib_path.DirExists() && !m_lib_path.Mkdir() )
{ {
THROW_IO_ERROR( THROW_IO_ERROR( wxString::Format( _( "Cannot create footprint library path '%s'" ),
wxString::Format( _( "Cannot create footprint library path '%s'" ),
m_lib_path.GetPath().GetData() ) ); m_lib_path.GetPath().GetData() ) );
} }
if( !m_lib_path.IsDirWritable() ) if( !m_lib_path.IsDirWritable() )
{ {
THROW_IO_ERROR( THROW_IO_ERROR( wxString::Format( _( "Footprint library path '%s' is read only" ),
wxString::Format( _( "Footprint library path '%s' is read only" ),
GetChars( m_lib_path.GetPath() ) ) ); GetChars( m_lib_path.GetPath() ) ) );
} }
@ -265,7 +246,9 @@ void FP_CACHE::Save()
{ {
wxString msg = wxString::Format( wxString msg = wxString::Format(
_( "Cannot rename temporary file '%s' to footprint library file '%s'" ), _( "Cannot rename temporary file '%s' to footprint library file '%s'" ),
GetChars( tempFileName ), GetChars( fn.GetFullPath() ) ); GetChars( tempFileName ),
GetChars( fn.GetFullPath() )
);
THROW_IO_ERROR( msg ); THROW_IO_ERROR( msg );
} }
@ -274,14 +257,17 @@ void FP_CACHE::Save()
} }
} }
void FP_CACHE::Load() void FP_CACHE::Load()
{ {
wxDir dir( m_lib_path.GetPath() ); wxDir dir( m_lib_path.GetPath() );
if( !dir.IsOpened() ) if( !dir.IsOpened() )
{ {
wxString msg = wxString::Format( _( "Footprint library path '%s' does not exist" ), wxString msg = wxString::Format(
GetChars( m_lib_path.GetPath() ) ); _( "Footprint library path '%s' does not exist" ),
GetChars( m_lib_path.GetPath() )
);
THROW_IO_ERROR( msg ); THROW_IO_ERROR( msg );
} }
@ -316,6 +302,7 @@ void FP_CACHE::Load()
} }
} }
void FP_CACHE::Remove( const wxString& aFootprintName ) void FP_CACHE::Remove( const wxString& aFootprintName )
{ {
@ -325,8 +312,11 @@ void FP_CACHE::Remove( const wxString& aFootprintName )
if( it == m_modules.end() ) if( it == m_modules.end() )
{ {
wxString msg = wxString::Format( _( "library '%s' has no footprint '%s' to delete" ), wxString msg = wxString::Format(
GetChars( m_lib_path.GetPath() ), GetChars( aFootprintName ) ); _( "library '%s' has no footprint '%s' to delete" ),
GetChars( m_lib_path.GetPath() ),
GetChars( aFootprintName )
);
THROW_IO_ERROR( msg ); THROW_IO_ERROR( msg );
} }
@ -336,6 +326,7 @@ void FP_CACHE::Remove( const wxString& aFootprintName )
wxRemoveFile( fullPath ); wxRemoveFile( fullPath );
} }
bool FP_CACHE::IsPath( const wxString& aPath ) const bool FP_CACHE::IsPath( const wxString& aPath ) const
{ {
// Converts path separators to native path separators // Converts path separators to native path separators
@ -345,6 +336,7 @@ bool FP_CACHE::IsPath( const wxString& aPath ) const
return m_lib_path == newPath; return m_lib_path == newPath;
} }
bool FP_CACHE::IsModified( const wxString& aLibPath, const wxString& aFootprintName ) const bool FP_CACHE::IsModified( const wxString& aLibPath, const wxString& aFootprintName ) const
{ {
// The library is modified if the library path got deleted or changed. // The library is modified if the library path got deleted or changed.
@ -378,7 +370,8 @@ bool FP_CACHE::IsModified( const wxString& aLibPath, const wxString& aFootprintN
return true; return true;
} }
} }
} else }
else
{ {
MODULE_CITER it = m_modules.find( TO_UTF8( aFootprintName ) ); MODULE_CITER it = m_modules.find( TO_UTF8( aFootprintName ) );
@ -389,6 +382,7 @@ bool FP_CACHE::IsModified( const wxString& aLibPath, const wxString& aFootprintN
return false; return false;
} }
void PCB_IO::Save( const wxString& aFileName, BOARD* aBoard, const PROPERTIES* aProperties ) void PCB_IO::Save( const wxString& aFileName, BOARD* aBoard, const PROPERTIES* aProperties )
{ {
LOCALE_IO toggle; // toggles on, then off, the C locale. LOCALE_IO toggle; // toggles on, then off, the C locale.
@ -412,6 +406,7 @@ void PCB_IO::Save( const wxString& aFileName, BOARD* aBoard, const PROPERTIES* a
m_out->Print( 0, ")\n" ); m_out->Print( 0, ")\n" );
} }
BOARD_ITEM* PCB_IO::Parse( const wxString& aClipboardSourceInput ) throw( PARSE_ERROR, IO_ERROR ) BOARD_ITEM* PCB_IO::Parse( const wxString& aClipboardSourceInput ) throw( PARSE_ERROR, IO_ERROR )
{ {
std::string input = TO_UTF8( aClipboardSourceInput ); std::string input = TO_UTF8( aClipboardSourceInput );
@ -423,7 +418,9 @@ BOARD_ITEM* PCB_IO::Parse( const wxString& aClipboardSourceInput ) throw( PARSE_
return m_parser->Parse(); return m_parser->Parse();
} }
void PCB_IO::Format( BOARD_ITEM* aItem, int aNestLevel ) const throw( IO_ERROR )
void PCB_IO::Format( BOARD_ITEM* aItem, int aNestLevel ) const
throw( IO_ERROR )
{ {
LOCALE_IO toggle; // public API function, perform anything convenient for caller LOCALE_IO toggle; // public API function, perform anything convenient for caller
@ -479,6 +476,7 @@ void PCB_IO::Format( BOARD_ITEM* aItem, int aNestLevel ) const throw( IO_ERROR )
} }
} }
void PCB_IO::formatLayer( const BOARD_ITEM* aItem ) const void PCB_IO::formatLayer( const BOARD_ITEM* aItem ) const
{ {
if( m_ctl & CTL_STD_LAYER_NAMES ) if( m_ctl & CTL_STD_LAYER_NAMES )
@ -487,11 +485,14 @@ void PCB_IO::formatLayer( const BOARD_ITEM* aItem ) const
// English layer names should never need quoting. // English layer names should never need quoting.
m_out->Print( 0, " (layer %s)", TO_UTF8( BOARD::GetStandardLayerName( layer ) ) ); m_out->Print( 0, " (layer %s)", TO_UTF8( BOARD::GetStandardLayerName( layer ) ) );
} else }
else
m_out->Print( 0, " (layer %s)", m_out->Quotew( aItem->GetLayerName() ).c_str() ); m_out->Print( 0, " (layer %s)", m_out->Quotew( aItem->GetLayerName() ).c_str() );
} }
void PCB_IO::format( BOARD* aBoard, int aNestLevel ) const throw( IO_ERROR )
void PCB_IO::format( BOARD* aBoard, int aNestLevel ) const
throw( IO_ERROR )
{ {
const BOARD_DESIGN_SETTINGS& dsnSettings = aBoard->GetDesignSettings(); const BOARD_DESIGN_SETTINGS& dsnSettings = aBoard->GetDesignSettings();
@ -663,7 +664,8 @@ void PCB_IO::format( BOARD* aBoard, int aNestLevel ) const throw( IO_ERROR )
FMTIU( aBoard->GetGridOrigin().x ).c_str(), FMTIU( aBoard->GetGridOrigin().x ).c_str(),
FMTIU( aBoard->GetGridOrigin().y ).c_str() ); FMTIU( aBoard->GetGridOrigin().y ).c_str() );
m_out->Print( aNestLevel + 1, "(visible_elements %X)\n", dsnSettings.GetVisibleElements() ); m_out->Print( aNestLevel+1, "(visible_elements %X)\n",
dsnSettings.GetVisibleElements() );
aBoard->GetPlotOptions().Format( m_out, aNestLevel+1 ); aBoard->GetPlotOptions().Format( m_out, aNestLevel+1 );
@ -673,7 +675,8 @@ void PCB_IO::format( BOARD* aBoard, int aNestLevel ) const throw( IO_ERROR )
for( NETINFO_MAPPING::iterator net = m_mapping->begin(), netEnd = m_mapping->end(); for( NETINFO_MAPPING::iterator net = m_mapping->begin(), netEnd = m_mapping->end();
net != netEnd; ++net ) net != netEnd; ++net )
{ {
m_out->Print( aNestLevel, "(net %d %s)\n", m_mapping->Translate( net->GetNet() ), m_out->Print( aNestLevel, "(net %d %s)\n",
m_mapping->Translate( net->GetNet() ),
m_out->Quotew( net->GetNetname() ).c_str() ); m_out->Quotew( net->GetNetname() ).c_str() );
} }
@ -686,7 +689,8 @@ void PCB_IO::format( BOARD* aBoard, int aNestLevel ) const throw( IO_ERROR )
// Save the rest of the net classes alphabetically. // Save the rest of the net classes alphabetically.
for( NETCLASSES::const_iterator it = dsnSettings.m_NetClasses.begin(); for( NETCLASSES::const_iterator it = dsnSettings.m_NetClasses.begin();
it != dsnSettings.m_NetClasses.end(); ++it ) it != dsnSettings.m_NetClasses.end();
++it )
{ {
NETCLASS netclass = *it->second; NETCLASS netclass = *it->second;
filterNetClass( *aBoard, netclass ); // Remove empty nets (from a copy of a netclass) filterNetClass( *aBoard, netclass ); // Remove empty nets (from a copy of a netclass)
@ -724,7 +728,9 @@ void PCB_IO::format( BOARD* aBoard, int aNestLevel ) const throw( IO_ERROR )
Format( aBoard->GetArea( i ), aNestLevel ); Format( aBoard->GetArea( i ), aNestLevel );
} }
void PCB_IO::format( DIMENSION* aDimension, int aNestLevel ) const throw( IO_ERROR )
void PCB_IO::format( DIMENSION* aDimension, int aNestLevel ) const
throw( IO_ERROR )
{ {
m_out->Print( aNestLevel, "(dimension %s (width %s)", m_out->Print( aNestLevel, "(dimension %s (width %s)",
FMT_IU( aDimension->GetValue() ).c_str(), FMT_IU( aDimension->GetValue() ).c_str(),
@ -784,7 +790,9 @@ void PCB_IO::format( DIMENSION* aDimension, int aNestLevel ) const throw( IO_ERR
m_out->Print( aNestLevel, ")\n" ); m_out->Print( aNestLevel, ")\n" );
} }
void PCB_IO::format( DRAWSEGMENT* aSegment, int aNestLevel ) const throw( IO_ERROR )
void PCB_IO::format( DRAWSEGMENT* aSegment, int aNestLevel ) const
throw( IO_ERROR )
{ {
unsigned i; unsigned i;
@ -848,7 +856,9 @@ void PCB_IO::format( DRAWSEGMENT* aSegment, int aNestLevel ) const throw( IO_ERR
m_out->Print( 0, ")\n" ); m_out->Print( 0, ")\n" );
} }
void PCB_IO::format( EDGE_MODULE* aModuleDrawing, int aNestLevel ) const throw( IO_ERROR )
void PCB_IO::format( EDGE_MODULE* aModuleDrawing, int aNestLevel ) const
throw( IO_ERROR )
{ {
switch( aModuleDrawing->GetShape() ) switch( aModuleDrawing->GetShape() )
{ {
@ -920,7 +930,9 @@ void PCB_IO::format( EDGE_MODULE* aModuleDrawing, int aNestLevel ) const throw(
m_out->Print( 0, ")\n" ); m_out->Print( 0, ")\n" );
} }
void PCB_IO::format( PCB_TARGET* aTarget, int aNestLevel ) const throw( IO_ERROR )
void PCB_IO::format( PCB_TARGET* aTarget, int aNestLevel ) const
throw( IO_ERROR )
{ {
m_out->Print( aNestLevel, "(target %s (at %s) (size %s)", m_out->Print( aNestLevel, "(target %s (at %s) (size %s)",
( aTarget->GetShape() ) ? "x" : "plus", ( aTarget->GetShape() ) ? "x" : "plus",
@ -938,7 +950,9 @@ void PCB_IO::format( PCB_TARGET* aTarget, int aNestLevel ) const throw( IO_ERROR
m_out->Print( 0, ")\n" ); m_out->Print( 0, ")\n" );
} }
void PCB_IO::format( MODULE* aModule, int aNestLevel ) const throw( IO_ERROR )
void PCB_IO::format( MODULE* aModule, int aNestLevel ) const
throw( IO_ERROR )
{ {
if( !( m_ctl & CTL_OMIT_INITIAL_COMMENTS ) ) if( !( m_ctl & CTL_OMIT_INITIAL_COMMENTS ) )
{ {
@ -953,7 +967,8 @@ void PCB_IO::format( MODULE* aModule, int aNestLevel ) const throw( IO_ERROR )
} }
} }
m_out->Print( aNestLevel, "(module %s", m_out->Quotes( aModule->GetFPID().Format() ).c_str() ); m_out->Print( aNestLevel, "(module %s",
m_out->Quotes( aModule->GetFPID().Format() ).c_str() );
if( aModule->IsLocked() ) if( aModule->IsLocked() )
m_out->Print( 0, " locked" ); m_out->Print( 0, " locked" );
@ -965,9 +980,10 @@ void PCB_IO::format( MODULE* aModule, int aNestLevel ) const throw( IO_ERROR )
if( !( m_ctl & CTL_OMIT_TSTAMPS ) ) if( !( m_ctl & CTL_OMIT_TSTAMPS ) )
{ {
m_out->Print( 0, " (tedit %lX) (tstamp %lX)\n", aModule->GetLastEditTime(), m_out->Print( 0, " (tedit %lX) (tstamp %lX)\n",
aModule->GetTimeStamp() ); aModule->GetLastEditTime(), aModule->GetTimeStamp() );
} else }
else
m_out->Print( 0, "\n" ); m_out->Print( 0, "\n" );
if( !( m_ctl & CTL_OMIT_AT ) ) if( !( m_ctl & CTL_OMIT_AT ) )
@ -989,7 +1005,8 @@ void PCB_IO::format( MODULE* aModule, int aNestLevel ) const throw( IO_ERROR )
m_out->Quotew( aModule->GetKeywords() ).c_str() ); m_out->Quotew( aModule->GetKeywords() ).c_str() );
if( !( m_ctl & CTL_OMIT_PATH ) && !!aModule->GetPath() ) if( !( m_ctl & CTL_OMIT_PATH ) && !!aModule->GetPath() )
m_out->Print( aNestLevel + 1, "(path %s)\n", m_out->Quotew( aModule->GetPath() ).c_str() ); m_out->Print( aNestLevel+1, "(path %s)\n",
m_out->Quotew( aModule->GetPath() ).c_str() );
if( aModule->GetPlacementCost90() != 0 ) if( aModule->GetPlacementCost90() != 0 )
m_out->Print( aNestLevel+1, "(autoplace_cost90 %d)\n", aModule->GetPlacementCost90() ); m_out->Print( aNestLevel+1, "(autoplace_cost90 %d)\n", aModule->GetPlacementCost90() );
@ -1079,7 +1096,9 @@ void PCB_IO::format( MODULE* aModule, int aNestLevel ) const throw( IO_ERROR )
m_out->Print( aNestLevel, ")\n" ); m_out->Print( aNestLevel, ")\n" );
} }
void PCB_IO::formatLayers( LAYER_MSK aLayerMask, int aNestLevel ) const throw( IO_ERROR )
void PCB_IO::formatLayers( LAYER_MSK aLayerMask, int aNestLevel ) const
throw( IO_ERROR )
{ {
std::string output; std::string output;
@ -1099,35 +1118,32 @@ void PCB_IO::formatLayers( LAYER_MSK aLayerMask, int aNestLevel ) const throw( I
{ {
output += " *.Cu"; output += " *.Cu";
aLayerMask &= ~ALL_CU_LAYERS; // clear bits, so they are not output again below aLayerMask &= ~ALL_CU_LAYERS; // clear bits, so they are not output again below
} else if( ( aLayerMask & cuMask ) == ( LAYER_BACK | LAYER_FRONT ) ) }
else if( ( aLayerMask & cuMask ) == (LAYER_BACK | LAYER_FRONT) )
{ {
output += " F&B.Cu"; output += " F&B.Cu";
aLayerMask &= ~(LAYER_BACK | LAYER_FRONT); aLayerMask &= ~(LAYER_BACK | LAYER_FRONT);
} }
if( ( aLayerMask & ( ADHESIVE_LAYER_BACK | ADHESIVE_LAYER_FRONT ) ) if( ( aLayerMask & (ADHESIVE_LAYER_BACK | ADHESIVE_LAYER_FRONT)) == (ADHESIVE_LAYER_BACK | ADHESIVE_LAYER_FRONT) )
== ( ADHESIVE_LAYER_BACK | ADHESIVE_LAYER_FRONT ) )
{ {
output += " *.Adhes"; output += " *.Adhes";
aLayerMask &= ~(ADHESIVE_LAYER_BACK | ADHESIVE_LAYER_FRONT); aLayerMask &= ~(ADHESIVE_LAYER_BACK | ADHESIVE_LAYER_FRONT);
} }
if( ( aLayerMask & ( SOLDERPASTE_LAYER_BACK | SOLDERPASTE_LAYER_FRONT ) ) if( ( aLayerMask & (SOLDERPASTE_LAYER_BACK | SOLDERPASTE_LAYER_FRONT)) == (SOLDERPASTE_LAYER_BACK | SOLDERPASTE_LAYER_FRONT) )
== ( SOLDERPASTE_LAYER_BACK | SOLDERPASTE_LAYER_FRONT ) )
{ {
output += " *.Paste"; output += " *.Paste";
aLayerMask &= ~(SOLDERPASTE_LAYER_BACK | SOLDERPASTE_LAYER_FRONT); aLayerMask &= ~(SOLDERPASTE_LAYER_BACK | SOLDERPASTE_LAYER_FRONT);
} }
if( ( aLayerMask & ( SILKSCREEN_LAYER_BACK | SILKSCREEN_LAYER_FRONT ) ) if( ( aLayerMask & (SILKSCREEN_LAYER_BACK | SILKSCREEN_LAYER_FRONT)) == (SILKSCREEN_LAYER_BACK | SILKSCREEN_LAYER_FRONT) )
== ( SILKSCREEN_LAYER_BACK | SILKSCREEN_LAYER_FRONT ) )
{ {
output += " *.SilkS"; output += " *.SilkS";
aLayerMask &= ~(SILKSCREEN_LAYER_BACK | SILKSCREEN_LAYER_FRONT); aLayerMask &= ~(SILKSCREEN_LAYER_BACK | SILKSCREEN_LAYER_FRONT);
} }
if( ( aLayerMask & ( SOLDERMASK_LAYER_BACK | SOLDERMASK_LAYER_FRONT ) ) if( ( aLayerMask & (SOLDERMASK_LAYER_BACK | SOLDERMASK_LAYER_FRONT)) == (SOLDERMASK_LAYER_BACK | SOLDERMASK_LAYER_FRONT) )
== ( SOLDERMASK_LAYER_BACK | SOLDERMASK_LAYER_FRONT ) )
{ {
output += " *.Mask"; output += " *.Mask";
aLayerMask &= ~(SOLDERMASK_LAYER_BACK | SOLDERMASK_LAYER_FRONT); aLayerMask &= ~(SOLDERMASK_LAYER_BACK | SOLDERMASK_LAYER_FRONT);
@ -1147,8 +1163,7 @@ void PCB_IO::formatLayers( LAYER_MSK aLayerMask, int aNestLevel ) const throw( I
if( m_board && !( m_ctl & CTL_STD_LAYER_NAMES ) ) if( m_board && !( m_ctl & CTL_STD_LAYER_NAMES ) )
layerName = m_board->GetLayerName( layer ); layerName = m_board->GetLayerName( layer );
else else // I am being called from FootprintSave()
// I am being called from FootprintSave()
layerName = BOARD::GetStandardLayerName( layer ); layerName = BOARD::GetStandardLayerName( layer );
output += ' '; output += ' ';
@ -1159,24 +1174,18 @@ void PCB_IO::formatLayers( LAYER_MSK aLayerMask, int aNestLevel ) const throw( I
m_out->Print( aNestLevel, "%s)", output.c_str() ); m_out->Print( aNestLevel, "%s)", output.c_str() );
} }
void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const throw( IO_ERROR )
void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const
throw( IO_ERROR )
{ {
const char* shape; const char* shape;
switch( aPad->GetShape() ) switch( aPad->GetShape() )
{ {
case PAD_CIRCLE: case PAD_CIRCLE: shape = "circle"; break;
shape = "circle"; case PAD_RECT: shape = "rect"; break;
break; case PAD_OVAL: shape = "oval"; break;
case PAD_RECT: case PAD_TRAPEZOID: shape = "trapezoid"; break;
shape = "rect";
break;
case PAD_OVAL:
shape = "oval";
break;
case PAD_TRAPEZOID:
shape = "trapezoid";
break;
default: default:
THROW_IO_ERROR( wxString::Format( _( "unknown pad type: %d"), aPad->GetShape() ) ); THROW_IO_ERROR( wxString::Format( _( "unknown pad type: %d"), aPad->GetShape() ) );
@ -1186,26 +1195,19 @@ void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const throw( IO_ERROR )
switch( aPad->GetAttribute() ) switch( aPad->GetAttribute() )
{ {
case PAD_STANDARD: case PAD_STANDARD: type = "thru_hole"; break;
type = "thru_hole"; case PAD_SMD: type = "smd"; break;
break; case PAD_CONN: type = "connect"; break;
case PAD_SMD: case PAD_HOLE_NOT_PLATED: type = "np_thru_hole"; break;
type = "smd";
break;
case PAD_CONN:
type = "connect";
break;
case PAD_HOLE_NOT_PLATED:
type = "np_thru_hole";
break;
default: default:
THROW_IO_ERROR( THROW_IO_ERROR( wxString::Format( _( "unknown pad attribute: %d" ),
wxString::Format( _( "unknown pad attribute: %d" ), aPad->GetAttribute() ) ); aPad->GetAttribute() ) );
} }
m_out->Print( aNestLevel, "(pad %s %s %s", m_out->Quotew( aPad->GetPadName() ).c_str(), type, m_out->Print( aNestLevel, "(pad %s %s %s",
shape ); m_out->Quotew( aPad->GetPadName() ).c_str(),
type, shape );
m_out->Print( 0, " (at %s", FMT_IU( aPad->GetPos0() ).c_str() ); m_out->Print( 0, " (at %s", FMT_IU( aPad->GetPos0() ).c_str() );
if( aPad->GetOrientation() != 0.0 ) if( aPad->GetOrientation() != 0.0 )
@ -1220,8 +1222,8 @@ void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const throw( IO_ERROR )
wxSize sz = aPad->GetDrillSize(); wxSize sz = aPad->GetDrillSize();
wxPoint shapeoffset = aPad->GetOffset(); wxPoint shapeoffset = aPad->GetOffset();
if( ( sz.GetWidth() > 0 ) || ( sz.GetHeight() > 0 ) || ( shapeoffset.x != 0 ) if( (sz.GetWidth() > 0) || (sz.GetHeight() > 0) ||
|| ( shapeoffset.y != 0 ) ) (shapeoffset.x != 0) || (shapeoffset.y != 0) )
{ {
m_out->Print( 0, " (drill" ); m_out->Print( 0, " (drill" );
@ -1283,9 +1285,12 @@ void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const throw( IO_ERROR )
m_out->Print( 0, ")\n" ); m_out->Print( 0, ")\n" );
} }
void PCB_IO::format( TEXTE_PCB* aText, int aNestLevel ) const throw( IO_ERROR )
void PCB_IO::format( TEXTE_PCB* aText, int aNestLevel ) const
throw( IO_ERROR )
{ {
m_out->Print( aNestLevel, "(gr_text %s (at %s", m_out->Quotew( aText->GetText() ).c_str(), m_out->Print( aNestLevel, "(gr_text %s (at %s",
m_out->Quotew( aText->GetText() ).c_str(),
FMT_IU( aText->GetTextPosition() ).c_str() ); FMT_IU( aText->GetTextPosition() ).c_str() );
if( aText->GetOrientation() != 0.0 ) if( aText->GetOrientation() != 0.0 )
@ -1305,7 +1310,9 @@ void PCB_IO::format( TEXTE_PCB* aText, int aNestLevel ) const throw( IO_ERROR )
m_out->Print( aNestLevel, ")\n" ); m_out->Print( aNestLevel, ")\n" );
} }
void PCB_IO::format( TEXTE_MODULE* aText, int aNestLevel ) const throw( IO_ERROR )
void PCB_IO::format( TEXTE_MODULE* aText, int aNestLevel ) const
throw( IO_ERROR )
{ {
MODULE* parent = (MODULE*) aText->GetParent(); MODULE* parent = (MODULE*) aText->GetParent();
double orient = aText->GetOrientation(); double orient = aText->GetOrientation();
@ -1313,14 +1320,9 @@ void PCB_IO::format( TEXTE_MODULE* aText, int aNestLevel ) const throw( IO_ERROR
switch( aText->GetType() ) switch( aText->GetType() )
{ {
case TEXTE_MODULE::TEXT_is_REFERENCE: case TEXTE_MODULE::TEXT_is_REFERENCE: type = wxT( "reference" ); break;
type = wxT( "reference" ); case TEXTE_MODULE::TEXT_is_VALUE: type = wxT( "value" ); break;
break; default: type = wxT( "user" );
case TEXTE_MODULE::TEXT_is_VALUE:
type = wxT( "value" );
break;
default:
type = wxT( "user" );
} }
// Due to the Pcbnew history, m_Orient is saved in screen value // Due to the Pcbnew history, m_Orient is saved in screen value
@ -1328,7 +1330,8 @@ void PCB_IO::format( TEXTE_MODULE* aText, int aNestLevel ) const throw( IO_ERROR
if( parent ) if( parent )
orient += parent->GetOrientation(); orient += parent->GetOrientation();
m_out->Print( aNestLevel, "(fp_text %s %s (at %s", m_out->Quotew( type ).c_str(), m_out->Print( aNestLevel, "(fp_text %s %s (at %s",
m_out->Quotew( type ).c_str(),
m_out->Quotew( aText->GetText() ).c_str(), m_out->Quotew( aText->GetText() ).c_str(),
FMT_IU( aText->GetPos0() ).c_str() ); FMT_IU( aText->GetPos0() ).c_str() );
@ -1348,7 +1351,9 @@ void PCB_IO::format( TEXTE_MODULE* aText, int aNestLevel ) const throw( IO_ERROR
m_out->Print( aNestLevel, ")\n" ); m_out->Print( aNestLevel, ")\n" );
} }
void PCB_IO::format( TRACK* aTrack, int aNestLevel ) const throw( IO_ERROR )
void PCB_IO::format( TRACK* aTrack, int aNestLevel ) const
throw( IO_ERROR )
{ {
if( aTrack->Type() == PCB_VIA_T ) if( aTrack->Type() == PCB_VIA_T )
{ {
@ -1357,8 +1362,8 @@ void PCB_IO::format( TRACK* aTrack, int aNestLevel ) const throw( IO_ERROR )
const VIA* via = static_cast<const VIA*>(aTrack); const VIA* via = static_cast<const VIA*>(aTrack);
BOARD* board = (BOARD*) via->GetParent(); BOARD* board = (BOARD*) via->GetParent();
wxCHECK_RET( board != 0, wxCHECK_RET( board != 0, wxT( "Via " ) + via->GetSelectMenuText() +
wxT( "Via " ) + via->GetSelectMenuText() + wxT( " has no parent." ) ); wxT( " has no parent." ) );
m_out->Print( aNestLevel, "(via" ); m_out->Print( aNestLevel, "(via" );
@ -1391,7 +1396,8 @@ void PCB_IO::format( TRACK* aTrack, int aNestLevel ) const throw( IO_ERROR )
m_out->Print( 0, " (layers %s %s)", m_out->Print( 0, " (layers %s %s)",
m_out->Quotew( m_board->GetLayerName( layer1 ) ).c_str(), m_out->Quotew( m_board->GetLayerName( layer1 ) ).c_str(),
m_out->Quotew( m_board->GetLayerName( layer2 ) ).c_str() ); m_out->Quotew( m_board->GetLayerName( layer2 ) ).c_str() );
} else }
else
{ {
m_out->Print( aNestLevel, "(segment (start %s) (end %s) (width %s)", m_out->Print( aNestLevel, "(segment (start %s) (end %s) (width %s)",
FMT_IU( aTrack->GetStart() ).c_str(), FMT_IU( aTrack->GetEnd() ).c_str(), FMT_IU( aTrack->GetStart() ).c_str(), FMT_IU( aTrack->GetEnd() ).c_str(),
@ -1411,7 +1417,9 @@ void PCB_IO::format( TRACK* aTrack, int aNestLevel ) const throw( IO_ERROR )
m_out->Print( 0, ")\n" ); m_out->Print( 0, ")\n" );
} }
void PCB_IO::format( ZONE_CONTAINER* aZone, int aNestLevel ) const throw( IO_ERROR )
void PCB_IO::format( ZONE_CONTAINER* aZone, int aNestLevel ) const
throw( IO_ERROR )
{ {
// Save the NET info; For keepout zones, net code and net name are irrelevant // Save the NET info; For keepout zones, net code and net name are irrelevant
// so be sure a dummy value is stored, just for ZONE_CONTAINER compatibility // so be sure a dummy value is stored, just for ZONE_CONTAINER compatibility
@ -1430,15 +1438,9 @@ void PCB_IO::format( ZONE_CONTAINER* aZone, int aNestLevel ) const throw( IO_ERR
switch( aZone->GetHatchStyle() ) switch( aZone->GetHatchStyle() )
{ {
default: default:
case CPolyLine::NO_HATCH: case CPolyLine::NO_HATCH: hatch = "none"; break;
hatch = "none"; case CPolyLine::DIAGONAL_EDGE: hatch = "edge"; break;
break; case CPolyLine::DIAGONAL_FULL: hatch = "full"; break;
case CPolyLine::DIAGONAL_EDGE:
hatch = "edge";
break;
case CPolyLine::DIAGONAL_FULL:
hatch = "full";
break;
} }
m_out->Print( 0, " (hatch %s %s)\n", hatch.c_str(), m_out->Print( 0, " (hatch %s %s)\n", hatch.c_str(),
@ -1512,8 +1514,7 @@ void PCB_IO::format( ZONE_CONTAINER* aZone, int aNestLevel ) const throw( IO_ERR
break; break;
default: default:
THROW_IO_ERROR( THROW_IO_ERROR( wxString::Format( _( "unknown zone corner smoothing type %d" ),
wxString::Format( _( "unknown zone corner smoothing type %d" ),
aZone->GetCornerSmoothingType() ) ); aZone->GetCornerSmoothingType() ) );
} }
m_out->Print( 0, ")" ); m_out->Print( 0, ")" );
@ -1640,14 +1641,18 @@ void PCB_IO::format( ZONE_CONTAINER* aZone, int aNestLevel ) const throw( IO_ERR
m_out->Print( aNestLevel, ")\n" ); m_out->Print( aNestLevel, ")\n" );
} }
PCB_IO::PCB_IO( int aControlFlags ) : PCB_IO::PCB_IO( int aControlFlags ) :
m_cache( 0 ), m_ctl( aControlFlags ), m_parser( new PCB_PARSER() ), m_cache( 0 ),
m_ctl( aControlFlags ),
m_parser( new PCB_PARSER() ),
m_mapping( new NETINFO_MAPPING() ) m_mapping( new NETINFO_MAPPING() )
{ {
init( 0 ); init( 0 );
m_out = &m_sf; m_out = &m_sf;
} }
PCB_IO::~PCB_IO() PCB_IO::~PCB_IO()
{ {
delete m_cache; delete m_cache;
@ -1655,6 +1660,7 @@ PCB_IO::~PCB_IO()
delete m_mapping; delete m_mapping;
} }
BOARD* PCB_IO::Load( const wxString& aFileName, BOARD* aAppendToMe, const PROPERTIES* aProperties ) BOARD* PCB_IO::Load( const wxString& aFileName, BOARD* aAppendToMe, const PROPERTIES* aProperties )
{ {
FILE_LINE_READER reader( aFileName ); FILE_LINE_READER reader( aFileName );
@ -1674,12 +1680,14 @@ BOARD* PCB_IO::Load( const wxString& aFileName, BOARD* aAppendToMe, const PROPER
return board; return board;
} }
void PCB_IO::init( const PROPERTIES* aProperties ) void PCB_IO::init( const PROPERTIES* aProperties )
{ {
m_board = NULL; m_board = NULL;
m_props = aProperties; m_props = aProperties;
} }
void PCB_IO::cacheLib( const wxString& aLibraryPath, const wxString& aFootprintName ) void PCB_IO::cacheLib( const wxString& aLibraryPath, const wxString& aFootprintName )
{ {
if( !m_cache || m_cache->IsModified( aLibraryPath, aFootprintName ) ) if( !m_cache || m_cache->IsModified( aLibraryPath, aFootprintName ) )
@ -1691,6 +1699,7 @@ void PCB_IO::cacheLib( const wxString& aLibraryPath, const wxString& aFootprintN
} }
} }
wxArrayString PCB_IO::FootprintEnumerate( const wxString& aLibraryPath, wxArrayString PCB_IO::FootprintEnumerate( const wxString& aLibraryPath,
const PROPERTIES* aProperties ) const PROPERTIES* aProperties )
{ {
@ -1700,8 +1709,7 @@ wxArrayString PCB_IO::FootprintEnumerate( const wxString& aLibraryPath,
if( !dir.IsOpened() ) if( !dir.IsOpened() )
{ {
THROW_IO_ERROR( THROW_IO_ERROR( wxString::Format( _( "footprint library path '%s' does not exist" ),
wxString::Format( _( "footprint library path '%s' does not exist" ),
GetChars( aLibraryPath ) ) ); GetChars( aLibraryPath ) ) );
} }
@ -1712,6 +1720,7 @@ wxArrayString PCB_IO::FootprintEnumerate( const wxString& aLibraryPath,
const MODULE_MAP& mods = m_cache->GetModules(); const MODULE_MAP& mods = m_cache->GetModules();
for( MODULE_CITER it = mods.begin(); it != mods.end(); ++it ) for( MODULE_CITER it = mods.begin(); it != mods.end(); ++it )
{ {
ret.Add( FROM_UTF8( it->first.c_str() ) ); ret.Add( FROM_UTF8( it->first.c_str() ) );
@ -1733,6 +1742,7 @@ wxArrayString PCB_IO::FootprintEnumerate( const wxString& aLibraryPath,
return ret; return ret;
} }
MODULE* PCB_IO::FootprintLoad( const wxString& aLibraryPath, const wxString& aFootprintName, MODULE* PCB_IO::FootprintLoad( const wxString& aLibraryPath, const wxString& aFootprintName,
const PROPERTIES* aProperties ) const PROPERTIES* aProperties )
{ {
@ -1755,6 +1765,7 @@ MODULE* PCB_IO::FootprintLoad( const wxString& aLibraryPath, const wxString& aFo
return new MODULE( *it->second->GetModule() ); return new MODULE( *it->second->GetModule() );
} }
void PCB_IO::FootprintSave( const wxString& aLibraryPath, const MODULE* aFootprint, void PCB_IO::FootprintSave( const wxString& aLibraryPath, const MODULE* aFootprint,
const PROPERTIES* aProperties ) const PROPERTIES* aProperties )
{ {
@ -1770,8 +1781,10 @@ void PCB_IO::FootprintSave( const wxString& aLibraryPath, const MODULE* aFootpri
if( !m_cache->IsWritable() ) if( !m_cache->IsWritable() )
{ {
wxString msg = wxString::Format( _( "Library '%s' is read only" ), wxString msg = wxString::Format(
GetChars( aLibraryPath ) ); _( "Library '%s' is read only" ),
GetChars( aLibraryPath )
);
THROW_IO_ERROR( msg ); THROW_IO_ERROR( msg );
} }
@ -1781,20 +1794,17 @@ void PCB_IO::FootprintSave( const wxString& aLibraryPath, const MODULE* aFootpri
MODULE_MAP& mods = m_cache->GetModules(); MODULE_MAP& mods = m_cache->GetModules();
// Quietly overwrite module and delete module file from path for any by same name. // Quietly overwrite module and delete module file from path for any by same name.
wxFileName fn( aLibraryPath, aFootprint->GetFPID().GetFootprintName(), wxFileName fn( aLibraryPath, aFootprint->GetFPID().GetFootprintName(), KiCadFootprintFileExtension );
KiCadFootprintFileExtension );
if( !fn.IsOk() ) if( !fn.IsOk() )
{ {
THROW_IO_ERROR( THROW_IO_ERROR( wxString::Format( _( "Footprint file name '%s' is not valid." ),
wxString::Format( _( "Footprint file name '%s' is not valid." ),
GetChars( fn.GetFullPath() ) ) ); GetChars( fn.GetFullPath() ) ) );
} }
if( fn.FileExists() && !fn.IsFileWritable() ) if( fn.FileExists() && !fn.IsFileWritable() )
{ {
THROW_IO_ERROR( THROW_IO_ERROR( wxString::Format( _( "user does not have write permission to delete file '%s' " ),
wxString::Format( _( "user does not have write permission to delete file '%s' " ),
GetChars( fn.GetFullPath() ) ) ); GetChars( fn.GetFullPath() ) ) );
} }
@ -1826,8 +1836,8 @@ void PCB_IO::FootprintSave( const wxString& aLibraryPath, const MODULE* aFootpri
m_cache->Save(); m_cache->Save();
} }
void PCB_IO::FootprintDelete( const wxString& aLibraryPath, const wxString& aFootprintName,
const PROPERTIES* aProperties ) void PCB_IO::FootprintDelete( const wxString& aLibraryPath, const wxString& aFootprintName, const PROPERTIES* aProperties )
{ {
LOCALE_IO toggle; // toggles on, then off, the C locale. LOCALE_IO toggle; // toggles on, then off, the C locale.
@ -1837,19 +1847,19 @@ void PCB_IO::FootprintDelete( const wxString& aLibraryPath, const wxString& aFoo
if( !m_cache->IsWritable() ) if( !m_cache->IsWritable() )
{ {
THROW_IO_ERROR( THROW_IO_ERROR( wxString::Format( _( "Library '%s' is read only" ),
wxString::Format( _( "Library '%s' is read only" ), aLibraryPath.GetData() ) ); aLibraryPath.GetData() ) );
} }
m_cache->Remove( aFootprintName ); m_cache->Remove( aFootprintName );
} }
void PCB_IO::FootprintLibCreate( const wxString& aLibraryPath, const PROPERTIES* aProperties ) void PCB_IO::FootprintLibCreate( const wxString& aLibraryPath, const PROPERTIES* aProperties )
{ {
if( wxDir::Exists( aLibraryPath ) ) if( wxDir::Exists( aLibraryPath ) )
{ {
THROW_IO_ERROR( THROW_IO_ERROR( wxString::Format( _( "cannot overwrite library path '%s'" ),
wxString::Format( _( "cannot overwrite library path '%s'" ),
aLibraryPath.GetData() ) ); aLibraryPath.GetData() ) );
} }
@ -1862,6 +1872,7 @@ void PCB_IO::FootprintLibCreate( const wxString& aLibraryPath, const PROPERTIES*
m_cache->Save(); m_cache->Save();
} }
bool PCB_IO::FootprintLibDelete( const wxString& aLibraryPath, const PROPERTIES* aProperties ) bool PCB_IO::FootprintLibDelete( const wxString& aLibraryPath, const PROPERTIES* aProperties )
{ {
wxFileName fn; wxFileName fn;
@ -1873,8 +1884,7 @@ bool PCB_IO::FootprintLibDelete( const wxString& aLibraryPath, const PROPERTIES*
if( !fn.IsDirWritable() ) if( !fn.IsDirWritable() )
{ {
THROW_IO_ERROR( THROW_IO_ERROR( wxString::Format( _( "user does not have permission to delete directory '%s'" ),
wxString::Format( _( "user does not have permission to delete directory '%s'" ),
aLibraryPath.GetData() ) ); aLibraryPath.GetData() ) );
} }
@ -1882,8 +1892,7 @@ bool PCB_IO::FootprintLibDelete( const wxString& aLibraryPath, const PROPERTIES*
if( dir.HasSubDirs() ) if( dir.HasSubDirs() )
{ {
THROW_IO_ERROR( THROW_IO_ERROR( wxString::Format( _( "library directory '%s' has unexpected sub-directories" ),
wxString::Format( _( "library directory '%s' has unexpected sub-directories" ),
aLibraryPath.GetData() ) ); aLibraryPath.GetData() ) );
} }
@ -1902,9 +1911,7 @@ bool PCB_IO::FootprintLibDelete( const wxString& aLibraryPath, const PROPERTIES*
if( tmp.GetExt() != KiCadFootprintFileExtension ) if( tmp.GetExt() != KiCadFootprintFileExtension )
{ {
THROW_IO_ERROR( THROW_IO_ERROR( wxString::Format( _( "unexpected file '%s' was found in library path '%s'" ),
wxString::Format(
_( "unexpected file '%s' was found in library path '%s'" ),
files[i].GetData(), aLibraryPath.GetData() ) ); files[i].GetData(), aLibraryPath.GetData() ) );
} }
} }
@ -1922,8 +1929,7 @@ bool PCB_IO::FootprintLibDelete( const wxString& aLibraryPath, const PROPERTIES*
// we don't want that. we want bare metal portability with no UI here. // we don't want that. we want bare metal portability with no UI here.
if( !wxRmdir( aLibraryPath ) ) if( !wxRmdir( aLibraryPath ) )
{ {
THROW_IO_ERROR( THROW_IO_ERROR( wxString::Format( _( "footprint library '%s' cannot be deleted" ),
wxString::Format( _( "footprint library '%s' cannot be deleted" ),
aLibraryPath.GetData() ) ); aLibraryPath.GetData() ) );
} }
@ -1943,6 +1949,7 @@ bool PCB_IO::FootprintLibDelete( const wxString& aLibraryPath, const PROPERTIES*
return true; return true;
} }
bool PCB_IO::IsFootprintLibWritable( const wxString& aLibraryPath ) bool PCB_IO::IsFootprintLibWritable( const wxString& aLibraryPath )
{ {
LOCALE_IO toggle; LOCALE_IO toggle;