From cf8f8ca2cc6be63bda7494dc974d973d646b06e7 Mon Sep 17 00:00:00 2001 From: Andrey Fedorushkov Date: Fri, 15 Apr 2011 20:41:31 +0400 Subject: [PATCH] minor fix component subref in russian GOST --- eeschema/class_libentry.cpp | 2 +- eeschema/component_references_lister.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eeschema/class_libentry.cpp b/eeschema/class_libentry.cpp index f980a7cf37..c978174a40 100644 --- a/eeschema/class_libentry.cpp +++ b/eeschema/class_libentry.cpp @@ -261,7 +261,7 @@ wxString LIB_COMPONENT::GetLibraryName() wxString LIB_COMPONENT::ReturnSubReference( int aUnit ) { wxString subRef; - #if defined(KICAD_GOST) +#if defined(KICAD_GOST) subRef.Printf( wxT(".%d" ), aUnit); #else subRef.Append( wxChar(aUnit + 'A' - 1) ); diff --git a/eeschema/component_references_lister.cpp b/eeschema/component_references_lister.cpp index 527a8a3013..619de2769a 100644 --- a/eeschema/component_references_lister.cpp +++ b/eeschema/component_references_lister.cpp @@ -597,14 +597,14 @@ int SCH_REFERENCE_LIST::CheckAnnotation( wxArrayString* aMessageList ) if( componentFlatList[ii].CompareValue( componentFlatList[next] ) != 0 ) { #if defined(KICAD_GOST) - msg.Printf( _( "Different values for %s%d.%c (%s) and %s%d.%c (%s)" ), + msg.Printf( _( "Different values for %s%d.%d (%s) and %s%d.%d (%s)" ), GetChars( componentFlatList[ii].GetRef() ), componentFlatList[ii].m_NumRef, - componentFlatList[ii].m_Unit + '1' - 1, + componentFlatList[ii].m_Unit, GetChars( *componentFlatList[ii].m_Value ), GetChars( componentFlatList[next].GetRef() ), componentFlatList[next].m_NumRef, - componentFlatList[next].m_Unit + '1' - 1, + componentFlatList[next].m_Unit, componentFlatList[next].m_Value->GetData() ); #else msg.Printf( _( "Different values for %s%d%c (%s) and %s%d%c (%s)" ),