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

Gerbview: remove used/unused row indicator 

No longer relevant as we only show in use layers
This commit is contained in:
Mike Williams 2022-07-25 11:23:15 -04:00
parent ece9a782ac
commit 4a6ac8ca2f
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gerbview/widgets/gerbview_layer_widget.cpp
View File

@ -377,9 +377,3 @@ void GERBER_LAYER_WIDGET::OnRenderEnable( int aId, bool isEnabled )
m_frame->GetCanvas()->Refresh(); m_frame->GetCanvas()->Refresh();
} }
bool GERBER_LAYER_WIDGET::useAlternateBitmap( int aRow )
{
return GetImagesList()->GetGbrImage( aRow ) != nullptr;
}

6
gerbview/widgets/gerbview_layer_widget.h
View File

@ -115,12 +115,6 @@ private:
/// on every child control within the layer panel. /// on every child control within the layer panel.
void installRightLayerClickHandler(); void installRightLayerClickHandler();
/**
* @return true if bitmaps shown in Render layer list are alternate bitmaps else false if
* they are "normal" bitmaps.
*/
virtual bool useAlternateBitmap( int aRow ) override;
GERBER_FILE_IMAGE_LIST* GetImagesList(); GERBER_FILE_IMAGE_LIST* GetImagesList();
GERBVIEW_FRAME* m_frame; GERBVIEW_FRAME* m_frame;

13
gerbview/widgets/layer_widget.cpp
View File

@ -404,8 +404,6 @@ void LAYER_WIDGET::updateLayerRow( int aRow, const wxString& aName )
{ {
if( aRow == m_CurrentRow ) if( aRow == m_CurrentRow )
indicator->SetIndicatorState( ROW_ICON_PROVIDER::STATE::ON ); indicator->SetIndicatorState( ROW_ICON_PROVIDER::STATE::ON );
if( useAlternateBitmap( aRow ) )
indicator->SetIndicatorState( ROW_ICON_PROVIDER::STATE::DIMMED );
else else
indicator->SetIndicatorState( ROW_ICON_PROVIDER::STATE::OFF ); indicator->SetIndicatorState( ROW_ICON_PROVIDER::STATE::OFF );
} }
@ -509,7 +507,7 @@ LAYER_WIDGET::LAYER_WIDGET( wxWindow* aParent, wxWindow* aFocusOwner, wxWindowID
// change the font size on the notebook's tabs to match aPointSize // change the font size on the notebook's tabs to match aPointSize
font.SetPointSize( pointSize ); font.SetPointSize( pointSize );
m_notebook->SetFont( font ); m_notebook->SetFont( font );
m_LayerPanel = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_LayerPanel = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxTAB_TRAVERSAL ); wxTAB_TRAVERSAL );
@ -679,12 +677,7 @@ void LAYER_WIDGET::SelectLayerRow( int aRow )
INDICATOR_ICON* oldIndicator = (INDICATOR_ICON*) getLayerComp( m_CurrentRow, 0 ); INDICATOR_ICON* oldIndicator = (INDICATOR_ICON*) getLayerComp( m_CurrentRow, 0 );
if( oldIndicator ) if( oldIndicator )
{ oldIndicator->SetIndicatorState( ROW_ICON_PROVIDER::STATE::OFF );
if( useAlternateBitmap( m_CurrentRow ) )
oldIndicator->SetIndicatorState( ROW_ICON_PROVIDER::STATE::DIMMED );
else
oldIndicator->SetIndicatorState( ROW_ICON_PROVIDER::STATE::OFF );
}
INDICATOR_ICON* newIndicator = (INDICATOR_ICON*) getLayerComp( aRow, 0 ); INDICATOR_ICON* newIndicator = (INDICATOR_ICON*) getLayerComp( aRow, 0 );
@ -846,8 +839,6 @@ void LAYER_WIDGET::UpdateLayerIcons()
if( row == m_CurrentRow ) if( row == m_CurrentRow )
state = ROW_ICON_PROVIDER::STATE::ON; state = ROW_ICON_PROVIDER::STATE::ON;
else if( useAlternateBitmap( row ) )
state = ROW_ICON_PROVIDER::STATE::DIMMED;
else else
state = ROW_ICON_PROVIDER::STATE::OFF; state = ROW_ICON_PROVIDER::STATE::OFF;