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
f3cc32f9
Commit
f3cc32f9
authored
Oct 17, 2012
by
Wayne Stambaugh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Put KiCad on a diet to remove the uncessary slices of pi. (fixes 1066194)
parent
f03b9048
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
16 deletions
+18
-16
fctsys.h
include/fctsys.h
+16
-14
muonde.cpp
pcbnew/muonde.cpp
+1
-1
zones_convert_brd_items_to_polygons_with_Boost.cpp
pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp
+1
-1
No files found.
include/fctsys.h
View file @
f3cc32f9
...
@@ -12,23 +12,23 @@
...
@@ -12,23 +12,23 @@
#endif
#endif
// for all others, include the necessary headers (this file is usually all you
// for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWi
ndow
s headers
// need because it includes almost all "standard" wxWi
dgets
s headers
#ifndef WX_PRECOMP
#ifndef WX_PRECOMP
#include <wx/wx.h>
#include <wx/wx.h>
#endif
#endif
/*
/*
*
*
FIXME:
This appears to already be included in the OSX build of wxWidgets.
*
@note
This appears to already be included in the OSX build of wxWidgets.
*
Will someone with OSX please remove this and see if it compiles.
*
Will someone with OSX please remove this and see if it compiles?
*/
*/
#ifdef __WXMAC__
#ifdef __WXMAC__
#include <Carbon/Carbon.h>
#include <Carbon/Carbon.h>
#endif
#endif
#ifndef M_PI
/**
#define M_PI 3.141592653
* @note Shouldn't we be using wxFileName::GetPathSeparator() instead of the following code
#endif
* for improved portability?
*/
#ifdef __WINDOWS__
#ifdef __WINDOWS__
#define DIR_SEP '\\'
#define DIR_SEP '\\'
#define STRING_DIR_SEP wxT( "\\" )
#define STRING_DIR_SEP wxT( "\\" )
...
@@ -37,6 +37,12 @@
...
@@ -37,6 +37,12 @@
#define STRING_DIR_SEP wxT( "/" )
#define STRING_DIR_SEP wxT( "/" )
#endif
#endif
/**
* @note Do we really need these defined again?
*/
#define UNIX_STRING_DIR_SEP wxT( "/" )
#define WIN_STRING_DIR_SEP wxT( "\\" )
#ifdef DEBUG
#ifdef DEBUG
#define D(x) x
#define D(x) x
#else
#else
...
@@ -63,18 +69,14 @@ template <typename T> inline const T& Clamp( const T& lower, const T& value, con
...
@@ -63,18 +69,14 @@ template <typename T> inline const T& Clamp( const T& lower, const T& value, con
return
value
;
return
value
;
}
}
#define UNIX_STRING_DIR_SEP wxT( "/" )
#define WIN_STRING_DIR_SEP wxT( "\\" )
#define USE_RESIZE_BORDER
#define USE_RESIZE_BORDER
#if defined(__UNIX__) || defined(USE_RESIZE_BORDER)
#if defined(__UNIX__) || defined(USE_RESIZE_BORDER)
#define MAYBE_RESIZE_BORDER wxRESIZE_BORDER // linux users like resizeable
#define MAYBE_RESIZE_BORDER wxRESIZE_BORDER // Linux users like resizeable borders
// borders
#else
#else
#define MAYBE_RESIZE_BORDER 0 // no resizeable border
#define MAYBE_RESIZE_BORDER 0 // no resizeable border
#endif
#endif
// wxNullPtr is not defined prior to wxWidget 2.9.0.
// wxNullPtr is not defined prior to wxWidget
s
2.9.0.
#if !wxCHECK_VERSION( 2, 9, 0 )
#if !wxCHECK_VERSION( 2, 9, 0 )
#define wxNullPtr ((void *)NULL)
#define wxNullPtr ((void *)NULL)
#endif
#endif
...
...
pcbnew/muonde.cpp
View file @
f3cc32f9
...
@@ -320,7 +320,7 @@ static void gen_arc( std::vector <wxPoint>& aBuffer,
...
@@ -320,7 +320,7 @@ static void gen_arc( std::vector <wxPoint>& aBuffer,
if
(
seg_count
==
0
)
if
(
seg_count
==
0
)
seg_count
=
1
;
seg_count
=
1
;
double
increment_angle
=
(
double
)
a_ArcAngle
*
3.14159
/
1800
/
seg_count
;
double
increment_angle
=
(
double
)
a_ArcAngle
*
M_PI
/
1800
/
seg_count
;
// Creates nb_seg point to approximate arc by segments:
// Creates nb_seg point to approximate arc by segments:
for
(
int
ii
=
1
;
ii
<=
seg_count
;
ii
++
)
for
(
int
ii
=
1
;
ii
<=
seg_count
;
ii
++
)
...
...
pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp
View file @
f3cc32f9
...
@@ -137,7 +137,7 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
...
@@ -137,7 +137,7 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
* For a circle the min radius is radius * cos( 2PI / s_CircleToSegmentsCount / 2)
* For a circle the min radius is radius * cos( 2PI / s_CircleToSegmentsCount / 2)
* s_Correction is 1 /cos( PI/s_CircleToSegmentsCount )
* s_Correction is 1 /cos( PI/s_CircleToSegmentsCount )
*/
*/
s_Correction
=
1.0
/
cos
(
3.14159265
/
s_CircleToSegmentsCount
);
s_Correction
=
1.0
/
cos
(
M_PI
/
s_CircleToSegmentsCount
);
// This KI_POLYGON_SET is the area(s) to fill, with m_ZoneMinThickness/2
// This KI_POLYGON_SET is the area(s) to fill, with m_ZoneMinThickness/2
KI_POLYGON_SET
polyset_zone_solid_areas
;
KI_POLYGON_SET
polyset_zone_solid_areas
;
...
...
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