From 5e409f0f6c1f74466b0049230b06aff7420209f9 Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Sat, 20 Aug 2022 20:06:26 -0700 Subject: [PATCH] Remove string change and associated new feature String changes are not allowed in v6 branch --- pcbnew/pcb_track.cpp | 34 ---------------------------------- pcbnew/pcb_track.h | 2 -- 2 files changed, 36 deletions(-) diff --git a/pcbnew/pcb_track.cpp b/pcbnew/pcb_track.cpp index dd6d38166a..6ebf78a6a6 100644 --- a/pcbnew/pcb_track.cpp +++ b/pcbnew/pcb_track.cpp @@ -132,24 +132,6 @@ int PCB_TRACK::GetLocalClearance( wxString* aSource ) const } -MINOPTMAX 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 { if( !FlashLayer( aLayer ) ) @@ -733,22 +715,6 @@ void PCB_TRACK::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector 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 ) ); - } } diff --git a/pcbnew/pcb_track.h b/pcbnew/pcb_track.h index c670c73838..fbaee01e3b 100644 --- a/pcbnew/pcb_track.h +++ b/pcbnew/pcb_track.h @@ -193,8 +193,6 @@ public: */ int GetLocalClearance( wxString* aSource ) const override; - MINOPTMAX GetWidthConstraint( wxString* aSource ) const; - wxString GetSelectMenuText( EDA_UNITS aUnits ) const override; BITMAPS GetMenuImage() const override;