Removed a debug message in annotate.cpp, and a problem in PadsPcb netlist (a67e71ac) · Commits · Elphel / kicad-source-mirror

eeschema/annotate.cpp

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -338,9 +338,7 @@ void AnnotateComponents( WinEDA_SchematicFrame* parent,
	/* Break full components reference in name (prefix) and number:		/* Break full components reference in name (prefix) and number:
	* example: IC1 become IC, and 1 */		* example: IC1 become IC, and 1 */
	BreakReference( BaseListeCmp, NbOfCmp );		BreakReference( BaseListeCmp, NbOfCmp );
	wxString msg1;
	msg1 << sortOption;
	wxMessageBox(msg1);
	switch( sortOption )		switch( sortOption )
	{		{
	case 0:		case 0:

eeschema/netlist.cpp

+22 −16

Original line number	Original line	Diff line number	Diff line
	@@ -153,14 +153,14 @@ void* WinEDA_SchematicFrame::BuildNetListBase()
	int NetNumber;		int NetNumber;
	int i, istart, NetCode;		int i, istart, NetCode;
	DrawSheetPath* sheet;		DrawSheetPath* sheet;
	wxString msg;		wxString msg, activity;
	wxBusyCursor Busy;		wxBusyCursor Busy;

	NetNumber = 1;		NetNumber = 1;
	s_PassNumber = 0;		s_PassNumber = 0;

	MsgPanel->EraseMsgBox();		activity = _( "List" );
	Affiche_1_Parametre( this, 1, _( "List" ), wxEmptyString, LIGHTRED );		SetStatusText( activity );

	/* Build the sheet (not screen) list (flattened)*/		/* Build the sheet (not screen) list (flattened)*/
	EDA_SheetList SheetListList( NULL );		EDA_SheetList SheetListList( NULL );
	@@ -192,7 +192,6 @@ void* WinEDA_SchematicFrame::BuildNetListBase()
	/* second pass: fill the fields of the structures in the Net */		/* second pass: fill the fields of the structures in the Net */

	s_PassNumber++;		s_PassNumber++;
	Affiche_1_Parametre( this, 1, _( "List" ), wxEmptyString, RED );

	sheet = SheetListList.GetFirst();		sheet = SheetListList.GetFirst();
	for( ObjetNetListStruct* tabObjNet = g_TabObjNet;		for( ObjetNetListStruct* tabObjNet = g_TabObjNet;
	@@ -201,17 +200,17 @@ void* WinEDA_SchematicFrame::BuildNetListBase()
	tabObjNet += ListeObjetConnection( this, sheet, tabObjNet );		tabObjNet += ListeObjetConnection( this, sheet, tabObjNet );
	}		}

	Affiche_1_Parametre( this, -1, _( "List" ), _( "Done" ), RED );		activity.Empty();
			activity << wxT(" ") << _( "NbItems" ) << wxT(" ") << g_NbrObjNet;
	msg.Printf( wxT( "%d" ), g_NbrObjNet );		SetStatusText( activity );
	Affiche_1_Parametre( this, 8, _( "NbItems" ), msg, GREEN );

	/* Recherche des connections pour les Segments et les Pins */		/* Recherche des connections pour les Segments et les Pins */
	/* Tri du Tableau des objets de Net par Sheet */		/* Tri du Tableau des objets de Net par Sheet */

	qsort( g_TabObjNet, g_NbrObjNet, sizeof(ObjetNetListStruct), TriBySheet );		qsort( g_TabObjNet, g_NbrObjNet, sizeof(ObjetNetListStruct), TriBySheet );

	Affiche_1_Parametre( this, 18, _( "Conn" ), wxEmptyString, CYAN );		activity << wxT("; ") << _( "Conn" );
			SetStatusText( activity );

	sheet = &(g_TabObjNet[0].m_SheetList);		sheet = &(g_TabObjNet[0].m_SheetList);
	LastNetCode = LastBusNetCode = 1;		LastNetCode = LastBusNetCode = 1;
	@@ -308,12 +307,14 @@ void* WinEDA_SchematicFrame::BuildNetListBase()
	#endif		#endif


	Affiche_1_Parametre( this, 18, _( "Conn" ), _( "Done" ), CYAN );		activity << wxT(" ") << _( "Done" );
			SetStatusText( activity );

	/* Mise a jour des NetCodes des Bus Labels connectes par les Bus */		/* Mise a jour des NetCodes des Bus Labels connectes par les Bus */
	ConnectBusLabels( g_TabObjNet, g_NbrObjNet );		ConnectBusLabels( g_TabObjNet, g_NbrObjNet );

	Affiche_1_Parametre( this, 26, _( "Labels" ), wxEmptyString, CYAN );		activity << wxT("; ") << _( "Labels" );
			SetStatusText( activity );

	/* Connections des groupes d'objets par labels identiques */		/* Connections des groupes d'objets par labels identiques */
	for( i = 0; i<g_NbrObjNet; i++ )		for( i = 0; i<g_NbrObjNet; i++ )
	@@ -348,10 +349,12 @@ void* WinEDA_SchematicFrame::BuildNetListBase()
	dumpNetTable();		dumpNetTable();
	#endif		#endif

	Affiche_1_Parametre( this, 26, _( "Labels" ), _( "Done" ), CYAN );		activity << wxT(" ") << _( "Done" );
			SetStatusText( activity );

	/* Connexion des hierarchies */		/* Connexion des hierarchies */
	Affiche_1_Parametre( this, 36, _( "Hierar." ), wxEmptyString, LIGHTRED );		activity << wxT("; ") << _( "Hierar." );
			SetStatusText( activity );

	for( i = 0; i<g_NbrObjNet; i++ )		for( i = 0; i<g_NbrObjNet; i++ )
	{		{
	@@ -369,10 +372,12 @@ void* WinEDA_SchematicFrame::BuildNetListBase()
	dumpNetTable();		dumpNetTable();
	#endif		#endif

	Affiche_1_Parametre( this, 36, _( "Hierar." ), _( "Done" ), RED );		activity << wxT(" ") << _( "Done" );
			SetStatusText( activity );

	/* Compression des numeros de NetCode a des valeurs consecutives */		/* Compression des numeros de NetCode a des valeurs consecutives */
	Affiche_1_Parametre( this, 46, _( "Sorting" ), wxEmptyString, GREEN );		activity << wxT("; ") << _( "Sorting Nets" );
			SetStatusText( activity );
	LastNetCode = NetCode = 0;		LastNetCode = NetCode = 0;
	for( i = 0; i < g_NbrObjNet; i++ )		for( i = 0; i < g_NbrObjNet; i++ )
	{		{
	@@ -384,7 +389,8 @@ void* WinEDA_SchematicFrame::BuildNetListBase()
	g_TabObjNet[i].SetNet( NetCode );		g_TabObjNet[i].SetNet( NetCode );
	}		}

	Affiche_1_Parametre( this, 46, _( "Sorting" ), _( "Done" ), GREEN );		activity << wxT(" ") << _( "Done" );
			SetStatusText( activity );

	/* Affectation du m_FlagOfConnection en fonction de connection ou non */		/* Affectation du m_FlagOfConnection en fonction de connection ou non */
	SetUnconnectedFlag( g_TabObjNet, g_NbrObjNet );		SetUnconnectedFlag( g_TabObjNet, g_NbrObjNet );

Admin message