minor fixes. (56d95e00) · Commits · Elphel / kicad-source-mirror

AUTHORS.txt

+26 −23

Original line number	Diff line number	Diff line
		@@ -3,8 +3,7 @@
		* under GNU General Public License (see copyright.txt)

		== Main Author
		Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
		Maitre de Conferences
		Jean-Pierre Charras <jean-pierre.charras[at]gipsa-lab-dot-inpg-dot-fr>
		IUT1 GEII2
		Universite Joseph Fourier (U.J.F.)
		Saint Martin d'Hres (38402)
		@@ -12,34 +11,38 @@ Laboratiore GIPSA-Lab
		Saint Martin d'Hres

		== Contributors
		Dick Hollenbeck <dick@softplc.com>
		Jerry Jacobs <xor.gate.engineering@gmail.com>
		Jonas Diemer <diemer@gmx.de>
		Dick Hollenbeck <dick[at]softplc-dot-com>
		Hauptmech <hauptmech[at]gmail-dot-com>
		Jerry Jacobs <xor.gate.engineering[at]gmail-dot-com>
		Jonas Diemer <diemer[at]gmx-dot-de>
		KBool Library http://boolean.klaasholwerda.nl/bool.html
		Rok Markovic <rok@kanardia.eu>
		Tim Hanson <sideskate@gmail.com>
		Vesa Solonen <vesa.solonen@hut.fi>
		Wayne Stambaugh <stambaughw@verizon.net>
		Lorenzo <lomarcan[at]tin-dot-it>
		Marco Serantoni <marco.serantoni[at]gmail-dot-com> (OSX maintener)
		Rok Markovic <rok[at]kanardia.eu>
		Tim Hanson <sideskate[at]gmail-dot-com>
		Vesa Solonen <vesa.solonen[at]hut-dot-fi>
		Wayne Stambaugh <stambaughw[at]verizon-dot-net>

		See also CHANGELOG.txt for contributors.

		== Document Writers
		Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
		Igor Plyatov <plyatov@gmail.com>
		Jean-Pierre Charras <jean-pierre.charras[at]gipsa-lab.inpg.fr>
		Igor Plyatov <plyatov[at]gmail.com>

		== Translators
		Czech (CZ) Martin Kratoška <martin@ok1rr.com>
		Dutch (NL) Jerry Jacobs <xor.gate.engineering@gmail.com>
		Finnish (FI) Vesa Solonen <vesa.solonen@hut.fi>
		French (FR) Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
		Polish (PL) Mateusz Skowroski <skowri@gmail.com>
		Portuguese (PT) Renie Marquet <reniemarquet@uol.com.br>"
		Russian (RU) Igor Plyatov <plyatov@gmail.com>
		Spanish (ES) Pedro Martin del Valle <pkicad@yahoo.es>
		Spanish (ES) Iigo Zuluaga <inigo_zuluaga@yahoo.es>
		Czech (CZ) Martin Kratoška <martin[at]ok1rr-dot-com>
		Dutch (NL) Jerry Jacobs <xor.gate.engineering[at]gmail-dot-com>
		Finnish (FI) Vesa Solonen <vesa.solonen[at]hut-dot-fi>
		French (FR) Jean-Pierre Charras <jean-pierre.charras[at]inpg-dot-fr>
		Polish (PL) Mateusz Skowroski <skowri[at]gmail-dot-com>
		Portuguese (PT) Renie Marquet <reniemarquet[at]uol-dot-com-dot-br>"
		Russian (RU) Igor Plyatov <plyatov[at]gmail-dot-com>
		Spanish (ES) Pedro Martin del Valle <pkicad[at]yahoo-dot-es>
		Spanish (ES) Iigo Zuluaga <inigo_zuluaga[at]yahoo-dot-es>
		German (DE) Rafael Sokolowski <Rafael.Sokolowski[at]web-dot-de
		Remy Halvick, David Briscoe, Dominique Laigle, Paul Burke

		== Programm credits for icons and others
		Icons by Iigo Zuluagaz <inigo_zuluaga@yahoo.es>
		3D modules by Renie Marquet <reniemarquet@uol.com.br>
		3D modules by Christophe Boschat <nox454@hotmail.fr>
		Icons by Iigo Zuluagaz <inigo_zuluaga[at]yahoo-dot-es>
		3D modules by Renie Marquet <reniemarquet[at]uol.com-dot-br>
		3D modules by Christophe Boschat <nox454[at]hotmail-dot-fr>

