kicad-source/common/refdes_utils.cpp
Seth Hillbrand 8a305eec32 Remove broken RefDesStringCompare
This function attempted a poor-man's natural compare but it assumed
specific structure of the string.  This broke for strings with
numberings that looked like decimals.

Instead, we use our natural string comparison function and remove the
references to this older function and its similar elements.

Fixes https://gitlab.com/kicad/code/kicad/issues/9067
2021-09-01 11:48:01 -07:00

74 lines
2.1 KiB
C++

/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2019-2021 KiCad Developers, see CHANGELOG.TXT for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <refdes_utils.h>
#include <string_utils.h>
#include <algorithm>
#include <cctype>
namespace UTIL
{
wxString GetRefDesPrefix( const wxString& aRefDes )
{
// find the first non-digit, non-question-mark character from the back
auto res = std::find_if( aRefDes.rbegin(), aRefDes.rend(),
[]( wxUniChar aChr )
{
return aChr != '?' && !std::isdigit( aChr );
} );
return { aRefDes.begin(), res.base() };
}
wxString GetRefDesUnannotated( const wxString& aSource )
{
return UTIL::GetRefDesPrefix( aSource ) + wxT( "?" );
}
int GetRefDesNumber( const wxString& aRefDes )
{
int retval = -1; // negative to indicate not found
size_t firstnum = aRefDes.find_first_of( "0123456789" );
if( firstnum != wxString::npos )
{
wxString candidateValue = aRefDes.Mid( firstnum );
long result;
if( !candidateValue.ToLong( &result ) )
retval = -1;
else
retval = static_cast<int>( result );
}
return retval;
}
} // namespace UTIL