From 1e9a65f5ecbbae558d6ae8ccd10102e7cd7b06f6 Mon Sep 17 00:00:00 2001
From: charras <Unknown>
Date: Mon, 18 Aug 2008 15:18:35 +0000
Subject: [PATCH] Pcbnew bug solved: Horizontal Oblong pads holes have a bad T
 Code size in the drill file

---
 3d-viewer/3d_draw.cpp                         |  10 ++---
 3d-viewer/3d_toolbar.cpp                      |   2 +-
 bitmaps/makefile.include                      |   1 +
 bitmaps/shape_3d.xpm                          |  33 +++++++++++++++
 change_log.txt                                |  10 ++++-
 include/bitmaps.h                             |   1 +
 include/build_version.h                       |   2 +-
 internat/fr/kicad.mo                          | Bin 157935 -> 157985 bytes
 internat/fr/kicad.po                          |  38 +++++++++---------
 pcbnew/class_pad.cpp                          |   4 +-
 .../gen_holes_and_tools_lists_for_drill.cpp   |   2 +-
 11 files changed, 71 insertions(+), 32 deletions(-)
 create mode 100644 bitmaps/shape_3d.xpm

diff --git a/3d-viewer/3d_draw.cpp b/3d-viewer/3d_draw.cpp
index 51552e5a3c..bc8afe5cf6 100644
--- a/3d-viewer/3d_draw.cpp
+++ b/3d-viewer/3d_draw.cpp
@@ -125,7 +125,6 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List()
             g_Parm_3D_Visu.m_LayerZcoord[ii] = g_Parm_3D_Visu.m_Epoxy_Width;
     }
 
-    //GLfloat zpos_cu  = 500 * g_Parm_3D_Visu.m_BoardScale;
     GLfloat zpos_cu  = 10 * g_Parm_3D_Visu.m_BoardScale;
     GLfloat zpos_cmp = g_Parm_3D_Visu.m_Epoxy_Width + zpos_cu;
     g_Parm_3D_Visu.m_LayerZcoord[ADHESIVE_N_CU]    = -zpos_cu * 2;
@@ -406,7 +405,8 @@ void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text )
     double x, y, xf, yf;
     double zpos, w;
     int    color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];
-    int    coord[104];
+    #define BUFFSIZE 50
+    int    coord[(BUFFSIZE+2)*2];
     int    ii, jj, kk, ll, nbpoints;
 
 
@@ -415,13 +415,12 @@ void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text )
         zpos = g_Parm_3D_Visu.m_LayerZcoord[layer];
         glNormal3f( 0.0, 0.0, Get3DLayerSide( layer ) );
 
-        text->CreateDrawData();
         jj = 5; ii = jj + 1;
         while( ii < text->m_TextDrawingsSize )
         {
             nbpoints = text->m_TextDrawings[jj];
-            if( nbpoints > 50 )
-                nbpoints = 50;
+            if( nbpoints > BUFFSIZE )
+                nbpoints = BUFFSIZE;
 
             for( kk = 0, ll = 0; (kk < nbpoints) && (ii < text->m_TextDrawingsSize); kk++ )
             {
@@ -440,7 +439,6 @@ void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text )
                 xf = coord[ll + 2] * g_Parm_3D_Visu.m_BoardScale;
                 yf = coord[ll + 3] * g_Parm_3D_Visu.m_BoardScale;
 
-                //printf("text koordinata x=%d, y=%d, x2=%d, y2=%d\n",x,y,xf,yf);
                 Draw3D_FilledSegment( x, -y, xf, -yf, w, zpos );
             }
         }
