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
c4f1a36a
Commit
c4f1a36a
authored
Nov 08, 2007
by
CHARRAS
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed infospgm.cpp compil proble under gcc 4.2
parent
dbfa52ec
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
23 deletions
+21
-23
drawtxt.cpp
common/drawtxt.cpp
+13
-14
infospgm.cpp
share/infospgm.cpp
+8
-9
No files found.
common/drawtxt.cpp
View file @
c4f1a36a
/************************************************/
/************************************************
*
/
/* drawtxt.cpp :
trace des textes de composan
ts */
/* drawtxt.cpp :
Function to draw and plot tex
ts */
/************************************************/
/************************************************
*
/
#include "fctsys.h"
#include "fctsys.h"
#include "gr_basic.h"
#include "gr_basic.h"
...
@@ -45,10 +45,10 @@ int size_h , size_v , espacement ;
...
@@ -45,10 +45,10 @@ int size_h , size_v , espacement ;
SH_CODE
f_cod
,
plume
=
'U'
;
SH_CODE
f_cod
,
plume
=
'U'
;
const
SH_CODE
*
ptcar
;
const
SH_CODE
*
ptcar
;
int
ptr
;
int
ptr
;
int
ux0
,
uy0
,
dx
,
dy
;
//
Coord de trace des segments de texte & variables de calcul */
int
ux0
,
uy0
,
dx
,
dy
;
//
Draw coordinate for segments to draw. also used in some other calculation
int
cX
,
cY
;
//
Centre du texte
int
cX
,
cY
;
//
Texte center
int
ox
,
oy
;
//
coord de trace du caractere courant
int
ox
,
oy
;
//
Draw coordinates for the current char
int
coord
[
100
];
//
liste des coord des segments a tracer
int
coord
[
100
];
//
Buffer coordinate used to draw polylines (char shapes)
bool
sketch_mode
=
FALSE
;
bool
sketch_mode
=
FALSE
;
zoom
=
panel
->
GetZoom
();
zoom
=
panel
->
GetZoom
();
...
@@ -63,14 +63,13 @@ bool sketch_mode = FALSE;
...
@@ -63,14 +63,13 @@ bool sketch_mode = FALSE;
}
}
kk
=
0
;
ptr
=
0
;
/* ptr = text index */
kk
=
0
;
ptr
=
0
;
/* ptr = text index */
/* calcul de la position du debut des textes: ox et oy */
nbchar
=
Text
.
Len
();
nbchar
=
Text
.
Len
();
if
(
nbchar
==
0
)
return
;
if
(
nbchar
==
0
)
return
;
espacement
=
(
10
*
size_h
)
/
9
;
espacement
=
(
10
*
size_h
)
/
9
;
// this is the pitch between chars
ox
=
cX
=
Pos
.
x
;
oy
=
cY
=
Pos
.
y
;
ox
=
cX
=
Pos
.
x
;
oy
=
cY
=
Pos
.
y
;
/*
Si le texte est totalement hors fenetre d'affichage, termin
! */
/*
Do not draw the text if out of draw area
! */
if
(
panel
)
if
(
panel
)
{
{
int
xm
,
ym
,
ll
,
xc
,
yc
;
int
xm
,
ym
,
ll
,
xc
,
yc
;
...
@@ -89,13 +88,13 @@ bool sketch_mode = FALSE;
...
@@ -89,13 +88,13 @@ bool sketch_mode = FALSE;
}
}
/* C
alcul du cadrage du texte
*/
/* C
ompute the position ux0, uy0 of the first letter , next
*/
dx
=
(
espacement
*
nbchar
)
/
2
;
dx
=
(
espacement
*
nbchar
)
/
2
;
dy
=
size_v
/
2
;
/*
Decalage du debut du texte / centre
*/
dy
=
size_v
/
2
;
/*
dx, dy = draw offset between first letter and text center
*/
ux0
=
uy0
=
0
;
/* Decalage du centre du texte / coord de ref */
ux0
=
uy0
=
0
;
/* Decalage du centre du texte / coord de ref */
if
(
(
orient
==
0
)
||
(
orient
==
1800
)
)
/*
Texte Horizontal
*/
if
(
(
orient
==
0
)
||
(
orient
==
1800
)
)
/*
Horizontal Text
*/
{
{
switch
(
h_justify
)
switch
(
h_justify
)
{
{
...
@@ -126,7 +125,7 @@ bool sketch_mode = FALSE;
...
@@ -126,7 +125,7 @@ bool sketch_mode = FALSE;
}
}
}
}
else
/*
Texte Vertical
*/
else
/*
Vertical Text
*/
{
{
switch
(
h_justify
)
switch
(
h_justify
)
{
{
...
...
share/infospgm.cpp
View file @
c4f1a36a
/****************************************************/
/****************************************************/
/*
Affichage du panneau d'information
(copyright..) */
/*
Display a generic info about kikac
(copyright..) */
/* Comm
un a CVPCB, EESCHEMA et PCBNEW
*/
/* Comm
on tp CVPCB, EESCHEMA, PCBNEW and GERBVIEW
*/
/****************************************************/
/****************************************************/
#include "fctsys.h"
#include "fctsys.h"
...
@@ -14,26 +14,25 @@
...
@@ -14,26 +14,25 @@
// Import:
// Import:
extern
wxString
g_Main_Title
;
extern
wxString
g_Main_Title
;
wxString
MsgInfos
;
// Local
#ifdef GERBVIEW
#ifdef GERBVIEW
MsgInfos
=
wxT
(
"** GERBVIEW (jul 2001 .. 2007) **"
);
static
wxString
MsgInfos
(
wxT
(
"** GERBVIEW (jul 2001 .. 2007) **"
)
);
#else
#else
#ifdef PCBNEW
#ifdef PCBNEW
MsgInfos
=
wxT
(
"** PCBNEW (sept 1992 .. 2007) **"
);
static
wxString
MsgInfos
(
wxT
(
"** PCBNEW (sept 1992 .. 2007) **"
)
);
#endif
#endif
#endif
#endif
#ifdef CVPCB
#ifdef CVPCB
MsgInfos
=
wxT
(
"** CVPCB (sept 1992 .. 2007) **"
);
static
wxString
MsgInfos
(
wxT
(
"** CVPCB (sept 1992 .. 2007) **"
)
);
#endif
#endif
#ifdef KICAD
#ifdef KICAD
MsgInfos
=
wxT
(
"** KICAD (jul 2000 .. 2007) **"
);
static
wxString
MsgInfos
(
wxT
(
"** KICAD (jul 2000 .. 2007) **"
)
);
#endif
#endif
#ifdef EESCHEMA
#ifdef EESCHEMA
MsgInfos
=
wxT
(
"** EESCHEMA (sept 1994 .. 2007) **"
);
static
wxString
MsgInfos
(
wxT
(
"** EESCHEMA (sept 1994 .. 2007) **"
)
);
#endif
#endif
// Routines Locales
// Routines Locales
...
...
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