ratsnest.cpp translated, onrightclick() bug solved.

change_log.txt

@@ -4,6 +4,15 @@ Started 2007-June-11
 Please add newer entries at the top, list the date and your name with 
 email address.
 
+2007-Oct-13 UPDATE   Dick Hollenbeck <dick@softplc.com>
+================================================================================
++ pcbnew:
+	ratsnest.cpp translated into english.
+	Many infos on the LEE algorithm used here added.
+	todo (by myself): connect.cpp translation.
+	onrightclick() bug (created by last change) solved: one could reselect an item,
+	while moving a previously selected item (pcbnew crashes).
+
 
 2007-Oct-13 UPDATE   Geoff Harland <gharlandau@yahoo.com.au>
 ================================================================================

pcbnew/class_board_item.cpp

@@ -28,6 +28,7 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
     wxString          text;
     const BOARD_ITEM* item = this;
     EQUIPOT*          net;
+	D_PAD * pad;
 
     switch( item->Type() )
     {
@@ -42,8 +43,17 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
         break;
 
     case TYPEPAD:
-        text << _( "Pad" ) << wxT( " " ) << ( (D_PAD*) item )->ReturnStringPadName() << _( " of " )
-             << ( (MODULE*) GetParent() )->GetReference();
+		pad = (D_PAD *) this;
+        text << _( "Pad" ) << wxT( " \"" ) << pad->ReturnStringPadName()
+				<< wxT( "\" (" );
+		if ( (pad->m_Masque_Layer & ALL_CU_LAYERS) == ALL_CU_LAYERS )
+			text << _("all copper layers");
+		else if( (pad->m_Masque_Layer & CUIVRE_LAYER) == CUIVRE_LAYER )
+			text << _("copper layers");
+		else if( (pad->m_Masque_Layer & CMP_LAYER) == CMP_LAYER )
+			text << _("cmp layers");
+		else text << _("???");
+		text << _( ") of " ) << ( (MODULE*) GetParent() )->GetReference();
         break;
 
     case TYPEDRAWSEGMENT:

pcbnew/class_pad.cpp

@@ -888,7 +888,7 @@ void D_PAD::Display_Infos( WinEDA_DrawFrame* frame )
     pos += 4;
     Affiche_1_Parametre( frame, pos, _( "Net" ), m_Netname, DARKCYAN );
 
-    /* pour mise au point (peut etre supprim� : Affichage du numero de Net et sous net */
+    /* For test and debug only: display m_physical_connexion and m_logical_connexion */
     pos += 10;
 #if 0
     Line.Printf( wxT( "%d.%d " ), m_logical_connexion, m_physical_connexion );

pcbnew/onrightclick.cpp

@@ -173,16 +173,16 @@ bool WinEDA_PcbFrame::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
     
     // printf( "cursor=(%d, %d) select=(%d,%d)\n", cursorPos.x, cursorPos.y, selectPos.x, selectPos.y );
     
-    /*  If not editing a track, and there is no selected item or the right click 
-        happened at a position other than where the selection was made.
-        We cannot call PcbGeneralLocateAndDisplay() when dragging a track because
-        editrack.cpp's void Exit_Editrack( WinEDA_DrawPanel* Panel, wxDC* DC )
-        uses GetCurItem(), thinking it is an aborted track, yet after calling
-        PcbGeneralLocateAndDisplay(), GetCurItem() is any arbitrary BOARD_ITEM,
-        not the aborted track.
+ 	/* We can reselect an other item only if there are no item being edited
+	*  because ALL moving functions use GetCurItem(),
+    *  therefore GetCurItem() must return the same item during moving.
+	*  We know an item is moving if ( item && (item->m_Flags != 0)) is true
+	*  and after calling PcbGeneralLocateAndDisplay(), GetCurItem() is any arbitrary BOARD_ITEM,
+    *  not the current editen item.
 	*/
-    if( ShowNewTrackWhenMovingCursor != DrawPanel->ManageCurseur 
-       && ( !item  ||  cursorPos != selectPos )  )
+	if ( ! item || (item->m_Flags == 0) )
+	{
+		if( !item || cursorPos != selectPos )	// Filter
 		{
 			DrawPanel->m_AbortRequest = false;
 			item = PcbGeneralLocateAndDisplay();
@@ -191,8 +191,7 @@ bool WinEDA_PcbFrame::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
 				DrawPanel->CursorOn( &dc );
 				return false;
 			}
-        
-        // SetCurItem( item );  no, PcbGeneralLocateAndDisplay() does this
+		}
 	}
 
 #else

