Commit 9d6c1d12 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Fix some (not all) bad values displayed in NANOMETER mode.

parent cdaa5cea

pcbnew/class_pad.cpp

+8 −8
Original line number Original line Diff line number Diff line
@@ -612,13 +612,13 @@ void D_PAD::DisplayInfo( EDA_DRAW_FRAME* frame ) 




    frame->AppendMsgPanel( ShowPadShape(), ShowPadAttr(), DARKGREEN );

    frame->AppendMsgPanel( ShowPadShape(), ShowPadAttr(), DARKGREEN );





    valeur_param( m_Size.x, Line );

    Line = frame->CoordinateToString( m_Size.x );

    frame->AppendMsgPanel( _( "H Size" ), Line, RED );

    frame->AppendMsgPanel( _( "H Size" ), Line, RED );





    valeur_param( m_Size.y, Line );

    Line = frame->CoordinateToString( m_Size.y );

    frame->AppendMsgPanel( _( "V Size" ), Line, RED );

    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 )

    if( m_DrillShape == PAD_CIRCLE )

    {

    {
@@ -626,9 +626,9 @@ void D_PAD::DisplayInfo( EDA_DRAW_FRAME* frame ) 
    }

    }

    else

    else

    {

    {

        valeur_param( (unsigned) m_Drill.x, Line );

        Line = frame->CoordinateToString( (unsigned) m_Drill.x );

        wxString msg;

        wxString msg;

        valeur_param( (unsigned) m_Drill.y, msg );

        Line = frame->CoordinateToString( (unsigned) m_Drill.y );

        Line += wxT( " / " ) + msg;

        Line += wxT( " / " ) + msg;

        frame->AppendMsgPanel( _( "Drill X / Y" ), Line, RED );

        frame->AppendMsgPanel( _( "Drill X / Y" ), Line, RED );

    }

    }
@@ -644,15 +644,15 @@ void D_PAD::DisplayInfo( EDA_DRAW_FRAME* frame ) 




    frame->AppendMsgPanel( _( "Orient" ), Line, LIGHTBLUE );

    frame->AppendMsgPanel( _( "Orient" ), Line, LIGHTBLUE );





    valeur_param( m_Pos.x, Line );

    Line = frame->CoordinateToString( m_Pos.x );

    frame->AppendMsgPanel( _( "X Pos" ), Line, LIGHTBLUE );

    frame->AppendMsgPanel( _( "X Pos" ), Line, LIGHTBLUE );





    valeur_param( m_Pos.y, Line );

    Line = frame->CoordinateToString( m_Pos.y );

    frame->AppendMsgPanel( _( "Y pos" ), Line, LIGHTBLUE );

    frame->AppendMsgPanel( _( "Y pos" ), Line, LIGHTBLUE );





    if( GetDieLength() )

    if( GetDieLength() )

    {

    {

        valeur_param( GetDieLength(), Line );

        Line = frame->CoordinateToString( GetDieLength() );

        frame->AppendMsgPanel( _( "Length on die" ), Line, CYAN );

        frame->AppendMsgPanel( _( "Length on die" ), Line, CYAN );

    }

    }

}

}

pcbnew/class_pcb_text.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -138,13 +138,13 @@ void TEXTE_PCB::DisplayInfo( EDA_DRAW_FRAME* frame ) 
    msg.Printf( wxT( "%.1f" ), (float) m_Orient / 10 );

    msg.Printf( wxT( "%.1f" ), (float) m_Orient / 10 );

    frame->AppendMsgPanel( _( "Orientation" ), msg, DARKGREEN );

    frame->AppendMsgPanel( _( "Orientation" ), msg, DARKGREEN );





    valeur_param( m_Thickness, msg );

    msg = frame->CoordinateToString( m_Thickness );

    frame->AppendMsgPanel( _( "Thickness" ), msg, MAGENTA );

    frame->AppendMsgPanel( _( "Thickness" ), msg, MAGENTA );





    valeur_param( m_Size.x, msg );

    msg = frame->CoordinateToString( m_Size.x );

    frame->AppendMsgPanel( _( "Size X" ), msg, RED );

    frame->AppendMsgPanel( _( "Size X" ), msg, RED );





    valeur_param( m_Size.y, msg );

    msg = frame->CoordinateToString( m_Size.y );

    frame->AppendMsgPanel( _( "Size Y" ), msg, RED );

    frame->AppendMsgPanel( _( "Size Y" ), msg, RED );

}

}

pcbnew/class_text_mod.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -405,13 +405,13 @@ void TEXTE_MODULE::DisplayInfo( EDA_DRAW_FRAME* frame ) 
    msg.Printf( wxT( "%.1f" ), (float) m_Orient / 10 );

    msg.Printf( wxT( "%.1f" ), (float) m_Orient / 10 );

    frame->AppendMsgPanel( _( "Orient" ), msg, DARKGREEN );

    frame->AppendMsgPanel( _( "Orient" ), msg, DARKGREEN );





    valeur_param( m_Thickness, msg );

    msg = frame->CoordinateToString( m_Thickness );

    frame->AppendMsgPanel( _( "Thickness" ), msg, DARKGREEN );

    frame->AppendMsgPanel( _( "Thickness" ), msg, DARKGREEN );





    valeur_param( m_Size.x, msg );

    msg = frame->CoordinateToString( m_Size.x );

    frame->AppendMsgPanel( _( "H Size" ), msg, RED );

    frame->AppendMsgPanel( _( "H Size" ), msg, RED );





    valeur_param( m_Size.y, msg );

    msg = frame->CoordinateToString( m_Size.y );

    frame->AppendMsgPanel( _( "V Size" ), msg, RED );

    frame->AppendMsgPanel( _( "V Size" ), msg, RED );

}

}