Fix pcad2kicad issue, from A. Lunev, and a minor code cleaning in component_references_lister.cpp. (a3f2980d) · Commits · Elphel / kicad-source-mirror

common/wildcards_and_files_ext.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -72,7 +72,7 @@ const wxString NetlistFileWildcard( _( "KiCad netlist files (.net)\|.net" ) );
	const wxString GerberFileWildcard( _( "Gerber files (.pho)\|.pho" ) );		const wxString GerberFileWildcard( _( "Gerber files (.pho)\|.pho" ) );
	const wxString LegacyPcbFileWildcard( _( "KiCad printed circuit board files (.brd)\|.brd" ) );		const wxString LegacyPcbFileWildcard( _( "KiCad printed circuit board files (.brd)\|.brd" ) );
	const wxString EaglePcbFileWildcard( _( "Eagle ver. 6.x XML PCB files (.brd)\|.brd" ) );		const wxString EaglePcbFileWildcard( _( "Eagle ver. 6.x XML PCB files (.brd)\|.brd" ) );
	const wxString PCadPcbFileWildcard( _( "P-Cad 2002/2004 ASCII PCB files (.pcb)\|.pcb" ) );		const wxString PCadPcbFileWildcard( _( "P-Cad 200x ASCII PCB files (.pcb)\|.pcb" ) );
	const wxString PcbFileWildcard( _( "KiCad s-expr printed circuit board files (.kicad_pcb)\|.kicad_pcb" ) );		const wxString PcbFileWildcard( _( "KiCad s-expr printed circuit board files (.kicad_pcb)\|.kicad_pcb" ) );
	const wxString KiCadFootprintLibFileWildcard( _( "KiCad footprint s-expre library file (.kicad_mod)\|.kicad_mod" ) );		const wxString KiCadFootprintLibFileWildcard( _( "KiCad footprint s-expre library file (.kicad_mod)\|.kicad_mod" ) );
	const wxString KiCadFootprintLibPathWildcard( _( "KiCad footprint s-expre library path (.pretty)\|.pretty" ) );		const wxString KiCadFootprintLibPathWildcard( _( "KiCad footprint s-expre library path (.pretty)\|.pretty" ) );

eeschema/component_references_lister.cpp

+13 −23

