Complete comment translation of gerbview source.

3c7df7b7 · stambaughw · 8b3ffe74 · 3c7df7b7 · 3c7df7b7 · 3c7df7b7
Commit 3c7df7b7 authored Nov 09, 2009 by stambaughw
27 changed files
--- a/gerbview/block.cpp
+++ b/gerbview/block.cpp
--- a/gerbview/controle.cpp
+++ b/gerbview/controle.cpp
-/********************************************************/
+/****************/
-/* Routines generales de gestion des commandes usuelles */
+/* controle.cpp */
-/********************************************************/
+/****************/
-/* fichier controle.cpp */
-/*
- *  Routines d'affichage grille, Boite de coordonnees, Curseurs, marqueurs ...
- */
 #include "fctsys.h"
 #include "common.h"
@@ -17,25 +11,13 @@
 #include "protos.h"
-/**********************************************************************/
 BOARD_ITEM* WinEDA_GerberFrame::GerberGeneralLocateAndDisplay()
-/**********************************************************************/
 {
    return Locate( CURSEUR_OFF_GRILLE );
 }
-/****************************************************************/
 void WinEDA_GerberFrame::GeneralControle( wxDC* DC, wxPoint Mouse )
-/****************************************************************/
-/* traitement des touches de fonctions utilisees ds tous les menus
- *  Zoom
- *  Redessin d'ecran
- *  Cht Unites
- *  Cht couches
- *  Remise a 0 de l'origine des coordonnees relatives
- */
 {
    wxRealPoint  delta;
    wxPoint curpos, oldpos;
@@ -68,25 +50,25 @@ void WinEDA_GerberFrame::GeneralControle( wxDC* DC, wxPoint Mouse )
    switch( g_KeyPressed )
    {
-    case WXK_NUMPAD8:       /* Deplacement curseur vers le haut */
+    case WXK_NUMPAD8:
    case WXK_UP:
        Mouse.y -= wxRound(delta.y);
        DrawPanel->MouseTo( Mouse );
        break;
-    case WXK_NUMPAD2:       /* Deplacement curseur vers le bas */
+    case WXK_NUMPAD2:
    case WXK_DOWN:
        Mouse.y += wxRound(delta.y);
        DrawPanel->MouseTo( Mouse );
        break;
-    case WXK_NUMPAD4:       /* Deplacement curseur vers la gauche */
+    case WXK_NUMPAD4:
    case WXK_LEFT:
        Mouse.x -= wxRound(delta.x);
        DrawPanel->MouseTo( Mouse );
        break;
-    case WXK_NUMPAD6:      /* Deplacement curseur vers la droite */
+    case WXK_NUMPAD6:
    case WXK_RIGHT:
        Mouse.x += wxRound(delta.x);
        DrawPanel->MouseTo( Mouse );
@@ -97,10 +79,8 @@ void WinEDA_GerberFrame::GeneralControle( wxDC* DC, wxPoint Mouse )
        break;
    }
-    /* Recalcul de la position du curseur schema */
    GetScreen()->m_Curseur = curpos;
-    /* Placement sur la grille generale */
    PutOnGrid( &GetScreen()->m_Curseur );
    if( oldpos != GetScreen()->m_Curseur )
@@ -129,5 +109,5 @@ void WinEDA_GerberFrame::GeneralControle( wxDC* DC, wxPoint Mouse )
    }
    SetToolbars();
-    UpdateStatusBar();    /* Affichage des coord curseur */
+    UpdateStatusBar();
 }
--- a/gerbview/dcode.cpp
+++ b/gerbview/dcode.cpp
--- a/gerbview/deltrack.cpp
+++ b/gerbview/deltrack.cpp
 /*********************************************/
-/* Edition des pistes: Routines d'effacement */
+/* Edit Track: Erase Routines                */
-/* Effacement de segment, piste, net et zone */
+/* Drop the segment, track, and net area     */
 /*********************************************/
 #include "fctsys.h"
@@ -10,22 +10,16 @@
 #include "gerbview.h"
 #include "protos.h"
