From 76e8ed2506c97515e8e821f0b24ab2941fefbfdf Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Tue, 16 Jan 2024 15:43:22 -0500 Subject: [PATCH] Fix sch_field and pcb_target not returning evaluated similarity correctly --- eeschema/sch_field.cpp | 16 ++++++++-------- pcbnew/pcb_target.cpp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp index fb2e79578e..d9d1ab7b8c 100644 --- a/eeschema/sch_field.cpp +++ b/eeschema/sch_field.cpp @@ -1341,7 +1341,7 @@ double SCH_FIELD::Similarity( const SCH_ITEM& aOther ) const const SCH_FIELD& field = static_cast( aOther ); - double retval = 0.99; // The UUIDs are different, so we start with non-identity + double similarity = 0.99; // The UUIDs are different, so we start with non-identity if( GetId() != field.GetId() ) { @@ -1349,25 +1349,25 @@ double SCH_FIELD::Similarity( const SCH_ITEM& aOther ) const if( GetId() < MANDATORY_FIELDS || field.GetId() < MANDATORY_FIELDS ) return 0.0; else - retval *= 0.5; + similarity *= 0.5; } if( GetPosition() != field.GetPosition() ) - retval *= 0.5; + similarity *= 0.5; if( IsNamedVariable() != field.IsNamedVariable() ) - retval *= 0.5; + similarity *= 0.5; if( IsNameShown() != field.IsNameShown() ) - retval *= 0.5; + similarity *= 0.5; if( CanAutoplace() != field.CanAutoplace() ) - retval *= 0.5; + similarity *= 0.5; if( GetText() != field.GetText() ) - retval *= Levenshtein( field ); + similarity *= Levenshtein( field ); - return 1.0; + return similarity; } diff --git a/pcbnew/pcb_target.cpp b/pcbnew/pcb_target.cpp index ad13e865c3..2e411f2bae 100644 --- a/pcbnew/pcb_target.cpp +++ b/pcbnew/pcb_target.cpp @@ -225,7 +225,7 @@ double PCB_TARGET::Similarity( const BOARD_ITEM& aOther ) const if( GetPosition() != other.GetPosition() ) similarity *= 0.9; - return 1.0; + return similarity; } static struct PCB_TARGET_DESC