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

eeschema: Set grid editor to use qty as the drop-down 

Symbol fields uses a custom expander control.  This should be tied to a
column that cannot be hidden in order to ensure the ability to view sub
elements remains intact, like the standard control.

Fixes: lp:1780847
* https://bugs.launchpad.net/kicad/+bug/1780847
This commit is contained in:
Seth Hillbrand 2019-01-11 17:27:08 -08:00
parent f1fed08fa7
commit 872f0eb44c
2 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
eeschema/dialogs/dialog_fields_editor_global.cpp
View File

@ -43,6 +43,13 @@
#include "dialog_fields_editor_global.h"
#define QUANTITY_COLUMN ( 0 )
// The first column in m_grid is Quantity, so offset the rows
static constexpr int colNumber( const int aCol )
{
return aCol + 1;
}
enum
{
@ -64,12 +71,12 @@ public:
protected:
void showPopupMenu( wxMenu& menu ) override
{
if( m_grid->GetGridCursorCol() == FOOTPRINT )
if( m_grid->GetGridCursorCol() == colNumber( FOOTPRINT ) )
{
menu.Append( MYID_SELECT_FOOTPRINT, _( "Select Footprint..." ), _( "Browse for footprint" ) );
menu.AppendSeparator();
}
else if( m_grid->GetGridCursorCol() == DATASHEET )
else if( m_grid->GetGridCursorCol() == colNumber( DATASHEET ) )
{
menu.Append( MYID_SHOW_DATASHEET, _( "Show Datasheet" ), _( "Show datasheet in browser" ) );
menu.AppendSeparator();
@ -83,17 +90,19 @@ protected:
if( event.GetId() == MYID_SELECT_FOOTPRINT )
{
// pick a footprint using the footprint picker.
wxString fpid = m_grid->GetCellValue( m_grid->GetGridCursorRow(), FOOTPRINT );
wxString fpid = m_grid->GetCellValue( m_grid->GetGridCursorRow(),
colNumber( FOOTPRINT ) );
KIWAY_PLAYER* frame = m_dlg->Kiway().Player( FRAME_PCB_MODULE_VIEWER_MODAL, true, m_dlg );
if( frame->ShowModal( &fpid, m_dlg ) )
m_grid->SetCellValue( m_grid->GetGridCursorRow(), FOOTPRINT, fpid );
m_grid->SetCellValue( m_grid->GetGridCursorRow(), colNumber( FOOTPRINT ), fpid );
frame->Destroy();
}
else if (event.GetId() == MYID_SHOW_DATASHEET )
{
wxString datasheet_uri = m_grid->GetCellValue( m_grid->GetGridCursorRow(), DATASHEET );
wxString datasheet_uri = m_grid->GetCellValue( m_grid->GetGridCursorRow(),
colNumber( DATASHEET ) );
datasheet_uri = ResolveUriByEnvVars( datasheet_uri );
GetAssociatedDocument( m_dlg, datasheet_uri );
}
@ -106,7 +115,7 @@ protected:
{
// Refresh Show checkboxes from grid columns
for( int i = 0; i < m_fieldsCtrl->GetItemCount(); ++i )
m_fieldsCtrl->SetToggleValue( m_grid->IsColShown( i ), i, 1 );
m_fieldsCtrl->SetToggleValue( colNumber( m_grid->IsColShown( i ) ), i, 1 );
}
}
@ -141,8 +150,6 @@ struct DATA_MODEL_ROW
#define SHOW_FIELD_COLUMN 1
#define GROUP_BY_COLUMN 2
#define QUANTITY_COLUMN ( GetNumberCols() - 1 )
#ifdef __WXMAC__
#define COLUMN_MARGIN 5
#else
@ -182,6 +189,7 @@ public:
m_frame( aFrame ),
m_componentRefs( aComponentList ),
m_edited( false ),
m_sortColumn( 0 ),
m_sortAscending( false )
{
m_componentRefs.SplitReferences();
@ -213,7 +221,7 @@ public:
if( aCol == QUANTITY_COLUMN )
return _( "Qty" );
else
return m_fieldNames[ aCol ];
return m_fieldNames[ aCol - 1 ];
}
@ -225,7 +233,7 @@ public:
wxString GetValue( int aRow, int aCol ) override
{
if( aCol == REFERENCE )
if( aCol == QUANTITY_COLUMN )
{
// Poor-man's tree controls
if( m_rows[ aRow ].m_Flag == GROUP_COLLAPSED )
@ -254,7 +262,7 @@ public:
for( const auto& ref : group.m_Refs )
{
if( aCol == REFERENCE || aCol == QUANTITY_COLUMN )
if( aCol == colNumber( REFERENCE ) || aCol == QUANTITY_COLUMN )
{
references.push_back( ref );
}
@ -262,14 +270,18 @@ public:
{
timestamp_t compID = ref.GetComp()->GetTimeStamp();
if( !m_dataStore.count( compID ) ||
!m_dataStore[ compID ].count( m_fieldNames[ aCol - 1 ] ) )
return INDETERMINATE;
if( &ref == &group.m_Refs.front() )
fieldValue = m_dataStore[ compID ][ m_fieldNames[ aCol ] ];
else if ( fieldValue != m_dataStore[ compID ][ m_fieldNames[ aCol ] ] )
fieldValue = m_dataStore[ compID ][ m_fieldNames[ aCol - 1 ] ];
else if ( fieldValue != m_dataStore[ compID ][ m_fieldNames[ aCol - 1 ] ] )
return INDETERMINATE;
}
}
if( aCol == REFERENCE || aCol == QUANTITY_COLUMN )
if( aCol == colNumber( REFERENCE ) || aCol == QUANTITY_COLUMN )
{
// Remove duplicates (other units of multi-unit parts)
std::sort( references.begin(), references.end(),
@ -295,7 +307,7 @@ public:
references.erase( logicalEnd, references.end() );
}
if( aCol == REFERENCE )
if( aCol == colNumber( REFERENCE ) )
{
fieldValue = SCH_REFERENCE_LIST::Shorthand( references );
}
@ -310,7 +322,7 @@ public:
void SetValue( int aRow, int aCol, const wxString &aValue ) override
{
if( aCol == REFERENCE || aCol == QUANTITY_COLUMN )
if( aCol == colNumber( REFERENCE ) || aCol == QUANTITY_COLUMN )
return; // Can't modify references or quantity
wxString value = EscapeString( aValue );
@ -336,12 +348,12 @@ public:
bool retVal;
// Primary sort key is sortCol; secondary is always REFERENCE (column 0)
// Primary sort key is sortCol; secondary is always REFERENCE (column 1)
wxString lhs = dataModel->GetValue( (DATA_MODEL_ROW&) lhGroup, sortCol );
wxString rhs = dataModel->GetValue( (DATA_MODEL_ROW&) rhGroup, sortCol );
if( lhs == rhs || sortCol == REFERENCE )
if( lhs == rhs || sortCol == colNumber( REFERENCE ) )
{
wxString lhRef = lhGroup.m_Refs[ 0 ].GetRef() + lhGroup.m_Refs[ 0 ].GetRefNumber();
wxString rhRef = rhGroup.m_Refs[ 0 ].GetRef() + rhGroup.m_Refs[ 0 ].GetRefNumber();
@ -609,7 +621,7 @@ public:
{
int width = 0;
if( aCol == REFERENCE )
if( aCol == colNumber( REFERENCE ) )
{
for( int row = 0; row < GetNumberRows(); ++row )
{
@ -699,9 +711,9 @@ DIALOG_FIELDS_EDITOR_GLOBAL::DIALOG_FIELDS_EDITOR_GLOBAL( SCH_EDIT_FRAME* parent
for( int i = 0; i < m_fieldsCtrl->GetItemCount(); ++i )
{
if( m_fieldsCtrl->GetToggleValue( i, 1 ) )
m_grid->ShowCol( i );
m_grid->ShowCol( colNumber( i ) );
else
m_grid->HideCol( i );
m_grid->HideCol( colNumber( i ) );
}
// add Cut, Copy, and Paste to wxGrid
@ -713,23 +725,23 @@ DIALOG_FIELDS_EDITOR_GLOBAL::DIALOG_FIELDS_EDITOR_GLOBAL( SCH_EDIT_FRAME* parent
// set reference column attributes
wxGridCellAttr* attr = new wxGridCellAttr;
attr->SetReadOnly();
m_grid->SetColAttr( REFERENCE, attr );
m_grid->SetColAttr( colNumber( REFERENCE ), attr );
// set footprint column browse button
attr = new wxGridCellAttr;
attr->SetEditor( new GRID_CELL_FOOTPRINT_ID_EDITOR( this ) );
m_grid->SetColAttr( FOOTPRINT, attr );
m_grid->SetColAttr( colNumber( FOOTPRINT ), attr );
// set datasheet column viewer button
attr = new wxGridCellAttr;
attr->SetEditor( new GRID_CELL_URL_EDITOR( this ) );
m_grid->SetColAttr( DATASHEET, attr );
m_grid->SetColAttr( colNumber( DATASHEET ), attr );
// set quantities column attributes
attr = new wxGridCellAttr;
attr->SetReadOnly();
m_grid->SetColAttr( m_dataModel->GetColsCount() - 1, attr );
m_grid->SetColFormatNumber( m_dataModel->GetColsCount() - 1 );
m_grid->SetColAttr( QUANTITY_COLUMN, attr );
m_grid->SetColFormatNumber( QUANTITY_COLUMN );
m_grid->AutoSizeColumns( false );
for( int col = 0; col < m_grid->GetNumberCols(); ++ col )
@ -913,9 +925,9 @@ void DIALOG_FIELDS_EDITOR_GLOBAL::OnColumnItemToggled( wxDataViewEvent& event )
m_config->Write( "SymbolFieldEditor/Show/" + fieldName, value );
if( value )
m_grid->ShowCol( row );
m_grid->ShowCol( colNumber( row ) );
else
m_grid->HideCol( row ); // grid's columns map to fieldsCtrl's rows
m_grid->HideCol( colNumber( row ) ); // grid's columns map to fieldsCtrl's rows
break;
}
@ -975,7 +987,7 @@ void DIALOG_FIELDS_EDITOR_GLOBAL::OnRegroupComponents( wxCommandEvent& event )
void DIALOG_FIELDS_EDITOR_GLOBAL::OnTableCellClick( wxGridEvent& event )
{
if( event.GetCol() == REFERENCE )
if( event.GetCol() == QUANTITY_COLUMN )
{
m_grid->ClearSelection();
m_grid->SetGridCursor( event.GetRow(), event.GetCol() );

2
eeschema/dialogs/dialog_fields_editor_global_base.cpp
View File

@ -64,7 +64,7 @@ DIALOG_FIELDS_EDITOR_GLOBAL_BASE::DIALOG_FIELDS_EDITOR_GLOBAL_BASE( wxWindow* pa
m_grid = new WX_GRID( m_panel4, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
// Grid
m_grid->CreateGrid( 5, 5 );
m_grid->CreateGrid( 5, 6 );
m_grid->EnableEditing( true );
m_grid->EnableGridLines( true );
m_grid->EnableDragGridSize( false );