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

Add dangling end support for lables and lines.

This commit is contained in:
Jeff Young 2018-08-30 23:43:42 +01:00
parent 6eafb9a2fd
commit 17ce36d4b7
2 changed files with 72 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eeschema/sch_line.h
View File

@ -158,6 +158,9 @@ public:
bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList ) override; bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList ) override;
bool IsStartDangling() const { return m_startIsDangling; }
bool IsEndDangling() const { return m_endIsDangling; }
bool IsDangling() const override { return m_startIsDangling || m_endIsDangling; } bool IsDangling() const override { return m_startIsDangling || m_endIsDangling; }
bool IsSelectStateChanged( const wxRect& aRect ) override; bool IsSelectStateChanged( const wxRect& aRect ) override;

149
eeschema/sch_painter.cpp
View File

@ -479,7 +479,6 @@ void SCH_PAINTER::draw ( LIB_TEXT *aText, int aLayer )
static int InternalPinDecoSize( const LIB_PIN &aPin ) static int InternalPinDecoSize( const LIB_PIN &aPin )
{ {
return aPin.GetNameTextSize() != 0 ? aPin.GetNameTextSize() / 2 : aPin.GetNumberTextSize() / 2; return aPin.GetNameTextSize() != 0 ? aPin.GetNameTextSize() / 2 : aPin.GetNumberTextSize() / 2;
} }
@ -832,11 +831,19 @@ void SCH_PAINTER::draw( LIB_PIN *aPin, int aLayer, bool isDangling )
} }
} }
void SCH_PAINTER::draw ( SCH_JUNCTION *aJct, int aLayer )
static void drawDanglingSymbol( GAL* aGal, const wxPoint& aPos )
{
wxPoint radius( DANGLING_SYMBOL_SIZE, DANGLING_SYMBOL_SIZE );
aGal->SetLineWidth ( 1.0 );
aGal->DrawRectangle( aPos - radius, aPos + radius );
}
void SCH_PAINTER::draw( SCH_JUNCTION *aJct, int aLayer )
{ {
const COLOR4D& color = m_schSettings.GetLayerColor( LAYER_JUNCTION ); const COLOR4D& color = m_schSettings.GetLayerColor( LAYER_JUNCTION );
m_gal->SetIsStroke(true); m_gal->SetIsStroke(true);
m_gal->SetIsFill(true); m_gal->SetIsFill(true);
m_gal->SetStrokeColor( color ); m_gal->SetStrokeColor( color );
@ -844,122 +851,101 @@ void SCH_PAINTER::draw ( SCH_JUNCTION *aJct, int aLayer )
m_gal->DrawCircle( aJct->GetPosition(), aJct->GetSymbolSize() / 2 ); m_gal->DrawCircle( aJct->GetPosition(), aJct->GetSymbolSize() / 2 );
} }
void SCH_PAINTER::draw ( SCH_LINE *aLine, int aLayer )
void SCH_PAINTER::draw( SCH_LINE *aLine, int aLayer )
{ {
COLOR4D color = GetLayerColor( LAYER_WIRE ); COLOR4D color = GetLayerColor( aLine->GetState( BRIGHTENED ) ? LAYER_BRIGHTENED : LAYER_WIRE );
int width = aLine->GetPenSize(); int width = aLine->GetPenSize();
/*if( Color != COLOR4D::UNSPECIFIED )
color = Color;
else if( m_color != COLOR4D::UNSPECIFIED )
color = m_color;
else
color = GetLayerColor( GetState( BRIGHTENED ) ? LAYER_BRIGHTENED : m_Layer );
GRSetDrawMode( DC, DrawMode );
wxPoint start = m_start;
wxPoint end = m_end;
if( ( m_Flags & STARTPOINT ) == 0 )
start += offset;
if( ( m_Flags & ENDPOINT ) == 0 )
end += offset;*/
m_gal->SetIsStroke(true); m_gal->SetIsStroke(true);
m_gal->SetStrokeColor(color); m_gal->SetStrokeColor(color);
m_gal->SetLineWidth( width ); m_gal->SetLineWidth( width );
m_gal->DrawLine( aLine->GetStartPoint(), aLine->GetEndPoint() ); m_gal->DrawLine( aLine->GetStartPoint(), aLine->GetEndPoint() );
//GRLine( panel->GetClipBox(), DC, start.x, start.y, end.x, end.y, width, color, if( aLine->IsStartDangling() )
// getwxPenStyle( (PlotDashType) GetLineStyle() ) ); drawDanglingSymbol( m_gal, aLine->GetStartPoint());
/*if( m_startIsDangling ) if( aLine->IsEndDangling() )
DrawDanglingSymbol( panel, DC, start, color ); drawDanglingSymbol( m_gal, aLine->GetEndPoint());
if( m_endIsDangling )
DrawDanglingSymbol( panel, DC, end, color );*/
} }
void SCH_PAINTER::draw ( SCH_TEXT *aText, int aLayer )
{
COLOR4D color;
int linewidth = aText->GetThickness() == 0 ? GetDefaultLineThickness() : aText->GetThickness();
switch ( aText->Type() ) void SCH_PAINTER::draw( SCH_TEXT *aText, int aLayer )
{
switch( aText->Type() )
{ {
case SCH_HIERARCHICAL_LABEL_T: case SCH_HIERARCHICAL_LABEL_T:
color = m_schSettings.GetLayerColor( LAYER_SHEETLABEL ); m_gal->SetStrokeColor( m_schSettings.GetLayerColor( LAYER_SHEETLABEL ) );
break; break;
case SCH_GLOBAL_LABEL_T: case SCH_GLOBAL_LABEL_T:
color = m_schSettings.GetLayerColor( LAYER_GLOBLABEL ); m_gal->SetStrokeColor( m_schSettings.GetLayerColor( LAYER_GLOBLABEL ) );
break; break;
default: default:
color = m_schSettings.GetLayerColor( LAYER_NOTES ); m_gal->SetStrokeColor( m_schSettings.GetLayerColor( LAYER_NOTES ) );
break; break;
} }
if( aText->IsDangling() )
drawDanglingSymbol( m_gal, aText->GetTextPos());
wxPoint text_offset = aText->GetTextPos() + aText->GetSchematicTextOffset();
int linewidth = aText->GetThickness() ? aText->GetThickness() : GetDefaultLineThickness();
wxString shownText( aText->GetShownText() );
linewidth = Clamp_Text_PenSize( linewidth, aText->GetTextSize(), aText->IsBold() ); linewidth = Clamp_Text_PenSize( linewidth, aText->GetTextSize(), aText->IsBold() );
wxPoint text_offset = aText->GetTextPos() + aText->GetSchematicTextOffset(); if( !shownText.IsEmpty() )
{
int savedWidth = aText->GetThickness();
//if( m_isDangling && panel)
//DrawDanglingSymbol( panel, DC, GetTextPos() + aOffset, color );
wxString shownText( aText->GetShownText() );
if( shownText.Length() == 0 )
return;
m_gal->SetStrokeColor( color );
m_gal->SetIsFill( false ); m_gal->SetIsFill( false );
m_gal->SetIsStroke( true ); m_gal->SetIsStroke( true );
m_gal->SetGlyphSize( aText->GetTextSize() );
m_gal->SetTextAttributes( aText ); m_gal->SetTextAttributes( aText );
m_gal->SetLineWidth( linewidth ); m_gal->SetLineWidth( linewidth );
m_gal->StrokeText( shownText, text_offset, aText->GetTextAngleRadians() ); m_gal->StrokeText( shownText, text_offset, aText->GetTextAngleRadians() );
}
} }
static void orientComponent( LIB_PART *part, int orientation ) static void orientComponent( LIB_PART *part, int orientation )
{ {
#define N_ORIENTATIONS 8 #define N_ORIENTATIONS 8
struct ORIENT { struct ORIENT
{
int flag; int flag;
int n_rots; int n_rots;
int mirror_x, mirror_y; int mirror_x, mirror_y;
} orientations[N_ORIENTATIONS] = { }
{ CMP_ORIENT_0, 0, 0, 0}, orientations[N_ORIENTATIONS] =
{ CMP_ORIENT_90, 1, 0, 0}, {
{ CMP_ORIENT_180, 2, 0, 0}, { CMP_ORIENT_0, 0, 0, 0 },
{ CMP_ORIENT_270, 3, 0, 0}, { CMP_ORIENT_90, 1, 0, 0 },
{ CMP_MIRROR_X + CMP_ORIENT_0, 0, 1, 0 }, { CMP_ORIENT_180, 2, 0, 0 },
{ CMP_MIRROR_X + CMP_ORIENT_90, 1, 1, 0}, { CMP_ORIENT_270, 3, 0, 0 },
{ CMP_MIRROR_Y, 0, 0, 1}, { CMP_MIRROR_X + CMP_ORIENT_0, 0, 1, 0 },
{ CMP_MIRROR_X + CMP_ORIENT_90, 1, 1, 0 },
{ CMP_MIRROR_Y, 0, 0, 1 },
{ CMP_MIRROR_X + CMP_ORIENT_270, 3, 1, 0 } { CMP_MIRROR_X + CMP_ORIENT_270, 3, 1, 0 }
// CMP_MIRROR_Y + CMP_ORIENT_0,
// CMP_MIRROR_Y + CMP_ORIENT_90,
// CMP_MIRROR_Y + CMP_ORIENT_180,
// CMP_MIRROR_Y + CMP_ORIENT_270
}; };
// ,
// CMP_MIRROR_Y + CMP_ORIENT_0, CMP_MIRROR_Y + CMP_ORIENT_90,
// CMP_MIRROR_Y + CMP_ORIENT_180, CMP_MIRROR_Y + CMP_ORIENT_270*/
//}
ORIENT o; ORIENT o;
for(int i = 0; i < N_ORIENTATIONS;i++) for( int i = 0; i < N_ORIENTATIONS; i++ )
if(orientations[i].flag == orientation)
{ {
o = orientations[i]; if( orientations[i].flag == orientation )
break; {
o = orientations[i];
break;
}
} }
//printf("orient %d %d %d\n", o.n_rots, o.mirror_x, o.mirror_y ); //printf("orient %d %d %d\n", o.n_rots, o.mirror_x, o.mirror_y );
for(int i = 0; i < o.n_rots; i++) for( int i = 0; i < o.n_rots; i++ )
{ {
for( auto& item : part->GetDrawItems() ) for( auto& item : part->GetDrawItems() )
{ {
@ -976,6 +962,7 @@ static void orientComponent( LIB_PART *part, int orientation )
} }
} }
void SCH_PAINTER::draw( SCH_COMPONENT *aComp, int aLayer ) void SCH_PAINTER::draw( SCH_COMPONENT *aComp, int aLayer )
{ {
PART_SPTR part = aComp->GetPartRef().lock(); PART_SPTR part = aComp->GetPartRef().lock();
@ -993,8 +980,10 @@ void SCH_PAINTER::draw( SCH_COMPONENT *aComp, int aLayer )
item.Move( wxPoint( rp.x + ip.x, ip.y - rp.y ) ); item.Move( wxPoint( rp.x + ip.x, ip.y - rp.y ) );
} }
draw( ptrans.get(), aLayer, false, // Always draw dangling pin targets when dragging
aComp->GetUnit(), aComp->GetConvert(), aComp->GetDanglingPinFlags() ); std::vector<bool>* pinFlags = aComp->IsMoving() ? nullptr : aComp->GetDanglingPinFlags();
draw( ptrans.get(), aLayer, false, aComp->GetUnit(), aComp->GetConvert(), pinFlags );
// The fields are SCH_COMPONENT-specific and so don't need to be copied/ // The fields are SCH_COMPONENT-specific and so don't need to be copied/
// oriented/translated. // oriented/translated.