← Back to branch summary

~andrew-plumb/kicad/kicad

« back to all changes in this revision

Viewing changes to 3d-viewer/3d_toolbar.cpp

  • Committer: jean-pierre charras
  • Date: 2013-10-07 16:39:39 UTC
  • mfrom: (4376.1.1 testing)
  • Revision ID: jp.charras@wanadoo.fr-20131007163939-2iwvh8m5n2ylimrk
3D-viewer: minor fixes and enhancements

Show diffs side-by-side

added added

removed removed

Lines of Context:
3d-viewer/3d_toolbar.cpp
1
1
/*
2
2
 * This program source code file is part of KiCad, a free EDA CAD application.
3
3
 *
4
 
 * Copyright (C) 2009 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
5
 
 * Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
6
 
 * Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
 
4
 * Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr
 
5
 * Copyright (C) 2013 Wayne Stambaugh <stambaughw@verizon.net>
 
6
 * Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors.
7
7
 *
8
8
 * This program is free software; you can redistribute it and/or
9
9
 * modify it under the terms of the GNU General Public License
180
180
    gridlistMenu->Append( ID_MENU3D_GRID_2P5_MM, _( "3D Grid 2.5 mm" ), wxEmptyString, true );
181
181
    gridlistMenu->Append( ID_MENU3D_GRID_1_MM, _( "3D Grid 1 mm" ), wxEmptyString, true );
182
182
 
 
183
    prefsMenu->AppendSeparator();
 
184
 
183
185
    AddMenuItem( prefsMenu, ID_MENU3D_SHOW_BOARD_BODY,
184
186
           _( "Show Board Body" ), KiBitmap( use_3D_copper_thickness_xpm ), wxITEM_CHECK );
185
187
 
192
194
    AddMenuItem( prefsMenu, ID_MENU3D_ZONE_ONOFF,
193
195
           _( "Show Zone &Filling" ), KiBitmap( add_zone_xpm ), wxITEM_CHECK );
194
196
 
 
197
    prefsMenu->AppendSeparator();
 
198
 
195
199
    AddMenuItem( prefsMenu, ID_MENU3D_ADHESIVE_ONOFF,
196
200
           _( "Show &Adhesive Layers" ), KiBitmap( tools_xpm ), wxITEM_CHECK );
197
201
 
224
228
    wxMenuItem* item;
225
229
    // Set the state of toggle menus according to the current display options
226
230
    item = menuBar->FindItem( ID_MENU3D_REALISTIC_MODE );
227
 
    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_USE_REALISTIC_MODE]);
 
231
    item->Check(g_Parm_3D_Visu.GetFlag( FL_USE_REALISTIC_MODE ) );
228
232
 
229
233
    item = menuBar->FindItem( ID_MENU3D_SHOW_BOARD_BODY );
230
 
    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SHOW_BOARD_BODY]);
 
234
    item->Check(g_Parm_3D_Visu.GetFlag( FL_SHOW_BOARD_BODY ) );
231
235
 
232
236
    item = menuBar->FindItem( ID_MENU3D_USE_COPPER_THICKNESS );
233
 
    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_USE_COPPER_THICKNESS]);
 
237
    item->Check(g_Parm_3D_Visu.GetFlag( FL_USE_COPPER_THICKNESS ) );
234
238
 
235
239
    item = menuBar->FindItem( ID_MENU3D_MODULE_ONOFF );
236
 
    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_MODULE]);
 
240
    item->Check(g_Parm_3D_Visu.GetFlag( FL_MODULE ) );
237
241
 
238
242
    item = menuBar->FindItem( ID_MENU3D_ZONE_ONOFF );
239
 
    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ZONE]);
 
243
    item->Check(g_Parm_3D_Visu.GetFlag( FL_ZONE ) );
240
244
 
241
245
    item = menuBar->FindItem( ID_MENU3D_AXIS_ONOFF );
242
 
    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_AXIS]);
 
246
    item->Check(g_Parm_3D_Visu.GetFlag( FL_AXIS ) );
243
247
 
244
248
    item = menuBar->FindItem( ID_MENU3D_ADHESIVE_ONOFF );
245
 
    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ADHESIVE]);
 
249
    item->Check(g_Parm_3D_Visu.GetFlag( FL_ADHESIVE ) );
246
250
 
247
251
    item = menuBar->FindItem( ID_MENU3D_SILKSCREEN_ONOFF );
248
 
    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SILKSCREEN]);
 
252
    item->Check(g_Parm_3D_Visu.GetFlag( FL_SILKSCREEN ) );
249
253
 
250
254
    item = menuBar->FindItem( ID_MENU3D_SOLDER_MASK_ONOFF );
251
 
    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SOLDERMASK]);
 
255
    item->Check(g_Parm_3D_Visu.GetFlag( FL_SOLDERMASK ) );
252
256
 
253
257
    item = menuBar->FindItem( ID_MENU3D_SOLDER_PASTE_ONOFF );
254
 
    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SOLDERPASTE]);
 
258
    item->Check(g_Parm_3D_Visu.GetFlag( FL_SOLDERPASTE ) );
255
259
 
256
260
    item = menuBar->FindItem( ID_MENU3D_COMMENTS_ONOFF );
257
 
    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_COMMENTS]);
 
261
    item->Check(g_Parm_3D_Visu.GetFlag( FL_COMMENTS ) );
258
262
 
259
263
    item = menuBar->FindItem( ID_MENU3D_ECO_ONOFF );
260
 
    item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ECO]);
 
264
    item->Check(g_Parm_3D_Visu.GetFlag( FL_ECO ));
261
265
}
262
266
 
263
267
void EDA_3D_FRAME::SetToolbars()