Commit aae87178 authored by Lorenzo Marcantonio's avatar Lorenzo Marcantonio
Browse files

Renamed global variables: 

Drc_On => g_Drc_On
Route_Layer_TOP => g_Route_Layer_TOP
Route_Layer_BOTTOM => g_Route_Layer_BOTTOM
Track_45_Only_Allowed => g_Track_45_Only_Allowed
parent 0cbe14c1

pcbnew/autorouter/autoplac.cpp

+9 −9
Original line number Original line Diff line number Diff line
@@ -140,8 +140,8 @@ void PCB_EDIT_FRAME::AutoPlaceModule( MODULE* Module, int place_mode, wxDC* DC ) 
    }

    }





    memopos = CurrPosition;

    memopos = CurrPosition;

    lay_tmp_BOTTOM = Route_Layer_BOTTOM;

    lay_tmp_BOTTOM = g_Route_Layer_BOTTOM;

    lay_tmp_TOP    = Route_Layer_TOP;

    lay_tmp_TOP    = g_Route_Layer_TOP;





    RoutingMatrix.m_GridRouting = (int) GetScreen()->GetGridSize().x;

    RoutingMatrix.m_GridRouting = (int) GetScreen()->GetGridSize().x;
@@ -353,8 +353,8 @@ end_of_tst: 




    RoutingMatrix.UnInitRoutingMatrix();

    RoutingMatrix.UnInitRoutingMatrix();





    Route_Layer_TOP    = lay_tmp_TOP;

    g_Route_Layer_TOP    = lay_tmp_TOP;

    Route_Layer_BOTTOM = lay_tmp_BOTTOM;

    g_Route_Layer_BOTTOM = lay_tmp_BOTTOM;





    Module = GetBoard()->m_Modules;

    Module = GetBoard()->m_Modules;
@@ -447,12 +447,12 @@ int PCB_EDIT_FRAME::GenPlaceBoard() 
    msg.Printf( wxT( "%d" ), RoutingMatrix.m_MemSize / 1024 );

    msg.Printf( wxT( "%d" ), RoutingMatrix.m_MemSize / 1024 );

    m_messagePanel->SetMessage( 24, wxT( "Mem(Kb)" ), msg, CYAN );

    m_messagePanel->SetMessage( 24, wxT( "Mem(Kb)" ), msg, CYAN );





    Route_Layer_BOTTOM = LAYER_N_FRONT;

    g_Route_Layer_BOTTOM = LAYER_N_FRONT;





    if( RoutingMatrix.m_RoutingLayersCount > 1 )

    if( RoutingMatrix.m_RoutingLayersCount > 1 )

        Route_Layer_BOTTOM = LAYER_N_BACK;

        g_Route_Layer_BOTTOM = LAYER_N_BACK;





    Route_Layer_TOP = LAYER_N_FRONT;

    g_Route_Layer_TOP = LAYER_N_FRONT;





    /* Place the edge layer segments */

    /* Place the edge layer segments */

    TRACK TmpSegm( NULL );

    TRACK TmpSegm( NULL );
