Skip to content

K
kicad-source-mirror
Commit 91b0191a authored by jean-pierre charras's avatar jean-pierre charras
Browse files
Options

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)
parent a6bc4a0d
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 50 deletions
pcbnew/class_board.cpp
View file @ 91b0191a
...@@ -76,7 +76,7 @@ BOARD::BOARD() : ...@@ -76,7 +76,7 @@ BOARD::BOARD() :
for( int layer = 0; layer < LAYER_COUNT; ++layer ) for( int layer = 0; layer < LAYER_COUNT; ++layer )
{ {
m_Layer[layer].m_Name = GetDefaultLayerName( layer ); m_Layer[layer].m_Name = GetDefaultLayerName( layer, true );
if( layer <= LAST_COPPER_LAYER ) if( layer <= LAST_COPPER_LAYER )
m_Layer[layer].m_Type = LT_SIGNAL; m_Layer[layer].m_Type = LT_SIGNAL;
...@@ -355,7 +355,7 @@ bool BOARD::SetLayer( int aIndex, const LAYER& aLayer ) ...@@ -355,7 +355,7 @@ bool BOARD::SetLayer( int aIndex, const LAYER& aLayer )
} }
wxString BOARD::GetLayerName( int aLayerIndex ) const wxString BOARD::GetLayerName( int aLayerIndex, bool aTranslate ) const
{ {
if( !IsValidLayerIndex( aLayerIndex ) ) if( !IsValidLayerIndex( aLayerIndex ) )
return wxEmptyString; return wxEmptyString;
...@@ -365,14 +365,51 @@ wxString BOARD::GetLayerName( int aLayerIndex ) const ...@@ -365,14 +365,51 @@ wxString BOARD::GetLayerName( int aLayerIndex ) const
{ {
// default names were set in BOARD::BOARD() but they may be // default names were set in BOARD::BOARD() but they may be
// over-ridden by BOARD::SetLayerName() // over-ridden by BOARD::SetLayerName()
return m_Layer[aLayerIndex].m_Name; // For non translated name, return the actual copper layer names,
// otherwise, return the native layer names
if( aTranslate || aLayerIndex < FIRST_NO_COPPER_LAYER )
return m_Layer[aLayerIndex].m_Name;
} }
return GetDefaultLayerName( aLayerIndex ); return GetDefaultLayerName( aLayerIndex, aTranslate );
} }
wxString BOARD::GetDefaultLayerName( int aLayerNumber ) // Default layer names are statically initialized,
// because we want the Enghish name and the translation
// The Enghish name is stored here, and to get the tranlation
// wxGetTranslation must be called explicitely
static const wxChar * layer_FRONT_name = _( "Front" );
static const wxChar * layer_INNER1_name = _( "Inner1" );
static const wxChar * layer_INNER2_name = _( "Inner2" );
static const wxChar * layer_INNER3_name = _( "Inner3" );
static const wxChar * layer_INNER4_name = _( "Inner4" );
static const wxChar * layer_INNER5_name = _( "Inner5" );
static const wxChar * layer_INNER6_name = _( "Inner6" );
static const wxChar * layer_INNER7_name = _( "Inner7" );
static const wxChar * layer_INNER8_name = _( "Inner8" );
static const wxChar * layer_INNER9_name = _( "Inner9" );
static const wxChar * layer_INNER10_name = _( "Inner10" );
static const wxChar * layer_INNER11_name = _( "Inner11" );
static const wxChar * layer_INNER12_name = _( "Inner12" );
static const wxChar * layer_INNER13_name = _( "Inner13" );
static const wxChar * layer_INNER14_name = _( "Inner14" );
static const wxChar * layer_BACK_name = _( "Back" );
static const wxChar * layer_ADHESIVE_BACK_name = _( "Adhes_Back" );
static const wxChar * layer_ADHESIVE_FRONT_name = _( "Adhes_Front" );
static const wxChar * layer_SOLDERPASTE_BACK_namet = _( "SoldP_Back" );
static const wxChar * layer_SOLDERPASTE_FRONT_name = _( "SoldP_Front" );
static const wxChar * layer_SILKSCREEN_BACK_name = _( "SilkS_Back" );
static const wxChar * layer_SILKSCREEN_FRONT_name = _( "SilkS_Front" );
static const wxChar * layer_SOLDERMASK_BACK_name = _( "Mask_Back" );
static const wxChar * layer_SOLDERMASK_FRONT_name = _( "Mask_Front" );
static const wxChar * layer_DRAW_name = _( "Drawings" );
static const wxChar * layer_COMMENT_name = _( "Comments" );
static const wxChar * layer_ECO1_name = _( "Eco1" );
static const wxChar * layer_ECO2_name = _( "Eco2" );
static const wxChar * layer_EDGE_name = _( "PCB_Edges" );
wxString BOARD::GetDefaultLayerName( int aLayerNumber, bool aTranslate )
{ {
const wxChar* txt; const wxChar* txt;
...@@ -382,39 +419,49 @@ wxString BOARD::GetDefaultLayerName( int aLayerNumber ) ...@@ -382,39 +419,49 @@ wxString BOARD::GetDefaultLayerName( int aLayerNumber )
// Use a switch to explicitly show the mapping more clearly // Use a switch to explicitly show the mapping more clearly
switch( aLayerNumber ) switch( aLayerNumber )
{ {
case LAYER_N_FRONT: txt = _( "Front" ); break; case LAYER_N_FRONT: txt = layer_FRONT_name; break;
case LAYER_N_2: txt = _( "Inner2" ); break; case LAYER_N_2: txt = layer_INNER1_name; break;
case LAYER_N_3: txt = _( "Inner3" ); break; case LAYER_N_3: txt = layer_INNER2_name; break;
case LAYER_N_4: txt = _( "Inner4" ); break; case LAYER_N_4: txt = layer_INNER3_name; break;
case LAYER_N_5: txt = _( "Inner5" ); break; case LAYER_N_5: txt = layer_INNER4_name; break;
case LAYER_N_6: txt = _( "Inner6" ); break; case LAYER_N_6: txt = layer_INNER5_name; break;
case LAYER_N_7: txt = _( "Inner7" ); break; case LAYER_N_7: txt = layer_INNER6_name; break;
case LAYER_N_8: txt = _( "Inner8" ); break; case LAYER_N_8: txt = layer_INNER7_name; break;
case LAYER_N_9: txt = _( "Inner9" ); break; case LAYER_N_9: txt = layer_INNER8_name; break;
case LAYER_N_10: txt = _( "Inner10" ); break; case LAYER_N_10: txt = layer_INNER9_name; break;
case LAYER_N_11: txt = _( "Inner11" ); break; case LAYER_N_11: txt = layer_INNER10_name; break;
case LAYER_N_12: txt = _( "Inner12" ); break; case LAYER_N_12: txt = layer_INNER11_name; break;
case LAYER_N_13: txt = _( "Inner13" ); break; case LAYER_N_13: txt = layer_INNER12_name; break;
case LAYER_N_14: txt = _( "Inner14" ); break; case LAYER_N_14: txt = layer_INNER13_name; break;
case LAYER_N_15: txt = _( "Inner15" ); break; case LAYER_N_15: txt = layer_INNER14_name; break;
case LAYER_N_BACK: txt = _( "Back" ); break; case LAYER_N_BACK: txt = layer_BACK_name; break;
case ADHESIVE_N_BACK: txt = _( "Adhes_Back" ); break; case ADHESIVE_N_BACK: txt =layer_ADHESIVE_BACK_name; break;
case ADHESIVE_N_FRONT: txt = _( "Adhes_Front" ); break; case ADHESIVE_N_FRONT: txt = layer_ADHESIVE_FRONT_name; break;
case SOLDERPASTE_N_BACK: txt = _( "SoldP_Back" ); break; case SOLDERPASTE_N_BACK: txt = layer_SOLDERPASTE_BACK_namet; break;
case SOLDERPASTE_N_FRONT: txt = _( "SoldP_Front" ); break; case SOLDERPASTE_N_FRONT: txt = layer_SOLDERPASTE_FRONT_name; break;
case SILKSCREEN_N_BACK: txt = _( "SilkS_Back" ); break; case SILKSCREEN_N_BACK: txt = layer_SILKSCREEN_BACK_name; break;
case SILKSCREEN_N_FRONT: txt = _( "SilkS_Front" ); break; case SILKSCREEN_N_FRONT: txt = layer_SILKSCREEN_FRONT_name; break;
case SOLDERMASK_N_BACK: txt = _( "Mask_Back" ); break; case SOLDERMASK_N_BACK: txt = layer_SOLDERMASK_BACK_name; break;
case SOLDERMASK_N_FRONT: txt = _( "Mask_Front" ); break; case SOLDERMASK_N_FRONT: txt = layer_SOLDERMASK_FRONT_name; break;
case DRAW_N: txt = _( "Drawings" ); break; case DRAW_N: txt = layer_DRAW_name; break;
case COMMENT_N: txt = _( "Comments" ); break; case COMMENT_N: txt = layer_COMMENT_name; break;
case ECO1_N: txt = _( "Eco1" ); break; case ECO1_N: txt = layer_ECO1_name; break;
case ECO2_N: txt = _( "Eco2" ); break; case ECO2_N: txt = layer_ECO2_name; break;
case EDGE_N: txt = _( "PCB_Edges" ); break; case EDGE_N: txt = layer_EDGE_name; break;
default: txt = _( "BAD INDEX" ); break; default: txt = wxT( "BAD_INDEX" ); break;
} }
return wxString( txt ); wxString name;
if( aTranslate )
{
name = wxGetTranslation( txt );
name.Trim( true );
name.Trim( false );
}
else
name = txt;
return name;
} }
......
pcbnew/class_board.h
View file @ 91b0191a
...@@ -303,10 +303,12 @@ public: ...@@ -303,10 +303,12 @@ public:
* be different than the default if the user has renamed any copper layers. * be different than the default if the user has renamed any copper layers.
* *
* @param aLayerNumber is the layer number to fetch * @param aLayerNumber is the layer number to fetch
* @param aTranslate = true to return the translated version
* = false to get the native version
* @return wxString - containing the layer name or "BAD INDEX" if aLayerNumber * @return wxString - containing the layer name or "BAD INDEX" if aLayerNumber
* is not legal * is not legal
*/ */
static wxString GetDefaultLayerName( int aLayerNumber ); static wxString GetDefaultLayerName( int aLayerNumber, bool aTranslate );
/** /**
* Function ReturnFlippedLayerNumber * Function ReturnFlippedLayerNumber
...@@ -619,10 +621,13 @@ public: ...@@ -619,10 +621,13 @@ public:
* Function GetLayerName * Function GetLayerName
* returns the name of the layer given by aLayerIndex. * returns the name of the layer given by aLayerIndex.
* *
* @param aLayerIndex A layer index, like LAYER_N_BACK, etc. * @param aLayerIndex = A layer index, like LAYER_N_BACK, etc.
* @param aTranslate = true to return the translated version (default)
* = false to get the native English name
* (Useful to build filenames from layer names)
* @return wxString - the layer name. * @return wxString - the layer name.
*/ */
wxString GetLayerName( int aLayerIndex ) const; wxString GetLayerName( int aLayerIndex, bool aTranslate = true ) const;
/** /**
* Function SetLayerName * Function SetLayerName
......
pcbnew/kicad_plugin.cpp
View file @ 91b0191a
...@@ -192,7 +192,7 @@ void PCB_IO::format( BOARD* aBoard, int aNestLevel ) const ...@@ -192,7 +192,7 @@ void PCB_IO::format( BOARD* aBoard, int aNestLevel ) const
#endif #endif
if( !( aBoard->GetVisibleLayers() & mask ) ) if( !( aBoard->GetVisibleLayers() & mask ) )
m_out->Print( 0, "hide" ); m_out->Print( 0, " hide" );
m_out->Print( 0, ")\n" ); m_out->Print( 0, ")\n" );
} }
...@@ -218,7 +218,7 @@ void PCB_IO::format( BOARD* aBoard, int aNestLevel ) const ...@@ -218,7 +218,7 @@ void PCB_IO::format( BOARD* aBoard, int aNestLevel ) const
#endif #endif
if( !( aBoard->GetVisibleLayers() & mask ) ) if( !( aBoard->GetVisibleLayers() & mask ) )
m_out->Print( 0, "hide" ); m_out->Print( 0, " hide" );
m_out->Print( 0, ")\n" ); m_out->Print( 0, ")\n" );
} }
......
pcbnew/pcb_parser.cpp
View file @ 91b0191a
...@@ -1528,13 +1528,13 @@ MODULE* PCB_PARSER::parseMODULE() throw( IO_ERROR, PARSE_ERROR ) ...@@ -1528,13 +1528,13 @@ MODULE* PCB_PARSER::parseMODULE() throw( IO_ERROR, PARSE_ERROR )
break; break;
case T_descr: case T_descr:
NeedSYMBOL(); NeedSYMBOLorNUMBER(); // some symbols can be 0508, so a number is also a symbol here
module->SetDescription( FromUTF8() ); module->SetDescription( FromUTF8() );
NeedRIGHT(); NeedRIGHT();
break; break;
case T_tags: case T_tags:
NeedSYMBOL(); NeedSYMBOLorNUMBER(); // some symbols can be 0508, so a number is also a symbol here
module->SetKeywords( FromUTF8() ); module->SetKeywords( FromUTF8() );
NeedRIGHT(); NeedRIGHT();
break; break;
...@@ -1788,6 +1788,7 @@ EDGE_MODULE* PCB_PARSER::parseEDGE_MODULE() throw( IO_ERROR, PARSE_ERROR ) ...@@ -1788,6 +1788,7 @@ EDGE_MODULE* PCB_PARSER::parseEDGE_MODULE() throw( IO_ERROR, PARSE_ERROR )
pt.y = parseBoardUnits( "Y coordinate" ); pt.y = parseBoardUnits( "Y coordinate" );
segment->SetStart0( pt ); segment->SetStart0( pt );
NeedRIGHT(); NeedRIGHT();
NeedLEFT();
token = NextTok(); token = NextTok();
if( token != T_end ) if( token != T_end )
......
pcbnew/pcbplot.cpp
View file @ 91b0191a
...@@ -111,7 +111,7 @@ private: ...@@ -111,7 +111,7 @@ private:
}; };
const int UNITS_MILS = 1000; //const int UNITS_MILS = 1000;
DIALOG_PLOT::DIALOG_PLOT( PCB_EDIT_FRAME* aParent ) : DIALOG_PLOT::DIALOG_PLOT( PCB_EDIT_FRAME* aParent ) :
DIALOG_PLOT_BASE( aParent ), DIALOG_PLOT_BASE( aParent ),
...@@ -725,9 +725,10 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event ) ...@@ -725,9 +725,10 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event )
fn = m_parent->GetScreen()->GetFileName(); fn = m_parent->GetScreen()->GetFileName();
fn.SetPath( outputDir.GetPath() ); fn.SetPath( outputDir.GetPath() );
// Create file name. // Create file name (from the English layer name for non copper layers).
wxString layername = m_board->GetLayerName( layer ); wxString layername = m_board->GetLayerName( layer, false );
layername.Trim( true ); layername.Trim( false ); // remove leading and trailing spaces if any // remove leading and trailing spaces if any
layername.Trim( true ); layername.Trim( false );
fn.SetName( fn.GetName() + wxT( "-" ) + layername ); fn.SetName( fn.GetName() + wxT( "-" ) + layername );
// Use Gerber Extensions based on layer number // Use Gerber Extensions based on layer number
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment