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

Move sheet drawing and resizing to modern toolset and fix some bugs. 

Fixes: lp:1825204
* https://bugs.launchpad.net/kicad/+bug/1825204
This commit is contained in:
Jeff Young 2019-04-18 16:45:10 +01:00
parent 3d7c070faf
commit cc18464f8f
9 changed files with 275 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
eeschema/onleftclick.cpp
View File

@ -29,54 +29,39 @@
#include <sch_draw_panel.h>
#include <sch_edit_frame.h>
#include <sim/sim_plot_frame.h>
#include <menus_helpers.h>
#include <sch_component.h>
#include <sch_sheet.h>
#include <sch_sheet_path.h>
#include <sch_bitmap.h>
#include <netlist_object.h>
#include <sch_view.h>
void SCH_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition )
{
switch( GetToolId() )
{
case ID_HIGHLIGHT_BUTT:
case ID_WIRE_BUTT:
case ID_BUS_BUTT:
case ID_NOCONN_BUTT:
case ID_JUNCTION_BUTT:
case ID_WIRETOBUS_ENTRY_BUTT:
case ID_BUSTOBUS_ENTRY_BUTT:
case ID_SCH_PLACE_COMPONENT:
case ID_PLACE_POWER_BUTT:
case ID_LABEL_BUTT:
case ID_GLOBALLABEL_BUTT:
case ID_HIERLABEL_BUTT:
case ID_TEXT_COMMENT_BUTT:
case ID_LINE_COMMENT_BUTT:
case ID_ADD_IMAGE_BUTT:
case ID_ZOOM_SELECTION:
return; // Moved to modern toolset
default:
break;
}
SCH_ITEM* item = GetScreen()->GetCurItem();
SCH_ITEM* item = GetScreen()->GetCurItem();
// item_flags != 0 means a current item in edit, or new ...
int item_flags = item ? (item->GetFlags() & ~HIGHLIGHTED) : 0;
if( ( GetToolId() == ID_NO_TOOL_SELECTED ) || item_flags )
if( GetToolId() == ID_NO_TOOL_SELECTED )
{
m_canvas->SetAutoPanRequest( false );
SetRepeatItem( NULL );
if( item_flags )
// item_flags != 0 means a current item in edit
if( item && ( item->GetFlags() & ~HIGHLIGHTED ) )
{
switch( item->Type() )
{
case SCH_LABEL_T:
case SCH_GLOBAL_LABEL_T:
case SCH_HIER_LABEL_T:
case SCH_TEXT_T:
case SCH_SHEET_PIN_T:
case SCH_SHEET_T:
case SCH_BUS_WIRE_ENTRY_T:
case SCH_BUS_BUS_ENTRY_T:
case SCH_JUNCTION_T:
case SCH_COMPONENT_T:
case SCH_FIELD_T:
case SCH_BITMAP_T:
case SCH_NO_CONNECT_T:
AddItemToScreen( item );
GetCanvas()->GetView()->ClearPreview();
GetCanvas()->GetView()->ClearHiddenFlags();
@ -100,51 +85,10 @@ void SCH_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition )
switch( GetToolId() )
{
case ID_NO_TOOL_SELECTED:
break;
case ID_SCHEMATIC_DELETE_ITEM_BUTT:
DeleteItemAtCrossHair();
break;
case ID_SHEET_SYMBOL_BUTT:
if( item_flags == 0 )
{
item = CreateSheet( aDC );
if( item != NULL )
{
GetScreen()->SetCurItem( item );
m_canvas->SetAutoPanRequest( true );
}
}
else
{
AddItemToScreen( item );
}
break;
case ID_IMPORT_HLABEL_BUTT:
case ID_SHEET_PIN_BUTT:
if( item_flags == 0 )
item = LocateAndShowItem( aPosition, SCH_COLLECTOR::SheetsAndSheetLabels );
if( item == NULL )
break;
if( (item->Type() == SCH_SHEET_T) && (item_flags == 0) )
{
if( GetToolId() == ID_IMPORT_HLABEL_BUTT )
GetScreen()->SetCurItem( ImportSheetPin( (SCH_SHEET*) item ) );
else
GetScreen()->SetCurItem( CreateSheetPin( (SCH_SHEET*) item ) );
}
else if( (item->Type() == SCH_SHEET_PIN_T) && (item->GetFlags() != 0) )
{
AddItemToScreen( item );
}
break;
#ifdef KICAD_SPICE
case ID_SIM_PROBE:
{
@ -199,9 +143,7 @@ void SCH_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition )
#endif /* KICAD_SPICE */
default:
SetNoToolSelected();
wxFAIL_MSG( wxT( "SCH_EDIT_FRAME::OnLeftClick invalid tool ID <" ) +
wxString::Format( wxT( "%d> selected." ), GetToolId() ) );
break;
}
}

4
eeschema/sch_edit_frame.cpp
View File

@ -1335,10 +1335,6 @@ void SCH_EDIT_FRAME::AddItemToScreen( SCH_ITEM* aItem )
if( aItem->Type() == SCH_SHEET_T )
{
// Fix the size and position of the new sheet using the last values set by
// the m_mouseCaptureCallback function.
m_canvas->SetMouseCapture( NULL, NULL );
if( !EditSheet( (SCH_SHEET*)aItem, g_CurrentSheet, &doClearAnnotation ) )
{
screen->SetCurItem( NULL );

6
eeschema/sch_edit_frame.h
View File

@ -1025,8 +1025,6 @@ private:
// Hierarchical Sheet & PinSheet
void InstallHierarchyFrame( wxPoint& pos );
SCH_SHEET* CreateSheet( wxDC* DC );
void ReSizeSheet( SCH_SHEET* Sheet, wxDC* DC );
/**
* Rotate a sheet object.
@ -1101,8 +1099,7 @@ private:
*/
bool importFile( const wxString& aFileName, int aFileType );
bool validateSheet( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHierarchy );
public:
/**
* Create a new SCH_SHEET_PIN object and add it to \a aSheet at the current cursor position.
*
@ -1129,7 +1126,6 @@ private:
*/
SCH_SHEET_PIN* ImportSheetPin( SCH_SHEET* aSheet );
public:
/**
* Remove \a aItem from the current screen and saves it in the undo list.
*

30
eeschema/schedit.cpp
View File

@ -215,15 +215,6 @@
AddItemToScreen( item );
break;
case ID_POPUP_SCH_RESIZE_SHEET:
ReSizeSheet( (SCH_SHEET*) item, nullptr );
break;
case ID_POPUP_IMPORT_HLABEL_TO_SHEETPIN:
if( item != NULL && item->Type() == SCH_SHEET_T )
screen->SetCurItem( ImportSheetPin( (SCH_SHEET*) item ) );
break;
case ID_POPUP_SCH_CLEANUP_SHEET:
if( item != NULL && item->Type() == SCH_SHEET_T )
{
@ -537,6 +528,12 @@ void SCH_EDIT_FRAME::OnSelectTool( wxCommandEvent& aEvent )
case ID_MENU_LINE_COMMENT_BUTT:
case ID_LINE_COMMENT_BUTT:
case ID_ZOOM_SELECTION:
case ID_MENU_SHEET_SYMBOL_BUTT:
case ID_SHEET_SYMBOL_BUTT:
case ID_MENU_SHEET_PIN_BUTT:
case ID_SHEET_PIN_BUTT:
case ID_MENU_IMPORT_HLABEL_BUTT:
case ID_IMPORT_HLABEL_BUTT:
// moved to modern toolset
return;
default:
@ -551,21 +548,6 @@ void SCH_EDIT_FRAME::OnSelectTool( wxCommandEvent& aEvent )
SetNoToolSelected();
break;
case ID_MENU_SHEET_SYMBOL_BUTT:
case ID_SHEET_SYMBOL_BUTT:
SetToolID( ID_SHEET_SYMBOL_BUTT, wxCURSOR_PENCIL, _( "Add sheet" ) );
break;
case ID_MENU_SHEET_PIN_BUTT:
case ID_SHEET_PIN_BUTT:
SetToolID( ID_SHEET_PIN_BUTT, wxCURSOR_PENCIL, _( "Add sheet pins" ) );
break;
case ID_MENU_IMPORT_HLABEL_BUTT:
case ID_IMPORT_HLABEL_BUTT:
SetToolID( ID_IMPORT_HLABEL_BUTT, wxCURSOR_PENCIL, _( "Import sheet pins" ) );
break;
case ID_MENU_DELETE_ITEM_BUTT:
case ID_SCHEMATIC_DELETE_ITEM_BUTT:
SetToolID( ID_SCHEMATIC_DELETE_ITEM_BUTT, wxCURSOR_BULLSEYE, _( "Delete item" ) );

157
eeschema/sheet.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2004-2018 KiCad Developers, see change_log.txt for contributors.
* Copyright (C) 2004-2019 KiCad Developers, see change_log.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -22,10 +22,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file sheet.cpp
*/
#include <fctsys.h>
#include <sch_draw_panel.h>
#include <confirm.h>
@ -308,157 +304,6 @@ bool SCH_EDIT_FRAME::EditSheet( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHierarchy,
}
/* Move selected sheet with the cursor.
* Callback function used by m_mouseCaptureCallback.
* Note also now this function is called only when resizing the sheet
* But the (very small code) relative to sheet move is still present here
*/
static void resizeSheetWithMouseCursor( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aPosition,
bool aErase )
{
BASE_SCREEN* screen = aPanel->GetScreen();
SCH_SHEET* sheet = dynamic_cast<SCH_SHEET*>( screen->GetCurItem() );
if( sheet == nullptr ) // Be sure we are using the right object
return;
wxPoint pos = sheet->GetPosition();
int width = aPanel->GetParent()->GetCrossHairPosition().x - pos.x;
int height = aPanel->GetParent()->GetCrossHairPosition().y - pos.y;
// If the sheet doesn't have any pins, clamp the minimum size to the default values.
width = ( width < MIN_SHEET_WIDTH ) ? MIN_SHEET_WIDTH : width;
height = ( height < MIN_SHEET_HEIGHT ) ? MIN_SHEET_HEIGHT : height;
if( sheet->HasPins() )
{
int gridSizeX = KiROUND( screen->GetGridSize().x );
int gridSizeY = KiROUND( screen->GetGridSize().y );
// If the sheet has pins, use the pin positions to clamp the minimum width and height.
height = ( height < sheet->GetMinHeight() + gridSizeY ) ?
sheet->GetMinHeight() + gridSizeY : height;
width = ( width < sheet->GetMinWidth() + gridSizeX ) ?
sheet->GetMinWidth() + gridSizeX : width;
}
wxPoint grid = aPanel->GetParent()->GetNearestGridPosition(
wxPoint( pos.x + width, pos.y + height ) );
sheet->Resize( wxSize( grid.x - pos.x, grid.y - pos.y ) );
auto panel = static_cast<SCH_DRAW_PANEL*>( aPanel );
auto view = panel->GetView();
view->Hide( sheet );
view->ClearPreview();
view->AddToPreview( sheet->Clone() );
}
// Complete sheet move.
static void ExitSheet( EDA_DRAW_PANEL* aPanel, wxDC* aDC )
{
SCH_SCREEN* screen = (SCH_SCREEN*) aPanel->GetScreen();
SCH_ITEM* item = screen->GetCurItem();
SCH_EDIT_FRAME* parent = (SCH_EDIT_FRAME*) aPanel->GetParent();
if( (item == NULL) || (item->Type() != SCH_SHEET_T) || (parent == NULL) )
return;
parent->SetRepeatItem( NULL );
if( item->IsNew() )
{
delete item;
}
else if( item->IsMoving() || item->IsResized() )
{
parent->RemoveFromScreen( item );
delete item;
item = parent->GetUndoItem();
wxCHECK_RET( item != NULL, wxT( "Cannot restore undefined last sheet item." ) );
parent->AddToScreen( item );
// the owner of item is no more parent, this is the draw list of screen:
parent->SetUndoItem( NULL );
item->ClearFlags();
}
else
{
item->ClearFlags();
}
auto panel = static_cast<SCH_DRAW_PANEL*>( aPanel );
auto view = panel->GetView();
view->ClearPreview();
screen->SetCurItem( NULL );
}
// Create hierarchy sheet.
SCH_SHEET* SCH_EDIT_FRAME::CreateSheet( wxDC* aDC )
{
SetRepeatItem( NULL );
SCH_SHEET* sheet = new SCH_SHEET( GetCrossHairPosition() );
sheet->SetFlags( IS_NEW | IS_RESIZED );
sheet->SetTimeStamp( GetNewTimeStamp() );
sheet->SetParent( GetScreen() );
sheet->SetScreen( NULL );
// need to check if this is being added to the GetDrawItems().
// also need to update the hierarchy, if we are adding
// a sheet to a screen that already has multiple instances (!)
GetScreen()->SetCurItem( sheet );
m_canvas->SetMouseCapture( resizeSheetWithMouseCursor, ExitSheet );
m_canvas->CallMouseCapture( aDC, wxDefaultPosition, false );
m_canvas->CrossHairOff( aDC );
SetCrossHairPosition( sheet->GetResizePosition() );
m_canvas->MoveCursorToCrossHair();
m_canvas->CrossHairOn( aDC );
return sheet;
}
void SCH_EDIT_FRAME::ReSizeSheet( SCH_SHEET* aSheet, wxDC* aDC )
{
if( aSheet == NULL || aSheet->IsNew() )
return;
wxCHECK_RET( aSheet->Type() == SCH_SHEET_T,
wxString::Format( wxT( "Cannot perform sheet resize on %s object." ),
GetChars( aSheet->GetClass() ) ) );
m_canvas->CrossHairOff( aDC );
SetCrossHairPosition( aSheet->GetResizePosition() );
m_canvas->MoveCursorToCrossHair();
m_canvas->CrossHairOn( aDC );
SetUndoItem( aSheet );
aSheet->SetFlags( IS_RESIZED );
std::vector<DANGLING_END_ITEM> emptySet;
aSheet->UpdateDanglingState( emptySet );
m_canvas->SetMouseCapture( resizeSheetWithMouseCursor, ExitSheet );
m_canvas->CallMouseCapture( aDC, wxDefaultPosition, true );
if( aSheet->IsNew() ) // not already in edit, save a copy for undo/redo
SetUndoItem( aSheet );
}
void SCH_EDIT_FRAME::RotateHierarchicalSheet( SCH_SHEET* aSheet, bool aRotCCW )
{
if( aSheet == NULL )

16
eeschema/tools/sch_actions.cpp
View File

@ -125,6 +125,22 @@ OPT<TOOL_EVENT> SCH_ACTIONS::TranslateLegacyId( int aId )
case ID_HIERLABEL_BUTT:
return SCH_ACTIONS::placeHierarchicalLabel.MakeEvent();
case ID_MENU_SHEET_PIN_BUTT:
case ID_SHEET_PIN_BUTT:
return SCH_ACTIONS::placeSheetPin.MakeEvent();
case ID_POPUP_IMPORT_HLABEL_TO_SHEETPIN:
case ID_MENU_IMPORT_HLABEL_BUTT:
case ID_IMPORT_HLABEL_BUTT:
return SCH_ACTIONS::importSheetPin.MakeEvent();
case ID_MENU_SHEET_SYMBOL_BUTT:
case ID_SHEET_SYMBOL_BUTT:
return SCH_ACTIONS::drawSheet.MakeEvent();
case ID_POPUP_SCH_RESIZE_SHEET:
return SCH_ACTIONS::resizeSheet.MakeEvent();
case ID_MENU_TEXT_COMMENT_BUTT:
case ID_TEXT_COMMENT_BUTT:
return SCH_ACTIONS::placeSchematicText.MakeEvent();

4
eeschema/tools/sch_actions.h
View File

@ -100,6 +100,10 @@ public:
static TOOL_ACTION placeLabel;
static TOOL_ACTION placeGlobalLabel;
static TOOL_ACTION placeHierarchicalLabel;
static TOOL_ACTION drawSheet;
static TOOL_ACTION resizeSheet;
static TOOL_ACTION placeSheetPin;
static TOOL_ACTION importSheetPin;
static TOOL_ACTION placeSchematicText;
static TOOL_ACTION drawLines;
static TOOL_ACTION placeImage;

234
eeschema/tools/sch_drawing_tool.cpp
View File

@ -91,6 +91,22 @@ TOOL_ACTION SCH_ACTIONS::placeHierarchicalLabel( "eeschema.InteractiveDrawing.pl
AS_GLOBAL, TOOL_ACTION::LegacyHotKey( HK_ADD_HLABEL ),
_( "Add Hierarchical Label" ), _( "Add a hierarchical sheet label" ), NULL, AF_ACTIVATE );
TOOL_ACTION SCH_ACTIONS::drawSheet( "eeschema.InteractiveDrawing.drawSheet",
AS_GLOBAL, TOOL_ACTION::LegacyHotKey( HK_ADD_HIER_SHEET ),
_( "Add Sheet" ), _( "Add a hierarchical sheet" ), NULL, AF_ACTIVATE );
TOOL_ACTION SCH_ACTIONS::resizeSheet( "eeschema.InteractiveDrawing.resizeSheet",
AS_GLOBAL, 0,
_( "Resize Sheet" ), _( "Resize hierarchical sheet" ), NULL, AF_NONE );
TOOL_ACTION SCH_ACTIONS::placeSheetPin( "eeschema.InteractiveDrawing.placeSheetPin",
AS_GLOBAL, 0,
_( "Add Sheet Pin" ), _( "Add a sheet pin" ), NULL, AF_ACTIVATE );
TOOL_ACTION SCH_ACTIONS::importSheetPin( "eeschema.InteractiveDrawing.importSheetPin",
AS_GLOBAL, 0,
_( "Import Sheet Pin" ), _( "Import a hierarchical sheet pin" ), NULL, AF_ACTIVATE );
TOOL_ACTION SCH_ACTIONS::placeGlobalLabel( "eeschema.InteractiveDrawing.placeGlobalLabel",
AS_GLOBAL, TOOL_ACTION::LegacyHotKey( HK_ADD_GLABEL ),
_( "Add Global Label" ), _( "Add a global label" ), NULL, AF_ACTIVATE );
@ -405,6 +421,20 @@ int SCH_DRAWING_TOOL::PlaceHierarchicalLabel( const TOOL_EVENT& aEvent )
}
int SCH_DRAWING_TOOL::PlaceSheetPin( const TOOL_EVENT& aEvent )
{
m_frame->SetToolID( ID_SHEET_PIN_BUTT, wxCURSOR_PENCIL, _( "Add sheet pins" ) );
return doTwoClickPlace( SCH_SHEET_PIN_T );
}
int SCH_DRAWING_TOOL::ImportSheetPin( const TOOL_EVENT& aEvent )
{
m_frame->SetToolID( ID_IMPORT_HLABEL_BUTT, wxCURSOR_PENCIL, _( "Import sheet pins" ) );
return doTwoClickPlace( SCH_SHEET_PIN_T );
}
int SCH_DRAWING_TOOL::PlaceSchematicText( const TOOL_EVENT& aEvent )
{
m_frame->SetToolID( ID_TEXT_COMMENT_BUTT, wxCURSOR_PENCIL, _( "Add text" ) );
@ -461,12 +491,34 @@ int SCH_DRAWING_TOOL::doTwoClickPlace( KICAD_T aType )
switch( aType )
{
case SCH_LABEL_T: item = m_frame->CreateNewText( LAYER_LOCLABEL ); break;
case SCH_HIER_LABEL_T: item = m_frame->CreateNewText( LAYER_HIERLABEL ); break;
case SCH_GLOBAL_LABEL_T: item = m_frame->CreateNewText( LAYER_GLOBLABEL ); break;
case SCH_TEXT_T: item = m_frame->CreateNewText( LAYER_NOTES ); break;
case SCH_BITMAP_T: item = m_frame->CreateNewImage(); break;
default: wxFAIL_MSG( "doTwoClickPlace(): unknown type" );
case SCH_LABEL_T:
item = m_frame->CreateNewText( LAYER_LOCLABEL );
break;
case SCH_HIER_LABEL_T:
item = m_frame->CreateNewText( LAYER_HIERLABEL );
break;
case SCH_GLOBAL_LABEL_T:
item = m_frame->CreateNewText( LAYER_GLOBLABEL );
break;
case SCH_TEXT_T:
item = m_frame->CreateNewText( LAYER_NOTES );
break;
case SCH_BITMAP_T:
item = m_frame->CreateNewImage();
break;
case SCH_SHEET_PIN_T:
item = m_frame->LocateAndShowItem( (wxPoint)cursorPos,
SCH_COLLECTOR::SheetsAndSheetLabels );
if( item )
{
if( m_frame->GetToolId() == ID_IMPORT_HLABEL_BUTT )
item = m_frame->ImportSheetPin( (SCH_SHEET*) item );
else
item = m_frame->CreateSheetPin( (SCH_SHEET*) item );
}
break;
default:
wxFAIL_MSG( "doTwoClickPlace(): unknown type" );
}
// Restore cursor after dialog
@ -753,7 +805,6 @@ int SCH_DRAWING_TOOL::doDrawSegments( int aType )
if( segment || m_busUnfold.in_progress )
{
segment = nullptr;
getModel<SCH_SCREEN>()->SetCurItem( nullptr );
s_wires.DeleteAll();
if( m_busUnfold.entry )
@ -771,7 +822,8 @@ int SCH_DRAWING_TOOL::doDrawSegments( int aType )
m_view->ClearHiddenFlags();
// Clear flags used in edit functions.
getModel<SCH_SCREEN>()->ClearDrawingState();
m_frame->GetScreen()->ClearDrawingState();
m_frame->GetScreen()->SetCurItem( nullptr );
}
else
break;
@ -1013,11 +1065,171 @@ void SCH_DRAWING_TOOL::finishSegments()
m_frame->TestDanglingEnds();
m_frame->GetScreen()->ClearDrawingState();
m_frame->GetScreen()->SetCurItem( NULL );
m_frame->GetScreen()->SetCurItem( nullptr );
m_frame->OnModify();
}
int SCH_DRAWING_TOOL::DrawSheet( const TOOL_EVENT& aEvent )
{
m_frame->SetToolID( ID_SHEET_SYMBOL_BUTT, wxCURSOR_PENCIL, _( "Add sheet" ) );
return doDrawSheet( nullptr );
}
int SCH_DRAWING_TOOL::ResizeSheet( const TOOL_EVENT& aEvent )
{
SCH_SHEET* sheet = dynamic_cast<SCH_SHEET*>( m_frame->GetScreen()->GetCurItem() );
if( sheet )
{
m_frame->SetToolID( ID_POPUP_SCH_RESIZE_SHEET, wxCURSOR_PENCIL, _( "Resize sheet" ) );
doDrawSheet( sheet );
}
else
wxFAIL_MSG( "No sheet to resize" );
return 0;
}
int SCH_DRAWING_TOOL::doDrawSheet( SCH_SHEET *aSheet )
{
m_toolMgr->RunAction( SCH_ACTIONS::selectionClear, true );
m_controls->ShowCursor( true );
m_controls->SetSnapping( true );
if( aSheet )
{
m_frame->SetUndoItem( aSheet );
aSheet->SetFlags( IS_RESIZED );
m_view->Hide( aSheet );
m_view->AddToPreview( aSheet->Clone() );
m_controls->SetCursorPosition( aSheet->GetResizePosition() );
m_controls->SetCrossHairCursorPosition( m_controls->GetCursorPosition() );
}
Activate();
// Main loop: keep receiving events
while( auto evt = Wait() )
{
wxPoint cursorPos = (wxPoint)m_controls->GetCursorPosition( !evt->Modifier( MD_ALT ) );
if( evt->IsAction( &ACTIONS::cancelInteractive ) || evt->IsActivate() || evt->IsCancel() )
{
m_view->ClearPreview();
if( m_frame->GetToolId() == ID_POPUP_SCH_RESIZE_SHEET )
{
if( dynamic_cast<SCH_SHEET*>( m_frame->GetUndoItem() ) )
{
delete aSheet;
aSheet = (SCH_SHEET*)m_frame->GetUndoItem();
m_frame->SetUndoItem( nullptr );
}
m_frame->AddToScreen( aSheet );
aSheet->ClearFlags();
m_view->Hide( aSheet, false );
m_frame->GetScreen()->SetCurItem( nullptr );
break; // resize sheet is a single-shot command, not a reusable tool
}
else if( aSheet )
{
delete aSheet;
m_frame->GetScreen()->SetCurItem( nullptr );
}
else
break;
if( evt->IsActivate() )
break; // exit unconditionally
}
else if( evt->IsClick( BUT_LEFT ) )
{
if( m_frame->GetToolId() == ID_POPUP_SCH_RESIZE_SHEET )
{
m_frame->SaveUndoItemInUndoList( aSheet );
m_frame->OnModify();
m_view->ClearPreview();
m_view->Hide( aSheet, false );
m_frame->RefreshItem( aSheet );
m_frame->GetScreen()->SetCurItem( nullptr );
break; // resize sheet is a single-shot command; when we're done we're done
}
else if( !aSheet )
{
aSheet = new SCH_SHEET( cursorPos );
aSheet->SetFlags( IS_NEW | IS_RESIZED );
aSheet->SetTimeStamp( GetNewTimeStamp() );
aSheet->SetParent( m_frame->GetScreen() );
aSheet->SetScreen( NULL );
m_frame->SetRepeatItem( nullptr );
m_frame->GetScreen()->SetCurItem( aSheet );
}
else
{
m_frame->AddItemToScreen( aSheet );
aSheet = nullptr;
m_view->ClearPreview();
m_frame->GetScreen()->SetCurItem( nullptr );
}
}
else if( evt->IsMotion() )
{
m_view->ClearPreview();
if( aSheet )
{
wxPoint pos = aSheet->GetPosition();
wxPoint size = cursorPos - pos;
// If the sheet doesn't have any pins, clamp the minimum size to the defaults.
size.x = std::max( size.x, MIN_SHEET_WIDTH );
size.y = std::max( size.y, MIN_SHEET_HEIGHT );
if( aSheet->HasPins() )
{
int gridSizeX = KiROUND( m_frame->GetScreen()->GetGridSize().x );
int gridSizeY = KiROUND( m_frame->GetScreen()->GetGridSize().y );
// Use the pin positions to clamp the minimum width and height.
size.x = std::max( size.x, aSheet->GetMinWidth() + gridSizeX );
size.y = std::max( size.y, aSheet->GetMinHeight() + gridSizeY );
}
wxPoint grid = m_frame->GetNearestGridPosition( pos + size );
aSheet->Resize( wxSize( grid.x - pos.x, grid.y - pos.y ) );
m_view->AddToPreview( aSheet->Clone() );
}
}
else if( evt->IsClick( BUT_RIGHT ) )
{
// JEY TODO
// m_menu.ShowContextMenu();
}
// Enable autopanning and cursor capture only when there is a sheet to be placed
m_controls->SetAutoPan( !!aSheet );
m_controls->CaptureCursor( !!aSheet );
}
m_frame->SetNoToolSelected();
return 0;
}
void SCH_DRAWING_TOOL::setTransitions()
{
Go( &SCH_DRAWING_TOOL::PlaceSymbol, SCH_ACTIONS::placeSymbol.MakeEvent() );
@ -1032,6 +1244,10 @@ void SCH_DRAWING_TOOL::setTransitions()
Go( &SCH_DRAWING_TOOL::PlaceLabel, SCH_ACTIONS::placeLabel.MakeEvent() );
Go( &SCH_DRAWING_TOOL::PlaceHierarchicalLabel,SCH_ACTIONS::placeHierarchicalLabel.MakeEvent() );
Go( &SCH_DRAWING_TOOL::PlaceGlobalLabel, SCH_ACTIONS::placeGlobalLabel.MakeEvent() );
Go( &SCH_DRAWING_TOOL::DrawSheet, SCH_ACTIONS::drawSheet.MakeEvent() );
Go( &SCH_DRAWING_TOOL::ResizeSheet, SCH_ACTIONS::resizeSheet.MakeEvent() );
Go( &SCH_DRAWING_TOOL::PlaceSheetPin, SCH_ACTIONS::placeSheetPin.MakeEvent() );
Go( &SCH_DRAWING_TOOL::ImportSheetPin, SCH_ACTIONS::importSheetPin.MakeEvent() );
Go( &SCH_DRAWING_TOOL::PlaceSchematicText, SCH_ACTIONS::placeSchematicText.MakeEvent() );
Go( &SCH_DRAWING_TOOL::DrawLines, SCH_ACTIONS::drawLines.MakeEvent() );
Go( &SCH_DRAWING_TOOL::PlaceImage, SCH_ACTIONS::placeImage.MakeEvent() );

6
eeschema/tools/sch_drawing_tool.h
View File

@ -88,6 +88,10 @@ public:
int PlaceLabel( const TOOL_EVENT& aEvent );
int PlaceGlobalLabel( const TOOL_EVENT& aEvent );
int PlaceHierarchicalLabel( const TOOL_EVENT& aEvent );
int DrawSheet( const TOOL_EVENT& aEvent );
int ResizeSheet( const TOOL_EVENT& aEvent );
int PlaceSheetPin( const TOOL_EVENT& aEvent );
int ImportSheetPin( const TOOL_EVENT& aEvent );
int PlaceSchematicText( const TOOL_EVENT& aEvent );
int DrawLines( const TOOL_EVENT& aEvent );
int PlaceImage( const TOOL_EVENT& aEvent );
@ -104,6 +108,8 @@ private:
int doDrawSegments( int aType );
void finishSegments();
int doDrawSheet( SCH_SHEET* aSheet );
///> Sets up handlers for various events.
void setTransitions() override;