diff --git a/eeschema/sch_plugins/altium/sch_altium_plugin.cpp b/eeschema/sch_plugins/altium/sch_altium_plugin.cpp index 2a39d96a35..604f7624af 100644 --- a/eeschema/sch_plugins/altium/sch_altium_plugin.cpp +++ b/eeschema/sch_plugins/altium/sch_altium_plugin.cpp @@ -304,8 +304,10 @@ void SCH_ALTIUM_PLUGIN::ParseStorage( const CFB::CompoundFileReader& aReader ) // throw IO Error. if( reader.GetRemainingBytes() != 0 ) { - wxLogError( _( "Storage file was not fully parsed as %d bytes are remaining." ), - reader.GetRemainingBytes() ); + m_reporter->Report( wxString::Format( _( "Storage file not fully parsed " + "(%d bytes remaining)." ), + reader.GetRemainingBytes() ), + RPT_SEVERITY_ERROR ); } } @@ -596,9 +598,8 @@ void SCH_ALTIUM_PLUGIN::ParsePin( const std::map& aPropertie if( libSymbolIt == m_libSymbols.end() ) { // TODO: e.g. can depend on Template (RECORD=39 - m_reporter->Report( wxString::Format( _( "Pin has non-existent ownerindex %d." ), - elem.ownerindex ), - RPT_SEVERITY_WARNING ); + m_reporter->Report( wxString::Format( _( "Pin's owner (%d) not found." ), elem.ownerindex ), + RPT_SEVERITY_ERROR ); return; } @@ -826,9 +827,9 @@ void SCH_ALTIUM_PLUGIN::ParseLabel( const std::map& aPropert if( libSymbolIt == m_libSymbols.end() ) { // TODO: e.g. can depend on Template (RECORD=39 - m_reporter->Report( wxString::Format( _( "Label has non-existent ownerindex %d." ), + m_reporter->Report( wxString::Format( _( "Label's owner (%d) not found." ), elem.ownerindex ), - RPT_SEVERITY_WARNING ); + RPT_SEVERITY_ERROR ); return; } @@ -1000,9 +1001,9 @@ void SCH_ALTIUM_PLUGIN::ParseBezier( const std::map& aProper if( libSymbolIt == m_libSymbols.end() ) { // TODO: e.g. can depend on Template (RECORD=39 - m_reporter->Report( wxString::Format( _( "Bezier has non-existent ownerindex %d." ), + m_reporter->Report( wxString::Format( _( "Bezier's owner (%d) not found." ), elem.ownerindex ), - RPT_SEVERITY_WARNING ); + RPT_SEVERITY_ERROR ); return; } @@ -1086,9 +1087,9 @@ void SCH_ALTIUM_PLUGIN::ParsePolyline( const std::map& aProp if( libSymbolIt == m_libSymbols.end() ) { // TODO: e.g. can depend on Template (RECORD=39 - m_reporter->Report( wxString::Format( _( "Polyline has non-existent ownerindex %d." ), + m_reporter->Report( wxString::Format( _( "Polyline's owner (%d) not found." ), elem.ownerindex ), - RPT_SEVERITY_WARNING ); + RPT_SEVERITY_ERROR ); return; } @@ -1145,9 +1146,9 @@ void SCH_ALTIUM_PLUGIN::ParsePolygon( const std::map& aPrope if( libSymbolIt == m_libSymbols.end() ) { // TODO: e.g. can depend on Template (RECORD=39 - m_reporter->Report( wxString::Format( _( "Polygon has non-existent ownerindex %d." ), + m_reporter->Report( wxString::Format( _( "Polygon's owner (%d) not found." ), elem.ownerindex ), - RPT_SEVERITY_WARNING ); + RPT_SEVERITY_ERROR ); return; } @@ -1226,10 +1227,9 @@ void SCH_ALTIUM_PLUGIN::ParseRoundRectangle( const std::map& if( libSymbolIt == m_libSymbols.end() ) { // TODO: e.g. can depend on Template (RECORD=39 - m_reporter->Report( wxString::Format( _( "Rounded rectangle has non-existent " - "ownerindex %d." ), + m_reporter->Report( wxString::Format( _( "Rounded rectangle's owner (%d) not found." ), elem.ownerindex ), - RPT_SEVERITY_WARNING ); + RPT_SEVERITY_ERROR ); return; } @@ -1263,7 +1263,7 @@ void SCH_ALTIUM_PLUGIN::ParseArc( const std::map& aPropertie if( elem.ownerpartid == ALTIUM_COMPONENT_NONE ) { - m_reporter->Report( _( "Arc drawing is not possible for now on schematic." ), + m_reporter->Report( _( "Arc drawing on schematic not currently supported." ), RPT_SEVERITY_ERROR ); } else @@ -1273,9 +1273,9 @@ void SCH_ALTIUM_PLUGIN::ParseArc( const std::map& aPropertie if( libSymbolIt == m_libSymbols.end() ) { // TODO: e.g. can depend on Template (RECORD=39 - m_reporter->Report( wxString::Format( _( "Arc has non-existent ownerindex %d." ), + m_reporter->Report( wxString::Format( _( "Arc's owner (%d) not found." ), elem.ownerindex ), - RPT_SEVERITY_WARNING ); + RPT_SEVERITY_ERROR ); return; } @@ -1334,9 +1334,9 @@ void SCH_ALTIUM_PLUGIN::ParseLine( const std::map& aProperti if( libSymbolIt == m_libSymbols.end() ) { // TODO: e.g. can depend on Template (RECORD=39 - m_reporter->Report( wxString::Format( _( "Line has non-existent ownerindex %d." ), + m_reporter->Report( wxString::Format( _( "Line's owner (%d) not found." ), elem.ownerindex ), - RPT_SEVERITY_WARNING ); + RPT_SEVERITY_ERROR ); return; } @@ -1405,9 +1405,9 @@ void SCH_ALTIUM_PLUGIN::ParseRectangle( const std::map& aPro if( libSymbolIt == m_libSymbols.end() ) { // TODO: e.g. can depend on Template (RECORD=39 - m_reporter->Report( wxString::Format( _( "Rectangle has non-existent ownerindex %d." ), + m_reporter->Report( wxString::Format( _( "Rectangle's owner (%d) not found." ), elem.ownerindex ), - RPT_SEVERITY_WARNING ); + RPT_SEVERITY_ERROR ); return; } @@ -1465,7 +1465,9 @@ void SCH_ALTIUM_PLUGIN::ParseSheetEntry( const std::map& aPr if( sheet == m_sheets.end() ) { - wxLogError( _( "Sheet entry's owner (%d) not found." ), elem.ownerindex ); + m_reporter->Report( wxString::Format( _( "Sheet entry's owner (%d) not found." ), + elem.ownerindex ), + RPT_SEVERITY_ERROR ); return; } @@ -1865,7 +1867,11 @@ void SCH_ALTIUM_PLUGIN::ParsePort( const ASCH_PORT& aElem ) || endIsBusTerminal; if( !connectionFound ) - wxLogError( _( "There is a port for '%s', but no connections to it." ), aElem.name ); + { + wxString msg = wxString::Format( _( "There is a port for '%s', but no connections to it." ), + aElem.name ); + m_reporter->Report( msg, RPT_SEVERITY_WARNING ); + } // Select label position. In case both match, we will add a line later. wxPoint position = ( startIsWireTerminal || startIsBusTerminal ) ? start : end; @@ -1986,8 +1992,8 @@ void SCH_ALTIUM_PLUGIN::ParseBus( const std::map& aPropertie for( size_t i = 0; i + 1 < elem.points.size(); i++ ) { - SCH_LINE* bus = - new SCH_LINE( elem.points.at( i ) + m_sheetOffset, SCH_LAYER_ID::LAYER_BUS ); + SCH_LINE* bus = new SCH_LINE( elem.points.at( i ) + m_sheetOffset, + SCH_LAYER_ID::LAYER_BUS ); bus->SetEndPoint( elem.points.at( i + 1 ) + m_sheetOffset ); bus->SetLineWidth( elem.lineWidth ); @@ -2038,7 +2044,9 @@ void SCH_ALTIUM_PLUGIN::ParseImage( const std::map& aPropert if( !storageFile ) { - wxLogError( _( "Embedded file %s not found in storage." ), elem.filename ); + wxString msg = wxString::Format( _( "Embedded file %s not found in storage." ), + elem.filename ); + m_reporter->Report( msg, RPT_SEVERITY_ERROR ); return; } @@ -2053,7 +2061,8 @@ void SCH_ALTIUM_PLUGIN::ParseImage( const std::map& aPropert if( !bitmap->ReadImageFile( storagePath ) ) { - wxLogError( _( "Error reading image %s." ), storagePath ); + m_reporter->Report( wxString::Format( _( "Error reading image %s." ), storagePath ), + RPT_SEVERITY_ERROR ); return; } @@ -2064,13 +2073,15 @@ void SCH_ALTIUM_PLUGIN::ParseImage( const std::map& aPropert { if( !wxFileExists( elem.filename ) ) { - wxLogError( _( "File not found %s." ), elem.filename ); + m_reporter->Report( wxString::Format( _( "File not found %s." ), elem.filename ), + RPT_SEVERITY_ERROR ); return; } if( !bitmap->ReadImageFile( elem.filename ) ) { - wxLogError( _( "Error reading image %s." ), elem.filename ); + m_reporter->Report( wxString::Format( _( "Error reading image %s." ), elem.filename ), + RPT_SEVERITY_ERROR ); return; } } @@ -2143,7 +2154,9 @@ void SCH_ALTIUM_PLUGIN::ParseSheetName( const std::map& aPro const auto& sheet = m_sheets.find( elem.ownerindex ); if( sheet == m_sheets.end() ) { - wxLogError( _( "Sheet name's owner (%d) not found." ), elem.ownerindex ); + m_reporter->Report( wxString::Format( _( "Sheetname's owner (%d) not found." ), + elem.ownerindex ), + RPT_SEVERITY_ERROR ); return; } @@ -2164,14 +2177,17 @@ void SCH_ALTIUM_PLUGIN::ParseFileName( const std::map& aProp { ASCH_FILE_NAME elem( aProperties ); - const auto& sheet = m_sheets.find( elem.ownerindex ); - if( sheet == m_sheets.end() ) + const auto& sheetIt = m_sheets.find( elem.ownerindex ); + + if( sheetIt == m_sheets.end() ) { - wxLogError( _( "File name's owner (%d) not found." ), elem.ownerindex ); + m_reporter->Report( wxString::Format( _( "Filename's owner (%d) not found." ), + elem.ownerindex ), + RPT_SEVERITY_ERROR ); return; } - SCH_FIELD& filenameField = sheet->second->GetFields()[SHEETFILENAME]; + SCH_FIELD& filenameField = sheetIt->second->GetFields()[SHEETFILENAME]; filenameField.SetPosition( elem.location + m_sheetOffset ); @@ -2203,9 +2219,9 @@ void SCH_ALTIUM_PLUGIN::ParseDesignator( const std::map& aPr if( libSymbolIt == m_libSymbols.end() ) { // TODO: e.g. can depend on Template (RECORD=39 - m_reporter->Report( wxString::Format( _( "Designator has non-existent ownerindex %d." ), + m_reporter->Report( wxString::Format( _( "Designator's owner (%d) not found." ), elem.ownerindex ), - RPT_SEVERITY_WARNING ); + RPT_SEVERITY_ERROR ); return; } @@ -2331,9 +2347,9 @@ void SCH_ALTIUM_PLUGIN::ParseImplementation( const std::map& if( libSymbolIt == m_libSymbols.end() ) { - m_reporter->Report( wxString::Format( _( "Footprint has non-existent ownerindex %d." ), + m_reporter->Report( wxString::Format( _( "Footprint's owner (%d) not found." ), ownerindex ), - RPT_SEVERITY_WARNING ); + RPT_SEVERITY_ERROR ); return; }