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
69756df3
Commit
69756df3
authored
Feb 16, 2009
by
charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some update for Kicad Release Candidate 1
parent
aa541fcb
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
119 additions
and
50 deletions
+119
-50
AUTHORS.txt
AUTHORS.txt
+48
-0
gr_basic.cpp
common/gr_basic.cpp
+65
-44
build_version.h
include/build_version.h
+2
-2
install.nsi
nsis_win_installer/install.nsi
+2
-2
version.txt
version.txt
+2
-2
No files found.
AUTHORS.txt
0 → 100644
View file @
69756df3
* Copyright (C) 1992-2008 Jean-Pierre Charras, jean-pierre.charras@inpg.fr
* Copyright (C) 1992-2008 Kicad Developers
* under GNU General Public License (see copyright.txt)
Main author:
Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
Maitre de Conferences
IUT1 GEII2
Universite Joseph Fourier (U.J.F.)
Saint Martin d'Hres (38402)
Laboratiore GIPSA-Lab
Saint Martin d'Hres
Contributors
Dick Hollenbeck <dick@softplc.com>
Jerry Jacobs <jerkejacobs@gmail.com>
Jonas Diemer <diemer@gmx.de>
KBool Library http://boolean.klaasholwerda.nl/bool.html
Rok Markovic <rok@kanardia.eu>
Tim Hanson <sideskate@gmail.com>
Vesa Solonen <vesa.solonen@hut.fi>
Wayne Stambaugh <stambaughw@verizon.net>
See also CHANGELOG.txt for contributors.
Document writers
Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
Igor Plyatov <plyatov@gmail.com>
Translators
Czech (CZ) Martin Kratoška <martin@ok1rr.com>
Dutch (NL) Jerry Jacobs <jerkejacobs@gmail.com>
French (FR) Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
Polish (PL) Mateusz Skowroński <skowri@gmail.com>
Portuguese (PT) Renie Marquet <reniemarquet@uol.com.br>"
Russian (RU) Igor Plyatov <plyatov@gmail.com>
Spanish (ES) Pedro Martin del Valle <pkicad@yahoo.es>
Spanish (ES) Iñigo Zuluaga <inigo_zuluaga@yahoo.es>
Remy Halvick
David Briscoe
Dominique Laigle
Paul Burke
Programm credits for icons and others
Icons by Iñigo Zuluaga
3D modules by Renie Marquet <reniemarquet@uol.com.br>
common/gr_basic.cpp
View file @
69756df3
...
...
@@ -15,6 +15,21 @@
#define FILLED 1
#endif
/* Important Note:
* These drawing functions clip draw item before send these items to wxDC draw functions.
* For guy who aks why i did it, see a sample of problems encounted when pixels
* coordinates overflow 16 bits values:
* http://trac.wxwidgets.org/ticket/10446
* Problems can be found under Windows **and** Linux (mainly when drawing arcs)
* (mainly at low zoom values (2, 1 or 0.5), in pcbnew)
* some of these problems could be now fixed in recent distributions.
*
* Currently (feb 2009) there are overflow problems when drawing solid (filled) polygons under linux without clipping
*
* So before removing cliping functions, be aware these bug (they are not in kicad or wxWidgets)
* are fixed by testing how are drawn complex lines arcs and solid polygons under Windows and Linux
* and remember users can have old versions with bugs
*/
/* global variables */
extern
BASE_SCREEN
*
ActiveScreen
;
...
...
@@ -58,8 +73,8 @@ static inline int USCALE( us arg, us num, us den )
#endif
}
static
int
inline
ZoomValue
(
int
val
)
{
static
int
inline
ZoomValue
(
int
val
)
{
return
ActiveScreen
->
Scale
(
val
);
}
...
...
@@ -253,7 +268,7 @@ void SetPenMinWidth( int minwidth )
/**
* Function GRSetColorPen
* sets a pen style, width, color, and alpha into the given device context.
*/
*/
void
GRSetColorPen
(
wxDC
*
DC
,
int
Color
,
int
width
,
int
style
)
{
if
(
width
<
PenMinWidth
)
...
...
@@ -313,6 +328,7 @@ void GRSetBrush( wxDC* DC, int Color, int fill )
/*************************************/
void
GRForceBlackPen
(
bool
flagforce
)
/*************************************/
/** function GRForceBlackPen
* @param flagforce True to force a black pen whenever the asked color
*/
...
...
@@ -320,9 +336,11 @@ void GRForceBlackPen( bool flagforce )
ForceBlackPen
=
flagforce
;
}
/***********************************/
bool
GetGRForceBlackPenState
(
void
)
/***********************************/
/** function GetGRForceBlackPenState
* @return ForceBlackPen (True if a black pen was forced)
*/
...
...
@@ -337,9 +355,11 @@ bool GetGRForceBlackPenState( void )
void
GRSetDrawMode
(
wxDC
*
DC
,
int
draw_mode
)
{
if
(
draw_mode
&
GR_OR
)
#if defined(__WXMAC__) && wxMAC_USE_CORE_GRAPHICS
#if defined (__WXMAC__) && wxMAC_USE_CORE_GRAPHICS
DC
->
SetLogicalFunction
(
wxCOPY
);
#else
DC
->
SetLogicalFunction
(
wxOR
);
#endif
else
if
(
draw_mode
&
GR_XOR
)
...
...
@@ -861,7 +881,7 @@ static void GRSPoly( EDA_Rect* ClipBox, wxDC* DC, int n, wxPoint Points[], bool
}
else
{
wxPoint
endPt
=
Points
[
n
-
1
];
wxPoint
endPt
=
Points
[
n
-
1
];
GRSetBrush
(
DC
,
Color
);
DC
->
DrawLines
(
n
,
Points
);
...
...
@@ -869,7 +889,7 @@ static void GRSPoly( EDA_Rect* ClipBox, wxDC* DC, int n, wxPoint Points[], bool
// The last point is not drawn by DrawLine and DrawLines
// Add it if the polygon is not closed
if
(
endPt
!=
Points
[
0
]
)
DC
->
DrawPoint
(
endPt
.
x
,
endPt
.
y
);
DC
->
DrawPoint
(
endPt
.
x
,
endPt
.
y
);
}
}
...
...
@@ -887,7 +907,7 @@ static void GRSClosedPoly( EDA_Rect* ClipBox, wxDC* DC, int aPointCount, wxPoint
if
(
Fill
&&
(
aPointCount
>
2
)
)
{
GRSMoveTo
(
aPoints
[
aPointCount
-
1
].
x
,
aPoints
[
aPointCount
-
1
].
y
);
GRSMoveTo
(
aPoints
[
aPointCount
-
1
].
x
,
aPoints
[
aPointCount
-
1
].
y
);
GRSetBrush
(
DC
,
BgColor
,
FILLED
);
DC
->
DrawPolygon
(
aPointCount
,
aPoints
,
0
,
0
,
wxODDEVEN_RULE
);
}
...
...
@@ -897,21 +917,22 @@ static void GRSClosedPoly( EDA_Rect* ClipBox, wxDC* DC, int aPointCount, wxPoint
DC
->
DrawLines
(
aPointCount
,
aPoints
);
/* Fermeture du polygone */
if
(
aPoints
[
aPointCount
-
1
]
!=
aPoints
[
0
]
)
if
(
aPoints
[
aPointCount
-
1
]
!=
aPoints
[
0
]
)
{
GRSLine
(
ClipBox
,
DC
,
aPoints
[
0
].
x
,
aPoints
[
0
].
y
,
aPoints
[
aPointCount
-
1
].
x
,
aPoints
[
aPointCount
-
1
].
y
,
width
,
Color
);
aPoints
[
aPointCount
-
1
].
x
,
aPoints
[
aPointCount
-
1
].
y
,
width
,
Color
);
}
}
}
/* not used
static void GRSClosedPoly( EDA_Rect* ClipBox, wxDC* DC, int n, wxPoint Points[],
bool Fill, int Color, int BgColor )
{
GRSClosedPoly( ClipBox, DC, n, Points, Fill, 0, Color, BgColor );
}
*/
*
static void GRSClosedPoly( EDA_Rect* ClipBox, wxDC* DC, int n, wxPoint Points[],
*
bool Fill, int Color, int BgColor )
*
{
*
GRSClosedPoly( ClipBox, DC, n, Points, Fill, 0, Color, BgColor );
*
}
*/
/************************************************************************/
...
...
@@ -920,7 +941,7 @@ static void GRSClosedPoly( EDA_Rect* ClipBox, wxDC* DC, int n, wxPoint Points[],
void
GRPoly
(
EDA_Rect
*
ClipBox
,
wxDC
*
DC
,
int
n
,
wxPoint
Points
[],
bool
Fill
,
int
width
,
int
Color
,
int
BgColor
)
{
for
(
int
i
=
0
;
i
<
n
;
++
i
)
for
(
int
i
=
0
;
i
<
n
;
++
i
)
{
Points
[
i
].
x
=
GRMapX
(
Points
[
i
].
x
);
Points
[
i
].
y
=
GRMapY
(
Points
[
i
].
y
);
...
...
@@ -944,7 +965,7 @@ void GRClosedPoly( EDA_Rect* ClipBox, wxDC* DC, int n, wxPoint Points[],
void
GRClosedPoly
(
EDA_Rect
*
ClipBox
,
wxDC
*
DC
,
int
n
,
wxPoint
Points
[],
bool
Fill
,
int
width
,
int
Color
,
int
BgColor
)
{
for
(
int
i
=
0
;
i
<
n
;
++
i
)
for
(
int
i
=
0
;
i
<
n
;
++
i
)
{
Points
[
i
].
x
=
GRMapX
(
Points
[
i
].
x
);
Points
[
i
].
y
=
GRMapY
(
Points
[
i
].
y
);
...
...
include/build_version.h
View file @
69756df3
...
...
@@ -9,7 +9,7 @@ COMMON_GLOBL wxString g_BuildVersion
# include "config.h"
(
wxT
(
KICAD_SVN_VERSION
))
# else
(
wxT
(
"(2009021
4
-RC1)"
))
/* main program version */
(
wxT
(
"(2009021
6
-RC1)"
))
/* main program version */
# endif
#endif
;
...
...
@@ -20,7 +20,7 @@ COMMON_GLOBL wxString g_BuildAboutVersion
# include "config.h"
(
wxT
(
KICAD_ABOUT_VERSION
))
# else
(
wxT
(
"(2009021
4
-RC1)"
))
/* svn date & rev (normally overridden) */
(
wxT
(
"(2009021
6
-RC1)"
))
/* svn date & rev (normally overridden) */
# endif
#endif
;
...
...
nsis_win_installer/install.nsi
View file @
69756df3
...
...
@@ -17,12 +17,12 @@
; General Product Description Definitions
!define PRODUCT_NAME "KiCad"
!define PRODUCT_VERSION "200
8.08.25
"
!define PRODUCT_VERSION "200
9.02.16
"
!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
!define COMPANY_NAME ""
!define TRADE_MARKS ""
!define COPYRIGHT "
Jean-Pierre Charras
"
!define COPYRIGHT "
Kicad Team (Jean-Pierre Charras and others)
"
!define COMMENTS ""
!define HELP_WEB_SITE "http://groups.yahoo.com/group/kicad-users/"
!define DEVEL_WEB_SITE "http://groups.yahoo.com/group/kicad-devel/"
...
...
version.txt
View file @
69756df3
release version:
25 aug 2008
16 feb 2009
files (.zip,.tgz):
kicad-200
8-08-25
kicad-200
9-02-16-RC1
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