From 9d6c1d12ed66799970e8c08f9084f9c771cdffda Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 27 Apr 2012 08:11:41 +0200 Subject: [PATCH] Fix some (not all) bad values displayed in NANOMETER mode. --- pcbnew/class_pad.cpp | 16 ++++++++-------- pcbnew/class_pcb_text.cpp | 6 +++--- pcbnew/class_text_mod.cpp | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pcbnew/class_pad.cpp b/pcbnew/class_pad.cpp index 0ee5d847b3..86aa6c60cf 100644 --- a/pcbnew/class_pad.cpp +++ b/pcbnew/class_pad.cpp @@ -612,13 +612,13 @@ void D_PAD::DisplayInfo( EDA_DRAW_FRAME* frame ) frame->AppendMsgPanel( ShowPadShape(), ShowPadAttr(), DARKGREEN ); - valeur_param( m_Size.x, Line ); + Line = frame->CoordinateToString( m_Size.x ); frame->AppendMsgPanel( _( "H Size" ), Line, RED ); - valeur_param( m_Size.y, Line ); + Line = frame->CoordinateToString( m_Size.y ); frame->AppendMsgPanel( _( "V Size" ), Line, RED ); - valeur_param( (unsigned) m_Drill.x, Line ); + Line = frame->CoordinateToString( (unsigned) m_Drill.x ); if( m_DrillShape == PAD_CIRCLE ) { @@ -626,9 +626,9 @@ void D_PAD::DisplayInfo( EDA_DRAW_FRAME* frame ) } else { - valeur_param( (unsigned) m_Drill.x, Line ); + Line = frame->CoordinateToString( (unsigned) m_Drill.x ); wxString msg; - valeur_param( (unsigned) m_Drill.y, msg ); + Line = frame->CoordinateToString( (unsigned) m_Drill.y ); Line += wxT( " / " ) + msg; frame->AppendMsgPanel( _( "Drill X / Y" ), Line, RED ); } @@ -644,15 +644,15 @@ void D_PAD::DisplayInfo( EDA_DRAW_FRAME* frame ) frame->AppendMsgPanel( _( "Orient" ), Line, LIGHTBLUE ); - valeur_param( m_Pos.x, Line ); + Line = frame->CoordinateToString( m_Pos.x ); frame->AppendMsgPanel( _( "X Pos" ), Line, LIGHTBLUE ); - valeur_param( m_Pos.y, Line ); + Line = frame->CoordinateToString( m_Pos.y ); frame->AppendMsgPanel( _( "Y pos" ), Line, LIGHTBLUE ); if( GetDieLength() ) { - valeur_param( GetDieLength(), Line ); + Line = frame->CoordinateToString( GetDieLength() ); frame->AppendMsgPanel( _( "Length on die" ), Line, CYAN ); } } diff --git a/pcbnew/class_pcb_text.cpp b/pcbnew/class_pcb_text.cpp index ec265d1ef3..e5099e9543 100644 --- a/pcbnew/class_pcb_text.cpp +++ b/pcbnew/class_pcb_text.cpp @@ -138,13 +138,13 @@ void TEXTE_PCB::DisplayInfo( EDA_DRAW_FRAME* frame ) msg.Printf( wxT( "%.1f" ), (float) m_Orient / 10 ); frame->AppendMsgPanel( _( "Orientation" ), msg, DARKGREEN ); - valeur_param( m_Thickness, msg ); + msg = frame->CoordinateToString( m_Thickness ); frame->AppendMsgPanel( _( "Thickness" ), msg, MAGENTA ); - valeur_param( m_Size.x, msg ); + msg = frame->CoordinateToString( m_Size.x ); frame->AppendMsgPanel( _( "Size X" ), msg, RED ); - valeur_param( m_Size.y, msg ); + msg = frame->CoordinateToString( m_Size.y ); frame->AppendMsgPanel( _( "Size Y" ), msg, RED ); } diff --git a/pcbnew/class_text_mod.cpp b/pcbnew/class_text_mod.cpp index 279489a06f..a588b12484 100644 --- a/pcbnew/class_text_mod.cpp +++ b/pcbnew/class_text_mod.cpp @@ -405,13 +405,13 @@ void TEXTE_MODULE::DisplayInfo( EDA_DRAW_FRAME* frame ) msg.Printf( wxT( "%.1f" ), (float) m_Orient / 10 ); frame->AppendMsgPanel( _( "Orient" ), msg, DARKGREEN ); - valeur_param( m_Thickness, msg ); + msg = frame->CoordinateToString( m_Thickness ); frame->AppendMsgPanel( _( "Thickness" ), msg, DARKGREEN ); - valeur_param( m_Size.x, msg ); + msg = frame->CoordinateToString( m_Size.x ); frame->AppendMsgPanel( _( "H Size" ), msg, RED ); - valeur_param( m_Size.y, msg ); + msg = frame->CoordinateToString( m_Size.y ); frame->AppendMsgPanel( _( "V Size" ), msg, RED ); }