Skip to content

K
kicad-source-mirror
Commit 01884b58 authored by charras's avatar charras
Browse files
Options

minor problems fixed.

parent 28868410
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 43 deletions
internat/fr/kicad.mo
View file @ 01884b58
No preview for this file type
internat/fr/kicad.po
View file @ 01884b58
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: kicad\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-03-04 11:58+0100\n"
"PO-Revision-Date: 2010-03-04 11:59+0100\n"
"POT-Creation-Date: 2010-03-07 10:52+0100\n"
"PO-Revision-Date: 2010-03-07 10:57+0100\n"
"Last-Translator: \n"
"Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
"MIME-Version: 1.0\n"
......@@ -2559,20 +2559,26 @@ msgstr "Par Netclass"
msgid "Min track width"
msgstr "Largeur Min Piste"
#: pcbnew/dialog_drc_base.cpp:50
#: pcbnew/dialog_drc_base.cpp:59
#: pcbnew/dialog_drc_base.cpp:68
msgid "In the clearance units, enter the clearance distance"
msgstr "Entrée l'isolation"
#: pcbnew/dialog_drc_base.cpp:47
msgid "Enter the minimum acceptable value for a track width"
msgstr "Entrer la largeur de piste minimale acceptable"
#: pcbnew/dialog_drc_base.cpp:54
msgid "Min via size"
msgstr "Diamètre min via"
#: pcbnew/dialog_drc_base.cpp:56
msgid "Enter the minimum acceptable diameter for a standard via"
msgstr "Entrer le diamètre minimal acceptable pour une via standard"
#: pcbnew/dialog_drc_base.cpp:63
msgid "Min uVia size"
msgstr "Taille min uVia"
#: pcbnew/dialog_drc_base.cpp:65
msgid "Enter the minimum acceptable diameter for a micro via"
msgstr "Entrer le diamètre minimal acceptable pour une micro via"
#: pcbnew/dialog_drc_base.cpp:75
msgid "Create Report File"
msgstr "Créer fichier rapport "
......@@ -6852,15 +6858,19 @@ msgstr "Change Pads du Module"
msgid "Change Pads on Same Modules"
msgstr "Change Pads des Modules id."
#: pcbnew/dialog_pad_properties.cpp:541
#: pcbnew/dialog_pad_properties.cpp:571
msgid "Incorrect value for pad drill: pad drill bigger than pad size"
msgstr "Valeur incorrecte pour diamètre de perçage: perçage plus grand que la taille du pad"
#: pcbnew/dialog_pad_properties.cpp:547
#: pcbnew/dialog_pad_properties.cpp:579
msgid "Error: pad is not a through pad and has a hole"
msgstr "Erreur: ce pad n'est pas tranversant et a un trou"
#: pcbnew/dialog_pad_properties.cpp:587
msgid "Incorrect value for pad offset"
msgstr "Valeur incorrecte pour offset du pad"
#: pcbnew/dialog_pad_properties.cpp:641
#: pcbnew/dialog_pad_properties.cpp:652
msgid "Unknown netname, no change"
msgstr "Net inconnu, pas de changement"
......@@ -13010,6 +13020,8 @@ msgstr "Options d'Affichage"
msgid "Page Settings"
msgstr "Ajustage opt Page"
#~ msgid "In the clearance units, enter the clearance distance"
#~ msgstr "Entrée l'isolation"
#~ msgid "&Run"
#~ msgstr "Exécute&r"
#~ msgid "&Open the file in a Text Editor"
......@@ -13862,8 +13874,6 @@ msgstr "Ajustage opt Page"
#~ msgstr "Orientation"
#~ msgid "Micro Via Size"
#~ msgstr "Diamètre Micro Via"
#~ msgid "Enter the current track width"
#~ msgstr "Entrer la largeur de piste courante"
#~ msgid "This is the clearance between tracks, vias and pads for DRC."
#~ msgstr "Ceci est l'isolation entre pistes, vias et pads pour le calcul DRC."
#~ msgid "Create pins for convert items."
......
pcbnew/dialog_drc_base.cpp
View file @ 01884b58
......@@ -44,29 +44,29 @@ DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID i
m_TrackMinWidthTitle = new wxStaticText( this, wxID_ANY, _("Min track width"), wxDefaultPosition, wxDefaultSize, 0 );
m_TrackMinWidthTitle->Wrap( -1 );
m_TrackMinWidthTitle->SetToolTip( _("Enter the minimum acceptable value for a track width") );
fgMinValuesSizer->Add( m_TrackMinWidthTitle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );
m_SetTrackMinWidthCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_SetTrackMinWidthCtrl->SetToolTip( _("In the clearance units, enter the clearance distance") );
fgMinValuesSizer->Add( m_SetTrackMinWidthCtrl, 0, wxALL|wxEXPAND, 5 );
m_ViaMinTitle = new wxStaticText( this, wxID_ANY, _("Min via size"), wxDefaultPosition, wxDefaultSize, 0 );
m_ViaMinTitle->Wrap( -1 );
m_ViaMinTitle->SetHelpText( _("Enter the minimum acceptable diameter for a standard via") );
fgMinValuesSizer->Add( m_ViaMinTitle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );
m_SetViaMinSizeCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_SetViaMinSizeCtrl->SetToolTip( _("In the clearance units, enter the clearance distance") );
fgMinValuesSizer->Add( m_SetViaMinSizeCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
m_MicroViaMinTitle = new wxStaticText( this, wxID_ANY, _("Min uVia size"), wxDefaultPosition, wxDefaultSize, 0 );
m_MicroViaMinTitle->Wrap( -1 );
m_MicroViaMinTitle->SetToolTip( _("Enter the minimum acceptable diameter for a micro via") );
fgMinValuesSizer->Add( m_MicroViaMinTitle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );
m_SetMicroViakMinSizeCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_SetMicroViakMinSizeCtrl->SetToolTip( _("In the clearance units, enter the clearance distance") );
fgMinValuesSizer->Add( m_SetMicroViakMinSizeCtrl, 0, wxALL|wxEXPAND, 5 );
bSizer7->Add( fgMinValuesSizer, 1, wxEXPAND, 5 );
......
pcbnew/dialog_drc_base.fbp
View file @ 01884b58
......@@ -248,7 +248,7 @@
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="tooltip">Enter the minimum acceptable value for a track width</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
......@@ -299,7 +299,7 @@
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip">In the clearance units, enter the clearance distance</property>
<property name="tooltip"></property>
<property name="value"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
......@@ -339,7 +339,7 @@
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_help">Enter the minimum acceptable diameter for a standard via</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
......@@ -405,7 +405,7 @@
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip">In the clearance units, enter the clearance distance</property>
<property name="tooltip"></property>
<property name="value"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
......@@ -460,7 +460,7 @@
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="tooltip">Enter the minimum acceptable diameter for a micro via</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
......@@ -511,7 +511,7 @@
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip">In the clearance units, enter the clearance distance</property>
<property name="tooltip"></property>
<property name="value"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
......
pcbnew/dialog_pad_properties.cpp
View file @ 01884b58
......@@ -433,7 +433,6 @@ void DIALOG_PAD_PROPERTIES::PadPropertiesAccept( wxCommandEvent& event )
*/
{
long PadLayerMask;
bool error = false;
bool RastnestIsChanged = false;
int internalUnits = m_Parent->m_InternalUnits;
wxString msg;
......@@ -533,23 +532,6 @@ void DIALOG_PAD_PROPERTIES::PadPropertiesAccept( wxCommandEvent& event )
break;
}
/* Test for incorrect values */
if( (g_Pad_Master.m_Size.x < g_Pad_Master.m_Drill.x)
|| (g_Pad_Master.m_Size.y < g_Pad_Master.m_Drill.y) )
{
error = true;
DisplayError( this, _( "Incorrect value for pad drill: pad drill bigger than pad size" ) );
}
if( ( g_Pad_Master.m_Size.x / 2 <= ABS( g_Pad_Master.m_Offset.x ) )
|| ( g_Pad_Master.m_Size.y / 2 <= ABS( g_Pad_Master.m_Offset.y ) ) )
{
error = true;
DisplayError( this, _( "Incorrect value for pad offset" ) );
}
if( error )
return;
PadLayerMask = 0;
if( m_PadLayerCu->GetValue() )
PadLayerMask |= LAYER_BACK;
......@@ -580,6 +562,40 @@ void DIALOG_PAD_PROPERTIES::PadPropertiesAccept( wxCommandEvent& event )
if( m_PadLayerDraft->GetValue() )
PadLayerMask |= DRAW_LAYER;
/* Test for incorrect values */
if( (g_Pad_Master.m_Size.x < g_Pad_Master.m_Drill.x)
|| (g_Pad_Master.m_Size.y < g_Pad_Master.m_Drill.y) )
{
DisplayError( this, _( "Incorrect value for pad drill: pad drill bigger than pad size" ) );
return;
}
int padlayers_mask = PadLayerMask & (LAYER_BACK | LAYER_FRONT);
if( padlayers_mask == 0 )
{
if( g_Pad_Master.m_Size.x || g_Pad_Master.m_Drill.y )
{
DisplayError( this, _( "Error: pad is not on a copper layer and has a hole" ) );
return;
}
}
if( padlayers_mask != (LAYER_BACK | LAYER_FRONT) )
{
if( g_Pad_Master.m_Size.x || g_Pad_Master.m_Drill.y )
{
if( !IsOK(this, _( "Warning: pad is not a through pad and has a hole; Continue?" ) ) )
return;
}
}
if( ( g_Pad_Master.m_Size.x / 2 <= ABS( g_Pad_Master.m_Offset.x ) )
|| ( g_Pad_Master.m_Size.y / 2 <= ABS( g_Pad_Master.m_Offset.y ) ) )
{
DisplayError( this, _( "Incorrect value for pad offset" ) );
return;
}
g_Pad_Master.m_Masque_Layer = PadLayerMask;
if( m_CurrentPad ) // Set current Pad parameters
......
pcbnew/zones_convert_brd_items_to_polygons.cpp
View file @ 01884b58
......@@ -215,12 +215,27 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
int item_clearance;
have_poly_to_substract = false;
D_PAD dummyPad((MODULE*)NULL);
for( MODULE* module = aPcb->m_Modules; module; module = module->Next() )
{
for( D_PAD* pad = module->m_Pads; pad != NULL; pad = pad->Next() )
{
if( !pad->IsOnLayer( GetLayer() ) )
continue;
{ /* Test fo pads that are on top or bottom only and have a hole.
* There are curious pads but they can be used for some components that are inside the
* board (in fact inside the hole. Some photo diodes and Leds are like this)
*/
if( (pad->m_Drill.x == 0) && (pad->m_Drill.y == 0) )
continue;
// Use a dummy pad to calculate a hole shape that have the same dimension as the pad hole
dummyPad.m_Size = pad->m_Drill;
dummyPad.m_Orient = pad->m_Orient;
dummyPad.m_PadShape = pad->m_DrillShape;
dummyPad.m_Pos = pad->m_Pos;
pad = &dummyPad;
}
if( pad->GetNet() != GetNet() )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment