Commit b4fe26a3 authored by dickelbeck's avatar dickelbeck
Browse files

Isaac's next color/layer work step

parent 12fa5f02
Loading
Loading
Loading
Loading
+25 −14
Original line number Original line Diff line number Diff line
@@ -316,12 +316,14 @@ void Pcb3D_GLCanvas::Draw3D_Track( TRACK* track )
{
{
    double zpos;
    double zpos;
    int    layer = track->GetLayer();
    int    layer = track->GetLayer();
    int    color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];
    double ox, oy, fx, fy;
    double ox, oy, fx, fy;
    double w;
    double w;


    if( color & ITEM_NOT_SHOW )
    if( g_Parm_3D_Visu.m_BoardSettings->IsLayerVisible( layer ) == false )
        return;
        return;

    int    color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];

    if( layer == LAST_COPPER_LAYER )
    if( layer == LAST_COPPER_LAYER )
        layer = g_Parm_3D_Visu.m_Layers - 1;
        layer = g_Parm_3D_Visu.m_Layers - 1;
    zpos = g_Parm_3D_Visu.m_LayerZcoord[layer];
    zpos = g_Parm_3D_Visu.m_LayerZcoord[layer];
@@ -363,11 +365,17 @@ void Pcb3D_GLCanvas::Draw3D_Via( SEGVIA* via )
    {
    {
        zpos = g_Parm_3D_Visu.m_LayerZcoord[layer];
        zpos = g_Parm_3D_Visu.m_LayerZcoord[layer];
        if( layer < g_Parm_3D_Visu.m_Layers - 1 )
        if( layer < g_Parm_3D_Visu.m_Layers - 1 )
        {
            if( g_Parm_3D_Visu.m_BoardSettings->IsLayerVisible( layer ) == false )
                continue;
            color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];
            color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];
        }
        else
        else
            color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[CMP_N];
        {
        if( color & ITEM_NOT_SHOW )
            if( g_Parm_3D_Visu.m_BoardSettings->IsLayerVisible( CMP_N ) == false )
                continue;
                continue;
            color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[CMP_N];
        }


        SetGLColor( color );
        SetGLColor( color );


@@ -394,14 +402,16 @@ void Pcb3D_GLCanvas::Draw3D_Via( SEGVIA* via )
void Pcb3D_GLCanvas::Draw3D_DrawSegment( DRAWSEGMENT* segment )
void Pcb3D_GLCanvas::Draw3D_DrawSegment( DRAWSEGMENT* segment )
/*************************************************************/
/*************************************************************/
{
{
    int    layer;
    double x, y, xf, yf;
    double x, y, xf, yf;
    double zpos, w;
    double zpos, w;
    int    color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[segment->GetLayer()];


    if( color & ITEM_NOT_SHOW )
    int    layer = segment->GetLayer();
    
    if( g_Parm_3D_Visu.m_BoardSettings->IsLayerVisible( layer ) == false )
        return;
        return;


    int    color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];

    SetGLColor( color );
    SetGLColor( color );
    w  = segment->m_Width * g_Parm_3D_Visu.m_BoardScale;
    w  = segment->m_Width * g_Parm_3D_Visu.m_BoardScale;
    x  = segment->m_Start.x * g_Parm_3D_Visu.m_BoardScale;
    x  = segment->m_Start.x * g_Parm_3D_Visu.m_BoardScale;
@@ -409,7 +419,7 @@ void Pcb3D_GLCanvas::Draw3D_DrawSegment( DRAWSEGMENT* segment )
    xf = segment->m_End.x * g_Parm_3D_Visu.m_BoardScale;
    xf = segment->m_End.x * g_Parm_3D_Visu.m_BoardScale;
    yf = segment->m_End.y * g_Parm_3D_Visu.m_BoardScale;
    yf = segment->m_End.y * g_Parm_3D_Visu.m_BoardScale;


    if( segment->GetLayer() == EDGE_N )
    if( layer == EDGE_N )
    {
    {
        for( layer = 0; layer < g_Parm_3D_Visu.m_Layers; layer++ )
        for( layer = 0; layer < g_Parm_3D_Visu.m_Layers; layer++ )
        {
        {
@@ -434,7 +444,6 @@ void Pcb3D_GLCanvas::Draw3D_DrawSegment( DRAWSEGMENT* segment )
    }
    }
    else
    else
    {
    {
        layer = segment->GetLayer();
        glNormal3f( 0.0, 0.0, Get3DLayerSide( layer ) );
        glNormal3f( 0.0, 0.0, Get3DLayerSide( layer ) );
        zpos = g_Parm_3D_Visu.m_LayerZcoord[layer];
        zpos = g_Parm_3D_Visu.m_LayerZcoord[layer];
        if( Get3DLayerEnable( layer ) )
        if( Get3DLayerEnable( layer ) )
@@ -623,11 +632,13 @@ void EDGE_MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas )
    wxString s;
    wxString s;
    int      dx, dy;
    int      dx, dy;
    double   scale, x, y, fx, fy, w, zpos;
    double   scale, x, y, fx, fy, w, zpos;
    int      color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[m_Layer];


    if( color & ITEM_NOT_SHOW )
    if( g_Parm_3D_Visu.m_BoardSettings->IsLayerVisible( m_Layer ) == false )
        return;
        return;


    int      color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[m_Layer];


    SetGLColor( color );
    SetGLColor( color );
    glNormal3f( 0.0, 0.0, (m_Layer == COPPER_LAYER_N) ? -1.0 : 1.0 );
    glNormal3f( 0.0, 0.0, (m_Layer == COPPER_LAYER_N) ? -1.0 : 1.0 );
    scale = g_Parm_3D_Visu.m_BoardScale;
    scale = g_Parm_3D_Visu.m_BoardScale;
@@ -737,7 +748,7 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas )
            if( (layer > FIRST_COPPER_LAYER) && (layer < LAST_COPPER_LAYER) && !Both )
            if( (layer > FIRST_COPPER_LAYER) && (layer < LAST_COPPER_LAYER) && !Both )
                continue;
                continue;
            color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];
            color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];
            if( color & ITEM_NOT_SHOW )
            if( g_Parm_3D_Visu.m_BoardSettings->IsLayerVisible( layer ) == false )
                continue;
                continue;


            SetGLColor( color );
            SetGLColor( color );
@@ -787,7 +798,7 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas )
                    continue;
                    continue;
                color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];
                color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];
                glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 );
                glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 );
                if( color & ITEM_NOT_SHOW )
                if( g_Parm_3D_Visu.m_BoardSettings->IsLayerVisible( layer ) == false )
                    continue;
                    continue;


                SetGLColor( color );
                SetGLColor( color );
