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

Auto-rotate sheet pins onto the top and bottom when moving 

Fixes https://gitlab.com/kicad/code/kicad/issues/2178
This commit is contained in:
Ian McInerney 2020-02-15 18:44:41 +00:00
parent 43514a18bb
commit a0698723b9
3 changed files with 88 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
eeschema/sch_sheet_pin.cpp
View File

@ -22,17 +22,20 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <fctsys.h> #include <algorithm>
#include <gr_basic.h>
#include <sch_draw_panel.h>
#include <gr_text.h>
#include <plotter.h>
#include <trigo.h>
#include <sch_edit_frame.h>
#include <bitmaps.h> #include <bitmaps.h>
#include <fctsys.h>
#include <general.h> #include <general.h>
#include <sch_sheet.h> #include <geometry/shape_line_chain.h>
#include <gr_basic.h>
#include <gr_text.h>
#include <kicad_string.h> #include <kicad_string.h>
#include <plotter.h>
#include <sch_draw_panel.h>
#include <sch_edit_frame.h>
#include <sch_sheet.h>
#include <trigo.h>
SCH_SHEET_PIN::SCH_SHEET_PIN( SCH_SHEET* parent, const wxPoint& pos, const wxString& text ) : SCH_SHEET_PIN::SCH_SHEET_PIN( SCH_SHEET* parent, const wxPoint& pos, const wxString& text ) :
@ -157,37 +160,65 @@ void SCH_SHEET_PIN::ConstrainOnEdge( wxPoint Pos )
if( sheet == NULL ) if( sheet == NULL )
return; return;
wxPoint center = sheet->m_pos + ( sheet->m_size / 2 ); int leftSide = sheet->m_pos.x;
int rightSide = sheet->m_pos.x + sheet->m_size.x;
int topSide = sheet->m_pos.y;
int botSide = sheet->m_pos.y + sheet->m_size.y;
if( m_edge == SHEET_LEFT_SIDE || m_edge == SHEET_RIGHT_SIDE ) SHAPE_LINE_CHAIN sheetEdge;
sheetEdge.Append( leftSide, topSide );
sheetEdge.Append( rightSide, topSide );
sheetEdge.Append( rightSide, botSide );
sheetEdge.Append( leftSide, botSide );
sheetEdge.Append( leftSide, topSide );
switch( sheetEdge.NearestSegment( Pos ) )
{ {
if( Pos.x > center.x ) case 0:
SetEdge( SHEET_RIGHT_SIDE ); SetEdge( SHEET_TOP_SIDE );
else break;
SetEdge( SHEET_LEFT_SIDE ); case 1:
SetEdge( SHEET_RIGHT_SIDE );
break;
case 2:
SetEdge( SHEET_BOTTOM_SIDE );
break;
case 3:
SetEdge( SHEET_LEFT_SIDE );
break;
default:
wxASSERT( "Invalid segment number" );
}
switch( GetEdge() )
{
case SHEET_RIGHT_SIDE:
case SHEET_LEFT_SIDE:
SetTextY( Pos.y ); SetTextY( Pos.y );
if( GetTextPos().y < sheet->m_pos.y ) if( GetTextPos().y < topSide )
SetTextY( sheet->m_pos.y ); SetTextY( topSide );
if( GetTextPos().y > (sheet->m_pos.y + sheet->m_size.y) ) if( GetTextPos().y > botSide )
SetTextY( sheet->m_pos.y + sheet->m_size.y ); SetTextY( botSide );
}
else
{
if( Pos.y > center.y )
SetEdge( SHEET_BOTTOM_SIDE );
else
SetEdge( SHEET_TOP_SIDE );
break;
case SHEET_BOTTOM_SIDE:
case SHEET_TOP_SIDE:
SetTextX( Pos.x ); SetTextX( Pos.x );
if( GetTextPos().x < sheet->m_pos.x ) if( GetTextPos().x < leftSide )
SetTextX( sheet->m_pos.x ); SetTextX( leftSide );
if( GetTextPos().x > (sheet->m_pos.x + sheet->m_size.x) ) if( GetTextPos().x > rightSide )
SetTextX( sheet->m_pos.x + sheet->m_size.x ); SetTextX( rightSide );
break;
case SHEET_UNDEFINED_SIDE:
wxASSERT( "Undefined sheet side" );
} }
} }

8
libs/kimath/include/geometry/shape_line_chain.h
View File

@ -607,6 +607,14 @@ public:
*/ */
ClipperLib::Path convertToClipper( bool aRequiredOrientation ) const; ClipperLib::Path convertToClipper( bool aRequiredOrientation ) const;
/**
* Find the segment nearest the given point.
*
* @param aP point to compare with
* @return the index of the segment closest to the point
*/
int NearestSegment( const VECTOR2I& aP ) const;
/** /**
* Function NearestPoint() * Function NearestPoint()
* *

20
libs/kimath/src/geometry/shape_line_chain.cpp
View File

@ -624,6 +624,26 @@ const VECTOR2I SHAPE_LINE_CHAIN::NearestPoint( const SEG& aSeg, int& dist ) cons
} }
int SHAPE_LINE_CHAIN::NearestSegment( const VECTOR2I& aP ) const
{
int min_d = INT_MAX;
int nearest = 0;
for( int i = 0; i < SegmentCount(); i++ )
{
int d = CSegment( i ).Distance( aP );
if( d < min_d )
{
min_d = d;
nearest = i;
}
}
return nearest;
}
const std::string SHAPE_LINE_CHAIN::Format() const const std::string SHAPE_LINE_CHAIN::Format() const
{ {
std::stringstream ss; std::stringstream ss;