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

Move 3d viewer board outline warning to the status bar 

This is less intrusive than a dialog that is constantly opening
whenever the 3d view is refreshed.
This commit is contained in:
Ian McInerney 2020-02-03 22:09:14 +00:00
parent a1c2abaff5
commit 5053f58bfc
12 changed files with 51 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
3d-viewer/3d_canvas/cinfo3d_visu.cpp
View File

@ -271,7 +271,7 @@ double CINFO3D_VISU::GetCircleCorrectionFactor( int aNrSides ) const
} }
void CINFO3D_VISU::InitSettings( REPORTER *aStatusTextReporter ) void CINFO3D_VISU::InitSettings( REPORTER* aStatusTextReporter, REPORTER* aWarningTextReporter )
{ {
wxLogTrace( m_logTrace, wxT( "CINFO3D_VISU::InitSettings" ) ); wxLogTrace( m_logTrace, wxT( "CINFO3D_VISU::InitSettings" ) );
@ -427,7 +427,10 @@ void CINFO3D_VISU::InitSettings( REPORTER *aStatusTextReporter )
if( aStatusTextReporter ) if( aStatusTextReporter )
aStatusTextReporter->Report( _( "Build board body" ) ); aStatusTextReporter->Report( _( "Build board body" ) );
createBoardPolygon(); if( !createBoardPolygon() )
aWarningTextReporter->Report( _( "Warning: Board outline is not closed" ) );
else
aWarningTextReporter->Report( wxEmptyString );
#ifdef PRINT_STATISTICS_3D_VIEWER #ifdef PRINT_STATISTICS_3D_VIEWER
unsigned stats_stopCreateBoardPolyTime = GetRunningMicroSecs(); unsigned stats_stopCreateBoardPolyTime = GetRunningMicroSecs();
@ -452,18 +455,13 @@ void CINFO3D_VISU::InitSettings( REPORTER *aStatusTextReporter )
} }
void CINFO3D_VISU::createBoardPolygon() bool CINFO3D_VISU::createBoardPolygon()
{ {
m_board_poly.RemoveAllContours(); m_board_poly.RemoveAllContours();
wxString errmsg; wxString errmsg;
if( !m_board->GetBoardPolygonOutlines( m_board_poly, /*allLayerHoles,*/ &errmsg ) ) return m_board->GetBoardPolygonOutlines( m_board_poly, /*allLayerHoles,*/ &errmsg );
{
errmsg.append( wxT( "\n\n" ) );
errmsg.append( _( "Cannot determine the board outline." ) );
wxLogMessage( errmsg );
}
} }

10
3d-viewer/3d_canvas/cinfo3d_visu.h
View File

@ -131,8 +131,9 @@ class CINFO3D_VISU
* @brief InitSettings - Function to be called by the render when it need to * @brief InitSettings - Function to be called by the render when it need to
* reload the settings for the board. * reload the settings for the board.
* @param aStatusTextReporter: the pointer for the status reporter * @param aStatusTextReporter: the pointer for the status reporter
* @param aWarningTextReporter: pointer for the warning reporter
*/ */
void InitSettings( REPORTER *aStatusTextReporter ); void InitSettings( REPORTER* aStatusTextReporter, REPORTER* aWarningTextReporter );
/** /**
* @brief BiuTo3Dunits - Board integer units To 3D units * @brief BiuTo3Dunits - Board integer units To 3D units
@ -418,7 +419,12 @@ class CINFO3D_VISU
const MAP_POLY &GetPolyMapHoles_Outer() const { return m_layers_outer_holes_poly; } const MAP_POLY &GetPolyMapHoles_Outer() const { return m_layers_outer_holes_poly; }
private: private:
void createBoardPolygon(); /**
* Create the board outline polygon.
*
* @return false if the outline could not be created
*/
bool createBoardPolygon();
void createLayers( REPORTER *aStatusTextReporter ); void createLayers( REPORTER *aStatusTextReporter );
void destroyLayers(); void destroyLayers();

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

