Commit 98ba50f8 authored by charras's avatar charras
Browse files

Use layer_widget in Gerbview 

Added sample gerber files for test (gerbview has problem with 2 files)
parent 9a6f753c

gerbview/CMakeLists.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ endif(APPLE) 




set(GERBVIEW_SRCS

set(GERBVIEW_SRCS

    block.cpp

    block.cpp

    class_gerbview_layer_widget.cpp

    controle.cpp

    controle.cpp

    dcode.cpp

    dcode.cpp

    deltrack.cpp

    deltrack.cpp
@@ -50,6 +51,7 @@ set(GERBVIEW_SRCS 




set(GERBVIEW_EXTRA_SRCS

set(GERBVIEW_EXTRA_SRCS

    ../share/setpage.cpp

    ../share/setpage.cpp

    ../pcbnew/layer_widget.cpp

    ../pcbnew/printout_controler.cpp

    ../pcbnew/printout_controler.cpp

)

)

gerbview/class_gerbview_layer_widget.cpp

0 → 100644
+246 −0
Original line number Original line Diff line number Diff line 
/*

 * This program source code file is part of KICAD, a free EDA CAD application.

 *

 * Copyright (C) 2004-2010 Jean-Pierre Charras, jean-pierre.charras@gpisa-lab.inpg.fr

 * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>

 * Copyright (C) 2010 Kicad Developers, see change_log.txt for contributors.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version 2

 * of the License, or (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, you may find one here:

 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html

 * or you may search the http://www.gnu.org website for the version 2 license,

 * or you may write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA

 */





/*********************************************************/

/* class_gerbview_layer_widget.cpp - gerbview layers manager. */

/*********************************************************/



#include "fctsys.h"

#include "common.h"

#include "class_drawpanel.h"

#include "pcbstruct.h"

#include "gerbview.h"

#include "wxGerberFrame.h"

#include "layer_widget.h"

#include "class_gerbview_layer_widget.h"





/**

 * Class GERBER_LAYER_WIDGET

 * is here to implement the abtract functions of LAYER_WIDGET so they

 * may be tied into the WinEDA_GerberFrame's data and so we can add a popup

 * menu which is specific to PCBNEW's needs.

 */





GERBER_LAYER_WIDGET::GERBER_LAYER_WIDGET( WinEDA_GerberFrame* aParent, wxWindow* aFocusOwner, int aPointSize ) :

    LAYER_WIDGET( aParent, aFocusOwner, aPointSize ),

    myframe( aParent )

{

    BOARD*  board = myframe->GetBoard();



    // Fixed "Rendering" tab rows within the LAYER_WIDGET, only the initial color

    // is changed before appending to the LAYER_WIDGET.  This is an automatic variable

    // not a static variable, change the color & state after copying from code to renderRows

    // on the stack.

    LAYER_WIDGET::ROW renderRows[2] = {



#define RR  LAYER_WIDGET::ROW   // Render Row abreviation to reduce source width



             // text                id                      color       tooltip                 checked

        RR( _( "Grid" ),            GERBER_GRID_VISIBLE,    WHITE,      _( "Show the (x,y) grid dots" ) ),

        RR( _( "DCodes" ),          DCODES_VISIBLE,         WHITE,      _( "Show DCodes identification" ) ),

    };



    for( unsigned row=0;  row<DIM(renderRows);  ++row )

    {

        if( renderRows[row].color != -1 )       // does this row show a color?

        {

            // this window frame must have an established BOARD, i.e. after SetBoard()

            renderRows[row].color = board->GetVisibleElementColor( renderRows[row].id );

        }

        renderRows[row].state = board->IsElementVisible( renderRows[row].id );

    }



    AppendRenderRows( renderRows, DIM(renderRows) );



    //-----<Popup menu>-------------------------------------------------

    // handle the popup menu over the layer window.

    m_LayerScrolledWindow->Connect( wxEVT_RIGHT_DOWN,

        wxMouseEventHandler( GERBER_LAYER_WIDGET::onRightDownLayers ), NULL, this );



    // since Popupmenu() calls this->ProcessEvent() we must call this->Connect()

    // and not m_LayerScrolledWindow->Connect()

    Connect( ID_SHOW_ALL_COPPERS, ID_SHOW_NO_COPPERS, wxEVT_COMMAND_MENU_SELECTED,

        wxCommandEventHandler( GERBER_LAYER_WIDGET::onPopupSelection ), NULL, this );



    // install the right click handler into each control at end of ReFill()

    // using installRightLayerClickHandler

}





void GERBER_LAYER_WIDGET::installRightLayerClickHandler()

{

    int rowCount = GetLayerRowCount();

    for( int row=0;  row<rowCount;  ++row )

    {

        for( int col=0; col<LYR_COLUMN_COUNT;  ++col )

        {

            wxWindow* w = getLayerComp( row, col );



            w->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler(

                GERBER_LAYER_WIDGET::onRightDownLayers ), NULL, this );

        }

    }

}





void GERBER_LAYER_WIDGET::onRightDownLayers( wxMouseEvent& event )

{

    wxMenu          menu;



    // menu text is capitalized:

    // http://library.gnome.org/devel/hig-book/2.20/design-text-labels.html.en#layout-capitalization

    menu.Append( new wxMenuItem( &menu, ID_SHOW_ALL_COPPERS,

        _("Show All Layers") ) );



    menu.Append( new wxMenuItem( &menu, ID_SHOW_NO_COPPERS,

        _( "Hide All Layers" ) ) );



    PopupMenu( &menu );



    passOnFocus();

}



void GERBER_LAYER_WIDGET::onPopupSelection( wxCommandEvent& event )

{

    int     rowCount;

    int     menuId = event.GetId();

    bool    visible;



    switch( menuId )

    {

    case ID_SHOW_ALL_COPPERS:

        visible = true;

        goto L_change_coppers;



    case ID_SHOW_NO_COPPERS:

        visible = false;

    L_change_coppers:

        int lastCu = -1;

        rowCount = GetLayerRowCount();

        for( int row=rowCount-1;  row>=0;  --row )

        {

            wxCheckBox* cb = (wxCheckBox*) getLayerComp( row, 3 );

            int layer = getDecodedId( cb->GetId() );

            if( IsValidCopperLayerIndex( layer ) )

            {

                lastCu = row;

                break;

            }

        }



        for( int row=0;  row<rowCount;  ++row )

        {

            wxCheckBox* cb = (wxCheckBox*) getLayerComp( row, 3 );

            int layer = getDecodedId( cb->GetId() );



            if( IsValidCopperLayerIndex( layer ) )

            {

                cb->SetValue( visible );



                bool isLastCopperLayer = (row==lastCu);



                OnLayerVisible( layer, visible, isLastCopperLayer );



                if( isLastCopperLayer )

                    break;

            }

        }

        break;

    }

}





void GERBER_LAYER_WIDGET::ReFill()

{

    BOARD*  brd = myframe->GetBoard();

    int     layer;

    ClearLayerRows();

    for( layer = 0; layer < LAYER_COUNT; layer++ )

    {

        wxString msg;

        msg.Printf( _("Layer %d"), layer+1 );

        AppendLayerRow( LAYER_WIDGET::ROW( msg, layer, brd->GetLayerColor( layer ), wxEmptyString, true ) );

    }



    installRightLayerClickHandler();

}



//-----<LAYER_WIDGET callbacks>-------------------------------------------



void GERBER_LAYER_WIDGET::OnLayerColorChange( int aLayer, int aColor )

{

    myframe->GetBoard()->SetLayerColor( aLayer, aColor );

    myframe->DrawPanel->Refresh();

}



bool GERBER_LAYER_WIDGET::OnLayerSelect( int aLayer )

{

    // the layer change from the GERBER_LAYER_WIDGET can be denied by returning

    // false from this function.

//    myframe->setActiveLayer( aLayer, false );

//    myframe->syncLayerBox();

    if(DisplayOpt.ContrastModeDisplay)

        myframe->DrawPanel->Refresh();



    return true;

}



void GERBER_LAYER_WIDGET::OnLayerVisible( int aLayer, bool isVisible, bool isFinal )

{

    BOARD* brd = myframe->GetBoard();



    int visibleLayers = brd->GetVisibleLayers();



    if( isVisible )

        visibleLayers |= (1 << aLayer);

    else

        visibleLayers &= ~(1 << aLayer);



    brd->SetVisibleLayers( visibleLayers );



    if( isFinal )

        myframe->DrawPanel->Refresh();

}



void GERBER_LAYER_WIDGET::OnRenderColorChange( int aId, int aColor )

{

    myframe->GetBoard()->SetVisibleElementColor( aId, aColor );

    myframe->DrawPanel->Refresh();

}



void GERBER_LAYER_WIDGET::OnRenderEnable( int aId, bool isEnabled )

{

    BOARD*  brd = myframe->GetBoard();

        brd->SetElementVisibility( aId, isEnabled );



    myframe->DrawPanel->Refresh();

}



//-----</LAYER_WIDGET callbacks>------------------------------------------

gerbview/class_gerbview_layer_widget.h

0 → 100644
+83 −0
Original line number Original line Diff line number Diff line 
/*

 * This program source code file is part of KICAD, a free EDA CAD application.

 *

 * Copyright (C) 2004-2010 Jean-Pierre Charras, jean-pierre.charras@gpisa-lab.inpg.fr

 * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>

 * Copyright (C) 2010 Kicad Developers, see change_log.txt for contributors.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version 2

 * of the License, or (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, you may find one here:

 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html

 * or you may search the http://www.gnu.org website for the version 2 license,

 * or you may write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA

 */





/************************************************************/

/* class_gerber_layer_widget.h : header for the layers manager */

/************************************************************/



#ifndef _CLASS_GERBER_LAYER_WIDGET_H_

#define _CLASS_GERBER_LAYER_WIDGET_H_



#include "layer_widget.h"



/**

 * Class GERBER_LAYER_WIDGET

 * is here to implement the abtract functions of LAYER_WIDGET so they

 * may be tied into the WinEDA_GerberFrame's data and so we can add a popup

 * menu which is specific to PCBNEW's needs.

 */

class GERBER_LAYER_WIDGET : public LAYER_WIDGET

{

    WinEDA_GerberFrame*    myframe;



    // popup menu ids.

#define ID_SHOW_ALL_COPPERS     wxID_HIGHEST

#define ID_SHOW_NO_COPPERS      (wxID_HIGHEST+1)



    /**

     * Function OnRightDownLayers

     * puts up a popup menu for the layer panel.

     */

    void onRightDownLayers( wxMouseEvent& event );



    void onPopupSelection( wxCommandEvent& event );



    /// this is for the popup menu, the right click handler has to be installed

    /// on every child control within the layer panel.

    void installRightLayerClickHandler();



public:



    /**

     * Constructor

     * @param aPointSize is the font point size to use within the widget.  This

     *  effectively sets the overal size of the widget via the row height and bitmap

     *  button sizes.

     */

    GERBER_LAYER_WIDGET( WinEDA_GerberFrame* aParent, wxWindow* aFocusOwner, int aPointSize = 10 );



    void ReFill();



    //-----<implement LAYER_WIDGET abstract callback functions>-----------

    void OnLayerColorChange( int aLayer, int aColor );

    bool OnLayerSelect( int aLayer );

    void OnLayerVisible( int aLayer, bool isVisible, bool isFinal );

    void OnRenderColorChange( int aId, int aColor );

    void OnRenderEnable( int aId, bool isEnabled );

    //-----</implement LAYER_WIDGET abstract callback functions>----------

};



#endif  // _CLASS_GERBER_LAYER_WIDGET_H_

gerbview/edit.cpp

+4 −13
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ void WinEDA_GerberFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos ) 
        break;

        break;









    case ID_PCB_DELETE_ITEM_BUTT:

    case ID_GERBVIEW_DELETE_ITEM_BUTT:

        DrawStruct = GerberGeneralLocateAndDisplay();

        DrawStruct = GerberGeneralLocateAndDisplay();

        if( DrawStruct == NULL )

        if( DrawStruct == NULL )

            break;

            break;
@@ -126,7 +126,7 @@ void WinEDA_GerberFrame::Process_Special_Functions( wxCommandEvent& event ) 
        Files_io( event );

        Files_io( event );

        break;

        break;





    case ID_PCB_GLOBAL_DELETE:

    case ID_GERBVIEW_GLOBAL_DELETE:

        Erase_Current_Layer( TRUE );

        Erase_Current_Layer( TRUE );

        break;

        break;
@@ -152,20 +152,11 @@ void WinEDA_GerberFrame::Process_Special_Functions( wxCommandEvent& event ) 
    case ID_POPUP_CANCEL_CURRENT_COMMAND:

    case ID_POPUP_CANCEL_CURRENT_COMMAND:

        break;

        break;





    case ID_POPUP_PCB_DELETE_TRACKSEG:

    case ID_GERBVIEW_DELETE_ITEM_BUTT:

        DrawPanel->MouseToCursorSchema();

        if( GetScreen()->GetCurItem() == NULL )

            break;

        Delete_Segment( &dc, (TRACK*) GetScreen()->GetCurItem() );

        GetScreen()->SetCurItem( NULL );

        GetScreen()->SetModify();

        break;



    case ID_PCB_DELETE_ITEM_BUTT:

        SetToolID( id, wxCURSOR_BULLSEYE, wxT( "Delete item" ) );

        SetToolID( id, wxCURSOR_BULLSEYE, wxT( "Delete item" ) );

        break;

        break;





    case ID_TOOLBARH_PCB_SELECT_LAYER:

    case ID_TOOLBARH_GERBVIEW_SELECT_LAYER:

        GetScreen()->m_Active_Layer = m_SelLayerBox->GetChoice();

        GetScreen()->m_Active_Layer = m_SelLayerBox->GetChoice();

        DrawPanel->Refresh( TRUE );

        DrawPanel->Refresh( TRUE );

        break;

        break;