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

TRACK::GetMsgPanelInfo(): For arc, display shape ("TRACK (arc)") and radius. 

Also display "TRACK (arc)" in DRC error message, instead of just "Track".
This commit is contained in:
jean-pierre charras 2021-04-19 10:00:46 +02:00
parent afe0c79a1e
commit 287b0eea0f
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcbnew/track.cpp
View File

@ -1,10 +1,10 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2012 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr * Copyright (C) 2012 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2012 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 2012 Wayne Stambaugh <stambaughw@gmail.com>
* Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -656,7 +656,9 @@ void TRACK::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>
wxString msg; wxString msg;
BOARD* board = GetBoard(); BOARD* board = GetBoard();
aList.emplace_back( _( "Type" ), _( "Track" ) ); aList.emplace_back( _( "Type" ),
Type() == PCB_ARC_T ? ( "Track (arc)" ) : _( "Track" ) );
GetMsgPanelInfoBase_Common( aFrame, aList ); GetMsgPanelInfoBase_Common( aFrame, aList );
@ -664,6 +666,12 @@ void TRACK::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>
aList.emplace_back( _( "Width" ), MessageTextFromValue( units, m_Width ) ); aList.emplace_back( _( "Width" ), MessageTextFromValue( units, m_Width ) );
if( Type() == PCB_ARC_T )
{
double radius = static_cast<ARC*>( this )->GetRadius();
aList.emplace_back( _( "Radius" ), MessageTextFromValue( units, radius ) );
}
// Display full track length (in Pcbnew) // Display full track length (in Pcbnew)
if( board ) if( board )
{ {
@ -889,7 +897,9 @@ bool VIA::HitTest( const EDA_RECT& aRect, bool aContained, int aAccuracy ) const
wxString TRACK::GetSelectMenuText( EDA_UNITS aUnits ) const wxString TRACK::GetSelectMenuText( EDA_UNITS aUnits ) const
{ {
return wxString::Format( _("Track %s on %s, length %s" ), return wxString::Format( Type() == PCB_ARC_T ?
_("Track (arc) %s on %s, length %s" )
: _("Track %s on %s, length %s" ),
GetNetnameMsg(), GetNetnameMsg(),
GetLayerName(), GetLayerName(),
MessageTextFromValue( aUnits, GetLength() ) ); MessageTextFromValue( aUnits, GetLength() ) );