diff --git a/3d-viewer/3d_toolbar.cpp b/3d-viewer/3d_toolbar.cpp
index 8ba4ef8578..8dd575f49e 100644
--- a/3d-viewer/3d_toolbar.cpp
+++ b/3d-viewer/3d_toolbar.cpp
@@ -132,7 +132,7 @@ bool full_options = true;
     if ( full_options )
     {
     ADD_MENUITEM( referencesMenu, ID_MENU3D_MODULE_ONOFF,
-                  _( "3D Footprints Shapes On/Off" ), add_component_xpm );
+                  _( "3D Footprints Shapes On/Off" ), shape_3d_xpm );
 
 #if 0
     ADD_MENUITEM( referencesMenu, ID_MENU3D_PLACE_ONOFF,
diff --git a/bitmaps/makefile.include b/bitmaps/makefile.include
index 3f5973476e..929554d495 100644
--- a/bitmaps/makefile.include
+++ b/bitmaps/makefile.include
@@ -249,6 +249,7 @@ OBJECTS = \
     showtrack.o\
     Show_Zone.o\
     Swap_Layer.o\
+    shape_3d.o\
     Text_Sketch.o\
     tool_ratsnet.o\
     tools.o\
diff --git a/bitmaps/shape_3d.xpm b/bitmaps/shape_3d.xpm
new file mode 100644
index 0000000000..e204e7745a
--- /dev/null
+++ b/bitmaps/shape_3d.xpm
@@ -0,0 +1,33 @@
+/* XPM */
+const char *shape_3d_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 11 1",
+"  c none",
+"$ c #ACAEAC",
+"% c #3C3E3C",
+"+ c #535553",
+"X c #B40204",
+"@ c #2C2A2C",
+"# c #CCCECC",
+"& c #044A04",
+". c #6B6A6B",
+"o c #6C6E6C",
+"O c #353335",
+/* pixels */
+"   .X           ",
+"  ..o..o.. X    ",
+" O..oo......o.  ",
+" O..........o...",
+" .o.O.......o...",
+" o..O...oo.o.oo.",
+" ...Oo..oo.o.oo.",
+" .+++...oo.o.oo.",
+" ....o......o...",
+" .......oo......",
+" @@@@o........o.",
+"   ### ###@+##@@",
+"  $$$  $$$ $$$  ",
+"  ++$ O$$ %$$   ",
+"  &XX &X  %X    ",
+"                "
+};
diff --git a/change_log.txt b/change_log.txt
index 31df0ec5ff..cbc50226d3 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -5,11 +5,17 @@ Started 2007-June-11
 Please add newer entries at the top, list the date and your name with
 email address.
 
+2008-Aug-18 UPDATE   Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
+================================================================================
++pcbnew:
+    bug solved: Horizontal Oblong pads holes have a bad T Code size.
+
+
 2008-Aug-15 UPDATE   Jerry Jacobs <jerkejacobs@gmail.com>
 ================================================================================
-+About dialog 
++About dialog
 modified: (common.cpp) GetAboutBuildVersion() is a custom build version for the about dialog
-          (config.h.cmake) 
+          (config.h.cmake)
           (CreateSVNVersionHeader.cmake) KICAD_ABOUT_VERSION macro added
 
 added:  (about_dialog.cpp) InitKiCadAbout() initalise the about dialog
diff --git a/include/bitmaps.h b/include/bitmaps.h
index 57bf728d2d..bc9fceaf54 100644
--- a/include/bitmaps.h
+++ b/include/bitmaps.h
@@ -7,6 +7,7 @@
 
 // Please keep list sorted alphabetically, ignoring case.
 
+extern const char* shape_3d_xpm[];
 extern const char* add_arc_xpm[];
 extern const char* add_bus2bus_xpm[];
 extern const char* add_bus_xpm[];
diff --git a/include/build_version.h b/include/build_version.h
index 7f19dc580f..b9ce213683 100644
--- a/include/build_version.h
+++ b/include/build_version.h
@@ -9,7 +9,7 @@ COMMON_GLOBL wxString g_BuildVersion
 #    include "config.h"
      (wxT(KICAD_SVN_VERSION))
 #  else
-     (wxT("(20080811.r1188)"))
+     (wxT("(20080818.r1197)"))
 #  endif
 #endif
 ;
diff --git a/internat/fr/kicad.mo b/internat/fr/kicad.mo
index fad914d5ff72bffccbd1ee960100330b7cd4041d..82634477d96b04aaecc40212e18e83e8823acd09 100644
GIT binary patch
delta 19631
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

delta 19589
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
bYv&Ftlylj-3XO6{7ta~LZd#k%MGgNCYG~Y=

diff --git a/internat/fr/kicad.po b/internat/fr/kicad.po
index 0c59519ebf..a2e42bc952 100644
--- a/internat/fr/kicad.po
+++ b/internat/fr/kicad.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: kicad\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-08-17 18:59+0100\n"
-"PO-Revision-Date: 2008-08-17 19:02+0100\n"
+"PO-Revision-Date: 2008-08-17 21:41+0100\n"
 "Last-Translator: \n"
 "Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
 "MIME-Version: 1.0\n"
@@ -2591,7 +2591,7 @@ msgstr "Selection couleurs et affichage des éléments du C.I."
 
 #: pcbnew/menubarpcb.cpp:184
 msgid "&General Options"
-msgstr "Options &générales"
+msgstr "Options &Générales"
 
 #: pcbnew/menubarpcb.cpp:185
 msgid "Select general options for pcbnew"
@@ -3658,7 +3658,7 @@ msgstr "Tracé en Negatif"
 
 #: pcbnew/pcbplot.cpp:276
 msgid "Save Options"
-msgstr "Sauver options"
+msgstr "Sauver Options"
 
 #: pcbnew/pcbplot.cpp:280
 msgid "Create Drill File"
@@ -3738,7 +3738,7 @@ msgstr "Perçage réel"
 
 #: pcbnew/pcbplot.cpp:399
 msgid "Pads Drill Opt"
-msgstr "Options perçage"
+msgstr "Options Perçage Pads"
 
 #: pcbnew/pcbplot.cpp:406
 msgid "Auto scale"
@@ -5484,7 +5484,7 @@ msgstr "Parts par omposant"
 
 #: eeschema/dialog_create_component.cpp:246
 msgid "Draw options"
-msgstr "Options affichage"
+msgstr "Options de Tracé"
 
 #: eeschema/dialog_create_component.cpp:250
 msgid "Show Pin Number"
@@ -5891,7 +5891,7 @@ msgstr "Incrément Y"
 
 #: eeschema/dialog_options.cpp:227
 msgid "Draw Options:"
-msgstr "Options de tracé:"
+msgstr "Options de Tracé:"
 
 #: eeschema/dialog_options.cpp:231
 msgid "Show grid"
@@ -6497,7 +6497,7 @@ msgstr "Déplacer arc"
 
 #: eeschema/libedit_onrightclick.cpp:81
 msgid "Arc Options"
-msgstr "Options"
+msgstr "Options pour l'Arc"
 
 #: eeschema/libedit_onrightclick.cpp:84
 msgid "Delete Arc "
@@ -6509,7 +6509,7 @@ msgstr "Déplacer Cercle"
 
 #: eeschema/libedit_onrightclick.cpp:96
 msgid "Circle Options"
-msgstr "Options"
+msgstr "Options pour le Cercle"
 
 #: eeschema/libedit_onrightclick.cpp:99
 msgid "Delete Circle "
@@ -6521,7 +6521,7 @@ msgstr "Déplacer Rect"
 
 #: eeschema/libedit_onrightclick.cpp:111
 msgid "Rect Options"
-msgstr "Options"
+msgstr "Options pour le Rectangle"
 
 #: eeschema/libedit_onrightclick.cpp:114
 msgid "Delete Rect "
@@ -6662,7 +6662,7 @@ msgstr "Addition de \"pins\""
 
 #: eeschema/libframe.cpp:483
 msgid "Set Pin Options"
-msgstr "Choix Options des pins"
+msgstr "Choix Options des Pins"
 
 #: eeschema/libframe.cpp:505
 msgid "Add Rectangle"
@@ -7089,7 +7089,7 @@ msgstr "Utiliser numéro de net"
 
 #: eeschema/netlist_control.cpp:245
 msgid "Netlist Options:"
-msgstr "Options de netliste:"
+msgstr "Options de Netliste:"
 
 #: eeschema/netlist_control.cpp:254
 msgid "Simulator command:"
@@ -7490,7 +7490,7 @@ msgstr "Format de la feuille:"
 
 #: eeschema/plotps.cpp:209
 msgid "Plot Options:"
-msgstr "Options de tracé:"
+msgstr "Options de Tracé:"
 
 #: eeschema/plotps.cpp:218
 msgid "B/W"
@@ -7655,7 +7655,7 @@ msgstr "Taille:"
 
 #: eeschema/symbtext.cpp:158
 msgid " Text Options : "
-msgstr "Options du texte:"
+msgstr "Options du Texte: "
 
 #: eeschema/tool_lib.cpp:45
 msgid "deselect current tool"
@@ -7993,7 +7993,7 @@ msgstr "Num de la pin :"
 
 #: eeschema/pinedit-dialog.cpp:174
 msgid " Pin Options :"
-msgstr "Options pin :"
+msgstr "Options Pin :"
 
 #: eeschema/pinedit-dialog.cpp:190
 msgid "Pin Lenght"
@@ -8170,7 +8170,7 @@ msgstr "Cvpcb est est cours d'exécution. Continuer ?"
 
 #: cvpcb/displayframe.cpp:118
 msgid "Display Options"
-msgstr "Options d'affichage"
+msgstr "Options d'Affichage"
 
 #: cvpcb/genorcad.cpp:134
 #, c-format
@@ -8953,7 +8953,7 @@ msgstr "Format 3.4"
 
 #: gerbview/options.cpp:273
 msgid "Gerbview Draw Options"
-msgstr "Options d'affichage"
+msgstr "Options d'Affichage"
 
 #: gerbview/options.cpp:299
 msgid "Lines:"
@@ -9979,7 +9979,7 @@ msgstr "grille user"
 
 #: pcbnew/cleaningoptions_dialog.h:48
 msgid "Cleaning options"
-msgstr "Options de nettoyage"
+msgstr "Options de Nettoyage"
 
 #: pcbnew/dialog_drc.h:63
 msgid "DRC Control"
@@ -9995,7 +9995,7 @@ msgstr "dialog_freeroute_exchange"
 
 #: pcbnew/dialog_general_options.h:60
 msgid "General Options"
-msgstr "Options générales"
+msgstr "Options Générales"
 
 #: pcbnew/dialog_initpcb.h:38
 msgid "Global Delete"
@@ -10019,7 +10019,7 @@ msgstr "Dims Pistes et Vias"
 
 #: pcbnew/dialog_zones_by_polygon.h:53
 msgid "Fill Zones Options"
-msgstr "Options de remplissage de Zone"
+msgstr "Options de Remplissage de Zone"
 
 #: pcbnew/drc_stuff.h:147
 #, c-format
diff --git a/pcbnew/class_pad.cpp b/pcbnew/class_pad.cpp
index 923eb83840..1e36abb9cd 100644
--- a/pcbnew/class_pad.cpp
+++ b/pcbnew/class_pad.cpp
@@ -1019,8 +1019,8 @@ void D_PAD::Display_Infos( WinEDA_DrawFrame* frame )
     {
         valeur_param( (unsigned) m_Drill.x, Line );
         wxString msg;
-        valeur_param( (unsigned) m_Drill.x, msg );
-        Line += wxT( " " ) + msg;
+        valeur_param( (unsigned) m_Drill.y, msg );
+        Line += wxT( " / " ) + msg;
         Affiche_1_Parametre( frame, pos, _( "Drill X / Y" ), Line, RED );
     }
 
diff --git a/pcbnew/gen_holes_and_tools_lists_for_drill.cpp b/pcbnew/gen_holes_and_tools_lists_for_drill.cpp
index ba4fe79bb6..69f21acb6c 100644
--- a/pcbnew/gen_holes_and_tools_lists_for_drill.cpp
+++ b/pcbnew/gen_holes_and_tools_lists_for_drill.cpp
@@ -109,7 +109,7 @@ void Build_Holes_List( BOARD* aPcb,
                 new_hole.m_Tool_Reference = -1;         // Flag is: Not initialized
                 new_hole.m_Hole_Orient    = pad->m_Orient;
                 new_hole.m_Hole_Shape    = 0;           // hole shape: round
-                new_hole.m_Hole_Diameter = min( pad->m_Drill.x, pad->m_Drill.x );
+                new_hole.m_Hole_Diameter = min( pad->m_Drill.x, pad->m_Drill.y );
                 new_hole.m_Hole_SizeX    = new_hole.m_Hole_SizeY = new_hole.m_Hole_Diameter;
                 if( pad->m_DrillShape != PAD_CIRCLE )
                     new_hole.m_Hole_Shape = 1; // oval flag set