Skip to content

K
kicad-source-mirror
Commit 9eba4f95 authored by charras's avatar charras
Browse files
Options

Solved a bug when creating a new zone outline that could crash pcbnew

parent 544ca4c9
Show whitespace changes
Inline Side-by-side
Showing with 798 additions and 1022 deletions
change_log.txt
View file @ 9eba4f95
......@@ -5,6 +5,14 @@ Started 2007-June-11
Please add newer entries at the top, list the date and your name with
email address.
2008-oct-11 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================
+pcbnew:
Solved a bug when creating a new zone outline that could crash pcbnew
More about copper zones filled without grid (by polygons)
Currently for tests only (work in progress).
now working: Thermal reliefs parameters can be set.
2008-oct-11 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================
+pcbnew:
......
internat/fr/kicad.mo
View file @ 9eba4f95
No preview for this file type
internat/fr/kicad.po
View file @ 9eba4f95
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: kicad\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-10-09 22:04+0100\n"
"PO-Revision-Date: 2008-10-15 13:53+0100\n"
"POT-Creation-Date: 2008-10-16 20:00+0100\n"
"PO-Revision-Date: 2008-10-16 20:06+0100\n"
"Last-Translator: \n"
"Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
"MIME-Version: 1.0\n"
......@@ -36,14 +36,11 @@ msgstr "Net Code"
#: pcbnew/affiche.cpp:53
#: pcbnew/class_board.cpp:551
#: pcbnew/class_module.cpp:1092
#: pcbnew/menubarpcb.cpp:240
msgid "Pads"
msgstr "Pads"
#: pcbnew/affiche.cpp:67
#: pcbnew/class_board.cpp:561
#: pcbnew/plotps.cpp:363
msgid "Vias"
msgstr "Vias"
......@@ -52,7 +49,6 @@ msgid "Net Length"
msgstr "Long. Net:"
#: pcbnew/automove.cpp:207
#: pcbnew/xchgmod.cpp:612
msgid "No Modules!"
msgstr "Pas de Modules"
......@@ -150,62 +146,10 @@ msgid "Include egde layer"
msgstr "Inclure couche Edge"
#: pcbnew/block.cpp:154
#: pcbnew/cotation.cpp:109
#: pcbnew/dialog_edit_module.cpp:122
#: pcbnew/dialog_copper_zones_frame.cpp:107
#: pcbnew/dialog_orient_footprints.cpp:177
#: pcbnew/globaleditpad.cpp:108
#: pcbnew/muonde.cpp:352
#: pcbnew/mirepcb.cpp:103
#: pcbnew/modedit_onclick.cpp:192
#: pcbnew/modedit_onclick.cpp:224
#: pcbnew/pcbtexte.cpp:119
#: pcbnew/sel_layer.cpp:163
#: pcbnew/sel_layer.cpp:322
#: pcbnew/set_color.cpp:357
#: pcbnew/dialog_gendrill.cpp:297
#: pcbnew/onrightclick.cpp:122
#: pcbnew/onrightclick.cpp:136
#: pcbnew/dialog_non_copper_zones_properties.cpp:47
#: eeschema/onrightclick.cpp:98
#: eeschema/onrightclick.cpp:110
#: eeschema/sheetlab.cpp:98
#: eeschema/eelayer.cpp:255
#: eeschema/libedit_onrightclick.cpp:42
#: eeschema/libedit_onrightclick.cpp:57
#: gerbview/onrightclick.cpp:39
#: gerbview/onrightclick.cpp:58
#: gerbview/options.cpp:169
#: gerbview/options.cpp:293
#: gerbview/reglage.cpp:112
#: gerbview/set_color.cpp:329
#: common/displlst.cpp:111
#: common/selcolor.cpp:171
#: common/get_component_dialog.cpp:121
#: share/svg_print.cpp:239
msgid "Cancel"
msgstr "Annuler"
#: pcbnew/block.cpp:157
#: pcbnew/cotation.cpp:105
#: pcbnew/dialog_edit_module.cpp:118
#: pcbnew/dialog_orient_footprints.cpp:174
#: pcbnew/muonde.cpp:348
#: pcbnew/mirepcb.cpp:99
#: pcbnew/pcbtexte.cpp:114
#: pcbnew/sel_layer.cpp:159
#: pcbnew/sel_layer.cpp:318
#: pcbnew/set_color.cpp:353
#: pcbnew/dialog_gendrill.cpp:292
#: pcbnew/dialog_non_copper_zones_properties.cpp:43
#: eeschema/sheetlab.cpp:94
#: eeschema/eelayer.cpp:251
#: gerbview/options.cpp:165
#: gerbview/options.cpp:289
#: gerbview/reglage.cpp:108
#: gerbview/set_color.cpp:325
#: common/displlst.cpp:106
#: common/get_component_dialog.cpp:112
msgid "OK"
msgstr "OK"
......@@ -254,48 +198,30 @@ msgid "Connect"
msgstr "Connect"
#: pcbnew/class_board.cpp:576
#: eeschema/eelayer.h:115
msgid "NoConn"
msgstr "Non Conn"
#: pcbnew/class_board_item.cpp:23
#: pcbnew/dialog_display_options.cpp:221
#: pcbnew/dialog_display_options.cpp:229
#: pcbnew/dialog_display_options.cpp:266
#: pcbnew/dialog_copper_zones_frame.cpp:77
#: pcbnew/pcbplot.cpp:415
#: pcbnew/dialog_non_copper_zones_properties.cpp:28
#: gerbview/options.cpp:321
msgid "Line"
msgstr "Ligne"
#: pcbnew/class_board_item.cpp:24
#: pcbnew/dialog_pad_edit.cpp:198
msgid "Rect"
msgstr "Rect"
#: pcbnew/class_board_item.cpp:25
#: pcbnew/class_drawsegment.cpp:311
msgid "Arc"
msgstr "Arc"
#: pcbnew/class_board_item.cpp:26
#: pcbnew/class_drawsegment.cpp:307
#: pcbnew/class_track.cpp:879
#: pcbnew/dialog_pad_edit.cpp:176
#: pcbnew/dialog_pad_edit.cpp:196
msgid "Circle"
msgstr "Cercle"
#: pcbnew/class_board_item.cpp:57
#: pcbnew/class_pad.cpp:909
msgid "Net"
msgstr "Net"
#: pcbnew/class_board_item.cpp:62
#: eeschema/dialog_build_BOM.cpp:298
#: eeschema/component_class.cpp:110
#: eeschema/edit_component_in_schematic.cpp:837
msgid "Footprint"
msgstr "Module"
......@@ -339,20 +265,10 @@ msgid "Pcb Text"
msgstr "Texte Pcb"
#: pcbnew/class_board_item.cpp:100
#: pcbnew/dialog_netlist.cpp:162
#: eeschema/dialog_create_component.cpp:167
#: eeschema/onrightclick.cpp:307
#: eeschema/edit_component_in_schematic.cpp:759
#: eeschema/eelayer.h:152
msgid "Reference"
msgstr "Référence"
#: pcbnew/class_board_item.cpp:104
#: pcbnew/class_edge_mod.cpp:287
#: pcbnew/class_text_mod.cpp:488
#: eeschema/component_class.cpp:109
#: eeschema/edit_component_in_schematic.cpp:797
#: eeschema/eelayer.h:158
msgid "Value"
msgstr "Valeur"
......@@ -363,8 +279,6 @@ msgid " of "
msgstr " de "
#: pcbnew/class_board_item.cpp:109
#: pcbnew/class_text_mod.cpp:488
#: pcbnew/class_text_mod.cpp:497
msgid "Text"
msgstr "Texte"
......@@ -373,24 +287,19 @@ msgid "Graphic"
msgstr "Graphique"
#: pcbnew/class_board_item.cpp:127
#: pcbnew/class_track.cpp:841
#: pcbnew/pcbframe.cpp:467
msgid "Track"
msgstr "Piste"
#: pcbnew/class_board_item.cpp:134
#: pcbnew/class_board_item.cpp:205
#: pcbnew/dialog_copper_zones_frame.cpp:143
msgid "Net:"
msgstr "Net:"
#: pcbnew/class_board_item.cpp:139
#: pcbnew/class_zone.cpp:759
msgid "Zone Outline"
msgstr "Contour de Zone"
#: pcbnew/class_board_item.cpp:144
#: pcbnew/class_zone.cpp:763
msgid "(Cutout)"
msgstr "(Cutout)"
......@@ -399,17 +308,14 @@ msgid "Not on copper layer"
msgstr "Pas sur Couches Cuivre"
#: pcbnew/class_board_item.cpp:167
#: pcbnew/class_zone.cpp:785
msgid "Not Found"
msgstr " Non Trouvé"
#: pcbnew/class_board_item.cpp:173
#: pcbnew/class_track.cpp:845
msgid "Zone"
msgstr "Zone"
#: pcbnew/class_board_item.cpp:191
#: pcbnew/pcbframe.cpp:499
msgid "Via"
msgstr "Via"
......@@ -418,12 +324,10 @@ msgid "Blind/Buried"
msgstr "Borgne/Aveugle"
#: pcbnew/class_board_item.cpp:197
#: pcbnew/pcbnew.h:292
msgid "Micro Via"
msgstr "Micro Via"
#: pcbnew/class_board_item.cpp:220
#: pcbnew/class_marker.cpp:133
msgid "Marker"
msgstr "Marqueur"
......@@ -443,8 +347,7 @@ msgstr "dimension"
#: pcbnew/class_marker.cpp:133
#: pcbnew/class_text_mod.cpp:503
#: pcbnew/class_track.cpp:852
#: pcbnew/class_zone.cpp:766
#: gerbview/affiche.cpp:94
#: pcbnew/class_zone.cpp:774
msgid "Type"
msgstr "Type"
......@@ -467,10 +370,7 @@ msgstr "Segment"
#: pcbnew/class_pcb_text.cpp:190
#: pcbnew/class_text_mod.cpp:516
#: pcbnew/class_track.cpp:909
#: pcbnew/class_zone.cpp:800
#: pcbnew/dialog_edit_module.cpp:262
#: pcbnew/sel_layer.cpp:146
#: gerbview/affiche.cpp:110
#: pcbnew/class_zone.cpp:808
msgid "Layer"
msgstr "Couche"
......@@ -479,19 +379,10 @@ msgstr "Couche"
#: pcbnew/class_pcb_text.cpp:204
#: pcbnew/class_text_mod.cpp:528
#: pcbnew/class_track.cpp:932
#: pcbnew/cotation.cpp:129
#: pcbnew/dialog_edit_mod_text.cpp:254
#: pcbnew/mirepcb.cpp:113
#: pcbnew/pcbtexte.cpp:133
#: eeschema/affiche.cpp:188
#: eeschema/dialog_cmp_graphic_properties.cpp:189
#: gerbview/affiche.cpp:52
#: gerbview/affiche.cpp:114
msgid "Width"
msgstr "Epaisseur"
#: pcbnew/class_drc_item.cpp:39
#: pcbnew/dialog_drc.cpp:484
msgid "Unconnected pads"
msgstr "Pads non connectés"
......@@ -559,7 +450,6 @@ msgstr "Seg"
#: pcbnew/class_module.cpp:1107
#: pcbnew/class_pad.cpp:903
#: pcbnew/class_text_mod.cpp:494
#: cvpcb/setvisu.cpp:31
msgid "Module"
msgstr "Module"
......@@ -596,9 +486,6 @@ msgstr "Stat"
#: pcbnew/class_pad.cpp:1035
#: pcbnew/class_pcb_text.cpp:201
#: pcbnew/class_text_mod.cpp:525
#: pcbnew/dialog_edit_module.cpp:273
#: eeschema/affiche.cpp:117
#: gerbview/affiche.cpp:49
msgid "Orient"
msgstr "Orient"
......@@ -625,14 +512,12 @@ msgstr "RefP"
#: pcbnew/class_pad.cpp:1006
#: pcbnew/class_pcb_text.cpp:207
#: pcbnew/class_text_mod.cpp:531
#: gerbview/affiche.cpp:55
msgid "H Size"
msgstr "Taille H"
#: pcbnew/class_pad.cpp:1010
#: pcbnew/class_pcb_text.cpp:210
#: pcbnew/class_text_mod.cpp:534
#: gerbview/affiche.cpp:58
msgid "V Size"
msgstr "Taille V"
......@@ -655,38 +540,25 @@ msgid "Y pos"
msgstr "Y pos"
#: pcbnew/class_pcb_text.cpp:186
#: gerbview/affiche.cpp:29
msgid "COTATION"
msgstr "COTATION"
#: pcbnew/class_pcb_text.cpp:188
#: gerbview/affiche.cpp:32
msgid "PCB Text"
msgstr "Texte Pcb"
#: pcbnew/class_pcb_text.cpp:194
#: pcbnew/class_text_mod.cpp:522
#: pcbnew/cotation.cpp:113
#: pcbnew/modedit_onclick.cpp:243
#: pcbnew/pcbtexte.cpp:180
#: gerbview/affiche.cpp:40
#: share/dialog_print.cpp:198
msgid "Mirror"
msgstr "Miroir"
#: pcbnew/class_pcb_text.cpp:196
#: pcbnew/class_text_mod.cpp:506
#: pcbnew/dialog_display_options.cpp:275
#: eeschema/dialog_options.cpp:280
#: gerbview/affiche.cpp:43
msgid "No"
msgstr "Non"
#: pcbnew/class_pcb_text.cpp:198
#: pcbnew/class_text_mod.cpp:508
#: pcbnew/dialog_display_options.cpp:274
#: eeschema/dialog_options.cpp:279
#: gerbview/affiche.cpp:45
msgid "Yes"
msgstr "Oui"
......@@ -695,29 +567,20 @@ msgid "Ref."
msgstr "Ref."
#: pcbnew/class_text_mod.cpp:509
#: pcbnew/cotation.cpp:114
#: pcbnew/dialog_edit_mod_text.cpp:291
#: pcbnew/pcbtexte.cpp:181
#: pcbnew/dialog_general_options.cpp:289
#: eeschema/affiche.cpp:92
#: gerbview/options.cpp:176
#: gerbview/tool_gerber.cpp:113
msgid "Display"
msgstr "Affichage"
#: pcbnew/class_track.cpp:868
#: pcbnew/class_zone.cpp:788
#: pcbnew/zones_by_polygon.cpp:897
#: pcbnew/class_zone.cpp:796
msgid "NetName"
msgstr "NetName"
#: pcbnew/class_track.cpp:873
#: pcbnew/class_zone.cpp:796
#: pcbnew/class_zone.cpp:804
msgid "NetCode"
msgstr "NetCode"
#: pcbnew/class_track.cpp:881
#: pcbnew/dialog_pad_edit.cpp:205
msgid "Standard"
msgstr "Standard"
......@@ -725,27 +588,27 @@ msgstr "Standard"
msgid "Diam"
msgstr "Diam"
#: pcbnew/class_zone.cpp:791
#: pcbnew/class_zone.cpp:799
msgid "Non Copper Zone"
msgstr "Zone non Cuivre"
#: pcbnew/class_zone.cpp:804
#: pcbnew/class_zone.cpp:812
msgid "Corners"
msgstr "Sommets"
#: pcbnew/class_zone.cpp:810
#: pcbnew/class_zone.cpp:818
msgid "No Grid"
msgstr "Pas de Grille"
#: pcbnew/class_zone.cpp:811
#: pcbnew/class_zone.cpp:819
msgid "Fill Grid"
msgstr "Grille de Remplissage"
#: pcbnew/class_zone.cpp:816
#: pcbnew/class_zone.cpp:824
msgid "Hatch lines"
msgstr "Lignes de Hachure"
#: pcbnew/class_zone.cpp:822
#: pcbnew/class_zone.cpp:830
msgid "Corners in DrawList"
msgstr "Sommets en Liste de dessin"
......@@ -770,10 +633,6 @@ msgid "Merge"
msgstr "Merge"
#: pcbnew/clean.cpp:464
#: pcbnew/dialog_pad_edit.cpp:186
#: eeschema/dialog_edit_component_in_schematic.cpp:172
#: eeschema/dialog_erc.cpp:193
#: eeschema/dialog_erc.cpp:197
msgid "0"
msgstr "0"
......@@ -877,7 +736,6 @@ msgstr ""
" %s's \"texte module\" de %s."
#: pcbnew/controle.cpp:172
#: pcbnew/modedit.cpp:76
msgid "Selection Clarification"
msgstr "Clarification de la Sélection"
......@@ -888,30 +746,15 @@ msgstr "Propriétés des Cotes"
#: pcbnew/cotation.cpp:113
#: pcbnew/dialog_edit_module.cpp:270
#: pcbnew/dialog_edit_module.cpp:316
#: pcbnew/muonde.cpp:360
#: pcbnew/pcbtexte.cpp:180
#: eeschema/onrightclick.cpp:293
#: eeschema/dialog_edit_component_in_schematic.cpp:181
#: eeschema/dialog_options.cpp:247
#: eeschema/component_wizard/component_setup_frame.cpp:50
msgid "Normal"
msgstr "Normal"
#: pcbnew/cotation.cpp:125
#: pcbnew/muonde.cpp:367
#: pcbnew/mirepcb.cpp:108
#: pcbnew/pcbtexte.cpp:129
#: eeschema/sheet.cpp:177
#: eeschema/sheet.cpp:183
#: eeschema/pinedit-dialog.cpp:208
#: eeschema/pinedit-dialog.cpp:214
#: common/wxwineda.cpp:91
msgid "Size"
msgstr "Taille "
#: pcbnew/cotation.cpp:133
#: pcbnew/dialog_copper_zones_frame.cpp:150
#: gerbview/affiche.cpp:37
#: pcbnew/dialog_copper_zones_frame.cpp:198
msgid "Layer:"
msgstr "Couche:"
......@@ -949,9 +792,6 @@ msgstr "Pistes et vias"
#: pcbnew/dialog_display_options.cpp:231
#: pcbnew/dialog_display_options.cpp:244
#: pcbnew/dialog_display_options.cpp:268
#: pcbnew/pcbplot.cpp:415
#: gerbview/options.cpp:298
#: gerbview/options.cpp:321
msgid "Sketch"
msgstr "Contour"
......@@ -960,10 +800,6 @@ msgstr "Contour"
#: pcbnew/dialog_display_options.cpp:230
#: pcbnew/dialog_display_options.cpp:245
#: pcbnew/dialog_display_options.cpp:267
#: pcbnew/pcbplot.cpp:415
#: eeschema/dialog_cmp_graphic_properties.cpp:169
#: gerbview/options.cpp:298
#: gerbview/options.cpp:321
msgid "Filled"
msgstr "Plein"
......@@ -973,8 +809,6 @@ msgstr "Pistes:"
#: pcbnew/dialog_display_options.cpp:198
#: pcbnew/dialog_display_options.cpp:208
#: pcbnew/dialog_general_options.cpp:451
#: pcbnew/dialog_general_options.cpp:466
msgid "Always"
msgstr "Toujours"
......@@ -984,8 +818,6 @@ msgstr "Nouvelle piste"
#: pcbnew/dialog_display_options.cpp:200
#: pcbnew/dialog_display_options.cpp:206
#: pcbnew/dialog_general_options.cpp:449
#: pcbnew/dialog_general_options.cpp:464
msgid "Never"
msgstr "Jamais"
......@@ -1034,12 +866,10 @@ msgid "Show Pad NoConnect"
msgstr "Montrer non conn"
#: pcbnew/dialog_display_options.cpp:269
#: gerbview/options.cpp:322
msgid "Display other items:"
msgstr "Afficher autres éléments"
#: pcbnew/dialog_display_options.cpp:276
#: eeschema/dialog_options.cpp:281
msgid "Show page limits"
msgstr " Afficher limites de page"
......@@ -1049,24 +879,6 @@ msgstr " Afficher limites de page"
#: pcbnew/dialog_track_options.cpp:322
#: pcbnew/dialog_graphic_items_options.cpp:263
#: pcbnew/dialog_initpcb.cpp:161
#: pcbnew/set_grid.cpp:171
#: pcbnew/swap_layers.cpp:223
#: pcbnew/dialog_general_options.cpp:479
#: pcbnew/dialog_pad_edit.cpp:215
#: eeschema/dialog_create_component.cpp:198
#: eeschema/dialog_cmp_graphic_properties.cpp:178
#: eeschema/dialog_edit_component_in_schematic.cpp:241
#: eeschema/dialog_edit_label.cpp:181
#: eeschema/dialog_options.cpp:288
#: eeschema/symbtext.cpp:177
#: eeschema/dialog_build_BOM.cpp:344
#: eeschema/sheet.cpp:198
#: eeschema/pinedit-dialog.cpp:242
#: eeschema/dialog_edit_component_in_lib.cpp:221
#: cvpcb/dialog_display_options.cpp:187
#: cvpcb/dialog_cvpcb_config.cpp:138
#: gerbview/select_layers_to_pcb.cpp:285
#: share/setpage.cpp:444
msgid "&OK"
msgstr "&OK"
......@@ -1076,33 +888,11 @@ msgstr "&OK"
#: pcbnew/dialog_track_options.cpp:328
#: pcbnew/dialog_graphic_items_options.cpp:267
#: pcbnew/dialog_initpcb.cpp:164
#: pcbnew/set_grid.cpp:176
#: pcbnew/swap_layers.cpp:227
#: pcbnew/dialog_general_options.cpp:485
#: pcbnew/dialog_pad_edit.cpp:219
#: eeschema/dialog_create_component.cpp:203
#: eeschema/dialog_cmp_graphic_properties.cpp:183
#: eeschema/dialog_edit_component_in_schematic.cpp:233
#: eeschema/dialog_edit_label.cpp:186
#: eeschema/dialog_options.cpp:293
#: eeschema/symbtext.cpp:182
#: eeschema/netlist_control.cpp:144
#: eeschema/netlist_control.cpp:267
#: eeschema/sheet.cpp:194
#: eeschema/pinedit-dialog.cpp:238
#: eeschema/dialog_edit_component_in_lib.cpp:217
#: cvpcb/dialog_display_options.cpp:192
#: gerbview/select_layers_to_pcb.cpp:289
#: share/setpage.cpp:448
msgid "&Cancel"
msgstr "&Annuler"
#: pcbnew/dialog_drc.cpp:430
#: pcbnew/dialog_netlist.cpp:193
#: eeschema/dialog_create_component.cpp:179
#: eeschema/dialog_edit_component_in_schematic.cpp:202
#: eeschema/dialog_erc.cpp:239
#: eeschema/dialog_edit_component_in_lib.cpp:169
msgid "Options"
msgstr "Options"
......@@ -1148,7 +938,6 @@ msgid "Include tests for clearances between pad to pads"
msgstr "Inclure test de l'isolation entre pads"
#: pcbnew/dialog_drc.cpp:478
#: pcbnew/onrightclick.cpp:649
msgid "Zones"
msgstr "Zones"
......@@ -1242,12 +1031,10 @@ msgid "3D settings"
msgstr "3D Caract"
#: pcbnew/dialog_edit_module.cpp:184
#: common/wxwineda.cpp:171
msgid "X"
msgstr "X"
#: pcbnew/dialog_edit_module.cpp:185
#: common/wxwineda.cpp:180
msgid "Y"
msgstr "Y"
......@@ -1256,18 +1043,14 @@ msgid "Change module(s)"
msgstr "Change module(s)"
#: pcbnew/dialog_edit_module.cpp:191
#: pcbnew/modedit_onclick.cpp:250
msgid "Edit Module"
msgstr "Edit Module"
#: pcbnew/dialog_edit_module.cpp:195
#: pcbnew/pcbtexte.cpp:137
msgid "Position"
msgstr "Position"
#: pcbnew/dialog_edit_module.cpp:220
#: eeschema/onrightclick.cpp:343
#: eeschema/dialog_edit_component_in_lib.cpp:206
msgid "Doc"
msgstr "Doc"
......@@ -1284,7 +1067,6 @@ msgid "Add Field"
msgstr "Ajouter Champ"
#: pcbnew/dialog_edit_module.cpp:249
#: eeschema/onrightclick.cpp:248
msgid "Edit Field"
msgstr "Editer Champ"
......@@ -1293,7 +1075,6 @@ msgid "Delete Field"
msgstr "Supprimer Champ"
#: pcbnew/dialog_edit_module.cpp:261
#: common/common.cpp:376
msgid "Component"
msgstr "Composant"
......@@ -1302,7 +1083,6 @@ msgid "Copper"
msgstr "Cuivre"
#: pcbnew/dialog_edit_module.cpp:270
#: pcbnew/dialog_pad_edit.cpp:190
msgid "User"
msgstr "User"
......@@ -1371,7 +1151,6 @@ msgid "3D Shape Name"
msgstr "3D forme"
#: pcbnew/dialog_edit_module.cpp:422
#: eeschema/dialog_eeschema_config.cpp:231
msgid "Browse"
msgstr "Examiner"
......@@ -1442,7 +1221,6 @@ msgid "vertical"
msgstr "Vertical"
#: pcbnew/dialog_edit_mod_text.cpp:282
#: pcbnew/pcbtexte.cpp:156
msgid "Orientation"
msgstr "Orientation"
......@@ -1459,139 +1237,182 @@ msgid "Value:"
msgstr "Valeur:"
#: pcbnew/dialog_edit_mod_text.cpp:384
#: pcbnew/pcbtexte.cpp:123
#: eeschema/sheetlab.cpp:102
msgid "Text:"
msgstr "Texte:"
#: pcbnew/dialog_copper_zones_frame.cpp:34
msgid "Zone fill options"
msgstr "Options de remplissage de zone:"
#: pcbnew/dialog_copper_zones_frame.cpp:33
msgid "Zone Setup:"
msgstr "Options Zone:"
#: pcbnew/dialog_copper_zones_frame.cpp:39
msgid "Zone Fill Options:"
msgstr "Options Remplissage Zone:"
#: pcbnew/dialog_copper_zones_frame.cpp:36
#: pcbnew/dialog_copper_zones_frame.cpp:41
msgid "0.00000"
msgstr "0.00000"
#: pcbnew/dialog_copper_zones_frame.cpp:36
msgid "No Grid (For tests only!)"
#: pcbnew/dialog_copper_zones_frame.cpp:41
msgid "No grid (For tests only!)"
msgstr "Pas de grille (pour tests)"
#: pcbnew/dialog_copper_zones_frame.cpp:38
#: pcbnew/dialog_copper_zones_frame.cpp:43
msgid "Grid Size for Filling:"
msgstr "Taille de Grille pour Remplissage:"
#: pcbnew/dialog_copper_zones_frame.cpp:42
msgid "Zone clearance value (mm):"
msgstr "Valeur isolation zone (mm):"
#: pcbnew/dialog_copper_zones_frame.cpp:49
#: pcbnew/dialog_copper_zones_frame.cpp:47
msgid "Include pads"
msgstr "Inclure oads"
msgstr "Inclure pads"
#: pcbnew/dialog_copper_zones_frame.cpp:49
#: pcbnew/dialog_copper_zones_frame.cpp:47
msgid "Thermal relief"
msgstr "Frein thermique"
#: pcbnew/dialog_copper_zones_frame.cpp:49
#: pcbnew/dialog_copper_zones_frame.cpp:47
msgid "Exclude pads"
msgstr "Exclure pads"
#: pcbnew/dialog_copper_zones_frame.cpp:51
msgid "Pad in zone:"
msgstr "Pads en zone:"
#: pcbnew/dialog_copper_zones_frame.cpp:49
msgid "Pad in Zone:"
msgstr "Pad en Zone:"
#: pcbnew/dialog_copper_zones_frame.cpp:54
msgid "Thermal Reliefs Parameters"
msgstr "Pramètres FreinsThermiques"
#: pcbnew/dialog_copper_zones_frame.cpp:56
msgid "Antipad Size"
msgstr "Taille AntiPad"
#: pcbnew/dialog_copper_zones_frame.cpp:61
msgid "Define the gap around the pad"
msgstr "Definit l'espace autour du pad"
#: pcbnew/dialog_copper_zones_frame.cpp:66
#: pcbnew/dialog_copper_zones_frame.cpp:65
msgid "Copper Width"
msgstr "Epaisseur Cuivre"
#: pcbnew/dialog_copper_zones_frame.cpp:70
msgid "Define the tickness of copper in therma reliefs"
msgstr "Définit l'épaisseur du cuivre dans les freins thermiques"
#: pcbnew/dialog_copper_zones_frame.cpp:90
msgid "Outlines Options:"
msgstr "Options des Contours:"
#: pcbnew/dialog_copper_zones_frame.cpp:68
#: pcbnew/dialog_non_copper_zones_properties.cpp:34
#: eeschema/dialog_options.cpp:273
#: pcbnew/dialog_copper_zones_frame.cpp:92
msgid "Any"
msgstr "Tout"
#: pcbnew/dialog_copper_zones_frame.cpp:68
#: pcbnew/dialog_copper_zones_frame.cpp:92
msgid "H , V and 45 deg"
msgstr "H, V et 45 deg"
#: pcbnew/dialog_copper_zones_frame.cpp:70
#: pcbnew/dialog_copper_zones_frame.cpp:94
msgid "Zone edges orient:"
msgstr "Direction contours zone:"
#: pcbnew/dialog_copper_zones_frame.cpp:77
#: pcbnew/dialog_non_copper_zones_properties.cpp:28
msgid "Hatched Outline"
msgstr "Contour Hachuré"
#: pcbnew/dialog_copper_zones_frame.cpp:98
msgid "Hatched outline"
msgstr "Contour hachuré"
#: pcbnew/dialog_copper_zones_frame.cpp:77
#: pcbnew/dialog_non_copper_zones_properties.cpp:28
msgid "Full Hatched"
msgstr "Pleinement Hachuré"
#: pcbnew/dialog_copper_zones_frame.cpp:98
msgid "Full hatched"
msgstr "Pleinement hachuré"
#: pcbnew/dialog_copper_zones_frame.cpp:79
#: pcbnew/dialog_copper_zones_frame.cpp:100
msgid "Outlines Appearance"
msgstr "Aspect des Contours"
#: pcbnew/dialog_copper_zones_frame.cpp:81
#: pcbnew/dialog_copper_zones_frame.cpp:102
msgid ""
"How a zone outline is shoved:\n"
"Single line\n"
"Short hatching\n"
"Full area hatched"
"Choose how a zone outline is displayed\n"
"- Single line\n"
"- Short hatching\n"
"- Full zone area hatched"
msgstr ""
"Choisir comment un coutour de zone est affiché\n"
"- Ligne simple\n"
"- Hachures courtes\n"
"- Hachures sur toute la surface"
#: pcbnew/dialog_copper_zones_frame.cpp:85
#: pcbnew/dialog_copper_zones_frame.cpp:106
msgid "16 segments / 360 deg"
msgstr "16 segments / 360 deg"
#: pcbnew/dialog_copper_zones_frame.cpp:85
#: pcbnew/dialog_copper_zones_frame.cpp:106
msgid "32 segments / 360 deg"
msgstr "32 segments / 360 deg"
#: pcbnew/dialog_copper_zones_frame.cpp:87
#: pcbnew/dialog_copper_zones_frame.cpp:108
msgid "Arcs Approximation:"
msgstr "Approximations des arcs:"
#: pcbnew/dialog_copper_zones_frame.cpp:89
#: pcbnew/dialog_copper_zones_frame.cpp:110
msgid ""
"Number of segments to approximate a circle in filling calculations.\n"
"16 segment is faster to calculate and when redraw screen.\n"
"32 segment give a better quality"
msgstr ""
#: pcbnew/dialog_copper_zones_frame.cpp:103
#: pcbnew/zone_filling_algorithm.cpp:247
#: pcbnew/dialog_copper_zones_frame.cpp:115
msgid "Others Options:"
msgstr "Autres Options:"
#: pcbnew/dialog_copper_zones_frame.cpp:117
msgid "Show filled areas in sketch mode"
msgstr "Affichersurfaces remplies en mode contour"
#: pcbnew/dialog_copper_zones_frame.cpp:119
msgid ""
"If enabled, filled areas in is this zone will be displayed as non filled polygons.\n"
"If disabled, filled areas in is this zone will be displayed as \"solid\" areas (normal mode)."
msgstr ""
#: pcbnew/dialog_copper_zones_frame.cpp:123
msgid "Zone clearance value (mm):"
msgstr "Valeur isolation zone (mm):"
#: pcbnew/dialog_copper_zones_frame.cpp:134
msgid "Export to others zones"
msgstr "Exporter vers autres zones"
#: pcbnew/dialog_copper_zones_frame.cpp:135
msgid "Export this zone setup to all others copper zones"
msgstr ""
#: pcbnew/dialog_copper_zones_frame.cpp:151
msgid "Ok"
msgstr "Ok"
#: pcbnew/dialog_copper_zones_frame.cpp:110
msgid "Unfill zone"
msgstr "Vider zone"
#: pcbnew/dialog_copper_zones_frame.cpp:158
msgid "Remove Filling"
msgstr "Supprimer Remplissage de Zone"
#: pcbnew/dialog_copper_zones_frame.cpp:117
#: pcbnew/dialog_copper_zones_frame.cpp:165
msgid "Nets Display Options:"
msgstr "Options d'Affichage des Nets"
#: pcbnew/dialog_copper_zones_frame.cpp:119
#: pcbnew/dialog_copper_zones_frame.cpp:167
msgid "Alphabetic"
msgstr "Alphabetique"
#: pcbnew/dialog_copper_zones_frame.cpp:119
#: pcbnew/dialog_copper_zones_frame.cpp:167
msgid "Advanced"
msgstr "Avancé"
#: pcbnew/dialog_copper_zones_frame.cpp:121
#: pcbnew/dialog_copper_zones_frame.cpp:169
msgid "Net sorting:"
msgstr "Tri des Equipotentielles:"
#: pcbnew/dialog_copper_zones_frame.cpp:123
#: pcbnew/dialog_copper_zones_frame.cpp:171
msgid ""
"Nets can be sorted:\n"
"By alphabetic order\n"
"By number of pads in the net (advanced)"
msgstr ""
#: pcbnew/dialog_copper_zones_frame.cpp:127
#: pcbnew/dialog_copper_zones_frame.cpp:175
msgid "Filter"
msgstr "Filtre"
......@@ -1612,7 +1433,6 @@ msgid "Alternate Via Drill"
msgstr "Perçage vias alternatif"
#: pcbnew/dialog_track_options.cpp:208
#: pcbnew/pcbnew.h:294
msgid "Through Via"
msgstr "Via Traversante"
......@@ -1625,7 +1445,6 @@ msgid "Default Via Type"
msgstr "Via par Défaut"
#: pcbnew/dialog_track_options.cpp:223
#: pcbnew/dialog_gendrill.cpp:284
msgid "Micro Vias:"
msgstr "Micro Vias:"
......@@ -1786,13 +1605,6 @@ msgid "Keep or change an existing footprint when the netlist gives a different f
msgstr "Garder ou changer une empreinte existante quand la netliste donne une empreinte différente"
#: pcbnew/dialog_netlist.cpp:186
#: pcbnew/onrightclick.cpp:584
#: pcbnew/onrightclick.cpp:765
#: pcbnew/onrightclick.cpp:820
#: pcbnew/onrightclick.cpp:869
#: eeschema/edit_component_in_lib.cpp:239
#: eeschema/edit_component_in_lib.cpp:320
#: eeschema/menubar.cpp:146
msgid "Delete"
msgstr "Supprimer"
......@@ -1845,10 +1657,6 @@ msgid "Rebuild the full ratsnest (usefull after a manual pad netname edition)"
msgstr "Recalculer le chevelu complet ( utile après une edition manuelle de nom de net sur pad)"
#: pcbnew/dialog_netlist.cpp:232
#: pcbnew/pcbplot.cpp:284
#: pcbnew/xchgmod.cpp:137
#: eeschema/annotate_dialog.cpp:230
#: share/zoom.cpp:449
msgid "Close"
msgstr "Fermer"
......@@ -1857,12 +1665,6 @@ msgid "Netlist File:"
msgstr "Fichier Netliste:"
#: pcbnew/dialog_netlist.cpp:253
#: pcbnew/dialog_freeroute_exchange.cpp:222
#: eeschema/plotps.cpp:227
#: eeschema/dialog_erc.cpp:219
#: eeschema/dialog_build_BOM.cpp:348
#: eeschema/plothpgl.cpp:292
#: share/dialog_print.cpp:242
msgid "&Close"
msgstr "&Fermer"
......@@ -1908,7 +1710,6 @@ msgid "Bad value for footprints orientation"
msgstr "Mauvaise valeur pour l'orientation des empreintes"
#: pcbnew/tool_modedit.cpp:44
#: eeschema/tool_lib.cpp:120
msgid "Select working library"
msgstr "Sélection de la librairie de travail"
......@@ -1925,7 +1726,6 @@ msgid "Delete part in current library"
msgstr "Supprimer composant en librairie de travail"
#: pcbnew/tool_modedit.cpp:61
#: pcbnew/xchgmod.cpp:156
msgid "New Module"
msgstr "Nouveau Module"
......@@ -1954,16 +1754,10 @@ msgid "export module"
msgstr "Exporter Module"
#: pcbnew/tool_modedit.cpp:92
#: eeschema/menubar.cpp:130
#: eeschema/tool_lib.cpp:147
#: eeschema/tool_sch.cpp:74
msgid "Undo last edition"
msgstr "Defait dernière édition"
#: pcbnew/tool_modedit.cpp:94
#: eeschema/menubar.cpp:138
#: eeschema/tool_lib.cpp:149
#: eeschema/tool_sch.cpp:77
msgid "Redo the last undo command"
msgstr "Refait la dernière commande defaite"
......@@ -1976,58 +1770,22 @@ msgid "Print Module"
msgstr "Imprimer Module"
#: pcbnew/tool_modedit.cpp:106
#: pcbnew/tool_pcb.cpp:255
#: eeschema/menubar.cpp:169
#: eeschema/menubar.cpp:172
#: eeschema/tool_lib.cpp:167
#: eeschema/tool_sch.cpp:92
#: eeschema/tool_viewlib.cpp:67
#: gerbview/tool_gerber.cpp:273
#: 3d-viewer/3d_toolbar.cpp:43
#: share/zoom.cpp:361
msgid "Zoom in"
msgstr "Zoom +"
#: pcbnew/tool_modedit.cpp:110
#: pcbnew/tool_pcb.cpp:259
#: eeschema/menubar.cpp:177
#: eeschema/menubar.cpp:180
#: eeschema/tool_lib.cpp:171
#: eeschema/tool_sch.cpp:96
#: eeschema/tool_viewlib.cpp:71
#: gerbview/tool_gerber.cpp:280
#: 3d-viewer/3d_toolbar.cpp:46
#: share/zoom.cpp:362
msgid "Zoom out"
msgstr "Zoom -"
#: pcbnew/tool_modedit.cpp:114
#: pcbnew/tool_pcb.cpp:263
#: eeschema/menubar.cpp:193
#: eeschema/tool_lib.cpp:175
#: eeschema/tool_sch.cpp:100
#: eeschema/tool_viewlib.cpp:75
#: gerbview/tool_gerber.cpp:287
#: 3d-viewer/3d_toolbar.cpp:49
#: share/zoom.cpp:369
msgid "Redraw view"
msgstr "Redessin de l'écran"
#: pcbnew/tool_modedit.cpp:119
#: pcbnew/tool_pcb.cpp:268
#: eeschema/menubar.cpp:186
#: eeschema/menubar.cpp:196
#: eeschema/tool_lib.cpp:181
#: eeschema/tool_sch.cpp:105
#: gerbview/tool_gerber.cpp:298
#: 3d-viewer/3d_toolbar.cpp:52
#: share/zoom.cpp:363
msgid "Zoom auto"
msgstr "Zoom Automatique"
#: pcbnew/tool_modedit.cpp:124
#: pcbnew/modedit.cpp:399
#: pcbnew/menubarmodedit.cpp:45
msgid "Pad Settings"
msgstr "Caract pads"
......@@ -2040,78 +1798,51 @@ msgid "Add Pads"
msgstr "Addition de \"pins\""
#: pcbnew/tool_modedit.cpp:159
#: pcbnew/tool_pcb.cpp:429
msgid "Add graphic line or polygon"
msgstr "Addition de lignes ou polygones graphiques"
#: pcbnew/tool_modedit.cpp:163
#: pcbnew/tool_pcb.cpp:433
msgid "Add graphic circle"
msgstr "Addition de graphiques (Cercle)"
#: pcbnew/tool_modedit.cpp:167
#: pcbnew/tool_pcb.cpp:437
msgid "Add graphic arc"
msgstr "Addition de graphiques (Arc de Cercle)"
#: pcbnew/tool_modedit.cpp:171
#: pcbnew/edit.cpp:291
#: eeschema/libframe.cpp:501
#: eeschema/schedit.cpp:217
#: gerbview/tool_gerber.cpp:387
msgid "Add Text"
msgstr "Ajout de Texte"
#: pcbnew/tool_modedit.cpp:176
#: pcbnew/modedit.cpp:413
msgid "Place anchor"
msgstr "Place Ancre"
#: pcbnew/tool_modedit.cpp:181
#: pcbnew/tool_pcb.cpp:455
#: eeschema/menubar.cpp:146
#: eeschema/tool_lib.cpp:90
#: eeschema/tool_sch.cpp:228
#: gerbview/tool_gerber.cpp:395
msgid "Delete items"
msgstr "Suppression d'éléments"
#: pcbnew/tool_modedit.cpp:203
#: pcbnew/tool_pcb.cpp:328
#: eeschema/tool_sch.cpp:250
#: gerbview/tool_gerber.cpp:419
msgid "Display Grid OFF"
msgstr "Suppression de l'affichage de la grille"
#: pcbnew/tool_modedit.cpp:207
#: pcbnew/tool_pcb.cpp:331
#: gerbview/tool_gerber.cpp:425
msgid "Display Polar Coord ON"
msgstr "Activer affichage coord Polaires"
#: pcbnew/tool_modedit.cpp:211
#: pcbnew/tool_pcb.cpp:333
#: eeschema/tool_sch.cpp:254
#: gerbview/tool_gerber.cpp:429
msgid "Units = Inch"
msgstr "Unités = pouce"
#: pcbnew/tool_modedit.cpp:215
#: pcbnew/tool_pcb.cpp:335
#: eeschema/tool_sch.cpp:258
#: gerbview/tool_gerber.cpp:433
msgid "Units = mm"
msgstr "Unités = mm"
#: pcbnew/tool_modedit.cpp:221
#: pcbnew/tool_pcb.cpp:338
#: eeschema/tool_sch.cpp:262
#: gerbview/tool_gerber.cpp:439
msgid "Change Cursor Shape"
msgstr "Sélection de la forme du curseur"
#: pcbnew/tool_modedit.cpp:229
#: pcbnew/tool_pcb.cpp:360
msgid "Show Pads Sketch"
msgstr "Afficher pastilles en contour"
......@@ -2124,8 +1855,6 @@ msgid "Show Edges Sketch"
msgstr "Afficher Modules en contour"
#: pcbnew/tool_modedit.cpp:276
#: pcbnew/tool_pcb.cpp:577
#: eeschema/plotps.cpp:189
msgid "Auto"
msgstr "Auto"
......@@ -2145,7 +1874,6 @@ msgid "Grid %.3f"
msgstr "Grille %.3f"
#: pcbnew/tool_modedit.cpp:305
#: pcbnew/tool_pcb.cpp:611
msgid "User Grid"
msgstr "Grille perso"
......@@ -2206,19 +1934,14 @@ msgid "Save current board as.."
msgstr "Sauver le Circuit Imprimé courant sous.."
#: pcbnew/menubarpcb.cpp:91
#: eeschema/menubar.cpp:75
#: gerbview/tool_gerber.cpp:88
msgid "P&rint"
msgstr "Imp&rimer"
#: pcbnew/menubarpcb.cpp:91
#: eeschema/menubar.cpp:75
#: gerbview/tool_gerber.cpp:88
msgid "Print on current printer"
msgstr "Imprimer sur l'imprimante par défaut"
#: pcbnew/menubarpcb.cpp:96
#: eeschema/menubar.cpp:105
msgid "&Plot"
msgstr "&Tracer"
......@@ -2267,7 +1990,6 @@ msgid "Import a routed \"Specctra Session\" (*.ses) file"
msgstr "Importer un fichier de routage \"Specctra Session\" (*.ses) "
#: pcbnew/menubarpcb.cpp:140
#: eeschema/libframe.cpp:525
msgid "Import"
msgstr "Importer"
......@@ -2300,10 +2022,6 @@ msgid "Archive or Add footprints in a library file"
msgstr "Archiver ou ajouter les modules dans un fichier librairie"
#: pcbnew/menubarpcb.cpp:163
#: eeschema/menubar.cpp:109
#: cvpcb/tool_cvpcb.cpp:122
#: kicad/buildmnu.cpp:122
#: gerbview/tool_gerber.cpp:93
msgid "E&xit"
msgstr "&Quitter"
......@@ -2312,18 +2030,14 @@ msgid "Quit pcbnew"
msgstr "Quitter Pcbnew"
#: pcbnew/menubarpcb.cpp:181
#: eeschema/menubar.cpp:358
msgid "&Library"
msgstr "&Librairie"
#: pcbnew/menubarpcb.cpp:182
#: cvpcb/tool_cvpcb.cpp:137
msgid "Setting Libraries, Directories and others..."
msgstr "Sélectionner les librairies et répertoires"
#: pcbnew/menubarpcb.cpp:186
#: eeschema/menubar.cpp:364
#: gerbview/tool_gerber.cpp:108
msgid "&Colors"
msgstr "&Couleurs"
......@@ -2348,23 +2062,18 @@ msgid "Select what items are displayed"
msgstr "Sélectionner les éléments a afficher"
#: pcbnew/menubarpcb.cpp:207
#: eeschema/menubar.cpp:382
msgid "&Save preferences"
msgstr "&Sauver Préférences"
#: pcbnew/menubarpcb.cpp:208
#: eeschema/menubar.cpp:383
#: gerbview/tool_gerber.cpp:123
msgid "Save application preferences"
msgstr "Sauver préférences"
#: pcbnew/menubarpcb.cpp:212
#: eeschema/menubar.cpp:386
msgid "&Read preferences"
msgstr "&Lire Préférences"
#: pcbnew/menubarpcb.cpp:213
#: eeschema/menubar.cpp:387
msgid "Read application preferences"
msgstr "Lire préférences de l'application"
......@@ -2377,16 +2086,10 @@ msgid "Adjust size and width for tracks, vias"
msgstr "Ajuster dims et taille des pistes et vias"
#: pcbnew/menubarpcb.cpp:230
#: pcbnew/tool_pcb.cpp:595
#: eeschema/eelayer.cpp:223
#: pcbnew/set_color.h:414
#: eeschema/eelayer.h:214
#: gerbview/set_color.h:324
msgid "Grid"
msgstr "Grille"
#: pcbnew/menubarpcb.cpp:231
#: pcbnew/menubarmodedit.cpp:51
msgid "Adjust User Grid"
msgstr "Ajuster Grille utilisateur"
......@@ -2395,17 +2098,14 @@ msgid "Texts and drawings"
msgstr "&Textes et Tracés"
#: pcbnew/menubarpcb.cpp:236
#: pcbnew/menubarmodedit.cpp:41
msgid "Adjust width for texts and drawings"
msgstr "Ajuster dims pour textes et graphiques"
#: pcbnew/menubarpcb.cpp:241
#: pcbnew/menubarmodedit.cpp:46
msgid "Adjust size,shape,layers... for Pads"
msgstr "Ajuster taille, forme, couches... pour pads"
#: pcbnew/menubarpcb.cpp:246
#: gerbview/tool_gerber.cpp:122
msgid "&Save Setup"
msgstr "&Sauver Options"
......@@ -2470,63 +2170,42 @@ msgid "Swap tracks on copper layers or drawings on others layers"
msgstr "Permutation de couches"
#: pcbnew/menubarpcb.cpp:299
#: pcbnew/menubarmodedit.cpp:64
#: eeschema/menubar.cpp:397
#: cvpcb/tool_cvpcb.cpp:155
#: kicad/buildmnu.cpp:190
#: gerbview/tool_gerber.cpp:149
msgid "&Contents"
msgstr "&Contenu"
#: pcbnew/menubarpcb.cpp:299
#: pcbnew/menubarmodedit.cpp:65
msgid "Open the pcbnew manual"
msgstr "Ouvrir la documentation de pcbnew"
#: pcbnew/menubarpcb.cpp:303
#: pcbnew/menubarmodedit.cpp:73
msgid "&About pcbnew"
msgstr "&Au sujet de r Pcbnew"
#: pcbnew/menubarpcb.cpp:303
#: pcbnew/menubarmodedit.cpp:74
msgid "About pcbnew PCB designer"
msgstr "Au sujet de Pcbnew, concption de PCB"
#: pcbnew/menubarpcb.cpp:311
#: pcbnew/menubarmodedit.cpp:82
msgid "3D Display"
msgstr "3D Visu"
#: pcbnew/menubarpcb.cpp:311
#: pcbnew/menubarmodedit.cpp:82
msgid "Show board in 3D viewer"
msgstr "Visualisation du circuit en 3D"
#: pcbnew/menubarpcb.cpp:315
#: eeschema/menubar.cpp:407
#: cvpcb/tool_cvpcb.cpp:164
#: gerbview/tool_gerber.cpp:156
#: 3d-viewer/3d_toolbar.cpp:116
msgid "&File"
msgstr "&Fichiers"
#: pcbnew/menubarpcb.cpp:316
#: eeschema/menubar.cpp:411
#: cvpcb/tool_cvpcb.cpp:165
#: kicad/buildmnu.cpp:202
#: gerbview/tool_gerber.cpp:157
#: 3d-viewer/3d_toolbar.cpp:124
msgid "&Preferences"
msgstr "&Préférences"
#: pcbnew/menubarpcb.cpp:317
#: pcbnew/menubarmodedit.cpp:86
msgid "&Dimensions"
msgstr "&Dimensions"
#: pcbnew/menubarpcb.cpp:318
#: gerbview/tool_gerber.cpp:158
msgid "&Miscellaneous"
msgstr "&Divers"
......@@ -2535,22 +2214,15 @@ msgid "P&ostprocess"
msgstr "P&ostprocesseurs"
#: pcbnew/menubarpcb.cpp:320
#: pcbnew/menubarmodedit.cpp:87
msgid "&3D Display"
msgstr "&3D Visu"
#: pcbnew/menubarpcb.cpp:321
#: pcbnew/menubarmodedit.cpp:88
#: eeschema/menubar.cpp:412
#: cvpcb/tool_cvpcb.cpp:166
#: kicad/buildmnu.cpp:203
#: gerbview/tool_gerber.cpp:161
msgid "&Help"
msgstr "&Aide"
#: pcbnew/pcbplot.cpp:147
#: pcbnew/pcbplot.cpp:272
#: gerbview/tool_gerber.cpp:90
msgid "Plot"
msgstr "Tracer"
......@@ -2607,7 +2279,6 @@ msgid "X scale adjust"
msgstr "Ajustage Echelle X"
#: pcbnew/pcbplot.cpp:259
#: share/wxprint.cpp:189
msgid "Set X scale adjust for exact scale plotting"
msgstr "Ajuster échelle X pour traçage à l'échelle exacte"
......@@ -2616,7 +2287,6 @@ msgid "Y scale adjust"
msgstr "Ajustage Echelle Y"
#: pcbnew/pcbplot.cpp:264
#: share/wxprint.cpp:190
msgid "Set Y scale adjust for exact scale plotting"
msgstr "Ajuster échelle Y pour traçage à l'échelle exacte"
......@@ -2637,7 +2307,6 @@ msgid "Exclude Edges_Pcb layer"
msgstr "Exclure Couche Contours PCB"
#: pcbnew/pcbplot.cpp:332
#: share/dialog_print.cpp:149
msgid "Exclude contents of Edges_Pcb layer from all other layers"
msgstr "Exclure les tracés contour PCB des autres couches"
......@@ -2722,12 +2391,10 @@ msgid "Scale 1.5"
msgstr "Echelle 1,5"
#: pcbnew/pcbplot.cpp:406
#: share/dialog_print.cpp:163
msgid "Scale 2"
msgstr "Echelle 2"
#: pcbnew/pcbplot.cpp:406
#: share/dialog_print.cpp:164
msgid "Scale 3"
msgstr "Echelle 3"
......@@ -2832,9 +2499,6 @@ msgid "Local Ratsnest"
msgstr "Monter le chevelu général"
#: pcbnew/edit.cpp:569
#: pcbnew/modedit.cpp:427
#: eeschema/libframe.cpp:577
#: eeschema/schedit.cpp:366
msgid "Delete item"
msgstr "Suppression d'éléments"
......@@ -2889,19 +2553,6 @@ msgstr "Fichier GenCAD:"
#: pcbnew/export_gencad.cpp:83
#: pcbnew/files.cpp:352
#: pcbnew/plothpgl.cpp:67
#: pcbnew/librairi.cpp:308
#: pcbnew/librairi.cpp:454
#: pcbnew/librairi.cpp:604
#: pcbnew/librairi.cpp:808
#: pcbnew/gen_modules_placefile.cpp:145
#: pcbnew/gen_modules_placefile.cpp:161
#: pcbnew/gen_modules_placefile.cpp:330
#: eeschema/plotps.cpp:433
#: eeschema/plothpgl.cpp:601
#: cvpcb/genequiv.cpp:42
#: gerbview/export_to_pcbnew.cpp:75
#: common/hotkeys_basic.cpp:385
msgid "Unable to create "
msgstr "Impossible de créer "
......@@ -2910,13 +2561,6 @@ msgid "Recovery file "
msgstr "Fichier de secours "
#: pcbnew/files.cpp:56
#: pcbnew/librairi.cpp:256
#: eeschema/find.cpp:241
#: eeschema/find.cpp:249
#: eeschema/find.cpp:695
#: gerbview/dcode.cpp:266
#: gerbview/readgerb.cpp:145
#: common/eda_doc.cpp:150
msgid " not found"
msgstr " non trouvé"
......@@ -2933,8 +2577,6 @@ msgid "Load board files:"
msgstr "Charger Fichiers C.I.:"
#: pcbnew/files.cpp:188
#: pcbnew/librairi.cpp:77
#: cvpcb/readschematicnetlist.cpp:110
#, c-format
msgid "File <%s> not found"
msgstr " fichier %s non trouvé"
......@@ -2986,7 +2628,6 @@ msgid "<%s> Not Found"
msgstr "<%s> Non trouvé"
#: pcbnew/find.cpp:238
#: eeschema/dialog_find.cpp:117
msgid "Item to find:"
msgstr "Elément a chercher:"
......@@ -3012,18 +2653,14 @@ msgstr "Fichier de percage"
#: pcbnew/gendrill.cpp:322
#: pcbnew/gendrill.cpp:810
#: pcbnew/plotps.cpp:51
#: pcbnew/xchgmod.cpp:637
msgid "Unable to create file "
msgstr "Impossible de créer le fichier "
#: pcbnew/gendrill.cpp:378
#: pcbnew/dialog_gendrill.cpp:184
msgid "2:3"
msgstr "2:3"
#: pcbnew/gendrill.cpp:379
#: pcbnew/dialog_gendrill.cpp:185
msgid "2:4"
msgstr "2:4"
......@@ -3145,7 +2782,6 @@ msgid "Delete draw items?"
msgstr "Suppression éléments graphiques?"
#: pcbnew/initpcb.cpp:249
#: gerbview/initpcb.cpp:150
msgid "Delete Tracks?"
msgstr "Effacer Pistes ?"
......@@ -3154,7 +2790,6 @@ msgid "Delete Modules?"
msgstr "Effacement des Modules?"
#: pcbnew/initpcb.cpp:295
#: gerbview/initpcb.cpp:173
msgid "Delete Pcb Texts"
msgstr "Effacer Textes Pcb"
......@@ -3175,7 +2810,6 @@ msgid "Arc Stub"
msgstr "Arc Stub"
#: pcbnew/muonde.cpp:175
#: common/common.cpp:102
msgid " (mm):"
msgstr " (mm):"
......@@ -3191,7 +2825,6 @@ msgstr " (pouce):"
#: pcbnew/muonde.cpp:189
#: pcbnew/muonde.cpp:202
#: pcbnew/gen_self.h:231
msgid "Incorrect number, abort"
msgstr "Nombre incorrect, arret"
......@@ -3257,8 +2890,6 @@ msgid "Gap (inch):"
msgstr "Gap (inch):"
#: pcbnew/modules.cpp:81
#: pcbnew/librairi.cpp:527
#: common/get_component_dialog.cpp:98
msgid "Name:"
msgstr "Nom:"
......@@ -3267,13 +2898,10 @@ msgid "Search footprint"
msgstr "Cherche Module"
#: pcbnew/modules.cpp:305
#: pcbnew/onrightclick.cpp:733
msgid "Delete Module"
msgstr "Supprimer Module"
#: pcbnew/modules.cpp:306
#: eeschema/find.cpp:220
#: eeschema/onrightclick.cpp:304
msgid "Value "
msgstr "Valeur "
......@@ -3306,25 +2934,18 @@ msgid "Open module editor"
msgstr "Ouvrir Editeur de modules"
#: pcbnew/tool_pcb.cpp:238
#: eeschema/tool_sch.cpp:65
#: gerbview/tool_gerber.cpp:245
msgid "Cut selected item"
msgstr "Suppression des éléments sélectionnés"
#: pcbnew/tool_pcb.cpp:242
#: eeschema/tool_sch.cpp:68
#: gerbview/tool_gerber.cpp:250
msgid "Copy selected item"
msgstr "Copie des éléments sélectionnés"
#: pcbnew/tool_pcb.cpp:244
#: eeschema/tool_sch.cpp:71
#: gerbview/tool_gerber.cpp:256
msgid "Paste"
msgstr "Copie des éléments sauvegardés"
#: pcbnew/tool_pcb.cpp:247
#: gerbview/tool_gerber.cpp:263
msgid "Undelete"
msgstr "Annulation du dernier effacement"
......@@ -3337,8 +2958,6 @@ msgid "Plot (HPGL, PostScript, or GERBER format)"
msgstr "Tracer en format HPGL, POSTSCRIPT ou GERBER"
#: pcbnew/tool_pcb.cpp:272
#: eeschema/menubar.cpp:154
#: eeschema/tool_sch.cpp:109
msgid "Find components and texts"
msgstr "Recherche de composants et textes"
......@@ -3379,8 +2998,6 @@ msgid "Enable Auto Del Track"
msgstr "Autoriser l'effacement automatique des pistes"
#: pcbnew/tool_pcb.cpp:355
#: pcbnew/pcbframe.cpp:434
#: pcbnew/set_color.h:423
msgid "Show Zones"
msgstr "Monter Zones"
......@@ -3389,7 +3006,6 @@ msgid "Show Tracks Sketch"
msgstr "Afficher Pistes en Contour"
#: pcbnew/tool_pcb.cpp:368
#: pcbnew/pcbframe.cpp:455
msgid "Hight Contrast Mode Display"
msgstr "Mode d'affichage Haut Contraste"
......@@ -3430,7 +3046,6 @@ msgid "Add dimension"
msgstr "Ajout des cotes"
#: pcbnew/tool_pcb.cpp:450
#: gerbview/tool_gerber.cpp:380
msgid "Add layer alignment target"
msgstr "Ajouter Mire de superposition"
......@@ -3491,27 +3106,18 @@ msgid "Target Shape:"
msgstr "Forme Mire:"
#: pcbnew/modedit_onclick.cpp:196
#: eeschema/onrightclick.cpp:102
#: eeschema/libedit_onrightclick.cpp:47
#: gerbview/onrightclick.cpp:41
msgid "End Tool"
msgstr "Fin Outil"
#: pcbnew/modedit_onclick.cpp:206
#: eeschema/libedit_onrightclick.cpp:231
#: gerbview/onrightclick.cpp:50
msgid "Cancel Block"
msgstr "Annuler Bloc"
#: pcbnew/modedit_onclick.cpp:208
#: eeschema/libedit_onrightclick.cpp:234
#: gerbview/onrightclick.cpp:51
msgid "Zoom Block (drag middle mouse)"
msgstr "Zoom Bloc (drag bouton du milieu souris)"
#: pcbnew/modedit_onclick.cpp:211
#: eeschema/libedit_onrightclick.cpp:238
#: gerbview/onrightclick.cpp:53
msgid "Place Block"
msgstr "Place Bloc"
......@@ -3532,8 +3138,6 @@ msgid "Delete Block (shift+ctrl + drag mouse)"
msgstr "Effacement Bloc (shift+ctrl + drag mouse)"
#: pcbnew/modedit_onclick.cpp:241
#: pcbnew/onrightclick.cpp:759
#: pcbnew/onrightclick.cpp:863
msgid "Rotate"
msgstr "Rotation"
......@@ -3558,17 +3162,14 @@ msgid "Move Pad"
msgstr "Déplace Pad"
#: pcbnew/modedit_onclick.cpp:263
#: pcbnew/onrightclick.cpp:798
msgid "Edit Pad"
msgstr "Edit Pad"
#: pcbnew/modedit_onclick.cpp:265
#: pcbnew/onrightclick.cpp:802
msgid "New Pad Settings"
msgstr "Nouvelles Caract. Pads"
#: pcbnew/modedit_onclick.cpp:267
#: pcbnew/onrightclick.cpp:806
msgid "Export Pad Settings"
msgstr "Exporte Caract. Pads"
......@@ -3577,7 +3178,6 @@ msgid "delete Pad"
msgstr "Supprimer Pad"
#: pcbnew/modedit_onclick.cpp:274
#: pcbnew/onrightclick.cpp:813
msgid "Global Pad Settings"
msgstr "Edition Globale des pads"
......@@ -3610,10 +3210,6 @@ msgid "Place edge"
msgstr "Place contour"
#: pcbnew/modedit_onclick.cpp:306
#: pcbnew/onrightclick.cpp:727
#: pcbnew/onrightclick.cpp:761
#: pcbnew/onrightclick.cpp:865
#: eeschema/onrightclick.cpp:300
msgid "Edit"
msgstr "Editer"
......@@ -3659,7 +3255,6 @@ msgid "Unable to drag this segment: two collinear segments"
msgstr "Impossible de drag ce segment: 2 segments alignés"
#: pcbnew/muwave_command.cpp:52
#: eeschema/libframe.cpp:517
msgid "Add Line"
msgstr "Addition de lignes"
......@@ -3762,20 +3357,15 @@ msgid "Cotation not authorized on Copper layers"
msgstr "Cotation non autorisée sur Couches Cuivre"
#: pcbnew/pcbcfg.cpp:71
#: eeschema/eeconfig.cpp:60
#: cvpcb/menucfg.cpp:140
msgid "Read config file"
msgstr "Lire config"
#: pcbnew/pcbcfg.cpp:85
#: cvpcb/menucfg.cpp:152
#, c-format
msgid "File %s not found"
msgstr " fichier %s non trouvé"
#: pcbnew/pcbcfg.cpp:205
#: eeschema/eeconfig.cpp:200
#: cvpcb/cfg.cpp:75
msgid "Save preferences"
msgstr "Sauver préférences"
......@@ -3852,13 +3442,10 @@ msgstr "Attention: Les couches dessus et dessous sont les mêmes"
#: pcbnew/set_color.cpp:269
#: pcbnew/set_color.cpp:296
#: gerbview/set_color.cpp:258
#: gerbview/set_color.cpp:285
msgid "Show None"
msgstr "Rien Afficher"
#: pcbnew/set_color.cpp:278
#: gerbview/set_color.cpp:267
msgid "Show All"
msgstr "Tout Afficher"
......@@ -3871,20 +3458,14 @@ msgid "Switch off all of the copper layers"
msgstr "N'affiche pas les couches cuivre"
#: pcbnew/set_color.cpp:361
#: eeschema/eelayer.cpp:260
#: gerbview/set_color.cpp:333
msgid "Apply"
msgstr "Appliquer"
#: pcbnew/set_grid.cpp:147
#: pcbnew/dialog_gendrill.cpp:167
#: pcbnew/dialog_general_options.cpp:299
#: gerbview/options.cpp:185
msgid "Inches"
msgstr "Pouces"
#: pcbnew/set_grid.cpp:148
#: share/drawframe.cpp:388
msgid "mm"
msgstr "mm"
......@@ -3933,7 +3514,6 @@ msgid "Add Pad"
msgstr "Ajouter Pastilles"
#: pcbnew/modedit.cpp:409
#: eeschema/schedit.cpp:197
msgid "Add Drawing"
msgstr "Ajout d'éléments graphiques"
......@@ -4036,21 +3616,21 @@ msgstr "Change module %s (%s) "
msgid "Cmp files:"
msgstr "Fichiers Cmp: "
#: pcbnew/zones_by_polygon.cpp:324
#: pcbnew/zones_by_polygon.cpp:380
#: pcbnew/zones_by_polygon.cpp:709
#: pcbnew/zones_by_polygon.cpp:328
#: pcbnew/zones_by_polygon.cpp:384
#: pcbnew/zones_by_polygon.cpp:717
msgid "Area: DRC outline error"
msgstr "Zone; Erreur DRC sur contour"
#: pcbnew/zones_by_polygon.cpp:592
#: pcbnew/zones_by_polygon.cpp:599
msgid "DRC error: this start point is inside or too close an other area"
msgstr "Erreur DRC: ce point de départ est a l'intérieur d'une autre zone ou trop proche"
#: pcbnew/zones_by_polygon.cpp:654
#: pcbnew/zones_by_polygon.cpp:662
msgid "DRC error: closing this area creates a drc error with an other area"
msgstr "Erreur DRC: la fermeture de cette zone crée une erreur DRC avec une autre zone"
#: pcbnew/zones_by_polygon.cpp:895
#: pcbnew/zones_by_polygon.cpp:903
msgid "No Net"
msgstr "No Net"
......@@ -4063,7 +3643,6 @@ msgid "Place module"
msgstr "Place module"
#: pcbnew/loadcmp.cpp:215
#: eeschema/eelibs_read_libraryfiles.cpp:64
#, c-format
msgid "Library <%s> not found"
msgstr "Librairie %s non trouvée"
......@@ -4084,12 +3663,10 @@ msgstr "Module <%s> non trouvé"
#: pcbnew/loadcmp.cpp:369
#: pcbnew/librairi.cpp:256
#: eeschema/eelibs_read_libraryfiles.cpp:144
msgid "Library "
msgstr "Librairie "
#: pcbnew/loadcmp.cpp:369
#: eeschema/eelibs_read_libraryfiles.cpp:148
msgid " loaded"
msgstr " chargé"
......@@ -4158,7 +3735,6 @@ msgid "File %s exists, OK to replace ?"
msgstr "Fichier %s existant, OK pour remplacer ?"
#: pcbnew/librairi.cpp:203
#: eeschema/symbedit.cpp:165
#, c-format
msgid "Unable to create <%s>"
msgstr "Incapable de créer <%s>"
......@@ -4399,7 +3975,6 @@ msgstr "Choisir l'origine des coordonnées: absolue ou relative à l'axe auxilia
#: pcbnew/dialog_gendrill.cpp:205
#: pcbnew/dialog_gendrill.cpp:215
#: eeschema/libedit.cpp:41
msgid "None"
msgstr "Aucun"
......@@ -4440,15 +4015,10 @@ msgid "Speed (cm/s)"
msgstr "Vitesse plume ( cm/s )"
#: pcbnew/dialog_gendrill.cpp:233
#: eeschema/plothpgl.cpp:256
msgid "Pen Number"
msgstr "Numéro de plume"
#: pcbnew/dialog_gendrill.cpp:239
#: pcbnew/dialog_general_options.cpp:376
#: eeschema/dialog_build_BOM.cpp:283
#: eeschema/netlist_control.cpp:121
#: share/dialog_print.cpp:187
msgid "Options:"
msgstr "Options :"
......@@ -4540,7 +4110,6 @@ msgid "Sizes and Widths"
msgstr "Dims. et Epaiss."
#: pcbnew/menubarmodedit.cpp:50
#: pcbnew/set_grid.h:39
msgid "User Grid Size"
msgstr "Dim Grille utilisteur"
......@@ -4597,7 +4166,6 @@ msgid "Move Drawing"
msgstr "Déplace Tracé"
#: pcbnew/onrightclick.cpp:238
#: eeschema/onrightclick.cpp:208
msgid "End Drawing"
msgstr "Fin tracé"
......@@ -4606,7 +4174,6 @@ msgid "Edit Drawing"
msgstr "Edit Tracé"
#: pcbnew/onrightclick.cpp:243
#: eeschema/onrightclick.cpp:210
msgid "Delete Drawing"
msgstr "Supprimer Tracé"
......@@ -4623,7 +4190,6 @@ msgid "Delete Last Corner"
msgstr "Supprimer Dernier Sommet"
#: pcbnew/onrightclick.cpp:275
#: eeschema/onrightclick.cpp:155
msgid "Delete Marker"
msgstr "Effacer Marqueur"
......@@ -4740,23 +4306,18 @@ msgid "Read Global AutoRouter Data"
msgstr "Lire Données de L'autorouteur global"
#: pcbnew/onrightclick.cpp:450
#: eeschema/onrightclick.cpp:609
msgid "Cancel block"
msgstr "Annuler bloc"
#: pcbnew/onrightclick.cpp:452
#: eeschema/onrightclick.cpp:615
msgid "Zoom block"
msgstr "Zoom bloc"
#: pcbnew/onrightclick.cpp:455
#: eeschema/onrightclick.cpp:617
msgid "Place block"
msgstr "Place bloc"
#: pcbnew/onrightclick.cpp:457
#: eeschema/onrightclick.cpp:626
#: eeschema/libedit_onrightclick.cpp:244
msgid "Copy block"
msgstr "Copie bloc"
......@@ -4769,8 +4330,6 @@ msgid "Rotate block"
msgstr "Rotation bloc"
#: pcbnew/onrightclick.cpp:463
#: eeschema/onrightclick.cpp:630
#: eeschema/libedit_onrightclick.cpp:247
msgid "Delete block"
msgstr "Effacer bloc"
......@@ -4999,7 +4558,6 @@ msgid "Rotate +"
msgstr "Rotation +"
#: pcbnew/onrightclick.cpp:722
#: eeschema/onrightclick.cpp:288
msgid "Rotate -"
msgstr "Rotation -"
......@@ -5067,6 +4625,14 @@ msgstr "URL FreeRouting.net"
msgid "The URL of the FreeRouting.net website"
msgstr "L' URL du site FreeRouting.net"
#: pcbnew/dialog_non_copper_zones_properties.cpp:28
msgid "Hatched Outline"
msgstr "Contour Hachuré"
#: pcbnew/dialog_non_copper_zones_properties.cpp:28
msgid "Full Hatched"
msgstr "Pleinement Hachuré"
#: pcbnew/dialog_non_copper_zones_properties.cpp:30
msgid "Outlines Appearence"
msgstr "Aspect des Contours"
......@@ -5080,12 +4646,11 @@ msgid "Zone Edges Orient"
msgstr "Direction contours zone"
#: pcbnew/dialog_non_copper_zones_properties.cpp:54
#: gerbview/select_layers_to_pcb.cpp:91
msgid "Layer selection:"
msgstr "Sélection couche:"
#: pcbnew/zones_non_copper_type_functions.cpp:152
#: pcbnew/dialog_copper_zones.cpp:335
#: pcbnew/dialog_copper_zones.cpp:369
msgid "Error : you must choose a layer"
msgstr "Erreur. Vous devez choisir une couche"
......@@ -5097,55 +4662,35 @@ msgstr "Valeur isolation zone:"
msgid "Grid :"
msgstr "Grille:"
#: pcbnew/dialog_copper_zones.cpp:344
#: pcbnew/dialog_copper_zones.cpp:381
msgid "Error : you must choose a net name"
msgstr "Erreur. Vous devez choisir une équipotentielle"
#: pcbnew/dialog_setup_libs.cpp:97
#: eeschema/dialog_eeschema_config.cpp:105
#: cvpcb/dialog_cvpcb_config.cpp:75
#: gerbview/reglage.cpp:90
msgid "from "
msgstr "De "
#: pcbnew/dialog_setup_libs.cpp:153
#: eeschema/dialog_eeschema_config.cpp:161
#: cvpcb/dialog_display_options.cpp:178
#: cvpcb/dialog_cvpcb_config.cpp:128
msgid "Save Cfg"
msgstr "Sauver config"
#: pcbnew/dialog_setup_libs.cpp:159
#: eeschema/dialog_eeschema_config.cpp:178
#: cvpcb/dialog_cvpcb_config.cpp:143
msgid "Files ext:"
msgstr "Ext. Fichiers"
#: pcbnew/dialog_setup_libs.cpp:175
#: cvpcb/dialog_cvpcb_config.cpp:162
#: cvpcb/dialog_cvpcb_config.cpp:194
msgid "Del"
msgstr "Supprimer"
#: pcbnew/dialog_setup_libs.cpp:179
#: eeschema/edit_component_in_lib.cpp:233
#: eeschema/edit_component_in_lib.cpp:312
#: eeschema/dialog_eeschema_config.cpp:197
#: cvpcb/dialog_cvpcb_config.cpp:166
#: cvpcb/dialog_cvpcb_config.cpp:198
msgid "Add"
msgstr "Ajouter"
#: pcbnew/dialog_setup_libs.cpp:183
#: eeschema/dialog_eeschema_config.cpp:203
#: cvpcb/dialog_cvpcb_config.cpp:170
#: cvpcb/dialog_cvpcb_config.cpp:202
msgid "Ins"
msgstr "Insérer"
#: pcbnew/dialog_setup_libs.cpp:191
#: eeschema/dialog_eeschema_config.cpp:213
#: cvpcb/dialog_cvpcb_config.cpp:177
msgid "Libraries"
msgstr "Librairies"
......@@ -5154,7 +4699,6 @@ msgid "Lib Modules Dir:"
msgstr "Repertoire Lib Modules:"
#: pcbnew/dialog_setup_libs.cpp:206
#: cvpcb/menucfg.cpp:62
msgid "Module Doc File:"
msgstr "Fichiers Doc des Modules"
......@@ -5175,15 +4719,10 @@ msgid "Net ext: "
msgstr "Net ext: "
#: pcbnew/dialog_setup_libs.cpp:367
#: eeschema/dialog_eeschema_config.cpp:368
#: cvpcb/menucfg.cpp:202
msgid "Library files:"
msgstr "Fichiers Librairies:"
#: pcbnew/dialog_setup_libs.cpp:392
#: eeschema/dialog_eeschema_config.cpp:394
#: cvpcb/menucfg.cpp:227
#: cvpcb/menucfg.cpp:295
msgid "Library already in use"
msgstr "Librairie déjà en usage"
......@@ -5204,38 +4743,30 @@ msgid "Module count"
msgstr "Nb Modules"
#: pcbnew/dialog_general_options.cpp:288
#: gerbview/options.cpp:175
msgid "No Display"
msgstr "Pas d'affichage"
#: pcbnew/dialog_general_options.cpp:291
#: gerbview/options.cpp:177
msgid "Display Polar Coord"
msgstr "Affichage coord Polaires"
#: pcbnew/dialog_general_options.cpp:300
#: gerbview/options.cpp:186
msgid "millimeters"
msgstr "millimetres"
#: pcbnew/dialog_general_options.cpp:302
#: eeschema/dialog_options.cpp:264
#: gerbview/options.cpp:187
msgid "Units"
msgstr "Unités"
#: pcbnew/dialog_general_options.cpp:309
#: gerbview/options.cpp:193
msgid "Small"
msgstr "Petit"
#: pcbnew/dialog_general_options.cpp:310
#: gerbview/options.cpp:193
msgid "Big"
msgstr "Grand"
#: pcbnew/dialog_general_options.cpp:312
#: gerbview/options.cpp:194
msgid "Cursor"
msgstr "Curseur"
......@@ -5276,7 +4807,6 @@ msgid "Segments 45 Only"
msgstr "Segments 45 seulement"
#: pcbnew/dialog_general_options.cpp:429
#: eeschema/dialog_options.cpp:256
msgid "Auto PAN"
msgstr "Auto PAN"
......@@ -5327,12 +4857,10 @@ msgid "90"
msgstr "90"
#: pcbnew/dialog_pad_edit.cpp:188
#: eeschema/dialog_edit_component_in_schematic.cpp:175
msgid "-90"
msgstr "-90"
#: pcbnew/dialog_pad_edit.cpp:189
#: eeschema/dialog_edit_component_in_schematic.cpp:174
msgid "180"
msgstr "180"
......@@ -5353,7 +4881,6 @@ msgid "SMD"
msgstr "CMS"
#: pcbnew/dialog_pad_edit.cpp:207
#: eeschema/netlist.cpp:245
msgid "Conn"
msgstr "Conn"
......@@ -5422,9 +4949,6 @@ msgid "Board modified, Save before exit ?"
msgstr "Circuit Imprimé modifiée, Sauver avant de quitter ?"
#: pcbnew/pcbframe.cpp:281
#: eeschema/schframe.cpp:309
#: cvpcb/cvframe.cpp:178
#: common/confirm.cpp:119
msgid "Confirmation"
msgstr "Confirmation"
......@@ -5445,12 +4969,10 @@ msgid "Display Polar Coords"
msgstr "Affichage coord Polaires"
#: pcbnew/pcbframe.cpp:402
#: eeschema/schframe.cpp:407
msgid "Grid not show"
msgstr "Grille non montrée"
#: pcbnew/pcbframe.cpp:402
#: eeschema/schframe.cpp:407
msgid "Show Grid"
msgstr "Afficher grille"
......@@ -5671,7 +5193,6 @@ msgid "FileName"
msgstr "Nom Fichier"
#: eeschema/affiche.cpp:37
#: eeschema/component_class.cpp:108
msgid "Ref"
msgstr "Ref"
......@@ -5696,7 +5217,6 @@ msgid "PinName"
msgstr "Nom Pin"
#: eeschema/affiche.cpp:80
#: eeschema/eelayer.h:140
msgid "PinNum"
msgstr "Num Pin"
......@@ -5719,44 +5239,31 @@ msgid "Length"
msgstr "Longueur"
#: eeschema/affiche.cpp:102
#: eeschema/dialog_edit_label.cpp:150
#: eeschema/pinedit-dialog.cpp:225
msgid "Up"
msgstr "Haut"
#: eeschema/affiche.cpp:105
#: eeschema/dialog_edit_label.cpp:152
#: eeschema/pinedit-dialog.cpp:226
msgid "Down"
msgstr "Bas"
#: eeschema/affiche.cpp:108
#: eeschema/dialog_edit_label.cpp:151
#: eeschema/pinedit-dialog.cpp:224
msgid "Left"
msgstr "Gauche"
#: eeschema/affiche.cpp:111
#: eeschema/dialog_edit_label.cpp:149
#: eeschema/pinedit-dialog.cpp:223
msgid "Right"
msgstr "Droite"
#: eeschema/affiche.cpp:169
#: eeschema/affiche.cpp:175
#: share/dialog_print.cpp:218
#: share/svg_print.cpp:229
msgid "All"
msgstr "Tout"
#: eeschema/affiche.cpp:172
#: eeschema/onrightclick.cpp:328
msgid "Unit"
msgstr "Unité"
#: eeschema/affiche.cpp:182
#: eeschema/onrightclick.cpp:315
#: eeschema/dialog_edit_component_in_schematic.cpp:191
msgid "Convert"
msgstr "Convert"
......@@ -5799,7 +5306,6 @@ msgid " Not Found"
msgstr " Non trouvé"
#: eeschema/find.cpp:653
#: eeschema/selpart.cpp:39
msgid "No libraries are loaded"
msgstr "Pas de librairies chargées"
......@@ -5832,23 +5338,18 @@ msgid "Nothing found"
msgstr " Rien trouvé"
#: eeschema/dialog_create_component.cpp:171
#: eeschema/component_class.cpp:59
msgid "U"
msgstr "U"
#: eeschema/dialog_create_component.cpp:183
#: eeschema/edit_component_in_lib.cpp:401
msgid "As Convert"
msgstr "A une forme \"convertie\""
#: eeschema/dialog_create_component.cpp:187
#: eeschema/dialog_edit_component_in_lib.cpp:161
msgid "Power symbol"
msgstr "Symbole alimentation"
#: eeschema/dialog_create_component.cpp:191
#: eeschema/dialog_edit_component_in_schematic.cpp:188
#: eeschema/dialog_edit_component_in_lib.cpp:165
msgid "Parts are locked"
msgstr "Les parts sont verrouillées"
......@@ -5969,17 +5470,14 @@ msgid "Show Pin Number"
msgstr "Montrer Numéro de Pin"
#: eeschema/dialog_create_component.cpp:254
#: eeschema/edit_component_in_lib.cpp:418
msgid "Show Pin Name"
msgstr "Montre Nom de Pin"
#: eeschema/dialog_create_component.cpp:258
#: eeschema/edit_component_in_lib.cpp:429
msgid "Pin Name Inside"
msgstr "Nom de pin a l'intérieur"
#: eeschema/dialog_create_component.cpp:262
#: eeschema/dialog_edit_component_in_lib.cpp:155
msgid "Skew:"
msgstr "Décalage:"
......@@ -6002,7 +5500,6 @@ msgstr "Feuille %s (fichier %s) modifiée. La sauver?"
#: eeschema/netform.cpp:60
#: eeschema/netform.cpp:278
#: eeschema/save_schemas.cpp:86
msgid "Failed to create file "
msgstr "Impossible de créer le fichier "
......@@ -6301,13 +5798,10 @@ msgid "Options :"
msgstr "Options :"
#: eeschema/dialog_cmp_graphic_properties.cpp:156
#: eeschema/symbtext.cpp:162
msgid "Common to Units"
msgstr "Commun aux Unités"
#: eeschema/dialog_cmp_graphic_properties.cpp:160
#: eeschema/symbtext.cpp:166
#: eeschema/pinedit-dialog.cpp:197
msgid "Common to convert"
msgstr "Commun a converti"
......@@ -6324,7 +5818,6 @@ msgid "Fill:"
msgstr "Remplissage:"
#: eeschema/edit_component_in_lib.cpp:168
#: eeschema/dialog_edit_component_in_lib.h:56
msgid "Lib Component Properties"
msgstr "Propriétés du composant librairie"
......@@ -6337,7 +5830,6 @@ msgid "(alias of "
msgstr "(alias de "
#: eeschema/edit_component_in_lib.cpp:216
#: eeschema/dialog_edit_component_in_lib.cpp:210
msgid "Alias"
msgstr "Alias"
......@@ -6382,7 +5874,6 @@ msgstr "Alignement au sommet"
#: eeschema/edit_component_in_lib.cpp:484
#: eeschema/dialog_edit_component_in_schematic.cpp:226
#: eeschema/eelayer.h:164
msgid "Fields"
msgstr "Champs"
......@@ -6393,22 +5884,18 @@ msgstr "Texte visible"
#: eeschema/edit_component_in_lib.cpp:502
#: eeschema/dialog_edit_component_in_schematic.cpp:216
#: eeschema/symbtext.cpp:170
msgid "Vertical"
msgstr "Vertical"
#: eeschema/edit_component_in_lib.cpp:508
#: eeschema/edit_component_in_schematic.cpp:206
msgid "Field Name:"
msgstr "Nom Champ"
#: eeschema/edit_component_in_lib.cpp:518
#: eeschema/edit_component_in_schematic.cpp:216
msgid "Field Text:"
msgstr "Texte du Champ:"
#: eeschema/edit_component_in_lib.cpp:524
#: eeschema/edit_component_in_schematic.cpp:224
msgid "Pos"
msgstr "Pos"
......@@ -6425,7 +5912,6 @@ msgid "Chip Name"
msgstr "Nom en librairie"
#: eeschema/edit_component_in_lib.cpp:554
#: eeschema/edit_component_in_schematic.cpp:200
msgid "Field to edit"
msgstr "Champ à éditer"
......@@ -6471,7 +5957,6 @@ msgid "Delete Convert items"
msgstr "Suppression des éléments convertis"
#: eeschema/edit_component_in_lib.cpp:1144
#: common/eda_doc.cpp:134
msgid "Doc Files"
msgstr "Fichiers de Doc"
......@@ -6484,17 +5969,14 @@ msgid "New FootprintFilter:"
msgstr "Nouveau Filtre de Modules:"
#: eeschema/plotps.cpp:190
#: eeschema/plothpgl.cpp:223
msgid "Page Size A4"
msgstr "Feuille A4"
#: eeschema/plotps.cpp:191
#: eeschema/plothpgl.cpp:228
msgid "Page Size A"
msgstr "Feuille A"
#: eeschema/plotps.cpp:192
#: eeschema/plothpgl.cpp:233
msgid "Plot page size:"
msgstr "Format de la feuille:"
......@@ -6507,8 +5989,6 @@ msgid "B/W"
msgstr "N/B"
#: eeschema/plotps.cpp:204
#: share/dialog_print.cpp:203
#: share/svg_print.cpp:212
msgid "Color"
msgstr "Couleur"
......@@ -6517,18 +5997,14 @@ msgid "Plot Color:"
msgstr "Tracé et Couleurs:"
#: eeschema/plotps.cpp:209
#: share/dialog_print.cpp:194
#: share/svg_print.cpp:218
msgid "Print Sheet Ref"
msgstr "Imprimer cartouche"
#: eeschema/plotps.cpp:218
#: eeschema/plothpgl.cpp:283
msgid "&Plot page"
msgstr "&Tracer Page"
#: eeschema/plotps.cpp:223
#: eeschema/plothpgl.cpp:288
msgid "Plot a&ll"
msgstr "&Tout tracer"
......@@ -6547,7 +6023,6 @@ msgid "Plot: %s\n"
msgstr "Trace: %s\n"
#: eeschema/menubar.cpp:41
#: gerbview/tool_gerber.cpp:63
msgid "&New"
msgstr "&Nouveau"
......@@ -6556,7 +6031,6 @@ msgid "New schematic"
msgstr "Nouvelle schématique"
#: eeschema/menubar.cpp:47
#: cvpcb/tool_cvpcb.cpp:109
msgid "&Open"
msgstr "&Ouvrir "
......@@ -6569,7 +6043,6 @@ msgid "&Save"
msgstr "&Sauver"
#: eeschema/menubar.cpp:55
#: eeschema/tool_sch.cpp:45
msgid "Save schematic project"
msgstr "Sauver le Projet schématique"
......@@ -6638,7 +6111,6 @@ msgid "&Redo\t"
msgstr "&Redo\t"
#: eeschema/menubar.cpp:154
#: pcbnew/find.h:38
msgid "Find"
msgstr "Chercher"
......@@ -6655,7 +6127,6 @@ msgid "&Component"
msgstr "&Composant"
#: eeschema/menubar.cpp:206
#: eeschema/tool_sch.cpp:156
msgid "Place the component"
msgstr "Placer le Composant"
......@@ -6664,7 +6135,6 @@ msgid "&Power port"
msgstr "Power Symbole"
#: eeschema/menubar.cpp:212
#: eeschema/tool_sch.cpp:160
msgid "Place the power port"
msgstr "Placer le Symbole Power"
......@@ -6673,7 +6143,6 @@ msgid "&Wire"
msgstr "&Fil"
#: eeschema/menubar.cpp:218
#: eeschema/tool_sch.cpp:165
msgid "Place the wire"
msgstr "Place fil"
......@@ -6682,7 +6151,6 @@ msgid "&Bus"
msgstr "&Bus"
#: eeschema/menubar.cpp:227
#: eeschema/tool_sch.cpp:169
msgid "Place bus"
msgstr "Place bus"
......@@ -6715,7 +6183,6 @@ msgid "Net name"
msgstr "Net Name"
#: eeschema/menubar.cpp:267
#: eeschema/tool_sch.cpp:186
msgid "Place net name"
msgstr "Place nom de net"
......@@ -6728,12 +6195,10 @@ msgid "Place a global label. Warning: all global labels with the same name are c
msgstr "Placer un label global. Attention: tous les labels globaux avec le même nom sont connectés dans toute la hierarchie"
#: eeschema/menubar.cpp:284
#: eeschema/eelayer.h:85
msgid "Junction"
msgstr "Jonction"
#: eeschema/menubar.cpp:285
#: eeschema/tool_sch.cpp:195
msgid "Place junction"
msgstr "Place jonction"
......@@ -6782,7 +6247,6 @@ msgid "Graphic text (comment)"
msgstr "Ttextes graphiques (commentaires)"
#: eeschema/menubar.cpp:349
#: eeschema/tool_sch.cpp:223
msgid "Place graphic text (comment)"
msgstr "Placer textes graphiques (commentaires)"
......@@ -6795,7 +6259,6 @@ msgid "Color preferences"
msgstr "Préférences de couleurs"
#: eeschema/menubar.cpp:371
#: gerbview/tool_gerber.cpp:110
msgid "&Options"
msgstr "&Options"
......@@ -6989,19 +6452,14 @@ msgid "Text Orient:"
msgstr "Orient:"
#: eeschema/dialog_edit_label.cpp:160
#: eeschema/pinedit-dialog.cpp:264
#: eeschema/component_wizard/dialog_component_setup.cpp:201
msgid "Input"
msgstr "Entrée"
#: eeschema/dialog_edit_label.cpp:161
#: eeschema/pinedit-dialog.cpp:265
#: eeschema/component_wizard/dialog_component_setup.cpp:202
msgid "Output"
msgstr "Sortie"
#: eeschema/dialog_edit_label.cpp:162
#: eeschema/pinedit-dialog.cpp:266
msgid "Bidi"
msgstr "Bidi"
......@@ -7010,8 +6468,6 @@ msgid "TriState"
msgstr "3 états"
#: eeschema/dialog_edit_label.cpp:164
#: eeschema/pinedit-dialog.cpp:268
#: eeschema/component_wizard/dialog_component_setup.cpp:205
msgid "Passive"
msgstr "Passive"
......@@ -7267,8 +6723,6 @@ msgid "Select component (%d items)"
msgstr "Selection composant (%d items)"
#: eeschema/viewlibs.cpp:118
#: eeschema/viewlib_frame.cpp:53
#: eeschema/tool_sch.cpp:56
msgid "Library browser"
msgstr "Visualisateur des librairies"
......@@ -7296,9 +6750,6 @@ msgid "Empty Text!"
msgstr "Texte vide"
#: eeschema/eeconfig.cpp:73
#: kicad/files-io.cpp:131
#: gerbview/dcode.cpp:266
#: gerbview/readgerb.cpp:145
msgid "File "
msgstr "Fichier "
......@@ -7311,7 +6762,6 @@ msgid "White"
msgstr "Blanc"
#: eeschema/eelayer.cpp:234
#: share/dialog_print.cpp:204
msgid "Black"
msgstr "Noir"
......@@ -7325,7 +6775,6 @@ msgid "Arc %.1f deg"
msgstr "Arc %.1f deg"
#: eeschema/eeredraw.cpp:130
#: eeschema/eelayer.h:171
msgid "Sheet"
msgstr "Feuille"
......@@ -7366,12 +6815,10 @@ msgid "Warning More than 1 Pin connected to UnConnect symbol"
msgstr "Warning: plus que 1 Pin connectée a un symbole de non connexion"
#: eeschema/erc.cpp:595
#: common/confirm.cpp:84
msgid "Warning"
msgstr "Avertissement"
#: eeschema/erc.cpp:598
#: common/confirm.cpp:88
msgid "Error"
msgstr "Erreur"
......@@ -7440,12 +6887,10 @@ msgid "Root"
msgstr "Racine"
#: eeschema/hotkeys.cpp:249
#: eeschema/schedit.cpp:241
msgid "Add Component"
msgstr "Ajout Composant"
#: eeschema/hotkeys.cpp:271
#: eeschema/schedit.cpp:189
msgid "Add Wire"
msgstr "Ajouter Fils"
......@@ -7482,7 +6927,6 @@ msgid "Hierachy Pins by Sheets"
msgstr "Pins de hiérarchie par feuilles"
#: eeschema/dialog_build_BOM.cpp:269
#: eeschema/netlist.cpp:197
msgid "List"
msgstr "Liste"
......@@ -7555,7 +6999,6 @@ msgid "Create &List"
msgstr "Créer &Liste"
#: eeschema/dialog_build_BOM.cpp:352
#: cvpcb/dialog_display_options.cpp:196
msgid "&Apply"
msgstr "&Appliquer"
......@@ -7732,7 +7175,6 @@ msgstr "#End labels\n"
#: eeschema/netlist_control.cpp:124
#: eeschema/netlist_control.cpp:240
#: gerbview/options.cpp:201
msgid "Default format"
msgstr "Format par défaut"
......@@ -7786,7 +7228,6 @@ msgid "Netlist command:"
msgstr "Commande netliste:"
#: eeschema/netlist_control.cpp:320
#: share/setpage.cpp:354
msgid "Title:"
msgstr "Titre:"
......@@ -7819,37 +7260,30 @@ msgid "Datasheet"
msgstr "Documentation"
#: eeschema/pinedit.cpp:22
#: eeschema/pinedit-dialog.cpp:251
msgid "line"
msgstr "Ligne"
#: eeschema/pinedit.cpp:22
#: eeschema/pinedit-dialog.cpp:252
msgid "invert"
msgstr "invert"
#: eeschema/pinedit.cpp:22
#: eeschema/pinedit-dialog.cpp:253
msgid "clock"
msgstr "clock"
#: eeschema/pinedit.cpp:22
#: eeschema/pinedit-dialog.cpp:254
msgid "clock inv"
msgstr "clock inv"
#: eeschema/pinedit.cpp:23
#: eeschema/pinedit-dialog.cpp:255
msgid "low in"
msgstr "low in"
#: eeschema/pinedit.cpp:23
#: eeschema/pinedit-dialog.cpp:256
msgid "low clock"
msgstr "low clock"
#: eeschema/pinedit.cpp:23
#: eeschema/pinedit-dialog.cpp:257
msgid "low out"
msgstr "low out"
......@@ -7876,7 +7310,6 @@ msgid " Normal"
msgstr " Normal"
#: eeschema/save_schemas.cpp:61
#: eeschema/files-io.cpp:82
msgid "Schematic files:"
msgstr "Fichiers schématiques:"
......@@ -7937,7 +7370,6 @@ msgid "Add Power"
msgstr "Add Alims"
#: eeschema/sheet.cpp:162
#: share/svg_print.cpp:251
msgid "Filename:"
msgstr "Nom Fichier:"
......@@ -8185,7 +7617,6 @@ msgid "Edit pins part per part (Carefully use!)"
msgstr "Editer pins unité par unité (Utiliser en connaissance de cause)"
#: eeschema/tool_lib.cpp:238
#: eeschema/tool_viewlib.cpp:128
#, c-format
msgid "Part %c"
msgstr "Composant %c"
......@@ -8227,7 +7658,6 @@ msgid "3 States"
msgstr "3 Etats"
#: eeschema/pinedit-dialog.cpp:269
#: eeschema/component_wizard/dialog_component_setup.cpp:206
msgid "Unspecified"
msgstr "Non specifié"
......@@ -8420,7 +7850,6 @@ msgid "Place graphic line or polygon"
msgstr "Placer ligne ou polygone graphique"
#: eeschema/tool_sch.cpp:267
#: eeschema/schframe.cpp:418
msgid "Show Hidden Pins"
msgstr "Force affichage des pins invisibles"
......@@ -8655,7 +8084,6 @@ msgid "Move Text "
msgstr "Déplacer Texte"
#: eeschema/libedit_onrightclick.cpp:126
#: eeschema/dialog_edit_label.h:44
msgid "Text Editor"
msgstr "Editeur de Texte"
......@@ -8958,8 +8386,6 @@ msgid "Cvpcb is already running, Continue?"
msgstr "Cvpcb est est cours d'exécution. Continuer ?"
#: cvpcb/displayframe.cpp:118
#: pcbnew/dialog_display_options.h:54
#: cvpcb/dialog_display_options.h:51
msgid "Display Options"
msgstr "Options d'Affichage"
......@@ -9199,27 +8625,22 @@ msgid "Delete selections"
msgstr "Effacement des associations existantes"
#: cvpcb/cvframe.cpp:426
#: share/drawframe.cpp:136
msgid "Dialog boxes"
msgstr "Fenêtres de dialogue"
#: cvpcb/cvframe.cpp:431
#: share/drawframe.cpp:141
msgid "Lists"
msgstr "Listes"
#: cvpcb/cvframe.cpp:436
#: share/drawframe.cpp:146
msgid "Status box"
msgstr "Fenetre d'état"
#: cvpcb/cvframe.cpp:442
#: share/drawframe.cpp:152
msgid "&Font"
msgstr "&Fonte"
#: cvpcb/cvframe.cpp:444
#: share/drawframe.cpp:154
msgid "Choose font type and size for dialogs, infos and status box"
msgstr "Choisir les fontes et leur taille pour les dialogues, infos et ligne d'état"
......@@ -9339,7 +8760,6 @@ msgid "You must choose a PDF viewer before use this option"
msgstr "Vous devez choisir un Visualisateur PDF avant d'utiliser cette option"
#: kicad/preferences.cpp:97
#: common/gestfich.cpp:685
msgid "Prefered Editor:"
msgstr "Editeur préféré:"
......@@ -9726,12 +9146,10 @@ msgid "Gerber files:"
msgstr "Fichiers Gerber:"
#: gerbview/files.cpp:187
#: gerbview/readgerb.cpp:273
msgid "D codes files:"
msgstr "Fichiers D-Codes:"
#: gerbview/gerbview_config.cpp:147
#: gerbview/process_config.cpp:117
msgid "Save config file"
msgstr "Sauver config"
......@@ -10852,7 +10270,6 @@ msgid "dialog_freeroute_exchange"
msgstr "dialog_freeroute_exchange"
#: pcbnew/dialog_general_options.h:60
#: eeschema/dialog_options.h:55
msgid "General Options"
msgstr "Options Générales"
......@@ -10873,7 +10290,6 @@ msgid "Footprints Orientation"
msgstr "Orientation des Modules"
#: pcbnew/dialog_setup_libs.h:43
#: eeschema/dialog_eeschema_config.h:50
msgid "Dialog"
msgstr "Dialog"
......@@ -10981,7 +10397,7 @@ msgstr "Afficher Modules Cu"
msgid "Pad properties"
msgstr "Propriétés des Pads"
#: pcbnew/dialog_copper_zones_frame.h:88
#: pcbnew/dialog_copper_zones_frame.h:103
msgid "Fill Zones Options"
msgstr "Options de Remplissage de Zone"
......@@ -11297,3 +10713,6 @@ msgstr "Imprimer"
msgid "Create SVG file"
msgstr "Créer Fichier SVG"
#~ msgid "Unfill zone"
#~ msgstr "Vider zone"
pcbnew/class_zone.cpp
View file @ 9eba4f95
......@@ -31,6 +31,8 @@ ZONE_CONTAINER::ZONE_CONTAINER( BOARD* parent ) :
m_Poly = new CPolyLine(); // Outlines
m_ArcToSegmentsCount = 16; // Use 16 segment to convert a circle to a polygon
m_DrawOptions = 0;
m_ThermalReliefGapValue = 200; // tickness of the gap in thermal reliefs
m_ThermalReliefCopperBridgeValue = 200; // tickness of the copper bridge in thermal reliefs
}
......@@ -138,8 +140,8 @@ bool ZONE_CONTAINER::Save( FILE* aFile ) const
if( ret < 2 )
return false;
ret = fprintf( aFile, "ZOptions %d %d %c\n", m_GridFillValue, m_ArcToSegmentsCount,
m_DrawOptions ? 'S' : 'F' );
ret = fprintf( aFile, "ZOptions %d %d %c %d %d\n", m_GridFillValue, m_ArcToSegmentsCount,
m_DrawOptions ? 'S' : 'F' , m_ThermalReliefGapValue, m_ThermalReliefCopperBridgeValue);
if( ret < 3 )
return false;
......@@ -274,20 +276,20 @@ int ZONE_CONTAINER::ReadDescr( FILE* aFile, int* aLineNum )
{
int gridsize = 50;
int arcsegmentcount = 16;
int drawopt = 'F';
char drawopt = 'F';
text = Line + 8;
ret = sscanf( text, "%d %d %c", &gridsize, &arcsegmentcount, &drawopt );
ret = sscanf( text, "%d %d %c %d %d", &gridsize, &arcsegmentcount, &drawopt,
&m_ThermalReliefGapValue, &m_ThermalReliefCopperBridgeValue );
if( ret < 1 ) // Must find 1 or more args.
return false;
else
m_GridFillValue = gridsize;
if ( arcsegmentcount >= 32 )
if( arcsegmentcount >= 32 )
m_ArcToSegmentsCount = 32;
if ( drawopt == 'S' ) // Sketch mode for filled areas in this zone selected
if( drawopt == 'S' ) // Sketch mode for filled areas in this zone selected
m_DrawOptions = 1;
}
if( strnicmp( Line, "ZClearance", 10 ) == 0 ) // Clearence and pad options info found
{
......@@ -351,7 +353,7 @@ int ZONE_CONTAINER::ReadDescr( FILE* aFile, int* aLineNum )
}
/* Set hatch here, when outlines corners are read */
m_Poly->SetHatch(outline_hatch);
m_Poly->SetHatch( outline_hatch );
return error ? 0 : 1;
}
......@@ -571,7 +573,7 @@ void ZONE_CONTAINER::DrawWhileCreateOutline( WinEDA_DrawPanel* panel, wxDC* DC,
if( DC == NULL )
return;
int curr_layer = ( (PCB_SCREEN*) panel->GetScreen() )->m_Active_Layer;
int color = g_DesignSettings.m_LayerColor[m_Layer] & MASKCOLOR;
int color = g_DesignSettings.m_LayerColor[m_Layer & 31] & MASKCOLOR;
if( DisplayOpt.ContrastModeDisplay )
{
......@@ -585,27 +587,30 @@ void ZONE_CONTAINER::DrawWhileCreateOutline( WinEDA_DrawPanel* panel, wxDC* DC,
// draw the lines
wxPoint start_contour_pos = GetCornerPosition( 0 );
for( int ic = 0; ic < GetNumCorners(); ic++ )
int icmax = GetNumCorners() - 1;
for( int ic = 0; ic <= icmax; ic++ )
{
int xi = GetCornerPosition( ic ).x;
int yi = GetCornerPosition( ic ).y;
int xf, yf;
if( m_Poly->corner[ic].end_contour == FALSE && ic < GetNumCorners() - 1 )
if( m_Poly->corner[ic].end_contour == FALSE && ic < icmax )
{
is_close_segment = false;
xf = GetCornerPosition( ic + 1 ).x;
yf = GetCornerPosition( ic + 1 ).y;
if( (m_Poly->corner[ic + 1].end_contour) || (ic == GetNumCorners() - 2) )
if( (m_Poly->corner[ic + 1].end_contour) || (ic == icmax - 1) )
current_gr_mode = GR_XOR;
else
current_gr_mode = draw_mode;
}
else
else // Draw the line from last corner to the first corner of the current coutour
{
is_close_segment = true;
current_gr_mode = GR_XOR;
xf = start_contour_pos.x;
yf = start_contour_pos.y;
// Prepare the next contour for drawing, if exists
if ( ic < icmax )
start_contour_pos = GetCornerPosition( ic + 1 );
}
GRSetDrawMode( DC, current_gr_mode );
......
pcbnew/class_zone.h
View file @ 9eba4f95
......@@ -34,6 +34,8 @@ public:
int m_GridFillValue; // Grid used for filling, 0 = use polygonal areas to fill
int m_ArcToSegmentsCount; // number of segments to convert a cirlce to a polygon (uses 16 or 32)
m_PadInZone m_PadOption; // see m_PadInZone
int m_ThermalReliefGapValue; // tickness of the gap in thermal reliefs
int m_ThermalReliefCopperBridgeValue; // tickness of the copper bridge in thermal reliefs
int utility, utility2; // flags used in polygon calculations
std::vector <CPolyPt> m_FilledPolysList; /* set of filled polygons used to draw a zone as a filled area.
* from outlines (m_Poly) but unlike m_Poly these filled polygons have no hole (they are all in one piece)
......
pcbnew/dialog_copper_zones.cpp
View file @ 9eba4f95
......@@ -53,7 +53,7 @@ dialog_copper_zone::dialog_copper_zone( WinEDA_PcbFrame* parent, ZONE_CONTAINER
/*****************************************************************/
void dialog_copper_zone::OnInitDialog( wxInitDialogEvent& event )
/*****************************************************************/
// Initialise dialog options
// Initialise all dialog options and values in wxTextCtrl
{
BOARD* board = m_Parent->m_Pcb;
......@@ -109,13 +109,13 @@ void dialog_copper_zone::OnInitDialog( wxInitDialogEvent& event )
switch( m_Zone_Container->m_PadOption )
{
case ZONE_CONTAINER::PAD_NOT_IN_ZONE: // Pads are not covered
m_FillOpt->SetSelection( 2 );
m_PadInZoneOpt->SetSelection( 2 );
break;
case ZONE_CONTAINER::THERMAL_PAD: // Use thermal relief for pads
m_FillOpt->SetSelection( 1 );
m_PadInZoneOpt->SetSelection( 1 );
break;
case ZONE_CONTAINER::PAD_IN_ZONE: // pads are covered by copper
m_FillOpt->SetSelection( 0 );
m_PadInZoneOpt->SetSelection( 0 );
break;
}
g_Zone_Hatching = m_Zone_Container->m_Poly->GetHatchStyle();
......@@ -133,19 +133,45 @@ void dialog_copper_zone::OnInitDialog( wxInitDialogEvent& event )
switch( g_Zone_Pad_Options )
{
case ZONE_CONTAINER::PAD_NOT_IN_ZONE: // Pads are not covered
m_FillOpt->SetSelection( 2 );
m_PadInZoneOpt->SetSelection( 2 );
break;
case ZONE_CONTAINER::THERMAL_PAD: // Use thermal relief for pads
m_FillOpt->SetSelection( 1 );
m_PadInZoneOpt->SetSelection( 1 );
break;
case ZONE_CONTAINER::PAD_IN_ZONE: // pads are covered by copper
m_FillOpt->SetSelection( 0 );
m_PadInZoneOpt->SetSelection( 0 );
break;
}
g_Zone_Hatching = m_Parent->m_Parent->m_EDA_Config->Read( ZONE_NET_OUTLINES_HATCH_OPTION_KEY,
(long) CPolyLine::DIAGONAL_EDGE );
}
if ( g_Zone_Pad_Options != ZONE_CONTAINER::THERMAL_PAD )
{
m_AntipadSizeValue->Enable(false);
m_CopperWidthValue->Enable(false);
}
else
{
m_AntipadSizeValue->Enable(true);
m_CopperWidthValue->Enable(true);
}
if( m_Zone_Container )
{
g_ThermalReliefGapValue = m_Zone_Container->m_ThermalReliefGapValue;
g_ThermalReliefCopperBridgeValue = m_Zone_Container->m_ThermalReliefCopperBridgeValue;
}
else
{
m_Parent->m_Parent->m_EDA_Config->Read( ZONE_THERMAL_RELIEF_GAP_STRING_KEY, &g_ThermalReliefGapValue );
m_Parent->m_Parent->m_EDA_Config->Read( ZONE_THERMAL_RELIEF_COPPER_WIDTH_STRING_KEY, &g_ThermalReliefCopperBridgeValue );
}
AddUnitSymbol( *m_AntipadSizeText, g_UnitMetric );
AddUnitSymbol( *m_CopperBridgeWidthText, g_UnitMetric );
PutValueInLocalUnits( *m_AntipadSizeValue, g_ThermalReliefGapValue, PCB_INTERNAL_UNIT );
PutValueInLocalUnits( *m_CopperWidthValue, g_ThermalReliefCopperBridgeValue, PCB_INTERNAL_UNIT );
switch( g_Zone_Hatching )
{
case CPolyLine::NO_HATCH:
......@@ -245,6 +271,7 @@ void dialog_copper_zone::OnInitDialog( wxInitDialogEvent& event )
{
GetSizer()->SetSizeHints(this);
}
Center();
}
......@@ -265,7 +292,7 @@ bool dialog_copper_zone::AcceptOptions(bool aPromptForErrors, bool aUseExportabl
* @param aUseExportableSetupOnly = true to use exportable parametres only (used to export this setup to other zones)
*/
{
switch( m_FillOpt->GetSelection() )
switch( m_PadInZoneOpt->GetSelection() )
{
case 2:
g_Zone_Pad_Options = ZONE_CONTAINER::PAD_NOT_IN_ZONE; // Pads are not covered
......@@ -338,6 +365,12 @@ bool dialog_copper_zone::AcceptOptions(bool aPromptForErrors, bool aUseExportabl
g_FilledAreasShowMode = m_ShowFilledAreasInSketchOpt->IsChecked() ? 1 : 0;
g_ThermalReliefGapValue = ReturnValueFromTextCtrl( *m_AntipadSizeValue, PCB_INTERNAL_UNIT );
g_ThermalReliefCopperBridgeValue = ReturnValueFromTextCtrl( *m_CopperWidthValue, PCB_INTERNAL_UNIT );
m_Parent->m_Parent->m_EDA_Config->Write( ZONE_THERMAL_RELIEF_GAP_STRING_KEY, (long) g_ThermalReliefGapValue );
m_Parent->m_Parent->m_EDA_Config->Write( ZONE_THERMAL_RELIEF_COPPER_WIDTH_STRING_KEY, (long)g_ThermalReliefCopperBridgeValue );
// If we use only exportable to others zones parameters, exit here:
if ( aUseExportableSetupOnly )
return true;
......@@ -467,7 +500,28 @@ void dialog_copper_zone::ExportSetupToOtherCopperZones( wxCommandEvent& event )
zone->m_GridFillValue = g_GridRoutingSize;
zone->m_ArcToSegmentsCount = g_Zone_Arc_Approximation;
zone->m_DrawOptions = g_FilledAreasShowMode;
zone->m_ThermalReliefGapValue = g_ThermalReliefGapValue;
zone->m_ThermalReliefCopperBridgeValue = g_ThermalReliefCopperBridgeValue;
m_Parent->GetScreen()->SetModify();;
}
}
/******************************************************************/
void dialog_copper_zone::OnPadsInZoneClick( wxCommandEvent& event )
/******************************************************************/
{
switch ( m_PadInZoneOpt->GetSelection() )
{
default:
m_AntipadSizeValue->Enable(false);
m_CopperWidthValue->Enable(false);
break;
case 1:
m_AntipadSizeValue->Enable(true);
m_CopperWidthValue->Enable(true);
break;
}
}
pcbnew/dialog_copper_zones.h
View file @ 9eba4f95
......@@ -24,6 +24,7 @@ public:
void OnRemoveFillZoneButtonClick( wxCommandEvent& event );
void OnNetSortingOptionSelected( wxCommandEvent& event );
void ExportSetupToOtherCopperZones( wxCommandEvent& event );
void OnPadsInZoneClick( wxCommandEvent& event );
};
#endif // #ifndef DIALOG_COPPER_ZONES
pcbnew/dialog_copper_zones_frame.cpp
View file @ 9eba4f95
......@@ -11,6 +11,7 @@
BEGIN_EVENT_TABLE( dialog_copper_zone_frame, wxDialog )
EVT_INIT_DIALOG( dialog_copper_zone_frame::_wxFB_OnInitDialog )
EVT_RADIOBOX( wxID_PADS_IN_ZONE_OPTIONS, dialog_copper_zone_frame::_wxFB_OnPadsInZoneClick )
EVT_BUTTON( wxID_BUTTON_EXPORT, dialog_copper_zone_frame::_wxFB_ExportSetupToOtherCopperZones )
EVT_BUTTON( wxID_OK, dialog_copper_zone_frame::_wxFB_OnButtonOkClick )
EVT_BUTTON( wxID_CANCEL, dialog_copper_zone_frame::_wxFB_OnButtonCancelClick )
......@@ -37,30 +38,40 @@ dialog_copper_zone_frame::dialog_copper_zone_frame( wxWindow* parent, wxWindowID
wxStaticBoxSizer* m_FillOptionsBox;
m_FillOptionsBox = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Zone Fill Options:") ), wxVERTICAL );
wxString m_GridCtrlChoices[] = { _("0.00000"), _("0.00000"), _("0.00000"), _("0.00000"), _("No Grid (For tests only!)") };
wxString m_GridCtrlChoices[] = { _("0.00000"), _("0.00000"), _("0.00000"), _("0.00000"), _("No grid (For tests only!)") };
int m_GridCtrlNChoices = sizeof( m_GridCtrlChoices ) / sizeof( wxString );
m_GridCtrl = new wxRadioBox( this, ID_RADIOBOX_GRID_SELECTION, _("Grid Size for Filling:"), wxDefaultPosition, wxDefaultSize, m_GridCtrlNChoices, m_GridCtrlChoices, 1, wxRA_SPECIFY_COLS );
m_GridCtrl->SetSelection( 0 );
m_GridCtrl->SetSelection( 4 );
m_FillOptionsBox->Add( m_GridCtrl, 0, wxALL|wxEXPAND, 5 );
m_ClearanceValueTitle = new wxStaticText( this, wxID_ANY, _("Zone clearance value (mm):"), wxDefaultPosition, wxDefaultSize, 0 );
m_ClearanceValueTitle->Wrap( -1 );
m_FillOptionsBox->Add( m_ClearanceValueTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
wxString m_PadInZoneOptChoices[] = { _("Include pads"), _("Thermal relief"), _("Exclude pads") };
int m_PadInZoneOptNChoices = sizeof( m_PadInZoneOptChoices ) / sizeof( wxString );
m_PadInZoneOpt = new wxRadioBox( this, wxID_PADS_IN_ZONE_OPTIONS, _("Pad in Zone:"), wxDefaultPosition, wxDefaultSize, m_PadInZoneOptNChoices, m_PadInZoneOptChoices, 1, wxRA_SPECIFY_COLS );
m_PadInZoneOpt->SetSelection( 1 );
m_FillOptionsBox->Add( m_PadInZoneOpt, 0, wxALL|wxEXPAND, 5 );
m_ZoneClearanceCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_FillOptionsBox->Add( m_ZoneClearanceCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
wxStaticBoxSizer* m_ThermalShapesParamsSizer;
m_ThermalShapesParamsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Thermal Reliefs Parameters") ), wxVERTICAL );
wxString m_FillOptChoices[] = { _("Include Pads"), _("Thermal Relief"), _("Exclude Pads") };
int m_FillOptNChoices = sizeof( m_FillOptChoices ) / sizeof( wxString );
m_FillOpt = new wxRadioBox( this, wxID_ANY, _("Pad in Zone:"), wxDefaultPosition, wxDefaultSize, m_FillOptNChoices, m_FillOptChoices, 1, wxRA_SPECIFY_COLS );
m_FillOpt->SetSelection( 2 );
m_FillOptionsBox->Add( m_FillOpt, 0, wxALL|wxEXPAND, 5 );
m_AntipadSizeText = new wxStaticText( this, wxID_ANY, _("Antipad Size"), wxDefaultPosition, wxDefaultSize, 0 );
m_AntipadSizeText->Wrap( -1 );
m_ThermalShapesParamsSizer->Add( m_AntipadSizeText, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_ShowFilledAreasInSketchOpt = new wxCheckBox( this, wxID_ANY, _("Show filled areas in sketch mode"), wxDefaultPosition, wxDefaultSize, 0 );
m_AntipadSizeValue = new wxTextCtrl( this, wxID_ANTIPAD_SIZE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_AntipadSizeValue->SetToolTip( _("Define the gap around the pad") );
m_ShowFilledAreasInSketchOpt->SetToolTip( _("If enabled, filled areas in is this zone will be displayed as non filled polygons.\nIf disabled, filled areas in is this zone will be displayed as \"solid\" areas (normal mode).") );
m_ThermalShapesParamsSizer->Add( m_AntipadSizeValue, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_CopperBridgeWidthText = new wxStaticText( this, wxID_ANY, _("Copper Width"), wxDefaultPosition, wxDefaultSize, 0 );
m_CopperBridgeWidthText->Wrap( -1 );
m_ThermalShapesParamsSizer->Add( m_CopperBridgeWidthText, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_FillOptionsBox->Add( m_ShowFilledAreasInSketchOpt, 0, wxALL, 5 );
m_CopperWidthValue = new wxTextCtrl( this, wxID_COPPER_BRIDGE_VALUE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_CopperWidthValue->SetToolTip( _("Define the tickness of copper in therma reliefs") );
m_ThermalShapesParamsSizer->Add( m_CopperWidthValue, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_FillOptionsBox->Add( m_ThermalShapesParamsSizer, 0, wxEXPAND, 5 );
m_LeftBoxSizer->Add( m_FillOptionsBox, 1, wxEXPAND, 5 );
......@@ -84,13 +95,10 @@ dialog_copper_zone_frame::dialog_copper_zone_frame( wxWindow* parent, wxWindowID
m_OrientEdgesOpt->SetSelection( 0 );
m_OutilinesBoxOpt->Add( m_OrientEdgesOpt, 0, wxALL|wxEXPAND, 5 );
m_OutilinesBoxOpt->Add( 5, 5, 0, 0, 5 );
wxString m_OutlineAppearanceCtrlChoices[] = { _("Line"), _("Hatched Outline"), _("Full Hatched") };
wxString m_OutlineAppearanceCtrlChoices[] = { _("Line"), _("Hatched outline"), _("Full hatched") };
int m_OutlineAppearanceCtrlNChoices = sizeof( m_OutlineAppearanceCtrlChoices ) / sizeof( wxString );
m_OutlineAppearanceCtrl = new wxRadioBox( this, ID_RADIOBOX_OUTLINES_OPTION, _("Outlines Appearance"), wxDefaultPosition, wxDefaultSize, m_OutlineAppearanceCtrlNChoices, m_OutlineAppearanceCtrlChoices, 1, wxRA_SPECIFY_COLS );
m_OutlineAppearanceCtrl->SetSelection( 0 );
m_OutlineAppearanceCtrl->SetSelection( 1 );
m_OutlineAppearanceCtrl->SetToolTip( _("Choose how a zone outline is displayed\n- Single line\n- Short hatching\n- Full zone area hatched") );
m_OutilinesBoxOpt->Add( m_OutlineAppearanceCtrl, 0, wxALL|wxEXPAND, 5 );
......@@ -103,12 +111,30 @@ dialog_copper_zone_frame::dialog_copper_zone_frame( wxWindow* parent, wxWindowID
m_OutilinesBoxOpt->Add( m_ArcApproximationOpt, 0, wxALL|wxEXPAND, 5 );
wxStaticBoxSizer* m_OthersOptionsSizer;
m_OthersOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Others Options:") ), wxVERTICAL );
m_ShowFilledAreasInSketchOpt = new wxCheckBox( this, wxID_ANY, _("Show filled areas in sketch mode"), wxDefaultPosition, wxDefaultSize, 0 );
m_ShowFilledAreasInSketchOpt->SetToolTip( _("If enabled, filled areas in is this zone will be displayed as non filled polygons.\nIf disabled, filled areas in is this zone will be displayed as \"solid\" areas (normal mode).") );
m_OthersOptionsSizer->Add( m_ShowFilledAreasInSketchOpt, 0, wxALL, 5 );
m_ClearanceValueTitle = new wxStaticText( this, wxID_ANY, _("Zone clearance value (mm):"), wxDefaultPosition, wxDefaultSize, 0 );
m_ClearanceValueTitle->Wrap( -1 );
m_OthersOptionsSizer->Add( m_ClearanceValueTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_ZoneClearanceCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_OthersOptionsSizer->Add( m_ZoneClearanceCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_OutilinesBoxOpt->Add( m_OthersOptionsSizer, 1, wxEXPAND, 5 );
m_MiddleBoxSizer->Add( m_OutilinesBoxOpt, 1, wxEXPAND, 5 );
m_ExportSetupBuuton = new wxButton( this, wxID_BUTTON_EXPORT, _("Export to others zones"), wxDefaultPosition, wxDefaultSize, 0 );
m_ExportSetupBuuton->SetToolTip( _("Export this zone setup to all others copper zones") );
m_ExportSetupButton = new wxButton( this, wxID_BUTTON_EXPORT, _("Export to others zones"), wxDefaultPosition, wxDefaultSize, 0 );
m_ExportSetupButton->SetToolTip( _("Export this zone setup to all others copper zones") );
m_MiddleBoxSizer->Add( m_ExportSetupBuuton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
m_MiddleBoxSizer->Add( m_ExportSetupButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
m_MiddleBox->Add( m_MiddleBoxSizer, 0, 0, 5 );
......@@ -129,7 +155,7 @@ dialog_copper_zone_frame::dialog_copper_zone_frame( wxWindow* parent, wxWindowID
m_ButtonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
m_RightBoxSizer->Add( m_ButtonCancel, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
m_UnFillZoneButton = new wxButton( this, wxID_BUTTON_UNFILL, _("UnFill Zone"), wxDefaultPosition, wxDefaultSize, 0 );
m_UnFillZoneButton = new wxButton( this, wxID_BUTTON_UNFILL, _("Remove Filling"), wxDefaultPosition, wxDefaultSize, 0 );
m_RightBoxSizer->Add( m_UnFillZoneButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
......
pcbnew/dialog_copper_zones_frame.fbp
View file @ 9eba4f95
......@@ -32,7 +32,7 @@
<property name="minimum_size"></property>
<property name="name">dialog_copper_zone_frame</property>
<property name="pos"></property>
<property name="size">452,493</property>
<property name="size">545,493</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass"></property>
<property name="title">Fill Zones Options</property>
......@@ -123,7 +123,7 @@
<property name="proportion">0</property>
<object class="wxRadioBox" expanded="1">
<property name="bg"></property>
<property name="choices">&quot;0.00000&quot; &quot;0.00000&quot; &quot;0.00000&quot; &quot;0.00000&quot; &quot;No Grid (For tests only!)&quot;</property>
<property name="choices">&quot;0.00000&quot; &quot;0.00000&quot; &quot;0.00000&quot; &quot;0.00000&quot; &quot;No grid (For tests only!)&quot;</property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
......@@ -137,7 +137,7 @@
<property name="name">m_GridCtrl</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="selection">0</property>
<property name="selection">4</property>
<property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property>
......@@ -171,6 +171,72 @@
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxRadioBox" expanded="1">
<property name="bg"></property>
<property name="choices">&quot;Include pads&quot; &quot;Thermal relief&quot; &quot;Exclude pads&quot;</property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_PADS_IN_ZONE_OPTIONS</property>
<property name="label">Pad in Zone:</property>
<property name="majorDimension">1</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_PadInZoneOpt</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="selection">1</property>
<property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</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="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></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="OnRadioBox">OnPadsInZoneClick</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">wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label">Thermal Reliefs Parameters</property>
<property name="minimum_size"></property>
<property name="name">m_ThermalShapesParamsSizer</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<event name="OnUpdateUI"></event>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
......@@ -183,10 +249,10 @@
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Zone clearance value (mm):</property>
<property name="label">Antipad Size</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_ClearanceValueTitle</property>
<property name="name">m_AntipadSizeText</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
......@@ -224,7 +290,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="flag">wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxTextCtrl" expanded="1">
<property name="bg"></property>
......@@ -233,17 +299,17 @@
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="id">wxID_ANTIPAD_SIZE</property>
<property name="maximum_size"></property>
<property name="maxlength">0</property>
<property name="minimum_size"></property>
<property name="name">m_ZoneClearanceCtrl</property>
<property name="name">m_AntipadSizeValue</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="tooltip">Define the gap around the pad</property>
<property name="value"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
......@@ -279,32 +345,30 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxRadioBox" expanded="1">
<object class="wxStaticText" expanded="1">
<property name="bg"></property>
<property name="choices">&quot;Include Pads&quot; &quot;Thermal Relief&quot; &quot;Exclude Pads&quot;</property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Pad in Zone:</property>
<property name="majorDimension">1</property>
<property name="label">Copper Width</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_FillOpt</property>
<property name="name">m_CopperBridgeWidthText</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="selection">2</property>
<property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</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>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
......@@ -322,7 +386,6 @@
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRadioBox"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
......@@ -333,32 +396,31 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<object class="wxTextCtrl" expanded="1">
<property name="bg"></property>
<property name="checked">0</property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Show filled areas in sketch mode</property>
<property name="id">wxID_COPPER_BRIDGE_VALUE</property>
<property name="maximum_size"></property>
<property name="maxlength">0</property>
<property name="minimum_size"></property>
<property name="name">m_ShowFilledAreasInSketchOpt</property>
<property name="name">m_CopperWidthValue</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">If enabled, filled areas in is this zone will be displayed as non filled polygons.&#x0A;If disabled, filled areas in is this zone will be displayed as &quot;solid&quot; areas (normal mode).</property>
<property name="tooltip">Define the tickness of copper in therma reliefs</property>
<property name="value"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
......@@ -380,6 +442,10 @@
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnText"></event>
<event name="OnTextEnter"></event>
<event name="OnTextMaxLen"></event>
<event name="OnTextURL"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
......@@ -387,6 +453,8 @@
</object>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
......@@ -481,23 +549,13 @@
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag"></property>
<property name="proportion">0</property>
<object class="spacer" expanded="1">
<property name="height">5</property>
<property name="permission">protected</property>
<property name="width">5</property>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxRadioBox" expanded="1">
<property name="bg"></property>
<property name="choices">&quot;Line&quot; &quot;Hatched Outline&quot; &quot;Full Hatched&quot;</property>
<property name="choices">&quot;Line&quot; &quot;Hatched outline&quot; &quot;Full hatched&quot;</property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
......@@ -511,7 +569,7 @@
<property name="name">m_OutlineAppearanceCtrl</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="selection">0</property>
<property name="selection">1</property>
<property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property>
......@@ -599,6 +657,178 @@
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label">Others Options:</property>
<property name="minimum_size"></property>
<property name="name">m_OthersOptionsSizer</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<event name="OnUpdateUI"></event>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="bg"></property>
<property name="checked">0</property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Show filled areas in sketch mode</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_ShowFilledAreasInSketchOpt</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">If enabled, filled areas in is this zone will be displayed as non filled polygons.&#x0A;If disabled, filled areas in is this zone will be displayed as &quot;solid&quot; areas (normal mode).</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></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">wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Zone clearance value (mm):</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_ClearanceValueTitle</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>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></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">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxTextCtrl" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="maxlength">0</property>
<property name="minimum_size"></property>
<property name="name">m_ZoneClearanceCtrl</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="value"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></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="OnText"></event>
<event name="OnTextEnter"></event>
<event name="OnTextMaxLen"></event>
<event name="OnTextURL"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="1">
......@@ -617,7 +847,7 @@
<property name="label">Export to others zones</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_ExportSetupBuuton</property>
<property name="name">m_ExportSetupButton</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
......@@ -795,7 +1025,7 @@
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_BUTTON_UNFILL</property>
<property name="label">UnFill Zone</property>
<property name="label">Remove Filling</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_UnFillZoneButton</property>
......
pcbnew/dialog_copper_zones_frame.h
View file @ 9eba4f95
......@@ -18,9 +18,9 @@
#include <wx/settings.h>
#include <wx/stattext.h>
#include <wx/textctrl.h>
#include <wx/checkbox.h>
#include <wx/sizer.h>
#include <wx/statbox.h>
#include <wx/checkbox.h>
#include <wx/button.h>
#include <wx/listbox.h>
#include <wx/dialog.h>
......@@ -37,6 +37,7 @@ class dialog_copper_zone_frame : public wxDialog
// Private event handlers
void _wxFB_OnInitDialog( wxInitDialogEvent& event ){ OnInitDialog( event ); }
void _wxFB_OnPadsInZoneClick( wxCommandEvent& event ){ OnPadsInZoneClick( event ); }
void _wxFB_ExportSetupToOtherCopperZones( wxCommandEvent& event ){ ExportSetupToOtherCopperZones( event ); }
void _wxFB_OnButtonOkClick( wxCommandEvent& event ){ OnButtonOkClick( event ); }
void _wxFB_OnButtonCancelClick( wxCommandEvent& event ){ OnButtonCancelClick( event ); }
......@@ -48,6 +49,9 @@ class dialog_copper_zone_frame : public wxDialog
enum
{
ID_RADIOBOX_GRID_SELECTION = 1000,
wxID_PADS_IN_ZONE_OPTIONS,
wxID_ANTIPAD_SIZE,
wxID_COPPER_BRIDGE_VALUE,
ID_RADIOBOX_OUTLINES_OPTION,
wxID_ARC_APPROX,
wxID_BUTTON_EXPORT,
......@@ -59,16 +63,19 @@ class dialog_copper_zone_frame : public wxDialog
};
wxRadioBox* m_GridCtrl;
wxStaticText* m_ClearanceValueTitle;
wxTextCtrl* m_ZoneClearanceCtrl;
wxRadioBox* m_FillOpt;
wxCheckBox* m_ShowFilledAreasInSketchOpt;
wxRadioBox* m_PadInZoneOpt;
wxStaticText* m_AntipadSizeText;
wxTextCtrl* m_AntipadSizeValue;
wxStaticText* m_CopperBridgeWidthText;
wxTextCtrl* m_CopperWidthValue;
wxRadioBox* m_OrientEdgesOpt;
wxRadioBox* m_OutlineAppearanceCtrl;
wxRadioBox* m_ArcApproximationOpt;
wxButton* m_ExportSetupBuuton;
wxCheckBox* m_ShowFilledAreasInSketchOpt;
wxStaticText* m_ClearanceValueTitle;
wxTextCtrl* m_ZoneClearanceCtrl;
wxButton* m_ExportSetupButton;
wxButton* m_OkButton;
wxButton* m_ButtonCancel;
......@@ -84,6 +91,7 @@ class dialog_copper_zone_frame : public wxDialog
// Virtual event handlers, overide them in your derived class
virtual void OnInitDialog( wxInitDialogEvent& event ){ event.Skip(); }
virtual void OnPadsInZoneClick( wxCommandEvent& event ){ event.Skip(); }
virtual void ExportSetupToOtherCopperZones( wxCommandEvent& event ){ event.Skip(); }
virtual void OnButtonOkClick( wxCommandEvent& event ){ event.Skip(); }
virtual void OnButtonCancelClick( wxCommandEvent& event ){ event.Skip(); }
......@@ -92,7 +100,7 @@ class dialog_copper_zone_frame : public wxDialog
public:
dialog_copper_zone_frame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Fill Zones Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 452,493 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
dialog_copper_zone_frame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Fill Zones Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 545,493 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~dialog_copper_zone_frame();
};
......
pcbnew/zones.h
View file @ 9eba4f95
......@@ -15,6 +15,8 @@
#define ZONE_NET_OUTLINES_HATCH_OPTION_KEY wxT( "Zone_Ouline_Hatch_Opt" )
#define ZONE_NET_SORT_OPTION_KEY wxT( "Zone_NetSort_Opt" )
#define ZONE_NET_FILTER_STRING_KEY wxT( "Zone_Filter_Opt" )
#define ZONE_THERMAL_RELIEF_GAP_STRING_KEY wxT( "Zone_TH_Gap" )
#define ZONE_THERMAL_RELIEF_COPPER_WIDTH_STRING_KEY wxT( "Zone_TH_Copper_Width" )
enum zone_cmd {
ZONE_ABORT,
......@@ -37,6 +39,16 @@ eda_global int g_Zone_Hatching; // Option to show the zone a
eda_global int g_Zone_Arc_Approximation; // Option to select number of segments to approximate a circle
// 16 or 32 segments
eda_global int g_FilledAreasShowMode; // Used to select draw options for filled areas in a zone (currently normal =0, sketch = 1)
eda_global long g_ThermalReliefGapValue // tickness of the gap in thermal reliefs
#ifdef MAIN
= 200
#endif
;
eda_global long g_ThermalReliefCopperBridgeValue // tickness of the copper bridge in thermal reliefs
#ifdef MAIN
= 200
#endif
;
eda_global ZONE_CONTAINER::m_PadInZone g_Zone_Pad_Options
#ifdef MAIN
......
pcbnew/zones_by_polygon.cpp
View file @ 9eba4f95
......@@ -64,6 +64,8 @@ void WinEDA_PcbFrame::Add_Similar_Zone( wxDC* DC, ZONE_CONTAINER* zone_container
* @param zone_container = parent zone outline
*/
{
if ( zone_container == NULL )
return;
s_AddCutoutToCurrentZone = false;
s_CurrentZone = zone_container;
wxCommandEvent evt;
......@@ -83,6 +85,8 @@ void WinEDA_PcbFrame::Add_Zone_Cutout( wxDC* DC, ZONE_CONTAINER* zone_container
* @param zone_container = parent zone outline
*/
{
if ( zone_container == NULL )
return;
s_AddCutoutToCurrentZone = true;
s_CurrentZone = zone_container;
wxCommandEvent evt;
......@@ -479,39 +483,40 @@ int WinEDA_PcbFrame::Begin_Zone( wxDC* DC )
* Function Begin_Zone
* either initializes the first segment of a new zone, or adds an
* intermediate segment.
* A new zone can be:
* created from scratch: the user will be prompted to define parameters (layer, clearence ...)
* created from a similar zone (s_CurrentZone is used): parameters are copied from s_CurrentZone
* created as a cutout (an hole) inside s_CurrentZone
*/
{
// verify if s_CurrentZone exists:
// verify if s_CurrentZone exists (could be deleted since last selection) :
int ii;
for( ii = 0; ii < m_Pcb->GetAreaCount(); ii++ )
{
if( s_CurrentZone == m_Pcb->GetArea( ii ) )
break;
}
if( ii == m_Pcb->GetAreaCount() ) // Not found: could be deleted since last selection
if( ii >= m_Pcb->GetAreaCount() ) // Not found: could be deleted since last selection
{
s_AddCutoutToCurrentZone = false;
s_CurrentZone = NULL;
}
ZONE_CONTAINER* zone;
// If no zone contour in progress, a new zone is beeing created:
if( m_Pcb->m_CurrentZoneContour == NULL )
m_Pcb->m_CurrentZoneContour = new ZONE_CONTAINER( m_Pcb );
zone = m_Pcb->m_CurrentZoneContour;
if( zone->GetNumCorners() == 0 ) /* Start a new contour: init zone params (net and layer) */
ZONE_CONTAINER* zone = m_Pcb->m_CurrentZoneContour;
if( zone->GetNumCorners() == 0 ) /* Start a new contour: init zone params (net, layer ...) */
{
if( s_CurrentZone == NULL ) // A new outline is created
if( s_CurrentZone == NULL ) // A new outline is created, from scratch
{
int diag;
// Init zone params to reasonnable values
zone->SetLayer( ( (PCB_SCREEN*) GetScreen() )->m_Active_Layer );
// Prompt user fro exact parameters:
// Prompt user for parameters:
DrawPanel->m_IgnoreMouseEvents = TRUE;
if( zone->IsOnCopperLayer() )
{ // Put a zone on a copper layer
......@@ -541,7 +546,7 @@ int WinEDA_PcbFrame::Begin_Zone( wxDC* DC )
( (PCB_SCREEN*) GetScreen() )->m_Active_Layer = g_CurrentZone_Layer; // Set by the dialog frame
}
else /* Start a new contour: init zone params (net and layer) from an existing zone */
else // Start a new contour: init zone params (net and layer) from an existing zone (add cutout or similar zone)
{
( (PCB_SCREEN*) GetScreen() )->m_Active_Layer = g_CurrentZone_Layer =
s_CurrentZone->GetLayer();
......@@ -551,18 +556,18 @@ int WinEDA_PcbFrame::Begin_Zone( wxDC* DC )
/* Show the Net for zones on copper layers */
if( g_CurrentZone_Layer < FIRST_NO_COPPER_LAYER )
{
if( g_HightLigt_Status && (g_HightLigth_NetCode != g_NetcodeSelection) )
if( s_CurrentZone )
g_NetcodeSelection = s_CurrentZone->GetNet();
if( g_HightLigt_Status )
{
Hight_Light( DC ); // Remove old hightlight selection
}
if( s_CurrentZone )
g_NetcodeSelection = s_CurrentZone->GetNet();
g_HightLigth_NetCode = g_NetcodeSelection;
Hight_Light( DC );
}
if( !s_AddCutoutToCurrentZone )
s_CurrentZone = NULL; // the zone is used only once
s_CurrentZone = NULL; // the zone is used only once ("add similar zone" command)
}
// if first segment
......@@ -574,6 +579,8 @@ int WinEDA_PcbFrame::Begin_Zone( wxDC* DC )
zone->m_TimeStamp = GetTimeStamp();
zone->m_PadOption = g_Zone_Pad_Options;
zone->m_ZoneClearance = g_DesignSettings.m_ZoneClearence;
zone->m_ThermalReliefGapValue = g_ThermalReliefGapValue;
zone->m_ThermalReliefCopperBridgeValue = g_ThermalReliefCopperBridgeValue;
zone->m_GridFillValue = g_GridRoutingSize;
zone->m_Poly->Start( g_CurrentZone_Layer,
GetScreen()->m_Curseur.x, GetScreen()->m_Curseur.y,
......@@ -729,6 +736,8 @@ static void Show_New_Edge_While_Move_Mouse( WinEDA_DrawPanel* panel, wxDC* DC, b
return;
int icorner = zone->GetNumCorners() - 1;
if ( icorner < 1 )
return; // We must have 2 (or more) corners
if( erase ) /* Undraw edge in old position*/
{
......@@ -760,7 +769,6 @@ void WinEDA_PcbFrame::Edit_Zone_Params( wxDC* DC, ZONE_CONTAINER* zone_container
*/
{
int diag;
DrawPanel->m_IgnoreMouseEvents = TRUE;
if( zone_container->GetLayer() < FIRST_NO_COPPER_LAYER )
{ // edit a zone on a copper layer
......@@ -795,6 +803,8 @@ void WinEDA_PcbFrame::Edit_Zone_Params( wxDC* DC, ZONE_CONTAINER* zone_container
zone_container->m_GridFillValue = g_GridRoutingSize;
zone_container->m_ArcToSegmentsCount = g_Zone_Arc_Approximation;
zone_container->m_DrawOptions = g_FilledAreasShowMode;
zone_container->m_ThermalReliefGapValue = g_ThermalReliefGapValue;
zone_container->m_ThermalReliefCopperBridgeValue = g_ThermalReliefCopperBridgeValue;
// Combine zones if possible :
......
pcbnew/zones_convert_brd_items_to_polygons.cpp
View file @ 9eba4f95
......@@ -113,7 +113,8 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
break;
case THERMAL_PAD:
AddThermalReliefPadPolygon( booleng, *pad, 100, 100 );
AddThermalReliefPadPolygon( booleng, *pad,
m_ThermalReliefGapValue, m_ThermalReliefCopperBridgeValue );
break;
case PAD_IN_ZONE:
......
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