Original line number	Original line	Diff line number	Diff line
	@@ -837,27 +837,17 @@ int SCH_REFERENCE_LIST::CheckAnnotation( wxArrayString* aMessageList )

	if( componentFlatList[ii].CompareValue( componentFlatList[next] ) != 0 )		if( componentFlatList[ii].CompareValue( componentFlatList[next] ) != 0 )
	{		{
	#if defined(KICAD_GOST)		msg.Printf( _( "Different values for %s%d%s (%s) and %s%d%s (%s)" ),
	msg.Printf( _( "Different values for %s%d.%d (%s) and %s%d.%d (%s)" ),
	GetChars( componentFlatList[ii].GetRef() ),		GetChars( componentFlatList[ii].GetRef() ),
	componentFlatList[ii].m_NumRef,		componentFlatList[ii].m_NumRef,
	componentFlatList[ii].m_Unit,		GetChars( LIB_COMPONENT::ReturnSubReference(
			componentFlatList[ii].m_Unit ) ),
	GetChars( componentFlatList[ii].m_Value->GetText() ),		GetChars( componentFlatList[ii].m_Value->GetText() ),
	GetChars( componentFlatList[next].GetRef() ),		GetChars( componentFlatList[next].GetRef() ),
	componentFlatList[next].m_NumRef,		componentFlatList[next].m_NumRef,
	componentFlatList[next].m_Unit,		GetChars( LIB_COMPONENT::ReturnSubReference(
	componentFlatList[next].m_Value->GetText().GetData() );		componentFlatList[next].m_Unit ) ),
	#else
	msg.Printf( _( "Different values for %s%d%c (%s) and %s%d%c (%s)" ),
	GetChars( componentFlatList[ii].GetRef() ),
	componentFlatList[ii].m_NumRef,
	componentFlatList[ii].m_Unit + 'A' - 1,
	GetChars( componentFlatList[ii].m_Value->GetText() ),
	GetChars( componentFlatList[next].GetRef() ),
	componentFlatList[next].m_NumRef,
	componentFlatList[next].m_Unit + 'A' - 1,
	GetChars( componentFlatList[next].m_Value->GetText() ) );		GetChars( componentFlatList[next].m_Value->GetText() ) );
	#endif

	if( aMessageList )		if( aMessageList )
	aMessageList->Add( msg + wxT( "\n" ));		aMessageList->Add( msg + wxT( "\n" ));

include/xnode.h

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -116,6 +116,10 @@ public:
	{		{
	AddProperty( attrName, value );		AddProperty( attrName, value );
	}		}
			bool DeleteAttribute( const wxString& attrName )
			{
			DeleteProperty( attrName );
			}
	wxXmlProperty* GetAttributes() const		wxXmlProperty* GetAttributes() const
	{		{
	return GetProperties();		return GetProperties();

pcbnew/pcad2kicadpcb_plugin/pcad2kicad_common.cpp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -131,7 +131,8 @@ double StrToDoublePrecisionUnits( wxString aStr, char aAxe, wxString aActualConv
	{		{
	ls.ToDouble( &i );		ls.ToDouble( &i );
	#ifdef PCAD2KICAD_SCALE_SCH_TO_INCH_GRID		#ifdef PCAD2KICAD_SCALE_SCH_TO_INCH_GRID
	if( aActualConversion == wxT( "SCH" ) )		if( aActualConversion == wxT( "SCH" )
			\|\| aActualConversion == wxT( "SCHLIB" ) )
	i = i * (0.0254 / 0.025);		i = i * (0.0254 / 0.025);
	#endif		#endif
	i = Millimeter2iu( i );		i = Millimeter2iu( i );

pcbnew/pcad2kicadpcb_plugin/pcb_text.cpp

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -76,10 +76,7 @@ void PCB_TEXT::Parse( XNODE* aNode,
	m_rotation = StrToInt1Units( str );		m_rotation = StrToInt1Units( str );
	}		}

	lNode = FindNode( aNode, wxT( "value" ) );		aNode->GetAttribute( wxT( "Name" ), &m_name.text );

	if( lNode )
	m_name.text = lNode->GetNodeContent();

	str = FindNodeGetContent( aNode, wxT( "isFlipped" ) );		str = FindNodeGetContent( aNode, wxT( "isFlipped" ) );

Original line number	Original line	Diff line number	Diff line
	@@ -72,7 +72,7 @@ const wxString NetlistFileWildcard( _( "KiCad netlist files (.net)\|.net" ) );
	const wxString GerberFileWildcard( _( "Gerber files (.pho)\|.pho" ) );		const wxString GerberFileWildcard( _( "Gerber files (.pho)\|.pho" ) );
	const wxString LegacyPcbFileWildcard( _( "KiCad printed circuit board files (.brd)\|.brd" ) );		const wxString LegacyPcbFileWildcard( _( "KiCad printed circuit board files (.brd)\|.brd" ) );
	const wxString EaglePcbFileWildcard( _( "Eagle ver. 6.x XML PCB files (.brd)\|.brd" ) );		const wxString EaglePcbFileWildcard( _( "Eagle ver. 6.x XML PCB files (.brd)\|.brd" ) );
	const wxString PCadPcbFileWildcard( _( "P-Cad 2002/2004 ASCII PCB files (.pcb)\|.pcb" ) );		const wxString PCadPcbFileWildcard( _( "P-Cad 200x ASCII PCB files (.pcb)\|.pcb" ) );
	const wxString PcbFileWildcard( _( "KiCad s-expr printed circuit board files (.kicad_pcb)\|.kicad_pcb" ) );		const wxString PcbFileWildcard( _( "KiCad s-expr printed circuit board files (.kicad_pcb)\|.kicad_pcb" ) );
	const wxString KiCadFootprintLibFileWildcard( _( "KiCad footprint s-expre library file (.kicad_mod)\|.kicad_mod" ) );		const wxString KiCadFootprintLibFileWildcard( _( "KiCad footprint s-expre library file (.kicad_mod)\|.kicad_mod" ) );
	const wxString KiCadFootprintLibPathWildcard( _( "KiCad footprint s-expre library path (.pretty)\|.pretty" ) );		const wxString KiCadFootprintLibPathWildcard( _( "KiCad footprint s-expre library path (.pretty)\|.pretty" ) );