Remove vestiges of legacy BLOCK architecture from eeschema.
This commit is contained in:
parent
1a3d0492f5
commit
38cdafd407
|
@ -136,7 +136,6 @@ BEGIN_EVENT_TABLE( LIB_EDIT_FRAME, EDA_DRAW_FRAME )
|
||||||
EVT_MENU( ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, LIB_EDIT_FRAME::Process_Config )
|
EVT_MENU( ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, LIB_EDIT_FRAME::Process_Config )
|
||||||
|
|
||||||
// Update user interface elements.
|
// Update user interface elements.
|
||||||
EVT_UPDATE_UI( wxID_PASTE, LIB_EDIT_FRAME::OnUpdatePaste )
|
|
||||||
EVT_UPDATE_UI( ID_LIBEDIT_EXPORT_PART, LIB_EDIT_FRAME::OnUpdateHavePart )
|
EVT_UPDATE_UI( ID_LIBEDIT_EXPORT_PART, LIB_EDIT_FRAME::OnUpdateHavePart )
|
||||||
EVT_UPDATE_UI( ID_LIBEDIT_SAVE, LIB_EDIT_FRAME::OnUpdateSave )
|
EVT_UPDATE_UI( ID_LIBEDIT_SAVE, LIB_EDIT_FRAME::OnUpdateSave )
|
||||||
EVT_UPDATE_UI( ID_LIBEDIT_SAVE_ALL, LIB_EDIT_FRAME::OnUpdateSave )
|
EVT_UPDATE_UI( ID_LIBEDIT_SAVE_ALL, LIB_EDIT_FRAME::OnUpdateSave )
|
||||||
|
@ -445,12 +444,6 @@ void LIB_EDIT_FRAME::OnUpdateEditingPart( wxUpdateUIEvent& aEvent )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void LIB_EDIT_FRAME::OnUpdatePaste( wxUpdateUIEvent& event )
|
|
||||||
{
|
|
||||||
event.Enable( m_clipboard.GetCount() > 0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void LIB_EDIT_FRAME::OnUpdateSyncPinEdit( wxUpdateUIEvent& event )
|
void LIB_EDIT_FRAME::OnUpdateSyncPinEdit( wxUpdateUIEvent& event )
|
||||||
{
|
{
|
||||||
LIB_PART* part = GetCurPart();
|
LIB_PART* part = GetCurPart();
|
||||||
|
|
|
@ -290,7 +290,6 @@ public:
|
||||||
void OnCheckComponent( wxCommandEvent& event );
|
void OnCheckComponent( wxCommandEvent& event );
|
||||||
void OnSelectBodyStyle( wxCommandEvent& event );
|
void OnSelectBodyStyle( wxCommandEvent& event );
|
||||||
|
|
||||||
void OnUpdatePaste( wxUpdateUIEvent& event );
|
|
||||||
void OnUpdateEditingPart( wxUpdateUIEvent& event );
|
void OnUpdateEditingPart( wxUpdateUIEvent& event );
|
||||||
void OnUpdateHavePart( wxUpdateUIEvent& aEvent );
|
void OnUpdateHavePart( wxUpdateUIEvent& aEvent );
|
||||||
void OnUpdateSave( wxUpdateUIEvent& aEvent );
|
void OnUpdateSave( wxUpdateUIEvent& aEvent );
|
||||||
|
@ -597,9 +596,6 @@ private:
|
||||||
///> Renames LIB_PART aliases to avoid conflicts before adding a component to a library
|
///> Renames LIB_PART aliases to avoid conflicts before adding a component to a library
|
||||||
void fixDuplicateAliases( LIB_PART* aPart, const wxString& aLibrary );
|
void fixDuplicateAliases( LIB_PART* aPart, const wxString& aLibrary );
|
||||||
|
|
||||||
///> Clipboard buffer storing LIB_ITEMs
|
|
||||||
BLOCK_SELECTOR m_clipboard;
|
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE()
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -503,92 +503,6 @@ KIGFX::SCH_RENDER_SETTINGS* SCH_BASE_FRAME::GetRenderSettings()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool SCH_BASE_FRAME::HandleBlockBegin( wxDC* aDC, EDA_KEY aKey, const wxPoint& aPosition,
|
|
||||||
int aExplicitCommand )
|
|
||||||
{
|
|
||||||
BLOCK_SELECTOR* block = &GetScreen()->m_BlockLocate;
|
|
||||||
|
|
||||||
if( ( block->GetCommand() != BLOCK_IDLE ) || ( block->GetState() != STATE_NO_BLOCK ) )
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if( aExplicitCommand == 0 )
|
|
||||||
block->SetCommand( (BLOCK_COMMAND_T) BlockCommand( aKey ) );
|
|
||||||
else
|
|
||||||
block->SetCommand( (BLOCK_COMMAND_T) aExplicitCommand );
|
|
||||||
|
|
||||||
if( block->GetCommand() == 0 )
|
|
||||||
return false;
|
|
||||||
|
|
||||||
switch( block->GetCommand() )
|
|
||||||
{
|
|
||||||
case BLOCK_IDLE:
|
|
||||||
break;
|
|
||||||
|
|
||||||
case BLOCK_MOVE: // Move
|
|
||||||
case BLOCK_DRAG: // Drag (block defined)
|
|
||||||
case BLOCK_DRAG_ITEM: // Drag from a drag item command
|
|
||||||
case BLOCK_DUPLICATE: // Duplicate
|
|
||||||
case BLOCK_DUPLICATE_AND_INCREMENT: // Duplicate and increment relevant references
|
|
||||||
case BLOCK_DELETE: // Delete
|
|
||||||
case BLOCK_COPY: // Copy
|
|
||||||
case BLOCK_FLIP: // Flip
|
|
||||||
case BLOCK_ZOOM: // Window Zoom
|
|
||||||
case BLOCK_MIRROR_X:
|
|
||||||
case BLOCK_MIRROR_Y: // mirror
|
|
||||||
block->InitData( m_canvas, aPosition );
|
|
||||||
GetCanvas()->GetView()->ShowSelectionArea();
|
|
||||||
break;
|
|
||||||
|
|
||||||
case BLOCK_PASTE:
|
|
||||||
{
|
|
||||||
block->InitData( m_canvas, aPosition );
|
|
||||||
InitBlockPasteInfos();
|
|
||||||
|
|
||||||
wxRect bounds( 0, 0, 0, 0 );
|
|
||||||
|
|
||||||
for( unsigned i = 0; i < block->GetCount(); ++i )
|
|
||||||
bounds.Union( block->GetItem( i )->GetBoundingBox() );
|
|
||||||
|
|
||||||
block->SetOrigin( bounds.GetPosition() );
|
|
||||||
block->SetSize( bounds.GetSize() );
|
|
||||||
block->SetLastCursorPosition( wxPoint( 0, 0 ) );
|
|
||||||
|
|
||||||
if( block->GetCount() == 0 ) // No data to paste
|
|
||||||
{
|
|
||||||
DisplayError( this, _( "Nothing to paste" ), 20 );
|
|
||||||
GetScreen()->m_BlockLocate.SetCommand( BLOCK_IDLE );
|
|
||||||
m_canvas->SetMouseCaptureCallback( NULL );
|
|
||||||
block->SetState( STATE_NO_BLOCK );
|
|
||||||
block->SetMessageBlock( this );
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( !m_canvas->IsMouseCaptured() )
|
|
||||||
{
|
|
||||||
block->ClearItemsList();
|
|
||||||
wxFAIL_MSG( "SCH_BASE_FRAME::HandleBlockBegin() error: m_mouseCaptureCallback NULL" );
|
|
||||||
block->SetState( STATE_NO_BLOCK );
|
|
||||||
block->SetMessageBlock( this );
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
block->SetState( STATE_BLOCK_MOVE );
|
|
||||||
block->SetFlags( IS_MOVED );
|
|
||||||
m_canvas->CallMouseCapture( aDC, aPosition, false );
|
|
||||||
m_canvas->Refresh();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
wxFAIL_MSG( wxString::Format( "SCH_BASE_FRAME::HandleBlockBegin() unknown command: %s",
|
|
||||||
block->GetCommand() ) );
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
block->SetMessageBlock( this );
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void SCH_BASE_FRAME::createCanvas()
|
void SCH_BASE_FRAME::createCanvas()
|
||||||
{
|
{
|
||||||
m_canvasType = LoadCanvasTypeSetting();
|
m_canvasType = LoadCanvasTypeSetting();
|
||||||
|
|
|
@ -353,9 +353,6 @@ protected:
|
||||||
*/
|
*/
|
||||||
bool saveSymbolLibTables( bool aGlobal, bool aProject );
|
bool saveSymbolLibTables( bool aGlobal, bool aProject );
|
||||||
|
|
||||||
virtual bool HandleBlockBegin( wxDC* aDC, EDA_KEY aKey, const wxPoint& aPosition,
|
|
||||||
int aExplicitCommand = 0 ) override;
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // SCH_BASE_FRAME_H_
|
#endif // SCH_BASE_FRAME_H_
|
||||||
|
|
|
@ -276,7 +276,6 @@ BEGIN_EVENT_TABLE( SCH_EDIT_FRAME, EDA_DRAW_FRAME )
|
||||||
EVT_MENU( ID_MENU_CANVAS_OPENGL, SCH_EDIT_FRAME::OnSwitchCanvas )
|
EVT_MENU( ID_MENU_CANVAS_OPENGL, SCH_EDIT_FRAME::OnSwitchCanvas )
|
||||||
|
|
||||||
/* Handle user interface update events. */
|
/* Handle user interface update events. */
|
||||||
EVT_UPDATE_UI( wxID_PASTE, SCH_EDIT_FRAME::OnUpdatePaste )
|
|
||||||
EVT_UPDATE_UI( ID_SAVE_PROJECT, SCH_EDIT_FRAME::OnUpdateSave )
|
EVT_UPDATE_UI( ID_SAVE_PROJECT, SCH_EDIT_FRAME::OnUpdateSave )
|
||||||
EVT_UPDATE_UI( ID_UPDATE_ONE_SHEET, SCH_EDIT_FRAME::OnUpdateSaveSheet )
|
EVT_UPDATE_UI( ID_UPDATE_ONE_SHEET, SCH_EDIT_FRAME::OnUpdateSaveSheet )
|
||||||
EVT_UPDATE_UI( ID_REMAP_SYMBOLS, SCH_EDIT_FRAME::OnUpdateRemapSymbols )
|
EVT_UPDATE_UI( ID_REMAP_SYMBOLS, SCH_EDIT_FRAME::OnUpdateRemapSymbols )
|
||||||
|
@ -734,12 +733,6 @@ void SCH_EDIT_FRAME::OnModify()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void SCH_EDIT_FRAME::OnUpdatePaste( wxUpdateUIEvent& event )
|
|
||||||
{
|
|
||||||
event.Enable( m_blockItems.GetCount() > 0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void SCH_EDIT_FRAME::OnUpdateSave( wxUpdateUIEvent& aEvent )
|
void SCH_EDIT_FRAME::OnUpdateSave( wxUpdateUIEvent& aEvent )
|
||||||
{
|
{
|
||||||
SCH_SHEET_LIST sheetList( g_RootSheet );
|
SCH_SHEET_LIST sheetList( g_RootSheet );
|
||||||
|
|
|
@ -119,7 +119,6 @@ private:
|
||||||
DIALOG_SCH_FIND* m_dlgFindReplace;
|
DIALOG_SCH_FIND* m_dlgFindReplace;
|
||||||
wxArrayString m_findStringHistoryList;
|
wxArrayString m_findStringHistoryList;
|
||||||
wxArrayString m_replaceStringHistoryList;
|
wxArrayString m_replaceStringHistoryList;
|
||||||
BLOCK_SELECTOR m_blockItems; ///< List of selected items.
|
|
||||||
SCH_ITEM* m_item_to_repeat; ///< Last item to insert by the repeat command.
|
SCH_ITEM* m_item_to_repeat; ///< Last item to insert by the repeat command.
|
||||||
int m_repeatLabelDelta; ///< Repeat label number increment step.
|
int m_repeatLabelDelta; ///< Repeat label number increment step.
|
||||||
SCH_FIND_COLLECTOR m_foundItems; ///< List of find/replace items.
|
SCH_FIND_COLLECTOR m_foundItems; ///< List of find/replace items.
|
||||||
|
@ -797,7 +796,6 @@ private:
|
||||||
void OnPreferencesOptions( wxCommandEvent& event );
|
void OnPreferencesOptions( wxCommandEvent& event );
|
||||||
|
|
||||||
/* User interface update event handlers. */
|
/* User interface update event handlers. */
|
||||||
void OnUpdatePaste( wxUpdateUIEvent& event );
|
|
||||||
void OnUpdateSave( wxUpdateUIEvent& aEvent );
|
void OnUpdateSave( wxUpdateUIEvent& aEvent );
|
||||||
void OnUpdateSaveSheet( wxUpdateUIEvent& aEvent );
|
void OnUpdateSaveSheet( wxUpdateUIEvent& aEvent );
|
||||||
void OnUpdateRemapSymbols( wxUpdateUIEvent& aEvent );
|
void OnUpdateRemapSymbols( wxUpdateUIEvent& aEvent );
|
||||||
|
|
Loading…
Reference in New Issue