Finished code cleaning about ratsnets calculations and handling.

Minor others changes.

3d-viewer/3d_canvas.cpp

@@ -474,6 +474,7 @@ void Pcb3D_GLCanvas::OnPaint( wxPaintEvent& event )
 /*************************************************/
 {
     wxPaintDC dc( this );
+
     // Set the OpenGL viewport according to the client size of this canvas.
     // This is done here rather than in a wxSizeEvent handler because our
     // OpenGL rendering context (and thus viewport setting) is used with
@@ -482,13 +483,12 @@ void Pcb3D_GLCanvas::OnPaint( wxPaintEvent& event )
     // is wrong when next another canvas is repainted.
     const wxSize ClientSize = GetClientSize();
 
-    glViewport(0, 0, ClientSize.x, ClientSize.y);
+    glViewport( 0, 0, ClientSize.x, ClientSize.y );
     Redraw();
     event.Skip();
 }
 
 
-
 /***********************************************************/
 void Pcb3D_GLCanvas::OnEraseBackground( wxEraseEvent& event )
 /***********************************************************/
@@ -627,13 +627,26 @@ void Pcb3D_GLCanvas::TakeScreenshot( wxCommandEvent& event )
     }
 
     Redraw( true );
-    wxSize     image_size = GetClientSize();
-    wxClientDC dc( this );
-    wxBitmap   bitmap( image_size.x, image_size.y );
-    wxMemoryDC memdc;
-    memdc.SelectObject( bitmap );
-    memdc.Blit( 0, 0, image_size.x, image_size.y, &dc, 0, 0 );
-    memdc.SelectObject( wxNullBitmap );
+
+    struct vieport_params
+    {
+        GLint originx;
+        GLint originy;
+        GLint x;
+        GLint y;
+    } viewport;
+
+    glGetIntegerv( GL_VIEWPORT, (GLint*) &viewport );
+
+    unsigned char* pixelbuffer = (unsigned char*) malloc( 3 * viewport.x * viewport.y );
+    glReadPixels( 0, 0, viewport.x, viewport.y, GL_RGB, GL_UNSIGNED_BYTE, pixelbuffer );
+
+    wxImage        image( viewport.x, viewport.y );
+
+    image.SetData( pixelbuffer );
+    image = image.Mirror();
+    image = image.Rotate90().Rotate90();
+    wxBitmap bitmap( image, -1 );
 
     if( event.GetId() == ID_TOOL_SCREENCOPY_TOCLIBBOARD )
     {
@@ -650,8 +663,6 @@ void Pcb3D_GLCanvas::TakeScreenshot( wxCommandEvent& event )
     }
     else
     {
-        wxImage image = bitmap.ConvertToImage();
-
         if( !image.SaveFile( FullFileName,
                              fmt_is_jpeg ? wxBITMAP_TYPE_JPEG : wxBITMAP_TYPE_PNG ) )
             wxLogError( wxT( "Can't save file" ) );

3d-viewer/3d_draw.cpp

 //////////////////////////////////////
-
 // Name:        3d_draw.cpp
 //////////////////////////////////////
 
-
-#ifdef __GNUG__
-#pragma implementation
-#pragma interface
-#endif
-
 #include "fctsys.h"
+#include "common.h"
 #include "trigo.h"
-
-
-#if !wxUSE_GLCANVAS
-#error Please set wxUSE_GLCANVAS to 1 in setup.h.
-#endif
-
 #include "pcbstruct.h"
 #include "macros.h"
 #include "drawtxt.h"
@@ -27,6 +15,11 @@
 
 #include "3d_struct.h"
 
+#if !wxUSE_GLCANVAS
+#error Please set wxUSE_GLCANVAS to 1 in setup.h.
+#endif
+
+
 static void Draw3D_FilledCircle( double posx, double posy,
                                  double rayon, double hole_rayon, double zpos );
 static void Draw3D_FilledSegment( double startx, double starty,
@@ -489,6 +482,30 @@ void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text )
     s_Text3DZPos  = g_Parm_3D_Visu.m_LayerZcoord[layer];
     s_Text3DWidth = text->m_Width * g_Parm_3D_Visu.m_BoardScale;
     glNormal3f( 0.0, 0.0, Get3DLayerSide( layer ) );
+    if( text->m_MultilineAllowed )
+    {
+        wxPoint        pos  = text->m_Pos;
+        wxArrayString* list = wxStringSplit( text->m_Text, '\n' );
+        wxPoint        offset;
+
+        offset.y = text->GetInterline();
+
+        RotatePoint( &offset, text->m_Orient );
+        for( unsigned i = 0; i<list->Count(); i++ )
+        {
+            wxString txt = list->Item( i );
+            DrawGraphicText( NULL, NULL, pos, (EDA_Colors) color,
+                     txt, text->m_Orient, text->m_Size,
+                     text->m_HJustify, text->m_VJustify,
+                     text->m_Width, text->m_Italic,
+                     true,
+                     Draw3dTextSegm );
+            pos += offset;
+        }
+
+        delete (list);
+    }
+    else
         DrawGraphicText( NULL, NULL, text->m_Pos, (EDA_Colors) color,
                      text->m_Text, text->m_Orient, text->m_Size,
                      text->m_HJustify, text->m_VJustify,

3d-viewer/3d_toolbar.cpp

@@ -31,7 +31,7 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar()
     m_HToolBar->AddTool( ID_RELOAD3D_BOARD, wxEmptyString,
                          wxBitmap( import3d_xpm ),
                          _( "Reload board" ) );
-#ifdef __WINDOWS__  // do not work properly under linux
+#if (defined(__WINDOWS__) || defined(__APPLE__))  // do not work properly under linux
     m_HToolBar-> AddSeparator();
 
     m_HToolBar->AddTool( ID_TOOL_SCREENCOPY_TOCLIBBOARD, wxEmptyString,

CHANGELOG.txt

@@ -4,6 +4,14 @@ KiCad ChangeLog 2009
 Please add newer entries at the top, list the date and your name with
 email address.
 
+
+2009-may-28 UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
+================================================================================
+++Pcbnew:
+    Finished code cleaning about ratsnets calculations and handling
+    Obscure code removed ( I hope)
+    Better names for some members of BOARD class.
+
 2009-may-24 UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
 ================================================================================
 ++Pcbnew:

common/about_kicad.cpp

@@ -8,7 +8,7 @@
 #include "appl_wxstruct.h"
 
 
-#define BUILD_VERSION wxT("(20090513-unstable)")
+#define BUILD_VERSION wxT("(20090525-unstable)")
 
 wxString g_BuildVersion
 

gerbview/initpcb.cpp

@@ -60,8 +60,6 @@ bool WinEDA_GerberFrame::Clear_Pcb( bool query )
     GetBoard()->m_BoundaryBox.SetOrigin( 0, 0 );
     GetBoard()->m_BoundaryBox.SetSize( 0, 0 );
     GetBoard()->m_Status_Pcb = 0;
-    GetBoard()->m_NbLoclinks = 0;
-    GetBoard()->m_NbLinks    = 0;
     GetBoard()->m_NbNodes     = 0;
     GetBoard()->m_NbNoconnect = 0;
 

include/wxPcbStruct.h

@@ -281,7 +281,7 @@ public:
     void                     Compile_Ratsnest( wxDC* DC, bool affiche );    /* Recalcul complet du chevelu */
     void                     ReCompile_Ratsnest_After_Changes( wxDC* DC );
     int                      Test_1_Net_Ratsnest( wxDC* DC, int net_code );
-    char*                    build_ratsnest_module( wxDC* DC, MODULE* Module );
+    void                     build_ratsnest_module( wxDC* DC, MODULE* Module );
     void                     trace_ratsnest_module( wxDC* DC );
     void                     Build_Board_Ratsnest( wxDC* DC );
     void                     DrawGeneralRatsnest( wxDC* DC, int net_code = 0 );
@@ -521,7 +521,14 @@ public:
 
     /* Fonctions specifiques */
     MODULE*          ListAndSelectModuleName();
-    void             Liste_Equipot( wxCommandEvent& event );
+
+    /** Function ListNetsAndSelect
+     * called by a command event
+     * displays the sorted list of nets in a dialog frame
+     * If a net is selected, it is hightlighted
+     */
+    void             ListNetsAndSelect( wxCommandEvent& event );
+
     void             Swap_Layers( wxCommandEvent& event );
     void             Install_Test_DRC_Frame( wxDC* DC );
 

pcbnew/ar_protos.h

@@ -69,7 +69,7 @@ int CalcDist( int, int, int ,int );
 
 /* BOARD.CPP */
 bool ComputeMatriceSize(WinEDA_BasePcbFrame * frame, int pas_route);
-int Build_Work(BOARD * Pcb, RATSNEST_ITEM* pt_chevelus);
+int Build_Work(BOARD * Pcb);
 void PlaceCells(BOARD * Pcb, int net_code, int flag = 0);
 
 BoardCell GetCell( int, int, int );

pcbnew/autoplac.cpp

@@ -61,10 +61,6 @@ static void     TracePenaliteRectangle( BOARD* Pcb, int ux0, int uy0, int ux1, i
                                         int marge, int Penalite, int masque_layer );
 static MODULE*  PickModule( WinEDA_PcbFrame* pcbframe, wxDC* DC );
 
-/* variables importees */
-extern RATSNEST_ITEM* local_liste_chevelu;        // adresse de base du buffer des chevelus locaux
-extern int      nb_local_chevelu;           // nbr de links du module en deplacement
-
 
 /********************************************************************************/
 void WinEDA_PcbFrame::AutoPlaceModule( MODULE* Module, int place_mode, wxDC* DC )
@@ -866,22 +862,18 @@ float WinEDA_PcbFrame::Compute_Ratsnest_PlaceModule( wxDC* DC )
  *  penalite pour les inclinaisons se rapprochant de 45 degre
  */
 {
-    RATSNEST_ITEM* pt_local_chevelu;
-    int      ii;
-    float    cout, icout;
+    double    cout, icout;
     int      ox, oy;
     int      fx, fy;
     int      dx, dy;
 
     if( (GetBoard()->m_Status_Pcb & RATSNEST_ITEM_LOCAL_OK) == 0 )
         return -1;
-
-    pt_local_chevelu = local_liste_chevelu;
-    ii = nb_local_chevelu;
     cout = 0;
 
-    while( ii-- > 0 )
+    for( unsigned ii = 0; ii < GetBoard()->m_LocalRatsnest.size(); ii++ )
     {
+        RATSNEST_ITEM* pt_local_chevelu = &GetBoard()->m_LocalRatsnest[ii];
         if( !(pt_local_chevelu->m_Status & LOCAL_RATSNEST_ITEM) )
         {
             ox = pt_local_chevelu->m_PadStart->GetPosition().x - g_Offset_Module.x;
@@ -913,11 +905,9 @@ float WinEDA_PcbFrame::Compute_Ratsnest_PlaceModule( wxDC* DC )
             icout  = sqrt( icout );
             cout  += icout; /* cout total = somme des couts de chaque chevelu */
         }
-
-        pt_local_chevelu++;
     }
 
-    return cout;
+    return (float)cout;
 }
 
 
@@ -1102,8 +1092,7 @@ static MODULE* PickModule( WinEDA_PcbFrame* pcbframe, wxDC* DC )
 {
     MODULE** BaseListeModules, ** pt_Dmod;
     MODULE*  Module = NULL, * AltModule = NULL;
-    RATSNEST_ITEM* pt_local_chevelu;
-    int      NbModules, ii;
+    int      NbModules;
 
     BaseListeModules = GenListeModules( pcbframe->GetBoard(), &NbModules );
     if( BaseListeModules == NULL )
@@ -1127,13 +1116,10 @@ static MODULE* PickModule( WinEDA_PcbFrame* pcbframe, wxDC* DC )
         pcbframe->build_ratsnest_module( DC, *pt_Dmod );
 
         /* calcul du nombre de chevelus externes */
-        pt_local_chevelu = local_liste_chevelu;
-        ii = nb_local_chevelu;
-        while( ii-- > 0 )
+        for( unsigned ii = 0; ii < pcbframe->GetBoard()->m_LocalRatsnest.size(); ii++ )
         {
-            if( (pt_local_chevelu->m_Status & LOCAL_RATSNEST_ITEM) == 0 )
+            if( (pcbframe->GetBoard()->m_LocalRatsnest[ii].m_Status & LOCAL_RATSNEST_ITEM) == 0 )
                 (*pt_Dmod)->flag++;
-            pt_local_chevelu++;
         }
     }
 

pcbnew/autorout.cpp

@@ -33,8 +33,7 @@ void WinEDA_PcbFrame::Autoroute( wxDC* DC, int mode )
 /********************************************************/
 /* init board, route traces*/
 {
-    int      ii, start, stop;
-    RATSNEST_ITEM* ptmp;
+    int      start, stop;
     MODULE*  Module = NULL;
     D_PAD*   Pad    = NULL;
     int      autoroute_net_code = -1;
@@ -94,9 +93,9 @@ void WinEDA_PcbFrame::Autoroute( wxDC* DC, int mode )
         Compile_Ratsnest( DC, TRUE );
 
     /* Placement du flag CH_ROUTE_REQ sur les chevelus demandes */
-    ptmp = (RATSNEST_ITEM*) GetBoard()->m_Ratsnest;
-    for( ii = GetBoard()->GetNumRatsnests(); ii > 0; ii--, ptmp++ )
+    for( unsigned ii = 0; ii < GetBoard()->GetRatsnestsCount(); ii++ )
     {
+            RATSNEST_ITEM* ptmp = &GetBoard()->m_FullRatsnest[ii];
         ptmp->m_Status &= ~CH_ROUTE_REQ;
 
         switch( mode )
@@ -130,8 +129,6 @@ void WinEDA_PcbFrame::Autoroute( wxDC* DC, int mode )
         }
     }
 
-    ptmp = (RATSNEST_ITEM*) GetBoard()->m_Ratsnest;
-
     start = time( NULL );
 
     /* Calcul du pas de routage fixe a 5 mils et plus */
@@ -162,7 +159,7 @@ void WinEDA_PcbFrame::Autoroute( wxDC* DC, int mode )
     PlaceCells( GetBoard(), -1, FORCE_PADS );
 
     /* Construction de la liste des pistes a router */
-    Build_Work( GetBoard(), ptmp );
+    Build_Work( GetBoard() );
 
     // DisplayBoard(DrawPanel, DC);
 
@@ -190,19 +187,12 @@ void WinEDA_PcbFrame::Reset_Noroutable( wxDC* DC )
  *  Si ce flag est a 1 il n'est pas reroute
  */
 {
-    int      ii;
-    RATSNEST_ITEM* pt_rats;
-
     if( (GetBoard()->m_Status_Pcb & LISTE_RATSNEST_ITEM_OK )== 0 )
         Compile_Ratsnest( DC, TRUE );
 
-    pt_rats = (RATSNEST_ITEM*) GetBoard()->m_Ratsnest;
-    if( pt_rats == NULL )
-        return;
-
-    for( ii = GetBoard()->GetNumRatsnests(); ii > 0; ii--, pt_rats++ )
+    for( unsigned ii = 0; ii < GetBoard()->GetRatsnestsCount(); ii++ )
     {
-        pt_rats->m_Status &= ~CH_UNROUTABLE;
+        GetBoard()->m_FullRatsnest[ii].m_Status &= ~CH_UNROUTABLE;
     }
 }
 

pcbnew/board.cpp

@@ -14,7 +14,7 @@
 /* routines externes : */
 
 /* Routines definies ici: */
-int         Build_Work( BOARD* Pcb, RATSNEST_ITEM* pt_base_chevelu );
+int         Build_Work( BOARD* Pcb );
 void        PlaceCells( BOARD* Pcb, int net_code, int flag );
 int         InitBoard();
 BoardCell   GetCell( int, int, int );
@@ -336,12 +336,11 @@ void PlaceCells( BOARD* aPcb, int net_code, int flag )
 
 
 /******************************************************/
-int Build_Work( BOARD* Pcb, RATSNEST_ITEM* pt_base_chevelu )
+int Build_Work( BOARD* Pcb )
 /*****************************************************/
 /* Build liste conn */
 {
-    int      ii;
-    RATSNEST_ITEM* pt_rats = pt_base_chevelu;
+    RATSNEST_ITEM* pt_rats;
     D_PAD*   pt_pad;
     int      r1, r2, c1, c2, current_net_code;
     RATSNEST_ITEM* pt_ch;
@@ -350,8 +349,9 @@ int Build_Work( BOARD* Pcb, RATSNEST_ITEM* pt_base_chevelu )
 
     InitWork(); /* clear work list */
     Ntotal = 0;
-    for( ii = Pcb->GetNumRatsnests(); ii > 0; ii--, pt_rats++ )
+    for( unsigned ii = 0;Pcb->GetRatsnestsCount(); ii++ )
     {
+        pt_rats = &Pcb->m_FullRatsnest[ii];
         /* On ne route que les chevelus actifs et routables */
         if( (pt_rats->m_Status & CH_ACTIF) == 0 )
             continue;

pcbnew/class_board.h

@@ -82,12 +82,9 @@ private:
 public:
     WinEDA_BasePcbFrame*    m_PcbFrame;         // Window de visualisation
     EDA_Rect                m_BoundaryBox;      // Board size and position
-    int                     m_Unused;
     int                     m_Status_Pcb;       // Flags used in ratsnet calculation and update
     EDA_BoardDesignSettings* m_BoardSettings;   // Link to current design settings
     int             m_NbNodes;                  // Active pads (pads attached to a net ) count
-    int             m_NbLinks;                  // Ratsnest count
-    int             m_NbLoclinks;               // Number of ratsnests from mouse cursor to pads to show while creating a track
     int             m_NbNoconnect;              // Active ratsnet count (rastnests not alraedy connected by tracks)
 
     DLIST<BOARD_ITEM> m_Drawings;               // linked list of lines & texts
@@ -98,8 +95,9 @@ public:
     std::vector<D_PAD*> m_Pads;                 // Entry for a sorted pad list (used in ratsnest calculations)
     NETINFO_LIST*   m_NetInfo;                  // nets info list (name, design constraints ..
 
-    RATSNEST_ITEM*        m_Ratsnest;                 // Rastnest list
-    RATSNEST_ITEM*        m_LocalRatsnest;            // Rastnest list used while moving a footprint
+    std::vector<RATSNEST_ITEM>  m_FullRatsnest;             // Rastnest list for the BOARD
+    std::vector<RATSNEST_ITEM>  m_LocalRatsnest;            /* Rastnest list relative to a given footprint
+(used while moving a footprint) */
 
     ZONE_CONTAINER* m_CurrentZoneContour;     	// zone contour currently in progress
 
@@ -233,27 +231,26 @@ public:
     /* Routines de calcul des nombres de segments pistes et zones */
     int     GetNumSegmTrack();
     int     GetNumSegmZone();
-    int     GetNumNoconnect();    // retourne le nombre de connexions manquantes
+    unsigned     GetNoconnectCount();    // retourne le nombre de connexions manquantes
 
     /**
      * Function GetNumRatsnests
      * @return int - The number of rats
      */
-    int     GetNumRatsnests()
+    unsigned     GetRatsnestsCount()
     {
-        return m_NbLinks;
+        return m_FullRatsnest.size();
     }
 
-    int     GetNumNodes();        // retourne le nombre de pads a netcode > 0
+    unsigned     GetNodesCount();        // retourne le nombre de pads a netcode > 0
 
     /** Function Build_Pads_Full_List
      *  Create the pad list
      * initialise:
      *   m_Pads (list of pads)
-     *   m_NbNodes = 0
      * set m_Status_Pcb = LISTE_PAD_OK;
-     * and clear for all pads the m_SubRatsnest member;
-     * delete ( free memory) m_Pcb->m_Ratsnest and set m_Pcb->m_Ratsnest to NULL
+     * and clear for all pads in list the m_SubRatsnest member;
+     * clear m_Pcb->m_FullRatsnest
      */
     void Build_Pads_Full_List();
 

pcbnew/class_netinfo.h

@@ -81,10 +81,10 @@ public:
      */
     void Append( NETINFO_ITEM* aNewElement );
 
-    /** Function Clear
+    /** Function DeleteData
      * delete the list of nets (and free memory)
      */
-    void Clear();
+    void DeleteData();
 
     /** Function BuildListOfNets
      * initialize the list of NETINFO_ITEM m_NetBuffer
@@ -112,9 +112,8 @@ public:
     int                          m_NbNoconn;        // Ratsnets remaining to route count
     int                          m_ForceWidth;      // specific width (O = default width)
     std::vector <D_PAD*>         m_ListPad;         // List of pads connected to this net
-    RATSNEST_ITEM*               m_RatsnestStart;   // pointeur sur debut de liste ratsnests du net
-    RATSNEST_ITEM*               m_RatsnestEnd;     // pointeur sur fin de liste ratsnests du net
-    std::vector <RATSNEST_ITEM*> m_ListRatsnest;    // List of Ratsnests for this net
+    unsigned                     m_RatsnestStart;   // debut de liste ratsnests du net (included)
+    unsigned                     m_RatsnestEnd;     // fin de liste ratsnests du net (excluded)
 
     NETINFO_ITEM( BOARD_ITEM* aParent );
     ~NETINFO_ITEM();

pcbnew/class_netinfo_item.cpp

@@ -19,8 +19,8 @@ NETINFO_ITEM::NETINFO_ITEM( BOARD_ITEM* aParent )
     SetNet( 0 );
     m_NbNodes = m_NbLink = m_NbNoconn = 0;
     m_ForceWidth    = 0;
-    m_RatsnestStart = NULL; // pointeur sur debut de liste ratsnests du net
-    m_RatsnestEnd   = NULL; // pointeur sur fin de liste ratsnests du net
+    m_RatsnestStart = 0; // debut de liste ratsnests du net
+    m_RatsnestEnd   = 0; // fin de liste ratsnests du net
 }
 
 

pcbnew/class_netinfolist.cpp

@@ -19,7 +19,7 @@ NETINFO_LIST::NETINFO_LIST( BOARD* aParent )
 
 NETINFO_LIST::~NETINFO_LIST()
 {
-    Clear();
+    DeleteData();
 }
 
 
@@ -35,10 +35,10 @@ NETINFO_ITEM* NETINFO_LIST::GetItem( int aNetcode )
 }
 
 
-/** Function Clear
+/** Function DeleteData
  * delete the list of nets (and free memory)
  */
-void NETINFO_LIST::Clear()
+void NETINFO_LIST::DeleteData()
 {
     for( unsigned ii = 0; ii < GetCount(); ii++ )
         delete m_NetBuffer[ii];
@@ -83,7 +83,7 @@ void NETINFO_LIST::BuildListOfNets()
     int nodes_count = 0;
     NETINFO_ITEM* net_item;
 
-    Clear();        // Remove all nets info and free memory
+    DeleteData();        // Remove all nets info and free memory
 
     // Create and add the "unconnected net"
     net_item = new NETINFO_ITEM( m_Parent );
@@ -135,13 +135,12 @@ void BOARD::Build_Pads_Full_List()
 /**********************************/
 
 /** Function Build_Pads_Full_List
- *  Create the pad list
+ *  Create the pad list, sorted by net names
  * initialise:
  *   m_Pads (list of pads)
- *   m_NbNodes = 0
  * set m_Status_Pcb = LISTE_PAD_OK;
- * and clear for all pads the m_SubRatsnest member;
- * delete ( free memory) m_Pcb->m_Ratsnest and set m_Pcb->m_Ratsnest to NULL
+ * also clear m_Pcb->m_FullRatsnest that could have bad data
+ *   (m_Pcb->m_FullRatsnest uses pointer to pads)
  */
 {
     if( m_Status_Pcb & LISTE_PAD_OK )
@@ -149,8 +148,7 @@ void BOARD::Build_Pads_Full_List()
 
     // empty the old list
     m_Pads.clear();
-
-    m_NbNodes = 0;
+    m_FullRatsnest.clear();
 
     /* Clear variables used in rastnest computation */
     for( MODULE* module = m_Modules;  module;  module = module->Next() )
@@ -161,20 +159,11 @@ void BOARD::Build_Pads_Full_List()
 
             pad->SetSubRatsnest( 0 );
             pad->SetParent( module );
-
-            if( pad->GetNet() )
-                m_NbNodes++;
         }
     }
 
     // Sort pad list per net
     sort( m_Pads.begin(), m_Pads.end(), PadlistSortByNetnames );
 
-    if( m_Ratsnest )
-    {
-        MyFree( m_Ratsnest );
-        m_Ratsnest = NULL;
-    }
-
     m_Status_Pcb = LISTE_PAD_OK;
 }

pcbnew/class_track.cpp

@@ -886,10 +886,10 @@ void TRACK::DisplayInfo( WinEDA_DrawFrame* frame )
     {
         /* Display NetName pour les segments de piste type cuivre */
 
-        NETINFO_ITEM* equipot = board->FindNet( GetNet() );
+        NETINFO_ITEM* net = board->FindNet( GetNet() );
 
-        if( equipot )
-            msg = equipot->GetNetname();
+        if( net )
+            msg = net->GetNetname();
         else
             msg = wxT( "<noname>" );
 

pcbnew/connect.cpp

@@ -363,7 +363,7 @@ void WinEDA_BasePcbFrame::test_1_net_connexion( wxDC* DC, int net_code )
 
     /* Display results */
     msg.Printf( wxT( "links %d nc %d  net:nc %d" ),
-                m_Pcb->m_NbLinks, m_Pcb->GetNumNoconnect(),
+                m_Pcb->GetRatsnestsCount(), m_Pcb->GetNoconnectCount(),
                 nb_net_noconnect );
 
     Affiche_Message( msg );

pcbnew/drc.cpp

@@ -302,12 +302,12 @@ void DRC::testUnconnected()
         m_mainWindow->Compile_Ratsnest( &dc, TRUE );
     }
 
-    if( m_pcb->m_Ratsnest == NULL )
+    if( m_pcb->GetRatsnestsCount() == 0 )
         return;
 
-    RATSNEST_ITEM* rat = m_pcb->m_Ratsnest;
-    for( int i = 0;  i<m_pcb->GetNumRatsnests();  ++i, ++rat )
+    for( unsigned ii = 0; ii < m_pcb->GetRatsnestsCount();  ++ii )
     {
+        RATSNEST_ITEM* rat = &m_pcb->m_FullRatsnest[ii];
         if( (rat->m_Status & CH_ACTIF) == 0 )
             continue;
 

pcbnew/editrack-part2.cpp

@@ -43,8 +43,7 @@ void WinEDA_PcbFrame::Ratsnest_On_Off( wxDC* DC )
 
 /* Affiche ou efface le chevelu selon l'etat du bouton d'appel */
 {
-    int      ii;
-    RATSNEST_ITEM* pt_chevelu;
+    unsigned      ii;
 
     if( (GetBoard()->m_Status_Pcb & LISTE_RATSNEST_ITEM_OK) == 0 )
     {
@@ -55,24 +54,23 @@ void WinEDA_PcbFrame::Ratsnest_On_Off( wxDC* DC )
 
     DrawGeneralRatsnest( DC, 0 ); /* effacement eventuel du chevelu affiche */
 
-    pt_chevelu = GetBoard()->m_Ratsnest;
-    if( pt_chevelu == NULL )
+    if( GetBoard()->GetRatsnestsCount() == 0 )
         return;
 
     if( g_Show_Ratsnest )
     {
-        for( ii = GetBoard()->GetNumRatsnests(); ii > 0; pt_chevelu++, ii-- )
+        for( ii = 0; ii < GetBoard()->GetRatsnestsCount(); ii++ )
         {
-            pt_chevelu->m_Status |= CH_VISIBLE;
+            GetBoard()->m_FullRatsnest[ii].m_Status |= CH_VISIBLE;
         }
 
         DrawGeneralRatsnest( DC, 0 );
     }
     else
     {
-        for( ii = GetBoard()->GetNumRatsnests(); ii > 0; pt_chevelu++, ii-- )
+        for( ii = 0; ii < GetBoard()->GetRatsnestsCount(); ii++ )
         {
-            pt_chevelu->m_Status &= ~CH_VISIBLE;
+            GetBoard()->m_FullRatsnest[ii].m_Status &= ~CH_VISIBLE;
         }
     }
 }
@@ -344,18 +342,14 @@ void WinEDA_PcbFrame::Show_1_Ratsnest( EDA_BaseStruct* item, wxDC* DC )
  *  Efface le chevelu affiche si aucun module ou pad n'est selectionne
  */
 {
-    int      ii;
-    RATSNEST_ITEM* pt_chevelu;
     D_PAD*   pt_pad = NULL;
     MODULE*  Module = NULL;
 
     if( g_Show_Ratsnest )
-        return; // Deja Affich�
+        return;
 
     if( (GetBoard()->m_Status_Pcb & LISTE_RATSNEST_ITEM_OK) == 0 )
-    {
         Compile_Ratsnest( DC, TRUE );
-    }
 
     if( item )
     {
@@ -368,24 +362,18 @@ void WinEDA_PcbFrame::Show_1_Ratsnest( EDA_BaseStruct* item, wxDC* DC )
         if( pt_pad ) /* Affichage du chevelu du net correspondant */
         {
             pt_pad->DisplayInfo( this );
-            pt_chevelu = (RATSNEST_ITEM*) GetBoard()->m_Ratsnest;
-            for( ii = GetBoard()->GetNumRatsnests(); ii > 0; pt_chevelu++, ii-- )
+            for( unsigned ii = 0; ii < GetBoard()->GetRatsnestsCount(); ii++ )
             {
-                if( pt_chevelu->GetNet() == pt_pad->GetNet() )
+                RATSNEST_ITEM* net = &GetBoard()->m_FullRatsnest[ii];
+                if( net->GetNet() == pt_pad->GetNet() )
                 {
-                    if( (pt_chevelu->m_Status & CH_VISIBLE) != 0 )
+                    if( (net->m_Status & CH_VISIBLE) != 0 )
                         continue;
-                    pt_chevelu->m_Status |= CH_VISIBLE;
-                    if( (pt_chevelu->m_Status & CH_ACTIF) == 0 )
+                    net->m_Status |= CH_VISIBLE;
+                    if( (net->m_Status & CH_ACTIF) == 0 )
                         continue;
 
-                    GRSetDrawMode( DC, GR_XOR );
-                    GRLine( &DrawPanel->m_ClipBox, DC, pt_chevelu->m_PadStart->m_Pos.x,
-                            pt_chevelu->m_PadStart->m_Pos.y,
-                            pt_chevelu->m_PadEnd->m_Pos.x,
-                            pt_chevelu->m_PadEnd->m_Pos.y,
-                            0,
-                            g_DesignSettings.m_RatsnestColor );
+                    net->Draw( DrawPanel, DC, GR_XOR, wxPoint(0,0) );
                 }
             }
         }
@@ -407,26 +395,19 @@ void WinEDA_PcbFrame::Show_1_Ratsnest( EDA_BaseStruct* item, wxDC* DC )
                 pt_pad = Module->m_Pads;
                 for( ; pt_pad != NULL; pt_pad = (D_PAD*) pt_pad->Next() )
                 {
-                    pt_chevelu = (RATSNEST_ITEM*) GetBoard()->m_Ratsnest;
-                    for( ii = GetBoard()->GetNumRatsnests(); ii > 0; pt_chevelu++, ii-- )
+                    for( unsigned ii = 0; ii < GetBoard()->GetRatsnestsCount(); ii++ )
                     {
-                        if( (pt_chevelu->m_PadStart == pt_pad)
-                           || (pt_chevelu->m_PadEnd == pt_pad) )
+                        RATSNEST_ITEM* net = &GetBoard()->m_FullRatsnest[ii];
+                        if( (net->m_PadStart == pt_pad) || (net->m_PadEnd == pt_pad) )
                         {
-                            if( pt_chevelu->m_Status & CH_VISIBLE )
+                            if( net->m_Status & CH_VISIBLE )
                                 continue;
 
-                            pt_chevelu->m_Status |= CH_VISIBLE;
-                            if( (pt_chevelu->m_Status & CH_ACTIF) == 0 )
+                            net->m_Status |= CH_VISIBLE;
+                            if( (net->m_Status & CH_ACTIF) == 0 )
                                 continue;
 
-                            GRSetDrawMode( DC, GR_XOR );
-                            GRLine( &DrawPanel->m_ClipBox, DC, pt_chevelu->m_PadStart->m_Pos.x,
-                                    pt_chevelu->m_PadStart->m_Pos.y,
-                                    pt_chevelu->m_PadEnd->m_Pos.x,
-                                    pt_chevelu->m_PadEnd->m_Pos.y,
-                                    0,
-                                    g_DesignSettings.m_RatsnestColor );
+                            net->Draw( DrawPanel, DC, GR_XOR, wxPoint(0,0) );
                         }
                     }
                 }
@@ -436,15 +417,13 @@ void WinEDA_PcbFrame::Show_1_Ratsnest( EDA_BaseStruct* item, wxDC* DC )
         }
     }
 
-    /* Effacement complet des selections
-     *  si aucun pad ou module n'a ete localise */
+    /* Effacement complet des selections  si aucun pad ou module n'a ete localise */
     if( (pt_pad == NULL) && (Module == NULL) )
     {
         DrawGeneralRatsnest( DC );
-        pt_chevelu = (RATSNEST_ITEM*) GetBoard()->m_Ratsnest;
 
-        for( ii = GetBoard()->GetNumRatsnests(); (ii > 0) && pt_chevelu; pt_chevelu++, ii-- )
-            pt_chevelu->m_Status &= ~CH_VISIBLE;
+        for( unsigned ii = 0; ii < GetBoard()->GetRatsnestsCount(); ii++ )
+            GetBoard()->m_FullRatsnest[ii].m_Status &= ~CH_VISIBLE;
     }
 }
 
@@ -453,27 +432,16 @@ void WinEDA_PcbFrame::Show_1_Ratsnest( EDA_BaseStruct* item, wxDC* DC )
 void WinEDA_PcbFrame::Affiche_PadsNoConnect( wxDC* DC )
 /*****************************************************/
 
-/* Met en surbrillance les pads non encore connectes ( correspondants aux
- *  chevelus actifs
+/* Hight light the unconnected pads
  */
 {
-    int      ii;
-    RATSNEST_ITEM* pt_chevelu;
-    D_PAD*   pt_pad;
-
-    pt_chevelu = (RATSNEST_ITEM*) GetBoard()->m_Ratsnest;
-    for( ii = GetBoard()->GetNumRatsnests(); ii > 0; pt_chevelu++, ii-- )
+    for( unsigned ii = 0; ii < GetBoard()->GetRatsnestsCount(); ii++ )
     {
-        if( (pt_chevelu->m_Status & CH_ACTIF) == 0 )
+        RATSNEST_ITEM* net = &GetBoard()->m_FullRatsnest[ii];
+        if( (net->m_Status & CH_ACTIF) == 0 )
             continue;
 
-        pt_pad = pt_chevelu->m_PadStart;
-
-        if( pt_pad )
-            pt_pad->Draw( DrawPanel, DC, GR_OR | GR_SURBRILL );
-
-        pt_pad = pt_chevelu->m_PadEnd;
-        if( pt_pad )
-            pt_pad->Draw( DrawPanel, DC, GR_OR | GR_SURBRILL );
+        net->m_PadStart->Draw( DrawPanel, DC, GR_OR | GR_SURBRILL );
+        net->m_PadEnd->Draw( DrawPanel, DC, GR_OR | GR_SURBRILL );
     }
 }

pcbnew/files.cpp

@@ -263,11 +263,12 @@ int WinEDA_PcbFrame::LoadOnePcbFile( const wxString& FullFileName, bool Append )
 
     /* Rebuild the new pad list (for drc and ratsnet control ...) */
     GetBoard()->m_Status_Pcb = 0;
-    GetBoard()->Build_Pads_Full_List();
  
-    GetBoard()->DisplayInfo( this );
     DrawPanel->Refresh( true);
 
+    Compile_Ratsnest( NULL, true );
+    GetBoard()->DisplayInfo( this );
+
     /* reset the auto save timer */
     g_SaveTime = time( NULL );
 

pcbnew/initpcb.cpp

@@ -279,10 +279,12 @@ void WinEDA_PcbFrame::Erase_Modules( bool query )
     GetBoard()->m_Modules.DeleteAll();
 
     GetBoard()->m_Status_Pcb = 0;
+    m_Pcb->m_Pads.clear();          // empty the pad list pointers
+    m_Pcb->m_NetInfo->DeleteData();
+    m_Pcb->m_FullRatsnest.clear();          // empty the pad list pointers
+    m_Pcb->m_LocalRatsnest.clear();          // empty the pad list pointers
     GetBoard()->m_NbNodes     = 0;
-    GetBoard()->m_NbLinks     = 0;
     GetBoard()->m_NbNoconnect = 0;
-    m_Pcb->m_Pads.clear();          // empty the pad list pointers
 
     GetScreen()->SetModify();
 }

pcbnew/ioascii.cpp

@@ -208,8 +208,7 @@ int WinEDA_BasePcbFrame::ReadGeneralDescrPcb( FILE* File, int* LineNum )
 
         if( strnicmp( data, "Links", 5 ) == 0 )
         {
-            data = strtok( NULL, " =\n\r" );
-            GetBoard()->m_NbLinks = atoi( data );
+            // Info only, do nothing
             continue;
         }
 
@@ -571,7 +570,7 @@ bool WinEDA_PcbFrame::WriteGeneralDescrPcb( FILE* File )
 
     // Write old format for Layer count (for compatibility with old versions of pcbnew
     fprintf( File, "Ly %8X\n", g_TabAllCopperLayerMask[NbLayers - 1] | ALL_NO_CU_LAYERS ); // For compatibility with old version of pcbnew
-    fprintf( File, "Links %d\n", GetBoard()->m_NbLinks );
+    fprintf( File, "Links %d\n", GetBoard()->GetRatsnestsCount() );
     fprintf( File, "NoConn %d\n", GetBoard()->m_NbNoconnect );
 
     /* Write Bounding box info */
@@ -872,10 +871,7 @@ int WinEDA_PcbFrame::ReadPcbFile( FILE* File, bool Append )
 
     BestZoom();
 
-#ifdef PCBNEW
-    // Build connectivity info
-    Compile_Ratsnest( NULL, TRUE );
-#endif
+    GetBoard()->m_Status_Pcb = 0;
     return 1;
 }
 

pcbnew/pcbframe.cpp

@@ -102,7 +102,7 @@ BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame )
     EVT_MENU( ID_PCB_GEN_BOM_FILE_FROM_BOARD, WinEDA_PcbFrame::RecreateBOMFileFromBoard )
 
 // menu Miscellaneous
-    EVT_MENU( ID_MENU_LIST_NETS, WinEDA_PcbFrame::Liste_Equipot )
+    EVT_MENU( ID_MENU_LIST_NETS, WinEDA_PcbFrame::ListNetsAndSelect )
     EVT_MENU( ID_PCB_GLOBAL_DELETE, WinEDA_PcbFrame::Process_Special_Functions )
     EVT_MENU( ID_MENU_PCB_CLEAN, WinEDA_PcbFrame::Process_Special_Functions )
     EVT_MENU( ID_MENU_PCB_SWAP_LAYERS,

pcbnew/pcbnew.cpp

@@ -40,11 +40,6 @@ bool g_TwoSegmentTrackBuild = TRUE;
 bool g_HightLigt_Status;
 extern PARAM_CFG_BASE* ParamCfgList[];
 
-/* A buffer used in some computations (will be removed in next cleanup code,
- * DO NOT use) */
-#define BUFMEMSIZE 256000    /* buffer size (in bytes) */
-char* adr_lowmem = NULL;
-
 int Angle_Rot_Module;
 int ModuleSegmentWidth;
 int ModuleTextWidth;
@@ -140,15 +135,6 @@ Changing extension to .brd." ),
                                           * real hotkeys in menus or tool tips */
 
 
-    /* allocation de la memoire pour le fichier et autres buffers: */
-    /* On reserve BUFMEMSIZE octets de ram pour calcul */
-    adr_lowmem = (char*) MyZMalloc( BUFMEMSIZE );   /* adresse de la zone de calcul */
-
-    if( adr_lowmem == NULL )
-    {
-        printf( "No Memory, Fatal err Memory alloc\n" );
-        return FALSE;
-    }
     frame = new WinEDA_PcbFrame( NULL, wxT( "PcbNew" ),
                                  wxPoint( 0, 0 ), wxSize( 600, 400 ) );
     frame->SetTitle( GetTitle() + wxT( " " ) + GetBuildVersion() );

pcbnew/surbrill.cpp

@@ -17,58 +17,63 @@
 
 
 /*********************************************************/
-void WinEDA_PcbFrame::Liste_Equipot( wxCommandEvent& event )
+void WinEDA_PcbFrame::ListNetsAndSelect( wxCommandEvent& event )
 /*********************************************************/
 
-/* Display a filtered list of equipot names
- *  if an equipot is selected the corresponding tracks and pads are highlighted
+/** Function ListNetsAndSelect
+ * called by a command event
+ * displays the sorted list of nets in a dialog frame
+ * If a net is selected, it is hightlighted
  */
 {
     NETINFO_ITEM* net;
-    wxString          msg;
-    WinEDA_TextFrame* List;
-    unsigned ii;
+    wxString      netFilter;
+    int           selection;
 
-    msg = wxT( "*" );
-    Get_Message( _( "Filter for net names:" ), _("Net Filter"), msg, this );
-    if( msg.IsEmpty() )
+    netFilter = wxT( "*" );
+    Get_Message( _( "Filter for net names:" ), _( "Net Filter" ), netFilter, this );
+    if( netFilter.IsEmpty() )
         return;
 
-    List = new WinEDA_TextFrame( this, _( "List Nets" ) );
+    WinEDA_TextFrame List( this, _( "List Nets" ) );
 
-    for( ii = 0; ii < GetBoard()->m_NetInfo->GetCount() ; ii++ )
+    for( unsigned ii = 0; ii < GetBoard()->m_NetInfo->GetCount(); ii++ )
     {
         net = GetBoard()->m_NetInfo->GetItem( ii );
         wxString Line;
-        if( !WildCompareString( msg, net->GetNetname(), false ) )
+        if( !WildCompareString( netFilter, net->GetNetname(), false ) )
             continue;
 
         Line.Printf( wxT( "net_code = %3.3d  [%.16s] " ), net->GetNet(),
                     net->GetNetname().GetData() );
-        List->Append( Line );
+        List.Append( Line );
     }
 
-    ii = List->ShowModal();
+    selection = List.ShowModal();
 
-    List->Destroy();
-
-    if( ii < 0 )
+    if( selection < 0 )
         return;
 
-    for( unsigned jj = 0; jj < GetBoard()->m_NetInfo->GetCount() ; jj++ )
+    bool     found   = false;
+    unsigned netcode = (unsigned) selection;
+
+    // Search for the net selected.
+    for( unsigned ii = 0; ii < GetBoard()->m_NetInfo->GetCount(); ii++ )
     {
         net = GetBoard()->m_NetInfo->GetItem( ii );
-        if( !WildCompareString( msg, net->GetNetname(), false ) )
+        if( !WildCompareString( netFilter, net->GetNetname(), false ) )
             continue;
 
-        if( ii == jj )
+        if( ii == netcode )
         {
-            ii = net->GetNet();
+            netcode = net->GetNet();
+            found   = true;
             break;
         }
-        jj++;
     }
 
+    if( found )
+    {
         wxClientDC dc( DrawPanel );
 
         DrawPanel->PrepareGraphicContext( &dc );
@@ -76,8 +81,9 @@ void WinEDA_PcbFrame::Liste_Equipot( wxCommandEvent& event )
         if( g_HightLigt_Status )
             Hight_Light( &dc );
 
-    g_HightLigth_NetCode = ii;
+        g_HightLigth_NetCode = netcode;
         Hight_Light( &dc );
+    }
 }
 
 
@@ -109,7 +115,7 @@ int WinEDA_PcbFrame::Select_High_Light( wxDC* DC )
         switch( item->Type() )
         {
         case TYPE_PAD:
-            g_HightLigth_NetCode = ((D_PAD*)item)->GetNet();
+            g_HightLigth_NetCode = ( (D_PAD*) item )->GetNet();
             Hight_Light( DC );
             SendMessageToEESCHEMA( item );
             return g_HightLigth_NetCode;
@@ -117,14 +123,15 @@ int WinEDA_PcbFrame::Select_High_Light( wxDC* DC )
         case TYPE_TRACK:
         case TYPE_VIA:
         case TYPE_ZONE:
+
             // since these classes are all derived from TRACK, use a common
             // GetNet() function:
-            g_HightLigth_NetCode = ((TRACK*)item)->GetNet();
+            g_HightLigth_NetCode = ( (TRACK*) item )->GetNet();
             Hight_Light( DC );
             return g_HightLigth_NetCode;
 
         case TYPE_ZONE_CONTAINER:
-            g_HightLigth_NetCode = ((ZONE_CONTAINER*)item)->GetNet();
+            g_HightLigth_NetCode = ( (ZONE_CONTAINER*) item )->GetNet();
             Hight_Light( DC );
             return g_HightLigth_NetCode;
 
@@ -151,4 +158,3 @@ void WinEDA_PcbFrame::Hight_Light( wxDC* DC )
 
     GetBoard()->DrawHighLight( DrawPanel, DC, g_HightLigth_NetCode );
 }
-