haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
kicad/pcbnew/pcb_parser.cpp

2883 lines
79 KiB
C++
Raw Normal View History

Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2012 CERN
Pcbnew: enhancements for blind/buried vias palcement, and save blind/buried vias allowed option in .kicad_pcb file
2013-08-28 16:14:39 +00:00
* @author Wayne Stambaugh <stambaughw@verizon.net>
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
*
* 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
*/
/**
* @file pcb_parser.cpp
* @brief Pcbnew s-expression file format parser implementation.
*/
#include <errno.h>
#include <common.h>
Added NETINFO_MAPPING, to ease saving nets with consecutive net codes (without modifying the net codes during the run time). Now, nets are saved with consecutive net codes (both modern & legacy plugins). Zones are saved together with their nets, without depending on the fact if there are any pads with such net. Therefore validation of zone net names was removed (pcbnew/class_board.cpp). Performed tests: - Changed a pad's net name from empty to existent - ok, name was changed. - Changed a pad's net name from empty to nonexistent - ok, error message is displayed, net name stays empty. - Changed a pad's net name from existent to empty - ok, net name became empty - Changed a pad's net name from existent to nonexistent - ok, error message is displayed, net name is not changed. - Drawn a zone that belongs to a net, then modified schematics so the net does not exist anymore. After reloading the net list, all pads/tracks are updated. Zones still belongs to the net that does not exist in the schematic (but still exists in .kicad_pcb file). After running DRC, the zone becomes not filled. - Undo & redo affects assignment of a polygon to a specific net (you may change net of a polygon, refill it and undo/redo the changes). - KiCad s-expr & legacy, Eagle, P-CAD boards seem to load without any problem (they also contain correct net names assigned to the appropriate pads). All types of board file formats were loaded, then saved in sexpr format and reopened with a KiCad built from the master branch (without my modifications). - A few boards were also saved using the legacy format and were opened with the master KiCad without any issues. - Change a net name for a pad, restore with undo/redo - ok - Remove everything, restore with undo - ok - Remove everything, reload netlist - ok Differences observed between files saved by the master branch KiCad and this one: - list of nets are not saved in any particular order, so net codes may differ - the default net class does not contain the unconnected net
2014-01-28 09:19:51 +00:00
#include <confirm.h>
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
#include <macros.h>
#include <convert_from_iu.h>
#include <trigo.h>
#include <3d_struct.h>
#include <class_title_block.h>
Pcbnew s-experssion footprint library implementation. * Add footprint methods to PCB_IO. * Add FP_CACHE and FP_CACHE_ITEM for handling new footprint library design. * Add code to save legacy libraries in new format. * Change behavior of BOARD_ITEM::GetLayerName() to return the default layer name when the item does not have a BOARD as a parent. * Minor changes to the module output formatter when writing to module library files (no BOARD as parent). * Add new (and some that I forgot along the way) CMake flags to EDA_BASE_FRAME::CopyVersionInfoToClipboard(). * Add -Wno-narrowing to GCC flags to stop GCC 4.7 from complaining about a conversion from int to unsigned in the Boost polygon library. * Add INPUT_STREAM_READER to richio.cpp to allow using any object derived from wxInputStream as a LINE_READER (needs to be validated).
2012-10-07 15:37:25 +00:00
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
#include <class_board.h>
#include <class_dimension.h>
#include <class_drawsegment.h>
#include <class_edge_mod.h>
#include <class_mire.h>
#include <class_module.h>
#include <class_netclass.h>
#include <class_pad.h>
#include <class_track.h>
#include <class_zone.h>
Pcbnew s-experssion footprint library implementation. * Add footprint methods to PCB_IO. * Add FP_CACHE and FP_CACHE_ITEM for handling new footprint library design. * Add code to save legacy libraries in new format. * Change behavior of BOARD_ITEM::GetLayerName() to return the default layer name when the item does not have a BOARD as a parent. * Minor changes to the module output formatter when writing to module library files (no BOARD as parent). * Add new (and some that I forgot along the way) CMake flags to EDA_BASE_FRAME::CopyVersionInfoToClipboard(). * Add -Wno-narrowing to GCC flags to stop GCC 4.7 from complaining about a conversion from int to unsigned in the Boost polygon library. * Add INPUT_STREAM_READER to richio.cpp to allow using any object derived from wxInputStream as a LINE_READER (needs to be validated).
2012-10-07 15:37:25 +00:00
#include <kicad_plugin.h>
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
#include <pcb_plot_params.h>
#include <zones.h>
#include <pcb_parser.h>
Fixes the bug that causes pcbnew crash, when there are multiple net classes and the plot dialog was opened. Changed NETCLASS* to boost::shared_ptr<NETCLASS>.
2014-05-20 09:29:37 +00:00
#include <boost/make_shared.hpp>
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
move PCB_PARSER into PCB_IO as a member
2012-10-24 18:20:33 +00:00
void PCB_PARSER::init()
{
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
m_layerIndices.clear();
m_layerMasks.clear();
move PCB_PARSER into PCB_IO as a member
2012-10-24 18:20:33 +00:00
populate PCB_PARSER::m_layerMap with English layernames so footprints can be parsed, since they do not have an overriding layer name map like a BOARD does. Avoid doubly looking up hashtable entries in m_layerMap. Minor code reformatting.
2012-11-09 06:58:00 +00:00
// Add untranslated default (i.e. english) layernames.
// Some may be overridden later if parsing a board rather than a footprint.
// The english name will survive if parsing only a footprint.
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
for( LAYER_NUM layer = 0; layer < LAYER_ID_COUNT; ++layer )
populate PCB_PARSER::m_layerMap with English layernames so footprints can be parsed, since they do not have an overriding layer name map like a BOARD does. Avoid doubly looking up hashtable entries in m_layerMap. Minor code reformatting.
2012-11-09 06:58:00 +00:00
{
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
std::string untranslated = TO_UTF8( wxString( LSET::Name( LAYER_ID( layer ) ) ) );
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
m_layerIndices[ untranslated ] = LAYER_ID( layer );
re-work the LSET(int,...) constructor
2014-06-29 18:09:32 +00:00
m_layerMasks[ untranslated ] = LSET( LAYER_ID( layer ) );
populate PCB_PARSER::m_layerMap with English layernames so footprints can be parsed, since they do not have an overriding layer name map like a BOARD does. Avoid doubly looking up hashtable entries in m_layerMap. Minor code reformatting.
2012-11-09 06:58:00 +00:00
}
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
m_layerMasks[ "*.Cu" ] = LSET::AllCuMask();
m_layerMasks[ "F&B.Cu" ] = LSET( 2, F_Cu, B_Cu );
m_layerMasks[ "*.Adhes" ] = LSET( 2, B_Adhes, F_Adhes );
m_layerMasks[ "*.Paste" ] = LSET( 2, B_Paste, F_Paste );
m_layerMasks[ "*.Mask" ] = LSET( 2, B_Mask, F_Mask );
m_layerMasks[ "*.SilkS" ] = LSET( 2, B_SilkS, F_SilkS );
m_layerMasks[ "*.Fab" ] = LSET( 2, B_Fab, F_Fab );
// This is for the first pretty format, which had Inner1_Cu-Inner14_Cu with the numbering
// sequence reversed from the In1_Cu-In30_Cu version 2 pretty numbering scheme.
// Version 2 brought in an additional 16 Cu layers and flipped the cu stack but
// kept the gap between one of the outside layers and the last cu internal.
for( int i=1; i<=14; ++i )
{
fix LSET() constructors, formatting
2014-06-29 20:33:29 +00:00
std::string key = StrPrintf( "Inner%d", i );
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
fix LSET() constructors, formatting
2014-06-29 20:33:29 +00:00
m_layerMasks[ key ] = LSET( LAYER_ID( In15_Cu - i ) );
}
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
fix LSET() constructors, formatting
2014-06-29 20:33:29 +00:00
#if defined(DEBUG) && 0
printf( "m_layerMasks:\n" );
for( LSET_MAP::const_iterator it = m_layerMasks.begin(); it != m_layerMasks.end(); ++it )
{
printf( " [%s] == 0x%s\n", it->first.c_str(), it->second.FmtHex().c_str() );
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
}
fix LSET() constructors, formatting
2014-06-29 20:33:29 +00:00
printf( "m_layerIndices:\n" );
for( LAYER_ID_MAP::const_iterator it = m_layerIndices.begin(); it != m_layerIndices.end(); ++it )
{
printf( " [%s] == %d\n", it->first.c_str(), it->second );
}
#endif
move PCB_PARSER into PCB_IO as a member
2012-10-24 18:20:33 +00:00
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
double PCB_PARSER::parseDouble() throw( IO_ERROR )
{
char* tmp;
errno = 0;
double fval = strtod( CurText(), &tmp );
if( errno )
{
wxString error;
revert text strings for clarity
2013-04-11 18:00:36 +00:00
error.Printf( _( "invalid floating point number in\nfile: <%s>\nline: %d\noffset: %d" ),
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
GetChars( CurSource() ), CurLineNumber(), CurOffset() );
THROW_IO_ERROR( error );
}
if( CurText() == tmp )
{
wxString error;
revert text strings for clarity
2013-04-11 18:00:36 +00:00
error.Printf( _( "missing floating point number in\nfile: <%s>\nline: %d\noffset: %d" ),
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
GetChars( CurSource() ), CurLineNumber(), CurOffset() );
THROW_IO_ERROR( error );
}
return fval;
}
bool PCB_PARSER::parseBool() throw( PARSE_ERROR )
{
T token = NextTok();
if( token == T_yes )
return true;
else if( token == T_no )
return false;
else
Expecting( "yes or no" );
return false;
}
wxPoint PCB_PARSER::parseXY() throw( PARSE_ERROR )
{
if( CurTok() != T_LEFT )
NeedLEFT();
wxPoint pt;
T token = NextTok();
if( token != T_xy )
Expecting( T_xy );
pt.x = parseBoardUnits( "X coordinate" );
pt.y = parseBoardUnits( "Y coordinate" );
NeedRIGHT();
return pt;
}
void PCB_PARSER::parseXY( int* aX, int* aY ) throw( PARSE_ERROR )
{
wxPoint pt = parseXY();
if( aX )
*aX = pt.x;
if( aY )
*aY = pt.y;
}
void PCB_PARSER::parseEDA_TEXT( EDA_TEXT* aText ) throw( PARSE_ERROR )
{
wxCHECK_RET( CurTok() == T_effects,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as EDA_TEXT." ) );
T token;
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token != T_LEFT )
Expecting( T_LEFT );
token = NextTok();
switch( token )
{
case T_font:
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token == T_LEFT )
continue;
switch( token )
{
case T_size:
{
wxSize sz;
sz.SetHeight( parseBoardUnits( "text height" ) );
sz.SetWidth( parseBoardUnits( "text width" ) );
aText->SetSize( sz );
NeedRIGHT();
break;
}
case T_thickness:
aText->SetThickness( parseBoardUnits( "text thickness" ) );
NeedRIGHT();
break;
case T_bold:
aText->SetBold( true );
break;
case T_italic:
aText->SetItalic( true );
break;
default:
Expecting( "size, bold, or italic" );
}
}
break;
case T_justify:
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token == T_LEFT )
continue;
switch( token )
{
case T_left:
aText->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT );
break;
case T_right:
aText->SetHorizJustify( GR_TEXT_HJUSTIFY_RIGHT );
break;
case T_top:
aText->SetVertJustify( GR_TEXT_VJUSTIFY_TOP );
break;
case T_bottom:
aText->SetVertJustify( GR_TEXT_VJUSTIFY_BOTTOM );
break;
case T_mirror:
aText->SetMirrored( true );
break;
default:
Expecting( "left, right, top, bottom, or mirror" );
}
}
break;
case T_hide:
aText->SetVisible( false );
break;
default:
Expecting( "font, justify, or hide" );
}
}
}
S3D_MASTER* PCB_PARSER::parse3DModel() throw( PARSE_ERROR )
{
wxCHECK_MSG( CurTok() == T_model, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as S3D_MASTER." ) );
T token;
Remove some uses of using namespace std.
2013-12-13 16:27:30 +00:00
std::auto_ptr< S3D_MASTER > n3D( new S3D_MASTER( NULL ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
Fix Pcbnew s-expr file parser bug.
2012-12-30 15:40:05 +00:00
NeedSYMBOLorNUMBER();
add patch from Cirilo Bernardo, and minor fixes.
2014-01-25 12:23:29 +00:00
n3D->SetShape3DName( FromUTF8() );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token != T_LEFT )
Expecting( T_LEFT );
token = NextTok();
switch( token )
{
case T_at:
NeedLEFT();
token = NextTok();
if( token != T_xyz )
Expecting( T_xyz );
n3D->m_MatPosition.x = parseDouble( "x value" );
n3D->m_MatPosition.y = parseDouble( "y value" );
n3D->m_MatPosition.z = parseDouble( "z value" );
NeedRIGHT();
break;
case T_scale:
NeedLEFT();
token = NextTok();
if( token != T_xyz )
Expecting( T_xyz );
n3D->m_MatScale.x = parseDouble( "x value" );
n3D->m_MatScale.y = parseDouble( "y value" );
n3D->m_MatScale.z = parseDouble( "z value" );
NeedRIGHT();
break;
case T_rotate:
NeedLEFT();
token = NextTok();
if( token != T_xyz )
Expecting( T_xyz );
n3D->m_MatRotation.x = parseDouble( "x value" );
n3D->m_MatRotation.y = parseDouble( "y value" );
n3D->m_MatRotation.z = parseDouble( "z value" );
NeedRIGHT();
break;
default:
Expecting( "at, scale, or rotate" );
}
NeedRIGHT();
}
return n3D.release();
}
BOARD_ITEM* PCB_PARSER::Parse() throw( IO_ERROR, PARSE_ERROR )
{
Support for 'initial single line comments' in the pretty footprint format. This is limited to round tripping the lines of commented text in the loading and saving to disk through PCBIO::Format() and PCBIO::Parse(). No editing of the comments is given.
2013-06-23 19:18:33 +00:00
T token;
BOARD_ITEM* item;
LOCALE_IO toggle;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
Support for 'initial single line comments' in the pretty footprint format. This is limited to round tripping the lines of commented text in the loading and saving to disk through PCBIO::Format() and PCBIO::Parse(). No editing of the comments is given.
2013-06-23 19:18:33 +00:00
// MODULEs can be prefixed with an initial block of single line comments and these
// are kept for Format() so they round trip in s-expression form. BOARDs might
// eventually do the same, but currently do not.
std::auto_ptr<wxArrayString> initial_comments( ReadCommentLines() );
token = CurTok();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
if( token != T_LEFT )
Expecting( T_LEFT );
switch( NextTok() )
{
case T_kicad_pcb:
if( m_board == NULL )
m_board = new BOARD();
item = (BOARD_ITEM*) parseBOARD();
break;
Pcbnew s-experssion footprint library implementation. * Add footprint methods to PCB_IO. * Add FP_CACHE and FP_CACHE_ITEM for handling new footprint library design. * Add code to save legacy libraries in new format. * Change behavior of BOARD_ITEM::GetLayerName() to return the default layer name when the item does not have a BOARD as a parent. * Minor changes to the module output formatter when writing to module library files (no BOARD as parent). * Add new (and some that I forgot along the way) CMake flags to EDA_BASE_FRAME::CopyVersionInfoToClipboard(). * Add -Wno-narrowing to GCC flags to stop GCC 4.7 from complaining about a conversion from int to unsigned in the Boost polygon library. * Add INPUT_STREAM_READER to richio.cpp to allow using any object derived from wxInputStream as a LINE_READER (needs to be validated).
2012-10-07 15:37:25 +00:00
case T_module:
Support for 'initial single line comments' in the pretty footprint format. This is limited to round tripping the lines of commented text in the loading and saving to disk through PCBIO::Format() and PCBIO::Parse(). No editing of the comments is given.
2013-06-23 19:18:33 +00:00
item = (BOARD_ITEM*) parseMODULE( initial_comments.release() );
Pcbnew s-experssion footprint library implementation. * Add footprint methods to PCB_IO. * Add FP_CACHE and FP_CACHE_ITEM for handling new footprint library design. * Add code to save legacy libraries in new format. * Change behavior of BOARD_ITEM::GetLayerName() to return the default layer name when the item does not have a BOARD as a parent. * Minor changes to the module output formatter when writing to module library files (no BOARD as parent). * Add new (and some that I forgot along the way) CMake flags to EDA_BASE_FRAME::CopyVersionInfoToClipboard(). * Add -Wno-narrowing to GCC flags to stop GCC 4.7 from complaining about a conversion from int to unsigned in the Boost polygon library. * Add INPUT_STREAM_READER to richio.cpp to allow using any object derived from wxInputStream as a LINE_READER (needs to be validated).
2012-10-07 15:37:25 +00:00
break;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
default:
wxString err;
Pcbnew: minor changes in pcb-parser.cpp and kicad_plugin.cpp to make translations easier. Code cleaning in autoroute functions.
2012-06-26 17:57:37 +00:00
err.Printf( _( "unknown token \"%s\"" ), GetChars( FromUTF8() ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
THROW_PARSE_ERROR( err, CurSource(), CurLine(), CurLineNumber(), CurOffset() );
}
return item;
}
BOARD* PCB_PARSER::parseBOARD() throw( IO_ERROR, PARSE_ERROR )
{
T token;
parseHeader();
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token != T_LEFT )
Expecting( T_LEFT );
token = NextTok();
switch( token )
{
case T_general:
parseGeneralSection();
break;
case T_page:
parsePAGE_INFO();
break;
case T_title_block:
parseTITLE_BLOCK();
break;
case T_layers:
parseLayers();
break;
case T_setup:
parseSetup();
break;
case T_net:
parseNETINFO_ITEM();
break;
case T_net_class:
parseNETCLASS();
break;
case T_gr_arc:
case T_gr_circle:
case T_gr_curve:
case T_gr_line:
case T_gr_poly:
m_board->Add( parseDRAWSEGMENT(), ADD_APPEND );
break;
case T_gr_text:
m_board->Add( parseTEXTE_PCB(), ADD_APPEND );
break;
case T_dimension:
m_board->Add( parseDIMENSION(), ADD_APPEND );
break;
case T_module:
m_board->Add( parseMODULE(), ADD_APPEND );
break;
case T_segment:
Another way of handling items for the ratsnest (clearer and now finally supports undo/redo of the PNS created tracks).
2014-01-30 14:46:39 +00:00
m_board->Add( parseTRACK(), ADD_APPEND );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_via:
TRACK/SEGVIA cleanup - SEGVIA becomes VIA - Drill size moved from TRACK to VIA - Removed shape from TRACK, becomes ViaType in VIA - GetTrace becomes GetTrack, for uniformity - Some minor constification and typo fixes
2014-04-25 06:00:04 +00:00
m_board->Add( parseVIA(), ADD_APPEND );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_zone:
m_board->Add( parseZONE_CONTAINER(), ADD_APPEND );
break;
case T_target:
m_board->Add( parsePCB_TARGET(), ADD_APPEND );
break;
default:
wxString err;
err.Printf( _( "unknown token \"%s\"" ), GetChars( FromUTF8() ) );
THROW_PARSE_ERROR( err, CurSource(), CurLine(), CurLineNumber(), CurOffset() );
}
}
return m_board;
}
void PCB_PARSER::parseHeader() throw( IO_ERROR, PARSE_ERROR )
{
wxCHECK_RET( CurTok() == T_kicad_pcb,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as a header." ) );
T token;
NeedLEFT();
token = NextTok();
if( token != T_version )
Expecting( GetTokenText( T_version ) );
// Get the file version.
Commit JP's custom page size fix for Pcbnew s-expressions file format with minor changes. Thanks JP.
2012-06-25 23:52:57 +00:00
m_board->SetFileFormatVersionAtLoad( parseInt( GetTokenText( T_version ) ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
// Skip the host name and host build version information.
NeedRIGHT();
NeedLEFT();
NeedSYMBOL();
NeedSYMBOL();
NeedSYMBOL();
NeedRIGHT();
}
void PCB_PARSER::parseGeneralSection() throw( IO_ERROR, PARSE_ERROR )
{
wxCHECK_RET( CurTok() == T_general,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) +
wxT( " as a general section." ) );
T token;
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token != T_LEFT )
Expecting( T_LEFT );
token = NextTok();
switch( token )
{
case T_thickness:
m_board->GetDesignSettings().SetBoardThickness( parseBoardUnits( T_thickness ) );
NeedRIGHT();
break;
bugfix 1325375: pcbnew crash while append a board
2014-06-02 09:41:54 +00:00
case T_nets:
m_netCodes.resize( parseInt( "nets number" ) );
NeedRIGHT();
break;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
case T_no_connects:
Pcbnew BOARD object encapsulation improvements.
2013-01-09 18:52:44 +00:00
m_board->SetUnconnectedNetCount( parseInt( "no connect count" ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
default: // Skip everything but the board thickness.
Pcbnew, plot functions: fix bug in SVG plotter, fix a minor other bug when using PS plotter (trcak width fine adjust not working) and plot code cleaning continued
2012-09-24 06:39:59 +00:00
wxLogDebug( wxT( "Skipping general section token %s " ),
Fixed compilation with unicode (wxString to printf without GetChars)
2012-08-29 17:28:33 +00:00
GetChars( GetTokenString( token ) ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
while( ( token = NextTok() ) != T_RIGHT )
{
if( !IsSymbol( token ) && token != T_NUMBER )
Expecting( "symbol or number" );
}
}
}
}
void PCB_PARSER::parsePAGE_INFO() throw( IO_ERROR, PARSE_ERROR )
{
wxCHECK_RET( CurTok() == T_page,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as a PAGE_INFO." ) );
T token;
Commit JP's custom page size fix for Pcbnew s-expressions file format with minor changes. Thanks JP.
2012-06-25 23:52:57 +00:00
PAGE_INFO pageInfo;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedSYMBOL();
wxString pageType = FromUTF8();
Commit JP's custom page size fix for Pcbnew s-expressions file format with minor changes. Thanks JP.
2012-06-25 23:52:57 +00:00
if( !pageInfo.SetType( pageType ) )
{
wxString err;
err.Printf( _( "page type \"%s\" is not valid " ), GetChars( FromUTF8() ) );
THROW_PARSE_ERROR( err, CurSource(), CurLine(), CurLineNumber(), CurOffset() );
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
if( pageType == PAGE_INFO::Custom )
{
Commit JP's custom page size fix for Pcbnew s-expressions file format with minor changes. Thanks JP.
2012-06-25 23:52:57 +00:00
double width = parseDouble( "width" ); // width in mm
// Perform some controls to avoid crashes if the size is edited by hands
if( width < 100.0 )
width = 100.0;
else if( width > 1200.0 )
width = 1200.0;
double height = parseDouble( "height" ); // height in mm
if( height < 100.0 )
height = 100.0;
else if( height > 1200.0 )
height = 1200.0;
pageInfo.SetWidthMils( Mm2mils( width ) );
pageInfo.SetHeightMils( Mm2mils( height ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
}
token = NextTok();
if( token == T_portrait )
{
Commit JP's custom page size fix for Pcbnew s-expressions file format with minor changes. Thanks JP.
2012-06-25 23:52:57 +00:00
pageInfo.SetPortrait( true );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
}
else if( token != T_RIGHT )
{
Expecting( "portrait|)" );
}
m_board->SetPageSettings( pageInfo );
}
void PCB_PARSER::parseTITLE_BLOCK() throw( IO_ERROR, PARSE_ERROR )
{
wxCHECK_RET( CurTok() == T_title_block,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) +
wxT( " as TITLE_BLOCK." ) );
T token;
TITLE_BLOCK titleBlock;
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token != T_LEFT )
Expecting( T_LEFT );
token = NextTok();
switch( token )
{
case T_title:
Fix Pcbnew s-expr file parser bug.
2012-12-30 15:40:05 +00:00
NextTok();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
titleBlock.SetTitle( FromUTF8() );
break;
case T_date:
Fix Pcbnew s-expr file parser bug.
2012-12-30 15:40:05 +00:00
NextTok();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
titleBlock.SetDate( FromUTF8() );
break;
case T_rev:
NextTok();
titleBlock.SetRevision( FromUTF8() );
break;
case T_company:
NextTok();
titleBlock.SetCompany( FromUTF8() );
break;
case T_comment:
Footprint library table work, minor fixes, and code cleaning. * Fix a bug when full file name and path are passed to FOOTPRINT_INFO:: ReadFootprintFiles() which I created in bug fix lp:593989. * Fix a wxString debug assertion in EDA_APP::InitEDA_Appl() when the KICAD environment variable is defined as an empty string. * Add error dialog when libraries cannot be found in system search path when loading footprint using the select footprint dialog. * Add footprint library name column to the EDA_LIST_DIALOG when selecting footprints from the list. * Allow reading all columns from the selected row in EDA_LIST_DIALOG. * Remove redundant sort from EDA_LIST_DIALOG constructor * Add library name member variable and accessors to FOOTPRINT_INFO. * Make headers translatable for Eeschema select component from list dialog. * Add some helper methods to FPID for identifying the FPID type and validity. * Remove a bunch of trailing whitespace and add missing license comments.
2013-05-08 20:47:23 +00:00
{
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
int commentNumber = parseInt( "comment" );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
switch( commentNumber )
{
case 1:
NextTok();
titleBlock.SetComment1( FromUTF8() );
break;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
case 2:
NextTok();
titleBlock.SetComment2( FromUTF8() );
break;
populate PCB_PARSER::m_layerMap with English layernames so footprints can be parsed, since they do not have an overriding layer name map like a BOARD does. Avoid doubly looking up hashtable entries in m_layerMap. Minor code reformatting.
2012-11-09 06:58:00 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
case 3:
NextTok();
titleBlock.SetComment3( FromUTF8() );
break;
Footprint library table work, minor fixes, and code cleaning. * Fix a bug when full file name and path are passed to FOOTPRINT_INFO:: ReadFootprintFiles() which I created in bug fix lp:593989. * Fix a wxString debug assertion in EDA_APP::InitEDA_Appl() when the KICAD environment variable is defined as an empty string. * Add error dialog when libraries cannot be found in system search path when loading footprint using the select footprint dialog. * Add footprint library name column to the EDA_LIST_DIALOG when selecting footprints from the list. * Allow reading all columns from the selected row in EDA_LIST_DIALOG. * Remove redundant sort from EDA_LIST_DIALOG constructor * Add library name member variable and accessors to FOOTPRINT_INFO. * Make headers translatable for Eeschema select component from list dialog. * Add some helper methods to FPID for identifying the FPID type and validity. * Remove a bunch of trailing whitespace and add missing license comments.
2013-05-08 20:47:23 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
case 4:
NextTok();
titleBlock.SetComment4( FromUTF8() );
break;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
default:
wxString err;
err.Printf( wxT( "%d is not a valid title block comment number" ), commentNumber );
THROW_PARSE_ERROR( err, CurSource(), CurLine(), CurLineNumber(), CurOffset() );
}
}
Footprint library table work, minor fixes, and code cleaning. * Fix a bug when full file name and path are passed to FOOTPRINT_INFO:: ReadFootprintFiles() which I created in bug fix lp:593989. * Fix a wxString debug assertion in EDA_APP::InitEDA_Appl() when the KICAD environment variable is defined as an empty string. * Add error dialog when libraries cannot be found in system search path when loading footprint using the select footprint dialog. * Add footprint library name column to the EDA_LIST_DIALOG when selecting footprints from the list. * Allow reading all columns from the selected row in EDA_LIST_DIALOG. * Remove redundant sort from EDA_LIST_DIALOG constructor * Add library name member variable and accessors to FOOTPRINT_INFO. * Make headers translatable for Eeschema select component from list dialog. * Add some helper methods to FPID for identifying the FPID type and validity. * Remove a bunch of trailing whitespace and add missing license comments.
2013-05-08 20:47:23 +00:00
break;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
default:
Expecting( "title, date, rev, company, or comment" );
}
NeedRIGHT();
}
m_board->SetTitleBlock( titleBlock );
}
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
void PCB_PARSER::parseLayer( LAYER* aLayer ) throw( IO_ERROR, PARSE_ERROR )
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
{
populate PCB_PARSER::m_layerMap with English layernames so footprints can be parsed, since they do not have an overriding layer name map like a BOARD does. Avoid doubly looking up hashtable entries in m_layerMap. Minor code reformatting.
2012-11-09 06:58:00 +00:00
T token;
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
std::string name;
populate PCB_PARSER::m_layerMap with English layernames so footprints can be parsed, since they do not have an overriding layer name map like a BOARD does. Avoid doubly looking up hashtable entries in m_layerMap. Minor code reformatting.
2012-11-09 06:58:00 +00:00
std::string type;
bool isVisible = true;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
if( CurTok() != T_LEFT )
Expecting( T_LEFT );
// this layer_num is not used, we DO depend on LAYER_T however.
LAYER_NUM layer_num = parseInt( "layer index" );
NeedSYMBOL();
name = CurText();
NeedSYMBOL();
type = CurText();
token = NextTok();
if( token == T_hide )
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
{
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
isVisible = false;
NeedRIGHT();
}
else if( token != T_RIGHT )
{
Expecting( "hide or )" );
}
aLayer->m_name = FROM_UTF8( name.c_str() );
aLayer->m_type = LAYER::ParseType( type.c_str() );
aLayer->m_number = layer_num;
aLayer->m_visible = isVisible;
}
void PCB_PARSER::parseLayers() throw( IO_ERROR, PARSE_ERROR )
{
wxCHECK_RET( CurTok() == T_layers,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as layers." ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
T token;
LSET visibleLayers;
LSET enabledLayers;
int copperLayerCount = 0;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
std::vector<LAYER> cu;
populate PCB_PARSER::m_layerMap with English layernames so footprints can be parsed, since they do not have an overriding layer name map like a BOARD does. Avoid doubly looking up hashtable entries in m_layerMap. Minor code reformatting.
2012-11-09 06:58:00 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
LAYER layer;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
parseLayer( &layer );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
if( layer.m_type != LT_UNDEFINED ) // it's a copper layer
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
{
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
cu.push_back( layer );
1) Fix compiles using wx 3.x and 2.8. 2) Fix passing wxString to common/config_params so lookup keys can be dynamically generated. This gives ~/.kicad files all the colors. 3) Fix LEGACY_PLUGIN so it loads all layer types and masks properly. 4) Extend the table in router/pns_index.h to 128 from 64.
2014-06-25 04:36:02 +00:00
//DBG( printf( "cop m_visible:%s\n", cu.back().m_visible ? "true" : "false" );)
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
}
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
else // all non-copper are fixed names, simply look up LAYER_ID.
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
{
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
// This is an edge triggered one shot if( test ) that happens on
// the first non copper layer, which follow all the Cu layers.
// This is the feature that the original *.kicad_pcb file format and
// the inverted Cu stack format had in common and is therefore a trick
// used to handle either. The layer number in the (layers ..)
// s-expression element are ignored.
if( cu.size() )
{
// Rework the layer numbers, which changed when the Cu stack
// was flipped. So we instead use position in the list.
cu[cu.size()-1].m_number = B_Cu;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
for( unsigned i=0; i < cu.size()-1; ++i )
{
cu[i].m_number = i;
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
for( std::vector<LAYER>::const_iterator it = cu.begin(); it<cu.end(); ++it )
{
enabledLayers.set( it->m_number );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
if( it->m_visible )
visibleLayers.set( it->m_number );
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
m_board->SetLayer( LAYER_ID( it->m_number ), *it );
pcbnew import footprint fixed for legacy nanometer format
2012-10-22 20:41:26 +00:00
1) Fix compiles using wx 3.x and 2.8. 2) Fix passing wxString to common/config_params so lookup keys can be dynamically generated. This gives ~/.kicad files all the colors. 3) Fix LEGACY_PLUGIN so it loads all layer types and masks properly. 4) Extend the table in router/pns_index.h to 128 from 64.
2014-06-25 04:36:02 +00:00
UTF8 name = it->m_name;
m_layerIndices[ name ] = LAYER_ID( it->m_number );
fix LSET() constructors, formatting
2014-06-29 20:33:29 +00:00
m_layerMasks[ name ] = LSET( LAYER_ID( it->m_number ) );
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
}
pcbnew import footprint fixed for legacy nanometer format
2012-10-22 20:41:26 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
copperLayerCount = cu.size();
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
cu.clear(); // this marks the list as "one time processed".
}
1) Fix compiles using wx 3.x and 2.8. 2) Fix passing wxString to common/config_params so lookup keys can be dynamically generated. This gives ~/.kicad files all the colors. 3) Fix LEGACY_PLUGIN so it loads all layer types and masks properly. 4) Extend the table in router/pns_index.h to 128 from 64.
2014-06-25 04:36:02 +00:00
LAYER_ID_MAP::const_iterator it = m_layerIndices.find( UTF8( layer.m_name ) );
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
if( it == m_layerIndices.end() )
{
wxString error = wxString::Format(
1) Fix compiles using wx 3.x and 2.8. 2) Fix passing wxString to common/config_params so lookup keys can be dynamically generated. This gives ~/.kicad files all the colors. 3) Fix LEGACY_PLUGIN so it loads all layer types and masks properly. 4) Extend the table in router/pns_index.h to 128 from 64.
2014-06-25 04:36:02 +00:00
_( "Layer '%s' in file '%s' at line %d, is not in fixed layer hash" ),
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
GetChars( layer.m_name ),
GetChars( CurSource() ),
CurLineNumber(),
CurOffset()
);
THROW_IO_ERROR( error );
}
layer.m_number = it->second;
enabledLayers.set( layer.m_number );
if( layer.m_visible )
visibleLayers.set( layer.m_number );
1) Fix compiles using wx 3.x and 2.8. 2) Fix passing wxString to common/config_params so lookup keys can be dynamically generated. This gives ~/.kicad files all the colors. 3) Fix LEGACY_PLUGIN so it loads all layer types and masks properly. 4) Extend the table in router/pns_index.h to 128 from 64.
2014-06-25 04:36:02 +00:00
//DBG( printf( "aux m_visible:%s\n", layer.m_visible ? "true" : "false" );)
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
m_board->SetLayer( LAYER_ID( layer.m_number ), layer );
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
}
// We need at least 2 copper layers and there must be an even number of them.
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
if( copperLayerCount < 2 || (copperLayerCount % 2) != 0 )
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
{
populate PCB_PARSER::m_layerMap with English layernames so footprints can be parsed, since they do not have an overriding layer name map like a BOARD does. Avoid doubly looking up hashtable entries in m_layerMap. Minor code reformatting.
2012-11-09 06:58:00 +00:00
wxString err = wxString::Format(
_( "%d is not a valid layer count" ), copperLayerCount );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
THROW_PARSE_ERROR( err, CurSource(), CurLine(), CurLineNumber(), CurOffset() );
}
m_board->SetCopperLayerCount( copperLayerCount );
m_board->SetEnabledLayers( enabledLayers );
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
// call SetEnabledLayers before SetVisibleLayers()
m_board->SetVisibleLayers( visibleLayers );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
}
- New typedef LAYER_MSK to encapsulate a layer bitmap - Renamed ReturnMaskLayer to GetLayerMask (since it's a plain getter)
2013-03-30 17:24:04 +00:00
template<class T, class M>
T PCB_PARSER::lookUpLayer( const M& aMap ) throw( PARSE_ERROR, IO_ERROR )
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
{
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
// avoid constructing another std::string, use lexer's directly
- New typedef LAYER_MSK to encapsulate a layer bitmap - Renamed ReturnMaskLayer to GetLayerMask (since it's a plain getter)
2013-03-30 17:24:04 +00:00
typename M::const_iterator it = aMap.find( curText );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
if( it == aMap.end() )
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
{
fix 2 corner case bugs in specctra import
2013-05-01 15:48:00 +00:00
#if 0 && defined(DEBUG)
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
// dump the whole darn table, there's something wrong with it.
for( it = aMap.begin(); it != aMap.end(); ++it )
{
Pcbnew footprint library plug in fixes and minor code cleaning. * When loading footprint do not retest every footprint in cache. Only test the footprint being loaded. Fixes long load times on libraries with a lot of parts. * Fix footprint name bug where file extension was added to the end of the footprint name. * Fix bug in path equivalence test due to Posix path separators in footprint library table. Convert paths to native separator before comparison. * Fix a bug in FOOTPRINT_VIEWER_FRAME::OnActivate() which cause the footprint list to always get reloaded when using footprint library tables. * Remove some unnecessary debugging messages. * Add a few Doxygen comments to FP_CACHE in kicad_plugin.cpp.
2013-09-24 18:45:57 +00:00
wxLogDebug( &aMap == (void*)&m_layerIndices ? wxT( "lm[%s] = %d" ) :
wxT( "lm[%s] = %08X" ), it->first.c_str(), it->second );
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
}
#endif
populate PCB_PARSER::m_layerMap with English layernames so footprints can be parsed, since they do not have an overriding layer name map like a BOARD does. Avoid doubly looking up hashtable entries in m_layerMap. Minor code reformatting.
2012-11-09 06:58:00 +00:00
wxString error = wxString::Format(
revert text strings for clarity
2013-04-11 18:00:36 +00:00
_( "Layer '%s' in file <%s> at line %d, position %d, was not defined in the layers section" ),
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
GetChars( FROM_UTF8( CurText() ) ), GetChars( CurSource() ),
CurLineNumber(), CurOffset() );
populate PCB_PARSER::m_layerMap with English layernames so footprints can be parsed, since they do not have an overriding layer name map like a BOARD does. Avoid doubly looking up hashtable entries in m_layerMap. Minor code reformatting.
2012-11-09 06:58:00 +00:00
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
THROW_IO_ERROR( error );
}
populate PCB_PARSER::m_layerMap with English layernames so footprints can be parsed, since they do not have an overriding layer name map like a BOARD does. Avoid doubly looking up hashtable entries in m_layerMap. Minor code reformatting.
2012-11-09 06:58:00 +00:00
return it->second;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
}
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
LAYER_ID PCB_PARSER::parseBoardItemLayer() throw( PARSE_ERROR, IO_ERROR )
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
{
wxCHECK_MSG( CurTok() == T_layer, UNDEFINED_LAYER,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as layer." ) );
NextTok();
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
LAYER_ID layerIndex = lookUpLayer<LAYER_ID>( m_layerIndices );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
// Handle closing ) in object parser.
return layerIndex;
}
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
LSET PCB_PARSER::parseBoardItemLayersAsMask() throw( PARSE_ERROR, IO_ERROR )
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
{
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
wxCHECK_MSG( CurTok() == T_layers, LSET(),
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) +
wxT( " as item layer mask." ) );
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
LSET layerMask;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
for( T token = NextTok(); token != T_RIGHT; token = NextTok() )
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
{
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
LSET mask = lookUpLayer<LSET>( m_layerMasks );
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
layerMask |= mask;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
}
return layerMask;
}
void PCB_PARSER::parseSetup() throw( IO_ERROR, PARSE_ERROR )
{
wxCHECK_RET( CurTok() == T_setup,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as setup." ) );
T token;
Fixes the bug that causes pcbnew crash, when there are multiple net classes and the plot dialog was opened. Changed NETCLASS* to boost::shared_ptr<NETCLASS>.
2014-05-20 09:29:37 +00:00
NETCLASSPTR defaultNetClass = m_board->GetDesignSettings().GetDefault();
Moved most of the board design rules related fields & methods to BOARD_DESIGN_SETTINGS class.
2014-05-13 09:22:51 +00:00
// TODO Orson: is it really necessary to first operate on a copy and then apply it?
// would not it be better to use reference here and apply all the changes instantly?
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
BOARD_DESIGN_SETTINGS designSettings = m_board->GetDesignSettings();
ZONE_SETTINGS zoneSettings = m_board->GetZoneSettings();
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token != T_LEFT )
Expecting( T_LEFT );
token = NextTok();
switch( token )
{
Pcbnew, plot functions: fix bug in SVG plotter, fix a minor other bug when using PS plotter (trcak width fine adjust not working) and plot code cleaning continued
2012-09-24 06:39:59 +00:00
case T_last_trace_width: // not used now
/* lastTraceWidth =*/ parseBoardUnits( T_last_trace_width );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_user_trace_width:
Moved most of the board design rules related fields & methods to BOARD_DESIGN_SETTINGS class.
2014-05-13 09:22:51 +00:00
designSettings.m_TrackWidthList.push_back( parseBoardUnits( T_user_trace_width ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_trace_clearance:
Moved NETCLASSES to BOARD_DESIGN_SETTINGS. Most of the changes are just adding GetDesignSettings() before every occurence of m_NetClasses. More complex changes: class_netclass.cpp - NETCLASS does not store the pointer to the parent BOARD anymore. Added function SetParams( BOARD_DESIGN_SETTINGS& ). class_netclass.h - Removed GetTrackMinWidth(), GetViaMinDiameter(), GetViaMinDrill(), GetuViaMinDiameter(), GetuViaMinDrill() as they were refering to BOARD_DESIGN_SETTINGS anyway (they are not net class specific). kicad_plugin.cpp - filters out empty nets (that are anyway not saved) when storing net class information. Previously it was done in NETCLASS::Format() function.
2014-05-13 09:22:51 +00:00
defaultNetClass->SetClearance( parseBoardUnits( T_trace_clearance ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_zone_clearance:
zoneSettings.m_ZoneClearance = parseBoardUnits( T_zone_clearance );
NeedRIGHT();
break;
case T_zone_45_only:
zoneSettings.m_Zone_45_Only = parseBool();
NeedRIGHT();
break;
case T_trace_min:
designSettings.m_TrackMinWidth = parseBoardUnits( T_trace_min );
NeedRIGHT();
break;
case T_segment_width:
designSettings.m_DrawSegmentWidth = parseBoardUnits( T_segment_width );
NeedRIGHT();
break;
case T_edge_width:
designSettings.m_EdgeSegmentWidth = parseBoardUnits( T_edge_width );
NeedRIGHT();
break;
case T_via_size:
Moved NETCLASSES to BOARD_DESIGN_SETTINGS. Most of the changes are just adding GetDesignSettings() before every occurence of m_NetClasses. More complex changes: class_netclass.cpp - NETCLASS does not store the pointer to the parent BOARD anymore. Added function SetParams( BOARD_DESIGN_SETTINGS& ). class_netclass.h - Removed GetTrackMinWidth(), GetViaMinDiameter(), GetViaMinDrill(), GetuViaMinDiameter(), GetuViaMinDrill() as they were refering to BOARD_DESIGN_SETTINGS anyway (they are not net class specific). kicad_plugin.cpp - filters out empty nets (that are anyway not saved) when storing net class information. Previously it was done in NETCLASS::Format() function.
2014-05-13 09:22:51 +00:00
defaultNetClass->SetViaDiameter( parseBoardUnits( T_via_size ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_via_drill:
Moved NETCLASSES to BOARD_DESIGN_SETTINGS. Most of the changes are just adding GetDesignSettings() before every occurence of m_NetClasses. More complex changes: class_netclass.cpp - NETCLASS does not store the pointer to the parent BOARD anymore. Added function SetParams( BOARD_DESIGN_SETTINGS& ). class_netclass.h - Removed GetTrackMinWidth(), GetViaMinDiameter(), GetViaMinDrill(), GetuViaMinDiameter(), GetuViaMinDrill() as they were refering to BOARD_DESIGN_SETTINGS anyway (they are not net class specific). kicad_plugin.cpp - filters out empty nets (that are anyway not saved) when storing net class information. Previously it was done in NETCLASS::Format() function.
2014-05-13 09:22:51 +00:00
defaultNetClass->SetViaDrill( parseBoardUnits( T_via_drill ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_via_min_size:
designSettings.m_ViasMinSize = parseBoardUnits( T_via_min_size );
NeedRIGHT();
break;
case T_via_min_drill:
designSettings.m_ViasMinDrill = parseBoardUnits( T_via_min_drill );
NeedRIGHT();
break;
case T_user_via:
*) retain grid origin in the BOARD and save it in legacy and kicad board files. *) add hotkey for setting the grid origin as 'S', in board editor, module editor. *) re-position the function interface for cursor movement from BASE_SCREEN into class EDA_DRAW_FRAME. This is a prelude to getting rid of BASE_SCREEN or splitting it up.
2013-08-03 05:15:23 +00:00
{
int viaSize = parseBoardUnits( "user via size" );
int viaDrill = parseBoardUnits( "user via drill" );
Moved most of the board design rules related fields & methods to BOARD_DESIGN_SETTINGS class.
2014-05-13 09:22:51 +00:00
designSettings.m_ViasDimensionsList.push_back( VIA_DIMENSION( viaSize, viaDrill ) );
*) retain grid origin in the BOARD and save it in legacy and kicad board files. *) add hotkey for setting the grid origin as 'S', in board editor, module editor. *) re-position the function interface for cursor movement from BASE_SCREEN into class EDA_DRAW_FRAME. This is a prelude to getting rid of BASE_SCREEN or splitting it up.
2013-08-03 05:15:23 +00:00
NeedRIGHT();
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_uvia_size:
Moved NETCLASSES to BOARD_DESIGN_SETTINGS. Most of the changes are just adding GetDesignSettings() before every occurence of m_NetClasses. More complex changes: class_netclass.cpp - NETCLASS does not store the pointer to the parent BOARD anymore. Added function SetParams( BOARD_DESIGN_SETTINGS& ). class_netclass.h - Removed GetTrackMinWidth(), GetViaMinDiameter(), GetViaMinDrill(), GetuViaMinDiameter(), GetuViaMinDrill() as they were refering to BOARD_DESIGN_SETTINGS anyway (they are not net class specific). kicad_plugin.cpp - filters out empty nets (that are anyway not saved) when storing net class information. Previously it was done in NETCLASS::Format() function.
2014-05-13 09:22:51 +00:00
defaultNetClass->SetuViaDiameter( parseBoardUnits( T_uvia_size ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_uvia_drill:
Moved NETCLASSES to BOARD_DESIGN_SETTINGS. Most of the changes are just adding GetDesignSettings() before every occurence of m_NetClasses. More complex changes: class_netclass.cpp - NETCLASS does not store the pointer to the parent BOARD anymore. Added function SetParams( BOARD_DESIGN_SETTINGS& ). class_netclass.h - Removed GetTrackMinWidth(), GetViaMinDiameter(), GetViaMinDrill(), GetuViaMinDiameter(), GetuViaMinDrill() as they were refering to BOARD_DESIGN_SETTINGS anyway (they are not net class specific). kicad_plugin.cpp - filters out empty nets (that are anyway not saved) when storing net class information. Previously it was done in NETCLASS::Format() function.
2014-05-13 09:22:51 +00:00
defaultNetClass->SetuViaDrill( parseBoardUnits( T_uvia_drill ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_uvias_allowed:
designSettings.m_MicroViasAllowed = parseBool();
NeedRIGHT();
Pcbnew: enhancements for blind/buried vias palcement, and save blind/buried vias allowed option in .kicad_pcb file
2013-08-28 16:14:39 +00:00
break;
case T_blind_buried_vias_allowed:
designSettings.m_BlindBuriedViaAllowed = parseBool();
NeedRIGHT();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_uvia_min_size:
designSettings.m_MicroViasMinSize = parseBoardUnits( T_uvia_min_size );
NeedRIGHT();
break;
case T_uvia_min_drill:
designSettings.m_MicroViasMinDrill = parseBoardUnits( T_uvia_min_drill );
NeedRIGHT();
break;
case T_pcb_text_width:
designSettings.m_PcbTextWidth = parseBoardUnits( T_pcb_text_width );
NeedRIGHT();
break;
case T_pcb_text_size:
designSettings.m_PcbTextSize.x = parseBoardUnits( "pcb text width" );
designSettings.m_PcbTextSize.y = parseBoardUnits( "pcb text height" );
NeedRIGHT();
break;
case T_mod_edge_width:
designSettings.m_ModuleSegmentWidth = parseBoardUnits( T_mod_edge_width );
NeedRIGHT();
break;
case T_mod_text_size:
designSettings.m_ModuleTextSize.x = parseBoardUnits( "module text width" );
designSettings.m_ModuleTextSize.y = parseBoardUnits( "module text height" );
NeedRIGHT();
break;
case T_mod_text_width:
designSettings.m_ModuleTextWidth = parseBoardUnits( T_mod_text_width );
NeedRIGHT();
break;
case T_pad_size:
*) retain grid origin in the BOARD and save it in legacy and kicad board files. *) add hotkey for setting the grid origin as 'S', in board editor, module editor. *) re-position the function interface for cursor movement from BASE_SCREEN into class EDA_DRAW_FRAME. This is a prelude to getting rid of BASE_SCREEN or splitting it up.
2013-08-03 05:15:23 +00:00
{
wxSize sz;
sz.SetWidth( parseBoardUnits( "master pad width" ) );
sz.SetHeight( parseBoardUnits( "master pad height" ) );
designSettings.m_Pad_Master.SetSize( sz );
NeedRIGHT();
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_pad_drill:
*) retain grid origin in the BOARD and save it in legacy and kicad board files. *) add hotkey for setting the grid origin as 'S', in board editor, module editor. *) re-position the function interface for cursor movement from BASE_SCREEN into class EDA_DRAW_FRAME. This is a prelude to getting rid of BASE_SCREEN or splitting it up.
2013-08-03 05:15:23 +00:00
{
int drillSize = parseBoardUnits( T_pad_drill );
designSettings.m_Pad_Master.SetDrillSize( wxSize( drillSize, drillSize ) );
NeedRIGHT();
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_pad_to_mask_clearance:
Add a min width parameter to plot solder mask layers.
2012-11-05 20:20:34 +00:00
designSettings.m_SolderMaskMargin = parseBoardUnits( T_pad_to_mask_clearance );
NeedRIGHT();
break;
case T_solder_mask_min_width:
designSettings.m_SolderMaskMinWidth = parseBoardUnits( T_solder_mask_min_width );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_pad_to_paste_clearance:
designSettings.m_SolderPasteMargin = parseBoardUnits( T_pad_to_paste_clearance );
NeedRIGHT();
break;
case T_pad_to_paste_clearance_ratio:
designSettings.m_SolderPasteMarginRatio = parseDouble( T_pad_to_paste_clearance_ratio );
NeedRIGHT();
break;
case T_aux_axis_origin:
*) retain grid origin in the BOARD and save it in legacy and kicad board files. *) add hotkey for setting the grid origin as 'S', in board editor, module editor. *) re-position the function interface for cursor movement from BASE_SCREEN into class EDA_DRAW_FRAME. This is a prelude to getting rid of BASE_SCREEN or splitting it up.
2013-08-03 05:15:23 +00:00
{
int x = parseBoardUnits( "auxiliary origin X" );
int y = parseBoardUnits( "auxiliary origin Y" );
// m_board->SetAuxOrigin( wxPoint( x, y ) ); gets overwritten via SetDesignSettings below
designSettings.m_AuxOrigin = wxPoint( x, y );
NeedRIGHT();
}
break;
case T_grid_origin:
{
int x = parseBoardUnits( "grid origin X" );
int y = parseBoardUnits( "grid origin Y" );
// m_board->SetGridOrigin( wxPoint( x, y ) ); gets overwritten SetDesignSettings below
designSettings.m_GridOrigin = wxPoint( x, y );
NeedRIGHT();
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_visible_elements:
designSettings.SetVisibleElements( parseHex() );
NeedRIGHT();
break;
Pcbnew s-expression file parser bug fixes. * Change save order of drawings to match legacy file format object order. * Set end point of SEGVIA to start point so the round trip back to legacy format is the same. * Fixed bug saving and loading oval pad drill parameters. * Fixed bug saving and loading rectangular pad deltas. * Fixed missing layer for PCB_TARGET. * Fixed EDA_TEXT italic bug. Thanks Dick! * Remove some left over debug logging statements.
2012-06-13 23:04:42 +00:00
case T_pcbplotparams:
*) retain grid origin in the BOARD and save it in legacy and kicad board files. *) add hotkey for setting the grid origin as 'S', in board editor, module editor. *) re-position the function interface for cursor movement from BASE_SCREEN into class EDA_DRAW_FRAME. This is a prelude to getting rid of BASE_SCREEN or splitting it up.
2013-08-03 05:15:23 +00:00
{
PCB_PLOT_PARAMS plotParams;
PCB_PLOT_PARAMS_PARSER parser( reader );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
*) retain grid origin in the BOARD and save it in legacy and kicad board files. *) add hotkey for setting the grid origin as 'S', in board editor, module editor. *) re-position the function interface for cursor movement from BASE_SCREEN into class EDA_DRAW_FRAME. This is a prelude to getting rid of BASE_SCREEN or splitting it up.
2013-08-03 05:15:23 +00:00
plotParams.Parse( &parser );
m_board->SetPlotOptions( plotParams );
Save and load print parameters and minor code cleaning in new Pcbnew file format.
2012-07-05 17:02:45 +00:00
*) retain grid origin in the BOARD and save it in legacy and kicad board files. *) add hotkey for setting the grid origin as 'S', in board editor, module editor. *) re-position the function interface for cursor movement from BASE_SCREEN into class EDA_DRAW_FRAME. This is a prelude to getting rid of BASE_SCREEN or splitting it up.
2013-08-03 05:15:23 +00:00
// I don't know why but this seems to fix a problem in PCB_PLOT_PARAMS::Parse().
NextTok();
}
Pcbnew s-expression file parser bug fixes. * Change save order of drawings to match legacy file format object order. * Set end point of SEGVIA to start point so the round trip back to legacy format is the same. * Fixed bug saving and loading oval pad drill parameters. * Fixed bug saving and loading rectangular pad deltas. * Fixed missing layer for PCB_TARGET. * Fixed EDA_TEXT italic bug. Thanks Dick! * Remove some left over debug logging statements.
2012-06-13 23:04:42 +00:00
break;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
default:
Pcbnew s-expression file parser bug fixes. * Change save order of drawings to match legacy file format object order. * Set end point of SEGVIA to start point so the round trip back to legacy format is the same. * Fixed bug saving and loading oval pad drill parameters. * Fixed bug saving and loading rectangular pad deltas. * Fixed missing layer for PCB_TARGET. * Fixed EDA_TEXT italic bug. Thanks Dick! * Remove some left over debug logging statements.
2012-06-13 23:04:42 +00:00
Unexpected( CurText() );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
}
}
m_board->SetDesignSettings( designSettings );
m_board->SetZoneSettings( zoneSettings );
// Until such time as the *.brd file does not have the
// global parameters:
// "last_trace_width", "trace_min_width", "via_size", "via_drill",
// "via_min_size", and "via_clearance", put those same global
// values into the default NETCLASS until later board load
Kicad manager: fix bug: .kicad_pcb files not saved in zip file
2013-03-10 19:55:21 +00:00
// code should override them. *.kicad_pcb files which have been
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
// saved with knowledge of NETCLASSes will override these
// defaults, old boards will not.
//
// @todo: I expect that at some point we can remove said global
// parameters from the *.brd file since the ones in the
// default netclass serve the same purpose. If needed
// at all, the global defaults should go into a preferences
// file instead so they are there to start new board
// projects.
Moved NETCLASSES to BOARD_DESIGN_SETTINGS. Most of the changes are just adding GetDesignSettings() before every occurence of m_NetClasses. More complex changes: class_netclass.cpp - NETCLASS does not store the pointer to the parent BOARD anymore. Added function SetParams( BOARD_DESIGN_SETTINGS& ). class_netclass.h - Removed GetTrackMinWidth(), GetViaMinDiameter(), GetViaMinDrill(), GetuViaMinDiameter(), GetuViaMinDrill() as they were refering to BOARD_DESIGN_SETTINGS anyway (they are not net class specific). kicad_plugin.cpp - filters out empty nets (that are anyway not saved) when storing net class information. Previously it was done in NETCLASS::Format() function.
2014-05-13 09:22:51 +00:00
defaultNetClass->SetParams( m_board->GetDesignSettings() );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
}
void PCB_PARSER::parseNETINFO_ITEM() throw( IO_ERROR, PARSE_ERROR )
{
wxCHECK_RET( CurTok() == T_net,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as net." ) );
bugfix 1325375: pcbnew crash while append a board
2014-06-02 09:41:54 +00:00
int netCode = parseInt( "net number" );
fixes for plugins
2012-08-11 05:50:17 +00:00
NeedSYMBOLorNUMBER();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
wxString name = FromUTF8();
fixes for plugins
2012-08-11 05:50:17 +00:00
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
Pcbnew: fix 2 minor issues, noticeable only in debug mode. When reading board files, the net 0 was stored twice. It creates only log messges in debug mode, because the list of nets is rebuild after reading files.
2012-06-30 08:20:04 +00:00
// net 0 should be already in list, so store this net
// if it is not the net 0, or if the net 0 does not exists.
// (TODO: a better test.)
bugfix 1325375: pcbnew crash while append a board
2014-06-02 09:41:54 +00:00
if( netCode > 0 || m_board->FindNet( 0 ) == NULL )
Pcbnew: fix 2 minor issues, noticeable only in debug mode. When reading board files, the net 0 was stored twice. It creates only log messges in debug mode, because the list of nets is rebuild after reading files.
2012-06-30 08:20:04 +00:00
{
bugfix 1325375: pcbnew crash while append a board
2014-06-02 09:41:54 +00:00
NETINFO_ITEM* net = new NETINFO_ITEM( m_board, name, netCode );
Pcbnew: fix 2 minor issues, noticeable only in debug mode. When reading board files, the net 0 was stored twice. It creates only log messges in debug mode, because the list of nets is rebuild after reading files.
2012-06-30 08:20:04 +00:00
m_board->AppendNet( net );
bugfix 1325375: pcbnew crash while append a board
2014-06-02 09:41:54 +00:00
// Store the new code mapping
m_netCodes[netCode] = net->GetNet();
Pcbnew: fix 2 minor issues, noticeable only in debug mode. When reading board files, the net 0 was stored twice. It creates only log messges in debug mode, because the list of nets is rebuild after reading files.
2012-06-30 08:20:04 +00:00
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
}
void PCB_PARSER::parseNETCLASS() throw( IO_ERROR, PARSE_ERROR )
{
wxCHECK_RET( CurTok() == T_net_class,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as net class." ) );
T token;
Fixes the bug that causes pcbnew crash, when there are multiple net classes and the plot dialog was opened. Changed NETCLASS* to boost::shared_ptr<NETCLASS>.
2014-05-20 09:29:37 +00:00
NETCLASSPTR nc = boost::make_shared<NETCLASS>( wxEmptyString );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
Pcbnew: add a dialog to load a legacy file in "old" projects, when the .kicad_pcb file is not existing, and the correspoinding .brd file exists. Fix also an issue in pcb_parser when a netclass name is just a number (like a track width as name)
2012-12-15 13:39:36 +00:00
// Read netclass name (can be a name or just a number like track width)
NeedSYMBOLorNUMBER();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
nc->SetName( FromUTF8() );
NeedSYMBOL();
nc->SetDescription( FromUTF8() );
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token != T_LEFT )
Expecting( T_LEFT );
token = NextTok();
switch( token )
{
case T_clearance:
nc->SetClearance( parseBoardUnits( T_clearance ) );
break;
case T_trace_width:
nc->SetTrackWidth( parseBoardUnits( T_trace_width ) );
break;
case T_via_dia:
nc->SetViaDiameter( parseBoardUnits( T_via_dia ) );
break;
case T_via_drill:
nc->SetViaDrill( parseBoardUnits( T_via_drill ) );
break;
case T_uvia_dia:
nc->SetuViaDiameter( parseBoardUnits( T_uvia_dia ) );
break;
case T_uvia_drill:
nc->SetuViaDrill( parseBoardUnits( T_uvia_drill ) );
break;
case T_add_net:
fixes for plugins
2012-08-11 05:50:17 +00:00
NeedSYMBOLorNUMBER();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
nc->Add( FromUTF8() );
break;
default:
Expecting( "clearance, trace_width, via_dia, via_drill, uvia_dia, uvia_drill, or add_net" );
}
NeedRIGHT();
}
Fixes the bug that causes pcbnew crash, when there are multiple net classes and the plot dialog was opened. Changed NETCLASS* to boost::shared_ptr<NETCLASS>.
2014-05-20 09:29:37 +00:00
if( !m_board->GetDesignSettings().m_NetClasses.Add( nc ) )
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
{
// Must have been a name conflict, this is a bad board file.
// User may have done a hand edit to the file.
remove -std=c++0x compiler option since nobody is ready for it, and accordingly back into auto_ptr from unique_ptr
2012-11-15 16:04:10 +00:00
// auto_ptr will delete nc on this code path
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
wxString error;
Better strings for the translators (converted concatenations to formats)
2013-04-09 17:49:01 +00:00
error.Printf( _( "duplicate NETCLASS name '%s' in file <%s> at line %d, offset %d" ),
Pcbnew: fix issue about order of tracks this order was modified when reading and writing a board, even without any change in board. Fix compil warnings and wx28 compatibility. code cleaning in autoroute functions.
2012-06-11 12:04:34 +00:00
nc->GetName().GetData(), CurSource().GetData(), CurLineNumber(), CurOffset() );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
THROW_IO_ERROR( error );
}
}
DRAWSEGMENT* PCB_PARSER::parseDRAWSEGMENT() throw( IO_ERROR, PARSE_ERROR )
{
wxCHECK_MSG( CurTok() == T_gr_arc || CurTok() == T_gr_circle || CurTok() == T_gr_curve ||
CurTok() == T_gr_line || CurTok() == T_gr_poly, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as DRAWSEGMENT." ) );
T token;
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
wxPoint pt;
Remove some uses of using namespace std.
2013-12-13 16:27:30 +00:00
std::auto_ptr< DRAWSEGMENT > segment( new DRAWSEGMENT( NULL ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
switch( CurTok() )
{
case T_gr_arc:
segment->SetShape( S_ARC );
NeedLEFT();
token = NextTok();
if( token != T_start )
Expecting( T_start );
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
pt.x = parseBoardUnits( "X coordinate" );
pt.y = parseBoardUnits( "Y coordinate" );
segment->SetStart( pt );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
NeedLEFT();
token = NextTok();
if( token != T_end )
Expecting( T_end );
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
pt.x = parseBoardUnits( "X coordinate" );
pt.y = parseBoardUnits( "Y coordinate" );
segment->SetEnd( pt );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_gr_circle:
segment->SetShape( S_CIRCLE );
NeedLEFT();
token = NextTok();
if( token != T_center )
Expecting( T_center );
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
pt.x = parseBoardUnits( "X coordinate" );
pt.y = parseBoardUnits( "Y coordinate" );
segment->SetStart( pt );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
NeedLEFT();
token = NextTok();
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
if( token != T_end )
Expecting( T_end );
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
pt.x = parseBoardUnits( "X coordinate" );
pt.y = parseBoardUnits( "Y coordinate" );
segment->SetEnd( pt );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_gr_curve:
segment->SetShape( S_CURVE );
NeedLEFT();
token = NextTok();
if( token != T_pts )
Expecting( T_pts );
segment->SetStart( parseXY() );
segment->SetBezControl1( parseXY() );
segment->SetBezControl2( parseXY() );
segment->SetEnd( parseXY() );
NeedRIGHT();
break;
case T_gr_line:
// Default DRAWSEGMENT type is S_SEGMENT.
NeedLEFT();
token = NextTok();
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
if( token != T_start )
Expecting( T_start );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
pt.x = parseBoardUnits( "X coordinate" );
pt.y = parseBoardUnits( "Y coordinate" );
segment->SetStart( pt );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
NeedLEFT();
token = NextTok();
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
if( token != T_end )
Expecting( T_end );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
pt.x = parseBoardUnits( "X coordinate" );
pt.y = parseBoardUnits( "Y coordinate" );
segment->SetEnd( pt );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_gr_poly:
{
segment->SetShape( S_POLYGON );
NeedLEFT();
token = NextTok();
if( token != T_pts )
Expecting( T_pts );
std::vector< wxPoint > pts;
while( (token = NextTok()) != T_RIGHT )
pts.push_back( parseXY() );
segment->SetPolyPoints( pts );
}
break;
default:
Expecting( "gr_arc, gr_circle, gr_curve, gr_line, or gr_poly" );
}
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token != T_LEFT )
Expecting( T_LEFT );
token = NextTok();
switch( token )
{
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
case T_angle:
segment->SetAngle( parseDouble( "segment angle" ) * 10.0 );
break;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
case T_layer:
segment->SetLayer( parseBoardItemLayer() );
break;
case T_width:
segment->SetWidth( parseBoardUnits( T_width ) );
break;
case T_tstamp:
segment->SetTimeStamp( parseHex() );
break;
case T_status:
Typedef STATUS_FLAGS to encapsulate EDA_ITEM bitmapped flags
2013-03-28 19:12:46 +00:00
segment->SetStatus( static_cast<STATUS_FLAGS>( parseHex() ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
default:
Expecting( "layer, width, tstamp, or status" );
}
NeedRIGHT();
}
return segment.release();
}
TEXTE_PCB* PCB_PARSER::parseTEXTE_PCB() throw( IO_ERROR, PARSE_ERROR )
{
wxCHECK_MSG( CurTok() == T_gr_text, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as TEXTE_PCB." ) );
T token;
Remove some uses of using namespace std.
2013-12-13 16:27:30 +00:00
std::auto_ptr<TEXTE_PCB> text( new TEXTE_PCB( m_board ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedSYMBOLorNUMBER();
text->SetText( FromUTF8() );
NeedLEFT();
token = NextTok();
if( token != T_at )
Expecting( T_at );
wxPoint pt;
pt.x = parseBoardUnits( "X coordinate" );
pt.y = parseBoardUnits( "Y coordinate" );
More encapsulation work. * Complete encapsulation of the MODULE class. * Complete encapsulation of the EDA_TEXT class. * Encapsulate most of the ZONE_CONTAINER class. * Add pcbcommon library as a dependency for reSWIGging the scripting support. This should cover most dependency cases.
2013-03-18 19:36:07 +00:00
text->SetTextPosition( pt );
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
// If there is no orientation defined, then it is the default value of 0 degrees.
token = NextTok();
if( token == T_NUMBER )
{
text->SetOrientation( parseDouble() * 10.0 );
NeedRIGHT();
}
else if( token != T_RIGHT )
{
Unexpected( CurText() );
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token != T_LEFT )
Expecting( T_LEFT );
token = NextTok();
switch( token )
{
case T_layer:
text->SetLayer( parseBoardItemLayer() );
NeedRIGHT();
break;
case T_tstamp:
text->SetTimeStamp( parseHex() );
NeedRIGHT();
break;
case T_effects:
parseEDA_TEXT( (EDA_TEXT*) text.get() );
break;
default:
Expecting( "layer, tstamp or effects" );
}
}
return text.release();
}
DIMENSION* PCB_PARSER::parseDIMENSION() throw( IO_ERROR, PARSE_ERROR )
{
wxCHECK_MSG( CurTok() == T_dimension, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as DIMENSION." ) );
T token;
Remove some uses of using namespace std.
2013-12-13 16:27:30 +00:00
std::auto_ptr<DIMENSION> dimension( new DIMENSION( NULL ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
Pcbnew encapsulation and code cleaning. * Encapsulate most of the MODULE class. * Start encapsulating the DIMENSION class. * Lay some groundwork for EDA_TEXT encapsulation. * Move cleverly hidden MODULE functions into class_module.cpp. * Use std::swap to exchange TEXTE_PCB values for undo/redo. * Remove unused members from MODULE class. * The usual coding policy and documentation fixes.
2013-03-13 18:53:58 +00:00
dimension->SetValue( parseBoardUnits( "dimension value" ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedLEFT();
token = NextTok();
if( token != T_width )
Expecting( T_width );
dimension->SetWidth( parseBoardUnits( "dimension width value" ) );
NeedRIGHT();
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token != T_LEFT )
Expecting( T_LEFT );
token = NextTok();
switch( token )
{
case T_layer:
dimension->SetLayer( parseBoardItemLayer() );
NeedRIGHT();
break;
case T_tstamp:
dimension->SetTimeStamp( parseHex() );
NeedRIGHT();
break;
case T_gr_text:
{
TEXTE_PCB* text = parseTEXTE_PCB();
Pcbnew encapsulation and code cleaning. * Encapsulate most of the MODULE class. * Start encapsulating the DIMENSION class. * Lay some groundwork for EDA_TEXT encapsulation. * Move cleverly hidden MODULE functions into class_module.cpp. * Use std::swap to exchange TEXTE_PCB values for undo/redo. * Remove unused members from MODULE class. * The usual coding policy and documentation fixes.
2013-03-13 18:53:58 +00:00
dimension->Text() = *text;
More encapsulation work. * Complete encapsulation of the MODULE class. * Complete encapsulation of the EDA_TEXT class. * Encapsulate most of the ZONE_CONTAINER class. * Add pcbcommon library as a dependency for reSWIGging the scripting support. This should cover most dependency cases.
2013-03-18 19:36:07 +00:00
dimension->SetPosition( text->GetTextPosition() );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
delete text;
break;
}
case T_feature1:
NeedLEFT();
token = NextTok();
if( token != T_pts )
Expecting( T_pts );
Pcbnew: class DIMENSION: code cleaning
2012-12-19 19:31:36 +00:00
parseXY( &dimension->m_featureLineDO.x, &dimension->m_featureLineDO.y );
parseXY( &dimension->m_featureLineDF.x, &dimension->m_featureLineDF.y );
Added new constraint for EDIT_POINTs (EPC_LINE). Dimensions have EDIT_POINTs. Different handling of 45 degree mode in POINT_EDITOR.
2014-03-12 09:46:11 +00:00
dimension->UpdateHeight();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
NeedRIGHT();
break;
case T_feature2:
NeedLEFT();
token = NextTok();
if( token != T_pts )
Expecting( T_pts );
Pcbnew: class DIMENSION: code cleaning
2012-12-19 19:31:36 +00:00
parseXY( &dimension->m_featureLineGO.x, &dimension->m_featureLineGO.y );
parseXY( &dimension->m_featureLineGF.x, &dimension->m_featureLineGF.y );
Added new constraint for EDIT_POINTs (EPC_LINE). Dimensions have EDIT_POINTs. Different handling of 45 degree mode in POINT_EDITOR.
2014-03-12 09:46:11 +00:00
dimension->UpdateHeight();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
NeedRIGHT();
break;
case T_crossbar:
NeedLEFT();
token = NextTok();
if( token != T_pts )
Expecting( T_pts );
Pcbnew: class DIMENSION: code cleaning
2012-12-19 19:31:36 +00:00
parseXY( &dimension->m_crossBarO.x, &dimension->m_crossBarO.y );
parseXY( &dimension->m_crossBarF.x, &dimension->m_crossBarF.y );
Added new constraint for EDIT_POINTs (EPC_LINE). Dimensions have EDIT_POINTs. Different handling of 45 degree mode in POINT_EDITOR.
2014-03-12 09:46:11 +00:00
dimension->UpdateHeight();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
NeedRIGHT();
break;
case T_arrow1a:
NeedLEFT();
token = NextTok();
if( token != T_pts )
Expecting( T_pts );
Removed redundant fields DIMENSION::m_arrowD1O, m_arrowD2O, m_arrowG1O, m_arrowG2O (==m_crossBarO/F). Added DIMENSION::SetOrigin(), DIMENSION::SetEnd(), DIMENSION::GetOrigin(), DIMENSION::GetEnd(), DIMENSION::GetHeight(). Fixed flipping for DIMENSION class. Added an information that helps to understand roles of the points in the DIMENSION class. Some minor changes to PCB_PAINTER (mainly using const COLOR4D& for taking the result of GetColor() function).
2014-02-11 12:22:30 +00:00
parseXY( &dimension->m_crossBarF.x, &dimension->m_crossBarF.y );
Pcbnew: class DIMENSION: code cleaning
2012-12-19 19:31:36 +00:00
parseXY( &dimension->m_arrowD1F.x, &dimension->m_arrowD1F.y );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
NeedRIGHT();
break;
case T_arrow1b:
NeedLEFT();
token = NextTok();
if( token != T_pts )
Expecting( T_pts );
Removed redundant fields DIMENSION::m_arrowD1O, m_arrowD2O, m_arrowG1O, m_arrowG2O (==m_crossBarO/F). Added DIMENSION::SetOrigin(), DIMENSION::SetEnd(), DIMENSION::GetOrigin(), DIMENSION::GetEnd(), DIMENSION::GetHeight(). Fixed flipping for DIMENSION class. Added an information that helps to understand roles of the points in the DIMENSION class. Some minor changes to PCB_PAINTER (mainly using const COLOR4D& for taking the result of GetColor() function).
2014-02-11 12:22:30 +00:00
parseXY( &dimension->m_crossBarF.x, &dimension->m_crossBarF.y );
Pcbnew: class DIMENSION: code cleaning
2012-12-19 19:31:36 +00:00
parseXY( &dimension->m_arrowD2F.x, &dimension->m_arrowD2F.y );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
NeedRIGHT();
break;
case T_arrow2a:
NeedLEFT();
token = NextTok();
if( token != T_pts )
Expecting( T_pts );
Removed redundant fields DIMENSION::m_arrowD1O, m_arrowD2O, m_arrowG1O, m_arrowG2O (==m_crossBarO/F). Added DIMENSION::SetOrigin(), DIMENSION::SetEnd(), DIMENSION::GetOrigin(), DIMENSION::GetEnd(), DIMENSION::GetHeight(). Fixed flipping for DIMENSION class. Added an information that helps to understand roles of the points in the DIMENSION class. Some minor changes to PCB_PAINTER (mainly using const COLOR4D& for taking the result of GetColor() function).
2014-02-11 12:22:30 +00:00
parseXY( &dimension->m_crossBarO.x, &dimension->m_crossBarO.y );
Pcbnew: class DIMENSION: code cleaning
2012-12-19 19:31:36 +00:00
parseXY( &dimension->m_arrowG1F.x, &dimension->m_arrowG1F.y );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
NeedRIGHT();
break;
case T_arrow2b:
NeedLEFT();
token = NextTok();
if( token != T_pts )
Expecting( T_pts );
Removed redundant fields DIMENSION::m_arrowD1O, m_arrowD2O, m_arrowG1O, m_arrowG2O (==m_crossBarO/F). Added DIMENSION::SetOrigin(), DIMENSION::SetEnd(), DIMENSION::GetOrigin(), DIMENSION::GetEnd(), DIMENSION::GetHeight(). Fixed flipping for DIMENSION class. Added an information that helps to understand roles of the points in the DIMENSION class. Some minor changes to PCB_PAINTER (mainly using const COLOR4D& for taking the result of GetColor() function).
2014-02-11 12:22:30 +00:00
parseXY( &dimension->m_crossBarO.x, &dimension->m_crossBarO.y );
Pcbnew: class DIMENSION: code cleaning
2012-12-19 19:31:36 +00:00
parseXY( &dimension->m_arrowG2F.x, &dimension->m_arrowG2F.y );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
NeedRIGHT();
break;
default:
Expecting( "layer, tstamp, gr_text, feature1, feature2 crossbar, arrow1a, "
"arrow1b, arrow2a, or arrow2b" );
}
}
return dimension.release();
}
Support for 'initial single line comments' in the pretty footprint format. This is limited to round tripping the lines of commented text in the loading and saving to disk through PCBIO::Format() and PCBIO::Parse(). No editing of the comments is given.
2013-06-23 19:18:33 +00:00
MODULE* PCB_PARSER::parseMODULE( wxArrayString* aInitialComments ) throw( IO_ERROR, PARSE_ERROR )
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
{
wxCHECK_MSG( CurTok() == T_module, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as MODULE." ) );
Fix board parsing error when module name is empty. (fixes lp:1226546)
2013-09-17 14:03:16 +00:00
wxString name;
wxPoint pt;
T token;
FPID fpid;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
Remove some uses of using namespace std.
2013-12-13 16:27:30 +00:00
std::auto_ptr<MODULE> module( new MODULE( m_board ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
Support for 'initial single line comments' in the pretty footprint format. This is limited to round tripping the lines of commented text in the loading and saving to disk through PCBIO::Format() and PCBIO::Parse(). No editing of the comments is given.
2013-06-23 19:18:33 +00:00
module->SetInitialComments( aInitialComments );
fix bug
2012-12-14 19:58:50 +00:00
NeedSYMBOLorNUMBER();
Fix board parsing error when module name is empty. (fixes lp:1226546)
2013-09-17 14:03:16 +00:00
name = FromUTF8();
Fix but reading empty footprints in netlist. (fixes lp:1226283) * Remove fp_lib token from board and s-expr netlist file format. * Fix a bunch of Doxygen warnings. * Remove some extra debug log messages.
2013-09-17 00:52:08 +00:00
Fix board parsing error when module name is empty. (fixes lp:1226546)
2013-09-17 14:03:16 +00:00
if( !name.IsEmpty() && fpid.Parse( FromUTF8() ) >= 0 )
Fix but reading empty footprints in netlist. (fixes lp:1226283) * Remove fp_lib token from board and s-expr netlist file format. * Fix a bunch of Doxygen warnings. * Remove some extra debug log messages.
2013-09-17 00:52:08 +00:00
{
wxString error;
error.Printf( _( "invalid PFID in\nfile: <%s>\nline: %d\noffset: %d" ),
GetChars( CurSource() ), CurLineNumber(), CurOffset() );
THROW_IO_ERROR( error );
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token == T_LEFT )
token = NextTok();
switch( token )
{
case T_locked:
module->SetLocked( true );
break;
case T_placed:
module->SetIsPlaced( true );
break;
case T_layer:
module->SetLayer( parseBoardItemLayer() );
NeedRIGHT();
break;
case T_tedit:
module->SetLastEditTime( parseHex() );
NeedRIGHT();
break;
case T_tstamp:
module->SetTimeStamp( parseHex() );
NeedRIGHT();
break;
case T_at:
pt.x = parseBoardUnits( "X coordinate" );
pt.y = parseBoardUnits( "Y coordinate" );
module->SetPosition( pt );
token = NextTok();
if( token == T_NUMBER )
{
module->SetOrientation( parseDouble() * 10.0 );
NeedRIGHT();
}
else if( token != T_RIGHT )
{
Expecting( T_RIGHT );
}
break;
case T_descr:
Pcbnew: save/load .kicad_pcb files: fix 2 minor issues. Use now English layers names to build filenames in plot functions (for techical layers), because translated names create sometimes problems in filenames. (should do not change anything for English users)
2012-06-27 20:07:37 +00:00
NeedSYMBOLorNUMBER(); // some symbols can be 0508, so a number is also a symbol here
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
module->SetDescription( FromUTF8() );
NeedRIGHT();
break;
case T_tags:
Pcbnew: save/load .kicad_pcb files: fix 2 minor issues. Use now English layers names to build filenames in plot functions (for techical layers), because translated names create sometimes problems in filenames. (should do not change anything for English users)
2012-06-27 20:07:37 +00:00
NeedSYMBOLorNUMBER(); // some symbols can be 0508, so a number is also a symbol here
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
module->SetKeywords( FromUTF8() );
NeedRIGHT();
break;
case T_path:
Fix Pcbnew s-expr file parser bug.
2012-12-30 15:40:05 +00:00
NeedSYMBOLorNUMBER(); // Paths can be numerical so a number is also a symbol here
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
module->SetPath( FromUTF8() );
NeedRIGHT();
break;
case T_autoplace_cost90:
Pcbnew encapsulation and code cleaning. * Encapsulate most of the MODULE class. * Start encapsulating the DIMENSION class. * Lay some groundwork for EDA_TEXT encapsulation. * Move cleverly hidden MODULE functions into class_module.cpp. * Use std::swap to exchange TEXTE_PCB values for undo/redo. * Remove unused members from MODULE class. * The usual coding policy and documentation fixes.
2013-03-13 18:53:58 +00:00
module->SetPlacementCost90( parseInt( "auto place cost at 90 degrees" ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_autoplace_cost180:
Pcbnew encapsulation and code cleaning. * Encapsulate most of the MODULE class. * Start encapsulating the DIMENSION class. * Lay some groundwork for EDA_TEXT encapsulation. * Move cleverly hidden MODULE functions into class_module.cpp. * Use std::swap to exchange TEXTE_PCB values for undo/redo. * Remove unused members from MODULE class. * The usual coding policy and documentation fixes.
2013-03-13 18:53:58 +00:00
module->SetPlacementCost180( parseInt( "auto place cost at 180 degrees" ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_solder_mask_margin:
module->SetLocalSolderMaskMargin( parseBoardUnits( "local solder mask margin value" ) );
NeedRIGHT();
break;
case T_solder_paste_margin:
module->SetLocalSolderPasteMargin(
parseBoardUnits( "local solder paste margin value" ) );
NeedRIGHT();
break;
case T_solder_paste_ratio:
module->SetLocalSolderPasteMarginRatio(
parseDouble( "local solder paste margin ratio value" ) );
NeedRIGHT();
break;
case T_clearance:
module->SetLocalClearance( parseBoardUnits( "local clearance value" ) );
NeedRIGHT();
break;
case T_zone_connect:
module->SetZoneConnection( (ZoneConnection) parseInt( "zone connection value" ) );
NeedRIGHT();
break;
case T_thermal_width:
module->SetThermalWidth( parseBoardUnits( "thermal width value" ) );
NeedRIGHT();
break;
case T_thermal_gap:
module->SetThermalGap( parseBoardUnits( "thermal gap value" ) );
NeedRIGHT();
break;
case T_attr:
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
switch( token )
{
case T_smd:
module->SetAttributes( module->GetAttributes() | MOD_CMS );
break;
case T_virtual:
module->SetAttributes( module->GetAttributes() | MOD_VIRTUAL );
break;
default:
Expecting( "smd and/or virtual" );
}
}
break;
case T_fp_text:
{
fix LSET() constructors, formatting
2014-06-29 20:33:29 +00:00
TEXTE_MODULE* text = parseTEXTE_MODULE();
text->SetParent( module.get() );
double orientation = text->GetOrientation();
orientation -= module->GetOrientation();
text->SetOrientation( orientation );
text->SetDrawCoord();
switch( text->GetType() )
{
case TEXTE_MODULE::TEXT_is_REFERENCE:
module->Reference() = *text;
delete text;
break;
case TEXTE_MODULE::TEXT_is_VALUE:
module->Value() = *text;
delete text;
break;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
fix LSET() constructors, formatting
2014-06-29 20:33:29 +00:00
default:
module->GraphicalItems().PushBack( text );
}
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_fp_arc:
case T_fp_circle:
case T_fp_curve:
case T_fp_line:
case T_fp_poly:
fix LSET() constructors, formatting
2014-06-29 20:33:29 +00:00
{
EDGE_MODULE* em = parseEDGE_MODULE();
em->SetParent( module.get() );
em->SetDrawCoord();
module->GraphicalItems().PushBack( em );
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_pad:
fix LSET() constructors, formatting
2014-06-29 20:33:29 +00:00
{
D_PAD* pad = parseD_PAD( module.get() );
wxPoint pt = pad->GetPos0();
RotatePoint( &pt, module->GetOrientation() );
pad->SetPosition( pt + module->GetPosition() );
module->AddPad( pad );
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_model:
module->Add3DModel( parse3DModel() );
break;
default:
Expecting( "locked, placed, tedit, tstamp, at, descr, tags, path, "
"autoplace_cost90, autoplace_cost180, solder_mask_margin, "
"solder_paste_margin, solder_paste_ratio, clearance, "
"zone_connect, thermal_width, thermal_gap, attr, fp_text, "
"fp_arc, fp_circle, fp_curve, fp_line, fp_poly, pad, or model" );
}
}
Convert footprint definitions from wxString to FPID. * Use FPID instead of wxString in MODULE object. * Use FPID instead of wxString when loading and saving files. * Use FPID in COMPONENT object. * Add wxString helper functions and comparison operators to FPID. * Add fp_lib token to pcb and netlist file formats. * Add code to load and save FPIDs to pcb file format. * Fix segfault when deleting invalid footprint library tables in Pcbnew in non footprint library table build. * Fix bug when counting the number of mod files in EDA_APP::SetFootprintLibTablePath();
2013-09-08 18:31:21 +00:00
module->SetFPID( fpid );
pcbnew: fix minor issues. pcb_calculator: fix a compil warning (gcc 4.7)
2012-11-12 16:19:10 +00:00
module->CalculateBoundingBox();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
return module.release();
}
TEXTE_MODULE* PCB_PARSER::parseTEXTE_MODULE() throw( IO_ERROR, PARSE_ERROR )
{
wxCHECK_MSG( CurTok() == T_fp_text, NULL,
wxString::Format( wxT( "Cannot parse %s as TEXTE_MODULE at line %d, offset %d." ),
Fixed compilation with unicode (wxString to printf without GetChars)
2012-08-29 17:28:33 +00:00
GetChars( GetTokenString( CurTok() ) ),
CurLineNumber(), CurOffset() ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
T token = NextTok();
Remove some uses of using namespace std.
2013-12-13 16:27:30 +00:00
std::auto_ptr<TEXTE_MODULE> text( new TEXTE_MODULE( NULL ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
switch( token )
{
case T_reference:
More cleanup on layer code usage Better description for entities on right click menu and panel Typo fixes and some comment reformats
2013-04-07 11:55:18 +00:00
text->SetType( TEXTE_MODULE::TEXT_is_REFERENCE );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_value:
More cleanup on layer code usage Better description for entities on right click menu and panel Typo fixes and some comment reformats
2013-04-07 11:55:18 +00:00
text->SetType( TEXTE_MODULE::TEXT_is_VALUE );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_user:
break; // Default type is user text.
default:
THROW_IO_ERROR( wxString::Format( _( "cannot handle module text type %s" ),
GetChars( FromUTF8() ) ) );
}
NeedSYMBOLorNUMBER();
text->SetText( FromUTF8() );
NeedLEFT();
token = NextTok();
if( token != T_at )
Expecting( T_at );
wxPoint pt;
pt.x = parseBoardUnits( "X coordinate" );
pt.y = parseBoardUnits( "Y coordinate" );
text->SetPos0( pt );
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
token = NextTok();
// If there is no orientation defined, then it is the default value of 0 degrees.
if( token == T_NUMBER )
{
text->SetOrientation( parseDouble() * 10.0 );
NeedRIGHT();
}
else if( token != T_RIGHT )
{
Unexpected( CurText() );
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token == T_LEFT )
token = NextTok();
switch( token )
{
case T_layer:
text->SetLayer( parseBoardItemLayer() );
NeedRIGHT();
break;
case T_hide:
text->SetVisible( false );
break;
case T_effects:
parseEDA_TEXT( (EDA_TEXT*) text.get() );
break;
default:
Expecting( "hide or effects" );
}
}
return text.release();
}
EDGE_MODULE* PCB_PARSER::parseEDGE_MODULE() throw( IO_ERROR, PARSE_ERROR )
{
wxCHECK_MSG( CurTok() == T_fp_arc || CurTok() == T_fp_circle || CurTok() == T_fp_curve ||
CurTok() == T_fp_line || CurTok() == T_fp_poly, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as EDGE_MODULE." ) );
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
wxPoint pt;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
T token;
Remove some uses of using namespace std.
2013-12-13 16:27:30 +00:00
std::auto_ptr< EDGE_MODULE > segment( new EDGE_MODULE( NULL ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
switch( CurTok() )
{
case T_fp_arc:
segment->SetShape( S_ARC );
NeedLEFT();
token = NextTok();
if( token != T_start )
Expecting( T_start );
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
pt.x = parseBoardUnits( "X coordinate" );
pt.y = parseBoardUnits( "Y coordinate" );
segment->SetStart0( pt );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
Pcbnew: save/load .kicad_pcb files: fix 2 minor issues. Use now English layers names to build filenames in plot functions (for techical layers), because translated names create sometimes problems in filenames. (should do not change anything for English users)
2012-06-27 20:07:37 +00:00
NeedLEFT();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
token = NextTok();
if( token != T_end )
Expecting( T_end );
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
pt.x = parseBoardUnits( "X coordinate" );
pt.y = parseBoardUnits( "Y coordinate" );
segment->SetEnd0( pt );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
NeedLEFT();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
token = NextTok();
if( token != T_angle )
Expecting( T_angle );
Fix angle scaling error in Pcbnew s-expr file format parser. (fixes the arc bug part of lp:1090524)
2012-12-14 21:37:59 +00:00
segment->SetAngle( parseDouble( "segment angle" ) * 10.0 );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_fp_circle:
segment->SetShape( S_CIRCLE );
NeedLEFT();
token = NextTok();
if( token != T_center )
Expecting( T_center );
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
pt.x = parseBoardUnits( "X coordinate" );
pt.y = parseBoardUnits( "Y coordinate" );
segment->SetStart0( pt );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
NeedLEFT();
token = NextTok();
if( token != T_end )
Expecting( T_end );
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
pt.x = parseBoardUnits( "X coordinate" );
pt.y = parseBoardUnits( "Y coordinate" );
segment->SetEnd0( pt );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_fp_curve:
segment->SetShape( S_CURVE );
NeedLEFT();
token = NextTok();
if( token != T_pts )
Expecting( T_pts );
segment->SetStart0( parseXY() );
segment->SetBezControl1( parseXY() );
segment->SetBezControl2( parseXY() );
segment->SetEnd0( parseXY() );
NeedRIGHT();
break;
case T_fp_line:
// Default DRAWSEGMENT type is S_SEGMENT.
NeedLEFT();
token = NextTok();
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
if( token != T_start )
Expecting( T_start );
pt.x = parseBoardUnits( "X coordinate" );
pt.y = parseBoardUnits( "Y coordinate" );
segment->SetStart0( pt );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
NeedRIGHT();
NeedLEFT();
token = NextTok();
if( token != T_end )
Expecting( T_end );
pt.x = parseBoardUnits( "X coordinate" );
pt.y = parseBoardUnits( "Y coordinate" );
segment->SetEnd0( pt );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_fp_poly:
{
segment->SetShape( S_POLYGON );
NeedLEFT();
token = NextTok();
if( token != T_pts )
Expecting( T_pts );
std::vector< wxPoint > pts;
while( (token = NextTok()) != T_RIGHT )
pts.push_back( parseXY() );
segment->SetPolyPoints( pts );
}
break;
default:
Expecting( "fp_arc, fp_circle, fp_curve, fp_line, or fp_poly" );
}
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token != T_LEFT )
Expecting( T_LEFT );
token = NextTok();
switch( token )
{
case T_layer:
segment->SetLayer( parseBoardItemLayer() );
break;
case T_width:
segment->SetWidth( parseBoardUnits( T_width ) );
break;
case T_tstamp:
segment->SetTimeStamp( parseHex() );
break;
case T_status:
Typedef STATUS_FLAGS to encapsulate EDA_ITEM bitmapped flags
2013-03-28 19:12:46 +00:00
segment->SetStatus( static_cast<STATUS_FLAGS>( parseHex() ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
default:
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
Expecting( "layer or width" );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
}
NeedRIGHT();
}
return segment.release();
}
BOARD_CONNECTED_ITEMs do not store net code anymore (m_NetCode field), instead net info is stored using a pointer to NETINFO_ITEM. GetNet() refers to the net code stored in the NETINFO_ITEM. SetNet() finds an appropriate NETINFO_ITEM and uses it. Removing GetNet() & SetNet() (and the whole net code idea) requires too many changes in the code (~250 references to the mentioned functions). BOARD_CONNECTED_ITEMs by default get a pointer to NETINFO_ITEM that stores unconnected items. This requires for all BOARD_CONNECTED_ITEMs to have a parent (so BOARD* is accessible). The only orphaned item is BOARD_DESIGN_SETTINGS::m_Pad_Master, but it does not cause any issues so far. Items that do not have access to a BOARD (do not have set parents) and therefore cannot get net assigned, by default get const static NETINFO_LIST::ORPHANED. Performed tests: - loaded .kicad_pcb, KiCad legacy board, Eagle 6.0 board, P-CAD board - all ok - load a simple project, reload netlist after changing connections in eeschema - ok - save & reload a board - ok, but still contain empty nets - remove everything, restore with undo - ok - remove everything, reload netlist - ok - changing net names (all possibilites: empty->existing, empty->not existing, existing->empty, existing->not existing) - all ok - zones: when net is changed to a net that does not have any nodes besides the zone itself, it does not get filled
2014-01-15 17:03:06 +00:00
D_PAD* PCB_PARSER::parseD_PAD( MODULE* aParent ) throw( IO_ERROR, PARSE_ERROR )
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
{
wxCHECK_MSG( CurTok() == T_pad, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as D_PAD." ) );
fix LSET() constructors, formatting
2014-06-29 20:33:29 +00:00
wxSize sz;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
wxPoint pt;
fix LSET() constructors, formatting
2014-06-29 20:33:29 +00:00
BOARD_CONNECTED_ITEMs do not store net code anymore (m_NetCode field), instead net info is stored using a pointer to NETINFO_ITEM. GetNet() refers to the net code stored in the NETINFO_ITEM. SetNet() finds an appropriate NETINFO_ITEM and uses it. Removing GetNet() & SetNet() (and the whole net code idea) requires too many changes in the code (~250 references to the mentioned functions). BOARD_CONNECTED_ITEMs by default get a pointer to NETINFO_ITEM that stores unconnected items. This requires for all BOARD_CONNECTED_ITEMs to have a parent (so BOARD* is accessible). The only orphaned item is BOARD_DESIGN_SETTINGS::m_Pad_Master, but it does not cause any issues so far. Items that do not have access to a BOARD (do not have set parents) and therefore cannot get net assigned, by default get const static NETINFO_LIST::ORPHANED. Performed tests: - loaded .kicad_pcb, KiCad legacy board, Eagle 6.0 board, P-CAD board - all ok - load a simple project, reload netlist after changing connections in eeschema - ok - save & reload a board - ok, but still contain empty nets - remove everything, restore with undo - ok - remove everything, reload netlist - ok - changing net names (all possibilites: empty->existing, empty->not existing, existing->empty, existing->not existing) - all ok - zones: when net is changed to a net that does not have any nodes besides the zone itself, it does not get filled
2014-01-15 17:03:06 +00:00
std::auto_ptr< D_PAD > pad( new D_PAD( aParent ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedSYMBOLorNUMBER();
pad->SetPadName( FromUTF8() );
T token = NextTok();
switch( token )
{
case T_thru_hole:
pad->SetAttribute( PAD_STANDARD );
break;
case T_smd:
pad->SetAttribute( PAD_SMD );
Fix bug caused by setting default drill size in D_PAD (fixes lp:1123392). * Add check for pad type and force drill size to zero if pad is surface mount in PCB_PARSER. * Modify the D_PAD SetAttribute method to clear drill size if pad type is set to surface mount.
2013-02-13 01:01:22 +00:00
// Default D_PAD object is thru hole with drill.
Pcbnew: fix issues: Ensure pads type connector have a drill size= 0, like SMD pads. Ensure keepout zones have no net.
2013-03-10 13:59:47 +00:00
// SMD pads have no hole
Fix bug caused by setting default drill size in D_PAD (fixes lp:1123392). * Add check for pad type and force drill size to zero if pad is surface mount in PCB_PARSER. * Modify the D_PAD SetAttribute method to clear drill size if pad type is set to surface mount.
2013-02-13 01:01:22 +00:00
pad->SetDrillSize( wxSize( 0, 0 ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_connect:
pad->SetAttribute( PAD_CONN );
Pcbnew: fix issues: Ensure pads type connector have a drill size= 0, like SMD pads. Ensure keepout zones have no net.
2013-03-10 13:59:47 +00:00
// Default D_PAD object is thru hole with drill.
// CONN pads have no hole
pad->SetDrillSize( wxSize( 0, 0 ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_np_thru_hole:
pad->SetAttribute( PAD_HOLE_NOT_PLATED );
break;
default:
Expecting( "thru_hole, smd, connect, or np_thru_hole" );
}
token = NextTok();
switch( token )
{
case T_circle:
pad->SetShape( PAD_CIRCLE );
break;
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
case T_rect:
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
pad->SetShape( PAD_RECT );
break;
case T_oval:
pad->SetShape( PAD_OVAL );
break;
case T_trapezoid:
pad->SetShape( PAD_TRAPEZOID );
break;
default:
Expecting( "circle, rectangle, oval, or trapezoid" );
}
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token != T_LEFT )
Expecting( T_LEFT );
token = NextTok();
switch( token )
{
case T_size:
sz.SetWidth( parseBoardUnits( "width value" ) );
sz.SetHeight( parseBoardUnits( "height value" ) );
pad->SetSize( sz );
NeedRIGHT();
break;
case T_at:
pt.x = parseBoardUnits( "X coordinate" );
pt.y = parseBoardUnits( "Y coordinate" );
pad->SetPos0( pt );
token = NextTok();
if( token == T_NUMBER )
{
pad->SetOrientation( parseDouble() * 10.0 );
NeedRIGHT();
}
else if( token != T_RIGHT )
{
Expecting( ") or angle value" );
}
break;
Pcbnew s-expression file parser bug fixes. * Change save order of drawings to match legacy file format object order. * Set end point of SEGVIA to start point so the round trip back to legacy format is the same. * Fixed bug saving and loading oval pad drill parameters. * Fixed bug saving and loading rectangular pad deltas. * Fixed missing layer for PCB_TARGET. * Fixed EDA_TEXT italic bug. Thanks Dick! * Remove some left over debug logging statements.
2012-06-13 23:04:42 +00:00
case T_rect_delta:
fix LSET() constructors, formatting
2014-06-29 20:33:29 +00:00
{
wxSize delta;
delta.SetWidth( parseBoardUnits( "rectangle delta width" ) );
delta.SetHeight( parseBoardUnits( "rectangle delta height" ) );
pad->SetDelta( delta );
NeedRIGHT();
}
Pcbnew s-expression file parser bug fixes. * Change save order of drawings to match legacy file format object order. * Set end point of SEGVIA to start point so the round trip back to legacy format is the same. * Fixed bug saving and loading oval pad drill parameters. * Fixed bug saving and loading rectangular pad deltas. * Fixed missing layer for PCB_TARGET. * Fixed EDA_TEXT italic bug. Thanks Dick! * Remove some left over debug logging statements.
2012-06-13 23:04:42 +00:00
break;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
Pcbnew s-expression file parser bug fixes. * Change save order of drawings to match legacy file format object order. * Set end point of SEGVIA to start point so the round trip back to legacy format is the same. * Fixed bug saving and loading oval pad drill parameters. * Fixed bug saving and loading rectangular pad deltas. * Fixed missing layer for PCB_TARGET. * Fixed EDA_TEXT italic bug. Thanks Dick! * Remove some left over debug logging statements.
2012-06-13 23:04:42 +00:00
case T_drill:
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
{
fix LSET() constructors, formatting
2014-06-29 20:33:29 +00:00
bool haveWidth = false;
wxSize drillSize = pad->GetDrillSize();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
fix LSET() constructors, formatting
2014-06-29 20:33:29 +00:00
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
Pcbnew s-expression file parser bug fixes. * Change save order of drawings to match legacy file format object order. * Set end point of SEGVIA to start point so the round trip back to legacy format is the same. * Fixed bug saving and loading oval pad drill parameters. * Fixed bug saving and loading rectangular pad deltas. * Fixed missing layer for PCB_TARGET. * Fixed EDA_TEXT italic bug. Thanks Dick! * Remove some left over debug logging statements.
2012-06-13 23:04:42 +00:00
{
fix LSET() constructors, formatting
2014-06-29 20:33:29 +00:00
if( token == T_LEFT )
token = NextTok();
Minor Pcbnew s-expression improvements. * Put text effects on a single line. * Remove size token when defining drill sizes. * Don't save net in pad definition when pad has no connection.
2012-06-24 01:19:41 +00:00
fix LSET() constructors, formatting
2014-06-29 20:33:29 +00:00
switch( token )
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
{
fix LSET() constructors, formatting
2014-06-29 20:33:29 +00:00
case T_oval:
pad->SetDrillShape( PAD_DRILL_OBLONG );
break;
case T_NUMBER:
{
if( !haveWidth )
{
drillSize.SetWidth( parseBoardUnits() );
// If height is not defined the width and height are the same.
drillSize.SetHeight( drillSize.GetWidth() );
haveWidth = true;
}
else
{
drillSize.SetHeight( parseBoardUnits() );
}
}
break;
case T_offset:
pt.x = parseBoardUnits( "drill offset x" );
pt.y = parseBoardUnits( "drill offset y" );
pad->SetOffset( pt );
NeedRIGHT();
break;
default:
Expecting( "oval, size, or offset" );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
}
}
fix LSET() constructors, formatting
2014-06-29 20:33:29 +00:00
// This fixes a bug caused by setting the default D_PAD drill size to a value
// other than 0 used to fix a bunch of debug assertions even though it is defined
// as a through hole pad. Wouldn't a though hole pad with no drill be a surface
// mount pad (or a conn pad which is a smd pad with no solder paste)?
if( ( pad->GetAttribute() != PAD_SMD ) && ( pad->GetAttribute() != PAD_CONN ) )
pad->SetDrillSize( drillSize );
else
pad->SetDrillSize( wxSize( 0, 0 ) );
Pcbnew s-expression file parser bug fixes. * Change save order of drawings to match legacy file format object order. * Set end point of SEGVIA to start point so the round trip back to legacy format is the same. * Fixed bug saving and loading oval pad drill parameters. * Fixed bug saving and loading rectangular pad deltas. * Fixed missing layer for PCB_TARGET. * Fixed EDA_TEXT italic bug. Thanks Dick! * Remove some left over debug logging statements.
2012-06-13 23:04:42 +00:00
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
}
break;
case T_layers:
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
{
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
LSET layerMask = parseBoardItemLayersAsMask();
pad->SetLayerSet( layerMask );
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_net:
bugfix #1325743: cvpcb crashes when opening any netlist.
2014-06-03 07:32:57 +00:00
pad->SetNetCode( getNetCode( parseInt( "net number" ) ) );
fixes for plugins
2012-08-11 05:50:17 +00:00
NeedSYMBOLorNUMBER();
Renamed BOARD_CONNECTED_ITEM::GetNet() -> GetNetCode() Renamed BOARD_CONNECTED_ITEM::SetNet() -> SetNetCode() Added BOARD_CONNECTED_ITEM::GetNet() for accessing NETINFO_ITEM* of a given item. Fixed module editor crash when launched to edit a module from a PCB. Replaced some BOARD::FindNet( item->GetNet() ) calls with BOARD_CONNECTED_ITEM::GetNet().
2014-02-25 10:47:27 +00:00
assert( FromUTF8() == m_board->FindNet( pad->GetNetCode() )->GetNetname() );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_die_length:
Pcbnew: fix Bug #1089120. Also change "Length Die" expression to "Length Pad To Die" in code
2012-12-12 11:57:17 +00:00
pad->SetPadToDieLength( parseBoardUnits( T_die_length ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_solder_mask_margin:
pad->SetLocalSolderMaskMargin( parseBoardUnits( T_solder_mask_margin ) );
NeedRIGHT();
break;
case T_solder_paste_margin:
pad->SetLocalSolderPasteMargin( parseBoardUnits( T_solder_paste_margin ) );
NeedRIGHT();
break;
case T_solder_paste_margin_ratio:
Pcbnew: fix bug in pcb_parser: incorrect pad local solder paste margin ratio value read when not 0. ( This also fixes bug 1170535 )
2013-04-19 07:14:27 +00:00
pad->SetLocalSolderPasteMarginRatio(
parseDouble( "pad local solder paste margin ratio value" ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_clearance:
pad->SetLocalClearance( parseBoardUnits( "local clearance value" ) );
NeedRIGHT();
break;
case T_zone_connect:
pad->SetZoneConnection( (ZoneConnection) parseInt( "zone connection value" ) );
NeedRIGHT();
break;
case T_thermal_width:
pad->SetThermalWidth( parseBoardUnits( T_thermal_width ) );
NeedRIGHT();
break;
case T_thermal_gap:
pad->SetThermalGap( parseBoardUnits( T_thermal_gap ) );
NeedRIGHT();
break;
default:
Expecting( "at, drill, layers, net, die_length, solder_mask_margin, "
"solder_paste_margin, solder_paste_margin_ratio, clearance, "
"zone_connect, thermal_width, or thermal_gap" );
}
}
return pad.release();
}
TRACK* PCB_PARSER::parseTRACK() throw( IO_ERROR, PARSE_ERROR )
{
wxCHECK_MSG( CurTok() == T_segment, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as TRACK." ) );
wxPoint pt;
T token;
Remove some uses of using namespace std.
2013-12-13 16:27:30 +00:00
std::auto_ptr< TRACK > track( new TRACK( m_board ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token != T_LEFT )
Expecting( T_LEFT );
token = NextTok();
switch( token )
{
case T_start:
pt.x = parseBoardUnits( "start x" );
pt.y = parseBoardUnits( "start y" );
track->SetStart( pt );
break;
case T_end:
pt.x = parseBoardUnits( "end x" );
pt.y = parseBoardUnits( "end y" );
track->SetEnd( pt );
break;
case T_width:
track->SetWidth( parseBoardUnits( "width" ) );
break;
case T_layer:
track->SetLayer( parseBoardItemLayer() );
break;
case T_net:
bugfix #1325743: cvpcb crashes when opening any netlist.
2014-06-03 07:32:57 +00:00
track->SetNetCode( getNetCode( parseInt( "net number" ) ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_tstamp:
track->SetTimeStamp( parseHex() );
break;
case T_status:
Typedef STATUS_FLAGS to encapsulate EDA_ITEM bitmapped flags
2013-03-28 19:12:46 +00:00
track->SetStatus( static_cast<STATUS_FLAGS>( parseHex() ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
default:
Expecting( "start, end, width, layer, net, tstamp, or status" );
}
NeedRIGHT();
}
return track.release();
}
TRACK/SEGVIA cleanup - SEGVIA becomes VIA - Drill size moved from TRACK to VIA - Removed shape from TRACK, becomes ViaType in VIA - GetTrace becomes GetTrack, for uniformity - Some minor constification and typo fixes
2014-04-25 06:00:04 +00:00
VIA* PCB_PARSER::parseVIA() throw( IO_ERROR, PARSE_ERROR )
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
{
wxCHECK_MSG( CurTok() == T_via, NULL,
TRACK/SEGVIA cleanup - SEGVIA becomes VIA - Drill size moved from TRACK to VIA - Removed shape from TRACK, becomes ViaType in VIA - GetTrace becomes GetTrack, for uniformity - Some minor constification and typo fixes
2014-04-25 06:00:04 +00:00
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as VIA." ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
wxPoint pt;
T token;
TRACK/SEGVIA cleanup - SEGVIA becomes VIA - Drill size moved from TRACK to VIA - Removed shape from TRACK, becomes ViaType in VIA - GetTrace becomes GetTrack, for uniformity - Some minor constification and typo fixes
2014-04-25 06:00:04 +00:00
std::auto_ptr< VIA > via( new VIA( m_board ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token == T_LEFT )
token = NextTok();
switch( token )
{
case T_blind:
TRACK/SEGVIA cleanup - SEGVIA becomes VIA - Drill size moved from TRACK to VIA - Removed shape from TRACK, becomes ViaType in VIA - GetTrace becomes GetTrack, for uniformity - Some minor constification and typo fixes
2014-04-25 06:00:04 +00:00
via->SetViaType( VIA_BLIND_BURIED );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_micro:
TRACK/SEGVIA cleanup - SEGVIA becomes VIA - Drill size moved from TRACK to VIA - Removed shape from TRACK, becomes ViaType in VIA - GetTrace becomes GetTrack, for uniformity - Some minor constification and typo fixes
2014-04-25 06:00:04 +00:00
via->SetViaType( VIA_MICROVIA );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_at:
pt.x = parseBoardUnits( "start x" );
pt.y = parseBoardUnits( "start y" );
via->SetStart( pt );
Pcbnew s-expression file parser bug fixes. * Change save order of drawings to match legacy file format object order. * Set end point of SEGVIA to start point so the round trip back to legacy format is the same. * Fixed bug saving and loading oval pad drill parameters. * Fixed bug saving and loading rectangular pad deltas. * Fixed missing layer for PCB_TARGET. * Fixed EDA_TEXT italic bug. Thanks Dick! * Remove some left over debug logging statements.
2012-06-13 23:04:42 +00:00
via->SetEnd( pt );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_size:
via->SetWidth( parseBoardUnits( "via width" ) );
NeedRIGHT();
break;
case T_drill:
via->SetDrill( parseBoardUnits( "drill diameter" ) );
NeedRIGHT();
break;
case T_layers:
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
{
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
LAYER_ID layer1, layer2;
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
NextTok();
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
layer1 = lookUpLayer<LAYER_ID>( m_layerIndices );
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
NextTok();
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
layer2 = lookUpLayer<LAYER_ID>( m_layerIndices );
1) Switch to boost hashtable support from wx macros which did not handle std::string. This required the additional compiler command line option "-std=c++0x". 2) Switch to unique_ptr from auto_ptr which is C++ deprecated. 3) Change to new English layer names per mailing list discussion, see class_board.cpp. 4) When saving to *.kicad_pcb or *.kicad_mod, identify opportunities to use wildcard layer sets, for pads so far. 5) Switch to two std::string hashtables in pcb_parser.cpp, away from one wxString based one for layer names and layer sets mapping. One hashtable holds the mask, the other the index. Layer sets are only in the mask table. 6) Move "LOCALE_IO toggle" into PCB_IO::Format() since it is a public API function and caller should find it as convenient as possible to use. LOCALE_IO should handle nesting OK in the case where public Format() is called from one of the Footprint*() functions. 7) Drop support for "export module to new library". Creating new libraries will have to be handled in concert with library table entries, and we've talked recently about creating a better footprint library manager, one that resides in a DLL/DSO. So this kind of functionality needs to be handled in there in the near future. 8) Change name of exported PCB_IO module/footprint to *.kicad_mod and not *.emp.
2012-11-14 07:15:59 +00:00
via->SetLayerPair( layer1, layer2 );
NeedRIGHT();
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_net:
bugfix #1325743: cvpcb crashes when opening any netlist.
2014-06-03 07:32:57 +00:00
via->SetNetCode( getNetCode( parseInt( "net number" ) ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_tstamp:
via->SetTimeStamp( parseHex() );
NeedRIGHT();
break;
case T_status:
Typedef STATUS_FLAGS to encapsulate EDA_ITEM bitmapped flags
2013-03-28 19:12:46 +00:00
via->SetStatus( static_cast<STATUS_FLAGS>( parseHex() ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
default:
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
Expecting( "blind, micro, at, size, drill, layers, net, tstamp, or status" );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
}
}
return via.release();
}
ZONE_CONTAINER* PCB_PARSER::parseZONE_CONTAINER() throw( IO_ERROR, PARSE_ERROR )
{
wxCHECK_MSG( CurTok() == T_zone, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) +
wxT( " as ZONE_CONTAINER." ) );
Fix issues in zones creation (DRC and merging) I created in 3658.1
2012-07-30 07:40:25 +00:00
CPolyLine::HATCH_STYLE hatchStyle = CPolyLine::NO_HATCH;
1) Add 32 Cu Layers. 2) Change from legacy Cu stack to counting down from top=(F_Cu or 0). The old Cu stack required knowing the count of Cu layers to make sense of the layer number when converting to many exported file types. The new Cu stack is more commonly used, although ours still gives B_Cu a fixed number. 3) Introduce class LSET and enum LAYER_ID. 4) Change *.kicad_pcb file format version to 4 from 3. 5) Change fixed names Inner1_Cu-Inner14_Cu to In1_Cu-In30_Cu and their meanings are typically flipped. 6) Moved the #define LAYER_N_* stuff into legacy_plugin.cpp where they can die a quiet death, and switch to enum LAYER_ID symbols throughout. 7) Removed the LEGACY_PLUGIN::Save() and FootprintSave() functions. You will need to convert to the format immediately, *.kicad_pcb and *.kicad_mod (=pretty) since legacy format was never going to know about 32 Cu layers and additional technical layers and the reversed Cu stack.
2014-06-24 16:17:18 +00:00
Fix issues in zones creation (DRC and merging) I created in 3658.1
2012-07-30 07:40:25 +00:00
int hatchPitch = Mils2iu( CPolyLine::GetDefaultHatchPitchMils() );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
wxPoint pt;
T token;
Save and load print parameters and minor code cleaning in new Pcbnew file format.
2012-07-05 17:02:45 +00:00
// bigger scope since each filled_polygon is concatenated in here
All: use CPOLYGONS_LIST, a typedef of std::vector<CPolyPt> to handle a Corners Polygons List. This is a starting point of some code enhancements relative to polygons in Pcbew and 3D viewer.
2013-05-03 17:51:10 +00:00
CPOLYGONS_LIST pts;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
Remove some uses of using namespace std.
2013-12-13 16:27:30 +00:00
std::auto_ptr< ZONE_CONTAINER > zone( new ZONE_CONTAINER( m_board ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
zone->SetPriority( 0 );
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token == T_LEFT )
token = NextTok();
switch( token )
{
case T_net:
Pcbnew: fix 2 minor issues, noticeable only in debug mode. When reading board files, the net 0 was stored twice. It creates only log messges in debug mode, because the list of nets is rebuild after reading files.
2012-06-30 08:20:04 +00:00
// Init the net code only, not the netname, to be sure
// the zone net name is the name read in file.
// (When mismatch, the user will be prompted in DRC, to fix the actual name)
bugfix #1325743: cvpcb crashes when opening any netlist.
2014-06-03 07:32:57 +00:00
zone->SetNetCode( getNetCode( parseInt( "net number" ) ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_net_name:
parse *.kicad_pcb files with numeric net_names
2013-02-28 16:17:24 +00:00
NeedSYMBOLorNUMBER();
Renamed BOARD_CONNECTED_ITEM::GetNet() -> GetNetCode() Renamed BOARD_CONNECTED_ITEM::SetNet() -> SetNetCode() Added BOARD_CONNECTED_ITEM::GetNet() for accessing NETINFO_ITEM* of a given item. Fixed module editor crash when launched to edit a module from a PCB. Replaced some BOARD::FindNet( item->GetNet() ) calls with BOARD_CONNECTED_ITEM::GetNet().
2014-02-25 10:47:27 +00:00
if( zone->GetNet()->GetNetname() != FromUTF8() )
Added NETINFO_MAPPING, to ease saving nets with consecutive net codes (without modifying the net codes during the run time). Now, nets are saved with consecutive net codes (both modern & legacy plugins). Zones are saved together with their nets, without depending on the fact if there are any pads with such net. Therefore validation of zone net names was removed (pcbnew/class_board.cpp). Performed tests: - Changed a pad's net name from empty to existent - ok, name was changed. - Changed a pad's net name from empty to nonexistent - ok, error message is displayed, net name stays empty. - Changed a pad's net name from existent to empty - ok, net name became empty - Changed a pad's net name from existent to nonexistent - ok, error message is displayed, net name is not changed. - Drawn a zone that belongs to a net, then modified schematics so the net does not exist anymore. After reloading the net list, all pads/tracks are updated. Zones still belongs to the net that does not exist in the schematic (but still exists in .kicad_pcb file). After running DRC, the zone becomes not filled. - Undo & redo affects assignment of a polygon to a specific net (you may change net of a polygon, refill it and undo/redo the changes). - KiCad s-expr & legacy, Eagle, P-CAD boards seem to load without any problem (they also contain correct net names assigned to the appropriate pads). All types of board file formats were loaded, then saved in sexpr format and reopened with a KiCad built from the master branch (without my modifications). - A few boards were also saved using the legacy format and were opened with the master KiCad without any issues. - Change a net name for a pad, restore with undo/redo - ok - Remove everything, restore with undo - ok - Remove everything, reload netlist - ok Differences observed between files saved by the master branch KiCad and this one: - list of nets are not saved in any particular order, so net codes may differ - the default net class does not contain the unconnected net
2014-01-28 09:19:51 +00:00
{
Pad editor dialog: Better tests and error messages about issues in pad settings. Fis also an other hard to translate error messge.
2014-03-19 20:06:09 +00:00
wxString msg;
msg.Printf( _( "There is a zone that belongs to a not existing net"
"(%s), you should verify it." ), GetChars( FromUTF8() ) );
Minor changes (fix cvpcb build issue, wx2.8 compatibility, some other stuff).
2014-02-03 15:02:54 +00:00
DisplayError( NULL, msg );
Renamed BOARD_CONNECTED_ITEM::GetNet() -> GetNetCode() Renamed BOARD_CONNECTED_ITEM::SetNet() -> SetNetCode() Added BOARD_CONNECTED_ITEM::GetNet() for accessing NETINFO_ITEM* of a given item. Fixed module editor crash when launched to edit a module from a PCB. Replaced some BOARD::FindNet( item->GetNet() ) calls with BOARD_CONNECTED_ITEM::GetNet().
2014-02-25 10:47:27 +00:00
zone->SetNetCode( NETINFO_LIST::UNCONNECTED );
Added NETINFO_MAPPING, to ease saving nets with consecutive net codes (without modifying the net codes during the run time). Now, nets are saved with consecutive net codes (both modern & legacy plugins). Zones are saved together with their nets, without depending on the fact if there are any pads with such net. Therefore validation of zone net names was removed (pcbnew/class_board.cpp). Performed tests: - Changed a pad's net name from empty to existent - ok, name was changed. - Changed a pad's net name from empty to nonexistent - ok, error message is displayed, net name stays empty. - Changed a pad's net name from existent to empty - ok, net name became empty - Changed a pad's net name from existent to nonexistent - ok, error message is displayed, net name is not changed. - Drawn a zone that belongs to a net, then modified schematics so the net does not exist anymore. After reloading the net list, all pads/tracks are updated. Zones still belongs to the net that does not exist in the schematic (but still exists in .kicad_pcb file). After running DRC, the zone becomes not filled. - Undo & redo affects assignment of a polygon to a specific net (you may change net of a polygon, refill it and undo/redo the changes). - KiCad s-expr & legacy, Eagle, P-CAD boards seem to load without any problem (they also contain correct net names assigned to the appropriate pads). All types of board file formats were loaded, then saved in sexpr format and reopened with a KiCad built from the master branch (without my modifications). - A few boards were also saved using the legacy format and were opened with the master KiCad without any issues. - Change a net name for a pad, restore with undo/redo - ok - Remove everything, restore with undo - ok - Remove everything, reload netlist - ok Differences observed between files saved by the master branch KiCad and this one: - list of nets are not saved in any particular order, so net codes may differ - the default net class does not contain the unconnected net
2014-01-28 09:19:51 +00:00
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
NeedRIGHT();
break;
case T_layer:
zone->SetLayer( parseBoardItemLayer() );
NeedRIGHT();
break;
case T_tstamp:
zone->SetTimeStamp( parseHex() );
NeedRIGHT();
break;
case T_hatch:
token = NextTok();
if( token != T_none && token != T_edge && token != T_full )
Expecting( "none, edge, or full" );
switch( token )
{
default:
case T_none: hatchStyle = CPolyLine::NO_HATCH; break;
case T_edge: hatchStyle = CPolyLine::DIAGONAL_EDGE; break;
case T_full: hatchStyle = CPolyLine::DIAGONAL_FULL;
}
hatchPitch = parseBoardUnits( "hatch pitch" );
NeedRIGHT();
break;
case T_priority:
zone->SetPriority( parseInt( "zone priority" ) );
NeedRIGHT();
break;
case T_connect_pads:
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
{
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
if( token == T_LEFT )
token = NextTok();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
switch( token )
{
case T_yes:
zone->SetPadConnection( PAD_IN_ZONE );
break;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
case T_no:
zone->SetPadConnection( PAD_NOT_IN_ZONE );
break;
Pcbnew: commit Lorenzo Marcantonio's patch for THT thermals (added loading/saving using S. expr). Fix incorrect import of smd pads from Gpcb. Very minor change in dialog print.
2012-07-09 07:10:07 +00:00
case T_thru_hole_only:
zone->SetPadConnection( THT_THERMAL );
break;
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
case T_clearance:
zone->SetZoneClearance( parseBoardUnits( "zone clearance" ) );
NeedRIGHT();
break;
default:
Expecting( "yes, no, or clearance" );
}
}
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_min_thickness:
zone->SetMinThickness( parseBoardUnits( T_min_thickness ) );
NeedRIGHT();
break;
case T_fill:
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
if( token == T_LEFT )
token = NextTok();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
switch( token )
{
Pcbnew s-expression file parser bug fixes and file size improvements. * Use index when saving layers to handle translated layer names. * Add LOCALE_IO switcher when loading s-expression format. * Make SEGVIA default to through hole to improve file size. * Don't save default orientation of 0 degrees in TEXTE_MODULE and TEXTE_PCB. * Don't save default zone configuration parameters. * Save multiple zone corners on a single line. * Fixed missing ( check in graphic and module arc parsers. * Consistency improvements for DRAWSEGMENT and EDGE_MODULE objects. * Minor tweaks to D_PAD formatting.
2012-06-16 22:49:24 +00:00
case T_yes:
zone->SetIsFilled( true );
break;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
case T_mode:
token = NextTok();
if( token != T_segment && token != T_polygon )
Expecting( "segment or polygon" );
// @todo Create an enum for fill modes.
zone->SetFillMode( token == T_polygon ? 0 : 1 );
pcb_parser failed on (fill yes (arc_segments 16) (thermal_gap 1.99898) (thermal_bridge_width 1.99898)) See http://tech.groups.yahoo.com/group/kicad-users/message/15105
2013-04-25 12:25:47 +00:00
NeedRIGHT();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_arc_segments:
More encapsulation work. * Complete encapsulation of the MODULE class. * Complete encapsulation of the EDA_TEXT class. * Encapsulate most of the ZONE_CONTAINER class. * Add pcbcommon library as a dependency for reSWIGging the scripting support. This should cover most dependency cases.
2013-03-18 19:36:07 +00:00
zone->SetArcSegmentCount( parseInt( "arc segment count" ) );
pcb_parser failed on (fill yes (arc_segments 16) (thermal_gap 1.99898) (thermal_bridge_width 1.99898)) See http://tech.groups.yahoo.com/group/kicad-users/message/15105
2013-04-25 12:25:47 +00:00
NeedRIGHT();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_thermal_gap:
zone->SetThermalReliefGap( parseBoardUnits( T_thermal_gap ) );
pcb_parser failed on (fill yes (arc_segments 16) (thermal_gap 1.99898) (thermal_bridge_width 1.99898)) See http://tech.groups.yahoo.com/group/kicad-users/message/15105
2013-04-25 12:25:47 +00:00
NeedRIGHT();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_thermal_bridge_width:
zone->SetThermalReliefCopperBridge( parseBoardUnits( T_thermal_bridge_width ) );
pcb_parser failed on (fill yes (arc_segments 16) (thermal_gap 1.99898) (thermal_bridge_width 1.99898)) See http://tech.groups.yahoo.com/group/kicad-users/message/15105
2013-04-25 12:25:47 +00:00
NeedRIGHT();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_smoothing:
switch( NextTok() )
{
case T_none:
zone->SetCornerSmoothingType( ZONE_SETTINGS::SMOOTHING_NONE );
break;
case T_chamfer:
zone->SetCornerSmoothingType( ZONE_SETTINGS::SMOOTHING_CHAMFER );
break;
case T_fillet:
zone->SetCornerSmoothingType( ZONE_SETTINGS::SMOOTHING_FILLET );
break;
default:
Expecting( "none, chamfer, or fillet" );
}
pcb_parser failed on (fill yes (arc_segments 16) (thermal_gap 1.99898) (thermal_bridge_width 1.99898)) See http://tech.groups.yahoo.com/group/kicad-users/message/15105
2013-04-25 12:25:47 +00:00
NeedRIGHT();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
case T_radius:
zone->SetCornerRadius( parseBoardUnits( "corner radius" ) );
pcb_parser failed on (fill yes (arc_segments 16) (thermal_gap 1.99898) (thermal_bridge_width 1.99898)) See http://tech.groups.yahoo.com/group/kicad-users/message/15105
2013-04-25 12:25:47 +00:00
NeedRIGHT();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
break;
default:
Expecting( "mode, arc_segments, thermal_gap, thermal_bridge_width, "
"smoothing, or radius" );
}
}
break;
Pcbnew: Add keepout areas (Copper zones without tracks or/and vias). This is *a work in progress*, so some features are missing, and/or could be modified. Mainly keepout zones are not yet exported to autorouters, and pads are not taken in account. Some code cleanup in polygon.*
2012-07-13 18:55:29 +00:00
case T_keepout:
zone->SetIsKeepout( true );
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token == T_LEFT )
token = NextTok();
switch( token )
{
case T_tracks:
token = NextTok();
if( token != T_allowed && token != T_not_allowed )
Expecting( "allowed or not_allowed" );
zone->SetDoNotAllowTracks( token == T_not_allowed );
break;
case T_vias:
token = NextTok();
if( token != T_allowed && token != T_not_allowed )
Expecting( "allowed or not_allowed" );
zone->SetDoNotAllowVias( token == T_not_allowed );
break;
Pcbnew: more about keepout areas: remove keepout for pads option and add keepout for copper zones option. Export keepout to Specctra DSN file.
2012-07-14 16:27:25 +00:00
case T_copperpour:
Pcbnew: Add keepout areas (Copper zones without tracks or/and vias). This is *a work in progress*, so some features are missing, and/or could be modified. Mainly keepout zones are not yet exported to autorouters, and pads are not taken in account. Some code cleanup in polygon.*
2012-07-13 18:55:29 +00:00
token = NextTok();
if( token != T_allowed && token != T_not_allowed )
Expecting( "allowed or not_allowed" );
Pcbnew: more about keepout areas: remove keepout for pads option and add keepout for copper zones option. Export keepout to Specctra DSN file.
2012-07-14 16:27:25 +00:00
zone->SetDoNotAllowCopperPour( token == T_not_allowed );
Pcbnew: Add keepout areas (Copper zones without tracks or/and vias). This is *a work in progress*, so some features are missing, and/or could be modified. Mainly keepout zones are not yet exported to autorouters, and pads are not taken in account. Some code cleanup in polygon.*
2012-07-13 18:55:29 +00:00
break;
default:
Pcbnew: more about keepout areas: remove keepout for pads option and add keepout for copper zones option. Export keepout to Specctra DSN file.
2012-07-14 16:27:25 +00:00
Expecting( "tracks, vias or copperpour" );
Pcbnew: Add keepout areas (Copper zones without tracks or/and vias). This is *a work in progress*, so some features are missing, and/or could be modified. Mainly keepout zones are not yet exported to autorouters, and pads are not taken in account. Some code cleanup in polygon.*
2012-07-13 18:55:29 +00:00
}
NeedRIGHT();
}
break;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
case T_polygon:
{
std::vector< wxPoint > corners;
NeedLEFT();
token = NextTok();
if( token != T_pts )
Expecting( T_pts );
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
corners.push_back( parseXY() );
}
NeedRIGHT();
zone->AddPolygon( corners );
}
break;
case T_filled_polygon:
{
// "(filled_polygon (pts"
NeedLEFT();
token = NextTok();
if( token != T_pts )
Expecting( T_pts );
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
More work on CPOLYGONS_LIST class. Pcbnew: fix minor bug about plot line width.
2013-05-09 19:08:12 +00:00
pts.Append( CPolyPt( parseXY() ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
}
NeedRIGHT();
More work on CPOLYGONS_LIST class. Pcbnew: fix minor bug about plot line width.
2013-05-09 19:08:12 +00:00
pts.CloseLastContour();
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
}
break;
case T_fill_segments:
{
std::vector< SEGMENT > segs;
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token != T_LEFT )
Expecting( T_LEFT );
token = NextTok();
if( token != T_pts )
Expecting( T_pts );
SEGMENT segment( parseXY(), parseXY() );
NeedRIGHT();
segs.push_back( segment );
}
zone->AddFillSegments( segs );
}
break;
default:
Expecting( "net, layer, tstamp, hatch, priority, connect_pads, min_thickness, "
"fill, polygon, filled_polygon, or fill_segments" );
}
}
if( zone->GetNumCorners() > 2 )
{
if( !zone->IsOnCopperLayer() )
{
zone->SetFillMode( 0 );
Renamed BOARD_CONNECTED_ITEM::GetNet() -> GetNetCode() Renamed BOARD_CONNECTED_ITEM::SetNet() -> SetNetCode() Added BOARD_CONNECTED_ITEM::GetNet() for accessing NETINFO_ITEM* of a given item. Fixed module editor crash when launched to edit a module from a PCB. Replaced some BOARD::FindNet( item->GetNet() ) calls with BOARD_CONNECTED_ITEM::GetNet().
2014-02-25 10:47:27 +00:00
zone->SetNetCode( NETINFO_LIST::UNCONNECTED );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
}
// Set hatch here, after outlines corners are read
Encapsulation, bug, context menu string, and, coding policy fixes. * Complete encapsulation of the ZONE_CONTAINER class. * Fixed a bug in the EDA_TEXT::Format() default effects behavior due to improper conversion to internal units and missing test for default thickness. * Improved grammar of some Pcbnew context menu strings. * Moved some more cleverly hidden BOARD object methods into class_board.cpp. * Lots of coding policy and documentation fixes.
2013-03-20 14:50:12 +00:00
zone->Outline()->SetHatch( hatchStyle, hatchPitch, true );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
}
More work on CPOLYGONS_LIST class. Pcbnew: fix minor bug about plot line width.
2013-05-09 19:08:12 +00:00
if( pts.GetCornersCount() )
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
zone->AddFilledPolysList( pts );
Pcbnew: fix issues: Ensure pads type connector have a drill size= 0, like SMD pads. Ensure keepout zones have no net.
2013-03-10 13:59:47 +00:00
// Ensure keepout does not have a net (which have no sense for a keepout zone)
if( zone->GetIsKeepout() )
Renamed BOARD_CONNECTED_ITEM::GetNet() -> GetNetCode() Renamed BOARD_CONNECTED_ITEM::SetNet() -> SetNetCode() Added BOARD_CONNECTED_ITEM::GetNet() for accessing NETINFO_ITEM* of a given item. Fixed module editor crash when launched to edit a module from a PCB. Replaced some BOARD::FindNet( item->GetNet() ) calls with BOARD_CONNECTED_ITEM::GetNet().
2014-02-25 10:47:27 +00:00
zone->SetNetCode( NETINFO_LIST::UNCONNECTED );
Pcbnew: fix issues: Ensure pads type connector have a drill size= 0, like SMD pads. Ensure keepout zones have no net.
2013-03-10 13:59:47 +00:00
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
return zone.release();
}
PCB_TARGET* PCB_PARSER::parsePCB_TARGET() throw( IO_ERROR, PARSE_ERROR )
{
wxCHECK_MSG( CurTok() == T_target, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as PCB_TARGET." ) );
wxPoint pt;
T token;
Remove some uses of using namespace std.
2013-12-13 16:27:30 +00:00
std::auto_ptr< PCB_TARGET > target( new PCB_TARGET( NULL ) );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
if( token == T_LEFT )
token = NextTok();
switch( token )
{
case T_x:
target->SetShape( 1 );
break;
case T_plus:
target->SetShape( 0 );
break;
case T_at:
pt.x = parseBoardUnits( "target x position" );
pt.y = parseBoardUnits( "target y position" );
target->SetPosition( pt );
NeedRIGHT();
break;
case T_size:
target->SetSize( parseBoardUnits( "target size" ) );
NeedRIGHT();
break;
case T_width:
target->SetWidth( parseBoardUnits( "target thickness" ) );
NeedRIGHT();
break;
Pcbnew s-expression file parser bug fixes. * Change save order of drawings to match legacy file format object order. * Set end point of SEGVIA to start point so the round trip back to legacy format is the same. * Fixed bug saving and loading oval pad drill parameters. * Fixed bug saving and loading rectangular pad deltas. * Fixed missing layer for PCB_TARGET. * Fixed EDA_TEXT italic bug. Thanks Dick! * Remove some left over debug logging statements.
2012-06-13 23:04:42 +00:00
case T_layer:
target->SetLayer( parseBoardItemLayer() );
NeedRIGHT();
break;
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
case T_tstamp:
target->SetTimeStamp( parseHex() );
NeedRIGHT();
break;
default:
fix incorrect use of KIROUND instead of KiROUND in parseBoardUnits( const char* aExpected ) (see comments in .h file) very minor fix in pcb_parser.cpp Fix scaling issue with nanometers in gpcb footprint import.
2012-06-14 06:29:54 +00:00
Expecting( "x, plus, at, size, width, layer or tstamp" );
Commit Dick's Pcbnew s-expression file parser bug fixes. * Apply Dick's patch along with a few minor changes to fix some clashes with changes in my branch. Thanks Dick! * Added missing DRAWSEGMENT line angle. * Fix thru hole pad layer mask issue.
2012-06-11 00:47:15 +00:00
}
}
return target.release();
}