@@ -862,7 +873,7 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas )
                continue;
                continue;
            color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];
            color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];
            glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 );
            glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 );
            if( color & ITEM_NOT_SHOW )
            if( g_Parm_3D_Visu.m_BoardSettings->IsLayerVisible( layer ) == false )
                continue;
                continue;


            SetGLColor( color );
            SetGLColor( color );
+2 −1
Original line number Original line Diff line number Diff line
@@ -338,7 +338,8 @@ static PARAM_CFG_SETCOLOR ColorpcbGrilleCfg
(
(
    INSETUP,
    INSETUP,
    wxT("CoPcbGr"),             /* identification */
    wxT("CoPcbGr"),             /* identification */
    &g_DesignSettings.m_PcbGridColor, /* Adresse du parametre */
//@@IMB: Wrong object    &g_DesignSettings.m_PcbGridColor, /* Adresse du parametre */
    &g_GridColor,       //@@IMB: This is the real variable.
    DARKGRAY                /* Valeur par defaut */
    DARKGRAY                /* Valeur par defaut */
);
);


+19 −20
Original line number Original line Diff line number Diff line
@@ -213,10 +213,10 @@ void WinEDA_SetColorsFrame::CreateControls()


        if( laytool_list[lyr]->m_NoDisplayIsColor )
        if( laytool_list[lyr]->m_NoDisplayIsColor )
        {
        {
            if( *laytool_list[lyr]->m_Color & ITEM_NOT_SHOW )
            if( g_DesignSettings.IsLayerVisible( lyr ))
                CheckBox->SetValue( FALSE );
            else
                CheckBox->SetValue( TRUE );
                CheckBox->SetValue( TRUE );
            else
                CheckBox->SetValue( FALSE );
        }
        }
        else
        else
            CheckBox->SetValue( *laytool_list[lyr]->m_NoDisplay );
            CheckBox->SetValue( *laytool_list[lyr]->m_NoDisplay );
