Commit 3ff16a0b authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Pcbnew: fix compil error I created in my previous commit. 

All: fix some Doxygen warnings
parent 93ebdb2c

3d-viewer/3d_draw_basic_functions.h

+3 −3
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ void Draw3D_SolidHorizontalPolygonWithHoles( const std::vector<CPolyPt>& aPol 
                                                int aZpos, int aThickness, double aBiuTo3DUnits );



/** draw a thick segment using 3D primitives, in a XY plane

 * @param wxPoint aStart = YX position of start point in board units

 * @param  wxPoint aEnd = YX position of end point in board units

 * @param aStart = YX position of start point in board units

 * @param aEnd = YX position of end point in board units

 * @param aWidth = width of segment in board units

 * @param aThickness = thickness of segment in board units

 * @param aZpos = z position of segment in board units
@@ -91,7 +91,7 @@ void Draw3D_ArcSegment( const wxPoint& aCenterPos, const wxPoint& aStartPoint, 


/** draw a thick cylinder (a tube) using 3D primitives.

 * the cylinder axis is parallel to the Z axis

 * @param aCentPos = XY position of the axis cylinder ( board internal units)

 * @param aCenterPos = XY position of the axis cylinder ( board internal units)

 * @param aRadius = radius of the cylinder ( board internal units)

 * @param aHeight = height of the cylinder ( boardinternal units)

 * @param aThickness = tichkness of tube ( boardinternal units)

cvpcb/loadcmp.cpp

+3 −4
Original line number Diff line number Diff line
@@ -21,12 +21,11 @@ 
#include <wildcards_and_files_ext.h>





/**

 * Read libraries to find a module.

/* Read libraries to find a module.

 * If this module is found, copy it into memory

 *

 * @param CmpName - Module name

 * @return - a pointer to the loaded module or NULL.

 * aFootprintName is the module name

 * return - a pointer to the loaded module or NULL.

 */

MODULE* DISPLAY_FOOTPRINTS_FRAME::Get_Module( const wxString& aFootprintName )

{

pcbnew/hotkeys.cpp

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ static EDA_HOTKEY HkSwitch2NextCopperLayer( wxT( "Switch to Next Layer" ), 
static EDA_HOTKEY HkSwitch2PreviousCopperLayer( wxT( "Switch to Previous Layer" ),

                                                HK_SWITCH_LAYER_TO_PREVIOUS, '-' );



static EDA_HOTKEY HkSaveModule( wxT( "Save Module" ), HK_SAVE_MODULE, 'S' + GR_KB_CTRL );

static EDA_HOTKEY HkSavefile( wxT( "Save board" ), HK_SAVE_BOARD, 'S' + GR_KB_CTRL );

static EDA_HOTKEY HkLoadfile( wxT( "Load board" ), HK_LOAD_BOARD, 'L' + GR_KB_CTRL );

static EDA_HOTKEY HkFindItem( wxT( "Find Item" ), HK_FIND_ITEM, 'F' + GR_KB_CTRL );
@@ -234,6 +235,7 @@ EDA_HOTKEY* board_edit_Hotkey_List[] = 
EDA_HOTKEY* module_edit_Hotkey_List[] = {

    &HkMoveItem,               &HkRotateItem,                &HkEditBoardItem,

    &HkDelete,

    &HkSaveModule,

    NULL

 };

pcbnew/hotkeys.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ enum hotkey_id_commnand { 
    HK_DRAG_TRACK_KEEP_SLOPE,

    HK_END_TRACK,

    HK_SAVE_BOARD, HK_LOAD_BOARD,

    HK_SAVE_MODULE,

    HK_SWITCH_UNITS,

    HK_SWITCH_TRACK_DISPLAY_MODE,

    HK_FIND_ITEM,

pcbnew/menubar_modedit.cpp

+4 −4
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ 
#include <module_editor_frame.h>

#include <menus_helpers.h>



#include <protos.h>

#include <pcbnew_id.h>

#include <hotkeys.h>





void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
@@ -101,7 +101,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() 


    // Save module

    text = AddHotkeyName( _( "&Save Module in Active Library" ),

                          s_Libedit_Hokeys_Descr, HK_SAVE_LIB );

                          g_Module_Editor_Hokeys_Descr, HK_SAVE_MODULE );

    AddMenuItem( fileMenu, ID_MODEDIT_SAVE_LIBMODULE, text,

                 _( "Save module in active library" ),

                 KiBitmap( save_library_xpm ) );
@@ -138,13 +138,13 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() 
    wxMenu* editMenu = new wxMenu;



    // Undo

    text = AddHotkeyName( _( "&Undo" ), s_Libedit_Hokeys_Descr, HK_UNDO );

    text = AddHotkeyName( _( "&Undo" ), g_Module_Editor_Hokeys_Descr, HK_UNDO );

    AddMenuItem( editMenu, wxID_UNDO,

                 text, _( "Undo last edit" ),

                 KiBitmap( undo_xpm ) );



    // Redo

    text = AddHotkeyName( _( "&Redo" ), s_Libedit_Hokeys_Descr, HK_REDO );

    text = AddHotkeyName( _( "&Redo" ), g_Module_Editor_Hokeys_Descr, HK_REDO );

    AddMenuItem( editMenu, wxID_REDO,

                 text, _( "Redo the last undo action" ),

                 KiBitmap( redo_xpm ) );