haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3D viewer: Remove outdated option "show holes in zones" that was no longer used in opengl mode, and useless in ray tracing 

(it was only used to reduce the calculation time)
Also add a wxBusyCursor when rebuilding the 3D scene.
This commit is contained in:
jean-pierre charras 2017-12-28 11:01:10 +01:00
parent 27171e1a88
commit 00c2257b26
7 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3d-viewer/3d_enums.h
View File

@ -43,7 +43,6 @@ enum DISPLAY3D_FLG {
FL_SHOW_BOARD_BODY,
FL_MOUSEWHEEL_PANNING,
FL_USE_REALISTIC_MODE,
FL_RENDER_SHOW_HOLES_IN_ZONES,
// OpenGL options
FL_RENDER_OPENGL_SHOW_MODEL_BBOX,

2
3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.cpp
View File

@ -473,6 +473,8 @@ bool C3D_RENDER_OGL_LEGACY::Redraw( bool aIsMoving,
if( m_reloadRequested )
{
wxBusyCursor dummy;
if( aStatusTextReporter )
aStatusTextReporter->Report( _( "Loading..." ) );

2
3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp
View File

@ -517,7 +517,7 @@ void C3D_RENDER_RAYTRACING::reload( REPORTER *aStatusTextReporter )
std::vector<const COBJECT2D *> *object2d_B = CSGITEM_EMPTY;
if( m_settings.GetFlag( FL_RENDER_SHOW_HOLES_IN_ZONES ) )
if( true ) // previously, was a option, now holes are always drawn in zones
{
object2d_B = new std::vector<const COBJECT2D *>();

1
3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp
View File

@ -167,6 +167,7 @@ bool C3D_RENDER_RAYTRACING::Redraw( bool aIsMoving, REPORTER *aStatusTextReporte
initialize_block_positions();
}
wxBusyCursor dummy;
// Reload board if it was requested
// /////////////////////////////////////////////////////////////////////////

9
3d-viewer/3d_viewer/3d_toolbar.cpp
View File

@ -198,12 +198,6 @@ void EDA_3D_VIEWER::CreateMenuBar()
AddMenuItem( prefsMenu, renderOptionsMenu, ID_MENU3D_FL,
_( "Render Options" ), KiBitmap( options_3drender_xpm ) );
AddMenuItem( renderOptionsMenu, ID_MENU3D_FL_RENDER_SHOW_HOLES_IN_ZONES,
_( "Show Holes in Zones" ),
_( "Holes inside a copper layer copper zones are shown, "
"but the calculation time is longer" ),
KiBitmap( green_xpm ), wxITEM_CHECK );
wxMenu * materialsList = new wxMenu;
AddMenuItem( renderOptionsMenu, materialsList, ID_MENU3D_FL_RENDER_MATERIAL,
_( "Material Properties" ), KiBitmap( color_materials_xpm ) );
@ -448,9 +442,6 @@ void EDA_3D_VIEWER::SetMenuBarOptionsState()
item = menuBar->FindItem( ID_MENU3D_ECO_ONOFF );
item->Enable( !m_settings.GetFlag( FL_USE_REALISTIC_MODE ) );
item = menuBar->FindItem( ID_MENU3D_FL_RENDER_SHOW_HOLES_IN_ZONES );
item->Check( m_settings.GetFlag( FL_RENDER_SHOW_HOLES_IN_ZONES ) );
item = menuBar->FindItem( ID_MENU3D_FL_RENDER_MATERIAL_MODE_NORMAL );
item->Check( m_settings.MaterialModeGet() == MATERIAL_MODE_NORMAL );

11
3d-viewer/3d_viewer/eda_3d_viewer.cpp
View File

@ -82,7 +82,6 @@ static const wxChar keyMousewheelPanning[] = wxT( "MousewheelPAN3D" );
static const wxChar keyShowRealisticMode[] = wxT( "ShowRealisticMode" );
static const wxChar keyRenderEngine[] = wxT( "RenderEngine" );
static const wxChar keyRenderRemoveHoles[] = wxT( "Render_RemoveHoles" );
//static const wxChar keyRenderTextures[] = wxT( "Render_Textures" );
static const wxChar keyRenderMaterial[] = wxT( "Render_Material" );
@ -396,11 +395,6 @@ void EDA_3D_VIEWER::Process_Special_Functions( wxCommandEvent &event )
ReloadRequest( );
return;
case ID_MENU3D_FL_RENDER_SHOW_HOLES_IN_ZONES:
m_settings.SetFlag( FL_RENDER_SHOW_HOLES_IN_ZONES, isChecked );
ReloadRequest();
return;
case ID_MENU3D_FL_RENDER_MATERIAL_MODE_NORMAL:
m_settings.MaterialModeSet( MATERIAL_MODE_NORMAL );
ReloadRequest( );
@ -747,9 +741,6 @@ void EDA_3D_VIEWER::LoadSettings( wxConfigBase *aCfg )
aCfg->Read( keyShowRealisticMode, &tmp, true );
m_settings.SetFlag( FL_USE_REALISTIC_MODE, tmp );
aCfg->Read( keyRenderRemoveHoles, &tmp, true );
m_settings.SetFlag( FL_RENDER_SHOW_HOLES_IN_ZONES, tmp );
// OpenGL options
aCfg->Read( keyRenderOGL_ShowCopperTck, &tmp, true );
m_settings.SetFlag( FL_RENDER_OPENGL_COPPER_THICKNESS, tmp );
@ -867,8 +858,6 @@ void EDA_3D_VIEWER::SaveSettings( wxConfigBase *aCfg )
aCfg->Write( keyRenderEngine, (int)m_settings.RenderEngineGet() );
aCfg->Write( keyRenderRemoveHoles, m_settings.GetFlag( FL_RENDER_SHOW_HOLES_IN_ZONES ) );
aCfg->Write( keyRenderMaterial, (int)m_settings.MaterialModeGet() );
// OpenGL options

1
3d-viewer/3d_viewer_id.h
View File

@ -60,7 +60,6 @@ enum id_3dview_frm
ID_MENU3D_REALISTIC_MODE,
ID_MENU3D_FL,
ID_MENU3D_FL_RENDER_SHOW_HOLES_IN_ZONES,
ID_MENU3D_FL_RENDER_MATERIAL,
ID_MENU3D_FL_RENDER_MATERIAL_MODE_NORMAL,