pcbnew/pcbpiste.cpp.notused

-/******************************************************/
-/* Fonctions diverses (swap..) relatives au pistes */
-/*			 et fonctions de test					  */
-/******************************************************/
-
-/* Fichier PCBPISTE.CPP */
-
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "pcbnew.h"
-#include "autorout.h"
-
-#include "protos.h"
-
-/* Variables locales */
-static int New_Layer[32];
-
-enum swap_layer_id {
-    ID_SWAP_LAYER_EXECUTE = 1800,
-    ID_SWAP_LAYER_CANCEL,
-    ID_SWAP_LAYER_BUTTON_SELECT,
-    ID_SWAP_LAYER_DESELECT,
-    ID_SWAP_LAYER_SELECT
-};
-
-
-/***********************************************/
-/* classe pour la frame de selection de layers */
-/***********************************************/
-
-class WinEDA_SwapLayerFrame : public wxDialog
-{
-private:
-    WinEDA_BasePcbFrame* m_Parent;
-    wxRadioBox*          m_LayerList;
-
-public:
-
-    // Constructor and destructor
-    WinEDA_SwapLayerFrame( WinEDA_BasePcbFrame * parent );
-    ~WinEDA_SwapLayerFrame() { };
-
-private:
-    void    Sel_Layer( wxCommandEvent& event );
-    void    Cancel( wxCommandEvent& event );
-    void    Execute( wxCommandEvent& event );
-
-    DECLARE_EVENT_TABLE()
-};
-/* Table des evenements pour WinEDA_SwapLayerFrame */
-BEGIN_EVENT_TABLE( WinEDA_SwapLayerFrame, wxDialog )
-EVT_BUTTON( ID_SWAP_LAYER_EXECUTE, WinEDA_SwapLayerFrame::Execute )
-EVT_BUTTON( ID_SWAP_LAYER_CANCEL, WinEDA_SwapLayerFrame::Cancel )
-EVT_BUTTON( ID_SWAP_LAYER_DESELECT, WinEDA_SwapLayerFrame::Sel_Layer )
-EVT_BUTTON( ID_SWAP_LAYER_BUTTON_SELECT, WinEDA_SwapLayerFrame::Sel_Layer )
-EVT_RADIOBOX( ID_SWAP_LAYER_SELECT, WinEDA_SwapLayerFrame::Sel_Layer )
-END_EVENT_TABLE()
-
-
-WinEDA_SwapLayerFrame::WinEDA_SwapLayerFrame( WinEDA_BasePcbFrame* parent ) :
-    wxDialog( parent, -1, _( "Swap Layers:" ), wxPoint( -1, -1 ),
-              wxSize( 470, 450 ), DIALOG_STYLE )
-{
-#define START_Y 15
-    wxButton* Button;
-    int       ii;
-    wxPoint   pos;
-    wxString  g_Layer_Name_Pair[32];
-    wxSize    winsize;
-
-    m_Parent = parent;
-    SetFont( *g_DialogFont );
-
-    for( ii = 0; ii < NB_LAYERS; ii++ )
-    {
-        g_Layer_Name_Pair[ii] = ReturnPcbLayerName( ii ) + wxT( " -> " ) + _( "No Change" );
-    }
-
-    pos.x = 5; pos.y = START_Y;
-    m_LayerList = new wxRadioBox( this, ID_SWAP_LAYER_SELECT, _( "Layers" ),
-                                  pos, wxSize( -1,
-                                               -1 ), 29, g_Layer_Name_Pair, 16, wxRA_SPECIFY_ROWS );
-
-    winsize.y = m_LayerList->GetRect().GetBottom();
-
-    pos.x  = m_LayerList->GetRect().GetRight() + 12;
-    Button = new wxButton( this, ID_SWAP_LAYER_CANCEL,
-                           _( "Cancel" ), pos );
-
-    Button->SetForegroundColour( *wxRED );
-    winsize.x = MAX( winsize.x, Button->GetRect().GetRight() );
-
-    pos.y += Button->GetSize().y + 5;
-    Button = new wxButton( this, ID_SWAP_LAYER_EXECUTE,
-                           _( "OK" ), pos );
-
-    Button->SetForegroundColour( *wxBLUE );
-    winsize.x = MAX( winsize.x, Button->GetRect().GetRight() );
-
-    pos.y += Button->GetSize().y + 15;
-    Button = new wxButton( this, ID_SWAP_LAYER_DESELECT,
-                           _( "Deselect" ), pos );
-
-    Button->SetForegroundColour( wxColour( 0, 100, 0 ) );
-    winsize.x = MAX( winsize.x, Button->GetRect().GetRight() );
-
-    pos.y += Button->GetSize().y + 5;
-    Button = new wxButton( this, ID_SWAP_LAYER_BUTTON_SELECT,
-                           _( "Select" ), pos );
-
-    Button->SetForegroundColour( wxColour( 0, 100, 100 ) );
-    winsize.x = MAX( winsize.x, Button->GetRect().GetRight() );
-
-    winsize.x += 10; winsize.y += 10;
-    SetClientSize( winsize );
-}
-
-
-/***************************************************************/
-void WinEDA_SwapLayerFrame::Sel_Layer( wxCommandEvent& event )
-/***************************************************************/
-{
-    int ii, jj;
-
-    ii = m_LayerList->GetSelection();
-
-    switch( event.GetId() )
-    {
-    case ID_SWAP_LAYER_DESELECT:
-        if( New_Layer[ii] != -1 )
-        {
-            New_Layer[ii] = -1;
-            m_LayerList->SetString( ii, ReturnPcbLayerName( ii ) +
-                                   + wxT( " -> " ) + _( "No Change" ) );
-        }
-        break;
-
-    case ID_SWAP_LAYER_BUTTON_SELECT:
-    case ID_SWAP_LAYER_SELECT:
-        jj = m_Parent->SelectLayer( ii, -1, -1 );
-        if( (jj < 0) || (jj >= 29) )
-            return;
-
-        if( ii != jj )
-        {
-            New_Layer[ii] = jj;
-            m_LayerList->SetString( ii,
-                                   ReturnPcbLayerName( ii ) + wxT( " -> " ) +
-                                   ReturnPcbLayerName( jj ) );
-        }
-        break;
-    }
-}
-
-
-/*********************************************************/
-void WinEDA_SwapLayerFrame::Cancel( wxCommandEvent& event )
-/*********************************************************/
-{
-    EndModal( -1 );
-}
-
-
-/*********************************************************/
-void WinEDA_SwapLayerFrame::Execute( wxCommandEvent& event )
-/*********************************************************/
-{
-    EndModal( 1 );
-}
-
-
-/********************************************************/
-void WinEDA_PcbFrame::Swap_Layers( wxCommandEvent& event )
-/********************************************************/
-/* Swap layers */
-{
-    int             ii, jj;
-    TRACK*          pt_segm;
-    DRAWSEGMENT*    pt_drawsegm;
-    EDA_BaseStruct* PtStruct;
-
-
-    /* Init default values */
-    for( ii = 0; ii < 32; ii++ )
-        New_Layer[ii] = -1;
-
-    WinEDA_SwapLayerFrame* frame = new WinEDA_SwapLayerFrame( this );
-
-    ii = frame->ShowModal(); frame->Destroy();
-
-    if( ii != 1 )
-        return;
-
-    /* Modifications des pistes */
-    pt_segm = (TRACK*) m_Pcb->m_Track;
-    for( ; pt_segm != NULL; pt_segm = (TRACK*) pt_segm->Pnext )
-    {
-        m_CurrentScreen->SetModify();
-        if( pt_segm->Type() == TYPEVIA )
-        {
-            SEGVIA* Via = (SEGVIA*) pt_segm;
-            if( Via->Shape() == VIA_NORMALE )
-                continue;
-            int     top_layer, bottom_layer;
-            Via->ReturnLayerPair( &top_layer, &bottom_layer );
-            if( New_Layer[bottom_layer] >= 0 )
-                bottom_layer = New_Layer[bottom_layer];
-            if( New_Layer[top_layer] >= 0 )
-                top_layer = New_Layer[top_layer];
-            Via->SetLayerPair( top_layer, bottom_layer );
-        }
-        else
-        {
-            jj = pt_segm->m_Layer;
-            if( New_Layer[jj] >= 0 )
-                pt_segm->m_Layer = New_Layer[jj];
-        }
-    }
-
-    /* Modifications des zones */
-    pt_segm = (TRACK*) m_Pcb->m_Zone;
-    for( ; pt_segm != NULL; pt_segm = (TRACK*) pt_segm->Pnext )
-    {
-        m_CurrentScreen->SetModify();
-        jj = pt_segm->m_Layer;
-        if( New_Layer[jj] >= 0 )
-            pt_segm->m_Layer = New_Layer[jj];
-    }
-
-    /* Modifications des autres segments */
-    PtStruct = m_Pcb->m_Drawings;
-    for( ; PtStruct != NULL; PtStruct = PtStruct->Pnext )
-    {
-        if( PtStruct->Type() == TYPEDRAWSEGMENT )
-        {
-            m_CurrentScreen->SetModify();
-            pt_drawsegm = (DRAWSEGMENT*) PtStruct;
-            jj = pt_drawsegm->m_Layer;
-            if( New_Layer[jj] >= 0 )
-                pt_drawsegm->m_Layer = New_Layer[jj];
-        }
-    }
-
-    DrawPanel->Refresh( TRUE );
-}
-
-
-/*********************************************************/
-void WinEDA_PcbFrame::Liste_Equipot( wxCommandEvent& event )
-/*********************************************************/
-{
-    EQUIPOT*          Equipot;
-    wxString          msg;
-    WinEDA_TextFrame* List;
-    int ii, jj;
-
-    msg = wxT( "*" );
-    Get_Message( _( "Filter for net names:" ), msg, this );
-    if( msg.IsEmpty() )
-        return;
-
-    List = new WinEDA_TextFrame( this, _( "List Nets" ) );
-
-    Equipot = (EQUIPOT*) m_Pcb->m_Equipots;
-    for( ; Equipot != NULL; Equipot = (EQUIPOT*) Equipot->Pnext )
-    {
-        wxString Line;
-        /* calcul adr relative du nom de la pastille reference de la piste */
-        if( !WildCompareString( msg, Equipot->m_Netname, FALSE ) )
-            continue;
-
-        Line.Printf( wxT( "net_code = %3.3d  [%.16s] " ), Equipot->m_NetCode,
-                    Equipot->m_Netname.GetData() );
-        List->Append( Line );
-    }
-
-    ii = List->ShowModal(); List->Destroy();
-    if( ii < 0 )
-        return;
-
-    /* Recherche du numero de net rellement selectionn */
-    Equipot = (EQUIPOT*) m_Pcb->m_Equipots;
-    for( jj = 0; Equipot != NULL; Equipot = (EQUIPOT*) Equipot->Pnext )
-    {
-        /* calcul adr relative du nom de la pastille reference de la piste */
-        if( !WildCompareString( msg, Equipot->m_Netname, FALSE ) )
-            continue;
-        if( ii == jj )
-        {
-            ii = Equipot->m_NetCode;
-            break;
-        }
-        jj++;
-    }
-
-    wxClientDC dc( DrawPanel );
-
-    DrawPanel->PrepareGraphicContext( &dc );
-
-    if( g_HightLigt_Status )
-        Hight_Light( &dc );
-    g_HightLigth_NetCode = ii;
-    Hight_Light( &dc );
-}

