haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes MSVC compile errors.

This commit is contained in:
Wayne Stambaugh 2011-02-16 14:16:38 -05:00
parent f0afa23066
commit e557b388a7
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/drawpanel.cpp
View File

@ -353,8 +353,8 @@ void EDA_DRAW_PANEL::OnScroll( wxScrollWinEvent& event )
} }
wxLogTrace( KICAD_TRACE_COORDS, wxLogTrace( KICAD_TRACE_COORDS,
wxT( "Setting scroll bars ppuX=%d, ppuY=%d, unitsX=%d, unitsY=%d," \ wxT( "Setting scroll bars ppuX=%d, ppuY=%d, unitsX=%d, unitsY=%d, posX=%d, posY=%d" ),
"posX=%d, posY=%d" ), ppux, ppuy, unitsX, unitsY, x, y ); ppux, ppuy, unitsX, unitsY, x, y );
Scroll( x/ppux, y/ppuy ); Scroll( x/ppux, y/ppuy );
event.Skip(); event.Skip();

3
gerbview/class_aperture_macro.cpp
View File

@ -458,7 +458,8 @@ void AM_PRIMITIVE::ConvertShapeToPolygon( GERBER_DRAW_ITEM* aParent,
aBuffer.push_back( currpt ); aBuffer.push_back( currpt );
// Rotate rectangle and move it to the actual start point // Rotate rectangle and move it to the actual start point
int angle = wxRound( atan2( delta.y, delta.x ) * 1800.0 / M_PI ); int angle = wxRound( atan2( (double) delta.y, (double) delta.x ) * 1800.0 / M_PI );
for( unsigned ii = 0; ii < 4; ii++ ) for( unsigned ii = 0; ii < 4; ii++ )
{ {
RotatePoint( &aBuffer[ii], -angle ); RotatePoint( &aBuffer[ii], -angle );

2
gerbview/dcode.h
View File

@ -66,7 +66,7 @@ enum APERTURE_DEF_HOLETYPE {
#define LAST_DCODE 999 #define LAST_DCODE 999
#define TOOLS_MAX_COUNT (LAST_DCODE + 1) #define TOOLS_MAX_COUNT (LAST_DCODE + 1)
class APERTURE_MACRO; struct APERTURE_MACRO;
/** /**

6
pcbnew/automove.cpp
View File

@ -211,7 +211,11 @@ void WinEDA_PcbFrame::AutoMoveModulesOnPcb( bool PlaceModulesHorsPcb )
if( PlaceModulesHorsPcb && edgesExists ) if( PlaceModulesHorsPcb && edgesExists )
{ {
if( GetScreen()->GetCrossHairPosition().y < (GetBoard()->m_BoundaryBox.GetBottom() + 2000) ) if( GetScreen()->GetCrossHairPosition().y < (GetBoard()->m_BoundaryBox.GetBottom() + 2000) )
GetScreen()->GetCrossHairPosition().y = GetBoard()->m_BoundaryBox.GetBottom() + 2000; {
wxPoint pos = GetScreen()->GetCrossHairPosition();
pos.y = GetBoard()->m_BoundaryBox.GetBottom() + 2000;
GetScreen()->SetCrossHairPosition( pos );
}
} }
/* calculate the area needed by footprints */ /* calculate the area needed by footprints */