@@ -427,24 +427,23 @@ void WinEDA_SetColorsFrame::SetColor(wxCommandEvent& event)
void WinEDA_SetColorsFrame::UpdateLayerSettings()
void WinEDA_SetColorsFrame::UpdateLayerSettings()
/******************************************************************/
/******************************************************************/
{
{
    for( int lyr = 0; lyr < NB_BUTT; lyr++ )
    for( int lyr = 0; lyr < NB_BUTT - 2; lyr++ )
    {
    {
        if( laytool_list[lyr]->m_NoDisplayIsColor )
        g_DesignSettings.SetLayerVisibility( lyr, laytool_list[lyr]->m_CheckBox->GetValue() );
        {
        *laytool_list[lyr]->m_Color = CurrentColor[lyr];
            if( laytool_list[lyr]->m_CheckBox->GetValue() )
                *laytool_list[lyr]->m_Color = CurrentColor[lyr] & ~ITEM_NOT_SHOW;
            else
                *laytool_list[lyr]->m_Color = CurrentColor[lyr] | ITEM_NOT_SHOW;
    }
    }
        else

        {
    // (As a bitmap button and a checkbox have been provided for *every*
    // (As a bitmap button and a checkbox have been provided for *every*
    // layer, it is not necessary to check whether each of those items
    // layer, it is not necessary to check whether each of those items
    // actually has been provided for each of those layers.)
    // actually has been provided for each of those layers.)
            *laytool_list[lyr]->m_Color = CurrentColor[lyr];

            *laytool_list[lyr]->m_NoDisplay = laytool_list[lyr]->m_CheckBox->GetValue();

        }
    g_GridColor                 = CurrentColor[32];
    }
    s_showGrid                  = laytool_list[32]->m_CheckBox->GetValue();

    g_DCodesColor               = CurrentColor[33];
    DisplayOpt.DisplayPadNum    = laytool_list[33]->m_CheckBox->GetValue();
    
    // Additional command required for updating visibility of grid.
    // Additional command required for updating visibility of grid.
    m_Parent->m_Draw_Grid = s_showGrid;
    m_Parent->m_Draw_Grid = s_showGrid;
}
}
+32 −32
Original line number Original line Diff line number Diff line
@@ -85,112 +85,112 @@ static ColorButton Layer_1_Butt=
{
{
    _("Layer 1"),       // Title
    _("Layer 1"),       // Title
    ADR(0),             // Address of optional parameter
    ADR(0),             // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_2_Butt=
static ColorButton Layer_2_Butt=
{
{
    _("Layer 2"),       // Title
    _("Layer 2"),       // Title
    ADR(1),             // Address of optional parameter
    ADR(1),             // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_3_Butt=
static ColorButton Layer_3_Butt=
{
{
    _("Layer 3"),       // Title
    _("Layer 3"),       // Title
    ADR(2),             // Address of optional parameter
    ADR(2),             // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_4_Butt=
static ColorButton Layer_4_Butt=
{
{
    _("Layer 4"),       // Title
    _("Layer 4"),       // Title
    ADR(3),             // Address of optional parameter
    ADR(3),             // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_5_Butt=
static ColorButton Layer_5_Butt=
{
{
    _("Layer 5"),       // Title
    _("Layer 5"),       // Title
    ADR(4),             // Address of optional parameter
    ADR(4),             // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_6_Butt=
static ColorButton Layer_6_Butt=
{
{
    _("Layer 6"),       // Title
    _("Layer 6"),       // Title
    ADR(5),             // Address of optional parameter
    ADR(5),             // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_7_Butt=
static ColorButton Layer_7_Butt=
{
{
    _("Layer 7"),       // Title
    _("Layer 7"),       // Title
    ADR(6),             // Address of optional parameter
    ADR(6),             // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_8_Butt=
static ColorButton Layer_8_Butt=
{
{
    _("Layer 8"),       // Title
    _("Layer 8"),       // Title
    ADR(7),             // Address of optional parameter
    ADR(7),             // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_9_Butt=
static ColorButton Layer_9_Butt=
{
{
    _("Layer 9"),       // Title
    _("Layer 9"),       // Title
    ADR(8),             // Address of optional parameter
    ADR(8),             // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_10_Butt=
static ColorButton Layer_10_Butt=
{
{
    _("Layer 10"),      // Title
    _("Layer 10"),      // Title
    ADR(9),             // Address of optional parameter
    ADR(9),             // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_11_Butt=
static ColorButton Layer_11_Butt=
{
{
    _("Layer 11"),      // Title
    _("Layer 11"),      // Title
    ADR(10),            // Address of optional parameter
    ADR(10),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_12_Butt=
static ColorButton Layer_12_Butt=
{
{
    _("Layer 12"),      // Title
    _("Layer 12"),      // Title
    ADR(11),            // Address of optional parameter
    ADR(11),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_13_Butt=
static ColorButton Layer_13_Butt=
{
{
    _("Layer 13"),      // Title
    _("Layer 13"),      // Title
    ADR(12),            // Address of optional parameter
    ADR(12),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_14_Butt=
static ColorButton Layer_14_Butt=
{
{
    _("Layer 14"),      // Title
    _("Layer 14"),      // Title
    ADR(13),            // Address of optional parameter
    ADR(13),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_15_Butt=
static ColorButton Layer_15_Butt=
{
{
    _("Layer 15"),      // Title
    _("Layer 15"),      // Title
    ADR(14),            // Address of optional parameter
    ADR(14),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_16_Butt=
static ColorButton Layer_16_Butt=
{
{
    _("Layer 16"),      // Title
    _("Layer 16"),      // Title
    ADR(15),            // Address of optional parameter
    ADR(15),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};




@@ -204,112 +204,112 @@ static ColorButton Layer_17_Butt=
{
{
    _("Layer 17"),      // Title
    _("Layer 17"),      // Title
    ADR(16),            // Address of optional parameter
    ADR(16),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_18_Butt=
static ColorButton Layer_18_Butt=
{
{
    _("Layer 18"),      // Title
    _("Layer 18"),      // Title
    ADR(17),            // Address of optional parameter
    ADR(17),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_19_Butt=
static ColorButton Layer_19_Butt=
{
{
    _("Layer 19"),      // Title
    _("Layer 19"),      // Title
    ADR(18),            // Address of optional parameter
    ADR(18),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_20_Butt=
static ColorButton Layer_20_Butt=
{
{
    _("Layer 20"),      // Title
    _("Layer 20"),      // Title
    ADR(19),            // Address of optional parameter
    ADR(19),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_21_Butt=
static ColorButton Layer_21_Butt=
{
{
    _("Layer 21"),      // Title
    _("Layer 21"),      // Title
    ADR(20),            // Address of optional parameter
    ADR(20),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_22_Butt=
static ColorButton Layer_22_Butt=
{
{
    _("Layer 22"),      // Title
    _("Layer 22"),      // Title
    ADR(21),            // Address of optional parameter
    ADR(21),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_23_Butt=
static ColorButton Layer_23_Butt=
{
{
    _("Layer 23"),      // Title
    _("Layer 23"),      // Title
    ADR(22),            // Address of optional parameter
    ADR(22),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_24_Butt=
static ColorButton Layer_24_Butt=
{
{
    _("Layer 24"),      // Title
    _("Layer 24"),      // Title
    ADR(23),            // Address of optional parameter
    ADR(23),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_25_Butt=
static ColorButton Layer_25_Butt=
{
{
    _("Layer 25"),      // Title
    _("Layer 25"),      // Title
    ADR(24),            // Address of optional parameter
    ADR(24),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_26_Butt=
static ColorButton Layer_26_Butt=
{
{
    _("Layer 26"),      // Title
    _("Layer 26"),      // Title
    ADR(25),            // Address of optional parameter
    ADR(25),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_27_Butt=
static ColorButton Layer_27_Butt=
{
{
    _("Layer 27"),      // Title
    _("Layer 27"),      // Title
    ADR(26),            // Address of optional parameter
    ADR(26),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_28_Butt=
static ColorButton Layer_28_Butt=
{
{
    _("Layer 28"),      // Title
    _("Layer 28"),      // Title
    ADR(27),            // Address of optional parameter
    ADR(27),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_29_Butt=
static ColorButton Layer_29_Butt=
{
{
    _("Layer 29"),      // Title
    _("Layer 29"),      // Title
    ADR(28),            // Address of optional parameter
    ADR(28),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_30_Butt=
static ColorButton Layer_30_Butt=
{
{
    _("Layer 30"),      // Title
    _("Layer 30"),      // Title
    ADR(29),            // Address of optional parameter
    ADR(29),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_31_Butt=
static ColorButton Layer_31_Butt=
{
{
    _("Layer 31"),      // Title
    _("Layer 31"),      // Title
    ADR(30),            // Address of optional parameter
    ADR(30),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};


static ColorButton Layer_32_Butt=
static ColorButton Layer_32_Butt=
{
{
    _("Layer 32"),      // Title
    _("Layer 32"),      // Title
    ADR(31),            // Address of optional parameter
    ADR(31),            // Address of optional parameter
    TRUE                // Toggle ITEM_NOT_SHOW bit of the color variable
    TRUE                // Toggle ITEM*NOT*SHOW bit of the color variable
};
};




+3 −2
Original line number Original line Diff line number Diff line
@@ -78,10 +78,11 @@ void Trace_Segment( WinEDA_DrawPanel* panel, wxDC* DC, TRACK* track, int draw_mo
    }
    }
    else
    else
    {
    {
        color = g_DesignSettings.m_LayerColor[track->GetLayer()];
        if( g_DesignSettings.IsLayerVisible( track->GetLayer() ) == false )
        if( color & ITEM_NOT_SHOW )
            return;
            return;


        color = g_DesignSettings.m_LayerColor[track->GetLayer()];

        if( draw_mode & GR_SURBRILL )
        if( draw_mode & GR_SURBRILL )
        {
        {
            if( draw_mode & GR_AND )
            if( draw_mode & GR_AND )
Loading