pcbnew/struct.cpp.notused

-/***********************************************/
-/* Routines d'effacement et copie de structures*/
-/***********************************************/
-
-#include "fctsys.h"
-#include "gr_basic.h"
-
-#include "common.h"
-#include "pcbnew.h"
-
-#if 0
-
-/* Routines Locales */
-/* Variables locales */
-
-/***********************************************/
-void DeleteStructure( BOARD_ITEM* item )
-/***********************************************/
-/* Supprime de la liste chainee la stucture pointee par GenericStructure
-	et libere la memoire correspondante
-*/
-{
-    if( !item )
-        return;
-
-    switch( item->Type() )
-    {
-    case TYPE_NOT_INIT:
-        DisplayError(NULL, wxT("DeleteStruct: Type Structure Non Initialise"));
-        break;
-        
-    case PCB_EQUIPOT_STRUCT_TYPE:
-    case TYPEMODULE:
-    case TYPEPAD:
-    case TYPECOTATION:
-    case TYPEMIRE:
-    case TYPEDRAWSEGMENT:
-    case TYPETEXTE:
-    case TYPETEXTEMODULE:
-    case TYPEEDGEMODULE:
-    case TYPETRACK:
-    case TYPEVIA:
-    case TYPEZONE:
-    case TYPEMARQUEUR:
-        item->UnLink();
-        delete item;
-        break;
-        
-    default:
-        {
-            wxString msg;
-            msg.Printf( wxT(" DeleteStructure: Type %d Inattendu"), item->Type() );
-            DisplayError(NULL, msg);
-        }
-    }        
-}
-
-#endif