Remove string change and associated new feature
String changes are not allowed in v6 branch
This commit is contained in:
parent
408e7fed29
commit
5e409f0f6c
|
@ -132,24 +132,6 @@ int PCB_TRACK::GetLocalClearance( wxString* aSource ) const
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
MINOPTMAX<int> PCB_TRACK::GetWidthConstraint( wxString* aSource ) const
|
|
||||||
{
|
|
||||||
DRC_CONSTRAINT constraint;
|
|
||||||
|
|
||||||
if( GetBoard() && GetBoard()->GetDesignSettings().m_DRCEngine )
|
|
||||||
{
|
|
||||||
BOARD_DESIGN_SETTINGS& bds = GetBoard()->GetDesignSettings();
|
|
||||||
|
|
||||||
constraint = bds.m_DRCEngine->EvalRules( TRACK_WIDTH_CONSTRAINT, this, nullptr, m_layer );
|
|
||||||
}
|
|
||||||
|
|
||||||
if( aSource )
|
|
||||||
*aSource = constraint.GetName();
|
|
||||||
|
|
||||||
return constraint.Value();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int PCB_VIA::GetMinAnnulus( PCB_LAYER_ID aLayer, wxString* aSource ) const
|
int PCB_VIA::GetMinAnnulus( PCB_LAYER_ID aLayer, wxString* aSource ) const
|
||||||
{
|
{
|
||||||
if( !FlashLayer( aLayer ) )
|
if( !FlashLayer( aLayer ) )
|
||||||
|
@ -733,22 +715,6 @@ void PCB_TRACK::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_I
|
||||||
aList.emplace_back( wxString::Format( _( "Min Clearance: %s" ),
|
aList.emplace_back( wxString::Format( _( "Min Clearance: %s" ),
|
||||||
MessageTextFromValue( units, clearance ) ),
|
MessageTextFromValue( units, clearance ) ),
|
||||||
wxString::Format( _( "(from %s)" ), source ) );
|
wxString::Format( _( "(from %s)" ), source ) );
|
||||||
|
|
||||||
MINOPTMAX<int> c = GetWidthConstraint( &source );
|
|
||||||
|
|
||||||
if( c.HasMax() )
|
|
||||||
{
|
|
||||||
aList.emplace_back( wxString::Format( _( "Width Constraints: min %s, max %s" ),
|
|
||||||
MessageTextFromValue( units, c.Min() ),
|
|
||||||
MessageTextFromValue( units, c.Max() ) ),
|
|
||||||
wxString::Format( _( "(from %s)" ), source ) );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
aList.emplace_back( wxString::Format( _( "Width Constraints: min %s" ),
|
|
||||||
MessageTextFromValue( units, c.Min() ) ),
|
|
||||||
wxString::Format( _( "(from %s)" ), source ) );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -193,8 +193,6 @@ public:
|
||||||
*/
|
*/
|
||||||
int GetLocalClearance( wxString* aSource ) const override;
|
int GetLocalClearance( wxString* aSource ) const override;
|
||||||
|
|
||||||
MINOPTMAX<int> GetWidthConstraint( wxString* aSource ) const;
|
|
||||||
|
|
||||||
wxString GetSelectMenuText( EDA_UNITS aUnits ) const override;
|
wxString GetSelectMenuText( EDA_UNITS aUnits ) const override;
|
||||||
|
|
||||||
BITMAPS GetMenuImage() const override;
|
BITMAPS GetMenuImage() const override;
|
||||||
|
|
Loading…
Reference in New Issue