eeschema/build_BOM.cpp

+39 −34

Original line number	Diff line number	Diff line
		@@ -704,10 +704,12 @@ int DIALOG_BUILD_BOM::PrintComponentsListByRef(
		#if defined(KICAD_GOST)



		Unit = aList[ii].m_Unit + '1' - 1;
		#else



		Unit = aList[ii].m_Unit + 'A' - 1;
		#endif

		@@ -719,6 +721,7 @@ int DIALOG_BUILD_BOM::PrintComponentsListByRef(
		#if defined(KICAD_GOST)



		fprintf( f, "%s%c%s%c%s", CmpName, s_ExportSeparatorSymbol,
		CONV_TO_UTF8( DrawLibItem->GetField(
		VALUE )->m_Text ), s_ExportSeparatorSymbol,
		@@ -726,6 +729,7 @@ int DIALOG_BUILD_BOM::PrintComponentsListByRef(
		#else



		fprintf( f, "%s%c%s", CmpName, s_ExportSeparatorSymbol,
		CONV_TO_UTF8( DrawLibItem->GetField( VALUE )->m_Text ) );
		#endif
		@@ -734,12 +738,14 @@ int DIALOG_BUILD_BOM::PrintComponentsListByRef(
		#if defined(KICAD_GOST)



		fprintf( f, "\| %-10s %-12s %-20s", CmpName,
		CONV_TO_UTF8( DrawLibItem->GetField( VALUE )->m_Text ),
		CONV_TO_UTF8( DrawLibItem->GetField( DATASHEET )->m_Text ) );
		#else



		fprintf( f, "\| %-10s %-12s", CmpName,
		CONV_TO_UTF8( DrawLibItem->GetField( VALUE )->m_Text ) );
		#endif
		@@ -799,19 +805,15 @@ int DIALOG_BUILD_BOM::PrintComponentsListByPart(
		std::vector <OBJ_CMP_TO_LIST>& aList )
		{
		int qty = 1;
		char RefName[256];
		wxString ValName, NxtName;
		char RNames[2000];
		wxString RefName;
		wxString ValName;
		wxString NxtName;
		wxString RNames;
		EDA_BaseStruct* DrawList;
		EDA_BaseStruct* NxtList;
		SCH_COMPONENT* DrawLibItem;
		SCH_COMPONENT* NxtLibItem;
		SCH_COMPONENT* m_Cmp;
		SCH_COMPONENT Cmp;

		NxtName = wxT ("");
		strcpy( RNames, "" );
		m_Cmp = &Cmp;
		SCH_COMPONENT dummyCmp; // A dummy component, to store fields

		for( unsigned ii = 0; ii < aList.size(); ii++ )
		{
		@@ -825,13 +827,12 @@ int DIALOG_BUILD_BOM::PrintComponentsListByPart(
		DrawLibItem = (SCH_COMPONENT*) DrawList;
		if( ( DrawLibItem->GetField( VALUE )->m_Text.IsEmpty() ) )
		continue;
		// m_Cmp = DrawLibItem->GenCopy();

		// Store fields. try to store non empty fields.
		// Store fields. Store non empty fields only.
		for( int jj = FOOTPRINT; jj < DrawLibItem->GetFieldCount(); jj++ )
		{
		if( !DrawLibItem->GetField( jj )->m_Text.IsEmpty() )
		m_Cmp->GetField( jj )->m_Text = DrawLibItem->GetField( jj )->m_Text;
		dummyCmp.GetField( jj )->m_Text = DrawLibItem->GetField( jj )->m_Text;
		}

		NxtLibItem = NULL;
		@@ -845,7 +846,8 @@ int DIALOG_BUILD_BOM::PrintComponentsListByPart(
		if( aList[ij].m_Reference[0] == '#' )
		continue;
		NxtLibItem = (SCH_COMPONENT*) NxtList;
		if( (NxtLibItem->GetField( VALUE )->m_Text.IsEmpty()) ) {
		if( ( NxtLibItem->GetField( VALUE )->m_Text.IsEmpty() ) )
		{
		continue;
		}
		break;
		@@ -856,13 +858,13 @@ int DIALOG_BUILD_BOM::PrintComponentsListByPart(
		else
		NxtName = wxT( "" );

		sprintf( RefName, "%s", aList[ii].m_Reference );
		RefName = CONV_FROM_UTF8( aList[ii].m_Reference );
		ValName = DrawLibItem->GetField( VALUE )->m_Text;

		if( !NxtName.CmpNoCase(ValName )) {
		if( !NxtName.CmpNoCase( ValName ) )
		{
		qty++;
		strcat( RNames, ", " );
		strcat( RNames, RefName );
		RNames << wxT( ", " ) << RefName;
		continue;
		}

		@@ -873,17 +875,20 @@ int DIALOG_BUILD_BOM::PrintComponentsListByPart(
		fprintf( f, "%c%15s", s_ExportSeparatorSymbol,
		CONV_TO_UTF8( DrawLibItem->GetField( FOOTPRINT )->m_Text ) );

		// for( int jj = FIELD1; jj < DrawLibItem->GetFieldCount(); jj++ )
		// print fields
		for( int jj = FIELD1; jj < FIELD5; jj++ )
		fprintf( f, "%c%12s", s_ExportSeparatorSymbol,
		CONV_TO_UTF8( m_Cmp->GetField( jj )->m_Text ) );
		CONV_TO_UTF8( dummyCmp.GetField( jj )->m_Text ) );

		fprintf( f, "%c%s%s", s_ExportSeparatorSymbol, RefName, RNames );
		fprintf( f, "%c%s%s", s_ExportSeparatorSymbol,
		CONV_TO_UTF8( RefName ),
		CONV_TO_UTF8( RNames ) );
		fputs( "\n", f );

		strcpy( RNames, "" );
		// Clear strings, to prepare next component
		RNames.Empty();
		for( int jj = FOOTPRINT; jj < DrawLibItem->GetFieldCount(); jj++ )
		m_Cmp->GetField( jj )->m_Text = wxT ("");
		dummyCmp.GetField( jj )->m_Text.Empty();
		}

		return 0;

internat/de/kicad.mo

+20.1 KiB (219 KiB)

File changed.

No diff preview for this file type.

View original file

View changed file

internat/de/kicad.po

+10249 −8702

File changed.

File size exceeds preview limit.

View original file

View changed file

pcbnew/dialog_pad_properties_base.cpp

+9 −9

Original line number	Diff line number	Diff line
		@@ -313,13 +313,13 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind
		wxStaticBoxSizer* m_LayersSizer;
		m_LayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers:") ), wxVERTICAL );

		m_PadLayerCu = new wxCheckBox( this, wxID_ANY, _("Copper layer"), wxDefaultPosition, wxDefaultSize, 0 );
		m_PadLayerCmp = new wxCheckBox( this, wxID_ANY, _("Component layer"), wxDefaultPosition, wxDefaultSize, 0 );

		m_LayersSizer->Add( m_PadLayerCu, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );
		m_LayersSizer->Add( m_PadLayerCmp, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

		m_PadLayerCmp = new wxCheckBox( this, wxID_ANY, _("Component layer"), wxDefaultPosition, wxDefaultSize, 0 );
		m_PadLayerCu = new wxCheckBox( this, wxID_ANY, _("Copper layer"), wxDefaultPosition, wxDefaultSize, 0 );

		m_LayersSizer->Add( m_PadLayerCmp, 0, wxALL, 5 );
		m_LayersSizer->Add( m_PadLayerCu, 0, wxALL, 5 );


		m_LayersSizer->Add( 0, 8, 1, wxEXPAND, 5 );
		@@ -356,17 +356,17 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind

		m_LayersSizer->Add( m_PadLayerMaskCu, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

		m_PadLayerDraft = new wxCheckBox( this, wxID_ANY, _("Draft layer"), wxDefaultPosition, wxDefaultSize, 0 );

		m_LayersSizer->Add( m_PadLayerDraft, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

		m_PadLayerECO1 = new wxCheckBox( this, wxID_ANY, _("E.C.O.1 layer"), wxDefaultPosition, wxDefaultSize, 0 );

		m_LayersSizer->Add( m_PadLayerECO1, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

		m_PadLayerECO2 = new wxCheckBox( this, wxID_ANY, _("E.C.O.2 layer"), wxDefaultPosition, wxDefaultSize, 0 );

		m_LayersSizer->Add( m_PadLayerECO2, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

		m_PadLayerDraft = new wxCheckBox( this, wxID_ANY, _("Draft layer"), wxDefaultPosition, wxDefaultSize, 0 );

		m_LayersSizer->Add( m_PadLayerDraft, 0, wxALL, 5 );
		m_LayersSizer->Add( m_PadLayerECO2, 0, wxALL, 5 );

		m_RightBoxSizer->Add( m_LayersSizer, 0, 0, 5 );