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
e26cdada
Commit
e26cdada
authored
Sep 20, 2011
by
Wayne Stambaugh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Translate French code names and comments and other minor code cleaning.
parent
4230ac4c
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
488 additions
and
517 deletions
+488
-517
wxBasePcbFrame.h
include/wxBasePcbFrame.h
+1
-2
wxPcbStruct.h
include/wxPcbStruct.h
+3
-3
class_dimension.cpp
pcbnew/class_dimension.cpp
+251
-297
class_dimension.h
pcbnew/class_dimension.h
+17
-12
class_zone.h
pcbnew/class_zone.h
+81
-59
dimension.cpp
pcbnew/dimension.cpp
+79
-83
edit.cpp
pcbnew/edit.cpp
+7
-6
onleftclick.cpp
pcbnew/onleftclick.cpp
+9
-11
plot_rtn.cpp
pcbnew/plot_rtn.cpp
+40
-44
No files found.
include/wxBasePcbFrame.h
View file @
e26cdada
...
@@ -20,7 +20,6 @@
...
@@ -20,7 +20,6 @@
/* Forward declarations of classes. */
/* Forward declarations of classes. */
class
WinEDA_CvpcbFrame
;
class
FOOTPRINT_EDIT_FRAME
;
class
FOOTPRINT_EDIT_FRAME
;
class
BOARD
;
class
BOARD
;
class
MODULE
;
class
MODULE
;
...
@@ -461,7 +460,7 @@ public:
...
@@ -461,7 +460,7 @@ public:
bool
aPlotVia
,
GRTraceMode
aPlotMode
,
bool
aPlotVia
,
GRTraceMode
aPlotMode
,
bool
aSkipNPTH_Pads
=
false
);
bool
aSkipNPTH_Pads
=
false
);
void
Plot
_Serigraphie
(
PLOTTER
*
plotter
,
int
masque_layer
,
GRTraceMode
trace_mode
);
void
Plot
SilkScreen
(
PLOTTER
*
plotter
,
int
masque_layer
,
GRTraceMode
trace_mode
);
/**
/**
* Function PlotDrillMark
* Function PlotDrillMark
...
...
include/wxPcbStruct.h
View file @
e26cdada
...
@@ -1145,9 +1145,9 @@ public:
...
@@ -1145,9 +1145,9 @@ public:
void
Delete_Drawings_All_Layer
(
int
aLayer
);
void
Delete_Drawings_All_Layer
(
int
aLayer
);
// Dimension handling:
// Dimension handling:
void
Install_Edit_Dimension
(
DIMENSION
*
Dimension
,
wxDC
*
DC
);
void
ShowDimensionPropertyDialog
(
DIMENSION
*
aDimension
,
wxDC
*
a
DC
);
DIMENSION
*
Begin_Dimension
(
DIMENSION
*
Dimension
,
wxDC
*
DC
);
DIMENSION
*
EditDimension
(
DIMENSION
*
aDimension
,
wxDC
*
a
DC
);
void
Delete
_Dimension
(
DIMENSION
*
Dimension
,
wxDC
*
DC
);
void
Delete
Dimension
(
DIMENSION
*
aDimension
,
wxDC
*
a
DC
);
// netlist handling:
// netlist handling:
void
InstallNetlistFrame
(
wxDC
*
DC
);
void
InstallNetlistFrame
(
wxDC
*
DC
);
...
...
pcbnew/class_dimension.cpp
View file @
e26cdada
This diff is collapsed.
Click to expand it.
pcbnew/class_dimension.h
View file @
e26cdada
/******************************/
/**
/* DIMENSION class definition */
* @file class_dimension.h
/******************************/
* @brief DIMENSION class definition.
*/
#ifndef DIMENSION_H
#ifndef DIMENSION_H
#define DIMENSION_H
#define DIMENSION_H
#include "base_struct.h"
#include "class_board_item.h"
#include "richio.h"
class
EDA_RECT
;
class
READER
;
class
EDA_DRAW_PANEL
;
class
DIMENSION
:
public
BOARD_ITEM
class
DIMENSION
:
public
BOARD_ITEM
...
@@ -19,13 +24,13 @@ public:
...
@@ -19,13 +24,13 @@ public:
int
m_Value
;
/* value of PCB dimensions. */
int
m_Value
;
/* value of PCB dimensions. */
TEXTE_PCB
*
m_Text
;
TEXTE_PCB
*
m_Text
;
int
Barre_ox
,
Barre_oy
,
Barre_fx
,
Barre_f
y
;
int
m_crossBarOx
,
m_crossBarOy
,
m_crossBarFx
,
m_crossBarF
y
;
int
TraitG_ox
,
TraitG_oy
,
TraitG_fx
,
TraitG_f
y
;
int
m_featureLineGOx
,
m_featureLineGOy
,
m_featureLineGFx
,
m_featureLineGF
y
;
int
TraitD_ox
,
TraitD_oy
,
TraitD_fx
,
TraitD_f
y
;
int
m_featureLineDOx
,
m_featureLineDOy
,
m_featureLineDFx
,
m_featureLineDF
y
;
int
FlecheD1_ox
,
FlecheD1_oy
,
FlecheD1_fx
,
FlecheD1_f
y
;
int
m_arrowD1Ox
,
m_arrowD1Oy
,
m_arrowD1Fx
,
m_arrowD1F
y
;
int
FlecheD2_ox
,
FlecheD2_oy
,
FlecheD2_fx
,
FlecheD2_f
y
;
int
m_arrowD2Ox
,
m_arrowD2Oy
,
m_arrowD2Fx
,
m_arrowD2F
y
;
int
FlecheG1_ox
,
FlecheG1_oy
,
FlecheG1_fx
,
FlecheG1_f
y
;
int
m_arrowG1Ox
,
m_arrowG1Oy
,
m_arrowG1Fx
,
m_arrowG1F
y
;
int
FlecheG2_ox
,
FlecheG2_oy
,
FlecheG2_fx
,
FlecheG2_f
y
;
int
m_arrowG2Ox
,
m_arrowG2Oy
,
m_arrowG2Fx
,
m_arrowG2F
y
;
public
:
public
:
DIMENSION
(
BOARD_ITEM
*
aParent
);
DIMENSION
(
BOARD_ITEM
*
aParent
);
...
...
pcbnew/class_zone.h
View file @
e26cdada
This diff is collapsed.
Click to expand it.
pcbnew/dimension.cpp
View file @
e26cdada
This diff is collapsed.
Click to expand it.
pcbnew/edit.cpp
View file @
e26cdada
/**************************************/
/**
/* edit.cpp: edit PCB implementation. */
* @file edit.cpp
/**************************************/
* @brief Edit PCB implementation.
*/
#include "fctsys.h"
#include "fctsys.h"
#include "appl_wxstruct.h"
#include "appl_wxstruct.h"
...
@@ -897,12 +898,12 @@ void PCB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
...
@@ -897,12 +898,12 @@ void PCB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
case
ID_POPUP_PCB_DELETE_DIMENSION
:
case
ID_POPUP_PCB_DELETE_DIMENSION
:
DrawPanel
->
MoveCursorToCrossHair
();
DrawPanel
->
MoveCursorToCrossHair
();
Delete
_
Dimension
(
(
DIMENSION
*
)
GetCurItem
(),
&
dc
);
DeleteDimension
(
(
DIMENSION
*
)
GetCurItem
(),
&
dc
);
SetCurItem
(
NULL
);
SetCurItem
(
NULL
);
break
;
break
;
case
ID_POPUP_PCB_EDIT_DIMENSION
:
case
ID_POPUP_PCB_EDIT_DIMENSION
:
Install_Edit_Dimension
(
(
DIMENSION
*
)
GetCurItem
(),
&
dc
);
ShowDimensionPropertyDialog
(
(
DIMENSION
*
)
GetCurItem
(),
&
dc
);
DrawPanel
->
MoveCursorToCrossHair
();
DrawPanel
->
MoveCursorToCrossHair
();
break
;
break
;
...
@@ -1092,7 +1093,7 @@ void PCB_EDIT_FRAME::RemoveStruct( BOARD_ITEM* Item, wxDC* DC )
...
@@ -1092,7 +1093,7 @@ void PCB_EDIT_FRAME::RemoveStruct( BOARD_ITEM* Item, wxDC* DC )
break
;
break
;
case
TYPE_DIMENSION
:
case
TYPE_DIMENSION
:
Delete
_
Dimension
(
(
DIMENSION
*
)
Item
,
DC
);
DeleteDimension
(
(
DIMENSION
*
)
Item
,
DC
);
break
;
break
;
case
PCB_TARGET_T
:
case
PCB_TARGET_T
:
...
...
pcbnew/onleftclick.cpp
View file @
e26cdada
/**************************************************************/
/**
/* onleftclick.cpp: */
* @file pcbnew/onleftclick.cpp
/* function called when the left button is clicked (released) */
* @brief Functions called when the left button is clicked or double clicked.
/* function called when the left button is double clicked */
*/
/**************************************************************/
#include "fctsys.h"
#include "fctsys.h"
#include "class_drawpanel.h"
#include "class_drawpanel.h"
...
@@ -13,7 +12,7 @@
...
@@ -13,7 +12,7 @@
#include "pcbnew_id.h"
#include "pcbnew_id.h"
/* Handle the left butto
m
mouse click, when a tool is active
/* Handle the left butto
n
mouse click, when a tool is active
*/
*/
void
PCB_EDIT_FRAME
::
OnLeftClick
(
wxDC
*
aDC
,
const
wxPoint
&
aPosition
)
void
PCB_EDIT_FRAME
::
OnLeftClick
(
wxDC
*
aDC
,
const
wxPoint
&
aPosition
)
{
{
...
@@ -286,7 +285,7 @@ void PCB_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition )
...
@@ -286,7 +285,7 @@ void PCB_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition )
}
}
}
}
else
if
(
DrawStruct
&&
(
DrawStruct
->
Type
()
==
TYPE_ZONE_CONTAINER
)
&&
DrawStruct
->
IsNew
()
)
else
if
(
DrawStruct
&&
(
DrawStruct
->
Type
()
==
TYPE_ZONE_CONTAINER
)
&&
DrawStruct
->
IsNew
()
)
{
// Add a new corner to the current outline be
e
ing created:
{
// Add a new corner to the current outline being created:
DrawPanel
->
m_AutoPAN_Request
=
true
;
DrawPanel
->
m_AutoPAN_Request
=
true
;
Begin_Zone
(
aDC
);
Begin_Zone
(
aDC
);
DrawStruct
=
GetBoard
()
->
m_CurrentZoneContour
;
DrawStruct
=
GetBoard
()
->
m_CurrentZoneContour
;
...
@@ -349,13 +348,13 @@ void PCB_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition )
...
@@ -349,13 +348,13 @@ void PCB_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition )
if
(
(
DrawStruct
==
NULL
)
||
(
DrawStruct
->
m_Flags
==
0
)
)
if
(
(
DrawStruct
==
NULL
)
||
(
DrawStruct
->
m_Flags
==
0
)
)
{
{
DrawStruct
=
Begin_
Dimension
(
NULL
,
aDC
);
DrawStruct
=
Edit
Dimension
(
NULL
,
aDC
);
SetCurItem
(
DrawStruct
);
SetCurItem
(
DrawStruct
);
DrawPanel
->
m_AutoPAN_Request
=
true
;
DrawPanel
->
m_AutoPAN_Request
=
true
;
}
}
else
if
(
DrawStruct
&&
(
DrawStruct
->
Type
()
==
TYPE_DIMENSION
)
&&
DrawStruct
->
IsNew
()
)
else
if
(
DrawStruct
&&
(
DrawStruct
->
Type
()
==
TYPE_DIMENSION
)
&&
DrawStruct
->
IsNew
()
)
{
{
DrawStruct
=
Begin_
Dimension
(
(
DIMENSION
*
)
DrawStruct
,
aDC
);
DrawStruct
=
Edit
Dimension
(
(
DIMENSION
*
)
DrawStruct
,
aDC
);
SetCurItem
(
DrawStruct
);
SetCurItem
(
DrawStruct
);
DrawPanel
->
m_AutoPAN_Request
=
true
;
DrawPanel
->
m_AutoPAN_Request
=
true
;
}
}
...
@@ -535,7 +534,7 @@ void PCB_EDIT_FRAME::OnEditItemRequest( wxDC* aDC, BOARD_ITEM* aItem )
...
@@ -535,7 +534,7 @@ void PCB_EDIT_FRAME::OnEditItemRequest( wxDC* aDC, BOARD_ITEM* aItem )
break
;
break
;
case
TYPE_DIMENSION
:
case
TYPE_DIMENSION
:
Install_Edit_Dimension
(
(
DIMENSION
*
)
aItem
,
aDC
);
ShowDimensionPropertyDialog
(
(
DIMENSION
*
)
aItem
,
aDC
);
break
;
break
;
case
TYPE_TEXTE_MODULE
:
case
TYPE_TEXTE_MODULE
:
...
@@ -554,4 +553,3 @@ void PCB_EDIT_FRAME::OnEditItemRequest( wxDC* aDC, BOARD_ITEM* aItem )
...
@@ -554,4 +553,3 @@ void PCB_EDIT_FRAME::OnEditItemRequest( wxDC* aDC, BOARD_ITEM* aItem )
break
;
break
;
}
}
}
}
pcbnew/plot_rtn.cpp
View file @
e26cdada
/*************************/
/**
/* Common plot routines. */
* @file plot_rtn.cpp
/*************************/
* @brief Common plot routines.
*/
#include "fctsys.h"
#include "fctsys.h"
#include "common.h"
#include "common.h"
...
@@ -22,9 +23,7 @@ static void PlotTextModule( PLOTTER* plotter, TEXTE_MODULE* pt_texte,
...
@@ -22,9 +23,7 @@ static void PlotTextModule( PLOTTER* plotter, TEXTE_MODULE* pt_texte,
/* Creates the plot for silkscreen layers
/* Creates the plot for silkscreen layers
*/
*/
void
PCB_BASE_FRAME
::
Plot_Serigraphie
(
PLOTTER
*
plotter
,
void
PCB_BASE_FRAME
::
PlotSilkScreen
(
PLOTTER
*
plotter
,
int
aLayerMask
,
GRTraceMode
trace_mode
)
int
aLayerMask
,
GRTraceMode
trace_mode
)
{
{
bool
trace_val
,
trace_ref
;
bool
trace_val
,
trace_ref
;
TEXTE_MODULE
*
pt_texte
;
TEXTE_MODULE
*
pt_texte
;
...
@@ -56,7 +55,7 @@ void PCB_BASE_FRAME::Plot_Serigraphie( PLOTTER* plotter,
...
@@ -56,7 +55,7 @@ void PCB_BASE_FRAME::Plot_Serigraphie( PLOTTER* plotter,
break
;
break
;
default
:
default
:
DisplayError
(
this
,
wxT
(
"Plot
_Serigraphie
() error: unexpected Type()"
)
);
DisplayError
(
this
,
wxT
(
"Plot
SilkScreen
() error: unexpected Type()"
)
);
break
;
break
;
}
}
}
}
...
@@ -256,7 +255,7 @@ static void PlotTextModule( PLOTTER* plotter, TEXTE_MODULE* pt_texte, GRTraceMod
...
@@ -256,7 +255,7 @@ static void PlotTextModule( PLOTTER* plotter, TEXTE_MODULE* pt_texte, GRTraceMod
void
PlotDimension
(
PLOTTER
*
plotter
,
DIMENSION
*
Dimension
,
int
aLayerMask
,
void
PlotDimension
(
PLOTTER
*
plotter
,
DIMENSION
*
Dimension
,
int
aLayerMask
,
GRTraceMode
trace_mode
)
GRTraceMode
trace_mode
)
{
{
DRAWSEGMENT
*
DrawTmp
;
DRAWSEGMENT
*
DrawTmp
;
...
@@ -270,46 +269,46 @@ void PlotDimension( PLOTTER* plotter, DIMENSION* Dimension, int aLayerMask,
...
@@ -270,46 +269,46 @@ void PlotDimension( PLOTTER* plotter, DIMENSION* Dimension, int aLayerMask,
PlotTextePcb
(
plotter
,
Dimension
->
m_Text
,
aLayerMask
,
trace_mode
);
PlotTextePcb
(
plotter
,
Dimension
->
m_Text
,
aLayerMask
,
trace_mode
);
DrawTmp
->
m_Start
.
x
=
Dimension
->
Barre_o
x
;
DrawTmp
->
m_Start
.
x
=
Dimension
->
m_crossBarO
x
;
DrawTmp
->
m_Start
.
y
=
Dimension
->
Barre_o
y
;
DrawTmp
->
m_Start
.
y
=
Dimension
->
m_crossBarO
y
;
DrawTmp
->
m_End
.
x
=
Dimension
->
Barre_f
x
;
DrawTmp
->
m_End
.
x
=
Dimension
->
m_crossBarF
x
;
DrawTmp
->
m_End
.
y
=
Dimension
->
Barre_f
y
;
DrawTmp
->
m_End
.
y
=
Dimension
->
m_crossBarF
y
;
PlotDrawSegment
(
plotter
,
DrawTmp
,
aLayerMask
,
trace_mode
);
PlotDrawSegment
(
plotter
,
DrawTmp
,
aLayerMask
,
trace_mode
);
DrawTmp
->
m_Start
.
x
=
Dimension
->
TraitG_o
x
;
DrawTmp
->
m_Start
.
x
=
Dimension
->
m_featureLineGO
x
;
DrawTmp
->
m_Start
.
y
=
Dimension
->
TraitG_o
y
;
DrawTmp
->
m_Start
.
y
=
Dimension
->
m_featureLineGO
y
;
DrawTmp
->
m_End
.
x
=
Dimension
->
TraitG_f
x
;
DrawTmp
->
m_End
.
x
=
Dimension
->
m_featureLineGF
x
;
DrawTmp
->
m_End
.
y
=
Dimension
->
TraitG_f
y
;
DrawTmp
->
m_End
.
y
=
Dimension
->
m_featureLineGF
y
;
PlotDrawSegment
(
plotter
,
DrawTmp
,
aLayerMask
,
trace_mode
);
PlotDrawSegment
(
plotter
,
DrawTmp
,
aLayerMask
,
trace_mode
);
DrawTmp
->
m_Start
.
x
=
Dimension
->
TraitD_o
x
;
DrawTmp
->
m_Start
.
x
=
Dimension
->
m_featureLineDO
x
;
DrawTmp
->
m_Start
.
y
=
Dimension
->
TraitD_o
y
;
DrawTmp
->
m_Start
.
y
=
Dimension
->
m_featureLineDO
y
;
DrawTmp
->
m_End
.
x
=
Dimension
->
TraitD_f
x
;
DrawTmp
->
m_End
.
x
=
Dimension
->
m_featureLineDF
x
;
DrawTmp
->
m_End
.
y
=
Dimension
->
TraitD_f
y
;
DrawTmp
->
m_End
.
y
=
Dimension
->
m_featureLineDF
y
;
PlotDrawSegment
(
plotter
,
DrawTmp
,
aLayerMask
,
trace_mode
);
PlotDrawSegment
(
plotter
,
DrawTmp
,
aLayerMask
,
trace_mode
);
DrawTmp
->
m_Start
.
x
=
Dimension
->
FlecheD1_o
x
;
DrawTmp
->
m_Start
.
x
=
Dimension
->
m_arrowD1O
x
;
DrawTmp
->
m_Start
.
y
=
Dimension
->
FlecheD1_o
y
;
DrawTmp
->
m_Start
.
y
=
Dimension
->
m_arrowD1O
y
;
DrawTmp
->
m_End
.
x
=
Dimension
->
FlecheD1_f
x
;
DrawTmp
->
m_End
.
x
=
Dimension
->
m_arrowD1F
x
;
DrawTmp
->
m_End
.
y
=
Dimension
->
FlecheD1_f
y
;
DrawTmp
->
m_End
.
y
=
Dimension
->
m_arrowD1F
y
;
PlotDrawSegment
(
plotter
,
DrawTmp
,
aLayerMask
,
trace_mode
);
PlotDrawSegment
(
plotter
,
DrawTmp
,
aLayerMask
,
trace_mode
);
DrawTmp
->
m_Start
.
x
=
Dimension
->
FlecheD2_o
x
;
DrawTmp
->
m_Start
.
x
=
Dimension
->
m_arrowD2O
x
;
DrawTmp
->
m_Start
.
y
=
Dimension
->
FlecheD2_o
y
;
DrawTmp
->
m_Start
.
y
=
Dimension
->
m_arrowD2O
y
;
DrawTmp
->
m_End
.
x
=
Dimension
->
FlecheD2_f
x
;
DrawTmp
->
m_End
.
x
=
Dimension
->
m_arrowD2F
x
;
DrawTmp
->
m_End
.
y
=
Dimension
->
FlecheD2_f
y
;
DrawTmp
->
m_End
.
y
=
Dimension
->
m_arrowD2F
y
;
PlotDrawSegment
(
plotter
,
DrawTmp
,
aLayerMask
,
trace_mode
);
PlotDrawSegment
(
plotter
,
DrawTmp
,
aLayerMask
,
trace_mode
);
DrawTmp
->
m_Start
.
x
=
Dimension
->
FlecheG1_o
x
;
DrawTmp
->
m_Start
.
x
=
Dimension
->
m_arrowG1O
x
;
DrawTmp
->
m_Start
.
y
=
Dimension
->
FlecheG1_o
y
;
DrawTmp
->
m_Start
.
y
=
Dimension
->
m_arrowG1O
y
;
DrawTmp
->
m_End
.
x
=
Dimension
->
FlecheG1_f
x
;
DrawTmp
->
m_End
.
x
=
Dimension
->
m_arrowG1F
x
;
DrawTmp
->
m_End
.
y
=
Dimension
->
FlecheG1_f
y
;
DrawTmp
->
m_End
.
y
=
Dimension
->
m_arrowG1F
y
;
PlotDrawSegment
(
plotter
,
DrawTmp
,
aLayerMask
,
trace_mode
);
PlotDrawSegment
(
plotter
,
DrawTmp
,
aLayerMask
,
trace_mode
);
DrawTmp
->
m_Start
.
x
=
Dimension
->
FlecheG2_o
x
;
DrawTmp
->
m_Start
.
x
=
Dimension
->
m_arrowG2O
x
;
DrawTmp
->
m_Start
.
y
=
Dimension
->
FlecheG2_o
y
;
DrawTmp
->
m_Start
.
y
=
Dimension
->
m_arrowG2O
y
;
DrawTmp
->
m_End
.
x
=
Dimension
->
FlecheG2_f
x
;
DrawTmp
->
m_End
.
x
=
Dimension
->
m_arrowG2F
x
;
DrawTmp
->
m_End
.
y
=
Dimension
->
FlecheG2_f
y
;
DrawTmp
->
m_End
.
y
=
Dimension
->
m_arrowG2F
y
;
PlotDrawSegment
(
plotter
,
DrawTmp
,
aLayerMask
,
trace_mode
);
PlotDrawSegment
(
plotter
,
DrawTmp
,
aLayerMask
,
trace_mode
);
delete
DrawTmp
;
delete
DrawTmp
;
...
@@ -367,8 +366,7 @@ void PlotPcbTarget( PLOTTER* plotter, PCB_TARGET* Mire, int aLayerMask, GRTraceM
...
@@ -367,8 +366,7 @@ void PlotPcbTarget( PLOTTER* plotter, PCB_TARGET* Mire, int aLayerMask, GRTraceM
/* Plot footprints graphic items (outlines) */
/* Plot footprints graphic items (outlines) */
void
Plot_Edges_Modules
(
PLOTTER
*
plotter
,
BOARD
*
pcb
,
int
aLayerMask
,
void
Plot_Edges_Modules
(
PLOTTER
*
plotter
,
BOARD
*
pcb
,
int
aLayerMask
,
GRTraceMode
trace_mode
)
GRTraceMode
trace_mode
)
{
{
for
(
MODULE
*
module
=
pcb
->
m_Modules
;
module
;
module
=
module
->
Next
()
)
for
(
MODULE
*
module
=
pcb
->
m_Modules
;
module
;
module
=
module
->
Next
()
)
{
{
...
@@ -389,8 +387,7 @@ void Plot_Edges_Modules( PLOTTER* plotter, BOARD* pcb, int aLayerMask,
...
@@ -389,8 +387,7 @@ void Plot_Edges_Modules( PLOTTER* plotter, BOARD* pcb, int aLayerMask,
/* Plot a graphic item (outline) relative to a footprint */
/* Plot a graphic item (outline) relative to a footprint */
void
Plot_1_EdgeModule
(
PLOTTER
*
plotter
,
EDGE_MODULE
*
PtEdge
,
void
Plot_1_EdgeModule
(
PLOTTER
*
plotter
,
EDGE_MODULE
*
PtEdge
,
GRTraceMode
trace_mode
)
GRTraceMode
trace_mode
)
{
{
int
type_trace
;
/* Type of item to plot. */
int
type_trace
;
/* Type of item to plot. */
int
thickness
;
/* Segment thickness. */
int
thickness
;
/* Segment thickness. */
...
@@ -467,8 +464,7 @@ void Plot_1_EdgeModule( PLOTTER* plotter, EDGE_MODULE* PtEdge,
...
@@ -467,8 +464,7 @@ void Plot_1_EdgeModule( PLOTTER* plotter, EDGE_MODULE* PtEdge,
/* Plot a PCB Text, i;e. a text found on a copper or technical layer */
/* Plot a PCB Text, i;e. a text found on a copper or technical layer */
void
PlotTextePcb
(
PLOTTER
*
plotter
,
TEXTE_PCB
*
pt_texte
,
int
aLayerMask
,
void
PlotTextePcb
(
PLOTTER
*
plotter
,
TEXTE_PCB
*
pt_texte
,
int
aLayerMask
,
GRTraceMode
trace_mode
)
GRTraceMode
trace_mode
)
{
{
int
orient
,
thickness
;
int
orient
,
thickness
;
wxPoint
pos
;
wxPoint
pos
;
...
@@ -686,7 +682,7 @@ void PCB_BASE_FRAME::Plot_Layer( PLOTTER* plotter, int Layer, GRTraceMode trace_
...
@@ -686,7 +682,7 @@ void PCB_BASE_FRAME::Plot_Layer( PLOTTER* plotter, int Layer, GRTraceMode trace_
case
LAYER_N_15
:
case
LAYER_N_15
:
case
LAST_COPPER_LAYER
:
case
LAST_COPPER_LAYER
:
Plot_Standard_Layer
(
plotter
,
layer_mask
,
true
,
trace_mode
,
Plot_Standard_Layer
(
plotter
,
layer_mask
,
true
,
trace_mode
,
g_PcbPlotOptions
.
m_SkipNPTH_Pads
);
g_PcbPlotOptions
.
m_SkipNPTH_Pads
);
// Adding drill marks, if required and if the plotter is able to plot them:
// Adding drill marks, if required and if the plotter is able to plot them:
if
(
g_PcbPlotOptions
.
m_DrillShapeOpt
!=
PCB_PLOT_PARAMS
::
NO_DRILL_SHAPE
)
if
(
g_PcbPlotOptions
.
m_DrillShapeOpt
!=
PCB_PLOT_PARAMS
::
NO_DRILL_SHAPE
)
...
@@ -711,7 +707,7 @@ void PCB_BASE_FRAME::Plot_Layer( PLOTTER* plotter, int Layer, GRTraceMode trace_
...
@@ -711,7 +707,7 @@ void PCB_BASE_FRAME::Plot_Layer( PLOTTER* plotter, int Layer, GRTraceMode trace_
break
;
break
;
default
:
default
:
Plot
_Serigraphie
(
plotter
,
layer_mask
,
trace_mode
);
Plot
SilkScreen
(
plotter
,
layer_mask
,
trace_mode
);
// Gerber: Subtract soldermask from silkscreen if enabled
// Gerber: Subtract soldermask from silkscreen if enabled
if
(
plotter
->
GetPlotterType
()
==
PLOT_FORMAT_GERBER
if
(
plotter
->
GetPlotterType
()
==
PLOT_FORMAT_GERBER
...
...
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