@ -311,10 +311,10 @@ void EDA_3D_CANVAS::DisplayStatus()
wxString msg; wxString msg;
msg.Printf( "dx %3.2f", m_settings.CameraGet().GetCameraPos().x ); msg.Printf( "dx %3.2f", m_settings.CameraGet().GetCameraPos().x );
m_parentStatusBar->SetStatusText( msg, 1 ); m_parentStatusBar->SetStatusText( msg, static_cast<int>( EDA_3D_VIEWER_STATUSBAR::X_POS ) );
msg.Printf( "dy %3.2f", m_settings.CameraGet().GetCameraPos().y ); msg.Printf( "dy %3.2f", m_settings.CameraGet().GetCameraPos().y );
m_parentStatusBar->SetStatusText( msg, 2 ); m_parentStatusBar->SetStatusText( msg, static_cast<int>( EDA_3D_VIEWER_STATUSBAR::Y_POS ) );
} }
} }
@ -346,7 +346,10 @@ void EDA_3D_CANVAS::OnPaint( wxPaintEvent &event )
// !TODO: implement error reporter // !TODO: implement error reporter
//WX_STRING_REPORTER errorReporter( &err_messages ); //WX_STRING_REPORTER errorReporter( &err_messages );
STATUS_TEXT_REPORTER activityReporter( m_parentStatusBar, 0 ); STATUS_TEXT_REPORTER activityReporter(
m_parentStatusBar, static_cast<int>( EDA_3D_VIEWER_STATUSBAR::STATUS_TEXT ) );
STATUS_TEXT_REPORTER warningReporter(
m_parentStatusBar, static_cast<int>( EDA_3D_VIEWER_STATUSBAR::WARN_TEXT ) );
unsigned strtime = GetRunningMicroSecs(); unsigned strtime = GetRunningMicroSecs();
@ -438,8 +441,8 @@ void EDA_3D_CANVAS::OnPaint( wxPaintEvent &event )
{ {
m_3d_render->SetCurWindowSize( clientSize ); m_3d_render->SetCurWindowSize( clientSize );
requested_redraw = m_3d_render->Redraw( m_mouse_was_moved || m_camera_is_moving, requested_redraw = m_3d_render->Redraw(
&activityReporter ); m_mouse_was_moved || m_camera_is_moving, &activityReporter, &warningReporter );
} }
if( m_render_pivot ) if( m_render_pivot )

4
3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp
View File

