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
ccbce931
Commit
ccbce931
authored
Oct 11, 2009
by
charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
All: better look when displaying info on messages panel
parent
56059efd
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
70 additions
and
109 deletions
+70
-109
msgpanel.cpp
common/msgpanel.cpp
+3
-0
class_sch_component.cpp
eeschema/class_sch_component.cpp
+8
-11
class_marker_pcb.cpp
pcbnew/class_marker_pcb.cpp
+5
-9
class_module.cpp
pcbnew/class_module.cpp
+15
-26
class_pad.cpp
pcbnew/class_pad.cpp
+16
-30
class_pcb_text.cpp
pcbnew/class_pcb_text.cpp
+12
-13
class_zone.cpp
pcbnew/class_zone.cpp
+11
-20
No files found.
common/msgpanel.cpp
View file @
ccbce931
...
@@ -122,6 +122,9 @@ void WinEDA_MsgPanel::AppendMessage( const wxString& textUpper,
...
@@ -122,6 +122,9 @@ void WinEDA_MsgPanel::AppendMessage( const wxString& textUpper,
m_Items
.
push_back
(
item
);
m_Items
.
push_back
(
item
);
m_last_x
+=
computeTextSize
(
text
).
x
;
m_last_x
+=
computeTextSize
(
text
).
x
;
// Add an extra space between texts for a better look:
m_last_x
+=
m_fontSize
.
x
;
Refresh
();
Refresh
();
}
}
...
...
eeschema/class_sch_component.cpp
View file @
ccbce931
...
@@ -1026,31 +1026,28 @@ void SCH_COMPONENT::DisplayInfo( WinEDA_DrawFrame* frame )
...
@@ -1026,31 +1026,28 @@ void SCH_COMPONENT::DisplayInfo( WinEDA_DrawFrame* frame )
LIB_COMPONENT
*
Entry
=
CMP_LIBRARY
::
FindLibraryComponent
(
m_ChipName
);
LIB_COMPONENT
*
Entry
=
CMP_LIBRARY
::
FindLibraryComponent
(
m_ChipName
);
wxString
msg
;
wxString
msg
;
WinEDA_MsgPanel
*
msgpanel
=
frame
->
MsgPanel
;
frame
->
MsgP
anel
->
EraseMsgBox
();
msgp
anel
->
EraseMsgBox
();
Affiche_1_Parametre
(
frame
,
1
,
_
(
"Ref"
),
msg
=
GetRef
(((
WinEDA_SchematicFrame
*
)
frame
)
->
GetSheet
());
GetRef
(((
WinEDA_SchematicFrame
*
)
frame
)
->
GetSheet
()),
msgpanel
->
AppendMessage
(
_
(
"Ref"
),
msg
,
DARKCYAN
);
DARKCYAN
);
if
(
Entry
&&
Entry
->
m_Options
==
ENTRY_POWER
)
if
(
Entry
&&
Entry
->
m_Options
==
ENTRY_POWER
)
msg
=
_
(
"Pwr Symb"
);
msg
=
_
(
"Pwr Symb"
);
else
else
msg
=
_
(
"Val"
);
msg
=
_
(
"Val"
);
Affiche_1_Parametre
(
frame
,
10
,
msg
,
GetField
(
VALUE
)
->
m_Text
,
DARKCYAN
);
msgpanel
->
AppendMessage
(
msg
,
GetField
(
VALUE
)
->
m_Text
,
DARKCYAN
);
Affiche_1_Parametre
(
frame
,
28
,
_
(
"RefLib"
),
m_ChipName
.
GetData
(),
BROWN
);
msgpanel
->
AppendMessage
(
_
(
"RefLib"
),
m_ChipName
.
GetData
(),
BROWN
);
msg
=
Entry
->
GetLibraryName
();
msg
=
Entry
->
GetLibraryName
();
Affiche_1_Parametre
(
frame
,
40
,
_
(
"Lib"
),
msg
,
DARKRED
);
msgpanel
->
AppendMessage
(
_
(
"Lib"
),
msg
,
DARKRED
);
if
(
Entry
)
if
(
Entry
)
{
msgpanel
->
AppendMessage
(
Entry
->
m_Doc
,
Entry
->
m_KeyWord
,
DARKCYAN
);
Affiche_1_Parametre
(
frame
,
52
,
Entry
->
m_Doc
,
Entry
->
m_KeyWord
,
DARKCYAN
);
}
}
}
/** virtual function Mirror_Y
/** virtual function Mirror_Y
...
...
pcbnew/class_marker_pcb.cpp
View file @
ccbce931
...
@@ -57,21 +57,18 @@ MARKER_PCB::~MARKER_PCB()
...
@@ -57,21 +57,18 @@ MARKER_PCB::~MARKER_PCB()
void
MARKER_PCB
::
DisplayInfo
(
WinEDA_DrawFrame
*
frame
)
void
MARKER_PCB
::
DisplayInfo
(
WinEDA_DrawFrame
*
frame
)
{
{
int
text_pos
;
WinEDA_MsgPanel
*
msgpanel
=
frame
->
MsgPanel
;
msgpanel
->
EraseMsgBox
();
frame
->
MsgPanel
->
EraseMsgBox
();
const
DRC_ITEM
&
rpt
=
m_drc
;
const
DRC_ITEM
&
rpt
=
m_drc
;
text_pos
=
1
;
msgpanel
->
AppendMessage
(
_
(
"Type"
),
_
(
"Marker"
),
DARKCYAN
);
Affiche_1_Parametre
(
frame
,
text_pos
,
_
(
"Type"
),
_
(
"Marker"
),
DARKCYAN
);
wxString
errorTxt
;
wxString
errorTxt
;
errorTxt
<<
_
(
"ErrType"
)
<<
wxT
(
"("
)
<<
rpt
.
GetErrorCode
()
<<
wxT
(
")- "
)
<<
rpt
.
GetErrorText
()
<<
wxT
(
":"
);
errorTxt
<<
_
(
"ErrType"
)
<<
wxT
(
"("
)
<<
rpt
.
GetErrorCode
()
<<
wxT
(
")- "
)
<<
rpt
.
GetErrorText
()
<<
wxT
(
":"
);
text_pos
=
5
;
msgpanel
->
AppendMessage
(
errorTxt
,
wxEmptyString
,
RED
);
Affiche_1_Parametre
(
frame
,
text_pos
,
errorTxt
,
wxEmptyString
,
RED
);
wxString
txtA
;
wxString
txtA
;
txtA
<<
DRC_ITEM
::
ShowCoord
(
rpt
.
GetPointA
()
)
<<
wxT
(
": "
)
<<
rpt
.
GetTextA
();
txtA
<<
DRC_ITEM
::
ShowCoord
(
rpt
.
GetPointA
()
)
<<
wxT
(
": "
)
<<
rpt
.
GetTextA
();
...
@@ -80,8 +77,7 @@ void MARKER_PCB::DisplayInfo( WinEDA_DrawFrame* frame )
...
@@ -80,8 +77,7 @@ void MARKER_PCB::DisplayInfo( WinEDA_DrawFrame* frame )
if
(
rpt
.
HasSecondItem
()
)
if
(
rpt
.
HasSecondItem
()
)
txtB
<<
DRC_ITEM
::
ShowCoord
(
rpt
.
GetPointB
()
)
<<
wxT
(
": "
)
<<
rpt
.
GetTextB
();
txtB
<<
DRC_ITEM
::
ShowCoord
(
rpt
.
GetPointB
()
)
<<
wxT
(
": "
)
<<
rpt
.
GetTextB
();
text_pos
=
25
;
msgpanel
->
AppendMessage
(
txtA
,
txtB
,
DARKBROWN
);
Affiche_1_Parametre
(
frame
,
text_pos
,
txtA
,
txtB
,
DARKBROWN
);
}
}
/**
/**
...
...
pcbnew/class_module.cpp
View file @
ccbce931
...
@@ -797,21 +797,19 @@ void MODULE::DisplayInfo( WinEDA_DrawFrame* frame )
...
@@ -797,21 +797,19 @@ void MODULE::DisplayInfo( WinEDA_DrawFrame* frame )
{
{
int
nbpad
;
int
nbpad
;
char
bufcar
[
512
],
Line
[
512
];
char
bufcar
[
512
],
Line
[
512
];
int
pos
;
bool
flag
=
FALSE
;
bool
flag
=
FALSE
;
wxString
msg
;
wxString
msg
;
BOARD
*
board
=
(
BOARD
*
)
m_Parent
;
BOARD
*
board
=
(
BOARD
*
)
m_Parent
;
WinEDA_MsgPanel
*
msgpanel
=
frame
->
MsgPanel
;
frame
->
MsgPanel
->
EraseMsgBox
();
/* Effacement de la zone message */
msgpanel
->
EraseMsgBox
();
if
(
frame
->
m_Ident
!=
PCB_FRAME
)
if
(
frame
->
m_Ident
!=
PCB_FRAME
)
flag
=
TRUE
;
flag
=
TRUE
;
pos
=
1
;
Affiche_1_Parametre
(
frame
,
pos
,
m_Reference
->
m_Text
,
m_Value
->
m_Text
,
msgpanel
->
AppendMessage
(
m_Reference
->
m_Text
,
m_Value
->
m_Text
,
DARKCYAN
);
DARKCYAN
);
/* Affiche signature temporelle ou date de modif (en edition de modules) */
if
(
flag
)
// Display last date the component was edited( useful in Module Editor)
pos
+=
6
;
if
(
flag
)
// Affichage date de modification (utile en Module Editor)
{
{
time_t
edit_time
=
m_LastEdit_Time
;
time_t
edit_time
=
m_LastEdit_Time
;
strcpy
(
Line
,
ctime
(
&
edit_time
)
);
strcpy
(
Line
,
ctime
(
&
edit_time
)
);
...
@@ -821,20 +819,16 @@ void MODULE::DisplayInfo( WinEDA_DrawFrame* frame )
...
@@ -821,20 +819,16 @@ void MODULE::DisplayInfo( WinEDA_DrawFrame* frame )
strtok
(
NULL
,
"
\n\r
"
);
strtok
(
NULL
,
"
\n\r
"
);
strcat
(
bufcar
,
strtok
(
NULL
,
"
\n\r
"
)
);
strcat
(
bufcar
,
strtok
(
NULL
,
"
\n\r
"
)
);
msg
=
CONV_FROM_UTF8
(
bufcar
);
msg
=
CONV_FROM_UTF8
(
bufcar
);
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"Last Change"
),
msg
,
BROWN
);
msgpanel
->
AppendMessage
(
_
(
"Last Change"
),
msg
,
BROWN
);
pos
+=
4
;
}
}
else
else
// displa time stamp in schematic
{
{
msg
.
Printf
(
wxT
(
"%8.8lX"
),
m_TimeStamp
);
msg
.
Printf
(
wxT
(
"%8.8lX"
),
m_TimeStamp
);
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"Netlist path"
),
m_Path
,
BROWN
);
msgpanel
->
AppendMessage
(
_
(
"Netlist path"
),
m_Path
,
BROWN
);
}
}
pos
+=
12
;
msgpanel
->
AppendMessage
(
_
(
"Layer"
),
board
->
GetLayerName
(
m_Layer
),
RED
);
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"Layer"
),
board
->
GetLayerName
(
m_Layer
),
RED
);
pos
+=
6
;
EDA_BaseStruct
*
PtStruct
=
m_Pads
;
EDA_BaseStruct
*
PtStruct
=
m_Pads
;
nbpad
=
0
;
nbpad
=
0
;
while
(
PtStruct
)
while
(
PtStruct
)
...
@@ -844,34 +838,29 @@ void MODULE::DisplayInfo( WinEDA_DrawFrame* frame )
...
@@ -844,34 +838,29 @@ void MODULE::DisplayInfo( WinEDA_DrawFrame* frame )
}
}
msg
.
Printf
(
wxT
(
"%d"
),
nbpad
);
msg
.
Printf
(
wxT
(
"%d"
),
nbpad
);
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"Pads"
),
msg
,
BLUE
);
msgpanel
->
AppendMessage
(
_
(
"Pads"
),
msg
,
BLUE
);
pos
+=
4
;
msg
=
wxT
(
".."
);
msg
=
wxT
(
".."
);
if
(
IsLocked
()
)
if
(
IsLocked
()
)
msg
[
0
]
=
'L'
;
msg
[
0
]
=
'L'
;
if
(
m_ModuleStatus
&
MODULE_is_PLACED
)
if
(
m_ModuleStatus
&
MODULE_is_PLACED
)
msg
[
1
]
=
'P'
;
msg
[
1
]
=
'P'
;
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"Stat"
),
msg
,
MAGENTA
);
msgpanel
->
AppendMessage
(
_
(
"Stat"
),
msg
,
MAGENTA
);
pos
+=
4
;
msg
.
Printf
(
wxT
(
"%.1f"
),
(
float
)
m_Orient
/
10
);
msg
.
Printf
(
wxT
(
"%.1f"
),
(
float
)
m_Orient
/
10
);
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"Orient"
),
msg
,
BROWN
);
msgpanel
->
AppendMessage
(
_
(
"Orient"
),
msg
,
BROWN
);
pos
+=
5
;
msgpanel
->
AppendMessage
(
_
(
"Module"
),
m_LibRef
,
BLUE
);
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"Module"
),
m_LibRef
,
BLUE
);
pos
+=
9
;
if
(
m_3D_Drawings
!=
NULL
)
if
(
m_3D_Drawings
!=
NULL
)
msg
=
m_3D_Drawings
->
m_Shape3DName
;
msg
=
m_3D_Drawings
->
m_Shape3DName
;
else
else
msg
=
_
(
"No 3D shape"
);
msg
=
_
(
"No 3D shape"
);
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"3D-Shape"
),
msg
,
RED
);
msgpanel
->
AppendMessage
(
_
(
"3D-Shape"
),
msg
,
RED
);
pos
+=
14
;
wxString
doc
=
_
(
"Doc: "
)
+
m_Doc
;
wxString
doc
=
_
(
"Doc: "
)
+
m_Doc
;
wxString
keyword
=
_
(
"KeyW: "
)
+
m_KeyWord
;
wxString
keyword
=
_
(
"KeyW: "
)
+
m_KeyWord
;
Affiche_1_Parametre
(
frame
,
pos
,
doc
,
keyword
,
BLACK
);
msgpanel
->
AppendMessage
(
doc
,
keyword
,
BLACK
);
}
}
...
...
pcbnew/class_pad.cpp
View file @
ccbce931
...
@@ -436,7 +436,6 @@ void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
...
@@ -436,7 +436,6 @@ void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
int
ii
;
int
ii
;
MODULE
*
module
;
MODULE
*
module
;
wxString
Line
;
wxString
Line
;
int
pos
=
1
;
/* Pad messages */
/* Pad messages */
static
const
wxString
Msg_Pad_Shape
[
6
]
=
static
const
wxString
Msg_Pad_Shape
[
6
]
=
...
@@ -453,26 +452,24 @@ void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
...
@@ -453,26 +452,24 @@ void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
{
wxT
(
"norm"
),
wxT
(
"smd "
),
wxT
(
"conn"
),
wxT
(
"????"
)
};
{
wxT
(
"norm"
),
wxT
(
"smd "
),
wxT
(
"conn"
),
wxT
(
"????"
)
};
frame
->
MsgPanel
->
EraseMsgBox
();
WinEDA_MsgPanel
*
msgpanel
=
frame
->
MsgPanel
;
msgpanel
->
EraseMsgBox
();
/* Recherche du module correspondant */
/* Recherche du module correspondant */
module
=
(
MODULE
*
)
m_Parent
;
module
=
(
MODULE
*
)
m_Parent
;
if
(
module
)
if
(
module
)
{
{
wxString
msg
=
module
->
GetReference
();
wxString
msg
=
module
->
GetReference
();
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"Module"
),
msg
,
DARKCYAN
);
msgpanel
->
AppendMessage
(
_
(
"Module"
),
msg
,
DARKCYAN
);
ReturnStringPadName
(
Line
);
ReturnStringPadName
(
Line
);
pos
+=
8
;
msgpanel
->
AppendMessage
(
_
(
"RefP"
),
Line
,
BROWN
);
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"RefP"
),
Line
,
BROWN
);
}
}
pos
+=
4
;
msgpanel
->
AppendMessage
(
_
(
"Net"
),
m_Netname
,
DARKCYAN
);
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"Net"
),
m_Netname
,
DARKCYAN
);
/* For test and debug only: display m_physical_connexion and m_logical_connexion */
/* For test and debug only: display m_physical_connexion and m_logical_connexion */
pos
+=
10
;
#if 1 // Used only to debug connectivity calculations
#if 1 // Used only to debug connectivity calculations
Line
.
Printf
(
wxT
(
"%d-%d-%d "
),
GetSubRatsnest
(),
GetSubNet
(),
m_ZoneSubnet
);
Line
.
Printf
(
wxT
(
"%d-%d-%d "
),
GetSubRatsnest
(),
GetSubNet
(),
m_ZoneSubnet
);
Affiche_1_Parametre
(
frame
,
pos
,
wxT
(
"L-P-Z"
),
Line
,
DARKGREEN
);
msgpanel
->
AppendMessage
(
wxT
(
"L-P-Z"
),
Line
,
DARKGREEN
);
#endif
#endif
wxString
LayerInfo
;
wxString
LayerInfo
;
...
@@ -549,32 +546,24 @@ void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
...
@@ -549,32 +546,24 @@ void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
break
;
break
;
}
}
}
}
pos
+=
3
;
msgpanel
->
AppendMessage
(
_
(
"Layer"
),
LayerInfo
,
DARKGREEN
);
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"Layer"
),
LayerInfo
,
DARKGREEN
);
pos
+=
6
;
int
attribut
=
m_Attribut
&
15
;
int
attribut
=
m_Attribut
&
15
;
if
(
attribut
>
3
)
if
(
attribut
>
3
)
attribut
=
3
;
attribut
=
3
;
Affiche_1_Parametre
(
frame
,
msgpanel
->
AppendMessage
(
Msg_Pad_Shape
[
m_PadShape
],
pos
,
Msg_Pad_Attribut
[
attribut
],
DARKGREEN
);
Msg_Pad_Shape
[
m_PadShape
],
Msg_Pad_Attribut
[
attribut
],
DARKGREEN
);
valeur_param
(
m_Size
.
x
,
Line
);
valeur_param
(
m_Size
.
x
,
Line
);
pos
+=
6
;
msgpanel
->
AppendMessage
(
_
(
"H Size"
),
Line
,
RED
);
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"H Size"
),
Line
,
RED
);
valeur_param
(
m_Size
.
y
,
Line
);
valeur_param
(
m_Size
.
y
,
Line
);
pos
+=
7
;
msgpanel
->
AppendMessage
(
_
(
"V Size"
),
Line
,
RED
);
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"V Size"
),
Line
,
RED
);
pos
+=
7
;
valeur_param
(
(
unsigned
)
m_Drill
.
x
,
Line
);
valeur_param
(
(
unsigned
)
m_Drill
.
x
,
Line
);
if
(
m_DrillShape
==
PAD_CIRCLE
)
if
(
m_DrillShape
==
PAD_CIRCLE
)
{
{
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"Drill"
),
Line
,
RED
);
msgpanel
->
AppendMessage
(
_
(
"Drill"
),
Line
,
RED
);
}
}
else
else
{
{
...
@@ -582,7 +571,7 @@ void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
...
@@ -582,7 +571,7 @@ void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
wxString
msg
;
wxString
msg
;
valeur_param
(
(
unsigned
)
m_Drill
.
y
,
msg
);
valeur_param
(
(
unsigned
)
m_Drill
.
y
,
msg
);
Line
+=
wxT
(
" / "
)
+
msg
;
Line
+=
wxT
(
" / "
)
+
msg
;
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"Drill X / Y"
),
Line
,
RED
);
msgpanel
->
AppendMessage
(
_
(
"Drill X / Y"
),
Line
,
RED
);
}
}
...
@@ -592,16 +581,13 @@ void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
...
@@ -592,16 +581,13 @@ void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
(
float
)
(
m_Orient
-
module_orient
)
/
10
,
(
float
)
module_orient
/
10
);
(
float
)
(
m_Orient
-
module_orient
)
/
10
,
(
float
)
module_orient
/
10
);
else
else
Line
.
Printf
(
wxT
(
"%3.1f"
),
(
float
)
m_Orient
/
10
);
Line
.
Printf
(
wxT
(
"%3.1f"
),
(
float
)
m_Orient
/
10
);
pos
+=
8
;
msgpanel
->
AppendMessage
(
_
(
"Orient"
),
Line
,
BLUE
);
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"Orient"
),
Line
,
BLUE
);
valeur_param
(
m_Pos
.
x
,
Line
);
valeur_param
(
m_Pos
.
x
,
Line
);
pos
+=
8
;
msgpanel
->
AppendMessage
(
_
(
"X Pos"
),
Line
,
BLUE
);
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"X Pos"
),
Line
,
BLUE
);
valeur_param
(
m_Pos
.
y
,
Line
);
valeur_param
(
m_Pos
.
y
,
Line
);
pos
+=
6
;
msgpanel
->
AppendMessage
(
_
(
"Y pos"
),
Line
,
BLUE
);
Affiche_1_Parametre
(
frame
,
pos
,
_
(
"Y pos"
),
Line
,
BLUE
);
}
}
...
...
pcbnew/class_pcb_text.cpp
View file @
ccbce931
...
@@ -231,34 +231,33 @@ void TEXTE_PCB::DisplayInfo( WinEDA_DrawFrame* frame )
...
@@ -231,34 +231,33 @@ void TEXTE_PCB::DisplayInfo( WinEDA_DrawFrame* frame )
board
=
(
BOARD
*
)
parent
;
board
=
(
BOARD
*
)
parent
;
wxASSERT
(
board
);
wxASSERT
(
board
);
frame
->
MsgPanel
->
EraseMsgBox
();
WinEDA_MsgPanel
*
msgpanel
=
frame
->
MsgPanel
;
msgpanel
->
EraseMsgBox
();
if
(
m_Parent
&&
m_Parent
->
Type
()
==
TYPE_COTATION
)
if
(
m_Parent
&&
m_Parent
->
Type
()
==
TYPE_COTATION
)
Affiche_1_Parametre
(
frame
,
1
,
_
(
"COTATION"
),
m_Text
,
DARKGREEN
);
msgpanel
->
AppendMessage
(
_
(
"COTATION"
),
m_Text
,
DARKGREEN
);
else
else
Affiche_1_Parametre
(
frame
,
1
,
_
(
"PCB Text"
),
m_Text
,
DARKGREEN
);
msgpanel
->
AppendMessage
(
_
(
"PCB Text"
),
m_Text
,
DARKGREEN
);
Affiche_1_Parametre
(
frame
,
28
,
_
(
"Layer"
),
msgpanel
->
AppendMessage
(
_
(
"Layer"
),
board
->
GetLayerName
(
m_Layer
),
board
->
GetLayerName
(
m_Layer
),
BLUE
);
g_DesignSettings
.
m_LayerColor
[
m_Layer
]
&
MASKCOLOR
);
Affiche_1_Parametre
(
frame
,
36
,
_
(
"Mirror"
),
wxEmptyString
,
GREEN
);
if
(
!
m_Mirror
)
if
(
!
m_Mirror
)
Affiche_1_Parametre
(
frame
,
-
1
,
wxEmptyString
,
_
(
"No"
),
DARKGREEN
);
msgpanel
->
AppendMessage
(
_
(
"Mirror"
)
,
_
(
"No"
),
DARKGREEN
);
else
else
Affiche_1_Parametre
(
frame
,
-
1
,
wxEmptyString
,
_
(
"Yes"
),
DARKGREEN
);
msgpanel
->
AppendMessage
(
_
(
"Mirror"
)
,
_
(
"Yes"
),
DARKGREEN
);
msg
.
Printf
(
wxT
(
"%.1f"
),
(
float
)
m_Orient
/
10
);
msg
.
Printf
(
wxT
(
"%.1f"
),
(
float
)
m_Orient
/
10
);
Affiche_1_Parametre
(
frame
,
43
,
_
(
"Orient"
),
msg
,
DARKGREEN
);
msgpanel
->
AppendMessage
(
_
(
"Orient"
),
msg
,
DARKGREEN
);
valeur_param
(
m_Width
,
msg
);
valeur_param
(
m_Width
,
msg
);
Affiche_1_Parametre
(
frame
,
50
,
_
(
"Width"
),
msg
,
MAGENTA
);
msgpanel
->
AppendMessage
(
_
(
"Width"
),
msg
,
MAGENTA
);
valeur_param
(
m_Size
.
x
,
msg
);
valeur_param
(
m_Size
.
x
,
msg
);
Affiche_1_Parametre
(
frame
,
60
,
_
(
"H Size"
),
msg
,
RED
);
msgpanel
->
AppendMessage
(
_
(
"H Size"
),
msg
,
RED
);
valeur_param
(
m_Size
.
y
,
msg
);
valeur_param
(
m_Size
.
y
,
msg
);
Affiche_1_Parametre
(
frame
,
70
,
_
(
"V Size"
),
msg
,
RED
);
msgpanel
->
AppendMessage
(
_
(
"V Size"
),
msg
,
RED
);
}
}
/**
/**
...
...
pcbnew/class_zone.cpp
View file @
ccbce931
...
@@ -904,13 +904,13 @@ void ZONE_CONTAINER::DisplayInfo( WinEDA_DrawFrame* frame )
...
@@ -904,13 +904,13 @@ void ZONE_CONTAINER::DisplayInfo( WinEDA_DrawFrame* frame )
/************************************************************/
/************************************************************/
{
{
wxString
msg
;
wxString
msg
;
int
text_pos
;
BOARD
*
board
=
(
BOARD
*
)
m_Parent
;
BOARD
*
board
=
(
BOARD
*
)
m_Parent
;
WinEDA_MsgPanel
*
msgpanel
=
frame
->
MsgPanel
;
wxASSERT
(
board
);
wxASSERT
(
board
);
frame
->
MsgP
anel
->
EraseMsgBox
();
msgp
anel
->
EraseMsgBox
();
msg
=
_
(
"Zone Outline"
);
msg
=
_
(
"Zone Outline"
);
...
@@ -918,10 +918,7 @@ void ZONE_CONTAINER::DisplayInfo( WinEDA_DrawFrame* frame )
...
@@ -918,10 +918,7 @@ void ZONE_CONTAINER::DisplayInfo( WinEDA_DrawFrame* frame )
if
(
ncont
)
if
(
ncont
)
msg
<<
wxT
(
" "
)
<<
_
(
"(Cutout)"
);
msg
<<
wxT
(
" "
)
<<
_
(
"(Cutout)"
);
text_pos
=
1
;
msgpanel
->
AppendMessage
(
_
(
"Type"
),
msg
,
DARKCYAN
);
Affiche_1_Parametre
(
frame
,
text_pos
,
_
(
"Type"
),
msg
,
DARKCYAN
);
text_pos
+=
15
;
if
(
IsOnCopperLayer
()
)
if
(
IsOnCopperLayer
()
)
{
{
...
@@ -941,41 +938,35 @@ void ZONE_CONTAINER::DisplayInfo( WinEDA_DrawFrame* frame )
...
@@ -941,41 +938,35 @@ void ZONE_CONTAINER::DisplayInfo( WinEDA_DrawFrame* frame )
msg
<<
wxT
(
" <"
)
<<
_
(
"Not Found"
)
<<
wxT
(
">"
);
msg
<<
wxT
(
" <"
)
<<
_
(
"Not Found"
)
<<
wxT
(
">"
);
}
}
Affiche_1_Parametre
(
frame
,
text_pos
,
_
(
"NetName"
),
msg
,
RED
);
msgpanel
->
AppendMessage
(
_
(
"NetName"
),
msg
,
RED
);
}
}
else
else
Affiche_1_Parametre
(
frame
,
text_pos
,
_
(
"Non Copper Zone"
),
wxEmptyString
,
RED
);
msgpanel
->
AppendMessage
(
_
(
"Non Copper Zone"
),
wxEmptyString
,
RED
);
/* Display net code : (usefull in test or debug) */
/* Display net code : (usefull in test or debug) */
text_pos
+=
18
;
msg
.
Printf
(
wxT
(
"%d"
),
GetNet
()
);
msg
.
Printf
(
wxT
(
"%d"
),
GetNet
()
);
Affiche_1_Parametre
(
frame
,
text_pos
,
_
(
"NetCode"
),
msg
,
RED
);
msgpanel
->
AppendMessage
(
_
(
"NetCode"
),
msg
,
RED
);
text_pos
+=
6
;
msg
=
board
->
GetLayerName
(
m_Layer
);
msg
=
board
->
GetLayerName
(
m_Layer
);
Affiche_1_Parametre
(
frame
,
text_pos
,
_
(
"Layer"
),
msg
,
BROWN
);
msgpanel
->
AppendMessage
(
_
(
"Layer"
),
msg
,
BROWN
);
text_pos
+=
8
;
msg
.
Printf
(
wxT
(
"%d"
),
m_Poly
->
corner
.
size
()
);
msg
.
Printf
(
wxT
(
"%d"
),
m_Poly
->
corner
.
size
()
);
Affiche_1_Parametre
(
frame
,
text_pos
,
_
(
"Corners"
),
msg
,
BLUE
);
msgpanel
->
AppendMessage
(
_
(
"Corners"
),
msg
,
BLUE
);
text_pos
+=
6
;
if
(
m_FillMode
)
if
(
m_FillMode
)
msg
.
Printf
(
_
(
"Segments"
),
m_FillMode
);
msg
.
Printf
(
_
(
"Segments"
),
m_FillMode
);
else
else
msg
=
_
(
"Polygons"
);
msg
=
_
(
"Polygons"
);
Affiche_1_Parametre
(
frame
,
text_pos
,
_
(
"Fill mode"
),
msg
,
BROWN
);
msgpanel
->
AppendMessage
(
_
(
"Fill mode"
),
msg
,
BROWN
);
// Useful for statistics :
// Useful for statistics :
text_pos
+=
9
;
msg
.
Printf
(
wxT
(
"%d"
),
m_Poly
->
m_HatchLines
.
size
()
);
msg
.
Printf
(
wxT
(
"%d"
),
m_Poly
->
m_HatchLines
.
size
()
);
Affiche_1_Parametre
(
frame
,
text_pos
,
_
(
"Hatch lines"
),
msg
,
BLUE
);
msgpanel
->
AppendMessage
(
_
(
"Hatch lines"
),
msg
,
BLUE
);
if
(
m_FilledPolysList
.
size
()
)
if
(
m_FilledPolysList
.
size
()
)
{
{
text_pos
+=
9
;
msg
.
Printf
(
wxT
(
"%d"
),
m_FilledPolysList
.
size
()
);
msg
.
Printf
(
wxT
(
"%d"
),
m_FilledPolysList
.
size
()
);
Affiche_1_Parametre
(
frame
,
text_pos
,
_
(
"Corners in DrawList"
),
msg
,
BLUE
);
msgpanel
->
AppendMessage
(
_
(
"Corners in DrawList"
),
msg
,
BLUE
);
}
}
}
}
...
...
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