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
baa278a3
Commit
baa278a3
authored
Jul 09, 2009
by
charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More about ERC and markers in eeschema ( work in progress )
parent
e4656c44
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
463 additions
and
314 deletions
+463
-314
class_marker_base.cpp
common/class_marker_base.cpp
+28
-24
dialog_display_info_HTML_base.cpp
common/dialog_display_info_HTML_base.cpp
+12
-3
dialog_display_info_HTML_base.fbp
common/dialog_display_info_HTML_base.fbp
+57
-5
class_marker_sch.cpp
eeschema/class_marker_sch.cpp
+17
-6
controle.cpp
eeschema/controle.cpp
+0
-11
erc.cpp
eeschema/erc.cpp
+57
-41
load_one_schematic_file.cpp
eeschema/load_one_schematic_file.cpp
+3
-2
onleftclick.cpp
eeschema/onleftclick.cpp
+6
-0
class_marker_base.h
include/class_marker_base.h
+32
-26
dialog_display_info_HTML_base.h
include/dialog_display_info_HTML_base.h
+8
-1
kicad.mo
internat/fr/kicad.mo
+0
-0
kicad.po
internat/fr/kicad.po
+243
-195
No files found.
common/class_marker_base.cpp
View file @
baa278a3
...
...
@@ -18,8 +18,10 @@
// Default marquer shape:
#define M_SHAPE_SCALE 6 // default scaling factor for MarkerShapeCorners coordinates
#define CORNERS_COUNT 8
// corners of the default shape
static
wxPoint
MarkerShapeCorners
[
CORNERS_COUNT
]
=
/* corners of the default shape
* real coordinates are these values * .m_ScalingFactor
*/
static
const
wxPoint
MarkerShapeCorners
[
CORNERS_COUNT
]
=
{
wxPoint
(
0
,
0
),
wxPoint
(
8
,
1
),
...
...
@@ -39,13 +41,20 @@ void MARKER_BASE::init()
{
m_MarkerType
=
0
;
m_Color
=
RED
;
wxPoint
start
=
MarkerShapeCorners
[
0
];
wxPoint
end
=
MarkerShapeCorners
[
0
];
for
(
unsigned
ii
=
0
;
ii
<
CORNERS_COUNT
;
ii
++
)
{
wxPoint
corner
=
MarkerShapeCorners
[
ii
];
m_Corners
.
push_back
(
corner
);
m_Size
.
x
=
MAX
(
m_Size
.
x
,
corner
.
x
);
m_Size
.
y
=
MAX
(
m_Size
.
y
,
corner
.
y
);
start
.
x
=
MIN
(
start
.
x
,
corner
.
x
);
start
.
y
=
MIN
(
start
.
y
,
corner
.
y
);
end
.
x
=
MAX
(
end
.
x
,
corner
.
x
);
end
.
y
=
MAX
(
end
.
y
,
corner
.
y
);
}
m_ShapeBoundingBox
.
SetOrigin
(
start
);
m_ShapeBoundingBox
.
SetEnd
(
end
);
}
...
...
@@ -103,24 +112,15 @@ void MARKER_BASE::SetData( int aErrorCode, const wxPoint& aMarkerPos,
}
/**********************************************/
/**********************************************
********
/
bool
MARKER_BASE
::
HitTestMarker
(
const
wxPoint
&
refPos
)
/**********************************************/
/**********************************************
********
/
{
int
dx
=
refPos
.
x
-
m_Pos
.
x
;
int
dy
=
refPos
.
y
-
m_Pos
.
y
;
wxSize
Realsize
=
m_Size
;
Realsize
.
x
*=
m_ScalingFactor
;
Realsize
.
y
*=
m_ScalingFactor
;
/* is refPos in the box: Marker size to right an bottom,
* or size/2 to left or top */
if
(
dx
<=
Realsize
.
x
&&
dy
<=
Realsize
.
y
&&
dx
>=
-
Realsize
.
x
/
2
&&
dy
>=
-
Realsize
.
y
/
2
)
return
true
;
else
return
false
;
wxPoint
rel_pos
=
refPos
-
m_Pos
;
rel_pos
.
x
/=
m_ScalingFactor
;
rel_pos
.
y
/=
m_ScalingFactor
;
return
m_ShapeBoundingBox
.
Inside
(
rel_pos
);
}
/**
...
...
@@ -132,10 +132,14 @@ bool MARKER_BASE::HitTestMarker( const wxPoint& refPos )
*/
EDA_Rect
MARKER_BASE
::
GetBoundingBoxMarker
()
{
wxSize
Realsize
=
m_Size
;
Realsize
.
x
*=
m_ScalingFactor
;
Realsize
.
y
*=
m_ScalingFactor
;
return
EDA_Rect
(
m_Pos
,
Realsize
);
wxSize
realsize
=
m_ShapeBoundingBox
.
GetSize
();
wxPoint
realposition
=
m_ShapeBoundingBox
.
GetPosition
();
realsize
.
x
*=
m_ScalingFactor
;
realsize
.
y
*=
m_ScalingFactor
;
realposition
.
x
*=
m_ScalingFactor
;
realposition
.
y
*=
m_ScalingFactor
;
realposition
+=
m_Pos
;
return
EDA_Rect
(
m_Pos
,
realsize
);
}
/**********************************************************************/
...
...
common/dialog_display_info_HTML_base.cpp
View file @
baa278a3
...
...
@@ -11,20 +11,29 @@
DIALOG_DISPLAY_HTML_TEXT_BASE
::
DIALOG_DISPLAY_HTML_TEXT_BASE
(
wxWindow
*
parent
,
wxWindowID
id
,
const
wxString
&
title
,
const
wxPoint
&
pos
,
const
wxSize
&
size
,
long
style
)
:
wxDialog
(
parent
,
id
,
title
,
pos
,
size
,
style
)
{
this
->
SetSizeHints
(
wx
DefaultSize
,
wxDefaultSize
);
this
->
SetSizeHints
(
wx
Size
(
400
,
170
)
,
wxDefaultSize
);
wxBoxSizer
*
bMainSizer
;
bMainSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
m_htmlWindow
=
new
wxHtmlWindow
(
this
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxHW_SCROLLBAR_AUTO
);
m_htmlWindow
->
SetMinSize
(
wxSize
(
400
,
150
)
);
bMainSizer
->
Add
(
m_htmlWindow
,
1
,
wxALL
|
wxEXPAND
,
5
);
m_buttonClose
=
new
wxButton
(
this
,
wxID_CANCEL
,
_
(
"Close"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_buttonClose
->
SetDefault
();
bMainSizer
->
Add
(
m_buttonClose
,
0
,
wxALL
|
wxALIGN_RIGHT
,
5
);
this
->
SetSizer
(
bMainSizer
);
this
->
Layout
();
// Connect Events
m_htmlWindow
->
Connect
(
wxEVT_COMMAND_HTML_LINK_CLICKED
,
wxHtmlLinkEventHandler
(
DIALOG_DISPLAY_HTML_TEXT_BASE
::
OnHTMLLinkClicked
),
NULL
,
this
);
m_buttonClose
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_DISPLAY_HTML_TEXT_BASE
::
OnCloseButtonClick
),
NULL
,
this
);
}
DIALOG_DISPLAY_HTML_TEXT_BASE
::~
DIALOG_DISPLAY_HTML_TEXT_BASE
()
{
// Disconnect Events
m_htmlWindow
->
Disconnect
(
wxEVT_COMMAND_HTML_LINK_CLICKED
,
wxHtmlLinkEventHandler
(
DIALOG_DISPLAY_HTML_TEXT_BASE
::
OnHTMLLinkClicked
),
NULL
,
this
);
m_buttonClose
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_DISPLAY_HTML_TEXT_BASE
::
OnCloseButtonClick
),
NULL
,
this
);
}
common/dialog_display_info_HTML_base.fbp
View file @
baa278a3
...
...
@@ -29,10 +29,10 @@
<property
name=
"hidden"
>
0
</property>
<property
name=
"id"
>
wxID_ANY
</property>
<property
name=
"maximum_size"
></property>
<property
name=
"minimum_size"
></property>
<property
name=
"minimum_size"
>
400,170
</property>
<property
name=
"name"
>
DIALOG_DISPLAY_HTML_TEXT_BASE
</property>
<property
name=
"pos"
></property>
<property
name=
"size"
>
291,165
</property>
<property
name=
"size"
>
431,170
</property>
<property
name=
"style"
>
wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER
</property>
<property
name=
"subclass"
></property>
<property
name=
"title"
></property>
...
...
@@ -71,7 +71,7 @@
<event
name=
"OnSize"
></event>
<event
name=
"OnUpdateUI"
></event>
<object
class=
"wxBoxSizer"
expanded=
"1"
>
<property
name=
"minimum_size"
></property>
<property
name=
"minimum_size"
>
-1,-1
</property>
<property
name=
"name"
>
bMainSizer
</property>
<property
name=
"orient"
>
wxVERTICAL
</property>
<property
name=
"permission"
>
none
</property>
...
...
@@ -88,7 +88,7 @@
<property
name=
"hidden"
>
0
</property>
<property
name=
"id"
>
wxID_ANY
</property>
<property
name=
"maximum_size"
></property>
<property
name=
"minimum_size"
>
400,150
</property>
<property
name=
"minimum_size"
>
-1,-1
</property>
<property
name=
"name"
>
m_htmlWindow
</property>
<property
name=
"permission"
>
public
</property>
<property
name=
"pos"
></property>
...
...
@@ -104,7 +104,59 @@
<event
name=
"OnEraseBackground"
></event>
<event
name=
"OnHtmlCellClicked"
></event>
<event
name=
"OnHtmlCellHover"
></event>
<event
name=
"OnHtmlLinkClicked"
></event>
<event
name=
"OnHtmlLinkClicked"
>
OnHTMLLinkClicked
</event>
<event
name=
"OnKeyDown"
></event>
<event
name=
"OnKeyUp"
></event>
<event
name=
"OnKillFocus"
></event>
<event
name=
"OnLeaveWindow"
></event>
<event
name=
"OnLeftDClick"
></event>
<event
name=
"OnLeftDown"
></event>
<event
name=
"OnLeftUp"
></event>
<event
name=
"OnMiddleDClick"
></event>
<event
name=
"OnMiddleDown"
></event>
<event
name=
"OnMiddleUp"
></event>
<event
name=
"OnMotion"
></event>
<event
name=
"OnMouseEvents"
></event>
<event
name=
"OnMouseWheel"
></event>
<event
name=
"OnPaint"
></event>
<event
name=
"OnRightDClick"
></event>
<event
name=
"OnRightDown"
></event>
<event
name=
"OnRightUp"
></event>
<event
name=
"OnSetFocus"
></event>
<event
name=
"OnSize"
></event>
<event
name=
"OnUpdateUI"
></event>
</object>
</object>
<object
class=
"sizeritem"
expanded=
"1"
>
<property
name=
"border"
>
5
</property>
<property
name=
"flag"
>
wxALL|wxALIGN_RIGHT
</property>
<property
name=
"proportion"
>
0
</property>
<object
class=
"wxButton"
expanded=
"1"
>
<property
name=
"bg"
></property>
<property
name=
"context_help"
></property>
<property
name=
"default"
>
1
</property>
<property
name=
"enabled"
>
1
</property>
<property
name=
"fg"
></property>
<property
name=
"font"
></property>
<property
name=
"hidden"
>
0
</property>
<property
name=
"id"
>
wxID_CANCEL
</property>
<property
name=
"label"
>
Close
</property>
<property
name=
"maximum_size"
></property>
<property
name=
"minimum_size"
></property>
<property
name=
"name"
>
m_buttonClose
</property>
<property
name=
"permission"
>
protected
</property>
<property
name=
"pos"
></property>
<property
name=
"size"
></property>
<property
name=
"style"
></property>
<property
name=
"subclass"
></property>
<property
name=
"tooltip"
></property>
<property
name=
"window_extra_style"
></property>
<property
name=
"window_name"
></property>
<property
name=
"window_style"
></property>
<event
name=
"OnButtonClick"
>
OnCloseButtonClick
</event>
<event
name=
"OnChar"
></event>
<event
name=
"OnEnterWindow"
></event>
<event
name=
"OnEraseBackground"
></event>
<event
name=
"OnKeyDown"
></event>
<event
name=
"OnKeyUp"
></event>
<event
name=
"OnKillFocus"
></event>
...
...
eeschema/class_marker_sch.cpp
View file @
baa278a3
...
...
@@ -86,19 +86,30 @@ void MARKER_SCH::Show( int nestLevel, std::ostream& os )
* writes the data structures for this object out to a FILE in "*.brd" format.
* @param aFile The FILE to write to.
* @return bool - true if success writing else false.
* Currently: do nothing (markers are no more saved in files)
*/
bool
MARKER_SCH
::
Save
(
FILE
*
aFile
)
const
{
bool
success
=
true
;
wxString
msg
=
GetReporter
().
GetMainText
();
#if 0
wxString msg = m_drc.GetMainText();
if
(
fprintf
(
aFile
,
"Kmarq %c %-4d %-4d
\"
%s
\"
F=%X T=%X
\n
"
,
if( fprintf( aFile, "Kmarq %c %-4d %-4d \"%s\"",
GetMarkerType() + 'A', GetPos().x, GetPos().y,
CONV_TO_UTF8
(
msg
),
GetErrorLevel
(),
GetReporter
().
GetErrorCode
()
)
==
EOF
)
CONV_TO_UTF8( msg ) ) == EOF )
success = false;
if ( m_drc.HasSecondItem() )
{
msg = GetReporter().GetAuxiliaryText();
if( fprintf( aFile, " \"%s\" %-4d %-4d",
GetMarkerType() + 'A', m_drc.GetPointB().x, m_drc.GetPointB().y,
CONV_TO_UTF8( msg ) ) == EOF )
success = false;
}
if( fprintf( aFile, " F=%X T=%X\n",
GetErrorLevel(), GetReporter().GetErrorCode() ) == EOF )
#endif
return
success
;
}
...
...
@@ -149,7 +160,7 @@ void MARKER_SCH::DisplayMarkerInfo( WinEDA_SchematicFrame* aFrame )
wxString
msg
=
GetReporter
().
ShowHtml
();
DIALOG_DISPLAY_HTML_TEXT_BASE
infodisplay
(
aFrame
,
-
1
,
wxEmptyString
,
wxGetMousePosition
(),
wxSize
(
550
,
1
3
0
)
);
wxGetMousePosition
(),
wxSize
(
550
,
1
7
0
)
);
infodisplay
.
m_htmlWindow
->
SetPage
(
msg
);
infodisplay
.
ShowModal
();
...
...
eeschema/controle.cpp
View file @
baa278a3
...
...
@@ -124,17 +124,6 @@ SCH_ITEM* WinEDA_SchematicFrame:: SchematicGeneralLocateAndDisplay( const wxPoin
wxString
msg
;
int
ii
;
DrawStruct
=
(
SCH_ITEM
*
)
PickStruct
(
refpoint
,
GetScreen
(),
MARKERITEM
);
if
(
DrawStruct
)
{
MARKER_SCH
*
Marker
=
(
MARKER_SCH
*
)
DrawStruct
;
Text
=
Marker
->
GetReporter
().
GetErrorText
();
ii
=
Marker
->
GetMarkerType
();
msg
=
NameMarqueurType
[
ii
];
msg
<<
wxT
(
" "
)
<<
Text
;
Affiche_Message
(
msg
);
return
DrawStruct
;
}
DrawStruct
=
(
SCH_ITEM
*
)
PickStruct
(
refpoint
,
GetScreen
(),
NOCONNECTITEM
);
if
(
DrawStruct
)
{
...
...
eeschema/erc.cpp
View file @
baa278a3
...
...
@@ -165,6 +165,53 @@ static int MinimalReq[PIN_NMAX][PIN_NMAX] =
};
/**Function TestDuplicateSheetNames( )
* inside a given sheet, one cannot have sheets with duplicate names (file names can be duplicated).
*/
int
TestDuplicateSheetNames
(
)
{
int
err_count
=
0
;
EDA_ScreenList
ScreenList
;
// Created the list of screen
for
(
SCH_SCREEN
*
Screen
=
ScreenList
.
GetFirst
();
Screen
!=
NULL
;
Screen
=
ScreenList
.
GetNext
()
)
{
for
(
SCH_ITEM
*
ref_item
=
Screen
->
EEDrawList
;
ref_item
!=
NULL
;
ref_item
=
ref_item
->
Next
()
)
{
// search for a scheet;
if
(
ref_item
->
Type
()
!=
DRAW_SHEET_STRUCT_TYPE
)
continue
;
for
(
SCH_ITEM
*
item_to_test
=
ref_item
->
Next
();
item_to_test
!=
NULL
;
item_to_test
=
item_to_test
->
Next
()
)
{
if
(
item_to_test
->
Type
()
!=
DRAW_SHEET_STRUCT_TYPE
)
continue
;
// We have found a second sheet: compare names
if
(
(
(
DrawSheetStruct
*
)
ref_item
)
->
m_SheetName
.
CmpNoCase
(
(
(
DrawSheetStruct
*
)
item_to_test
)
->
m_SheetName
)
==
0
)
{
/* Create a new marker type ERC error*/
MARKER_SCH
*
Marker
=
new
MARKER_SCH
();
Marker
->
m_TimeStamp
=
GetTimeStamp
();
Marker
->
SetData
(
ERCE_DUPLICATE_SHEET_NAME
,
(
(
DrawSheetStruct
*
)
item_to_test
)
->
m_Pos
,
_
(
"Duplicate Sheet name"
),
(
(
DrawSheetStruct
*
)
item_to_test
)
->
m_Pos
);
Marker
->
SetMarkerType
(
MARK_ERC
);
Marker
->
SetErrorLevel
(
ERR
);
Marker
->
SetNext
(
Screen
->
EEDrawList
);
Screen
->
EEDrawList
=
Marker
;
err_count
++
;
}
}
}
}
return
err_count
;
}
/**************************************************/
void
DIALOG_ERC
::
TestErc
(
wxArrayString
*
aMessagesList
)
/**************************************************/
...
...
@@ -219,43 +266,10 @@ void DIALOG_ERC::TestErc( wxArrayString* aMessagesList )
/* Test duplicate sheet names
* inside a given sheet, one cannot have sheets with duplicate names (file names can be duplicated).
* Test screens is enought
*/
for
(
SCH_SCREEN
*
Screen
=
ScreenList
.
GetFirst
();
Screen
!=
NULL
;
Screen
=
ScreenList
.
GetNext
()
)
{
for
(
SCH_ITEM
*
ref_item
=
Screen
->
EEDrawList
;
ref_item
!=
NULL
;
ref_item
=
ref_item
->
Next
()
)
{
// serach for a scheet;
if
(
ref_item
->
Type
()
!=
DRAW_SHEET_STRUCT_TYPE
)
continue
;
for
(
SCH_ITEM
*
item_to_test
=
ref_item
->
Next
();
item_to_test
!=
NULL
;
item_to_test
=
item_to_test
->
Next
()
)
{
if
(
item_to_test
->
Type
()
!=
DRAW_SHEET_STRUCT_TYPE
)
continue
;
// We have found a second sheet: compare names
if
(
(
(
DrawSheetStruct
*
)
ref_item
)
->
m_SheetName
.
CmpNoCase
(
(
(
DrawSheetStruct
*
)
item_to_test
)
->
m_SheetName
)
==
0
)
{
/* Create a new marker type ERC error*/
MARKER_SCH
*
Marker
=
new
MARKER_SCH
();
Marker
->
SetData
(
ERCE_DUPLICATE_SHEET_NAME
,
(
(
DrawSheetStruct
*
)
item_to_test
)
->
m_Pos
,
_
(
"Duplicate Sheet name"
),
(
(
DrawSheetStruct
*
)
item_to_test
)
->
m_Pos
);
Marker
->
SetMarkerType
(
MARK_ERC
);
Marker
->
SetErrorLevel
(
ERR
);
Marker
->
SetNext
(
Screen
->
EEDrawList
);
Screen
->
EEDrawList
=
Marker
;
g_EESchemaVar
.
NbErrorErc
++
;
g_EESchemaVar
.
NbWarningErc
++
;
}
}
}
}
int
errcnt
=
TestDuplicateSheetNames
(
);
g_EESchemaVar
.
NbErrorErc
+=
errcnt
;
g_EESchemaVar
.
NbWarningErc
+=
errcnt
;
m_Parent
->
BuildNetListBase
();
...
...
@@ -388,6 +402,7 @@ static void Diagnose( WinEDA_DrawPanel* aPanel,
/* Creation du nouveau marqueur type Erreur ERC */
Marker
=
new
MARKER_SCH
();
Marker
->
m_TimeStamp
=
GetTimeStamp
();
Marker
->
SetMarkerType
(
MARK_ERC
);
Marker
->
SetErrorLevel
(
WAR
);
...
...
@@ -430,7 +445,8 @@ static void Diagnose( WinEDA_DrawPanel* aPanel,
if
(
aMinConn
==
NOC
)
/* 1 seul element dans le net */
{
msg
.
Printf
(
_
(
"Cmp %s, Pin %s (%s) Unconnected"
),
cmp_ref
.
GetData
(),
string_pinnum
.
GetData
(),
MsgPinElectricType
[
ii
]
);
cmp_ref
.
GetData
(),
string_pinnum
.
GetData
(),
MsgPinElectricType
[
ii
]
);
Marker
->
SetData
(
ERCE_PIN_NOT_CONNECTED
,
aNetItemRef
->
m_Start
,
msg
,
...
...
@@ -522,15 +538,15 @@ static void TestOthersItems( WinEDA_DrawPanel* panel,
NetItemTst
=
netstart
;
local_minconn
=
NOC
;
/*
Examen de la liste des Pins connectees a
NetItemRef */
/*
Test pins Pins connected to
NetItemRef */
for
(
;
;
NetItemTst
++
)
{
if
(
NetItemRef
==
NetItemTst
)
continue
;
/*
Est - on toujours dans le meme net ?
*/
if
(
(
NetItemTst
>=
Lim
)
//
fin de liste (donc fin de net)
||
(
NetItemRef
->
GetNet
()
!=
NetItemTst
->
GetNet
()
)
)
//
fin de
net
/*
We examine only a given net. We stop the search if the net changes
*/
if
(
(
NetItemTst
>=
Lim
)
//
End of list
||
(
NetItemRef
->
GetNet
()
!=
NetItemTst
->
GetNet
()
)
)
//
End of
net
{
/* Fin de netcode trouve: Tst connexion minimum */
if
(
(
*
MinConnexion
<
NET_NC
)
...
...
eeschema/load_one_schematic_file.cpp
View file @
baa278a3
...
...
@@ -50,7 +50,6 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen,
DrawPolylineStruct
*
PolylineStruct
;
EDA_DrawLineStruct
*
SegmentStruct
;
DrawBusEntryStruct
*
RaccordStruct
;
MARKER_SCH
*
Marker
;
DrawNoConnectStruct
*
NoConnectStruct
;
int
LineCount
;
wxString
MsgDiag
;
/* Error and log messages */
...
...
@@ -325,6 +324,7 @@ at line %d, aborted" ),
break
;
case
'K'
:
/* It is a Marker item. */
#if 0 // Markers are no more read from file
if( sscanf( SLine, "%s %d %d", Name1, &pos.x, &pos.y ) != 3 )
{
MsgDiag.Printf( wxT( "EESchema file marker struct error line %d, aborted" ),
...
...
@@ -338,7 +338,7 @@ at line %d, aborted" ),
char BufLine[1024];
BufLine[0] = 0;
int errtype = 0;
Marker
=
new
MARKER_SCH
(
);
M
ARKER_SCH* M
arker = new MARKER_SCH( );
ii = ReadDelimitedText( BufLine, Line, 1024 );
int type = (TypeMarker) ( (Name1[0] & 255) - 'A' );
if( type < 0 || type >= MARK_NMAX)
...
...
@@ -360,6 +360,7 @@ at line %d, aborted" ),
Marker->SetNext( screen->EEDrawList );
screen->EEDrawList = Marker;
}
#endif
break
;
case
'T'
:
/* It is a text item. */
...
...
eeschema/onleftclick.cpp
View file @
baa278a3
...
...
@@ -12,6 +12,8 @@
#include "program.h"
#include "libcmp.h"
#include "general.h"
#include "class_marker_sch.h"
#include "protos.h"
static
wxArrayString
s_CmpNameList
;
...
...
@@ -369,6 +371,10 @@ void WinEDA_SchematicFrame::OnLeftDClick( wxDC* DC, const wxPoint& MousePos )
DrawPanel
->
MouseToCursorSchema
();
break
;
case
DRAW_MARKER_STRUCT_TYPE
:
((
MARKER_SCH
*
)
DrawStruct
)
->
DisplayMarkerInfo
(
this
);
break
;
default
:
break
;
}
...
...
include/class_marker_base.h
View file @
baa278a3
...
...
@@ -15,7 +15,7 @@ protected:
std
::
vector
<
wxPoint
>
m_Corners
;
///< Corner list for shape definition (a polygon)
int
m_MarkerType
;
///< Can be used as a flag
EDA_Colors
m_Color
;
///< color
wxSize
m_Size
;
///< Size of the graphic symbol
, used for Hit Tests
EDA_Rect
m_ShapeBoundingBox
;
///< Bounding box of the graphic symbol, relative to the position of the shape
, used for Hit Tests
int
m_ScalingFactor
;
///< Scaling factor for m_Size and m_Corners (can set the physical size
DRC_ITEM
m_drc
;
...
...
@@ -23,7 +23,7 @@ protected:
public
:
MARKER_BASE
(
);
MARKER_BASE
();
/**
* Constructor
...
...
@@ -37,6 +37,7 @@ public:
MARKER_BASE
(
int
aErrorCode
,
const
wxPoint
&
aMarkerPos
,
const
wxString
&
aText
,
const
wxPoint
&
aPos
,
const
wxString
&
bText
,
const
wxPoint
&
bPos
);
/**
* Constructor
* @param aErrorCode The categorizing identifier for an error
...
...
@@ -68,22 +69,24 @@ public:
/** Function SetColor
* Set the color of this marker
*/
void
SetColor
(
EDA_Colors
aColor
)
void
SetColor
(
EDA_Colors
aColor
)
{
m_Color
=
aColor
;
}
/** Function to set/get error levels (warning, fatal ..)
* this value is stored in m_MarkerType
*/
void
SetErrorLevel
(
int
aErrorLevel
)
void
SetErrorLevel
(
int
aErrorLevel
)
{
m_MarkerType
&=
~
0xFF00
;
aErrorLevel
&=
0xFF
;
m_MarkerType
|=
aErrorLevel
<<
8
;
}
int
GetErrorLevel
(
)
const
int
GetErrorLevel
()
const
{
return
(
m_MarkerType
>>
8
)
&
0xFF
;
}
...
...
@@ -92,18 +95,20 @@ public:
/** Functions to set/get marker type (DRC, ERC, or other)
* this value is stored in m_MarkerType
*/
void
SetMarkerType
(
int
aMarkerType
)
void
SetMarkerType
(
int
aMarkerType
)
{
m_MarkerType
&=
~
0xFF
;
aMarkerType
&=
0xFF
;
m_MarkerType
|=
aMarkerType
;
}
int
GetMarkerType
(
)
const
int
GetMarkerType
()
const
{
return
m_MarkerType
&
0xFF
;
}
/**
* Function SetData
* fills in all the reportable data associated with a MARKER.
...
...
@@ -140,6 +145,7 @@ public:
m_drc
.
SetAuxiliaryData
(
aAuxiliaryText
,
aAuxiliaryPos
);
}
/**
* Function GetReporter
* returns the DRC_ITEM held within this MARKER so that its
...
...
include/dialog_display_info_HTML_base.h
View file @
baa278a3
...
...
@@ -16,6 +16,7 @@
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/string.h>
#include <wx/button.h>
#include <wx/sizer.h>
#include <wx/dialog.h>
...
...
@@ -30,10 +31,16 @@ class DIALOG_DISPLAY_HTML_TEXT_BASE : public wxDialog
private
:
protected
:
wxButton
*
m_buttonClose
;
// Virtual event handlers, overide them in your derived class
virtual
void
OnHTMLLinkClicked
(
wxHtmlLinkEvent
&
event
){
event
.
Skip
();
}
virtual
void
OnCloseButtonClick
(
wxCommandEvent
&
event
){
event
.
Skip
();
}
public
:
wxHtmlWindow
*
m_htmlWindow
;
DIALOG_DISPLAY_HTML_TEXT_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
wxEmptyString
,
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
291
,
165
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
DIALOG_DISPLAY_HTML_TEXT_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
wxEmptyString
,
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
431
,
180
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
~
DIALOG_DISPLAY_HTML_TEXT_BASE
();
};
...
...
internat/fr/kicad.mo
View file @
baa278a3
No preview for this file type
internat/fr/kicad.po
View file @
baa278a3
...
...
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: kicad\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-0
8 07:54
+0100\n"
"PO-Revision-Date: 2009-07-0
8 08:02
+0100\n"
"POT-Creation-Date: 2009-07-0
9 08:02
+0100\n"
"PO-Revision-Date: 2009-07-0
9 08:06
+0100\n"
"Last-Translator: \n"
"Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
"MIME-Version: 1.0\n"
...
...
@@ -5707,11 +5707,6 @@ msgstr "Change tous"
msgid "Browse Libs modules"
msgstr "Liste modules"
#: eeschema/dialog_erc.cpp:245
#, c-format
msgid "sheet %s (loc X=%f, Y=%f): %s\n"
msgstr "feuille %s (pos X=%f, Y=%f): %s\n"
#: eeschema/libedit.cpp:35
msgid " Part: "
msgstr "Composant "
...
...
@@ -5817,63 +5812,63 @@ msgstr "Le composant \" %s\" existe, Le changer ?"
msgid "Component %s saved in %s"
msgstr "Composant %s sauvé en %s"
#: eeschema/schedit.cpp:18
7
#: eeschema/schedit.cpp:18
9
msgid "Push/Pop Hierarchy"
msgstr "Naviger dans Hiérarchie"
#: eeschema/schedit.cpp:19
1
#: eeschema/schedit.cpp:19
3
msgid "Add NoConnect Flag"
msgstr "Ajoutde symboles de non connexion"
#: eeschema/schedit.cpp:19
5
#: eeschema/schedit.cpp:19
7
msgid "Add Wire"
msgstr "Ajouter Fils"
#: eeschema/schedit.cpp:
199
#: eeschema/schedit.cpp:
201
msgid "Add Bus"
msgstr "Addition de Bus"
#: eeschema/schedit.cpp:20
7
#: eeschema/schedit.cpp:20
9
msgid "Add Junction"
msgstr "Ajout jonctions"
#: eeschema/schedit.cpp:21
1
#: eeschema/schedit.cpp:21
3
msgid "Add Label"
msgstr "Ajout Label"
#: eeschema/schedit.cpp:21
5
#: eeschema/schedit.cpp:21
7
msgid "Add Global label"
msgstr "Ajout de labels globaux"
#: eeschema/schedit.cpp:2
19
#: eeschema/schedit.cpp:2
21
msgid "Add Hierarchal label"
msgstr "Ajouter Label Hiérarchique"
#: eeschema/schedit.cpp:22
7
#: eeschema/schedit.cpp:22
9
msgid "Add Wire to Bus entry"
msgstr "Addition d'entrées de bus (type fil vers bus)"
#: eeschema/schedit.cpp:23
1
#: eeschema/schedit.cpp:23
3
msgid "Add Bus to Bus entry"
msgstr "Addition d'entrées de bus (type bus vers bus)"
#: eeschema/schedit.cpp:23
5
#: eeschema/schedit.cpp:23
7
msgid "Add Sheet"
msgstr "Ajout de Feuille"
#: eeschema/schedit.cpp:2
39
#: eeschema/schedit.cpp:2
41
msgid "Add PinSheet"
msgstr "Ajout Conn. hiérar."
#: eeschema/schedit.cpp:24
3
#: eeschema/schedit.cpp:24
5
msgid "Import PinSheet"
msgstr "Importer Connecteur de hiérarchie"
#: eeschema/schedit.cpp:24
7
#: eeschema/schedit.cpp:24
9
msgid "Add Component"
msgstr "Ajout Composant"
#: eeschema/schedit.cpp:25
1
#: eeschema/schedit.cpp:25
3
msgid "Add Power"
msgstr "Ajouter Alims"
...
...
@@ -6506,39 +6501,39 @@ msgstr "item non numéroté: %s%s"
msgid "( unit %d)"
msgstr "( Unité %d)"
#: eeschema/annotate.cpp:72
1
#: eeschema/annotate.cpp:72
0
#, c-format
msgid "Error item %s%s"
msgstr "Erreur item %s%s"
#: eeschema/annotate.cpp:72
4
#: eeschema/annotate.cpp:72
3
#, c-format
msgid " unit %d and no more than %d parts"
msgstr " unité %d et plus que %d parts"
#: eeschema/annotate.cpp:76
2
#: eeschema/annotate.cpp:7
91
#: eeschema/annotate.cpp:76
0
#: eeschema/annotate.cpp:7
88
#, c-format
msgid "Multiple item %s%s"
msgstr "Multipleélément %s%s"
#: eeschema/annotate.cpp:76
7
#: eeschema/annotate.cpp:79
6
#: eeschema/annotate.cpp:76
5
#: eeschema/annotate.cpp:79
3
#, c-format
msgid " (unit %d)"
msgstr " ( Unité %d)"
#: eeschema/annotate.cpp:81
8
#: eeschema/annotate.cpp:81
4
#, c-format
msgid "Diff values for %s%d.%c (%s) and %s%d.%c (%s)"
msgstr "Valeurs différentes pour %s%d%c (%s) et %s%d%c (%s)"
#: eeschema/annotate.cpp:82
7
#: eeschema/annotate.cpp:82
3
#, c-format
msgid "Diff values for %s%d%c (%s) and %s%d%c (%s)"
msgstr "Valeurs différentes pour %s%d%c (%s) et %s%d%c (%s)"
#: eeschema/annotate.cpp:8
64
#: eeschema/annotate.cpp:8
59
#, c-format
msgid "duplicate time stamp (%s) for %s%d and %s%d"
msgstr "signature temporelle dupliquée (%s) pour %s%d et %s%d"
...
...
@@ -6583,64 +6578,58 @@ msgstr "Pas de nouveau Label Hiérarchique trouvé"
msgid "Annotation Required!"
msgstr "Numérotation requise!"
#: eeschema/erc.cpp:24
6
#: eeschema/erc.cpp:24
7
msgid "Duplicate Sheet name"
msgstr "Nom de feuille en double"
#: eeschema/erc.cpp:344
msgid "ERC finished, no error\n"
msgstr "ERC finie, pas d'erreur\n"
#: eeschema/erc.cpp:355
#: eeschema/erc.cpp:353
msgid "ERC File"
msgstr "Fichier ERC"
#: eeschema/erc.cpp:35
6
#: eeschema/erc.cpp:35
4
msgid "Electronic rule check file (.erc)|*.erc"
msgstr "Fichier Contrôle des règles électroniques (.erc)|*.erc"
#: eeschema/erc.cpp:40
9
#: eeschema/erc.cpp:40
6
#, c-format
msgid "HLabel %s not connected to SheetLabel"
msgstr "HLabel %s non connecté à SheetLabel"
#: eeschema/erc.cpp:41
3
#: eeschema/erc.cpp:41
0
#, c-format
msgid "SheetLabel %s not connected to HLabel"
msgstr "SheetLabel %s non connecté à HLabel"
#: eeschema/erc.cpp:43
5
#: eeschema/erc.cpp:43
2
#, c-format
msgid "Cmp %s, Pin %s (%s) Unconnected"
msgstr "Cmp %s, Pin %s (%s) Non connectée"
#: eeschema/erc.cpp:4
50
#: eeschema/erc.cpp:4
47
#, c-format
msgid "Cmp %s, Pin %s (%s) not driven (Net %d)"
msgstr "Cmp %s, Pin %s (%s) non pilotée (Net %d)"
#: eeschema/erc.cpp:46
3
#: eeschema/erc.cpp:46
0
msgid "More than 1 Pin connected to UnConnect symbol"
msgstr "Plus de 1 Pin connectée à un symbole de non connexion"
#: eeschema/erc.cpp:475
msgid "Warning"
msgstr "Avertissement"
#: eeschema/erc.cpp:479
msgid "Error"
msgstr "Erreur"
#: eeschema/erc.cpp:486
#, fuzzy, c-format
msgid "Cmp %s, Pin %s (%s) connected to "
msgstr "Cmp %s, Pin %s (%s) Non connectée"
#: eeschema/erc.cpp:49
1
#, c-format
msgid "
%s: Cmp %s, Pin %s (%s) connected to
Cmp %s, Pin %s (%s) (net %d)"
msgstr "
%s: Cmp %s, Pin %s (%s) connectée à Cmp %s, Pin %s (%s) (net %d)
"
#: eeschema/erc.cpp:49
2
#,
fuzzy,
c-format
msgid "Cmp %s, Pin %s (%s) (net %d)"
msgstr "
Cmp %s, Pin %s (%s) Non connectée
"
#: eeschema/erc.cpp:613
msgid "ERC control"
msgstr "Contrôle ERC"
#: eeschema/erc.cpp:609
#, fuzzy
msgid "ERC report"
msgstr "Créer Rapport d'erreur"
#: eeschema/erc.cpp:6
23
#: eeschema/erc.cpp:6
19
msgid ""
"\n"
"***** Sheet / (Root) \n"
...
...
@@ -6648,7 +6637,7 @@ msgstr ""
"\n"
"***** Feuille/ ( Racine)\n"
#: eeschema/erc.cpp:62
8
#: eeschema/erc.cpp:62
4
#, c-format
msgid ""
"\n"
...
...
@@ -6657,12 +6646,7 @@ msgstr ""
"\n"
"***** Feuille %s\n"
#: eeschema/erc.cpp:645
#, c-format
msgid "ERC: %s (X= %2.3f inches, Y= %2.3f inches\n"
msgstr "ERC: %s (X= %2.3f pouces, Y= %2.3f pouces\n"
#: eeschema/erc.cpp:654
#: eeschema/erc.cpp:643
#, c-format
msgid ""
"\n"
...
...
@@ -6679,297 +6663,301 @@ msgstr "Pas de composants trouvés"
msgid "Selection"
msgstr "Sélection"
#: eeschema/onrightclick.cpp:10
5
#: eeschema/onrightclick.cpp:10
8
msgid "Leave Sheet"
msgstr "Quitter sous-feuille"
#: eeschema/onrightclick.cpp:12
1
#: eeschema/onrightclick.cpp:12
4
msgid "Delete Noconn"
msgstr "Supprimer Non Connexion"
#: eeschema/onrightclick.cpp:13
1
#: eeschema/onrightclick.cpp:13
4
msgid "Move Bus Entry"
msgstr "Déplacer Entrée de Bus"
#: eeschema/onrightclick.cpp:13
3
#: eeschema/onrightclick.cpp:13
6
msgid "Set Bus Entry /"
msgstr "Entrée de Bus /"
#: eeschema/onrightclick.cpp:13
5
#: eeschema/onrightclick.cpp:13
8
msgid "Set Bus Entry \\"
msgstr "Entrée de Bus \\"
#: eeschema/onrightclick.cpp:1
37
#: eeschema/onrightclick.cpp:1
40
msgid "Delete Bus Entry"
msgstr "Supprimer Entrée de Bus"
#: eeschema/onrightclick.cpp:23
2
#: eeschema/onrightclick.cpp:23
5
msgid "Move Field"
msgstr "Déplace Champ"
#: eeschema/onrightclick.cpp:23
3
#: eeschema/onrightclick.cpp:23
6
msgid "Rotate Field"
msgstr "Rotation Champ"
#: eeschema/onrightclick.cpp:2
59
#: eeschema/onrightclick.cpp:2
62
msgid "Move Component"
msgstr "Déplace Composant"
#: eeschema/onrightclick.cpp:26
4
#: eeschema/onrightclick.cpp:26
7
msgid "Drag Component"
msgstr "Drag Composant"
#: eeschema/onrightclick.cpp:27
1
#: eeschema/onrightclick.cpp:27
4
msgid "Rotate +"
msgstr "Rotation +"
#: eeschema/onrightclick.cpp:27
5
#: eeschema/onrightclick.cpp:27
8
msgid "Mirror --"
msgstr "Miroir--"
#: eeschema/onrightclick.cpp:2
77
#: eeschema/onrightclick.cpp:2
80
msgid "Mirror ||"
msgstr "Miroir ||"
#: eeschema/onrightclick.cpp:28
3
#: eeschema/onrightclick.cpp:28
6
msgid "Orient Component"
msgstr "Oriente Composant"
#: eeschema/onrightclick.cpp:29
6
#: eeschema/onrightclick.cpp:29
9
msgid "Footprint "
msgstr "Empreinte: "
#: eeschema/onrightclick.cpp:30
1
#: eeschema/onrightclick.cpp:30
4
msgid "Convert"
msgstr "Convert"
#: eeschema/onrightclick.cpp:3
09
#: eeschema/onrightclick.cpp:3
12
#, c-format
msgid "Unit %d %c"
msgstr "Unité %d %c"
#: eeschema/onrightclick.cpp:31
4
#: eeschema/onrightclick.cpp:31
7
msgid "Unit"
msgstr "Unité"
#: eeschema/onrightclick.cpp:3
19
#: eeschema/onrightclick.cpp:3
22
msgid "Edit Component"
msgstr "Edite Composant"
#: eeschema/onrightclick.cpp:32
3
#: eeschema/onrightclick.cpp:32
6
msgid "Copy Component"
msgstr "Copie Composant"
#: eeschema/onrightclick.cpp:32
4
#: eeschema/onrightclick.cpp:32
7
msgid "Delete Component"
msgstr "Suppression Composant"
#: eeschema/onrightclick.cpp:34
3
#: eeschema/onrightclick.cpp:34
6
msgid "Move Global Label"
msgstr "Déplacer Label Global"
#: eeschema/onrightclick.cpp:34
4
#: eeschema/onrightclick.cpp:34
7
msgid "Rotate Global Label"
msgstr "Rot. Label Global"
#: eeschema/onrightclick.cpp:34
5
#: eeschema/onrightclick.cpp:34
8
msgid "Edit Global Label"
msgstr "Editer Label Global"
#: eeschema/onrightclick.cpp:34
6
#: eeschema/onrightclick.cpp:34
9
msgid "Delete Global Label"
msgstr "Supprimer Label Global"
#: eeschema/onrightclick.cpp:35
0
#: eeschema/onrightclick.cpp:40
4
#: eeschema/onrightclick.cpp:4
37
#: eeschema/onrightclick.cpp:35
3
#: eeschema/onrightclick.cpp:40
7
#: eeschema/onrightclick.cpp:4
40
msgid "Change to Hierarchical Label"
msgstr "Changer en Label Hiérarchique"
#: eeschema/onrightclick.cpp:35
2
#: eeschema/onrightclick.cpp:3
77
#: eeschema/onrightclick.cpp:43
5
#: eeschema/onrightclick.cpp:35
5
#: eeschema/onrightclick.cpp:3
80
#: eeschema/onrightclick.cpp:43
8
msgid "Change to Label"
msgstr "Change en Label"
#: eeschema/onrightclick.cpp:35
4
#: eeschema/onrightclick.cpp:3
79
#: eeschema/onrightclick.cpp:40
6
#: eeschema/onrightclick.cpp:35
7
#: eeschema/onrightclick.cpp:3
82
#: eeschema/onrightclick.cpp:40
9
msgid "Change to Text"
msgstr "Change en Texte"
#: eeschema/onrightclick.cpp:35
6
#: eeschema/onrightclick.cpp:38
3
#: eeschema/onrightclick.cpp:41
0
#: eeschema/onrightclick.cpp:44
1
#: eeschema/onrightclick.cpp:35
9
#: eeschema/onrightclick.cpp:38
6
#: eeschema/onrightclick.cpp:41
3
#: eeschema/onrightclick.cpp:44
4
msgid "Change Type"
msgstr "Change Type"
#: eeschema/onrightclick.cpp:37
0
#: eeschema/onrightclick.cpp:37
3
msgid "Move Hierarchical Label"
msgstr "Déplacer Label Hiérarchique"
#: eeschema/onrightclick.cpp:37
1
#: eeschema/onrightclick.cpp:37
4
msgid "Rotate Hierarchical Label"
msgstr "Rot. Label Hiérarchique"
#: eeschema/onrightclick.cpp:37
2
#: eeschema/onrightclick.cpp:37
5
msgid "Edit Hierarchical Label"
msgstr "Editer Label Hiérarchique"
#: eeschema/onrightclick.cpp:37
3
#: eeschema/onrightclick.cpp:37
6
msgid "Delete Hierarchical label"
msgstr "Supprimer Label Hiérarchique"
#: eeschema/onrightclick.cpp:38
1
#: eeschema/onrightclick.cpp:4
08
#: eeschema/onrightclick.cpp:38
4
#: eeschema/onrightclick.cpp:4
11
msgid "Change to Global Label"
msgstr "Change en Label Global"
#: eeschema/onrightclick.cpp:
397
#: eeschema/onrightclick.cpp:
400
msgid "Move Label"
msgstr "Déplace Label"
#: eeschema/onrightclick.cpp:
398
#: eeschema/onrightclick.cpp:
401
msgid "Rotate Label"
msgstr "Rot. Label"
#: eeschema/onrightclick.cpp:
399
#: eeschema/onrightclick.cpp:
402
msgid "Edit Label"
msgstr "Editer Label"
#: eeschema/onrightclick.cpp:40
0
#: eeschema/onrightclick.cpp:40
3
msgid "Delete Label"
msgstr "Supprimer Label"
#: eeschema/onrightclick.cpp:42
4
#: eeschema/onrightclick.cpp:42
7
msgid "Move Text"
msgstr "Déplacer Texte"
#: eeschema/onrightclick.cpp:42
5
#: eeschema/onrightclick.cpp:42
8
msgid "Rotate Text"
msgstr "Rot. Texte"
#: eeschema/onrightclick.cpp:42
6
#: eeschema/onrightclick.cpp:42
9
msgid "Edit Text"
msgstr "Editer Texte"
#: eeschema/onrightclick.cpp:4
27
#: eeschema/onrightclick.cpp:4
30
msgid "Delete Text"
msgstr "Effacer Texte"
#: eeschema/onrightclick.cpp:4
39
#: eeschema/onrightclick.cpp:4
42
msgid "Change to Glabel"
msgstr "Change en Label Global"
#: eeschema/onrightclick.cpp:46
0
#: eeschema/onrightclick.cpp:50
0
#: eeschema/onrightclick.cpp:46
3
#: eeschema/onrightclick.cpp:50
3
msgid "Break Wire"
msgstr "Briser Fil"
#: eeschema/onrightclick.cpp:46
3
#: eeschema/onrightclick.cpp:46
6
msgid "Delete Junction"
msgstr "Supprimer Jonction"
#: eeschema/onrightclick.cpp:4
68
#: eeschema/onrightclick.cpp:49
4
#: eeschema/onrightclick.cpp:4
71
#: eeschema/onrightclick.cpp:49
7
msgid "Delete Node"
msgstr "Supprimer Noeud"
#: eeschema/onrightclick.cpp:47
0
#: eeschema/onrightclick.cpp:49
6
#: eeschema/onrightclick.cpp:47
3
#: eeschema/onrightclick.cpp:49
9
msgid "Delete Connection"
msgstr "Supprimer Connexion"
#: eeschema/onrightclick.cpp:4
87
#: eeschema/onrightclick.cpp:4
90
msgid "Wire End"
msgstr "Terminer Fil"
#: eeschema/onrightclick.cpp:4
89
#: eeschema/onrightclick.cpp:4
92
msgid "Delete Wire"
msgstr "Supprimer Fil"
#: eeschema/onrightclick.cpp:51
0
#: eeschema/onrightclick.cpp:54
2
#: eeschema/onrightclick.cpp:51
3
#: eeschema/onrightclick.cpp:54
5
msgid "Add Global Label"
msgstr "Ajout Label Global"
#: eeschema/onrightclick.cpp:52
6
#: eeschema/onrightclick.cpp:52
9
msgid "Bus End"
msgstr "Terminer Bus"
#: eeschema/onrightclick.cpp:5
29
#: eeschema/onrightclick.cpp:5
32
msgid "Delete Bus"
msgstr "Supprimer Bus"
#: eeschema/onrightclick.cpp:53
3
#: eeschema/onrightclick.cpp:53
6
msgid "Break Bus"
msgstr "Briser Bus"
#: eeschema/onrightclick.cpp:55
5
#: eeschema/onrightclick.cpp:55
8
msgid "Enter Sheet"
msgstr "Entrer dans Feuille"
#: eeschema/onrightclick.cpp:5
57
#: eeschema/onrightclick.cpp:5
60
msgid "Move Sheet"
msgstr "Déplacer Feuille"
#: eeschema/onrightclick.cpp:56
2
#: eeschema/onrightclick.cpp:56
5
msgid "Place Sheet"
msgstr "Placer Feuille"
#: eeschema/onrightclick.cpp:56
6
#: eeschema/onrightclick.cpp:56
9
msgid "Edit Sheet"
msgstr "Editer Feuille"
#: eeschema/onrightclick.cpp:5
67
#: eeschema/onrightclick.cpp:5
70
msgid "Resize Sheet"
msgstr "Redimensionner Feuille"
#: eeschema/onrightclick.cpp:5
69
#: eeschema/onrightclick.cpp:5
72
msgid "Import PinSheets"
msgstr "Importer Connecteur de Hiérarchie"
#: eeschema/onrightclick.cpp:57
3
#: eeschema/onrightclick.cpp:57
6
msgid "Cleanup PinSheets"
msgstr "Nettoyage des Pins Hiérarchiques"
#: eeschema/onrightclick.cpp:57
5
#: eeschema/onrightclick.cpp:57
8
msgid "Delete Sheet"
msgstr "Supprimer Feuille"
#: eeschema/onrightclick.cpp:5
88
#: eeschema/onrightclick.cpp:5
91
msgid "Move PinSheet"
msgstr "Déplace Connecteur de hiérarchie"
#: eeschema/onrightclick.cpp:59
0
#: eeschema/onrightclick.cpp:59
3
msgid "Edit PinSheet"
msgstr "Edit Connecteur de hiérarchie"
#: eeschema/onrightclick.cpp:59
3
#: eeschema/onrightclick.cpp:59
6
msgid "Delete PinSheet"
msgstr "Supprimer Connecteur de hiérarchie"
#: eeschema/onrightclick.cpp:61
0
#: eeschema/onrightclick.cpp:61
3
msgid "Window Zoom"
msgstr "Zoom sur Fenètre"
#: eeschema/onrightclick.cpp:61
6
#: eeschema/onrightclick.cpp:61
9
msgid "Save Block"
msgstr "Sauver Bloc"
#: eeschema/onrightclick.cpp:62
0
#: eeschema/onrightclick.cpp:62
3
msgid "Drag Block"
msgstr "Drag Bloc"
#: eeschema/onrightclick.cpp:62
4
#: eeschema/onrightclick.cpp:62
7
msgid "Mirror Block ||"
msgstr "Miroir Bloc ||"
#: eeschema/onrightclick.cpp:6
28
#: eeschema/onrightclick.cpp:6
31
msgid "Copy to Clipboard"
msgstr "Copie dans Presse papier"
#: eeschema/onrightclick.cpp:643
msgid "About this Marker"
msgstr ""
#: eeschema/edit_label.cpp:48
msgid "Empty Text!"
msgstr "Texte vide"
...
...
@@ -8973,6 +8961,41 @@ msgstr "Librairie <"
msgid "> header read error"
msgstr "> erreur lecture entête"
#: eeschema/class_drc_erc_item.cpp:39
#, fuzzy
msgid "ERC err unspecified"
msgstr "Non specifié"
#: eeschema/class_drc_erc_item.cpp:41
#, fuzzy
msgid "Duplicate sheet names within a given sheet"
msgstr "Nom de feuille en double"
#: eeschema/class_drc_erc_item.cpp:43
msgid "Pin not connected (and no connect symbol found on this pin)"
msgstr "Pin non connectée (pas de symbole de non connexion trouvé sur cette pin)"
#: eeschema/class_drc_erc_item.cpp:45
msgid "Pin connected to some others pins but no pin to drive it"
msgstr "Pin connectée à d'autres pins, mais aucunne pin pour la piloter"
#: eeschema/class_drc_erc_item.cpp:47
msgid "Confict problem between pins. Severity: warning"
msgstr "Problème de conflit entre pins. Sévérité: warning"
#: eeschema/class_drc_erc_item.cpp:49
msgid "Confict problem between pins. Severity: error"
msgstr "Problème de conflit entre pins. Sévérité: erreur"
#: eeschema/class_drc_erc_item.cpp:51
#, fuzzy
msgid "Mismatch between hierarchical labels and pins sheets"
msgstr "Addition de pins de hiérarchie dans les feuilles symboles de hiérarchie"
#: eeschema/class_drc_erc_item.cpp:53
msgid "A no connect symbol is connected to more than 1 pin"
msgstr "Un symbole de non connexion est connecté à plus de une pin"
#: eeschema/dialog_edit_component_in_schematic.cpp:94
#: eeschema/dialog_edit_component_in_schematic.cpp:99
#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:159
...
...
@@ -9010,7 +9033,7 @@ msgstr " a été créé par une version plus récente de Eeschema et peut ne pas
msgid " was created by an older version of EESchema. It will be stored in the new file format when you save this file again."
msgstr " a été créé par une version plus ancienne de Eeschema. Il sera enregistré au nouveau format après la prochaine sauvegarde."
#: eeschema/load_one_schematic_file.cpp:4
09
#: eeschema/load_one_schematic_file.cpp:4
15
msgid "Done Loading "
msgstr "Chargement terminé"
...
...
@@ -9116,45 +9139,51 @@ msgstr "la position X du point %d de la courbe de Bezier n'est pas définie"
msgid "Bezier point %d Y position not defined"
msgstr "la position Y du point %d de la courbe de Bezier n'est pas définie"
#: eeschema/dialog_erc_base.cpp:3
5
#: eeschema/dialog_erc_base.cpp:3
8
msgid "Erc File Report:"
msgstr "Fichier rapport d'erreurs:"
#: eeschema/dialog_erc_base.cpp:4
0
#: eeschema/dialog_erc_base.cpp:4
3
msgid "Total Errors Count: "
msgstr "Nombre Total d'Erreurs: "
#: eeschema/dialog_erc_base.cpp:4
4
#: eeschema/dialog_erc_base.cpp:5
2
#: eeschema/dialog_erc_base.cpp:6
0
#: eeschema/dialog_erc_base.cpp:4
7
#: eeschema/dialog_erc_base.cpp:5
5
#: eeschema/dialog_erc_base.cpp:6
3
msgid "0000"
msgstr "0000"
#: eeschema/dialog_erc_base.cpp:
48
#: eeschema/dialog_erc_base.cpp:
51
msgid "Warnings Count:"
msgstr "Nombre de Warnings:"
#: eeschema/dialog_erc_base.cpp:5
6
#: eeschema/dialog_erc_base.cpp:5
9
msgid "Errors Count:"
msgstr "Nombre d'erreurs:"
#: eeschema/dialog_erc_base.cpp:
74
#: eeschema/dialog_erc_base.cpp:
88
msgid "&Test Erc"
msgstr "&Test Erc"
#: eeschema/dialog_erc_base.cpp:
77
#: eeschema/dialog_erc_base.cpp:
91
msgid "&Del Markers"
msgstr "&Supprimer Marqueurs"
#: eeschema/dialog_erc_base.cpp:87
msgid "Write ERC report"
#: eeschema/dialog_erc_base.cpp:101
#, fuzzy
msgid "Create ERC report"
msgstr "Créer Rapport d'erreur"
#: eeschema/dialog_erc_base.cpp:106
#: eeschema/dialog_erc_base.cpp:108
#, fuzzy
msgid "Markers:"
msgstr "Marqueur"
#: eeschema/dialog_erc_base.cpp:120
msgid "ERC"
msgstr "ERC"
#: eeschema/dialog_erc_base.cpp:1
10
#: eeschema/dialog_erc_base.cpp:1
24
msgid "Reset"
msgstr "Défaut"
...
...
@@ -10239,6 +10268,7 @@ msgid "D code File Ext:"
msgstr "Ext. Fichiers DCodes:"
#: gerbview/select_layers_to_pcb.cpp:220
#: gerbview/tool_gerber.cpp:244
msgid "Layer "
msgstr "Couche "
...
...
@@ -10555,131 +10585,131 @@ msgstr "Fichiers \"Portable document format\" (*.pdf)|*.pdf"
msgid "All files (*)|*"
msgstr "Tous les fichiers (*)|*"
#: common/common.cpp:24
4
#: common/common.cpp:24
5
msgid " (\"):"
msgstr " (\"):"
#: common/common.cpp:33
4
#: common/common.cpp:33
5
msgid " \""
msgstr " \""
#: common/common.cpp:33
8
#: common/common.cpp:33
9
msgid " mm"
msgstr " mm"
#: common/common.cpp:58
8
#: common/common.cpp:58
9
msgid "Copper "
msgstr "Cuivre "
#: common/common.cpp:58
8
#: common/common.cpp:58
9
msgid "Inner L1 "
msgstr "Interne 1"
#: common/common.cpp:58
8
#: common/common.cpp:58
9
msgid "Inner L2 "
msgstr "Interne 2"
#: common/common.cpp:58
8
#: common/common.cpp:58
9
msgid "Inner L3 "
msgstr "Interne 3"
#: common/common.cpp:5
89
#: common/common.cpp:5
90
msgid "Inner L4 "
msgstr "Interne 4"
#: common/common.cpp:5
89
#: common/common.cpp:5
90
msgid "Inner L5 "
msgstr "Interne 5"
#: common/common.cpp:5
89
#: common/common.cpp:5
90
msgid "Inner L6 "
msgstr "Interne 6"
#: common/common.cpp:5
89
#: common/common.cpp:5
90
msgid "Inner L7 "
msgstr "Interne 7"
#: common/common.cpp:59
0
#: common/common.cpp:59
1
msgid "Inner L8 "
msgstr "Interne 8"
#: common/common.cpp:59
0
#: common/common.cpp:59
1
msgid "Inner L9 "
msgstr "Interne 9"
#: common/common.cpp:59
0
#: common/common.cpp:59
1
msgid "Inner L10"
msgstr "Interne 10"
#: common/common.cpp:59
0
#: common/common.cpp:59
1
msgid "Inner L11"
msgstr "Interne 11"
#: common/common.cpp:59
1
#: common/common.cpp:59
2
msgid "Inner L12"
msgstr "Interne 12"
#: common/common.cpp:59
1
#: common/common.cpp:59
2
msgid "Inner L13"
msgstr "Interne 13"
#: common/common.cpp:59
1
#: common/common.cpp:59
2
msgid "Inner L14"
msgstr "Interne 14"
#: common/common.cpp:59
2
#: common/common.cpp:59
3
msgid "Adhes Cop"
msgstr "Adhes Cu "
#: common/common.cpp:59
2
#: common/common.cpp:59
3
msgid "Adhes Cmp"
msgstr "Adhes Cmp"
#: common/common.cpp:59
2
#: common/common.cpp:59
3
msgid "SoldP Cop"
msgstr "SoldP Cu "
#: common/common.cpp:59
2
#: common/common.cpp:59
3
msgid "SoldP Cmp"
msgstr "SoldP Cmp"
#: common/common.cpp:59
3
#: common/common.cpp:59
4
msgid "SilkS Cop"
msgstr "Sérigr Cu "
#: common/common.cpp:59
3
#: common/common.cpp:59
4
msgid "SilkS Cmp"
msgstr "Sérigr Cmp"
#: common/common.cpp:59
3
#: common/common.cpp:59
4
msgid "Mask Cop "
msgstr "Masque Cu "
#: common/common.cpp:59
3
#: common/common.cpp:59
4
msgid "Mask Cmp "
msgstr "Masque Cmp"
#: common/common.cpp:59
4
#: common/common.cpp:59
5
msgid "Drawings "
msgstr "Drawings "
#: common/common.cpp:59
4
#: common/common.cpp:59
5
msgid "Comments "
msgstr "Commentaires "
#: common/common.cpp:59
4
#: common/common.cpp:59
5
msgid "Eco1 "
msgstr "Eco1 "
#: common/common.cpp:59
4
#: common/common.cpp:59
5
msgid "Eco2 "
msgstr "Eco2 "
#: common/common.cpp:59
5
#: common/common.cpp:59
6
msgid "Edges Pcb"
msgstr "Contour Pcb"
#: common/common.cpp:59
5
#: common/common.cpp:59
6
msgid "BAD INDEX"
msgstr "BAD INDEX"
...
...
@@ -10751,6 +10781,14 @@ msgstr "Langue"
msgid "Select application language (only for testing!)"
msgstr "Choisir la langue (seulement pour tests!)"
#: common/confirm.cpp:70
msgid "Warning"
msgstr "Avertissement"
#: common/confirm.cpp:74
msgid "Error"
msgstr "Erreur"
#: common/eda_doc.cpp:151
msgid "Doc File "
msgstr "Fichier de Doc "
...
...
@@ -11452,7 +11490,7 @@ msgstr "Propriétés du texte graphique:"
msgid "Fields Properties"
msgstr "Propriétés des Champs"
#: eeschema/dialog_erc_base.h:
87
#: eeschema/dialog_erc_base.h:
94
msgid "EESchema Erc"
msgstr "EESchema Erc"
...
...
@@ -11612,6 +11650,16 @@ msgstr "DCodes id."
msgid "Page Settings"
msgstr "Ajustage opt Page"
#~ msgid "sheet %s (loc X=%f, Y=%f): %s\n"
#~ msgstr "feuille %s (pos X=%f, Y=%f): %s\n"
#~ msgid "ERC finished, no error\n"
#~ msgstr "ERC finie, pas d'erreur\n"
#~ msgid "%s: Cmp %s, Pin %s (%s) connected to Cmp %s, Pin %s (%s) (net %d)"
#~ msgstr "%s: Cmp %s, Pin %s (%s) connectée à Cmp %s, Pin %s (%s) (net %d)"
#~ msgid "ERC control"
#~ msgstr "Contrôle ERC"
#~ msgid "ERC: %s (X= %2.3f inches, Y= %2.3f inches\n"
#~ msgstr "ERC: %s (X= %2.3f pouces, Y= %2.3f pouces\n"
#~ msgid "Last Warnings: "
#~ msgstr "-> Dern. Warnings: "
#~ msgid "Last Errors: "
...
...
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