mirror of
https://gitlab.com/kicad/code/kicad.git
synced 2025-09-14 10:13:19 +02:00
c9fc15b5eb
When leaving the main point editor loop, we need to ensure that the edit point is cleared as well. This is usually cleared by a ClearEvent call but in case this is missed, we need to ensure that other tools are not caught out Fixes https://gitlab.com/kicad/code/kicad/issues/10288 (cherry picked from commit 9a2332dfcf187b5267ef9bdada01eb6c7d30abb6)
1143 lines
35 KiB
C++
1143 lines
35 KiB
C++
/*
|
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
|
*
|
|
* Copyright (C) 2019 CERN
|
|
* Copyright (C) 2019-2021 KiCad Developers, see AUTHORS.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
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, you may find one here:
|
|
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
|
* or you may search the http://www.gnu.org website for the version 2 license,
|
|
* or you may write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
|
*/
|
|
|
|
#include <functional>
|
|
using namespace std::placeholders;
|
|
|
|
#include "ee_point_editor.h"
|
|
#include <ee_grid_helper.h>
|
|
#include <tool/tool_manager.h>
|
|
#include <view/view_controls.h>
|
|
#include <geometry/seg.h>
|
|
#include <tools/ee_actions.h>
|
|
#include <tools/ee_selection_tool.h>
|
|
#include <bitmaps.h>
|
|
#include <sch_edit_frame.h>
|
|
#include <sch_line.h>
|
|
#include <sch_bitmap.h>
|
|
#include <sch_sheet.h>
|
|
#include <sch_shape.h>
|
|
#include <sch_sheet_pin.h>
|
|
#include <symbol_edit_frame.h>
|
|
#include <lib_shape.h>
|
|
|
|
|
|
// Few constants to avoid using bare numbers for point indices
|
|
enum ARC_POINTS
|
|
{
|
|
ARC_CENTER, ARC_START, ARC_END
|
|
};
|
|
|
|
enum CIRCLE_POINTS
|
|
{
|
|
CIRC_CENTER, CIRC_END
|
|
};
|
|
|
|
enum RECTANGLE_POINTS
|
|
{
|
|
RECT_TOPLEFT, RECT_TOPRIGHT, RECT_BOTLEFT, RECT_BOTRIGHT
|
|
};
|
|
|
|
enum LINE_POINTS
|
|
{
|
|
LINE_START, LINE_END
|
|
};
|
|
|
|
class EDIT_POINTS_FACTORY
|
|
{
|
|
public:
|
|
static std::shared_ptr<EDIT_POINTS> Make( EDA_ITEM* aItem, SCH_BASE_FRAME* frame )
|
|
{
|
|
std::shared_ptr<EDIT_POINTS> points = std::make_shared<EDIT_POINTS>( aItem );
|
|
|
|
if( !aItem )
|
|
return points;
|
|
|
|
// Generate list of edit points based on the item type
|
|
switch( aItem->Type() )
|
|
{
|
|
case LIB_SHAPE_T:
|
|
{
|
|
LIB_SHAPE* shape = static_cast<LIB_SHAPE*>( aItem );
|
|
|
|
switch( shape->GetShape() )
|
|
{
|
|
case SHAPE_T::ARC:
|
|
points->AddPoint( mapCoords( shape->GetPosition() ) );
|
|
points->AddPoint( mapCoords( shape->GetStart() ) );
|
|
points->AddPoint( mapCoords( shape->GetEnd() ) );
|
|
break;
|
|
|
|
case SHAPE_T::CIRCLE:
|
|
points->AddPoint( mapCoords( shape->GetPosition() ) );
|
|
points->AddPoint( mapCoords( shape->GetEnd() ) );
|
|
break;
|
|
|
|
case SHAPE_T::RECT:
|
|
{
|
|
// point editor works only with rectangles having width and height > 0
|
|
// Some symbols can have rectangles with width or height < 0
|
|
// So normalize the size:
|
|
BOX2I dummy;
|
|
dummy.SetOrigin( mapCoords( shape->GetPosition() ) );
|
|
dummy.SetEnd( mapCoords( shape->GetEnd() ) );
|
|
dummy.Normalize();
|
|
VECTOR2I topLeft = dummy.GetPosition();
|
|
VECTOR2I botRight = dummy.GetEnd();
|
|
|
|
points->AddPoint( topLeft );
|
|
points->AddPoint( VECTOR2I( botRight.x, topLeft.y ) );
|
|
points->AddPoint( VECTOR2I( topLeft.x, botRight.y ) );
|
|
points->AddPoint( botRight );
|
|
}
|
|
break;
|
|
|
|
case SHAPE_T::POLY:
|
|
for( const VECTOR2I& pt : shape->GetPolyShape().Outline( 0 ).CPoints() )
|
|
points->AddPoint( mapCoords( pt ) );
|
|
|
|
break;
|
|
|
|
case SHAPE_T::BEZIER:
|
|
// TODO
|
|
break;
|
|
|
|
default:
|
|
UNIMPLEMENTED_FOR( shape->SHAPE_T_asString() );
|
|
}
|
|
}
|
|
break;
|
|
|
|
case SCH_SHAPE_T:
|
|
{
|
|
SCH_SHAPE* shape = static_cast<SCH_SHAPE*>( aItem );
|
|
|
|
switch( shape->GetShape() )
|
|
{
|
|
case SHAPE_T::ARC:
|
|
points->AddPoint( shape->GetPosition() );
|
|
points->AddPoint( shape->GetStart() );
|
|
points->AddPoint( shape->GetEnd() );
|
|
break;
|
|
|
|
case SHAPE_T::CIRCLE:
|
|
points->AddPoint( shape->GetPosition() );
|
|
points->AddPoint( shape->GetEnd() );
|
|
break;
|
|
|
|
case SHAPE_T::RECT:
|
|
{
|
|
// point editor works only with rectangles having width and height > 0
|
|
// Some symbols can have rectangles with width or height < 0
|
|
// So normalize the size:
|
|
BOX2I dummy;
|
|
dummy.SetOrigin( shape->GetPosition() );
|
|
dummy.SetEnd( shape->GetEnd() );
|
|
dummy.Normalize();
|
|
VECTOR2I topLeft = dummy.GetPosition();
|
|
VECTOR2I botRight = dummy.GetEnd();
|
|
|
|
points->AddPoint( topLeft );
|
|
points->AddPoint( VECTOR2I( botRight.x, topLeft.y ) );
|
|
points->AddPoint( VECTOR2I( topLeft.x, botRight.y ) );
|
|
points->AddPoint( botRight );
|
|
}
|
|
break;
|
|
|
|
case SHAPE_T::POLY:
|
|
for( const VECTOR2I& pt : shape->GetPolyShape().Outline( 0 ).CPoints() )
|
|
points->AddPoint( pt );
|
|
|
|
break;
|
|
|
|
case SHAPE_T::BEZIER:
|
|
// TODO
|
|
break;
|
|
|
|
default:
|
|
UNIMPLEMENTED_FOR( shape->SHAPE_T_asString() );
|
|
}
|
|
}
|
|
break;
|
|
|
|
case SCH_SHEET_T:
|
|
{
|
|
SCH_SHEET* sheet = (SCH_SHEET*) aItem;
|
|
VECTOR2I topLeft = sheet->GetPosition();
|
|
VECTOR2I botRight = sheet->GetPosition() + sheet->GetSize();
|
|
|
|
points->AddPoint( topLeft );
|
|
points->AddPoint( VECTOR2I( botRight.x, topLeft.y ) );
|
|
points->AddPoint( VECTOR2I( topLeft.x, botRight.y ) );
|
|
points->AddPoint( botRight );
|
|
}
|
|
break;
|
|
|
|
case SCH_BITMAP_T:
|
|
{
|
|
SCH_BITMAP* bitmap = (SCH_BITMAP*) aItem;
|
|
VECTOR2I topLeft = bitmap->GetPosition() - bitmap->GetSize() / 2;
|
|
VECTOR2I botRight = bitmap->GetPosition() + bitmap->GetSize() / 2;
|
|
|
|
points->AddPoint( topLeft );
|
|
points->AddPoint( VECTOR2I( botRight.x, topLeft.y ) );
|
|
points->AddPoint( VECTOR2I( topLeft.x, botRight.y ) );
|
|
points->AddPoint( botRight );
|
|
}
|
|
break;
|
|
|
|
case SCH_LINE_T:
|
|
{
|
|
SCH_LINE* line = (SCH_LINE*) aItem;
|
|
std::pair<EDA_ITEM*, int> connectedStart = { nullptr, STARTPOINT };
|
|
std::pair<EDA_ITEM*, int> connectedEnd = { nullptr, STARTPOINT };
|
|
|
|
for( SCH_ITEM* test : frame->GetScreen()->Items().OfType( SCH_LINE_T ) )
|
|
{
|
|
if( test->GetLayer() != LAYER_NOTES )
|
|
continue;
|
|
|
|
if( test == aItem )
|
|
continue;
|
|
|
|
SCH_LINE* testLine = static_cast<SCH_LINE*>( test );
|
|
|
|
if( testLine->GetStartPoint() == line->GetStartPoint() )
|
|
{
|
|
connectedStart = { testLine, STARTPOINT };
|
|
}
|
|
else if( testLine->GetEndPoint() == line->GetStartPoint() )
|
|
{
|
|
connectedStart = { testLine, ENDPOINT };
|
|
}
|
|
else if( testLine->GetStartPoint() == line->GetEndPoint() )
|
|
{
|
|
connectedEnd = { testLine, STARTPOINT };
|
|
}
|
|
else if( testLine->GetEndPoint() == line->GetEndPoint() )
|
|
{
|
|
connectedEnd = { testLine, ENDPOINT };
|
|
}
|
|
}
|
|
|
|
points->AddPoint( line->GetStartPoint(), connectedStart );
|
|
points->AddPoint( line->GetEndPoint(), connectedEnd );
|
|
}
|
|
break;
|
|
|
|
default:
|
|
points.reset();
|
|
break;
|
|
}
|
|
|
|
return points;
|
|
}
|
|
|
|
private:
|
|
EDIT_POINTS_FACTORY() {};
|
|
};
|
|
|
|
|
|
EE_POINT_EDITOR::EE_POINT_EDITOR() :
|
|
EE_TOOL_BASE<SCH_BASE_FRAME>( "eeschema.PointEditor" ),
|
|
m_editedPoint( nullptr )
|
|
{
|
|
}
|
|
|
|
|
|
void EE_POINT_EDITOR::Reset( RESET_REASON aReason )
|
|
{
|
|
EE_TOOL_BASE::Reset( aReason );
|
|
|
|
m_editPoints.reset();
|
|
m_editedPoint = nullptr;
|
|
}
|
|
|
|
|
|
bool EE_POINT_EDITOR::Init()
|
|
{
|
|
EE_TOOL_BASE::Init();
|
|
|
|
auto& menu = m_selectionTool->GetToolMenu().GetMenu();
|
|
menu.AddItem( EE_ACTIONS::pointEditorAddCorner,
|
|
std::bind( &EE_POINT_EDITOR::addCornerCondition, this, _1 ) );
|
|
menu.AddItem( EE_ACTIONS::pointEditorRemoveCorner,
|
|
std::bind( &EE_POINT_EDITOR::removeCornerCondition, this, _1 ) );
|
|
|
|
return true;
|
|
}
|
|
|
|
|
|
int EE_POINT_EDITOR::clearEditedPoints( const TOOL_EVENT& aEvent )
|
|
{
|
|
setEditedPoint( nullptr );
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
void EE_POINT_EDITOR::updateEditedPoint( const TOOL_EVENT& aEvent )
|
|
{
|
|
EDIT_POINT* point = m_editedPoint;
|
|
|
|
if( !m_editPoints )
|
|
{
|
|
point = nullptr;
|
|
}
|
|
else if( aEvent.IsMotion() )
|
|
{
|
|
point = m_editPoints->FindPoint( aEvent.Position(), getView() );
|
|
}
|
|
else if( aEvent.IsDrag( BUT_LEFT ) )
|
|
{
|
|
point = m_editPoints->FindPoint( aEvent.DragOrigin(), getView() );
|
|
}
|
|
else
|
|
{
|
|
point = m_editPoints->FindPoint( getViewControls()->GetCursorPosition(), getView() );
|
|
}
|
|
|
|
if( m_editedPoint != point )
|
|
setEditedPoint( point );
|
|
}
|
|
|
|
|
|
int EE_POINT_EDITOR::Main( const TOOL_EVENT& aEvent )
|
|
{
|
|
static KICAD_T supportedTypes[] = {
|
|
LIB_SHAPE_T,
|
|
SCH_SHAPE_T,
|
|
SCH_SHEET_T,
|
|
SCH_ITEM_LOCATE_GRAPHIC_LINE_T,
|
|
SCH_BITMAP_T,
|
|
EOT
|
|
};
|
|
|
|
if( !m_selectionTool )
|
|
return 0;
|
|
|
|
if( m_isSymbolEditor )
|
|
{
|
|
SYMBOL_EDIT_FRAME* editor = getEditFrame<SYMBOL_EDIT_FRAME>();
|
|
|
|
if( !editor->IsSymbolEditable() || editor->IsSymbolAlias() )
|
|
return 0;
|
|
}
|
|
|
|
const EE_SELECTION& selection = m_selectionTool->GetSelection();
|
|
|
|
if( selection.Size() != 1 || !selection.Front()->IsType( supportedTypes ) )
|
|
return 0;
|
|
|
|
// Wait till drawing tool is done
|
|
if( selection.Front()->IsNew() )
|
|
return 0;
|
|
|
|
Activate();
|
|
|
|
KIGFX::VIEW_CONTROLS* controls = getViewControls();
|
|
KIGFX::VIEW* view = getView();
|
|
EDA_ITEM* item = (EDA_ITEM*) selection.Front();
|
|
|
|
controls->ShowCursor( true );
|
|
|
|
m_editPoints = EDIT_POINTS_FACTORY::Make( item, m_frame );
|
|
view->Add( m_editPoints.get() );
|
|
setEditedPoint( nullptr );
|
|
updateEditedPoint( aEvent );
|
|
bool inDrag = false;
|
|
bool modified = false;
|
|
|
|
// Main loop: keep receiving events
|
|
while( TOOL_EVENT* evt = Wait() )
|
|
{
|
|
if( !m_editPoints || evt->IsSelectionEvent() )
|
|
break;
|
|
|
|
if ( !inDrag )
|
|
updateEditedPoint( *evt );
|
|
|
|
if( evt->IsDrag( BUT_LEFT ) && m_editedPoint )
|
|
{
|
|
if( !inDrag )
|
|
{
|
|
saveItemsToUndo();
|
|
controls->ForceCursorPosition( false );
|
|
inDrag = true;
|
|
modified = true;
|
|
}
|
|
|
|
bool snap = !evt->DisableGridSnapping();
|
|
EDA_SHAPE* shape = dynamic_cast<EDA_SHAPE*>( item );
|
|
|
|
if( shape && shape->GetShape() == SHAPE_T::ARC && getEditedPointIndex() == ARC_CENTER )
|
|
snap = false;
|
|
|
|
m_editedPoint->SetPosition( controls->GetCursorPosition( snap ) );
|
|
|
|
updateParentItem();
|
|
updatePoints();
|
|
}
|
|
else if( inDrag && evt->IsMouseUp( BUT_LEFT ) )
|
|
{
|
|
if( modified )
|
|
{
|
|
m_frame->OnModify();
|
|
modified = false;
|
|
}
|
|
|
|
controls->SetAutoPan( false );
|
|
inDrag = false;
|
|
}
|
|
else if( evt->IsCancelInteractive() || evt->IsActivate() )
|
|
{
|
|
if( inDrag ) // Restore the last change
|
|
{
|
|
rollbackFromUndo();
|
|
inDrag = false;
|
|
modified = false;
|
|
break;
|
|
}
|
|
else if( evt->IsCancelInteractive() )
|
|
{
|
|
break;
|
|
}
|
|
|
|
if( evt->IsActivate() )
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
evt->SetPassEvent();
|
|
}
|
|
|
|
controls->SetAutoPan( inDrag );
|
|
controls->CaptureCursor( inDrag );
|
|
}
|
|
|
|
controls->SetAutoPan( false );
|
|
controls->CaptureCursor( false );
|
|
setEditedPoint( nullptr );
|
|
|
|
if( m_editPoints )
|
|
{
|
|
view->Remove( m_editPoints.get() );
|
|
|
|
if( modified )
|
|
m_frame->OnModify();
|
|
|
|
m_editPoints.reset();
|
|
m_frame->GetCanvas()->Refresh();
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* Update the coordinates of 4 corners of a rectangle, according to constraints
|
|
* and the moved corner
|
|
* @param aEditedPointIndex is the corner id
|
|
* @param minWidth is the minimal width constraint
|
|
* @param minHeight is the minimal height constraint
|
|
* @param topLeft is the RECT_TOPLEFT to constraint
|
|
* @param topRight is the RECT_TOPRIGHT to constraint
|
|
* @param botLeft is the RECT_BOTLEFT to constraint
|
|
* @param botRight is the RECT_BOTRIGHT to constraint
|
|
*/
|
|
static void pinEditedCorner( int aEditedPointIndex, int minWidth, int minHeight,
|
|
VECTOR2I& topLeft, VECTOR2I& topRight, VECTOR2I& botLeft,
|
|
VECTOR2I& botRight, EE_GRID_HELPER* aGrid )
|
|
{
|
|
switch( aEditedPointIndex )
|
|
{
|
|
case RECT_TOPLEFT:
|
|
// pin edited point within opposite corner
|
|
topLeft.x = std::min( topLeft.x, botRight.x - minWidth );
|
|
topLeft.y = std::min( topLeft.y, botRight.y - minHeight );
|
|
|
|
topLeft = aGrid->AlignGrid( topLeft );
|
|
|
|
// push edited point edges to adjacent corners
|
|
topRight.y = topLeft.y;
|
|
botLeft.x = topLeft.x;
|
|
|
|
break;
|
|
|
|
case RECT_TOPRIGHT:
|
|
// pin edited point within opposite corner
|
|
topRight.x = std::max( topRight.x, botLeft.x + minWidth );
|
|
topRight.y = std::min( topRight.y, botLeft.y - minHeight );
|
|
|
|
topRight = aGrid->AlignGrid( topRight );
|
|
|
|
// push edited point edges to adjacent corners
|
|
topLeft.y = topRight.y;
|
|
botRight.x = topRight.x;
|
|
|
|
break;
|
|
|
|
case RECT_BOTLEFT:
|
|
// pin edited point within opposite corner
|
|
botLeft.x = std::min( botLeft.x, topRight.x - minWidth );
|
|
botLeft.y = std::max( botLeft.y, topRight.y + minHeight );
|
|
|
|
botLeft = aGrid->AlignGrid( botLeft );
|
|
|
|
// push edited point edges to adjacent corners
|
|
botRight.y = botLeft.y;
|
|
topLeft.x = botLeft.x;
|
|
|
|
break;
|
|
|
|
case RECT_BOTRIGHT:
|
|
// pin edited point within opposite corner
|
|
botRight.x = std::max( botRight.x, topLeft.x + minWidth );
|
|
botRight.y = std::max( botRight.y, topLeft.y + minHeight );
|
|
|
|
botRight = aGrid->AlignGrid( botRight );
|
|
|
|
// push edited point edges to adjacent corners
|
|
botLeft.y = botRight.y;
|
|
topRight.x = botRight.x;
|
|
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
void EE_POINT_EDITOR::updateParentItem() const
|
|
{
|
|
EDA_ITEM* item = m_editPoints->GetParent();
|
|
|
|
if( !item )
|
|
return;
|
|
|
|
switch( item->Type() )
|
|
{
|
|
case LIB_SHAPE_T:
|
|
{
|
|
LIB_SHAPE* shape = static_cast<LIB_SHAPE*>( item );
|
|
|
|
switch( shape->GetShape() )
|
|
{
|
|
case SHAPE_T::ARC:
|
|
if( getEditedPointIndex() == ARC_CENTER )
|
|
{
|
|
shape->SetEditState( 4 );
|
|
shape->CalcEdit( mapCoords( m_editPoints->Point( ARC_CENTER ).GetPosition() ) );
|
|
}
|
|
else if( getEditedPointIndex() == ARC_START )
|
|
{
|
|
shape->SetEditState( 2 );
|
|
shape->CalcEdit( mapCoords( m_editPoints->Point( ARC_START ).GetPosition() ) );
|
|
}
|
|
else if( getEditedPointIndex() == ARC_END )
|
|
{
|
|
shape->SetEditState( 3 );
|
|
shape->CalcEdit( mapCoords( m_editPoints->Point( ARC_END ).GetPosition() ) );
|
|
}
|
|
break;
|
|
|
|
case SHAPE_T::CIRCLE:
|
|
shape->SetPosition( mapCoords( m_editPoints->Point( CIRC_CENTER ).GetPosition() ) );
|
|
shape->SetEnd( mapCoords( m_editPoints->Point( CIRC_END ).GetPosition() ) );
|
|
break;
|
|
|
|
case SHAPE_T::POLY:
|
|
shape->GetPolyShape().RemoveAllContours();
|
|
shape->GetPolyShape().NewOutline();
|
|
|
|
for( unsigned i = 0; i < m_editPoints->PointsSize(); ++i )
|
|
shape->GetPolyShape().Append( mapCoords( m_editPoints->Point( i ).GetPosition() ) );
|
|
|
|
break;
|
|
|
|
case SHAPE_T::RECT:
|
|
{
|
|
EE_GRID_HELPER gridHelper( m_toolMgr );
|
|
VECTOR2I topLeft = m_editPoints->Point( RECT_TOPLEFT ).GetPosition();
|
|
VECTOR2I topRight = m_editPoints->Point( RECT_TOPRIGHT ).GetPosition();
|
|
VECTOR2I botLeft = m_editPoints->Point( RECT_BOTLEFT ).GetPosition();
|
|
VECTOR2I botRight = m_editPoints->Point( RECT_BOTRIGHT ).GetPosition();
|
|
|
|
pinEditedCorner( getEditedPointIndex(), Mils2iu( 1 ), Mils2iu( 1 ),
|
|
topLeft, topRight, botLeft, botRight, &gridHelper );
|
|
|
|
shape->SetPosition( mapCoords( topLeft ) );
|
|
shape->SetEnd( mapCoords( botRight ) );
|
|
}
|
|
break;
|
|
|
|
case SHAPE_T::BEZIER:
|
|
// TODO
|
|
break;
|
|
|
|
default:
|
|
UNIMPLEMENTED_FOR( shape->SHAPE_T_asString() );
|
|
}
|
|
}
|
|
break;
|
|
|
|
case SCH_SHAPE_T:
|
|
{
|
|
SCH_SHAPE* shape = static_cast<SCH_SHAPE*>( item );
|
|
|
|
switch( shape->GetShape() )
|
|
{
|
|
case SHAPE_T::ARC:
|
|
if( getEditedPointIndex() == ARC_CENTER )
|
|
{
|
|
shape->SetEditState( 4 );
|
|
shape->CalcEdit( m_editPoints->Point( ARC_CENTER ).GetPosition() );
|
|
}
|
|
else if( getEditedPointIndex() == ARC_START )
|
|
{
|
|
shape->SetEditState( 2 );
|
|
shape->CalcEdit( m_editPoints->Point( ARC_START ).GetPosition() );
|
|
}
|
|
else if( getEditedPointIndex() == ARC_END )
|
|
{
|
|
shape->SetEditState( 3 );
|
|
shape->CalcEdit( m_editPoints->Point( ARC_END ).GetPosition() );
|
|
}
|
|
break;
|
|
|
|
case SHAPE_T::CIRCLE:
|
|
shape->SetPosition( m_editPoints->Point( CIRC_CENTER ).GetPosition() );
|
|
shape->SetEnd( m_editPoints->Point( CIRC_END ).GetPosition() );
|
|
break;
|
|
|
|
case SHAPE_T::POLY:
|
|
shape->GetPolyShape().RemoveAllContours();
|
|
shape->GetPolyShape().NewOutline();
|
|
|
|
for( unsigned i = 0; i < m_editPoints->PointsSize(); ++i )
|
|
shape->GetPolyShape().Append( m_editPoints->Point( i ).GetPosition() );
|
|
|
|
break;
|
|
|
|
case SHAPE_T::RECT:
|
|
{
|
|
EE_GRID_HELPER gridHelper( m_toolMgr );
|
|
VECTOR2I topLeft = m_editPoints->Point( RECT_TOPLEFT ).GetPosition();
|
|
VECTOR2I topRight = m_editPoints->Point( RECT_TOPRIGHT ).GetPosition();
|
|
VECTOR2I botLeft = m_editPoints->Point( RECT_BOTLEFT ).GetPosition();
|
|
VECTOR2I botRight = m_editPoints->Point( RECT_BOTRIGHT ).GetPosition();
|
|
|
|
pinEditedCorner( getEditedPointIndex(), Mils2iu( 1 ), Mils2iu( 1 ),
|
|
topLeft, topRight, botLeft, botRight, &gridHelper );
|
|
|
|
shape->SetPosition( topLeft );
|
|
shape->SetEnd( botRight );
|
|
}
|
|
break;
|
|
|
|
case SHAPE_T::BEZIER:
|
|
// TODO
|
|
break;
|
|
|
|
default:
|
|
UNIMPLEMENTED_FOR( shape->SHAPE_T_asString() );
|
|
}
|
|
}
|
|
break;
|
|
|
|
case SCH_BITMAP_T:
|
|
{
|
|
EE_GRID_HELPER gridHelper( m_toolMgr );
|
|
SCH_BITMAP* bitmap = (SCH_BITMAP*) item;
|
|
VECTOR2I topLeft = m_editPoints->Point( RECT_TOPLEFT ).GetPosition();
|
|
VECTOR2I topRight = m_editPoints->Point( RECT_TOPRIGHT ).GetPosition();
|
|
VECTOR2I botLeft = m_editPoints->Point( RECT_BOTLEFT ).GetPosition();
|
|
VECTOR2I botRight = m_editPoints->Point( RECT_BOTRIGHT ).GetPosition();
|
|
|
|
pinEditedCorner( getEditedPointIndex(), Mils2iu( 50 ), Mils2iu( 50 ),
|
|
topLeft, topRight, botLeft, botRight, &gridHelper );
|
|
|
|
double oldWidth = bitmap->GetSize().x;
|
|
double newWidth = topRight.x - topLeft.x;
|
|
double widthRatio = newWidth / oldWidth;
|
|
|
|
double oldHeight = bitmap->GetSize().y;
|
|
double newHeight = botLeft.y - topLeft.y;
|
|
double heightRatio = newHeight / oldHeight;
|
|
|
|
bitmap->SetImageScale( bitmap->GetImageScale() * std::min( widthRatio, heightRatio ) );
|
|
}
|
|
break;
|
|
|
|
case SCH_SHEET_T:
|
|
{
|
|
SCH_SHEET* sheet = (SCH_SHEET*) item;
|
|
EE_GRID_HELPER gridHelper( m_toolMgr );
|
|
VECTOR2I topLeft = m_editPoints->Point( RECT_TOPLEFT ).GetPosition();
|
|
VECTOR2I topRight = m_editPoints->Point( RECT_TOPRIGHT ).GetPosition();
|
|
VECTOR2I botLeft = m_editPoints->Point( RECT_BOTLEFT ).GetPosition();
|
|
VECTOR2I botRight = m_editPoints->Point( RECT_BOTRIGHT ).GetPosition();
|
|
int edited = getEditedPointIndex();
|
|
|
|
pinEditedCorner( getEditedPointIndex(),
|
|
sheet->GetMinWidth( edited == RECT_TOPRIGHT || edited == RECT_BOTRIGHT ),
|
|
sheet->GetMinHeight( edited == RECT_BOTLEFT || edited == RECT_BOTRIGHT ),
|
|
topLeft, topRight, botLeft, botRight, &gridHelper );
|
|
|
|
// Pin positions are relative to origin. Attempt to leave them where they
|
|
// are if the origin moves.
|
|
VECTOR2I originDelta = sheet->GetPosition() - topLeft;
|
|
|
|
sheet->SetPosition( topLeft );
|
|
sheet->SetSize( wxSize( botRight.x - topLeft.x, botRight.y - topLeft.y ) );
|
|
|
|
// Update the fields if we're in autoplace mode
|
|
if( sheet->GetFieldsAutoplaced() == FIELDS_AUTOPLACED_AUTO )
|
|
sheet->AutoplaceFields( /* aScreen */ nullptr, /* aManual */ false );
|
|
|
|
// Keep sheet pins attached to edges:
|
|
for( SCH_SHEET_PIN* pin : sheet->GetPins() )
|
|
{
|
|
VECTOR2I pos = pin->GetPosition();
|
|
|
|
pos += originDelta;
|
|
|
|
switch( pin->GetSide() )
|
|
{
|
|
case SHEET_SIDE::LEFT: pos.x = topLeft.x; break;
|
|
case SHEET_SIDE::RIGHT: pos.x = topRight.x; break;
|
|
case SHEET_SIDE::TOP: pos.y = topLeft.y; break;
|
|
case SHEET_SIDE::BOTTOM: pos.y = botLeft.y; break;
|
|
case SHEET_SIDE::UNDEFINED: break;
|
|
}
|
|
|
|
pin->SetPosition( pos );
|
|
}
|
|
}
|
|
break;
|
|
|
|
case SCH_LINE_T:
|
|
{
|
|
SCH_LINE* line = (SCH_LINE*) item;
|
|
|
|
line->SetStartPoint( m_editPoints->Point( LINE_START ).GetPosition() );
|
|
line->SetEndPoint( m_editPoints->Point( LINE_END ).GetPosition() );
|
|
|
|
std::pair<EDA_ITEM*, int> connected = m_editPoints->Point( LINE_START ).GetConnected();
|
|
|
|
if( connected.first )
|
|
{
|
|
if( connected.second == STARTPOINT )
|
|
static_cast<SCH_LINE*>( connected.first )->SetStartPoint( line->GetPosition() );
|
|
else if( connected.second == ENDPOINT )
|
|
static_cast<SCH_LINE*>( connected.first )->SetEndPoint( line->GetPosition() );
|
|
|
|
updateItem( connected.first, true );
|
|
}
|
|
|
|
connected = m_editPoints->Point( LINE_END ).GetConnected();
|
|
|
|
if( connected.first )
|
|
{
|
|
if( connected.second == STARTPOINT )
|
|
static_cast<SCH_LINE*>( connected.first )->SetStartPoint( line->GetEndPoint() );
|
|
else if( connected.second == ENDPOINT )
|
|
static_cast<SCH_LINE*>( connected.first )->SetEndPoint( line->GetEndPoint() );
|
|
|
|
updateItem( connected.first, true );
|
|
}
|
|
}
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
|
|
updateItem( item, true );
|
|
m_frame->SetMsgPanel( item );
|
|
}
|
|
|
|
|
|
void EE_POINT_EDITOR::updatePoints()
|
|
{
|
|
if( !m_editPoints )
|
|
return;
|
|
|
|
EDA_ITEM* item = m_editPoints->GetParent();
|
|
|
|
if( !item )
|
|
return;
|
|
|
|
switch( item->Type() )
|
|
{
|
|
case LIB_SHAPE_T:
|
|
{
|
|
LIB_SHAPE* shape = static_cast<LIB_SHAPE*>( item );
|
|
|
|
switch( shape->GetShape() )
|
|
{
|
|
case SHAPE_T::ARC:
|
|
m_editPoints->Point( ARC_CENTER ).SetPosition( mapCoords( shape->GetPosition() ) );
|
|
m_editPoints->Point( ARC_START ).SetPosition( mapCoords( shape->GetStart() ) );
|
|
m_editPoints->Point( ARC_END ).SetPosition( mapCoords( shape->GetEnd() ) );
|
|
break;
|
|
|
|
case SHAPE_T::CIRCLE:
|
|
m_editPoints->Point( CIRC_CENTER ).SetPosition( mapCoords( shape->GetPosition() ) );
|
|
m_editPoints->Point( CIRC_END ).SetPosition( mapCoords( shape->GetEnd() ) );
|
|
break;
|
|
|
|
case SHAPE_T::POLY:
|
|
{
|
|
if( (int) m_editPoints->PointsSize() != shape->GetPointCount() )
|
|
{
|
|
getView()->Remove( m_editPoints.get() );
|
|
m_editedPoint = nullptr;
|
|
m_editPoints = EDIT_POINTS_FACTORY::Make( item, m_frame );
|
|
getView()->Add( m_editPoints.get() );
|
|
}
|
|
else
|
|
{
|
|
int ii = 0;
|
|
|
|
for( const VECTOR2I& pt : shape->GetPolyShape().Outline( 0 ).CPoints() )
|
|
m_editPoints->Point( ii++ ).SetPosition( mapCoords( pt ) );
|
|
}
|
|
|
|
break;
|
|
}
|
|
|
|
case SHAPE_T::RECT:
|
|
{
|
|
// point editor works only with rectangles having width and height > 0
|
|
// Some symbols can have rectangles with width or height < 0
|
|
// So normalize the size:
|
|
BOX2I dummy;
|
|
dummy.SetOrigin( mapCoords( shape->GetPosition() ) );
|
|
dummy.SetEnd( mapCoords( shape->GetEnd() ) );
|
|
dummy.Normalize();
|
|
VECTOR2I topLeft = dummy.GetPosition();
|
|
VECTOR2I botRight = dummy.GetEnd();
|
|
|
|
m_editPoints->Point( RECT_TOPLEFT ).SetPosition( topLeft );
|
|
m_editPoints->Point( RECT_TOPRIGHT ).SetPosition( VECTOR2I( botRight.x, topLeft.y ) );
|
|
m_editPoints->Point( RECT_BOTLEFT ).SetPosition( VECTOR2I( topLeft.x, botRight.y ) );
|
|
m_editPoints->Point( RECT_BOTRIGHT ).SetPosition( botRight );
|
|
}
|
|
break;
|
|
|
|
case SHAPE_T::BEZIER:
|
|
// TODO
|
|
break;
|
|
|
|
default:
|
|
UNIMPLEMENTED_FOR( shape->SHAPE_T_asString() );
|
|
}
|
|
}
|
|
break;
|
|
|
|
case SCH_SHAPE_T:
|
|
{
|
|
SCH_SHAPE* shape = static_cast<SCH_SHAPE*>( item );
|
|
|
|
switch( shape->GetShape() )
|
|
{
|
|
case SHAPE_T::ARC:
|
|
m_editPoints->Point( ARC_CENTER ).SetPosition( shape->GetPosition() );
|
|
m_editPoints->Point( ARC_START ).SetPosition( shape->GetStart() );
|
|
m_editPoints->Point( ARC_END ).SetPosition( shape->GetEnd() );
|
|
break;
|
|
|
|
case SHAPE_T::CIRCLE:
|
|
m_editPoints->Point( CIRC_CENTER ).SetPosition( shape->GetPosition() );
|
|
m_editPoints->Point( CIRC_END ).SetPosition( shape->GetEnd() );
|
|
break;
|
|
|
|
case SHAPE_T::POLY:
|
|
{
|
|
if( (int) m_editPoints->PointsSize() != shape->GetPointCount() )
|
|
{
|
|
getView()->Remove( m_editPoints.get() );
|
|
m_editedPoint = nullptr;
|
|
m_editPoints = EDIT_POINTS_FACTORY::Make( item, m_frame );
|
|
getView()->Add( m_editPoints.get() );
|
|
}
|
|
else
|
|
{
|
|
int ii = 0;
|
|
|
|
for( const VECTOR2I& pt : shape->GetPolyShape().Outline( 0 ).CPoints() )
|
|
m_editPoints->Point( ii++ ).SetPosition( pt );
|
|
}
|
|
|
|
break;
|
|
}
|
|
|
|
case SHAPE_T::RECT:
|
|
{
|
|
// point editor works only with rectangles having width and height > 0
|
|
// Some symbols can have rectangles with width or height < 0
|
|
// So normalize the size:
|
|
BOX2I dummy;
|
|
dummy.SetOrigin( shape->GetPosition() );
|
|
dummy.SetEnd( shape->GetEnd() );
|
|
dummy.Normalize();
|
|
VECTOR2I topLeft = dummy.GetPosition();
|
|
VECTOR2I botRight = dummy.GetEnd();
|
|
|
|
m_editPoints->Point( RECT_TOPLEFT ).SetPosition( topLeft );
|
|
m_editPoints->Point( RECT_TOPRIGHT ).SetPosition( VECTOR2I( botRight.x, topLeft.y ) );
|
|
m_editPoints->Point( RECT_BOTLEFT ).SetPosition( VECTOR2I( topLeft.x, botRight.y ) );
|
|
m_editPoints->Point( RECT_BOTRIGHT ).SetPosition( botRight );
|
|
}
|
|
break;
|
|
|
|
case SHAPE_T::BEZIER:
|
|
// TODO
|
|
break;
|
|
|
|
default:
|
|
UNIMPLEMENTED_FOR( shape->SHAPE_T_asString() );
|
|
}
|
|
}
|
|
break;
|
|
|
|
case SCH_BITMAP_T:
|
|
{
|
|
SCH_BITMAP* bitmap = (SCH_BITMAP*) item;
|
|
VECTOR2I topLeft = bitmap->GetPosition() - bitmap->GetSize() / 2;
|
|
VECTOR2I botRight = bitmap->GetPosition() + bitmap->GetSize() / 2;
|
|
|
|
m_editPoints->Point( RECT_TOPLEFT ).SetPosition( topLeft );
|
|
m_editPoints->Point( RECT_TOPRIGHT ).SetPosition( botRight.x, topLeft.y );
|
|
m_editPoints->Point( RECT_BOTLEFT ).SetPosition( topLeft.x, botRight.y );
|
|
m_editPoints->Point( RECT_BOTRIGHT ).SetPosition( botRight );
|
|
}
|
|
break;
|
|
|
|
case SCH_SHEET_T:
|
|
{
|
|
SCH_SHEET* sheet = (SCH_SHEET*) item;
|
|
VECTOR2I topLeft = sheet->GetPosition();
|
|
VECTOR2I botRight = sheet->GetPosition() + sheet->GetSize();
|
|
|
|
m_editPoints->Point( RECT_TOPLEFT ).SetPosition( topLeft );
|
|
m_editPoints->Point( RECT_TOPRIGHT ).SetPosition( botRight.x, topLeft.y );
|
|
m_editPoints->Point( RECT_BOTLEFT ).SetPosition( topLeft.x, botRight.y );
|
|
m_editPoints->Point( RECT_BOTRIGHT ).SetPosition( botRight );
|
|
}
|
|
break;
|
|
|
|
case SCH_LINE_T:
|
|
{
|
|
SCH_LINE* line = (SCH_LINE*) item;
|
|
|
|
m_editPoints->Point( LINE_START ).SetPosition( line->GetStartPoint() );
|
|
m_editPoints->Point( LINE_END ).SetPosition( line->GetEndPoint() );
|
|
}
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
|
|
getView()->Update( m_editPoints.get() );
|
|
}
|
|
|
|
|
|
void EE_POINT_EDITOR::setEditedPoint( EDIT_POINT* aPoint )
|
|
{
|
|
KIGFX::VIEW_CONTROLS* controls = getViewControls();
|
|
|
|
if( aPoint )
|
|
{
|
|
m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::ARROW );
|
|
controls->ForceCursorPosition( true, aPoint->GetPosition() );
|
|
controls->ShowCursor( true );
|
|
}
|
|
else
|
|
{
|
|
if( m_frame->ToolStackIsEmpty() )
|
|
controls->ShowCursor( false );
|
|
|
|
controls->ForceCursorPosition( false );
|
|
}
|
|
|
|
m_editedPoint = aPoint;
|
|
}
|
|
|
|
|
|
bool EE_POINT_EDITOR::removeCornerCondition( const SELECTION& )
|
|
{
|
|
if( !m_editPoints || !m_editedPoint || m_editPoints->GetParent()->Type() != LIB_SHAPE_T )
|
|
return false;
|
|
|
|
LIB_SHAPE* shape = static_cast<LIB_SHAPE*>( m_editPoints->GetParent() );
|
|
|
|
if( shape->GetPolyShape().IsEmpty() )
|
|
return false;
|
|
|
|
SHAPE_LINE_CHAIN& poly = shape->GetPolyShape().Outline( 0 );
|
|
|
|
if( poly.GetPointCount() < 3 )
|
|
return false;
|
|
|
|
for( const VECTOR2I& pt : poly.CPoints() )
|
|
{
|
|
if( pt == mapCoords( m_editedPoint->GetPosition() ) )
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
|
|
bool EE_POINT_EDITOR::addCornerCondition( const SELECTION& )
|
|
{
|
|
if( !m_editPoints || m_editPoints->GetParent()->Type() != LIB_SHAPE_T )
|
|
return false;
|
|
|
|
LIB_SHAPE* shape = static_cast<LIB_SHAPE*>( m_editPoints->GetParent() );
|
|
|
|
if( shape->GetShape() != SHAPE_T::POLY )
|
|
return false;
|
|
|
|
VECTOR2I cursorPos = getViewControls()->GetCursorPosition();
|
|
double threshold = getView()->ToWorld( EDIT_POINT::POINT_SIZE );
|
|
|
|
return shape->HitTest( cursorPos, (int) threshold );
|
|
}
|
|
|
|
|
|
int EE_POINT_EDITOR::addCorner( const TOOL_EVENT& aEvent )
|
|
{
|
|
if( !m_editPoints || m_editPoints->GetParent()->Type() != LIB_SHAPE_T )
|
|
return 0;
|
|
|
|
LIB_SHAPE* shape = static_cast<LIB_SHAPE*>( m_editPoints->GetParent() );
|
|
SHAPE_LINE_CHAIN& poly = shape->GetPolyShape().Outline( 0 );
|
|
|
|
VECTOR2I cursor = getViewControls()->GetCursorPosition( !aEvent.DisableGridSnapping() );
|
|
VECTOR2I pos = mapCoords( cursor );
|
|
int currentMinDistance = INT_MAX;
|
|
int closestLineStart = 0;
|
|
|
|
for( unsigned i = 0; i < poly.GetPointCount() - 1; ++i )
|
|
{
|
|
int distance = (int) DistanceLinePoint( poly.CPoint( i ),
|
|
poly.CPoint( i + 1 ), pos );
|
|
|
|
if( distance < currentMinDistance )
|
|
{
|
|
currentMinDistance = distance;
|
|
closestLineStart = i;
|
|
}
|
|
}
|
|
|
|
saveItemsToUndo();
|
|
poly.Insert( closestLineStart + 1, pos );
|
|
|
|
updateItem( shape, true );
|
|
updatePoints();
|
|
|
|
m_frame->OnModify();
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
int EE_POINT_EDITOR::removeCorner( const TOOL_EVENT& aEvent )
|
|
{
|
|
if( !m_editPoints || !m_editedPoint || m_editPoints->GetParent()->Type() != LIB_SHAPE_T )
|
|
return 0;
|
|
|
|
LIB_SHAPE* shape = static_cast<LIB_SHAPE*>( m_editPoints->GetParent() );
|
|
SHAPE_LINE_CHAIN& poly = shape->GetPolyShape().Outline( 0 );
|
|
|
|
if( poly.GetPointCount() < 3 )
|
|
return 0;
|
|
|
|
saveItemsToUndo();
|
|
poly.Remove( getEditedPointIndex() );
|
|
|
|
updateItem( shape, true );
|
|
updatePoints();
|
|
|
|
m_frame->OnModify();
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
int EE_POINT_EDITOR::modifiedSelection( const TOOL_EVENT& aEvent )
|
|
{
|
|
updatePoints();
|
|
return 0;
|
|
}
|
|
|
|
|
|
void EE_POINT_EDITOR::saveItemsToUndo()
|
|
{
|
|
if( m_isSymbolEditor )
|
|
{
|
|
saveCopyInUndoList( m_editPoints->GetParent()->GetParent(), UNDO_REDO::LIBEDIT );
|
|
}
|
|
else
|
|
{
|
|
saveCopyInUndoList( (SCH_ITEM*) m_editPoints->GetParent(), UNDO_REDO::CHANGED );
|
|
|
|
if( m_editPoints->GetParent()->Type() == SCH_LINE_T )
|
|
{
|
|
std::pair<EDA_ITEM*, int> connected = m_editPoints->Point( LINE_START ).GetConnected();
|
|
|
|
if( connected.first )
|
|
saveCopyInUndoList( (SCH_ITEM*) connected.first, UNDO_REDO::CHANGED, true );
|
|
|
|
connected = m_editPoints->Point( LINE_END ).GetConnected();
|
|
|
|
if( connected.first )
|
|
saveCopyInUndoList( (SCH_ITEM*) connected.first, UNDO_REDO::CHANGED, true );
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
void EE_POINT_EDITOR::rollbackFromUndo()
|
|
{
|
|
if( m_isSymbolEditor )
|
|
static_cast<SYMBOL_EDIT_FRAME*>( m_frame )->RollbackSymbolFromUndo();
|
|
else
|
|
static_cast<SCH_EDIT_FRAME*>( m_frame )->RollbackSchematicFromUndo();
|
|
}
|
|
|
|
|
|
void EE_POINT_EDITOR::setTransitions()
|
|
{
|
|
Go( &EE_POINT_EDITOR::Main, EVENTS::SelectedEvent );
|
|
Go( &EE_POINT_EDITOR::Main, ACTIONS::activatePointEditor.MakeEvent() );
|
|
Go( &EE_POINT_EDITOR::addCorner, EE_ACTIONS::pointEditorAddCorner.MakeEvent() );
|
|
Go( &EE_POINT_EDITOR::removeCorner, EE_ACTIONS::pointEditorRemoveCorner.MakeEvent() );
|
|
Go( &EE_POINT_EDITOR::modifiedSelection, EVENTS::SelectedItemsModified );
|
|
Go( &EE_POINT_EDITOR::clearEditedPoints, EVENTS::ClearedEvent );
|
|
}
|
|
|
|
|