Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
28b93176
Commit
28b93176
authored
Nov 01, 2013
by
Orson
Committed by
jean-pierre charras
Nov 01, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix redraw issue in modedit a modview, with GAL
parent
53e04ce7
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
8 deletions
+14
-8
CMakeLists.txt
CMakeLists.txt
+5
-2
class_DisplayFootprintsFrame.cpp
cvpcb/class_DisplayFootprintsFrame.cpp
+0
-2
shape_line_chain.h
include/geometry/shape_line_chain.h
+2
-2
basepcbframe.cpp
pcbnew/basepcbframe.cpp
+2
-0
moduleframe.cpp
pcbnew/moduleframe.cpp
+4
-2
pns_node.h
pcbnew/router/pns_node.h
+1
-0
No files found.
CMakeLists.txt
View file @
28b93176
...
...
@@ -39,7 +39,7 @@ option( KICAD_SCRIPTING_MODULES
option
(
KICAD_SCRIPTING_WXPYTHON
"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:
# PYTHON_EXECUTABLE can be defined when invoking cmake
# ( use -DPYTHON_EXECUTABLE=<python path>/python.exe or python2 )
...
...
@@ -65,6 +65,9 @@ endif()
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."
)
#Add option to add user directories for linker, if any
LINK_DIRECTORIES
(
${
LINK_DIRECTORIES_PATH
}
)
if
(
UNIX
)
set
(
KICAD_USER_CONFIG_DIR $ENV{HOME} CACHE PATH
"Location of user specifig KiCad config files"
)
elseif
(
MINGW
)
...
...
@@ -230,7 +233,7 @@ include( ExternalProject )
#================================================
include
(
CheckFindPackageResult
)
# Turn on wxWidgets compatibility mode for some classes
# Turn on wxWidgets compatibility mode for some classes
add_definitions
(
-DWX_COMPATIBILITY
)
#######################
...
...
cvpcb/class_DisplayFootprintsFrame.cpp
View file @
28b93176
...
...
@@ -122,8 +122,6 @@ DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( CVPCB_MAINFRAME* parent,
EDA_PANEINFO
mesg
;
mesg
.
MessageToolbarPane
();
m_galCanvas
->
Hide
();
m_auimgr
.
AddPane
(
m_mainToolBar
,
wxAuiPaneInfo
(
horiz
).
Name
(
wxT
(
"m_mainToolBar"
)
).
Top
().
Row
(
0
)
);
...
...
include/geometry/shape_line_chain.h
View file @
28b93176
...
...
@@ -188,7 +188,7 @@ public:
if
(
aIndex
<
0
)
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
);
else
return
SEG
(
m_points
[
aIndex
],
m_points
[
aIndex
+
1
],
aIndex
);
...
...
@@ -207,7 +207,7 @@ public:
if
(
aIndex
<
0
)
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
]
),
const_cast
<
VECTOR2I
&>
(
m_points
[
0
]
),
aIndex
);
else
...
...
pcbnew/basepcbframe.cpp
View file @
28b93176
...
...
@@ -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
,
EDA_DRAW_PANEL_GAL
::
GAL_TYPE_OPENGL
);
// Hide by default, it has to be explicitly shown
m_galCanvas
->
Hide
();
m_auxiliaryToolBar
=
NULL
;
}
...
...
pcbnew/moduleframe.cpp
View file @
28b93176
...
...
@@ -224,11 +224,13 @@ FOOTPRINT_EDIT_FRAME::FOOTPRINT_EDIT_FRAME( PCB_EDIT_FRAME* aParent, FP_LIB_TABL
m_auimgr
.
AddPane
(
m_auxiliaryToolBar
,
wxAuiPaneInfo
(
horiz
).
Name
(
wxT
(
"m_auxiliaryToolBar"
)
).
Top
().
Row
(
1
)
);
// The main right vertical toolbar
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
,
wxAuiPaneInfo
(
vert
).
Name
(
wxT
(
"m_optionsToolBar"
)
).
Left
()
);
wxAuiPaneInfo
(
vert
).
Name
(
wxT
(
"m_optionsToolBar"
)
).
Left
()
.
Layer
(
1
)
);
m_auimgr
.
AddPane
(
m_canvas
,
wxAuiPaneInfo
().
Name
(
wxT
(
"DrawFrame"
)
).
CentrePane
()
);
...
...
pcbnew/router/pns_node.h
View file @
28b93176
...
...
@@ -49,6 +49,7 @@ class PNS_CLEARANCE_FUNC
{
public
:
virtual
int
operator
()(
const
PNS_ITEM
*
a
,
const
PNS_ITEM
*
b
)
=
0
;
virtual
~
PNS_CLEARANCE_FUNC
()
{}
};
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment