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 +================================================================================ ++pcbnew: + bug solved: Horizontal Oblong pads holes have a bad T Code size. + + 2008-Aug-15 UPDATE Jerry Jacobs ================================================================================ -+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 fad914d5ff..82634477d9 100644 Binary files a/internat/fr/kicad.mo and b/internat/fr/kicad.mo differ 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 \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