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

Altium importer: do not mark translatable some strings used in debug messages.

This commit is contained in:
jean-pierre charras 2020-04-05 11:22:40 +02:00
parent c16a453e53
commit 70afd12524
2 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
pcbnew/altium2kicadpcb_plugin/altium_parser_pcb.cpp
View File

@ -153,7 +153,7 @@ ABOARD6::ABOARD6( ALTIUM_PARSER& aReader )
std::map<wxString, wxString> properties = aReader.ReadProperties();
if( properties.empty() )
{
THROW_IO_ERROR( _( "Board6 stream has no properties!" ) );
THROW_IO_ERROR( "Board6 stream has no properties!" );
}
/*for (auto & property : properties) {
@ -201,7 +201,7 @@ ABOARD6::ABOARD6( ALTIUM_PARSER& aReader )
if( aReader.HasParsingError() )
{
THROW_IO_ERROR( _( "Board6 stream was not parsed correctly!" ) );
THROW_IO_ERROR( "Board6 stream was not parsed correctly!" );
}
}
@ -210,7 +210,7 @@ ACLASS6::ACLASS6( ALTIUM_PARSER& aReader )
std::map<wxString, wxString> properties = aReader.ReadProperties();
if( properties.empty() )
{
THROW_IO_ERROR( _( "Classes6 stream has no properties!" ) );
THROW_IO_ERROR( "Classes6 stream has no properties!" );
}
name = ALTIUM_PARSER::PropertiesReadString( properties, "NAME", "" );
@ -230,7 +230,7 @@ ACLASS6::ACLASS6( ALTIUM_PARSER& aReader )
if( aReader.HasParsingError() )
{
THROW_IO_ERROR( _( "Classes6 stream was not parsed correctly!" ) );
THROW_IO_ERROR( "Classes6 stream was not parsed correctly" );
}
}
@ -239,7 +239,7 @@ ACOMPONENT6::ACOMPONENT6( ALTIUM_PARSER& aReader )
std::map<wxString, wxString> properties = aReader.ReadProperties();
if( properties.empty() )
{
THROW_IO_ERROR( _( "Components6 stream has no properties!" ) );
THROW_IO_ERROR( "Components6 stream has no properties" );
}
layer = altium_layer_from_name(
@ -260,7 +260,7 @@ ACOMPONENT6::ACOMPONENT6( ALTIUM_PARSER& aReader )
if( aReader.HasParsingError() )
{
THROW_IO_ERROR( _( "Components6 stream was not parsed correctly" ) );
THROW_IO_ERROR( "Components6 stream was not parsed correctly" );
}
}
@ -271,7 +271,7 @@ ADIMENSION6::ADIMENSION6( ALTIUM_PARSER& aReader )
std::map<wxString, wxString> properties = aReader.ReadProperties();
if( properties.empty() )
{
THROW_IO_ERROR( _( "Dimensions6 stream has no properties" ) );
THROW_IO_ERROR( "Dimensions6 stream has no properties" );
}
layer = altium_layer_from_name(
@ -347,7 +347,7 @@ ADIMENSION6::ADIMENSION6( ALTIUM_PARSER& aReader )
if( aReader.HasParsingError() )
{
THROW_IO_ERROR( _( "Dimensions6 stream was not parsed correctly" ) );
THROW_IO_ERROR( "Dimensions6 stream was not parsed correctly" );
}
}
@ -356,14 +356,14 @@ ANET6::ANET6( ALTIUM_PARSER& aReader )
std::map<wxString, wxString> properties = aReader.ReadProperties();
if( properties.empty() )
{
THROW_IO_ERROR( _( "Nets6 stream has no properties" ) );
THROW_IO_ERROR( "Nets6 stream has no properties" );
}
name = ALTIUM_PARSER::PropertiesReadString( properties, "NAME", "" );
if( aReader.HasParsingError() )
{
THROW_IO_ERROR( _( "Nets6 stream was not parsed correctly" ) );
THROW_IO_ERROR( "Nets6 stream was not parsed correctly" );
}
}
@ -372,7 +372,7 @@ APOLYGON6::APOLYGON6( ALTIUM_PARSER& aReader )
std::map<wxString, wxString> properties = aReader.ReadProperties();
if( properties.empty() )
{
THROW_IO_ERROR( _( "Polygons6 stream has no properties" ) );
THROW_IO_ERROR( "Polygons6 stream has no properties" );
}
layer = altium_layer_from_name(
@ -421,7 +421,7 @@ APOLYGON6::APOLYGON6( ALTIUM_PARSER& aReader )
if( aReader.HasParsingError() )
{
THROW_IO_ERROR( _( "Polygons6 stream was not parsed correctly" ) );
THROW_IO_ERROR( "Polygons6 stream was not parsed correctly" );
}
}
@ -432,7 +432,7 @@ ARULE6::ARULE6( ALTIUM_PARSER& aReader )
std::map<wxString, wxString> properties = aReader.ReadProperties();
if( properties.empty() )
{
THROW_IO_ERROR( _( "Rules6 stream has no properties" ) );
THROW_IO_ERROR( "Rules6 stream has no properties" );
}
name = ALTIUM_PARSER::PropertiesReadString( properties, "NAME", "" );
@ -494,7 +494,7 @@ ARULE6::ARULE6( ALTIUM_PARSER& aReader )
if( aReader.HasParsingError() )
{
THROW_IO_ERROR( _( "Rules6 stream was not parsed correctly" ) );
THROW_IO_ERROR( "Rules6 stream was not parsed correctly" );
}
}
@ -503,7 +503,7 @@ AARC6::AARC6( ALTIUM_PARSER& aReader )
ALTIUM_RECORD recordtype = static_cast<ALTIUM_RECORD>( aReader.Read<uint8_t>() );
if( recordtype != ALTIUM_RECORD::ARC )
{
THROW_IO_ERROR( _( "Arcs6 stream has invalid recordtype" ) );
THROW_IO_ERROR( "Arcs6 stream has invalid recordtype" );
}
// Subrecord 1
@ -532,7 +532,7 @@ AARC6::AARC6( ALTIUM_PARSER& aReader )
if( aReader.HasParsingError() )
{
THROW_IO_ERROR( _( "Arcs6 stream was not parsed correctly" ) );
THROW_IO_ERROR( "Arcs6 stream was not parsed correctly" );
}
}
@ -541,19 +541,19 @@ APAD6::APAD6( ALTIUM_PARSER& aReader )
ALTIUM_RECORD recordtype = static_cast<ALTIUM_RECORD>( aReader.Read<uint8_t>() );
if( recordtype != ALTIUM_RECORD::PAD )
{
THROW_IO_ERROR( _( "Pads6 stream has invalid recordtype" ) );
THROW_IO_ERROR( "Pads6 stream has invalid recordtype" );
}
// Subrecord 1
size_t subrecord1 = aReader.ReadAndSetSubrecordLength();
if( subrecord1 == 0 )
{
THROW_IO_ERROR( _( "Pads6 stream has no subrecord1 data" ) );
THROW_IO_ERROR( "Pads6 stream has no subrecord1 data" );
}
name = aReader.ReadWxString();
if( aReader.GetRemainingSubrecordBytes() != 0 )
{
THROW_IO_ERROR( _( "Pads6 stream has invalid subrecord1 length" ) );
THROW_IO_ERROR( "Pads6 stream has invalid subrecord1 length" );
}
aReader.SkipSubrecord();
@ -573,8 +573,9 @@ APAD6::APAD6( ALTIUM_PARSER& aReader )
size_t subrecord5 = aReader.ReadAndSetSubrecordLength();
if( subrecord5 < 120 )
{
THROW_IO_ERROR( _(
"Pads6 stream subrecord has length < 120, which is unexpected" ) ); // TODO: exact minimum length we know?
// TODO: exact minimum length we know?
THROW_IO_ERROR(
"Pads6 stream subrecord has length < 120, which is unexpected" );
}
layer = static_cast<ALTIUM_LAYER>( aReader.Read<uint8_t>() );
@ -681,7 +682,7 @@ APAD6::APAD6( ALTIUM_PARSER& aReader )
if( aReader.HasParsingError() )
{
THROW_IO_ERROR( _( "Pads6 stream was not parsed correctly" ) );
THROW_IO_ERROR( "Pads6 stream was not parsed correctly" );
}
}
@ -690,7 +691,7 @@ AVIA6::AVIA6( ALTIUM_PARSER& aReader )
ALTIUM_RECORD recordtype = static_cast<ALTIUM_RECORD>( aReader.Read<uint8_t>() );
if( recordtype != ALTIUM_RECORD::VIA )
{
THROW_IO_ERROR( _( "Vias6 stream has invalid recordtype" ) );
THROW_IO_ERROR( "Vias6 stream has invalid recordtype" );
}
// Subrecord 1
@ -722,7 +723,7 @@ AVIA6::AVIA6( ALTIUM_PARSER& aReader )
if( aReader.HasParsingError() )
{
THROW_IO_ERROR( _( "Vias6 stream was not parsed correctly" ) );
THROW_IO_ERROR( "Vias6 stream was not parsed correctly" );
}
}
@ -731,7 +732,7 @@ ATRACK6::ATRACK6( ALTIUM_PARSER& aReader )
ALTIUM_RECORD recordtype = static_cast<ALTIUM_RECORD>( aReader.Read<uint8_t>() );
if( recordtype != ALTIUM_RECORD::TRACK )
{
THROW_IO_ERROR( _( "Tracks6 stream has invalid recordtype" ) );
THROW_IO_ERROR( "Tracks6 stream has invalid recordtype" );
}
// Subrecord 1
@ -758,7 +759,7 @@ ATRACK6::ATRACK6( ALTIUM_PARSER& aReader )
if( aReader.HasParsingError() )
{
THROW_IO_ERROR( _( "Tracks6 stream was not parsed correctly" ) );
THROW_IO_ERROR( "Tracks6 stream was not parsed correctly" );
}
}
@ -767,7 +768,7 @@ ATEXT6::ATEXT6( ALTIUM_PARSER& aReader )
ALTIUM_RECORD recordtype = static_cast<ALTIUM_RECORD>( aReader.Read<uint8_t>() );
if( recordtype != ALTIUM_RECORD::TEXT )
{
THROW_IO_ERROR( _( "Texts6 stream has invalid recordtype" ) );
THROW_IO_ERROR( "Texts6 stream has invalid recordtype" );
}
// Subrecord 1 - Properties
@ -809,7 +810,7 @@ ATEXT6::ATEXT6( ALTIUM_PARSER& aReader )
if( aReader.HasParsingError() )
{
THROW_IO_ERROR( _( "Texts6 stream was not parsed correctly" ) );
THROW_IO_ERROR( "Texts6 stream was not parsed correctly" );
}
}
@ -818,7 +819,7 @@ AFILL6::AFILL6( ALTIUM_PARSER& aReader )
ALTIUM_RECORD recordtype = static_cast<ALTIUM_RECORD>( aReader.Read<uint8_t>() );
if( recordtype != ALTIUM_RECORD::FILL )
{
THROW_IO_ERROR( _( "Fills6 stream has invalid recordtype" ) );
THROW_IO_ERROR( "Fills6 stream has invalid recordtype" );
}
// Subrecord 1
@ -844,7 +845,7 @@ AFILL6::AFILL6( ALTIUM_PARSER& aReader )
if( aReader.HasParsingError() )
{
THROW_IO_ERROR( _( "Fills6 stream was not parsed correctly" ) );
THROW_IO_ERROR( "Fills6 stream was not parsed correctly" );
}
}
@ -853,7 +854,7 @@ AREGION6::AREGION6( ALTIUM_PARSER& aReader, bool aExtendedVertices )
ALTIUM_RECORD recordtype = static_cast<ALTIUM_RECORD>( aReader.Read<uint8_t>() );
if( recordtype != ALTIUM_RECORD::REGION )
{
THROW_IO_ERROR( _( "Regions6 stream has invalid recordtype" ) );
THROW_IO_ERROR( "Regions6 stream has invalid recordtype" );
}
// Subrecord 1
@ -875,7 +876,7 @@ AREGION6::AREGION6( ALTIUM_PARSER& aReader, bool aExtendedVertices )
std::map<wxString, wxString> properties = aReader.ReadProperties();
if( properties.empty() )
{
THROW_IO_ERROR( _( "Regions6 stream has empty properties" ) );
THROW_IO_ERROR( "Regions6 stream has empty properties" );
}
int pkind = ALTIUM_PARSER::PropertiesReadInt( properties, "KIND", 0 );
@ -936,6 +937,6 @@ AREGION6::AREGION6( ALTIUM_PARSER& aReader, bool aExtendedVertices )
if( aReader.HasParsingError() )
{
THROW_IO_ERROR( _( "Regions6 stream was not parsed correctly" ) );
THROW_IO_ERROR( "Regions6 stream was not parsed correctly" );
}
}

64
pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp
View File

@ -470,7 +470,7 @@ void ALTIUM_PCB::ParseFileHeader(
// TODO: does not seem to work all the time at the moment
//if( reader.GetRemainingBytes() != 0 )
//{
// THROW_IO_ERROR( _( "FileHeader stream is not fully parsed" ) );
// THROW_IO_ERROR( "FileHeader stream is not fully parsed" );
//}
}
@ -483,7 +483,7 @@ void ALTIUM_PCB::ParseBoard6Data(
if( reader.GetRemainingBytes() != 0 )
{
THROW_IO_ERROR( _( "Board6 stream is not fully parsed" ) );
THROW_IO_ERROR( "Board6 stream is not fully parsed" );
}
m_board->SetAuxOrigin( elem.sheetpos );
@ -518,7 +518,7 @@ void ALTIUM_PCB::ParseBoard6Data(
if( ( *it )->GetType() != BS_ITEM_TYPE_COPPER )
{
THROW_IO_ERROR( _( "Board6 stream, unexpected item while parsing stackup" ) );
THROW_IO_ERROR( "Board6 stream, unexpected item while parsing stackup" );
}
( *it )->SetThickness( layer.copperthick );
@ -527,7 +527,7 @@ void ALTIUM_PCB::ParseBoard6Data(
if( layer.nextId != 0 )
{
THROW_IO_ERROR(
_( "Board6 stream, unexpected id while parsing last stackup layer" ) );
"Board6 stream, unexpected id while parsing last stackup layer" );
}
// overwrite entry from internal -> bottom
m_layermap[static_cast<ALTIUM_LAYER>( i )] = B_Cu;
@ -537,7 +537,7 @@ void ALTIUM_PCB::ParseBoard6Data(
++it;
if( ( *it )->GetType() != BS_ITEM_TYPE_DIELECTRIC )
{
THROW_IO_ERROR( _( "Board6 stream, unexpected item while parsing stackup" ) );
THROW_IO_ERROR( "Board6 stream, unexpected item while parsing stackup" );
}
( *it )->SetThickness( layer.dielectricthick, 0 );
( *it )->SetMaterial( layer.dielectricmaterial.empty() ?
@ -642,7 +642,7 @@ void ALTIUM_PCB::ParseClasses6Data(
if( reader.GetRemainingBytes() != 0 )
{
THROW_IO_ERROR( _( "Classes6 stream is not fully parsed" ) );
THROW_IO_ERROR( "Classes6 stream is not fully parsed" );
}
}
@ -691,7 +691,7 @@ void ALTIUM_PCB::ParseComponents6Data(
if( reader.GetRemainingBytes() != 0 )
{
THROW_IO_ERROR( _( "Components6 stream is not fully parsed" ) );
THROW_IO_ERROR( "Components6 stream is not fully parsed" );
}
}
@ -700,7 +700,7 @@ void ALTIUM_PCB::HelperParseDimensions6Linear( const ADIMENSION6& aElem )
{
if( aElem.referencePoint.size() != 2 )
{
THROW_IO_ERROR( _( "Incorrect number of reference points for linear dimension object" ) );
THROW_IO_ERROR( "Incorrect number of reference points for linear dimension object" );
}
PCB_LAYER_ID klayer = GetKicadLayer( aElem.layer );
@ -931,21 +931,21 @@ void ALTIUM_PCB::ParseDimensions6Data(
HelperParseDimensions6Leader( elem );
break;
case ALTIUM_DIMENSION_KIND::DATUM:
wxLogInfo( wxString::Format( _( "Ignore dimension object of kind %d" ), elem.kind ) );
wxLogInfo( wxString::Format( "Ignore dimension object of kind %d", elem.kind ) );
// HelperParseDimensions6Datum( elem );
break;
case ALTIUM_DIMENSION_KIND::CENTER:
HelperParseDimensions6Center( elem );
break;
default:
wxLogInfo( wxString::Format( _( "Ignore dimension object of kind %d" ), elem.kind ) );
wxLogInfo( wxString::Format( "Ignore dimension object of kind %d", elem.kind ) );
break;
}
}
if( reader.GetRemainingBytes() != 0 )
{
THROW_IO_ERROR( _( "Dimensions6 stream is not fully parsed" ) );
THROW_IO_ERROR( "Dimensions6 stream is not fully parsed" );
}
}
@ -964,7 +964,7 @@ void ALTIUM_PCB::ParseNets6Data(
if( reader.GetRemainingBytes() != 0 )
{
THROW_IO_ERROR( _( "Nets6 stream is not fully parsed" ) );
THROW_IO_ERROR( "Nets6 stream is not fully parsed" );
}
}
@ -1062,7 +1062,7 @@ void ALTIUM_PCB::ParsePolygons6Data(
if( reader.GetRemainingBytes() != 0 )
{
THROW_IO_ERROR( _( "Polygons6 stream is not fully parsed" ) );
THROW_IO_ERROR( "Polygons6 stream is not fully parsed" );
}
}
@ -1087,7 +1087,7 @@ void ALTIUM_PCB::ParseRules6Data(
if( reader.GetRemainingBytes() != 0 )
{
THROW_IO_ERROR( _( "Rules6 stream is not fully parsed" ) );
THROW_IO_ERROR( "Rules6 stream is not fully parsed" );
}
}
@ -1105,7 +1105,7 @@ void ALTIUM_PCB::ParseBoardRegionsData(
if( reader.GetRemainingBytes() != 0 )
{
THROW_IO_ERROR( _( "BoardRegions stream is not fully parsed" ) );
THROW_IO_ERROR( "BoardRegions stream is not fully parsed" );
}
}
@ -1214,7 +1214,7 @@ void ALTIUM_PCB::ParseShapeBasedRegions6Data(
if( reader.GetRemainingBytes() != 0 )
{
THROW_IO_ERROR( _( "ShapeBasedRegions6 stream is not fully parsed" ) );
THROW_IO_ERROR( "ShapeBasedRegions6 stream is not fully parsed" );
}
}
@ -1241,7 +1241,7 @@ void ALTIUM_PCB::ParseRegions6Data(
if( m_polygons.size() <= elem.subpolyindex )
{
THROW_IO_ERROR( wxString::Format(
_( "Region stream tries to access polygon id %d of %d existing polygons" ),
"Region stream tries to access polygon id %d of %d existing polygons",
elem.subpolyindex, m_polygons.size() ) );
}
@ -1272,7 +1272,7 @@ void ALTIUM_PCB::ParseRegions6Data(
if( reader.GetRemainingBytes() != 0 )
{
THROW_IO_ERROR( _( "Regions6 stream is not fully parsed" ) );
THROW_IO_ERROR( "Regions6 stream is not fully parsed" );
}
}
@ -1375,7 +1375,7 @@ void ALTIUM_PCB::ParseArcs6Data(
if( m_components.size() <= elem.component )
{
THROW_IO_ERROR( wxString::Format(
_( "Arcs6 stream tries to access component id %d of %d existing components" ),
"Arcs6 stream tries to access component id %d of %d existing components",
elem.component, m_components.size() ) );
}
MODULE* module = m_components.at( elem.component );
@ -1415,7 +1415,7 @@ void ALTIUM_PCB::ParseArcs6Data(
if( reader.GetRemainingBytes() != 0 )
{
THROW_IO_ERROR( _( "Arcs6 stream is not fully parsed" ) );
THROW_IO_ERROR( "Arcs6 stream is not fully parsed" );
}
}
@ -1441,7 +1441,7 @@ void ALTIUM_PCB::ParsePads6Data(
if( m_components.size() <= elem.component )
{
THROW_IO_ERROR( wxString::Format(
_( "Pads6 stream tries to access component id %d of %d existing components" ),
"Pads6 stream tries to access component id %d of %d existing components",
elem.component, m_components.size() ) );
}
module = m_components.at( elem.component );
@ -1491,7 +1491,7 @@ void ALTIUM_PCB::ParsePads6Data(
switch( elem.sizeAndShape->holeshape )
{
case ALTIUM_PAD_HOLE_SHAPE::ROUND:
wxFAIL_MSG( _( "Round holes are handled before the switch" ) );
wxFAIL_MSG( "Round holes are handled before the switch" );
break;
case ALTIUM_PAD_HOLE_SHAPE::SQUARE:
@ -1617,7 +1617,7 @@ void ALTIUM_PCB::ParsePads6Data(
if( reader.GetRemainingBytes() != 0 )
{
THROW_IO_ERROR( _( "Pads6 stream is not fully parsed" ) );
THROW_IO_ERROR( "Pads6 stream is not fully parsed" );
}
}
@ -1661,7 +1661,7 @@ void ALTIUM_PCB::ParseVias6Data(
if( !IsCopperLayer( start_klayer ) || !IsCopperLayer( end_klayer ) )
{
wxLogError( wxString::Format(
_( "Via from layer %d <-> %d uses non-coppy layer. This should not happen." ),
_( "Via from layer %d <-> %d uses non-copper layer. This should not happen." ),
elem.layer_start, elem.layer_end ) );
continue; // just assume through-hole instead.
}
@ -1672,7 +1672,7 @@ void ALTIUM_PCB::ParseVias6Data(
if( reader.GetRemainingBytes() != 0 )
{
THROW_IO_ERROR( _( "Vias6 stream is not fully parsed" ) );
THROW_IO_ERROR( "Vias6 stream is not fully parsed" );
}
}
@ -1759,7 +1759,7 @@ void ALTIUM_PCB::ParseTracks6Data(
if( m_components.size() <= elem.component )
{
THROW_IO_ERROR( wxString::Format(
_( "Tracks6 stream tries to access component id %d of %d existing components" ),
"Tracks6 stream tries to access component id %d of %d existing components",
elem.component, m_components.size() ) );
}
MODULE* module = m_components.at( elem.component );
@ -1783,7 +1783,7 @@ void ALTIUM_PCB::ParseTracks6Data(
if( reader.GetRemainingBytes() != 0 )
{
THROW_IO_ERROR( _( "Tracks6 stream is not fully parsed" ) );
THROW_IO_ERROR( "Tracks6 stream is not fully parsed" );
}
}
@ -1811,7 +1811,7 @@ void ALTIUM_PCB::ParseTexts6Data(
if( m_components.size() <= elem.component )
{
THROW_IO_ERROR( wxString::Format(
_( "Texts6 stream tries to access component id %d of %d existing components" ),
"Texts6 stream tries to access component id %d of %d existing components",
elem.component, m_components.size() ) );
}
MODULE* module = m_components.at( elem.component );
@ -1900,7 +1900,7 @@ void ALTIUM_PCB::ParseTexts6Data(
tx->SetHorizJustify( EDA_TEXT_HJUSTIFY_T::GR_TEXT_HJUSTIFY_RIGHT );
break;
default:
wxLogError( _( "Unexpected horizontal Text Position. This should never happen." ) );
wxLogError( "Unexpected horizontal Text Position. This should never happen." );
break;
}
@ -1922,7 +1922,7 @@ void ALTIUM_PCB::ParseTexts6Data(
tx->SetVertJustify( EDA_TEXT_VJUSTIFY_T::GR_TEXT_VJUSTIFY_BOTTOM );
break;
default:
wxLogError( _( "Unexpected vertical text position. This should never happen." ) );
wxLogError( "Unexpected vertical text position. This should never happen." );
break;
}
}
@ -1930,7 +1930,7 @@ void ALTIUM_PCB::ParseTexts6Data(
if( reader.GetRemainingBytes() != 0 )
{
THROW_IO_ERROR( _( "Texts6 stream is not fully parsed" ) );
THROW_IO_ERROR( "Texts6 stream is not fully parsed" );
}
}
@ -2014,6 +2014,6 @@ void ALTIUM_PCB::ParseFills6Data(
if( reader.GetRemainingBytes() != 0 )
{
THROW_IO_ERROR( _( "Fills6 stream is not fully parsed" ) );
THROW_IO_ERROR( "Fills6 stream is not fully parsed" );
}
}