@@ -969,10 +969,10 @@ void CreateKeepOutRectangle( int ux0, int uy0, int ux1, int uy1, 
    DIST_CELL data, LocalKeepOut;

    DIST_CELL data, LocalKeepOut;

    int      lgain, cgain;

    int      lgain, cgain;





    if( aLayerMask & GetLayerMask( Route_Layer_BOTTOM ) )

    if( aLayerMask & GetLayerMask( g_Route_Layer_BOTTOM ) )

        trace = 1;     /* Trace on bottom layer. */

        trace = 1;     /* Trace on bottom layer. */





    if( ( aLayerMask & GetLayerMask( Route_Layer_TOP ) ) && RoutingMatrix.m_RoutingLayersCount )

    if( ( aLayerMask & GetLayerMask( g_Route_Layer_TOP ) ) && RoutingMatrix.m_RoutingLayersCount )

        trace |= 2;    /* Trace on top layer. */

        trace |= 2;    /* Trace on top layer. */





    if( trace == 0 )

    if( trace == 0 )

pcbnew/autorouter/autorout.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -61,12 +61,12 @@ void PCB_EDIT_FRAME::Autoroute( wxDC* DC, int mode ) 




    if( GetBoard()->GetCopperLayerCount() > 1 )

    if( GetBoard()->GetCopperLayerCount() > 1 )

    {

    {

        Route_Layer_TOP    = GetScreen()->m_Route_Layer_TOP;

        g_Route_Layer_TOP    = GetScreen()->m_Route_Layer_TOP;

        Route_Layer_BOTTOM = GetScreen()->m_Route_Layer_BOTTOM;

        g_Route_Layer_BOTTOM = GetScreen()->m_Route_Layer_BOTTOM;

    }

    }

    else

    else

    {

    {

        Route_Layer_TOP = Route_Layer_BOTTOM = LAYER_N_BACK;

        g_Route_Layer_TOP = g_Route_Layer_BOTTOM = LAYER_N_BACK;

    }

    }





    switch( mode )

    switch( mode )
@@ -172,7 +172,7 @@ void PCB_EDIT_FRAME::Autoroute( wxDC* DC, int mode ) 
    /* Map the board */

    /* Map the board */

    RoutingMatrix.m_RoutingLayersCount = 1;

    RoutingMatrix.m_RoutingLayersCount = 1;





    if( Route_Layer_TOP != Route_Layer_BOTTOM )

    if( g_Route_Layer_TOP != g_Route_Layer_BOTTOM )

        RoutingMatrix.m_RoutingLayersCount = 2;

        RoutingMatrix.m_RoutingLayersCount = 2;





    if( RoutingMatrix.InitRoutingMatrix() < 0 )

    if( RoutingMatrix.InitRoutingMatrix() < 0 )

pcbnew/autorouter/graphpcb.cpp

+12 −12
Original line number Original line Diff line number Diff line
@@ -76,10 +76,10 @@ static void TraceCircle( int ux0, int uy0, int ux1, int uy1, int lg, int layer, 
        }                                                               \

        }                                                               \

        else                                                            \

        else                                                            \

        {                                                               \

        {                                                               \

            if( layer == Route_Layer_BOTTOM )                           \

            if( layer == g_Route_Layer_BOTTOM )                         \

                RoutingMatrix.WriteCell( dy, dx, BOTTOM, color );       \

                RoutingMatrix.WriteCell( dy, dx, BOTTOM, color );       \

            if( RoutingMatrix.m_RoutingLayersCount > 1 )                                              \

            if( RoutingMatrix.m_RoutingLayersCount > 1 )                                              \

                if( layer == Route_Layer_TOP )                          \

                if( layer == g_Route_Layer_TOP )                        \

                    RoutingMatrix.WriteCell( dy, dx, TOP, color );      \

                    RoutingMatrix.WriteCell( dy, dx, TOP, color );      \

        }                                                               \

        }                                                               \

    }

    }
