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

3D-Viewer: add an infobar to the panel preview

This commit is contained in:
Mario Luzeiro 2020-10-06 10:55:26 +01:00 committed by Ian McInerney
parent 1cbe8fcc1f
commit d31c5c41e6
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
3d-viewer/3d_cache/dialogs/panel_prev_3d.cpp
View File

@ -38,12 +38,14 @@
#include <pgm_base.h>
#include <project.h>
#include <settings/common_settings.h>
#include <widgets/infobar.h>
PANEL_PREV_3D::PANEL_PREV_3D( wxWindow* aParent, PCB_BASE_FRAME* aFrame, MODULE* aModule,
std::vector<MODULE_3D_SETTINGS>* aParentModelList ) :
PANEL_PREV_3D_BASE( aParent, wxID_ANY ),
m_previewPane( nullptr ),
m_infobar( nullptr ),
m_boardAdapter(),
m_currentCamera( m_trackBallCamera ),
m_trackBallCamera( RANGE_SCALE_3D )
@ -87,6 +89,9 @@ PANEL_PREV_3D::PANEL_PREV_3D( wxWindow* aParent, PCB_BASE_FRAME* aFrame, MODULE*
m_dummyModule = new MODULE( *aModule );
m_dummyBoard->Add( m_dummyModule );
// Create the infobar
m_infobar = new WX_INFOBAR( this );
// Create the 3D canvas
m_previewPane = new EDA_3D_CANVAS( this, COGL_ATT_LIST::GetAttributesList( ANTIALIASING_MODE::AA_8X ),
m_dummyBoard, m_boardAdapter, m_currentCamera,
@ -111,8 +116,13 @@ PANEL_PREV_3D::PANEL_PREV_3D( wxWindow* aParent, PCB_BASE_FRAME* aFrame, MODULE*
// Run the viewer control tool, it is supposed to be always active
m_toolManager->InvokeTool( "3DViewer.Control" );
m_SizerPanelView->Add( m_infobar, 0, wxEXPAND, 0 );
m_SizerPanelView->Add( m_previewPane, 1, wxEXPAND, 5 );
// Tell the canvas about the infobar
if( m_previewPane && m_infobar )
m_previewPane->SetInfoBar( m_infobar );
for( wxEventType eventType : { wxEVT_MENU_OPEN, wxEVT_MENU_CLOSE, wxEVT_MENU_HIGHLIGHT } )
Connect( eventType, wxMenuEventHandler( PANEL_PREV_3D::OnMenuEvent ), NULL, this );

2
3d-viewer/3d_cache/dialogs/panel_prev_3d.h
View File

@ -64,6 +64,7 @@
// Declared classes to create pointers
class WX_INFOBAR;
class S3D_CACHE;
class FILENAME_RESOLVER;
class BOARD;
@ -80,6 +81,7 @@ public:
private:
EDA_3D_CANVAS* m_previewPane;
WX_INFOBAR* m_infobar;
BOARD_ADAPTER m_boardAdapter;
CCAMERA& m_currentCamera;
CTRACK_BALL m_trackBallCamera;

2
3d-viewer/3d_canvas/eda_3d_canvas.cpp
View File

@ -421,7 +421,7 @@ void EDA_3D_CANVAS::DoRePaint()
if( !m_is_opengl_version_supported )
{
warningReporter.Report( _( "Your OpenGL version is not supported. Minimum required is 1.5" ),
RPT_SEVERITY_WARNING );
RPT_SEVERITY_ERROR );
warningReporter.Finalize();
}