-/* Routines externes : */
-/* Routines Locales */
+void WinEDA_GerberFrame::Delete_DCode_Items( wxDC* DC,
+                                             int   dcode_value,
-/* Variables locales */
+                                             int   layer_number )
-/****************************************************************************************/
-void WinEDA_GerberFrame::Delete_DCode_Items( wxDC* DC, int dcode_value, int layer_number )
-/****************************************************************************************/
 {
    if( dcode_value < FIRST_DCODE )  // No tool selected
        return;
    TRACK* next;
-    for( TRACK* track = GetBoard()->m_Track;  track;  track = next  )
+    for( TRACK* track = GetBoard()->m_Track; track; track = next  )
    {
        next = track->Next();
@@ -42,28 +36,26 @@ void WinEDA_GerberFrame::Delete_DCode_Items( wxDC* DC, int dcode_value, int laye
 }
-/*****************************************************************/
+/* Removes 1 segment of track.
-TRACK* WinEDA_GerberFrame::Delete_Segment( wxDC* DC, TRACK* Track )
+ *
-/*****************************************************************/
+ * If There is evidence of new track: erase segment
+ * Otherwise: Delete segment under the cursor.
-/* Supprime 1 segment de piste.
- *  2 Cas possibles:
- *  Si On est en trace de nouvelle piste: Effacement du segment en
- *      cours de trace
- *  Sinon : Effacment du segment sous le curseur.
 */
+TRACK* WinEDA_GerberFrame::Delete_Segment( wxDC* DC, TRACK* Track )
 {
    if( Track == NULL )
        return NULL;
-    if( Track->m_Flags & IS_NEW )  // Trace en cours, on peut effacer le dernier segment
+    if( Track->m_Flags & IS_NEW )  // Trace in progress, delete the last
+                                   // segment
    {
        if( g_CurrentTrackList.GetCount() > 0 )
        {
-            // modification du trace
+            // Change track.
            delete g_CurrentTrackList.PopBack();
-            if( g_CurrentTrackList.GetCount() && g_CurrentTrackSegment->Type() == TYPE_VIA )
+            if( g_CurrentTrackList.GetCount()
+                && g_CurrentTrackSegment->Type() == TYPE_VIA )
            {
                delete g_CurrentTrackList.PopBack();
            }
@@ -85,12 +77,11 @@ TRACK* WinEDA_GerberFrame::Delete_Segment( wxDC* DC, TRACK* Track )
        }
        return NULL;
-    } // Fin traitement si trace en cours
+    }
    Trace_Segment( DrawPanel, DC, Track, GR_XOR );
-    DLIST<TRACK>* container = (DLIST<TRACK>*) Track->GetList();
+    DLIST<TRACK>* container = (DLIST<TRACK>*)Track->GetList();
    wxASSERT( container );
    container->Remove( Track );

--- a/gerbview/edit.cpp
+++ b/gerbview/edit.cpp
-/******************************************************/
+/***********************************/
-/* edit.cpp: fonctions generales de l'edition du PCB */
+/* edit.cpp: PCB editing functions */
-/******************************************************/
+/***********************************/
 #include "fctsys.h"
 #include "class_drawpanel.h"
@@ -13,21 +13,17 @@
 #include "protos.h"
+/* Process the command triggered by the left button of the mouse when a tool
-/************************************************************************/
+ * is already selected.
-void WinEDA_GerberFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
-/************************************************************************/
-/* Traite les commandes declench�e par le bouton gauche de la souris,
- *  quand un outil est deja selectionn�
 */
+void WinEDA_GerberFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
 {
-    BOARD_ITEM*     DrawStruct = GetScreen()->GetCurItem();
+    BOARD_ITEM* DrawStruct = GetScreen()->GetCurItem();
-    wxString        msg;
+    wxString    msg;
    if( m_ID_current_state == 0 )
    {
-        if( DrawStruct && DrawStruct->m_Flags ) // Commande "POPUP" en cours
+        if( DrawStruct && DrawStruct->m_Flags )
        {
            msg.Printf( wxT( "WinEDA_GerberFrame::ProcessCommand err: Struct %d, m_Flags = %X" ),
                        (unsigned) DrawStruct->Type(),
@@ -70,18 +66,15 @@ void WinEDA_GerberFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
 }
-/********************************************************************************/
+/* Handles the selection of tools, menu, and popup menu commands.
-void WinEDA_GerberFrame::Process_Special_Functions( wxCommandEvent& event )
-/********************************************************************************/
-/* Traite les selections d'outils et les commandes appelees du menu POPUP
 */
+void WinEDA_GerberFrame::Process_Special_Functions( wxCommandEvent& event )
 {
-    int           id    = event.GetId();
+    int        id    = event.GetId();
-    int           layer = GetScreen()->m_Active_Layer;
+    int        layer = GetScreen()->m_Active_Layer;
-    GERBER*       gerber_layer = g_GERBER_List[layer];
+    GERBER*    gerber_layer = g_GERBER_List[layer];
-    wxPoint       pos;
+    wxPoint    pos;
-    wxClientDC    dc( DrawPanel );
+    wxClientDC dc( DrawPanel );
    DrawPanel->PrepareGraphicContext( &dc );
@@ -89,7 +82,7 @@ void WinEDA_GerberFrame::Process_Special_Functions( wxCommandEvent& event )
    pos.y += 20;
-    switch( id )   // Arret eventuel de la commande de d�placement en cours
+    switch( id )
    {
    case wxID_CUT:
    case wxID_COPY:
@@ -108,7 +101,7 @@ void WinEDA_GerberFrame::Process_Special_Functions( wxCommandEvent& event )
        {
            DrawPanel->ForceCloseManageCurseur( DrawPanel, &dc );
        }
-        /* ne devrait pas etre execute, sauf bug */
+        /* Should not be executed, except bug */
        if( GetScreen()->m_BlockLocate.m_Command != BLOCK_IDLE )
        {
            GetScreen()->m_BlockLocate.m_Command = BLOCK_IDLE;
@@ -121,7 +114,7 @@ void WinEDA_GerberFrame::Process_Special_Functions( wxCommandEvent& event )
            SetCursor( DrawPanel->m_PanelCursor = DrawPanel->m_PanelDefaultCursor );
        break;
-    default:        // Arret dea commande de d�placement en cours
+    default:
        if( DrawPanel->ManageCurseur
            && DrawPanel->ForceCloseManageCurseur )
        {
@@ -131,7 +124,7 @@ void WinEDA_GerberFrame::Process_Special_Functions( wxCommandEvent& event )
        break;
    }
-    switch( id )   // Traitement des commandes
+    switch( id )
    {
    case ID_EXIT:
        Close( TRUE );
@@ -147,10 +140,12 @@ void WinEDA_GerberFrame::Process_Special_Functions( wxCommandEvent& event )
        break;
    case ID_GET_TOOLS:
 //			InstallToolsFrame(this, wxPoint(-1,-1) );
        break;
    case ID_FIND_ITEMS:
 //			InstallFindFrame(this, pos);
        break;
@@ -249,7 +244,8 @@ void WinEDA_GerberFrame::Process_Special_Functions( wxCommandEvent& event )
    case ID_GERBVIEW_POPUP_DELETE_DCODE_ITEMS:
        if( gerber_layer )
-            Delete_DCode_Items( &dc, gerber_layer->m_Selected_Tool, ((PCB_SCREEN*)GetScreen())->m_Active_Layer );
+            Delete_DCode_Items( &dc, gerber_layer->m_Selected_Tool,
+                                ( (PCB_SCREEN*) GetScreen() )->m_Active_Layer );
        break;
    default:
@@ -261,12 +257,9 @@ void WinEDA_GerberFrame::Process_Special_Functions( wxCommandEvent& event )
 }
-/**************************************************************************/
+/* Called on a double click of left mouse button.
-void WinEDA_GerberFrame::OnLeftDClick( wxDC* DC, const wxPoint& MousePos )
-/**************************************************************************/
-/* Called on a double click:
 */
+void WinEDA_GerberFrame::OnLeftDClick( wxDC* DC, const wxPoint& MousePos )
 {
    EDA_BaseStruct* DrawStruct = GetScreen()->GetCurItem();
    wxClientDC      dc( DrawPanel );
@@ -281,7 +274,7 @@ void WinEDA_GerberFrame::OnLeftDClick( wxDC* DC, const wxPoint& MousePos )
            DrawStruct = GerberGeneralLocateAndDisplay();
        }
-        break;      // end case 0
+        break;
    default:
        break;

--- a/gerbview/export_to_pcbnew.cpp
+++ b/gerbview/export_to_pcbnew.cpp
@@ -15,21 +15,15 @@
 #include "class_board_design_settings.h"
 #include "protos.h"
-/* Routines Locales : */
 static int SavePcbFormatAscii( WinEDA_GerberFrame* frame,
                               FILE* File, int* LayerLookUpTable );
-/* Variables Locales */
-/************************************************************************/
-void WinEDA_GerberFrame::ExportDataInPcbnewFormat( wxCommandEvent& event )
-/************************************************************************/
 /* Export data in pcbnew format
 */
+void WinEDA_GerberFrame::ExportDataInPcbnewFormat( wxCommandEvent& event )
 {
-    int ii = 0;
+    int  ii = 0;
    bool no_used_layers = true; // Changed to false if any used layer found
    // Check whether any of the Gerber layers are actually currently used
@@ -42,7 +36,8 @@ void WinEDA_GerberFrame::ExportDataInPcbnewFormat( wxCommandEvent& event )
    if( no_used_layers )
    {
-        DisplayInfoMessage( this, _( "None of the Gerber layers contain any data" ) );
+        DisplayInfoMessage( this,
+                           _( "None of the Gerber layers contain any data" ) );
        return;
    }
@@ -50,14 +45,14 @@ void WinEDA_GerberFrame::ExportDataInPcbnewFormat( wxCommandEvent& event )
    wxString PcbExt( wxT( ".brd" ) );
-    FILE* dest;
+    FILE*    dest;
    msg = wxT( "*" ) + PcbExt;
    FullFileName = EDA_FileSelector( _( "Board file name:" ),
-                                     wxEmptyString, /* Chemin par defaut */
+                                     wxEmptyString,
-                                     wxEmptyString, /* nom fichier par defaut */
+                                     wxEmptyString,
-                                     PcbExt,        /* extension par defaut */
+                                     PcbExt,
-                                     msg,           /* Masque d'affichage */
+                                     msg,
                                     this,
                                     wxFD_SAVE,
                                     FALSE
@@ -87,9 +82,7 @@ void WinEDA_GerberFrame::ExportDataInPcbnewFormat( wxCommandEvent& event )
 }
-/***************************************************************/
 static int WriteSetup( FILE* File, BOARD* Pcb )
-/***************************************************************/
 {
    char text[1024];
@@ -97,22 +90,21 @@ static int WriteSetup( FILE* File, BOARD* Pcb )
    sprintf( text, "InternalUnit %f INCH\n", 1.0 / PCB_INTERNAL_UNIT );
    fprintf( File, "%s", text );
-    Pcb->m_BoardSettings->SetCopperLayerCount( g_DesignSettings.GetCopperLayerCount( ) );
+    Pcb->m_BoardSettings->SetCopperLayerCount(
-    fprintf( File, "Layers %d\n", g_DesignSettings.GetCopperLayerCount( ) );
+         g_DesignSettings.GetCopperLayerCount() );
+    fprintf( File, "Layers %d\n", g_DesignSettings.GetCopperLayerCount() );
    fprintf( File, "$EndSETUP\n\n" );
    return 1;
 }
-/******************************************************/
 static bool WriteGeneralDescrPcb( BOARD* Pcb, FILE* File )
-/******************************************************/
 {
    int NbLayers;
    /* Print the copper layer count */
-    NbLayers = Pcb->m_BoardSettings->GetCopperLayerCount( );
+    NbLayers = Pcb->m_BoardSettings->GetCopperLayerCount();
    fprintf( File, "$GENERAL\n" );
    fprintf( File, "LayerCount %d\n", NbLayers );
@@ -128,29 +120,26 @@ static bool WriteGeneralDescrPcb( BOARD* Pcb, FILE* File )
 }
-/*******************************************************************/
-static int SavePcbFormatAscii( WinEDA_GerberFrame* frame, FILE* aFile,
-                               int* LayerLookUpTable )
-/*******************************************************************/
 /* Routine to save the board
 * @param frame = pointer to the main frame
 * @param File = FILE * pointer to an already opened file
 * @param LayerLookUpTable = look up table: pcbnew layer for each gerber layer
 * @return 1 if OK, 0 if fail
 */
+static int SavePcbFormatAscii( WinEDA_GerberFrame* frame, FILE* aFile,
+                               int* LayerLookUpTable )
 {
-    char            line[256];
+    char   line[256];
-    TRACK*          track;
+    TRACK* track;
-    BOARD*          gerberPcb = frame->GetBoard();
+    BOARD* gerberPcb = frame->GetBoard();
-    BOARD*          pcb;
+    BOARD* pcb;
    wxBeginBusyCursor();
    // create an image of gerber data
    pcb = new BOARD( NULL, frame );
-    for( track = gerberPcb->m_Track;  track;  track = track->Next() )
+    for( track = gerberPcb->m_Track; track; track = track->Next() )
    {
        int layer = track->GetLayer();
        int pcb_layer_number = LayerLookUpTable[layer];
@@ -170,29 +159,32 @@ static int SavePcbFormatAscii( WinEDA_GerberFrame* frame, FILE* aFile,
            {
                double cx = track->m_Param;
                double cy = track->GetSubNet();
-                double a = atan2( track->m_Start.y-cy, track->m_Start.x-cx );
+                double a  = atan2( track->m_Start.y - cy,
-                double b = atan2( track->m_End.y-cy, track->m_End.x-cx );
+                                   track->m_Start.x - cx );
+                double b  = atan2( track->m_End.y - cy, track->m_End.x - cx );
-                drawitem->m_Shape = S_ARC;
-                drawitem->m_Angle = (int)fmod( (a-b)/M_PI*1800.0+3600.0, 3600.0 );
+                drawitem->m_Shape   = S_ARC;
-                drawitem->m_Start.x = (int)cx;
+                drawitem->m_Angle   = (int) fmod(
-                drawitem->m_Start.y = (int)cy;
+                     (a - b) / M_PI * 1800.0 + 3600.0, 3600.0 );
+                drawitem->m_Start.x = (int) cx;
+                drawitem->m_Start.y = (int) cy;
            }
            pcb->Add( drawitem );
        }
        else
        {
-            TRACK*  newtrack;
+            TRACK* newtrack;
            // replace spots with vias when possible
            if( track->m_Shape == S_SPOT_CIRCLE
-             || track->m_Shape == S_SPOT_RECT
+                || track->m_Shape == S_SPOT_RECT
-             || track->m_Shape == S_SPOT_OVALE )
+                || track->m_Shape == S_SPOT_OVALE )
            {
-                newtrack = new SEGVIA( (const SEGVIA&) *track );
+                newtrack = new SEGVIA( (const SEGVIA &) * track );
-                // A spot is found, and can be a via: change it to via, and delete other
+                // A spot is found, and can be a via: change it to via, and
+                // delete other
                // spots at same location
                newtrack->m_Shape = VIA_THROUGH;
@@ -200,10 +192,13 @@ static int SavePcbFormatAscii( WinEDA_GerberFrame* frame, FILE* aFile,
                newtrack->SetDrillDefault();
-                // Compute the via position from track position ( Via position is the
+                // Compute the via position from track position ( Via position
+                // is the
                // position of the middle of the track segment )
-                newtrack->m_Start.x = (newtrack->m_Start.x + newtrack->m_End.x) / 2;
+                newtrack->m_Start.x =
-                newtrack->m_Start.y = (newtrack->m_Start.y + newtrack->m_End.y) / 2;
+                    (newtrack->m_Start.x + newtrack->m_End.x) / 2;
+                newtrack->m_Start.y =
+                    (newtrack->m_Start.y + newtrack->m_End.y) / 2;
                newtrack->m_End = newtrack->m_Start;
            }
            else    // a true TRACK
@@ -217,7 +212,7 @@ static int SavePcbFormatAscii( WinEDA_GerberFrame* frame, FILE* aFile,
    }
    // delete redundant vias
-    for( track = pcb->m_Track;  track;  track = track->Next() )
+    for( track = pcb->m_Track; track; track = track->Next() )
    {
        if( track->m_Shape != VIA_THROUGH )
            continue;
@@ -225,7 +220,7 @@ static int SavePcbFormatAscii( WinEDA_GerberFrame* frame, FILE* aFile,
        // Search and delete others vias
        TRACK* next_track;
        TRACK* alt_track = track->Next();
-        for( ;  alt_track;   alt_track = next_track )
+        for( ; alt_track; alt_track = next_track )
        {
            next_track = alt_track->Next();
            if( alt_track->m_Shape != VIA_THROUGH )
@@ -240,8 +235,9 @@ static int SavePcbFormatAscii( WinEDA_GerberFrame* frame, FILE* aFile,
        }
    }
-    // Switch the locale to standard C (needed to print floating point numbers like 1.3)
+    // Switch the locale to standard C (needed to print floating point numbers
-    SetLocaleTo_C_standard( );
+    // like 1.3)
+    SetLocaleTo_C_standard();
    // write the PCB heading
    fprintf( aFile, "PCBNEW-BOARD Version %d date %s\n\n", g_CurrentVersionPCB,
@@ -255,7 +251,7 @@ static int SavePcbFormatAscii( WinEDA_GerberFrame* frame, FILE* aFile,
    // the destructor should destroy all owned sub-objects
    delete pcb;
-    SetLocaleTo_Default( );      // revert to the current locale
+    SetLocaleTo_Default();       // revert to the current locale
    wxEndBusyCursor();
    return 1;
 }
--- a/gerbview/files.cpp
+++ b/gerbview/files.cpp
-/******************************************************/
+/*************/
-/* Files.cp: Lecture / Sauvegarde des fichiers gerber */
+/* files.cpp */
-/******************************************************/
+/*************/
 #include "fctsys.h"
 #include "common.h"
@@ -13,8 +13,9 @@
 #include "protos.h"
-/* Routines locales */
+static void LoadDCodeFile( WinEDA_GerberFrame* frame,
-static void LoadDCodeFile( WinEDA_GerberFrame* frame, const wxString& FullFileName, wxDC* DC );
+                           const wxString&     FullFileName,
+                           wxDC*               DC );
 void WinEDA_GerberFrame::OnFileHistory( wxCommandEvent& event )
@@ -33,15 +34,11 @@ void WinEDA_GerberFrame::OnFileHistory( wxCommandEvent& event )
    }
 }
-/***************
-***************************************/
-void WinEDA_GerberFrame::Files_io( wxCommandEvent& event )
-/********************************************************/
-/* Gestion generale  des commandes de lecture de fichiers
+/* File commands. */
- */
+void WinEDA_GerberFrame::Files_io( wxCommandEvent& event )
 {
-    int id = event.GetId();
+    int        id = event.GetId();
    wxClientDC dc( DrawPanel );
@@ -58,17 +55,17 @@ void WinEDA_GerberFrame::Files_io( wxCommandEvent& event )
    case ID_MENU_INC_LAYER_AND_APPEND_FILE:
    case ID_INC_LAYER_AND_APPEND_FILE:
-        {
+    {
-            int origLayer = GetScreen()->m_Active_Layer;
+        int origLayer = GetScreen()->m_Active_Layer;
-            GetScreen()->m_Active_Layer++;
+        GetScreen()->m_Active_Layer++;
-            if( !LoadOneGerberFile( wxEmptyString, &dc, 0 ) )
+        if( !LoadOneGerberFile( wxEmptyString, &dc, 0 ) )
-                GetScreen()->m_Active_Layer = origLayer;
+            GetScreen()->m_Active_Layer = origLayer;
-            SetToolbars();
+        SetToolbars();
-        }
+    }
-        break;
+    break;
    case ID_APPEND_FILE:
        LoadOneGerberFile( wxEmptyString, &dc, 0 );
@@ -106,52 +103,49 @@ void WinEDA_GerberFrame::Files_io( wxCommandEvent& event )
 }
-/*******************************************************************************************/
-bool
-WinEDA_GerberFrame::LoadOneGerberFile( const wxString& FullFileName,
-                                       wxDC* DC,
-                                         int mode )
-/*******************************************************************************************/
 /*
- *  Lecture d'un fichier PCB, le nom etant dans PcbNameBuffer.s
+ * Load a PCB file.
- *  retourne:
+ *
- *  0 si fichier non lu ( annulation de commande ... )
+ * Returns:
- *  1 si OK
+ *   0 if file not read (cancellation of order ...)
+ *   1 if OK
 */
+bool WinEDA_GerberFrame::LoadOneGerberFile( const wxString& FullFileName,
+                                            wxDC*           DC,
+                                            int             mode )
 {
-    wxString filetypes;
+    wxString   filetypes;
    wxFileName filename = FullFileName;
    ActiveScreen = GetScreen();
    if( !filename.IsOk() )
    {
-		wxString current_path = filename.GetPath();
+        wxString current_path = filename.GetPath();
-		/* Standard gerber filetypes */
+        /* Standard gerber filetypes */
-		filetypes += _("Gerber files (.gbr .gbx .lgr .ger .pho)| \
+        filetypes += _( "Gerber files (.gbr .gbx .lgr .ger .pho)| \
-			*.gbr;*.GBR;*.gbx;*.GBX;*.lgr;*.LGR;*.ger;*.GER;*.pho;*.PHO|");
+.gbr;*.GBR;*.gbx;*.GBX;*.lgr;*.LGR;*.ger;*.GER;*.pho;*.PHO|" );
-		/* Special gerber filetypes */
+        /* Special gerber filetypes */
-		filetypes += _("Top layer (*.GTL)|*.GTL;*.gtl|");
+        filetypes += _( "Top layer (*.GTL)|*.GTL;*.gtl|" );
-		filetypes += _("Bottom layer (*.GBL)|*.GBL;*.gbl|");
+        filetypes += _( "Bottom layer (*.GBL)|*.GBL;*.gbl|" );
-		filetypes += _("Bottom solder resist (*.GBS)|*.GBS;*.gbs|");
+        filetypes += _( "Bottom solder resist (*.GBS)|*.GBS;*.gbs|" );
-		filetypes += _("Top solder resist (*.GTS)|*.GTS;*.gts|");
+        filetypes += _( "Top solder resist (*.GTS)|*.GTS;*.gts|" );
-		filetypes += _("Bottom overlay (*.GBO)|*.GBO;*.gbo|");
+        filetypes += _( "Bottom overlay (*.GBO)|*.GBO;*.gbo|" );
-		filetypes += _("Top overlay (*.GTO)|*.GTO;*.gto|");
+        filetypes += _( "Top overlay (*.GTO)|*.GTO;*.gto|" );
-		filetypes += _("Bottom paste (*.GBP)|*.GBP;*.gbp|");
+        filetypes += _( "Bottom paste (*.GBP)|*.GBP;*.gbp|" );
-		filetypes += _("Top paste (*.GTP)|*.GTP;*.gtp|");
+        filetypes += _( "Top paste (*.GTP)|*.GTP;*.gtp|" );
-		filetypes += _("Keep-out layer (*.GKO)|*.GKO;*.gko|");
+        filetypes += _( "Keep-out layer (*.GKO)|*.GKO;*.gko|" );
-		filetypes += _("Mechanical layers (*.GMx)|*.GM1;*.gm1;*.GM2;*.gm2;*.GM3;*.gm3|");
+        filetypes += _( "Mechanical layers (*.GMx)|*.GM1;*.gm1;*.GM2;*.gm2;*.GM3;*.gm3|" );
-		filetypes += _("Top Pad Master (*.GPT)|*.GPT;*.gpt|");
+        filetypes += _( "Top Pad Master (*.GPT)|*.GPT;*.gpt|" );
-		filetypes += _("Bottom Pad Master (*.GPB)|*.GPB;*.gpb|");
+        filetypes += _( "Bottom Pad Master (*.GPB)|*.GPB;*.gpb|" );
-		/* All filetypes */
+        /* All filetypes */
-		filetypes += AllFilesWildcard;
+        filetypes += AllFilesWildcard;
-		/* Get current path if emtpy */
+        /* Get current path if emtpy */
-        if ( current_path.IsEmpty() )
+        if( current_path.IsEmpty() )
            current_path = wxGetCwd();
        wxFileDialog dlg( this,
@@ -182,18 +176,18 @@ WinEDA_GerberFrame::LoadOneGerberFile( const wxString& FullFileName,
 }
-/**********************************************************************************************/
-static void LoadDCodeFile( WinEDA_GerberFrame* frame, const wxString& FullFileName, wxDC* DC )
-/**********************************************************************************************/
 /*
- *  Lecture d'un fichier PCB, le nom etant dans PcbNameBuffer.s
+ * Read a PCB file.
- *  retourne:
+ *
- *  0 si fichier non lu ( annulation de commande ... )
+ * Returns:
- *  1 si OK
+ *   0 if file not read (cancellation of order ...)
+ *   1 if OK
 */
+static void LoadDCodeFile( WinEDA_GerberFrame* frame,
+                           const wxString&     FullFileName,
+                           wxDC*               DC )
 {
-    wxString wildcard;
+    wxString   wildcard;
    wxFileName fn = FullFileName;
    ActiveScreen = frame->GetScreen();
@@ -201,11 +195,12 @@ static void LoadDCodeFile( WinEDA_GerberFrame* frame, const wxString& FullFileNa
    if( !fn.IsOk() )
    {
        wildcard.Printf( _( "Gerber DCODE files (%s)|*.%s" ),
-                         GetChars( g_PenFilenameExt ), GetChars( g_PenFilenameExt ));
+                         GetChars( g_PenFilenameExt ),
+                         GetChars( g_PenFilenameExt ) );
        wildcard += AllFilesWildcard;
        fn = frame->GetScreen()->m_FileName;
        fn.SetExt( g_PenFilenameExt );
-        wxFileDialog dlg( ( wxWindow* )frame, _( "Load GERBER DCODE File" ),
+        wxFileDialog dlg( (wxWindow*) frame, _( "Load GERBER DCODE File" ),
                          fn.GetPath(), fn.GetFullName(), wildcard,
                          wxFD_OPEN | wxFD_FILE_MUST_EXIST );
@@ -221,14 +216,12 @@ static void LoadDCodeFile( WinEDA_GerberFrame* frame, const wxString& FullFileNa
 }
-/*******************************************************************************/
+/* Save the file in ASCII PCB.
-bool WinEDA_GerberFrame::SaveGerberFile( const wxString& FullFileName, wxDC* DC )
-/*******************************************************************************/
-/* Sauvegarde du fichier PCB en format ASCII
 */
+bool WinEDA_GerberFrame::SaveGerberFile( const wxString& FullFileName,
+                                         wxDC*           DC )
 {
-    wxString wildcard;
+    wxString   wildcard;
    wxFileName fn = FullFileName;
    if( !fn.IsOk() )
@@ -236,7 +229,8 @@ bool WinEDA_GerberFrame::SaveGerberFile( const wxString& FullFileName, wxDC* DC
        fn = GetScreen()->m_FileName;
        wildcard.Printf( _( "Gerber DCODE files (%s)|*.%s" ),
-                         GetChars( g_PenFilenameExt ), GetChars( g_PenFilenameExt ));
+                         GetChars( g_PenFilenameExt ),
+                         GetChars( g_PenFilenameExt ) );
        wxFileDialog dlg( this, _( "Save Gerber File" ), fn.GetPath(),
                          fn.GetFullName(), wildcard,

--- a/gerbview/gerberframe.cpp
+++ b/gerbview/gerberframe.cpp
-/******************************************************************/
+/*******************/
-/* gerberframe.cpp - fonctions des classes du type WinEDA_GerberFrame */
+/* gerberframe.cpp */
-/******************************************************************/
+/*******************/
 #ifdef __GNUG__
 #pragma implementation
@@ -94,15 +94,13 @@ BEGIN_EVENT_TABLE( WinEDA_GerberFrame, WinEDA_BasePcbFrame )
    EVT_KICAD_CHOICEBOX( ID_TOOLBARH_GERBER_SELECT_TOOL,
                         WinEDA_GerberFrame::Process_Special_Functions )
 // Vertical toolbar:
    EVT_TOOL( ID_NO_SELECT_BUTT, WinEDA_GerberFrame::Process_Special_Functions )
    EVT_TOOL( ID_TRACK_BUTT, WinEDA_GerberFrame::Process_Special_Functions )
    EVT_TOOL( ID_PCB_ZONES_BUTT, WinEDA_GerberFrame::Process_Special_Functions )
    EVT_TOOL( ID_PCB_DELETE_ITEM_BUTT,
-              WinEDA_GerberFrame::Process_Special_Functions )
+          WinEDA_GerberFrame::Process_Special_Functions )
-// Annulation de commande en cours
    EVT_MENU_RANGE( ID_POPUP_GENERAL_START_RANGE, ID_POPUP_GENERAL_END_RANGE,
                    WinEDA_GerberFrame::Process_Special_Functions )
@@ -116,11 +114,6 @@ BEGIN_EVENT_TABLE( WinEDA_GerberFrame, WinEDA_BasePcbFrame )
 END_EVENT_TABLE()
-/****************/
-/* Constructeur */
-/****************/
 WinEDA_GerberFrame::WinEDA_GerberFrame( wxWindow*       father,
                                        const wxString& title,
                                        const wxPoint&  pos,
@@ -130,8 +123,8 @@ WinEDA_GerberFrame::WinEDA_GerberFrame( wxWindow*       father,
 {
    m_FrameName = wxT( "GerberFrame" );
-    m_Draw_Axis      = true;   // true to show X and Y axis on screen
+    m_Draw_Axis = true;         // true to show X and Y axis on screen
-    m_Draw_Sheet_Ref = FALSE;   // TRUE pour avoir le cartouche dessin�
+    m_Draw_Sheet_Ref = FALSE;   // TRUE for reference drawings.
    if( DrawPanel )
        DrawPanel->m_Block_Enable = TRUE;
@@ -146,6 +139,7 @@ WinEDA_GerberFrame::WinEDA_GerberFrame( wxWindow*       father,
    ActiveScreen = ScreenPcb;
    LoadSettings();
    SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
    GetScreen()->SetGrid( ID_POPUP_GRID_LEVEL_1000 + m_LastGridSizeId  );
@@ -153,36 +147,37 @@ WinEDA_GerberFrame::WinEDA_GerberFrame( wxWindow*       father,
    ReCreateHToolbar();
    ReCreateVToolbar();
    ReCreateOptToolbar();
 #if defined(KICAD_AUIMANAGER)
-    m_auimgr.SetManagedWindow(this);
+    m_auimgr.SetManagedWindow( this );
    wxAuiPaneInfo horiz;
-    horiz.Gripper(false);
+    horiz.Gripper( false );
-    horiz.DockFixed(true);
+    horiz.DockFixed( true );
-    horiz.Movable(false);
+    horiz.Movable( false );
-    horiz.Floatable(false);
+    horiz.Floatable( false );
-    horiz.CloseButton(false);
+    horiz.CloseButton( false );
-    horiz.CaptionVisible(false);
+    horiz.CaptionVisible( false );
-    wxAuiPaneInfo vert(horiz);
+    wxAuiPaneInfo vert( horiz );
-    vert.TopDockable(false).BottomDockable(false);
+    vert.TopDockable( false ).BottomDockable( false );
-    horiz.LeftDockable(false).RightDockable(false);
+    horiz.LeftDockable( false ).RightDockable( false );
-    m_auimgr.AddPane(m_HToolBar,
+    m_auimgr.AddPane( m_HToolBar,
-        wxAuiPaneInfo(horiz).Name(wxT("m_HToolBar")).Top().Row(0));
+                      wxAuiPaneInfo( horiz ).Name( wxT( "m_HToolBar" ) ).Top().Row( 0 ) );
-    m_auimgr.AddPane(m_VToolBar,
+    m_auimgr.AddPane( m_VToolBar,
-        wxAuiPaneInfo(vert).Name(wxT("m_VToolBar")).Right());
+                      wxAuiPaneInfo( vert ).Name( wxT( "m_VToolBar" ) ).Right() );
-    m_auimgr.AddPane(m_OptionsToolBar,
+    m_auimgr.AddPane( m_OptionsToolBar,
-        wxAuiPaneInfo(vert).Name(wxT("m_OptionsToolBar")).Left());
+                      wxAuiPaneInfo( vert ).Name( wxT( "m_OptionsToolBar" ) ).Left() );
-    m_auimgr.AddPane(DrawPanel,
+    m_auimgr.AddPane( DrawPanel,
-        wxAuiPaneInfo().Name(wxT("DrawFrame")).CentrePane());
+                      wxAuiPaneInfo().Name( wxT( "DrawFrame" ) ).CentrePane() );
-    m_auimgr.AddPane(MsgPanel,
+    m_auimgr.AddPane( MsgPanel,
-        wxAuiPaneInfo(horiz).Name(wxT("MsgPanel")).Bottom());
+                      wxAuiPaneInfo( horiz ).Name( wxT( "MsgPanel" ) ).Bottom() );
    m_auimgr.Update();
 #endif
@@ -194,13 +189,10 @@ WinEDA_GerberFrame::~WinEDA_GerberFrame()
    SetBaseScreen( ScreenPcb );
    extern PARAM_CFG_BASE* ParamCfgList[];
    wxGetApp().SaveCurrentSetupValues( ParamCfgList );
 }
-/***********************************************************/
 void WinEDA_GerberFrame::OnCloseWindow( wxCloseEvent& Event )
-/***********************************************************/
 {
    PCB_SCREEN* screen = ScreenPcb;
@@ -221,7 +213,8 @@ void WinEDA_GerberFrame::OnCloseWindow( wxCloseEvent& Event )
        }
    }
 #endif
-    while( screen ) // suppression flag modify pour eviter d'autres message
+    while( screen ) // Modify delete flag to prevent further message.
    {
        screen->ClrModify();
        screen = screen->Next();
@@ -234,13 +227,10 @@ void WinEDA_GerberFrame::OnCloseWindow( wxCloseEvent& Event )
 }
-/*******************************************/
-void WinEDA_GerberFrame::SetToolbars()
-/*******************************************/
 /** Function SetToolbars()
- * Set the tools state for the toolbars, accordint to display options
+ * Set the tools state for the toolbars, according to display options
 */
+void WinEDA_GerberFrame::SetToolbars()
 {
    int     layer  = ( (PCB_SCREEN*) GetScreen() )->m_Active_Layer;
    GERBER* gerber = g_GERBER_List[layer];
@@ -263,7 +253,7 @@ void WinEDA_GerberFrame::SetToolbars()
        ( (PCB_SCREEN*) GetScreen() )->m_Active_Layer )
    {
        m_SelLayerBox->SetSelection(
-             ( (PCB_SCREEN*) GetScreen() )->m_Active_Layer );
+            ( (PCB_SCREEN*) GetScreen() )->m_Active_Layer );
    }
    if( gerber )
@@ -318,16 +308,15 @@ void WinEDA_GerberFrame::SetToolbars()
    }
    DisplayUnitsMsg();
 #if defined(KICAD_AUIMANAGER)
-   if(m_auimgr.GetManagedWindow())
+    if( m_auimgr.GetManagedWindow() )
-       m_auimgr.Update();
+        m_auimgr.Update();
 #endif
 }
-/*************************************/
 int WinEDA_GerberFrame::BestZoom()
-/*************************************/
 {
    double x, y;
    wxSize size;
@@ -340,5 +329,5 @@ int WinEDA_GerberFrame::BestZoom()
          GetScreen()->GetGridSize().y ) / (double) size.y;
    GetScreen()->m_Curseur = GetBoard()->m_BoundaryBox.Centre();
-    return wxRound( MAX( x, y ) * (double)GetScreen()->m_ZoomScalar );
+    return wxRound( MAX( x, y ) * (double) GetScreen()->m_ZoomScalar );
 }
--- a/gerbview/gerbview.cpp
+++ b/gerbview/gerbview.cpp
@@ -26,7 +26,7 @@ wxString g_PenFilenameExt;
 int      g_DCodesColor;
 int      g_Default_GERBER_Format;
-int      g_Plot_Spot_Mini;        /* Diametre mini de l'ouverture pour */
+int      g_Plot_Spot_Mini;  /* Diameter of the opening mini-track for GERBER. */
 int      g_DisplayPolygonsModeSketch;
 GERBER*  g_GERBER_List[32];
@@ -37,7 +37,7 @@ IMPLEMENT_APP( WinEDA_App )
 bool WinEDA_App::OnInit()
 {
-    wxFileName fn;
+    wxFileName          fn;
    WinEDA_GerberFrame* frame = NULL;
    InitEDA_Appl( wxT( "GerbView" ), APP_TYPE_GERBVIEW );
@@ -47,9 +47,10 @@ bool WinEDA_App::OnInit()
    ActiveScreen = ScreenPcb;
-    // read current setup and reopen last directory if no filename to open in command line
+    // read current setup and reopen last directory if no filename to open in
+    // command line
    bool reopenLastUsedDirectory = argc == 1;
-    GetSettings(reopenLastUsedDirectory);
+    GetSettings( reopenLastUsedDirectory );
    extern PARAM_CFG_BASE* ParamCfgList[];
    wxGetApp().ReadCurrentSetupValues( ParamCfgList );
@@ -62,25 +63,28 @@ bool WinEDA_App::OnInit()
    g_DrawBgColor = BLACK;
-    Read_Hotkey_Config( frame, false );  /* Must be called before creating the main frame
+    Read_Hotkey_Config( frame, false );  /* Must be called before creating the
-                                          *  in order to display the real hotkeys
+                                          * main frame in order to display the
-                                          *  in menus or tool tips */
+                                          * real hotkeys in menus or tool tips
+                                          */
    frame = new  WinEDA_GerberFrame( NULL, wxT( "GerbView" ),
-                                     wxPoint( 0, 0 ),
+                                    wxPoint( 0, 0 ),
-                                     wxSize( 600, 400 ) );
+                                    wxSize( 600, 400 ) );
    /* Gerbview mainframe title */
    frame->SetTitle( GetTitle() + wxT( " " ) + GetBuildVersion() );
    frame->SetBoard( new BOARD( NULL, frame ) );
    // Initialize some display options
-    DisplayOpt.DisplayPadIsol = false;      // Pad clearance has no meaning here
+    DisplayOpt.DisplayPadIsol = false;      // Pad clearance has no meaning
-    DisplayOpt.ShowTrackClearanceMode = 0;  // tracks and vias clearance has no meaning here
+                                            // here
+    DisplayOpt.ShowTrackClearanceMode = 0;  // tracks and vias clearance has no
-    SetTopWindow( frame );              // Set GerbView mainframe on top
+                                            // meaning here
-    frame->Show( TRUE );                // Show GerbView mainframe
-    frame->Zoom_Automatique( TRUE );    // Zoomfit drawing in frame
+    SetTopWindow( frame );                  // Set GerbView mainframe on top
+    frame->Show( TRUE );                    // Show GerbView mainframe
+    frame->Zoom_Automatique( TRUE );        // Zoomfit drawing in frame
    Read_Config();

--- a/gerbview/gerbview.h
+++ b/gerbview/gerbview.h
--- a/gerbview/gerbview_config.cpp
+++ b/gerbview/gerbview_config.cpp
@@ -2,8 +2,6 @@
 /** gerbview_config.cpp : Gerbview configuration*/
 /************************************************/
-/* Functions to handle Gerbview configuration */
 #include "fctsys.h"
 #include "appl_wxstruct.h"
 #include "common.h"
@@ -27,9 +25,7 @@ const wxString GerbviewProjectFileExt( wxT( "cnf" ) );
 const wxString GerbviewProjectFileWildcard( _( "GerbView project files (.cnf)|*.cnf" ) );
-/*************************************************************/
 void WinEDA_GerberFrame::Process_Config( wxCommandEvent& event )
-/*************************************************************/
 {
    int      id = event.GetId();
    wxPoint  pos;
@@ -45,7 +41,7 @@ void WinEDA_GerberFrame::Process_Config( wxCommandEvent& event )
        DisplayColorSetupFrame( this, pos );
        break;
-    case ID_CONFIG_REQ:             // Creation de la fenetre de configuration
+    case ID_CONFIG_REQ:
    {
        InstallConfigFrame( pos );
        break;
@@ -91,7 +87,7 @@ void WinEDA_GerberFrame::Process_Config( wxCommandEvent& event )
        HandleHotkeyConfigMenuSelection( this, id );
        break;
-    case ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST:           // Display Current hotkey list for gerbview
+    case ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST:
        DisplayHotkeyList( this, s_Gerbview_Hokeys_Descr );
        break;
@@ -102,22 +98,16 @@ void WinEDA_GerberFrame::Process_Config( wxCommandEvent& event )
 }
-/*****************************************************/
+/* Read configuration, if it has not already read.
-bool Read_Config()
+ * 1 - bed gerbview.cnf
-/*****************************************************/
+ * 2 - if no bed is path> gerbview.exe> / gerbview.cnf
+ * 3 - If not found: init variables to default values
-/* lit la configuration, si elle n'a pas deja etee lue
- * 1 - lit gerbview.cnf
- * 2 - si non trouve lit <chemin de gerbview.exe>/gerbview.cnf
- * 3 - si non trouve: init des variables aux valeurs par defaut
- *
- * Retourne un pointeur su le message d'erreur a afficher
 */
+bool Read_Config()
 {
    wxGetApp().ReadProjectConfig( wxT( "gerbview.cnf" ), GROUP, ParamCfgList,
                                  FALSE );
-    /* Inits autres variables */
    if( g_PhotoFilenameExt.IsEmpty() )
        g_PhotoFilenameExt = wxT( "pho" );
    if( g_DrillFilenameExt.IsEmpty() )
@@ -129,13 +119,7 @@ bool Read_Config()
 }
-/******************************************/
 void WinEDA_GerberFrame::Update_config()
-/******************************************/
-/*
- * creation du fichier de config
- */
 {
    wxFileName fn = wxFileName( wxEmptyString, wxT( "gerbview" ),
                                GerbviewProjectFileExt );
@@ -147,21 +131,17 @@ void WinEDA_GerberFrame::Update_config()
    if( dlg.ShowModal() == wxID_CANCEL )
        return;
-    /* ecriture de la configuration */
    wxGetApp().WriteProjectConfig( dlg.GetPath(), GROUP, ParamCfgList );
 }
-/***************************************************************/
-bool Read_Hotkey_Config( WinEDA_DrawFrame* frame, bool verbose )
-/***************************************************************/
 /*
 * Read the hotkey files config for pcbnew and module_edit
 */
+bool Read_Hotkey_Config( WinEDA_DrawFrame* frame, bool verbose )
 {
-    wxString FullFileName = ReturnHotkeyConfigFilePath(
+    wxString FullFileName =
-        g_ConfigFileLocationChoice );
+        ReturnHotkeyConfigFilePath( g_ConfigFileLocationChoice );
    FullFileName += HOTKEY_FILENAME;
    FullFileName +=  wxT(".");

--- a/gerbview/gerbview_config.h
+++ b/gerbview/gerbview_config.h
--- a/gerbview/initpcb.cpp
+++ b/gerbview/initpcb.cpp
-/**********************************************/
+/****************************************/
-/* GERBVIEW : Routines d'initialisation globale */
+/******* initpcb.cpp ********************/
-/******* Fichier INITPCB.C ********************/
+/****************************************/
-/**********************************************/
 #include "fctsys.h"
@@ -12,16 +11,8 @@
 #include "gerbview.h"
 #include "protos.h"
-/* Routines Locales */
-/********************************************************/
 bool WinEDA_GerberFrame::Clear_Pcb( bool query )
-/********************************************************/
-/* Realise les init des pointeurs et variables
- *  Si Item == NULL, il n'y aura pas de confirmation
- */
 {
    int layer;
@@ -30,9 +21,10 @@ bool WinEDA_GerberFrame::Clear_Pcb( bool query )
    if( query )
    {
-        if( GetBoard()->m_Drawings || GetBoard()->m_Track || GetBoard()->m_Zone )
+        if( GetBoard()->m_Drawings || GetBoard()->m_Track
+            || GetBoard()->m_Zone )
        {
-            if( !IsOK( this, _( "Current Data will be lost ?" ) ) )
+            if( !IsOK( this, _( "Current data will be lost?" ) ) )
                return FALSE;
        }
    }
@@ -43,21 +35,18 @@ bool WinEDA_GerberFrame::Clear_Pcb( bool query )
    GetBoard()->m_Zone.DeleteAll();
-    /* init pointeurs  et variables */
    for( layer = 0; layer < 32; layer++ )
    {
        if( g_GERBER_List[layer] )
            g_GERBER_List[layer]->InitToolTable();
    }
-    /* remise a 0 ou a une valeur initiale des variables de la structure */
    GetBoard()->m_BoundaryBox.SetOrigin( 0, 0 );
    GetBoard()->m_BoundaryBox.SetSize( 0, 0 );
-    GetBoard()->m_Status_Pcb = 0;
+    GetBoard()->m_Status_Pcb  = 0;
    GetBoard()->m_NbNodes     = 0;
    GetBoard()->m_NbNoconnect = 0;
-    /* Init parametres de gestion des ecrans PAD et PCB */
    SetBaseScreen( ActiveScreen = ScreenPcb );
    GetScreen()->Init();
@@ -65,11 +54,9 @@ bool WinEDA_GerberFrame::Clear_Pcb( bool query )
 }
-/*********************************************************/
 void WinEDA_GerberFrame::Erase_Zones( bool query )
-/*********************************************************/
 {
-    if( query && !IsOK( this, _( "Delete zones ?" ) ) )
+    if( query && !IsOK( this, _( "Delete zones?" ) ) )
        return;
    GetBoard()->m_Zone.DeleteAll();
@@ -78,17 +65,15 @@ void WinEDA_GerberFrame::Erase_Zones( bool query )
 }
-/************************************************************************/
 void WinEDA_GerberFrame::Erase_Segments_Pcb( bool all_layers, bool query )
-/************************************************************************/
 {
-    int  layer = GetScreen()->m_Active_Layer;
+    int layer = GetScreen()->m_Active_Layer;
    if( all_layers )
        layer = -1;
-    BOARD_ITEM*  next;
+    BOARD_ITEM* next;
-    for( BOARD_ITEM* item = GetBoard()->m_Drawings;  item;  item = next )
+    for( BOARD_ITEM* item = GetBoard()->m_Drawings; item; item = next )
    {
        next = item->Next();
@@ -103,7 +88,7 @@ void WinEDA_GerberFrame::Erase_Segments_Pcb( bool all_layers, bool query )
            break;
        default:
-            DisplayError( this, wxT( "Type Draw inconnu/inattendu" ) );
+            DisplayError( this, wxT( "Draw type unknown." ) );
            break;
        }
    }
@@ -112,24 +97,23 @@ void WinEDA_GerberFrame::Erase_Segments_Pcb( bool all_layers, bool query )
 }
-/******************************************************************/
+/* Delete track segments.
-void WinEDA_GerberFrame::Erase_Pistes( int masque_type, bool query )
+ * masque_type mask options selection:
-/******************************************************************/
+ *   SEGM_FIXE, SEGM_AR
+ * If a bit is 1, segment is not erased.
-/* Efface les segments de piste, selon les autorisations affichees
- *  masque_type = masque des options de selection:
- *  SEGM_FIXE, SEGM_AR
- *  Si un des bits est a 1, il n'y a pas effacement du segment de meme bit a 1
 */
+void WinEDA_GerberFrame::Erase_Pistes( int masque_type, bool query )
 {
-    TRACK*          pt_segm;
+    TRACK*      pt_segm;
-    BOARD_ITEM*     PtNext;
+    BOARD_ITEM* PtNext;
-    if( query && !IsOK( this, _( "Delete Tracks?" ) ) )
+    if( query && !IsOK( this, _( "Delete tracks?" ) ) )
        return;
-    /* Marquage des pistes a effacer */
+    /* Mark tracks to clear. */
-    for( pt_segm = GetBoard()->m_Track; pt_segm != NULL; pt_segm = (TRACK*) PtNext )
+    for( pt_segm = GetBoard()->m_Track;
+         pt_segm != NULL;
+         pt_segm = (TRACK*) PtNext )
    {
        PtNext = pt_segm->Next();
        if( pt_segm->GetState( SEGM_FIXE | SEGM_AR ) & masque_type )
@@ -141,14 +125,12 @@ void WinEDA_GerberFrame::Erase_Pistes( int masque_type, bool query )
 }
-/*****************************************************************/
 void WinEDA_GerberFrame::Erase_Textes_Pcb( bool query )
-/*****************************************************************/
 {
    BOARD_ITEM* PtStruct;
    BOARD_ITEM* PtNext;
-    if( query && !IsOK( this, _( "Delete Pcb Texts" ) ) )
+    if( query && !IsOK( this, _( "Delete pcb text?" ) ) )
        return;
    PtStruct = GetBoard()->m_Drawings;
@@ -163,20 +145,20 @@ void WinEDA_GerberFrame::Erase_Textes_Pcb( bool query )
 }
-/*********************************************************/
 void WinEDA_GerberFrame::Erase_Current_Layer( bool query )
-/*********************************************************/
 {
-    int             layer = GetScreen()->m_Active_Layer;
+    int      layer = GetScreen()->m_Active_Layer;
-    wxString        msg;
+    wxString msg;
-    msg.Printf( _( "Delete Layer %d" ), layer + 1 );
+    msg.Printf( _( "Delete layer %d?" ), layer + 1 );
    if( query && !IsOK( this, msg ) )
        return;
    /* Delete tracks (spots and lines) */
-    TRACK*     PtNext;
+    TRACK* PtNext;
-    for( TRACK* pt_segm = GetBoard()->m_Track; pt_segm != NULL; pt_segm = (TRACK*) PtNext )
+    for( TRACK* pt_segm = GetBoard()->m_Track;
+         pt_segm != NULL;
+         pt_segm = (TRACK*) PtNext )
    {
        PtNext = pt_segm->Next();
        if( pt_segm->GetLayer() != layer )
@@ -185,7 +167,7 @@ void WinEDA_GerberFrame::Erase_Current_Layer( bool query )
    }
    /* Delete polygons */
-    SEGZONE*     Nextzone;
+    SEGZONE* Nextzone;
    for( SEGZONE* zone = GetBoard()->m_Zone; zone != NULL; zone = Nextzone )
    {
        Nextzone = zone->Next();
@@ -193,6 +175,7 @@ void WinEDA_GerberFrame::Erase_Current_Layer( bool query )
            continue;
        zone->DeleteStructure();
    }
    ScreenPcb->SetModify();
    ScreenPcb->SetRefreshReq();
 }
--- a/gerbview/lay2plot.cpp
+++ b/gerbview/lay2plot.cpp
-        /**********************************************/
+/****************/
-        /* Routine de selection de couches pour trace */
+/* lay2plot.cpp */
-        /**********************************************/
+/****************/
 #include "fctsys.h"
 #include "common.h"
@@ -10,14 +10,8 @@
 #include "protos.h"
-/* Variables locales : */
+/* Routine to plot the pcb, by selected layers. */
-/* Routines Locales */
-/*******************************************************************************/
 void Print_PcbItems(BOARD * Pcb, wxDC *DC, int drawmode, int printmasklayer)
-/*******************************************************************************/
-/* routine de trace du pcb, avec selection des couches */
 {
    DISPLAY_OPTIONS save_opt;
    TRACK * pt_piste;
@@ -33,16 +27,12 @@ void Print_PcbItems(BOARD * Pcb, wxDC *DC, int drawmode, int printmasklayer)
    DisplayOpt.DisplayDrawItems = FILLED;
    DisplayOpt.DisplayZonesMode = 0;
-    /* trace des pistes */
    pt_piste = Pcb->m_Track;
    for( ; pt_piste != NULL ; pt_piste = pt_piste->Next() )
    {
-//		if( (printmasklayer & ReturnMaskLayer(pt_piste) ) == 0 ) continue;
+//      if( (printmasklayer & ReturnMaskLayer(pt_piste) ) == 0 ) continue;
        Trace_Segment(NULL, DC, pt_piste, drawmode);
    }
    DisplayOpt = save_opt;
 }
--- a/gerbview/locate.cpp
+++ b/gerbview/locate.cpp
--- a/gerbview/onrightclick.cpp
+++ b/gerbview/onrightclick.cpp
-/******************************************************/
+/********************/
-/* edit.cpp: fonctions generales de l'edition du PCB */
+/* onrightclick.cpp */
-/******************************************************/
+/********************/
 #include "fctsys.h"
 #include "common.h"
@@ -11,27 +11,28 @@
 #include "pcbplot.h"
 #include "protos.h"
-/********************************************************************************/
-bool WinEDA_GerberFrame::OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu )
-/********************************************************************************/
 /* Prepare the right-click pullup menu.
 * The menu already has a list of zoom commands.
 */
+bool WinEDA_GerberFrame::OnRightClick( const wxPoint& MousePos,
+                                       wxMenu*        PopMenu )
 {
-    BOARD_ITEM*     DrawStruct = GetScreen()->GetCurItem();
+    BOARD_ITEM* DrawStruct = GetScreen()->GetCurItem();
-    wxString        msg;
+    wxString    msg;
-    bool            BlockActive = (GetScreen()->m_BlockLocate.m_Command !=  BLOCK_IDLE);
+    bool        BlockActive =
+        (GetScreen()->m_BlockLocate.m_Command !=  BLOCK_IDLE);
-    DrawPanel->m_CanStartBlock = -1;    // Ne pas engager un debut de bloc sur validation menu
+    // Do not initiate a start block validation on menu.
+    DrawPanel->m_CanStartBlock = -1;
-    // Simple localisation des elements si possible
+    // Simple location of elements where possible.
-    if( (DrawStruct == NULL) || (DrawStruct->m_Flags == 0) )
+    if( ( DrawStruct == NULL ) || ( DrawStruct->m_Flags == 0 ) )
    {
        DrawStruct = GerberGeneralLocateAndDisplay();
    }
-    // Si commande en cours: affichage fin de commande
+    // If command in progress, end command.
    if(  m_ID_current_state )
    {
        if( DrawStruct && DrawStruct->m_Flags )
@@ -46,16 +47,21 @@ bool WinEDA_GerberFrame::OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu
        {
            if( BlockActive )
            {
-                PopMenu->Append( ID_POPUP_CANCEL_CURRENT_COMMAND, _( "Cancel Block" ) );
+                PopMenu->Append( ID_POPUP_CANCEL_CURRENT_COMMAND,
-                PopMenu->Append( ID_POPUP_ZOOM_BLOCK, _( "Zoom Block (drag middle mouse)" ) );
+                                 _( "Cancel Block" ) );
+                PopMenu->Append( ID_POPUP_ZOOM_BLOCK,
+                                 _( "Zoom Block (drag middle mouse)" ) );
                PopMenu->AppendSeparator();
                PopMenu->Append( ID_POPUP_PLACE_BLOCK, _( "Place Block" ) );
-                PopMenu->Append( ID_POPUP_COPY_BLOCK, _( "Copy Block (shift mouse)" ) );
+                PopMenu->Append( ID_POPUP_COPY_BLOCK,
-                PopMenu->Append( ID_POPUP_DELETE_BLOCK, _( "Delete Block (ctrl + drag mouse)" ) );
+                                 _( "Copy Block (shift mouse)" ) );
+                PopMenu->Append( ID_POPUP_DELETE_BLOCK,
+                                 _( "Delete Block (ctrl + drag mouse)" ) );
                PopMenu->Append( ID_POPUP_MIRROR_X_BLOCK, _( "Mirror Block" ) );
            }
            else
-                PopMenu->Append( ID_POPUP_CANCEL_CURRENT_COMMAND, _( "Cancel" ) );
+                PopMenu->Append( ID_POPUP_CANCEL_CURRENT_COMMAND,
+                                 _( "Cancel" ) );
            PopMenu->AppendSeparator();
        }
    }
@@ -63,7 +69,8 @@ bool WinEDA_GerberFrame::OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu
    if( BlockActive )
        return true;
-    PopMenu->Append( ID_GERBVIEW_POPUP_DELETE_DCODE_ITEMS, _( "Delete Dcode items" ) );
+    PopMenu->Append( ID_GERBVIEW_POPUP_DELETE_DCODE_ITEMS,
+                     _( "Delete Dcode items" ) );
    if( DrawStruct == NULL )
        return true;
@@ -81,9 +88,8 @@ bool WinEDA_GerberFrame::OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu
    default:
-        msg.Printf(
+        msg.Printf( wxT( "WinEDA_GerberFrame::OnRightClick Error: illegal or unknown DrawType %d" ),
-            wxT( "WinEDA_GerberFrame::OnRightClick Error: illegal or unknown DrawType %d" ),
+                    DrawStruct->Type() );
-            DrawStruct->Type() );
        DisplayError( this, msg );
        break;
    }

--- a/gerbview/options.cpp
+++ b/gerbview/options.cpp
-/********************************************/
+/************************/
-/* GERBVIEW - Gestion des Options et Reglages */
+/*   File options.cpp   */
-/********************************************/
+/************************/
-/*	 File options.cpp   */
 /*
 * Set the display options for Gerbview
@@ -21,13 +19,10 @@
 #include <wx/spinctrl.h>
-/*****************************************************************/
-void WinEDA_GerberFrame::OnSelectOptionToolbar( wxCommandEvent& event )
-/*****************************************************************/
 /** Function OnSelectOptionToolbar
 *  called to validate current choices
 */
+void WinEDA_GerberFrame::OnSelectOptionToolbar( wxCommandEvent& event )
 {
    int id = event.GetId();
@@ -112,7 +107,7 @@ void WinEDA_GerberFrame::OnSelectOptionToolbar( wxCommandEvent& event )
    default:
        DisplayError( this,
-                     wxT( "WinEDA_PcbFrame::OnSelectOptionToolbar error" ) );
+                      wxT( "WinEDA_PcbFrame::OnSelectOptionToolbar error" ) );
        break;
    }
@@ -120,9 +115,7 @@ void WinEDA_GerberFrame::OnSelectOptionToolbar( wxCommandEvent& event )
 }
-/******************************************************/
 class WinEDA_GerberGeneralOptionsFrame : public wxDialog
-/******************************************************/
 {
 private:
@@ -132,7 +125,6 @@ private:
    wxRadioBox*          m_CursorShape;
    wxRadioBox*          m_GerberDefaultScale;
-    // Constructor and destructor
 public:
    WinEDA_GerberGeneralOptionsFrame( WinEDA_BasePcbFrame* parent,
                                      const wxPoint&       pos );
@@ -145,25 +137,19 @@ private:
    DECLARE_EVENT_TABLE()
 };
-/* Events table for WinEDA_GerberGeneralOptionsFrame */
 BEGIN_EVENT_TABLE( WinEDA_GerberGeneralOptionsFrame, wxDialog )
    EVT_BUTTON( wxID_OK, WinEDA_GerberGeneralOptionsFrame::OnOkClick )
    EVT_BUTTON( wxID_CANCEL, WinEDA_GerberGeneralOptionsFrame::OnCancelClick )
 END_EVENT_TABLE()
-/**********************************************************************************************/
 WinEDA_GerberGeneralOptionsFrame::WinEDA_GerberGeneralOptionsFrame(
    WinEDA_BasePcbFrame* parent,
-    const
+    const wxPoint&       framepos ) :
-    wxPoint&             framepos ) :
    wxDialog( parent, -1, _( "Gerbview Options" ),
              framepos, wxSize( 300, 240 ),
              wxDEFAULT_DIALOG_STYLE | wxFRAME_FLOAT_ON_PARENT )
-/**********************************************************************************************/
-/** WinEDA_GerberGeneralOptionsFrame Constructor
- */
 {
    m_Parent = parent;
@@ -228,18 +214,14 @@ WinEDA_GerberGeneralOptionsFrame::WinEDA_GerberGeneralOptionsFrame(
 }
-/************************************************************************/
 void WinEDA_GerberGeneralOptionsFrame::OnCancelClick(
     wxCommandEvent& WXUNUSED(event) )
-/************************************************************************/
 {
    EndModal( -1 );
 }
-/*****************************************************************************/
 void WinEDA_GerberGeneralOptionsFrame::OnOkClick( wxCommandEvent& event )
-/*****************************************************************************/
 {
    DisplayOpt.DisplayPolarCood =
        (m_PolarDisplay->GetSelection() == 0) ? FALSE : TRUE;
@@ -253,7 +235,7 @@ void WinEDA_GerberGeneralOptionsFrame::OnOkClick( wxCommandEvent& event )
 /*******************************************/
-/* Dialog frame to select deisplay options */
+/* Dialog frame to select display options */
 /*******************************************/
 class WinEDA_LookFrame : public wxDialog
 {
@@ -261,14 +243,13 @@ private:
    WinEDA_BasePcbFrame* m_Parent;
    wxRadioBox*          m_OptDisplayLines;
    wxRadioBox*          m_OptDisplayFlashes;
-    wxRadioBox*          m_OptDisplayVias;		//@@@@TODO: Does it belong here?
+    wxRadioBox*          m_OptDisplayVias;      //@@@@TODO: Does it belong here?
    wxRadioBox*          m_OptDisplayPolygons;
    wxCheckBox*          m_OptDisplayDCodes;
    wxRadioBox*          m_OptDisplayDrawings;
 public:
-    // Constructor and destructor
    WinEDA_LookFrame( WinEDA_BasePcbFrame* parent, const wxPoint& pos );
    ~WinEDA_LookFrame() {};
@@ -279,20 +260,17 @@ private:
    DECLARE_EVENT_TABLE()
 };
-/* Construction de la table des evenements pour WinEDA_LookFrame */
 BEGIN_EVENT_TABLE( WinEDA_LookFrame, wxDialog )
    EVT_BUTTON( wxID_OK, WinEDA_LookFrame::OnOkClick )
    EVT_BUTTON( wxID_CANCEL, WinEDA_LookFrame::OnCancelClick )
 END_EVENT_TABLE()
-/*******************************************************************************/
 WinEDA_LookFrame::WinEDA_LookFrame( WinEDA_BasePcbFrame* parent,
                                    const wxPoint&       framepos ) :
    wxDialog( parent, -1, _( "Gerbview Draw Options" ), framepos,
              wxSize( 350, 200 ),
              wxDEFAULT_DIALOG_STYLE | wxFRAME_FLOAT_ON_PARENT )
-/*******************************************************************************/
 {
    m_Parent = parent;
@@ -362,20 +340,13 @@ WinEDA_LookFrame::WinEDA_LookFrame( WinEDA_BasePcbFrame* parent,
 }
-/**************************************************************/
 void WinEDA_LookFrame::OnCancelClick( wxCommandEvent& WXUNUSED(event) )
-/**************************************************************/
 {
    EndModal( -1 );
 }
-/*************************************************************/
 void WinEDA_LookFrame::OnOkClick( wxCommandEvent& event )
-/*************************************************************/
-/* Met a jour les options
- */
 {
    if( m_OptDisplayLines->GetSelection() == 1 )
        DisplayOpt.DisplayPcbTrackFill = TRUE;
@@ -412,9 +383,7 @@ void WinEDA_LookFrame::OnOkClick( wxCommandEvent& event )
 }
-/***************************************************************************/
 void WinEDA_GerberFrame::InstallGerberOptionsFrame( const wxPoint& pos, int id )
-/***************************************************************************/
 {
    switch( id )
    {

--- a/gerbview/pcbplot.cpp
+++ b/gerbview/pcbplot.cpp
-		/************************************************/
+/***************/
-		/* Menu General de Trace (PLOT) fichier PLOT.CC */
+/* pcbplot.cpp */
-		/************************************************/
+/***************/
 #include "fctsys.h"
 #include "common.h"
@@ -15,13 +15,9 @@
 PCB_Plot_Options g_pcb_plot_options;
-/* variables locale : */
+/**************************************************************/
+/* void WinEDA_BasePcbFrame::ToPlotter(wxCommandEvent& event) */
-/* Routines Locales */
+/***************************************************************/
-	/**************************************************************/
-	/* void WinEDA_BasePcbFrame::ToPlotter(wxCommandEvent& event) */
-	/***************************************************************/
 void WinEDA_BasePcbFrame::ToPlotter(wxCommandEvent& event)
 {

--- a/gerbview/pcbplot.h
+++ b/gerbview/pcbplot.h
@@ -13,30 +13,32 @@
 #define OPTKEY_PRINT_SCALE           wxT( "PrintScale" )
 /* Plot Options : */
-struct PCB_Plot_Options {
+struct PCB_Plot_Options
+{
    bool Exclude_Edges_Pcb;
    int PlotLine_Width;
    bool Plot_Frame_Ref;       // True to plot/print frame references
-    bool DrawViaOnMaskLayer;   // True if vias are drawn on Mask layer (ie protected by mask)
+    bool DrawViaOnMaskLayer;   // True if vias are drawn on Mask layer
+                               // (ie protected by mask)
    int Plot_Mode;
    bool Plot_Set_MIROIR;
    bool Sel_Rotate_Window;
-    int HPGL_Pen_Num;                                                                  
+    int HPGL_Pen_Num;
    int HPGL_Pen_Speed;
    int HPGL_Pen_Diam;
    int HPGL_Pen_Recouvrement;
-    bool HPGL_Org_Centre;        // TRUE si en HPGL, l'origine le centre de la feuille
+    bool HPGL_Org_Centre;      // TRUE if, HPGL originally the center of the node
    int PlotPSColorOpt;        // True for color Postscript output
-    bool Plot_PS_Negative;     // True to create a  negative board ps plot
+    bool Plot_PS_Negative;     // True to create a negative board ps plot
-    /* Autorisation de trace des divers items en serigraphie */
+    /* Settings to trace the various items in silkscreen. */
    bool Sel_Texte_Reference;
    bool Sel_Texte_Valeur;
    bool Sel_Texte_Divers;
    bool Sel_Texte_Invisible;
    bool PlotPadsOnSilkLayer;
-    bool Plot_Pads_All_Layers;   /* Plot pads meme n'appartenant pas a la
+    /* Plot pads even outside the layer (useful for silkscreen) */
-				    couche ( utile pour serigraphie) */
+    bool Plot_Pads_All_Layers;
    /* id for plot format (see enum PlotFormat in plot_common.h) */
    int PlotFormat;
@@ -49,4 +51,3 @@ struct PCB_Plot_Options {
 extern PCB_Plot_Options g_pcb_plot_options;
 #endif  // ifndef PCBPLOT_H
--- a/gerbview/readgerb.cpp
+++ b/gerbview/readgerb.cpp
-/********************************************************/
+/**********************/
-/**** Routine de lecture et visu d'un fichier GERBER ****/
+/**** readgerb.cpp ****/
-/********************************************************/
+/**********************/
 #include "fctsys.h"
 #include "common.h"
@@ -11,121 +11,113 @@
 #include "pcbplot.h"
 #include "protos.h"
-/* Format Gerber : NOTES :
+/* Format Gerber: NOTES:
- *  Fonctions preparatoires:
+ *   Functions history:
- *  Gn =
+ *   Gn =
- *  G01			interpolation lineaire ( trace de droites )
+ *   G01 linear interpolation (right trace)
- *  G02,G20,G21	Interpolation circulaire , sens trigo < 0
+ *   G02, G20, G21 Circular interpolation, meaning trig <0
- *  G03,G30,G31	Interpolation circulaire , sens trigo > 0
+ *   G03, G30, G31 Circular interpolation, meaning trigo> 0
- *  G04			commentaire
+ *   G04 review
- *  G06			Interpolation parabolique
+ *   G06 parabolic interpolation
- *  G07			Interpolation cubique
+ *   G07 Cubic Interpolation
- *  G10			interpolation lineaire ( echelle 10x )
+ *   G10 linear interpolation (scale x10)
- *  G11			interpolation lineaire ( echelle 0.1x )
+ *   G11 linear interpolation (0.1x range)
- *  G12			interpolation lineaire ( echelle 0.01x )
+ *   G12 linear interpolation (0.01x scale)
- *  G52			plot symbole reference par Dnn code
+ *   G52 plot symbol reference code by Dnn
- *  G53			plot symbole reference par Dnn ; symbole tourne de -90 degres
+ *   G53 plot symbol reference by Dnn; symbol rotates from -90 degrees
- *  G54			Selection d'outil
+ *   G54 Selection Tool
- *  G55			Mode exposition photo
+ *   G55 Fashion photo exhibition
- *  G56			plot symbole reference par Dnn A code
+ *   G56 plot symbol reference code for DNN
- *  G57			affiche le symbole reference sur la console
+ *   G57 displays the symbol link to the console
- *  G58			plot et affiche le symbole reference sur la console
+ *   G58 plot displays the symbol and link to the console
- *  G60			interpolation lineaire ( echelle 100x )
+ *   G60 linear interpolation (scale x100)
- *  G70			Unites = Inches
+ *   G70 Units = Inches
- *  G71			Unites = Millimetres
+ *   G71 Units = Millimeters
- *  G74			supprime interpolation circulaire sur 360 degre, revient a G01
+ *   G74 circular interpolation removes 360 degree, has returned G01
- *  G75			Active interpolation circulaire sur 360 degre
+ *   G75 Active circular interpolation on 360 degree
- *  G90			Mode Coordonnees absolues
+ *   G90 mode absolute coordinates
- *  G91			Mode Coordonnees Relatives
+ *   G91 Fashion Related Contacts
 *
- *  Coordonnees X,Y
+ *   X, Y coordinates
- *  X,Y sont suivies de + ou - et de m+n chiffres (non separes)
+ *   X and Y are followed by + or - and m + n digits (not separated)
- *          m = partie entiere
+ *   m = integer part
- *          n = partie apres la virgule
+ *   n = part after the comma
- *           formats classiques : 	m = 2, n = 3 (format 2.3)
+ *   Classic formats: m = 2, n = 3 (size 2.3)
- *                                  m = 3, n = 4 (format 3.4)
+ *   m = 3, n = 4 (size 3.4)
- *  ex:
+ *   eg
- *  G__ X00345Y-06123 D__*
+ *   G__ X00345Y-06123 * D__
 *
- *  Outils et D_CODES
+ *   Tools and D_CODES
- *  numero d'outil ( identification des formes )
+ *   Tool number (identification of shapes)
- *  1 a 99 	(classique)
+ *   1 to 99 (Classical)
- *  1 a 999
+ *   1 to 999
- *  D_CODES:
+ *   D_CODES:
 *
- *  D01 ... D9 = codes d'action:
+ *   D01 ... D9 = action codes:
- *  D01			= activation de lumiere (baisser de plume) lors du d�placement
+ *   D01 = activating light (lower pen) when placement
- *  D02			= extinction de lumiere (lever de plume) lors du d�placement
+ *   D02 = light extinction (lift pen) when placement
- *  D03			= Flash
+ *   D03 = Flash
- *  D09			= VAPE Flash
+ *   D09 = VAPE Flash
- *  D51			= precede par G54 -> Select VAPE
+ *   D51 = G54 preceded by -> Select VAPE
 *
- *  D10 ... D255 = Indentification d'outils ( d'ouvertures )
+ *   D10 ... D255 = Identification Tool (Opening)
- *              Ne sont pas tj dans l'ordre ( voir tableau dans PCBPLOT.H)
+ *   Not in order (see table in PCBPLOT.H)
 */
-/* Variables locales : */
+/* Routine to Read a file D Codes.
+ * Accepts standard format or ALSPCB
-/* Routines Locales */
+ * A ';' starts a comment.
-/* Routine de Lecture d'un fichier de D Codes.
- *  Accepte format standard ou ALSPCB
- *      un ';' demarre un commentaire.
 *
- *  Format Standard:
+ * Standard Format:
- *  tool,	 Horiz,		  Vert,	  drill, vitesse, acc. ,Type ; [DCODE (commentaire)]
+ * Tool, Horiz, Vert, drill, speed, acc. Type; [dCode (comment)]
- *  ex:	   1,		  12,		12,		0,		  0,	 0,	  3 ; D10
+ * Ex: 1, 12, 12, 0, 0, 0, 3; D10
 *
- *  Format ALSPCB:
+ * Format: ALSPCB
- *  Ver  ,  Hor , Type , Tool [,Drill]
+ * Ver, Hor, Type, Tool, [Drill]
- *  ex:	0.012, 0.012,  L   , D10
+ * Eg 0012, 0012, L, D10
 *
- *  Classe les caract en buf_tmp sous forme de tableau de structures D_CODE.
+ * Rank the characters in buf_tmp tabular structures D_CODE.
- *  Retourne:
+ * Returns:
- *      < 0 si erreur:
+ * <0 if error:
- *          -1 = Fichier non trouve
+ * -1 = File not found
- *          -2 = Erreur lecture fichier
+ * -2 = Error reading file
- *      Rang de D_code maxi lu ( nbr de dcodes )
+ * Rank D_code max lu (nbr of dCode)
 *
+ * Internal Representation:
 *
- *  Representation interne:
+ * Lines are represented as standard TRACKS
- *
+ * The flash is represented as DRAWSEGMENTS
- *  Les lignes sont repr�sent�es par des TRACKS standards
+ * - Round or oval: DRAWSEGMENTS
- *  Les Flash  sont repr�sent�es par des DRAWSEGMENTS
+ * - Rectangles DRAWSEGMENTS
- *      - ronds ou ovales: DRAWSEGMENTS
+ * Reference to the D-CODE is set in the member Getnet()
- *      - rectangles: DRAWSEGMENTS
- *  la reference aux D-CODES est plac�e dans le membre GetNet()
 */
-/********************************************************/
+/* Read a gerber file (RS274D gold RS274X format).
+ * Normal size:
+ * Imperial
+ * Absolute
+ * End of block = *
+ * CrLf after each command
+ * G codes BROKE
+ */
 bool WinEDA_GerberFrame::Read_GERBER_File( wxDC*           DC,
                                           const wxString& GERBER_FullFileName,
                                           const wxString& D_Code_FullFileName )
-/********************************************************/
-/* Read a gerber file (RS274D or RS274X format).
- *  Normal format:
- *      Imperial
- *      Absolute
- *      end of block = *
- *      CrLf after each command
- *      G codes repetes
- */
 {
-    int           G_commande = 0,
+    int      G_commande = 0,
-                  D_commande = 0;       /* command number for G et D commands (like G04 or D02) */
+             D_commande = 0;            /* command number for G or D commands
+                                         * (like G04 or D02) */
-    char          line[GERBER_BUFZ];
+    char     line[GERBER_BUFZ];
-    wxString      msg;
+    wxString msg;
-    char*         text;
+    char*    text;
-    int           layer;    /* current layer used in gerbview */
+    int      layer;         /* current layer used in gerbview */
-    GERBER*       gerber;
+    GERBER*  gerber;
-    wxPoint       pos;
+    wxPoint  pos;
-    int           error = 0;
+    int      error = 0;
    layer = GetScreen()->m_Active_Layer;
@@ -155,11 +147,11 @@ bool WinEDA_GerberFrame::Read_GERBER_File( wxDC*           DC,
        wxSetWorkingDirectory( path );
    wxBusyCursor show_wait;
-    SetLocaleTo_C_standard( );
+    SetLocaleTo_C_standard();
    while( TRUE )
    {
-        if( fgets( line, sizeof(line), gerber->m_Current_File ) == NULL ) // E.O.F
+        if( fgets( line, sizeof(line), gerber->m_Current_File ) == NULL )
        {
            if( gerber->m_FilesPtr == 0 )
                break;
@@ -185,7 +177,7 @@ bool WinEDA_GerberFrame::Read_GERBER_File( wxDC*           DC,
                text++;
                break;
-            case '*':       // End commande
+            case '*':       // End command
                gerber->m_CommandState = END_BLOCK;
                text++;
                break;
@@ -202,7 +194,8 @@ bool WinEDA_GerberFrame::Read_GERBER_File( wxDC*           DC,
                gerber->Execute_G_Command( text, G_commande );
                break;
-            case 'D':       /* Line type Dxx : Tool selection (xx > 0) or command if xx = 0..9*/
+            case 'D':       /* Line type Dxx : Tool selection (xx > 0) or
+                             * command if xx = 0..9 */
                D_commande = gerber->ReturnDCodeNumber( text );
                gerber->Execute_DCODE_Command( this, DC, text, D_commande );
                break;
@@ -251,15 +244,16 @@ bool WinEDA_GerberFrame::Read_GERBER_File( wxDC*           DC,
    if( error )
    {
        msg.Printf( _( "%d errors while reading Gerber file [%s]" ),
-                    error, GERBER_FullFileName.GetData() );
+                   error, GERBER_FullFileName.GetData() );
        DisplayError( this, msg );
    }
    fclose( gerber->m_Current_File );
-    SetLocaleTo_Default( );
+    SetLocaleTo_Default();
-    /* Init  DCodes list and perhaps read a DCODES file,
+    /* Init DCodes list and perhaps read a DCODES file,
-     * if the gerber file is only a RS274D file (without any aperture information)
+     * if the gerber file is only a RS274D file (without any aperture
+     * information)
     */
    if( !gerber->m_Has_DCode )
    {
@@ -272,7 +266,8 @@ bool WinEDA_GerberFrame::Read_GERBER_File( wxDC*           DC,
            fn = GERBER_FullFileName;
            fn.SetExt( g_PenFilenameExt );
            wildcard.Printf( _( "Gerber DCODE files (%s)|*.%s" ),
-                             GetChars( g_PenFilenameExt ), GetChars( g_PenFilenameExt ));
+                             GetChars( g_PenFilenameExt ),
+                             GetChars( g_PenFilenameExt ) );
            wildcard += AllFilesWildcard;
            wxFileDialog dlg( this, _( "Load GERBER DCODE File" ),

--- a/gerbview/reglage.cpp
+++ b/gerbview/reglage.cpp
-/**********************************************/
+/***************/
-/* GERBVIEW - Gestion des Options et Reglages */
+/* reglage.cpp */
-/**********************************************/
+/***************/
-/*	 Fichier reglage.cpp 	*/
 /*
 * Options for file extensions
@@ -16,13 +14,12 @@
 #include "pcbplot.h"
 #include "protos.h"
-/***********/
-enum {
+enum
+{
    ID_SAVE_CFG = 1000
 };
-/* Routines Locales */
 class WinEDA_ConfigFrame : public wxDialog
 {
@@ -36,7 +33,6 @@ private:
    WinEDA_EnterText*   TextPhotoExt;
    WinEDA_EnterText*   TextPenExt;
-    // Constructor and destructor
 public:
    WinEDA_ConfigFrame( WinEDA_GerberFrame* parent, const wxPoint& pos );
    ~WinEDA_ConfigFrame() { };
@@ -48,7 +44,8 @@ private:
    DECLARE_EVENT_TABLE()
 };
-/* Construction de la table des evenements pour WinEDA_ConfigFrame */
 BEGIN_EVENT_TABLE( WinEDA_ConfigFrame, wxDialog )
    EVT_BUTTON( ID_SAVE_CFG, WinEDA_ConfigFrame::SaveCfg )
    EVT_BUTTON( wxID_OK, WinEDA_ConfigFrame::OnOkClick )
@@ -56,14 +53,11 @@ BEGIN_EVENT_TABLE( WinEDA_ConfigFrame, wxDialog )
 END_EVENT_TABLE()
-/*****************************************************************/
-void WinEDA_GerberFrame::InstallConfigFrame( const wxPoint& pos )
-/*****************************************************************/
 /** Function InstallConfigFrame
-  * install the dialog box to configure some gerbview options
+ * install the dialog box to configure some gerbview options
-  * manly the default file extensions
+ * mainly the default file extensions
 */
+void WinEDA_GerberFrame::InstallConfigFrame( const wxPoint& pos )
 {
    WinEDA_ConfigFrame* CfgFrame = new WinEDA_ConfigFrame( this, pos );
@@ -72,19 +66,17 @@ void WinEDA_GerberFrame::InstallConfigFrame( const wxPoint& pos )
 }
-/************************************************************/
 WinEDA_ConfigFrame::WinEDA_ConfigFrame( WinEDA_GerberFrame* parent,
                                        const wxPoint&      framepos ) :
    wxDialog( parent, -1, wxEmptyString, framepos, wxSize( 300, 180 ),
              wxDEFAULT_DIALOG_STYLE | wxFRAME_FLOAT_ON_PARENT )
-/************************************************************/
 {
    const int LEN_EXT = 100;
    wxString  title;
    m_Parent = parent;
-	/* Shows the config filename currently used : */
+    /* Shows the config filename currently used : */
    title = _( "from " ) + wxGetApp().m_CurrentOptionFile;
    SetTitle( title );
@@ -132,9 +124,7 @@ WinEDA_ConfigFrame::WinEDA_ConfigFrame( WinEDA_GerberFrame* parent,
 }
-/******************************************************************/
 void WinEDA_ConfigFrame::OnOkClick( wxCommandEvent& WXUNUSED (event) )
-/******************************************************************/
 {
    g_DrillFilenameExt = TextDrillExt->GetValue();
    g_PhotoFilenameExt = TextPhotoExt->GetValue();
@@ -144,17 +134,13 @@ void WinEDA_ConfigFrame::OnOkClick( wxCommandEvent& WXUNUSED (event) )
 }
-/******************************************************************/
 void WinEDA_ConfigFrame::OnCancelClick( wxCommandEvent& WXUNUSED (event) )
-/******************************************************************/
 {
    EndModal( -1 );
 }
-/******************************************************/
 void WinEDA_ConfigFrame::SaveCfg( wxCommandEvent& event )
-/******************************************************/
 {
    m_Parent->Update_config();
 }
--- a/gerbview/rs274d.cpp
+++ b/gerbview/rs274d.cpp
--- a/gerbview/rs274x.cpp
+++ b/gerbview/rs274x.cpp
--- a/gerbview/select_layers_to_pcb.cpp
+++ b/gerbview/select_layers_to_pcb.cpp
--- a/gerbview/tool_gerber.cpp
+++ b/gerbview/tool_gerber.cpp
--- a/gerbview/tracepcb.cpp
+++ b/gerbview/tracepcb.cpp
--- a/gerbview/wxGerberFrame.h
+++ b/gerbview/wxGerberFrame.h
 /***********************************************************/
-/*                      wxGerberStruct.h:                     */
+/*                   wxGerberStruct.h:                     */
 /***********************************************************/
 #ifndef  WX_GERBER_STRUCT_H
@@ -58,7 +58,7 @@ public:
    void         OnLeftClick( wxDC* DC, const wxPoint& MousePos );
    void         OnLeftDClick( wxDC* DC, const wxPoint& MousePos );
    bool         OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu );
-    int          BestZoom();    // Retourne le meilleur zoom
+    int          BestZoom();
    void         OnSelectOptionToolbar( wxCommandEvent& event );
    void         OnHotKey( wxDC* DC, int hotkey, EDA_BaseStruct* DrawStruct );
@@ -176,7 +176,6 @@ public:
    void         CopyDCodesSizeToItems();
    void         Liste_D_Codes( wxDC* DC );
-    /* Fonctions specifiques */
    void         Trace_Gerber( wxDC* DC, int draw_mode, int printmasklayer );
    // Copper texts