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
59d33db4
Commit
59d33db4
authored
Sep 12, 2010
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Plain Diff
fixed compil errors with USE_WX_ZOOM on.
parents
a13ddf38
1b0da6c3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
class_pad_draw_functions.cpp
pcbnew/class_pad_draw_functions.cpp
+3
-3
dialog_pad_properties.cpp
pcbnew/dialog_pad_properties.cpp
+1
-1
No files found.
pcbnew/class_pad_draw_functions.cpp
View file @
59d33db4
...
...
@@ -487,7 +487,7 @@ void D_PAD::DrawShape( EDA_Rect* aClipBox, wxDC* aDC, PAD_DRAWINFO& aDrawInfo )
case
PAD_CIRCLE
:
#ifdef USE_WX_ZOOM
if
(
DC
->
LogicalToDeviceXRel
(
hole
)
>
1
)
if
(
a
DC
->
LogicalToDeviceXRel
(
hole
)
>
1
)
#else
if
(
aDrawInfo
.
m_Scale
*
hole
>
1
)
/* draw hole if its size is enough */
#endif
...
...
@@ -602,7 +602,7 @@ void D_PAD::DrawShape( EDA_Rect* aClipBox, wxDC* aDC, PAD_DRAWINFO& aDrawInfo )
#define CHAR_SIZE_MIN 5
#ifdef USE_WX_ZOOM
if
(
DC
->
LogicalToDeviceXRel
(
tsize
)
>=
CHAR_SIZE_MIN
)
// Not drawable when size too small.
if
(
a
DC
->
LogicalToDeviceXRel
(
tsize
)
>=
CHAR_SIZE_MIN
)
// Not drawable when size too small.
#else
if
(
aDrawInfo
.
m_Scale
*
tsize
>=
CHAR_SIZE_MIN
)
// Not drawable when size too small.
#endif
...
...
@@ -624,7 +624,7 @@ void D_PAD::DrawShape( EDA_Rect* aClipBox, wxDC* aDC, PAD_DRAWINFO& aDrawInfo )
tsize
=
min
(
AreaSize
.
y
,
AreaSize
.
x
/
shortname_len
);
#ifdef USE_WX_ZOOM
if
(
DC
->
LogicalToDeviceXRel
(
tsize
)
>=
CHAR_SIZE_MIN
)
// Not drawable in size too small.
if
(
a
DC
->
LogicalToDeviceXRel
(
tsize
)
>=
CHAR_SIZE_MIN
)
// Not drawable in size too small.
#else
if
(
aDrawInfo
.
m_Scale
*
tsize
>=
CHAR_SIZE_MIN
)
// Not drawable in size too small.
#endif
...
...
pcbnew/dialog_pad_properties.cpp
View file @
59d33db4
...
...
@@ -132,9 +132,9 @@ void DIALOG_PAD_PROPERTIES::OnPaintShowPanel( wxPaintEvent& event )
// Give a margin
scale
*=
0.7
;
dc
.
SetUserScale
(
scale
,
scale
);
drawInfo
.
m_Scale
=
scale
;
#ifndef USE_WX_ZOOM
drawInfo
.
m_Scale
=
scale
;
wxPoint
org
=
ActiveScreen
->
m_DrawOrg
;
wxPoint
strt
=
ActiveScreen
->
m_StartVisu
;
int
pzoom
=
ActiveScreen
->
GetZoom
();
...
...
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