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
1a6b90d0
Commit
1a6b90d0
authored
Nov 23, 2009
by
charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix last French to English translations problems
parent
d2eac37d
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
51 additions
and
50 deletions
+51
-50
pcbcommon.cpp
common/pcbcommon.cpp
+1
-1
listlib.cpp
cvpcb/listlib.cpp
+2
-2
class_text_mod.cpp
pcbnew/class_text_mod.cpp
+36
-37
muonde.cpp
pcbnew/muonde.cpp
+6
-4
netlist.cpp
pcbnew/netlist.cpp
+3
-5
solve.cpp
pcbnew/solve.cpp
+3
-1
No files found.
common/pcbcommon.cpp
View file @
1a6b90d0
...
@@ -58,7 +58,7 @@ int g_TabAllCopperLayerMask[NB_COPPER_LAYERS] = {
...
@@ -58,7 +58,7 @@ int g_TabAllCopperLayerMask[NB_COPPER_LAYERS] = {
};
};
wxString
g_ViaType_Name
[
4
]
=
{
wxString
g_ViaType_Name
[
4
]
=
{
_
(
"??? Via"
),
// Not used yet
_
(
"??? Via"
),
// Not used yet
, do not exists
_
(
"Micro Via"
),
// from external layer (TOP or BOTTOM) from
_
(
"Micro Via"
),
// from external layer (TOP or BOTTOM) from
// the near neighbor inner layer only
// the near neighbor inner layer only
_
(
"Blind/Buried Via"
),
// from inner or external to inner or external
_
(
"Blind/Buried Via"
),
// from inner or external to inner or external
...
...
cvpcb/listlib.cpp
View file @
1a6b90d0
...
@@ -4,8 +4,8 @@
...
@@ -4,8 +4,8 @@
/*
/*
*
Searches for all ref <path lib> *.??? if offering their file name,
*
Functions to read footprint libraries and create the list of availlable footprints
*
or reviews <path lib> [MODULE.LIB]
*
and their documentation (comments and keywords)
*/
*/
#include "fctsys.h"
#include "fctsys.h"
#include "wxstruct.h"
#include "wxstruct.h"
...
...
pcbnew/class_text_mod.cpp
View file @
1a6b90d0
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
/*******************************************************************/
/*******************************************************************/
TEXTE_MODULE
::
TEXTE_MODULE
(
MODULE
*
parent
,
int
text_type
)
:
TEXTE_MODULE
::
TEXTE_MODULE
(
MODULE
*
parent
,
int
text_type
)
:
BOARD_ITEM
(
parent
,
TYPE_TEXTE_MODULE
),
EDA_TextStruct
()
BOARD_ITEM
(
parent
,
TYPE_TEXTE_MODULE
),
EDA_TextStruct
()
{
{
MODULE
*
Module
=
(
MODULE
*
)
m_Parent
;
MODULE
*
Module
=
(
MODULE
*
)
m_Parent
;
...
@@ -110,7 +110,7 @@ int TEXTE_MODULE::ReadDescr( char* aLine, FILE* aFile, int* aLineNum )
...
@@ -110,7 +110,7 @@ int TEXTE_MODULE::ReadDescr( char* aLine, FILE* aFile, int* aLineNum )
BufCar1
[
0
]
=
0
;
BufCar1
[
0
]
=
0
;
BufCar2
[
0
]
=
0
;
BufCar2
[
0
]
=
0
;
BufCar3
[
0
]
=
0
;
BufCar3
[
0
]
=
0
;
if
(
sscanf
(
aLine
+
1
,
"%d %d %d %d %d %d %d %s %s %d %s"
,
if
(
sscanf
(
aLine
+
1
,
"%d %d %d %d %d %d %d %s %s %d %s"
,
&
type
,
&
type
,
&
m_Pos0
.
x
,
&
m_Pos0
.
y
,
&
m_Pos0
.
x
,
&
m_Pos0
.
y
,
&
m_Size
.
y
,
&
m_Size
.
x
,
&
m_Size
.
y
,
&
m_Size
.
x
,
...
@@ -124,7 +124,7 @@ int TEXTE_MODULE::ReadDescr( char* aLine, FILE* aFile, int* aLineNum )
...
@@ -124,7 +124,7 @@ int TEXTE_MODULE::ReadDescr( char* aLine, FILE* aFile, int* aLineNum )
// Due to the pcbnew history, .m_Orient is saved in screen value
// Due to the pcbnew history, .m_Orient is saved in screen value
// but it is handled as relative to its parent footprint
// but it is handled as relative to its parent footprint
m_Orient
-=
(
(
MODULE
*
)
m_Parent
)
->
m_Orient
;
m_Orient
-=
(
(
MODULE
*
)
m_Parent
)
->
m_Orient
;
if
(
BufCar1
[
0
]
==
'M'
)
if
(
BufCar1
[
0
]
==
'M'
)
m_Mirror
=
true
;
m_Mirror
=
true
;
else
else
...
@@ -336,7 +336,9 @@ void TEXTE_MODULE::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode,
...
@@ -336,7 +336,9 @@ void TEXTE_MODULE::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode,
wxPoint
pos
;
// Center of text
wxPoint
pos
;
// Center of text
PCB_SCREEN
*
screen
;
PCB_SCREEN
*
screen
;
WinEDA_BasePcbFrame
*
frame
;
WinEDA_BasePcbFrame
*
frame
;
MODULE
*
Module
=
(
MODULE
*
)
m_Parent
;
MODULE
*
Module
=
(
MODULE
*
)
m_Parent
;
/* parent must *not* be null
* (a module text without a footprint parent has no sense)
*/
if
(
panel
==
NULL
)
if
(
panel
==
NULL
)
...
@@ -371,18 +373,16 @@ void TEXTE_MODULE::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode,
...
@@ -371,18 +373,16 @@ void TEXTE_MODULE::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode,
pos
.
x
,
pos
.
y
+
anchor_size
,
0
,
g_AnchorColor
);
pos
.
x
,
pos
.
y
+
anchor_size
,
0
,
g_AnchorColor
);
}
}
//@@@@IMB: BIG BIG BUG Here???? May Module be NULL?
color
=
g_DesignSettings
.
m_LayerColor
[
Module
->
GetLayer
()];
color
=
g_DesignSettings
.
m_LayerColor
[
Module
->
GetLayer
()];
//@@IMB: Why the next ifs are testing for Module?
if
(
Module
->
GetLayer
()
==
COPPER_LAYER_N
)
if
(
Module
&&
Module
->
GetLayer
()
==
COPPER_LAYER_N
)
{
{
if
(
g_DesignSettings
.
IsElementVisible
(
MODULE_TEXT_CU_VISIBLE
)
==
false
)
if
(
g_DesignSettings
.
IsElementVisible
(
MODULE_TEXT_CU_VISIBLE
)
==
false
)
return
;
return
;
color
=
g_ModuleTextCUColor
;
color
=
g_ModuleTextCUColor
;
}
}
else
if
(
Module
&&
Module
->
GetLayer
()
==
CMP_N
)
else
if
(
Module
->
GetLayer
()
==
CMP_N
)
{
{
if
(
g_DesignSettings
.
IsElementVisible
(
MODULE_TEXT_CMP_VISIBLE
)
==
false
)
if
(
g_DesignSettings
.
IsElementVisible
(
MODULE_TEXT_CMP_VISIBLE
)
==
false
)
return
;
return
;
...
@@ -419,12 +419,9 @@ int TEXTE_MODULE::GetDrawRotation()
...
@@ -419,12 +419,9 @@ int TEXTE_MODULE::GetDrawRotation()
NORMALIZE_ANGLE_POS
(
rotation
);
NORMALIZE_ANGLE_POS
(
rotation
);
// For angle = 0 .. 180 deg
// For angle = 0 .. 180 deg
// if( (rotation > 900 ) && (rotation < 2700 ) ) rotation -= 1800;
while
(
rotation
>
900
)
while
(
rotation
>
900
)
rotation
-=
1800
;
rotation
-=
1800
;
// For angle = -90 .. 90 deg
return
rotation
;
return
rotation
;
}
}
...
@@ -433,13 +430,15 @@ int TEXTE_MODULE::GetDrawRotation()
...
@@ -433,13 +430,15 @@ int TEXTE_MODULE::GetDrawRotation()
void
TEXTE_MODULE
::
DisplayInfo
(
WinEDA_DrawFrame
*
frame
)
void
TEXTE_MODULE
::
DisplayInfo
(
WinEDA_DrawFrame
*
frame
)
{
{
MODULE
*
module
=
(
MODULE
*
)
m_Parent
;
MODULE
*
module
=
(
MODULE
*
)
m_Parent
;
if
(
module
==
NULL
)
// Happens in modedit, and for new texts
if
(
module
==
NULL
)
// Happens in modedit, and for new texts
return
;
return
;
wxString
msg
,
Line
;
wxString
msg
,
Line
;
int
ii
;
int
ii
;
static
const
wxString
text_type_msg
[
3
]
=
{
static
const
wxString
text_type_msg
[
3
]
=
{
_
(
"Ref."
),
_
(
"Value"
),
_
(
"Text"
)
_
(
"Ref."
),
_
(
"Value"
),
_
(
"Text"
)
};
};
...
@@ -523,7 +522,7 @@ bool TEXTE_MODULE::IsOnLayer( int aLayer ) const
...
@@ -523,7 +522,7 @@ bool TEXTE_MODULE::IsOnLayer( int aLayer ) const
*/
*/
#if defined
(DEBUG)
#if defined(DEBUG)
/**
/**
* Function Show
* Function Show
...
...
pcbnew/muonde.cpp
View file @
1a6b90d0
...
@@ -29,7 +29,7 @@ static EDGE_MODULE* gen_arc( MODULE* aModule,
...
@@ -29,7 +29,7 @@ static EDGE_MODULE* gen_arc( MODULE* aModule,
int
cX
,
int
cX
,
int
cY
,
int
cY
,
int
angle
);
int
angle
);
static
void
Show
CadreSelf
(
WinEDA_DrawPanel
*
panel
,
static
void
Show
BoundingBoxMicroWaveInductor
(
WinEDA_DrawPanel
*
panel
,
wxDC
*
DC
,
wxDC
*
DC
,
bool
erase
);
bool
erase
);
...
@@ -57,8 +57,10 @@ static int Self_On;
...
@@ -57,8 +57,10 @@ static int Self_On;
static
int
Bl_X0
,
Bl_Y0
,
Bl_Xf
,
Bl_Yf
;
static
int
Bl_X0
,
Bl_Y0
,
Bl_Xf
,
Bl_Yf
;
/* ??? Routine d'affichage a l'ecran du cadre de la self */
/* This function shows on screen the bounding box of the inductor that will be
static
void
ShowCadreSelf
(
WinEDA_DrawPanel
*
panel
,
wxDC
*
DC
,
bool
erase
)
* created at the end of the build inductor process
*/
static
void
ShowBoundingBoxMicroWaveInductor
(
WinEDA_DrawPanel
*
panel
,
wxDC
*
DC
,
bool
erase
)
{
{
int
deltaX
,
deltaY
;
int
deltaX
,
deltaY
;
...
@@ -132,7 +134,7 @@ void WinEDA_PcbFrame::Begin_Self( wxDC* DC )
...
@@ -132,7 +134,7 @@ void WinEDA_PcbFrame::Begin_Self( wxDC* DC )
Bl_Xf
=
Bl_X0
;
Bl_Xf
=
Bl_X0
;
Bl_Yf
=
Bl_Y0
;
Bl_Yf
=
Bl_Y0
;
DrawPanel
->
ManageCurseur
=
Show
CadreSelf
;
DrawPanel
->
ManageCurseur
=
Show
BoundingBoxMicroWaveInductor
;
DrawPanel
->
ForceCloseManageCurseur
=
Exit_Self
;
DrawPanel
->
ForceCloseManageCurseur
=
Exit_Self
;
DrawPanel
->
ManageCurseur
(
DrawPanel
,
DC
,
0
);
DrawPanel
->
ManageCurseur
(
DrawPanel
,
DC
,
0
);
}
}
...
...
pcbnew/netlist.cpp
View file @
1a6b90d0
...
@@ -959,12 +959,10 @@ int ReadListeModules( const wxString& CmpFullFileName, const wxString* RefCmp,
...
@@ -959,12 +959,10 @@ int ReadListeModules( const wxString& CmpFullFileName, const wxString* RefCmp,
}
}
/*
??? Fontion copiant en memoire de travail les caracteristiques
/*
This function add to the current list of footprints found in netlist
*
des nouveaux modules
*
a new MODULEtoLOAD item (a descriptor of footprints)
*/
*/
void
AddToList
(
const
wxString
&
NameLibCmp
,
void
AddToList
(
const
wxString
&
NameLibCmp
,
const
wxString
&
CmpName
,
const
wxString
&
path
)
const
wxString
&
CmpName
,
const
wxString
&
path
)
{
{
MODULEtoLOAD
*
NewMod
;
MODULEtoLOAD
*
NewMod
;
...
...
pcbnew/solve.cpp
View file @
1a6b90d0
...
@@ -1100,7 +1100,9 @@ static int Retrace( WinEDA_PcbFrame* pcbframe, wxDC* DC,
...
@@ -1100,7 +1100,9 @@ static int Retrace( WinEDA_PcbFrame* pcbframe, wxDC* DC,
}
}
/* ??? appelle la routine OrCell et place la piste reelle sur le pcb */
/* This function is used by Retrace and read the autorouting matrix data cells to create
* the real track on the physical board
*/
static
void
OrCell_Trace
(
BOARD
*
pcb
,
int
col
,
int
row
,
static
void
OrCell_Trace
(
BOARD
*
pcb
,
int
col
,
int
row
,
int
side
,
int
orient
,
int
current_net_code
)
int
side
,
int
orient
,
int
current_net_code
)
{
{
...
...
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