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

Fix redraw issue in modedit a modview, with GAL

This commit is contained in:
Orson 2013-11-01 13:56:20 +01:00 committed by jean-pierre charras
parent 53e04ce7a6
commit 28b9317640
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -39,7 +39,7 @@ option( KICAD_SCRIPTING_MODULES
option( KICAD_SCRIPTING_WXPYTHON option( KICAD_SCRIPTING_WXPYTHON
"set this option ON to build wxpython implementation for wx interface building in python and py.shell" "set this option ON to build wxpython implementation for wx interface building in python and py.shell"
) )
# when option KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES is enabled: # when option KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES is enabled:
# PYTHON_EXECUTABLE can be defined when invoking cmake # PYTHON_EXECUTABLE can be defined when invoking cmake
# ( use -DPYTHON_EXECUTABLE=<python path>/python.exe or python2 ) # ( use -DPYTHON_EXECUTABLE=<python path>/python.exe or python2 )
@ -65,6 +65,9 @@ endif()
set( DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/.downloads-by-cmake set( DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/.downloads-by-cmake
CACHE PATH "Location of KiCad downloads, suggested is a dir common to all builds, i.e. global." ) CACHE PATH "Location of KiCad downloads, suggested is a dir common to all builds, i.e. global." )
#Add option to add user directories for linker, if any
LINK_DIRECTORIES( ${LINK_DIRECTORIES_PATH} )
if( UNIX ) if( UNIX )
set( KICAD_USER_CONFIG_DIR $ENV{HOME} CACHE PATH "Location of user specifig KiCad config files" ) set( KICAD_USER_CONFIG_DIR $ENV{HOME} CACHE PATH "Location of user specifig KiCad config files" )
elseif( MINGW ) elseif( MINGW )
@ -230,7 +233,7 @@ include( ExternalProject )
#================================================ #================================================
include( CheckFindPackageResult ) include( CheckFindPackageResult )
# Turn on wxWidgets compatibility mode for some classes # Turn on wxWidgets compatibility mode for some classes
add_definitions(-DWX_COMPATIBILITY) add_definitions(-DWX_COMPATIBILITY)
####################### #######################

2
cvpcb/class_DisplayFootprintsFrame.cpp
View File

@ -122,8 +122,6 @@ DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( CVPCB_MAINFRAME* parent,
EDA_PANEINFO mesg; EDA_PANEINFO mesg;
mesg.MessageToolbarPane(); mesg.MessageToolbarPane();
m_galCanvas->Hide();
m_auimgr.AddPane( m_mainToolBar, m_auimgr.AddPane( m_mainToolBar,
wxAuiPaneInfo( horiz ).Name( wxT( "m_mainToolBar" ) ).Top(). Row( 0 ) ); wxAuiPaneInfo( horiz ).Name( wxT( "m_mainToolBar" ) ).Top(). Row( 0 ) );

4
include/geometry/shape_line_chain.h
View File

@ -188,7 +188,7 @@ public:
if( aIndex < 0 ) if( aIndex < 0 )
aIndex += SegmentCount(); aIndex += SegmentCount();
if( aIndex == ( m_points.size() - 1 ) && m_closed ) if( aIndex == (int)( m_points.size() - 1 ) && m_closed )
return SEG( m_points[aIndex], m_points[0], aIndex ); return SEG( m_points[aIndex], m_points[0], aIndex );
else else
return SEG( m_points[aIndex], m_points[aIndex + 1], aIndex ); return SEG( m_points[aIndex], m_points[aIndex + 1], aIndex );
@ -207,7 +207,7 @@ public:
if( aIndex < 0 ) if( aIndex < 0 )
aIndex += SegmentCount(); aIndex += SegmentCount();
if( aIndex == ( m_points.size() - 1 ) && m_closed ) if( aIndex == (int)( m_points.size() - 1 ) && m_closed )
return SEG( const_cast<VECTOR2I&>( m_points[aIndex] ), return SEG( const_cast<VECTOR2I&>( m_points[aIndex] ),
const_cast<VECTOR2I&>( m_points[0] ), aIndex ); const_cast<VECTOR2I&>( m_points[0] ), aIndex );
else else

2
pcbnew/basepcbframe.cpp
View File

@ -151,6 +151,8 @@ PCB_BASE_FRAME::PCB_BASE_FRAME( wxWindow* aParent, ID_DRAWFRAME_TYPE aFrameType,
m_galCanvas = new EDA_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_FrameSize, m_galCanvas = new EDA_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_FrameSize,
EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL ); EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL );
// Hide by default, it has to be explicitly shown
m_galCanvas->Hide();
m_auxiliaryToolBar = NULL; m_auxiliaryToolBar = NULL;
} }

6
pcbnew/moduleframe.cpp
View File

@ -224,11 +224,13 @@ FOOTPRINT_EDIT_FRAME::FOOTPRINT_EDIT_FRAME( PCB_EDIT_FRAME* aParent, FP_LIB_TABL
m_auimgr.AddPane( m_auxiliaryToolBar, m_auimgr.AddPane( m_auxiliaryToolBar,
wxAuiPaneInfo( horiz ).Name( wxT( "m_auxiliaryToolBar" ) ).Top().Row( 1 ) ); wxAuiPaneInfo( horiz ).Name( wxT( "m_auxiliaryToolBar" ) ).Top().Row( 1 ) );
// The main right vertical toolbar
m_auimgr.AddPane( m_drawToolBar, m_auimgr.AddPane( m_drawToolBar,
wxAuiPaneInfo( vert ).Name( wxT( "m_VToolBar" ) ).Right() ); wxAuiPaneInfo( vert ).Name( wxT( "m_VToolBar" ) ).Right().Layer(1) );
// The left vertical toolbar (fast acces to display options)
m_auimgr.AddPane( m_optionsToolBar, m_auimgr.AddPane( m_optionsToolBar,
wxAuiPaneInfo( vert ).Name( wxT( "m_optionsToolBar" ) ). Left() ); wxAuiPaneInfo( vert ).Name( wxT( "m_optionsToolBar" ) ). Left().Layer(1) );
m_auimgr.AddPane( m_canvas, m_auimgr.AddPane( m_canvas,
wxAuiPaneInfo().Name( wxT( "DrawFrame" ) ).CentrePane() ); wxAuiPaneInfo().Name( wxT( "DrawFrame" ) ).CentrePane() );

1
pcbnew/router/pns_node.h
View File

@ -49,6 +49,7 @@ class PNS_CLEARANCE_FUNC
{ {
public: public:
virtual int operator()( const PNS_ITEM* a, const PNS_ITEM* b ) = 0; virtual int operator()( const PNS_ITEM* a, const PNS_ITEM* b ) = 0;
virtual ~PNS_CLEARANCE_FUNC() {}
}; };
/** /**