From d4bfa450e096c6c3d218e25d89f8925e8147189a Mon Sep 17 00:00:00 2001 From: Vladimir Uryvaev Date: Fri, 18 Nov 2011 03:16:36 +0400 Subject: [PATCH] Debug bug:) fix. Wayne found it. --- include/lengthpcb.h | 16 ++++++++++++---- pcbnew/class_pad.cpp | 2 +- pcbnew/specctra_export.cpp | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/include/lengthpcb.h b/include/lengthpcb.h index fb508f330a..05602174f4 100644 --- a/include/lengthpcb.h +++ b/include/lengthpcb.h @@ -25,26 +25,34 @@ typedef LENGTH< double, 1 > LENGTH_PCB_DBL; #define TO_LEGACY_LU_DBL( x ) \ ( (double) ( LENGTH_PCB_DBL( x ) / PCB_LEGACY_UNIT( LENGTH_PCB_DBL ) ) ) -static LENGTH_PCB from_legacy_lu( int x ) +#ifdef __GNUC__ +#define NOT_USED __attribute__ ((unused)) +#else +#define NOT_USED +#endif + +static LENGTH_PCB NOT_USED from_legacy_lu( int x ) { return x * PCB_LEGACY_UNIT( LENGTH_PCB ); } -static LENGTH_PCB from_legacy_lu( long x ) +static LENGTH_PCB NOT_USED from_legacy_lu( long x ) { return x * PCB_LEGACY_UNIT( LENGTH_PCB ); } -static LENGTH_PCB from_legacy_lu( double x ) +static LENGTH_PCB NOT_USED from_legacy_lu( double x ) { return LENGTH_PCB( x * PCB_LEGACY_UNIT( LENGTH_PCB_DBL ) ); } -static LENGTH_PCB_DBL from_legacy_lu_dbl( double x ) +static LENGTH_PCB_DBL NOT_USED from_legacy_lu_dbl( double x ) { return x * LENGTH_UNITS< LENGTH_PCB_DBL >::inch() / PCB_LEGACY_INCH_SCALE; } +#undef NOT_USED + #define FROM_LEGACY_LU( x ) ( from_legacy_lu( x ) ) #define FROM_LEGACY_LU_DBL( x ) ( from_legacy_lu_dbl( x ) ) diff --git a/pcbnew/class_pad.cpp b/pcbnew/class_pad.cpp index 71ac87cdd8..081699eeef 100644 --- a/pcbnew/class_pad.cpp +++ b/pcbnew/class_pad.cpp @@ -988,7 +988,7 @@ void D_PAD::Show( int nestLevel, std::ostream& os ) " num=\"" << padname << '"' << " net=\"" << m_Netname.mb_str() << '"' << " netcode=\"" << GetNet() << '"' << - " layerMask=\"" << layerMask << '"' << m_Pos << "/>\n"; + " layerMask=\"" << layerMask << '"' << TO_LEGACY_LU_WXP( m_Pos ) << "/>\n"; // NestedSpace( nestLevel+1, os ) << m_Text.mb_str() << '\n'; diff --git a/pcbnew/specctra_export.cpp b/pcbnew/specctra_export.cpp index 5afb05e4e6..5e37e96565 100644 --- a/pcbnew/specctra_export.cpp +++ b/pcbnew/specctra_export.cpp @@ -479,7 +479,7 @@ PADSTACK* SPECCTRA_DB::makePADSTACK( BOARD* aBoard, D_PAD* aPad ) polygon->AppendPoint( lowerRight ); } - D(printf( "m_DeltaSize: %d,%d\n", TO_LEGACY_LU( aPad->m_DeltaSize.x ), TO_LEGACY_LU( aPad->m_DeltaSize.y ) );) + D(printf( "m_DeltaSize: %d,%d\n", TO_LEGACY_LU( aPad->m_DeltaSize.x() ), TO_LEGACY_LU( aPad->m_DeltaSize.y() ) );) // this string _must_ be unique for a given physical shape snprintf( name, sizeof(name), "Trapz%sPad_%.6gx%.6g_%c%.6gx%c%.6g_mil",