All: better look when displaying info on messages panel (ccbce931) · Commits · Elphel / kicad-source-mirror

common/msgpanel.cpp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -122,6 +122,9 @@ void WinEDA_MsgPanel::AppendMessage( const wxString& textUpper,
	m_Items.push_back( item );		m_Items.push_back( item );
	m_last_x += computeTextSize( text ).x;		m_last_x += computeTextSize( text ).x;

			// Add an extra space between texts for a better look:
			m_last_x += m_fontSize.x;

	Refresh();		Refresh();
	}		}

eeschema/class_sch_component.cpp

+8 −11

Original line number	Original line	Diff line number	Diff line
	@@ -1026,31 +1026,28 @@ void SCH_COMPONENT::DisplayInfo( WinEDA_DrawFrame* frame )
	LIB_COMPONENT* Entry = CMP_LIBRARY::FindLibraryComponent( m_ChipName );		LIB_COMPONENT* Entry = CMP_LIBRARY::FindLibraryComponent( m_ChipName );

	wxString msg;		wxString msg;
			WinEDA_MsgPanel *msgpanel = frame->MsgPanel;

	frame->MsgPanel->EraseMsgBox();		msgpanel->EraseMsgBox();

	Affiche_1_Parametre( frame, 1, _( "Ref" ),		msg = GetRef(((WinEDA_SchematicFrame*)frame)->GetSheet());
	GetRef(((WinEDA_SchematicFrame*)frame)->GetSheet()),		msgpanel->AppendMessage( _( "Ref" ), msg, DARKCYAN );
	DARKCYAN );

	if( Entry && Entry->m_Options == ENTRY_POWER )		if( Entry && Entry->m_Options == ENTRY_POWER )
	msg = _( "Pwr Symb" );		msg = _( "Pwr Symb" );
	else		else
	msg = _( "Val" );		msg = _( "Val" );

	Affiche_1_Parametre( frame, 10, msg, GetField( VALUE )->m_Text, DARKCYAN );		msgpanel->AppendMessage( msg, GetField( VALUE )->m_Text, DARKCYAN );

	Affiche_1_Parametre( frame, 28, _( "RefLib" ), m_ChipName.GetData(), BROWN );		msgpanel->AppendMessage( _( "RefLib" ), m_ChipName.GetData(), BROWN );

	msg = Entry->GetLibraryName();		msg = Entry->GetLibraryName();

	Affiche_1_Parametre( frame, 40, _( "Lib" ), msg, DARKRED );		msgpanel->AppendMessage( _( "Lib" ), msg, DARKRED );

	if( Entry )		if( Entry )
	{		msgpanel->AppendMessage( Entry->m_Doc, Entry->m_KeyWord, DARKCYAN );
	Affiche_1_Parametre( frame, 52, Entry->m_Doc, Entry->m_KeyWord,
	DARKCYAN );
	}
	}		}

	/** virtual function Mirror_Y		/** virtual function Mirror_Y

pcbnew/class_marker_pcb.cpp

+5 −9

Original line number	Original line	Diff line number	Diff line
	@@ -57,21 +57,18 @@ MARKER_PCB::~MARKER_PCB()

	void MARKER_PCB::DisplayInfo( WinEDA_DrawFrame* frame )		void MARKER_PCB::DisplayInfo( WinEDA_DrawFrame* frame )
	{		{
	int text_pos;		WinEDA_MsgPanel *msgpanel = frame->MsgPanel;
			msgpanel->EraseMsgBox();
	frame->MsgPanel->EraseMsgBox();

	const DRC_ITEM& rpt = m_drc;		const DRC_ITEM& rpt = m_drc;

	text_pos = 1;		msgpanel->AppendMessage( _( "Type" ), _("Marker"), DARKCYAN );
	Affiche_1_Parametre( frame, text_pos, _( "Type" ), _("Marker"), DARKCYAN );

	wxString errorTxt;		wxString errorTxt;

	errorTxt << _("ErrType") << wxT("(") << rpt.GetErrorCode() << wxT(")- ") << rpt.GetErrorText() << wxT(":");		errorTxt << _("ErrType") << wxT("(") << rpt.GetErrorCode() << wxT(")- ") << rpt.GetErrorText() << wxT(":");

	text_pos = 5;		msgpanel->AppendMessage( errorTxt, wxEmptyString, RED );
	Affiche_1_Parametre( frame, text_pos, errorTxt, wxEmptyString, RED );

	wxString txtA;		wxString txtA;
	txtA << DRC_ITEM::ShowCoord( rpt.GetPointA() ) << wxT(": ") << rpt.GetTextA();		txtA << DRC_ITEM::ShowCoord( rpt.GetPointA() ) << wxT(": ") << rpt.GetTextA();
	@@ -80,8 +77,7 @@ void MARKER_PCB::DisplayInfo( WinEDA_DrawFrame* frame )
	if ( rpt.HasSecondItem() )		if ( rpt.HasSecondItem() )
	txtB << DRC_ITEM::ShowCoord( rpt.GetPointB() ) << wxT(": ") << rpt.GetTextB();		txtB << DRC_ITEM::ShowCoord( rpt.GetPointB() ) << wxT(": ") << rpt.GetTextB();

	text_pos = 25;		msgpanel->AppendMessage( txtA, txtB, DARKBROWN );
	Affiche_1_Parametre( frame, text_pos, txtA, txtB, DARKBROWN );
	}		}

	/**		/**

pcbnew/class_module.cpp

+15 −26

Original line number	Original line	Diff line number	Diff line
	@@ -797,21 +797,19 @@ void MODULE::DisplayInfo( WinEDA_DrawFrame* frame )
	{		{
	int nbpad;		int nbpad;
	char bufcar[512], Line[512];		char bufcar[512], Line[512];
	int pos;
	bool flag = FALSE;		bool flag = FALSE;
	wxString msg;		wxString msg;
	BOARD* board = (BOARD*) m_Parent;		BOARD* board = (BOARD*) m_Parent;
			WinEDA_MsgPanel *msgpanel = frame->MsgPanel;

	frame->MsgPanel->EraseMsgBox(); /* Effacement de la zone message */		msgpanel->EraseMsgBox();
	if( frame->m_Ident != PCB_FRAME )		if( frame->m_Ident != PCB_FRAME )
	flag = TRUE;		flag = TRUE;
	pos = 1;
	Affiche_1_Parametre( frame, pos, m_Reference->m_Text, m_Value->m_Text,		msgpanel->AppendMessage( m_Reference->m_Text, m_Value->m_Text,
	DARKCYAN );		DARKCYAN );

	/* Affiche signature temporelle ou date de modif (en edition de modules) */		if( flag ) // Display last date the component was edited( useful in Module Editor)
	pos += 6;
	if( flag ) // Affichage date de modification (utile en Module Editor)
	{		{
	time_t edit_time = m_LastEdit_Time;		time_t edit_time = m_LastEdit_Time;
	strcpy( Line, ctime( &edit_time ) );		strcpy( Line, ctime( &edit_time ) );
	@@ -821,20 +819,16 @@ void MODULE::DisplayInfo( WinEDA_DrawFrame* frame )
	strtok( NULL, " \n\r" );		strtok( NULL, " \n\r" );
	strcat( bufcar, strtok( NULL, " \n\r" ) );		strcat( bufcar, strtok( NULL, " \n\r" ) );
	msg = CONV_FROM_UTF8( bufcar );		msg = CONV_FROM_UTF8( bufcar );
	Affiche_1_Parametre( frame, pos, _( "Last Change" ), msg, BROWN );		msgpanel->AppendMessage( _( "Last Change" ), msg, BROWN );
	pos += 4;
	}		}
	else		else // displa time stamp in schematic
	{		{
	msg.Printf( wxT( "%8.8lX" ), m_TimeStamp );		msg.Printf( wxT( "%8.8lX" ), m_TimeStamp );
	Affiche_1_Parametre( frame, pos, _( "Netlist path" ), m_Path, BROWN );		msgpanel->AppendMessage( _( "Netlist path" ), m_Path, BROWN );
	}		}

	pos += 12;		msgpanel->AppendMessage( _( "Layer" ), board->GetLayerName( m_Layer ), RED );
	Affiche_1_Parametre( frame, pos, _( "Layer" ),
	board->GetLayerName( m_Layer ), RED );

	pos += 6;
	EDA_BaseStruct* PtStruct = m_Pads;		EDA_BaseStruct* PtStruct = m_Pads;
	nbpad = 0;		nbpad = 0;
	while( PtStruct )		while( PtStruct )
	@@ -844,34 +838,29 @@ void MODULE::DisplayInfo( WinEDA_DrawFrame* frame )
	}		}

	msg.Printf( wxT( "%d" ), nbpad );		msg.Printf( wxT( "%d" ), nbpad );
	Affiche_1_Parametre( frame, pos, _( "Pads" ), msg, BLUE );		msgpanel->AppendMessage( _( "Pads" ), msg, BLUE );

	pos += 4;
	msg = wxT( ".." );		msg = wxT( ".." );
	if( IsLocked() )		if( IsLocked() )
	msg[0] = 'L';		msg[0] = 'L';
	if( m_ModuleStatus & MODULE_is_PLACED )		if( m_ModuleStatus & MODULE_is_PLACED )
	msg[1] = 'P';		msg[1] = 'P';
	Affiche_1_Parametre( frame, pos, _( "Stat" ), msg, MAGENTA );		msgpanel->AppendMessage( _( "Stat" ), msg, MAGENTA );

	pos += 4;
	msg.Printf( wxT( "%.1f" ), (float) m_Orient / 10 );		msg.Printf( wxT( "%.1f" ), (float) m_Orient / 10 );
	Affiche_1_Parametre( frame, pos, _( "Orient" ), msg, BROWN );		msgpanel->AppendMessage( _( "Orient" ), msg, BROWN );

	pos += 5;		msgpanel->AppendMessage( _( "Module" ), m_LibRef, BLUE );
	Affiche_1_Parametre( frame, pos, _( "Module" ), m_LibRef, BLUE );

	pos += 9;
	if( m_3D_Drawings != NULL )		if( m_3D_Drawings != NULL )
	msg = m_3D_Drawings->m_Shape3DName;		msg = m_3D_Drawings->m_Shape3DName;
	else		else
	msg = _("No 3D shape");		msg = _("No 3D shape");
	Affiche_1_Parametre( frame, pos, _( "3D-Shape" ), msg, RED );		msgpanel->AppendMessage( _( "3D-Shape" ), msg, RED );

	pos += 14;
	wxString doc = _( "Doc: " ) + m_Doc;		wxString doc = _( "Doc: " ) + m_Doc;
	wxString keyword = _( "KeyW: " ) + m_KeyWord;		wxString keyword = _( "KeyW: " ) + m_KeyWord;
	Affiche_1_Parametre( frame, pos, doc, keyword, BLACK );		msgpanel->AppendMessage( doc, keyword, BLACK );
	}		}

pcbnew/class_pad.cpp

+16 −30

Original line number	Original line	Diff line number	Diff line
	@@ -436,7 +436,6 @@ void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
	int ii;		int ii;
	MODULE* module;		MODULE* module;
	wxString Line;		wxString Line;
	int pos = 1;

	/* Pad messages */		/* Pad messages */
	static const wxString Msg_Pad_Shape[6] =		static const wxString Msg_Pad_Shape[6] =
	@@ -453,26 +452,24 @@ void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
	{ wxT( "norm" ), wxT( "smd " ), wxT( "conn" ), wxT( "????" ) };		{ wxT( "norm" ), wxT( "smd " ), wxT( "conn" ), wxT( "????" ) };


	frame->MsgPanel->EraseMsgBox();		WinEDA_MsgPanel *msgpanel = frame->MsgPanel;
			msgpanel->EraseMsgBox();

	/* Recherche du module correspondant */		/* Recherche du module correspondant */
	module = (MODULE*) m_Parent;		module = (MODULE*) m_Parent;
	if( module )		if( module )
	{		{
	wxString msg = module->GetReference();		wxString msg = module->GetReference();
	Affiche_1_Parametre( frame, pos, _( "Module" ), msg, DARKCYAN );		msgpanel->AppendMessage( _( "Module" ), msg, DARKCYAN );
	ReturnStringPadName( Line );		ReturnStringPadName( Line );
	pos += 8;		msgpanel->AppendMessage( _( "RefP" ), Line, BROWN );
	Affiche_1_Parametre( frame, pos, _( "RefP" ), Line, BROWN );
	}		}
	pos += 4;		msgpanel->AppendMessage( _( "Net" ), m_Netname, DARKCYAN );
	Affiche_1_Parametre( frame, pos, _( "Net" ), m_Netname, DARKCYAN );

	/* For test and debug only: display m_physical_connexion and m_logical_connexion */		/* For test and debug only: display m_physical_connexion and m_logical_connexion */
	pos += 10;
	#if 1 // Used only to debug connectivity calculations		#if 1 // Used only to debug connectivity calculations
	Line.Printf( wxT( "%d-%d-%d " ), GetSubRatsnest(), GetSubNet(), m_ZoneSubnet );		Line.Printf( wxT( "%d-%d-%d " ), GetSubRatsnest(), GetSubNet(), m_ZoneSubnet );
	Affiche_1_Parametre( frame, pos, wxT( "L-P-Z" ), Line, DARKGREEN );		msgpanel->AppendMessage( wxT( "L-P-Z" ), Line, DARKGREEN );
	#endif		#endif

	wxString LayerInfo;		wxString LayerInfo;
	@@ -549,32 +546,24 @@ void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
	break;		break;
	}		}
	}		}
	pos += 3;		msgpanel->AppendMessage( _( "Layer" ), LayerInfo, DARKGREEN );
	Affiche_1_Parametre( frame, pos, _( "Layer" ), LayerInfo, DARKGREEN );

	pos += 6;
	int attribut = m_Attribut & 15;		int attribut = m_Attribut & 15;
	if( attribut > 3 )		if( attribut > 3 )
	attribut = 3;		attribut = 3;
	Affiche_1_Parametre( frame,		msgpanel->AppendMessage( Msg_Pad_Shape[m_PadShape],
	pos,		Msg_Pad_Attribut[attribut], DARKGREEN );
	Msg_Pad_Shape[m_PadShape],
	Msg_Pad_Attribut[attribut],
	DARKGREEN );

	valeur_param( m_Size.x, Line );		valeur_param( m_Size.x, Line );
	pos += 6;		msgpanel->AppendMessage( _( "H Size" ), Line, RED );
	Affiche_1_Parametre( frame, pos, _( "H Size" ), Line, RED );

	valeur_param( m_Size.y, Line );		valeur_param( m_Size.y, Line );
	pos += 7;		msgpanel->AppendMessage( _( "V Size" ), Line, RED );
	Affiche_1_Parametre( frame, pos, _( "V Size" ), Line, RED );

	pos += 7;
	valeur_param( (unsigned) m_Drill.x, Line );		valeur_param( (unsigned) m_Drill.x, Line );
	if( m_DrillShape == PAD_CIRCLE )		if( m_DrillShape == PAD_CIRCLE )
	{		{
	Affiche_1_Parametre( frame, pos, _( "Drill" ), Line, RED );		msgpanel->AppendMessage( _( "Drill" ), Line, RED );
	}		}
	else		else
	{		{
	@@ -582,7 +571,7 @@ void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
	wxString msg;		wxString msg;
	valeur_param( (unsigned) m_Drill.y, msg );		valeur_param( (unsigned) m_Drill.y, msg );
	Line += wxT( " / " ) + msg;		Line += wxT( " / " ) + msg;
	Affiche_1_Parametre( frame, pos, _( "Drill X / Y" ), Line, RED );		msgpanel->AppendMessage( _( "Drill X / Y" ), Line, RED );
	}		}


	@@ -592,16 +581,13 @@ void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
	(float) ( m_Orient - module_orient ) / 10, (float) module_orient / 10 );		(float) ( m_Orient - module_orient ) / 10, (float) module_orient / 10 );
	else		else
	Line.Printf( wxT( "%3.1f" ), (float) m_Orient / 10 );		Line.Printf( wxT( "%3.1f" ), (float) m_Orient / 10 );
	pos += 8;		msgpanel->AppendMessage( _( "Orient" ), Line, BLUE );
	Affiche_1_Parametre( frame, pos, _( "Orient" ), Line, BLUE );

	valeur_param( m_Pos.x, Line );		valeur_param( m_Pos.x, Line );
	pos += 8;		msgpanel->AppendMessage( _( "X Pos" ), Line, BLUE );
	Affiche_1_Parametre( frame, pos, _( "X Pos" ), Line, BLUE );

	valeur_param( m_Pos.y, Line );		valeur_param( m_Pos.y, Line );
	pos += 6;		msgpanel->AppendMessage( _( "Y pos" ), Line, BLUE );
	Affiche_1_Parametre( frame, pos, _( "Y pos" ), Line, BLUE );
	}		}

Admin message