@@ -152,10 +152,10 @@ void TraceFilledCircle( int cx, int cy, int radius, 
    int   tstwrite = 0;

    int   tstwrite = 0;

    int   distmin;

    int   distmin;





    if( aLayerMask & GetLayerMask( Route_Layer_BOTTOM ) )

    if( aLayerMask & GetLayerMask( g_Route_Layer_BOTTOM ) )

        trace = 1;       // Trace on BOTTOM

        trace = 1;       // Trace on BOTTOM





    if( aLayerMask & GetLayerMask( Route_Layer_TOP ) )

    if( aLayerMask & GetLayerMask( g_Route_Layer_TOP ) )

        if( RoutingMatrix.m_RoutingLayersCount > 1 )

        if( RoutingMatrix.m_RoutingLayersCount > 1 )

            trace |= 2;  // Trace on TOP

            trace |= 2;  // Trace on TOP
@@ -275,13 +275,13 @@ void TraceSegmentPcb( TRACK* pt_segm, int color, int marge, int op_logic ) 
    {

    {

        int mask_layer = 0;

        int mask_layer = 0;





        if( pt_segm->IsOnLayer( Route_Layer_BOTTOM ) )

        if( pt_segm->IsOnLayer( g_Route_Layer_BOTTOM ) )

            mask_layer = 1 << Route_Layer_BOTTOM;

            mask_layer = 1 << g_Route_Layer_BOTTOM;





        if( pt_segm->IsOnLayer( Route_Layer_TOP ) )

        if( pt_segm->IsOnLayer( g_Route_Layer_TOP ) )

        {

        {

            if( mask_layer == 0 )

            if( mask_layer == 0 )

                mask_layer = 1 << Route_Layer_TOP;

                mask_layer = 1 << g_Route_Layer_TOP;

            else

            else

                mask_layer = -1;

                mask_layer = -1;

        }

        }
@@ -474,10 +474,10 @@ void TraceFilledRectangle( int ux0, int uy0, int ux1, int uy1, 
    int  row_min, row_max, col_min, col_max;

    int  row_min, row_max, col_min, col_max;

    int  trace = 0;

    int  trace = 0;





    if( ( aLayerMask & GetLayerMask( Route_Layer_BOTTOM ) ) )

    if( ( aLayerMask & GetLayerMask( g_Route_Layer_BOTTOM ) ) )

        trace = 1;     // Trace on BOTTOM

        trace = 1;     // Trace on BOTTOM





    if( ( aLayerMask & GetLayerMask( Route_Layer_TOP ) ) &&

    if( ( aLayerMask & GetLayerMask( g_Route_Layer_TOP ) ) &&

        RoutingMatrix.m_RoutingLayersCount > 1 )

        RoutingMatrix.m_RoutingLayersCount > 1 )

        trace |= 2;    // Trace on TOP

        trace |= 2;    // Trace on TOP
@@ -540,10 +540,10 @@ void TraceFilledRectangle( int ux0, int uy0, int ux1, int uy1, 
    int  rotrow, rotcol;

    int  rotrow, rotcol;

    int  trace = 0;

    int  trace = 0;





    if( aLayerMask & GetLayerMask( Route_Layer_BOTTOM ) )

    if( aLayerMask & GetLayerMask( g_Route_Layer_BOTTOM ) )

        trace = 1;     // Trace on BOTTOM

        trace = 1;     // Trace on BOTTOM





    if( aLayerMask & GetLayerMask( Route_Layer_TOP ) )

    if( aLayerMask & GetLayerMask( g_Route_Layer_TOP ) )

    {

    {

        if( RoutingMatrix.m_RoutingLayersCount > 1 )

        if( RoutingMatrix.m_RoutingLayersCount > 1 )

            trace |= 2;  // Trace on TOP

            trace |= 2;  // Trace on TOP

pcbnew/autorouter/solve.cpp

+8 −8
Original line number Original line Diff line number Diff line
@@ -416,8 +416,8 @@ static int Autoroute_One_Track( PCB_EDIT_FRAME* pcbframe, 
    int          marge;

    int          marge;

    int          padLayerMaskStart;    /* Mask layers belonging to the starting pad. */

    int          padLayerMaskStart;    /* Mask layers belonging to the starting pad. */

    int          padLayerMaskEnd;      /* Mask layers belonging to the ending pad. */

    int          padLayerMaskEnd;      /* Mask layers belonging to the ending pad. */

    int          topLayerMask = GetLayerMask( Route_Layer_TOP );

    int          topLayerMask = GetLayerMask( g_Route_Layer_TOP );

    int          bottomLayerMask = GetLayerMask( Route_Layer_BOTTOM );

    int          bottomLayerMask = GetLayerMask( g_Route_Layer_BOTTOM );

    int          routeLayerMask;       /* Mask two layers for routing. */

    int          routeLayerMask;       /* Mask two layers for routing. */

    int          tab_mask[2];       /* Enables the calculation of the mask layer being

    int          tab_mask[2];       /* Enables the calculation of the mask layer being

                                     * tested. (side = TOP or BOTTOM) */

                                     * tested. (side = TOP or BOTTOM) */
@@ -1169,7 +1169,7 @@ static void OrCell_Trace( BOARD* pcb, int col, int row, 




        g_CurrentTrackList.PushBack( newTrack );

        g_CurrentTrackList.PushBack( newTrack );





        g_CurrentTrackSegment->SetState( TRACK_AR, ON );

        g_CurrentTrackSegment->SetState( TRACK_AR, true );

        g_CurrentTrackSegment->SetLayer( 0x0F );

        g_CurrentTrackSegment->SetLayer( 0x0F );





        g_CurrentTrackSegment->SetStart(wxPoint( pcb->GetBoundingBox().GetX() +

        g_CurrentTrackSegment->SetStart(wxPoint( pcb->GetBoundingBox().GetX() +
@@ -1189,12 +1189,12 @@ static void OrCell_Trace( BOARD* pcb, int col, int row, 




        g_CurrentTrackList.PushBack( newTrack );

        g_CurrentTrackList.PushBack( newTrack );





        g_CurrentTrackSegment->SetLayer( Route_Layer_BOTTOM );

        g_CurrentTrackSegment->SetLayer( g_Route_Layer_BOTTOM );





        if( side == TOP )

        if( side == TOP )

            g_CurrentTrackSegment->SetLayer( Route_Layer_TOP );

            g_CurrentTrackSegment->SetLayer( g_Route_Layer_TOP );





        g_CurrentTrackSegment->SetState( TRACK_AR, ON );

        g_CurrentTrackSegment->SetState( TRACK_AR, true );

        g_CurrentTrackSegment->SetEnd( wxPoint( pcb->GetBoundingBox().GetX() +

        g_CurrentTrackSegment->SetEnd( wxPoint( pcb->GetBoundingBox().GetX() +

                                         ( RoutingMatrix.m_GridRouting * row ),

                                         ( RoutingMatrix.m_GridRouting * row ),

                                         pcb->GetBoundingBox().GetY() +

                                         pcb->GetBoundingBox().GetY() +
@@ -1305,12 +1305,12 @@ static void AddNewTrace( PCB_EDIT_FRAME* pcbframe, wxDC* DC ) 
    g_FirstTrackSegment->start = pcbframe->GetBoard()->GetPad( g_FirstTrackSegment, FLG_START );

    g_FirstTrackSegment->start = pcbframe->GetBoard()->GetPad( g_FirstTrackSegment, FLG_START );





    if( g_FirstTrackSegment->start )

    if( g_FirstTrackSegment->start )

        g_FirstTrackSegment->SetState( BEGIN_ONPAD, ON );

        g_FirstTrackSegment->SetState( BEGIN_ONPAD, true );





    g_CurrentTrackSegment->end = pcbframe->GetBoard()->GetPad( g_CurrentTrackSegment, FLG_END );

    g_CurrentTrackSegment->end = pcbframe->GetBoard()->GetPad( g_CurrentTrackSegment, FLG_END );





    if( g_CurrentTrackSegment->end )

    if( g_CurrentTrackSegment->end )

        g_CurrentTrackSegment->SetState( END_ONPAD, ON );

        g_CurrentTrackSegment->SetState( END_ONPAD, true );





    /* Out the new track on the matrix board */

    /* Out the new track on the matrix board */

    for( TRACK* track = g_FirstTrackSegment; track; track = track->Next() )

    for( TRACK* track = g_FirstTrackSegment; track; track = track->Next() )

pcbnew/controle.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -332,7 +332,7 @@ void PCB_EDIT_FRAME::GeneralControl( wxDC* aDC, const wxPoint& aPosition, int aH 
    {

    {

        // If there's no intrusion and DRC is active, we pass the cursor

        // If there's no intrusion and DRC is active, we pass the cursor

        // "as is", and let ShowNewTrackWhenMovingCursor figure out what to do.

        // "as is", and let ShowNewTrackWhenMovingCursor figure out what to do.

        if( !Drc_On || !g_CurrentTrackSegment ||

        if( !g_Drc_On || !g_CurrentTrackSegment ||

            (BOARD_ITEM*)g_CurrentTrackSegment != this->GetCurItem() ||

            (BOARD_ITEM*)g_CurrentTrackSegment != this->GetCurItem() ||

            !LocateIntrusion( m_Pcb->m_Track, g_CurrentTrackSegment,

            !LocateIntrusion( m_Pcb->m_Track, g_CurrentTrackSegment,

                              GetScreen()->m_Active_Layer, GetScreen()->RefPos( true ) ) )

                              GetScreen()->m_Active_Layer, GetScreen()->RefPos( true ) ) )