@ -334,7 +334,7 @@ CLAYERS_OGL_DISP_LISTS *C3D_RENDER_OGL_LEGACY::generate_holes_display_list(
} }
void C3D_RENDER_OGL_LEGACY::reload( REPORTER *aStatusTextReporter ) void C3D_RENDER_OGL_LEGACY::reload( REPORTER* aStatusTextReporter, REPORTER* aWarningTextReporter )
{ {
m_reloadRequested = false; m_reloadRequested = false;
@ -348,7 +348,7 @@ void C3D_RENDER_OGL_LEGACY::reload( REPORTER *aStatusTextReporter )
unsigned stats_startReloadTime = GetRunningMicroSecs(); unsigned stats_startReloadTime = GetRunningMicroSecs();
m_settings.InitSettings( aStatusTextReporter ); m_settings.InitSettings( aStatusTextReporter, aWarningTextReporter );
#ifdef PRINT_STATISTICS_3D_VIEWER #ifdef PRINT_STATISTICS_3D_VIEWER
unsigned stats_endReloadTime = GetRunningMicroSecs(); unsigned stats_endReloadTime = GetRunningMicroSecs();

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

@ -516,8 +516,8 @@ void init_lights(void)
} }
bool C3D_RENDER_OGL_LEGACY::Redraw( bool aIsMoving, bool C3D_RENDER_OGL_LEGACY::Redraw(
REPORTER *aStatusTextReporter ) bool aIsMoving, REPORTER* aStatusTextReporter, REPORTER* aWarningTextReporter )
{ {
// Initialize openGL // Initialize openGL
if( !m_is_opengl_initialized ) if( !m_is_opengl_initialized )
@ -533,7 +533,7 @@ bool C3D_RENDER_OGL_LEGACY::Redraw( bool aIsMoving,
if( aStatusTextReporter ) if( aStatusTextReporter )
aStatusTextReporter->Report( _( "Loading..." ) ); aStatusTextReporter->Report( _( "Loading..." ) );
reload( aStatusTextReporter ); reload( aStatusTextReporter, aWarningTextReporter );
setupMaterials(); setupMaterials();
// generate a new 3D grid as the size of the board may had changed // generate a new 3D grid as the size of the board may had changed

5
3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.h
View File

@ -65,13 +65,14 @@ public:
// Imported from C3D_RENDER_BASE // Imported from C3D_RENDER_BASE
void SetCurWindowSize( const wxSize &aSize ) override; void SetCurWindowSize( const wxSize &aSize ) override;
bool Redraw( bool aIsMoving, REPORTER *aStatusTextReporter ) override; bool Redraw( bool aIsMoving, REPORTER* aStatusTextReporter,
REPORTER* aWarningTextReporter ) override;
int GetWaitForEditingTimeOut() override; int GetWaitForEditingTimeOut() override;
private: private:
bool initializeOpenGL(); bool initializeOpenGL();
void reload( REPORTER *aStatusTextReporter ); void reload( REPORTER* aStatusTextReporter, REPORTER* aWarningTextReporter );
void ogl_set_arrow_material(); void ogl_set_arrow_material();

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

@ -255,7 +255,7 @@ void C3D_RENDER_RAYTRACING::create_3d_object_from( CCONTAINER& aDstContainer,
} }
void C3D_RENDER_RAYTRACING::reload( REPORTER *aStatusTextReporter ) void C3D_RENDER_RAYTRACING::reload( REPORTER* aStatusTextReporter, REPORTER* aWarningTextReporter )
{ {
m_reloadRequested = false; m_reloadRequested = false;
@ -270,7 +270,7 @@ void C3D_RENDER_RAYTRACING::reload( REPORTER *aStatusTextReporter )
unsigned stats_startReloadTime = GetRunningMicroSecs(); unsigned stats_startReloadTime = GetRunningMicroSecs();
m_settings.InitSettings( aStatusTextReporter ); m_settings.InitSettings( aStatusTextReporter, aWarningTextReporter );
#ifdef PRINT_STATISTICS_3D_VIEWER #ifdef PRINT_STATISTICS_3D_VIEWER
unsigned stats_endReloadTime = GetRunningMicroSecs(); unsigned stats_endReloadTime = GetRunningMicroSecs();

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

@ -147,7 +147,8 @@ static inline void SetPixel( GLubyte *p, const CCOLORRGB &v )
} }
bool C3D_RENDER_RAYTRACING::Redraw( bool aIsMoving, REPORTER *aStatusTextReporter ) bool C3D_RENDER_RAYTRACING::Redraw(
bool aIsMoving, REPORTER* aStatusTextReporter, REPORTER* aWarningTextReporter )
{ {
bool requestRedraw = false; bool requestRedraw = false;
@ -178,7 +179,7 @@ bool C3D_RENDER_RAYTRACING::Redraw( bool aIsMoving, REPORTER *aStatusTextReporte
//aIsMoving = true; //aIsMoving = true;
requestRedraw = true; requestRedraw = true;
reload( aStatusTextReporter ); reload( aStatusTextReporter, aWarningTextReporter );
} }

5
3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.h
View File

@ -65,7 +65,8 @@ public:
// Imported from C3D_RENDER_BASE // Imported from C3D_RENDER_BASE
void SetCurWindowSize( const wxSize &aSize ) override; void SetCurWindowSize( const wxSize &aSize ) override;
bool Redraw(bool aIsMoving, REPORTER *aStatusTextReporter ) override; bool Redraw( bool aIsMoving, REPORTER* aStatusTextReporter,
REPORTER* aWarningTextReporter ) override;
int GetWaitForEditingTimeOut() override; int GetWaitForEditingTimeOut() override;
@ -74,7 +75,7 @@ private:
void initializeNewWindowSize(); void initializeNewWindowSize();
void opengl_init_pbo(); void opengl_init_pbo();
void opengl_delete_pbo(); void opengl_delete_pbo();
void reload( REPORTER *aStatusTextReporter ); void reload( REPORTER* aStatusTextReporter, REPORTER* aWarningTextReporter );
void restart_render_state(); void restart_render_state();
void rt_render_tracing( GLubyte *ptrPBO , REPORTER *aStatusTextReporter ); void rt_render_tracing( GLubyte *ptrPBO , REPORTER *aStatusTextReporter );

3
3d-viewer/3d_rendering/c3d_render_base.h
View File

@ -66,7 +66,8 @@ public:
* @param aStatusTextReporter: a pointer to the status progress reporter * @param aStatusTextReporter: a pointer to the status progress reporter
* @return it will return true if the render would like to redraw again * @return it will return true if the render would like to redraw again
*/ */
virtual bool Redraw( bool aIsMoving, REPORTER *aStatusTextReporter = NULL ) = 0; virtual bool Redraw( bool aIsMoving, REPORTER* aStatusTextReporter = NULL,
REPORTER* aWarningTextReporter = NULL ) = 0;
/** /**
* @brief ReloadRequest - !TODO: this must be reviewed to add flags to * @brief ReloadRequest - !TODO: this must be reviewed to add flags to

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

@ -167,7 +167,7 @@ EDA_3D_VIEWER::EDA_3D_VIEWER( KIWAY *aKiway, PCB_BASE_FRAME *aParent,
SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y ); SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
// Create the status line // Create the status line
static const int status_dims[4] = { -1, 130, 130, 170 }; static const int status_dims[5] = { -1, -1, 130, 130, 170 };
wxStatusBar *status_bar = CreateStatusBar( arrayDim( status_dims ) ); wxStatusBar *status_bar = CreateStatusBar( arrayDim( status_dims ) );
SetStatusWidths( arrayDim( status_dims ), status_dims ); SetStatusWidths( arrayDim( status_dims ), status_dims );

9
3d-viewer/3d_viewer/eda_3d_viewer.h
View File

@ -50,6 +50,15 @@
#define QUALIFIED_VIEWER3D_FRAMENAME( parent ) \ #define QUALIFIED_VIEWER3D_FRAMENAME( parent ) \
( wxString( VIEWER3D_FRAMENAME ) + wxT( ":" ) + parent->GetName() ) ( wxString( VIEWER3D_FRAMENAME ) + wxT( ":" ) + parent->GetName() )
enum EDA_3D_VIEWER_STATUSBAR
{
STATUS_TEXT = 0,
WARN_TEXT,
X_POS,
Y_POS
};
/** /**
* Create and handle a window for the 3d viewer connected to a Kiway and a pcbboard * Create and handle a window for the 3d viewer connected to a Kiway and a pcbboard
*/ */