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

Stop setting modify from ClearAnnotation(). 

It's a side-effect, and as it turns out every current caller has
special-case code to reset it afterwards.
This commit is contained in:
Jeff Young 2020-09-06 11:26:39 +01:00
parent 4354fa7bde
commit a25dfb2ac9
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eeschema/annotate.cpp
View File

@ -70,11 +70,6 @@ void SCH_EDIT_FRAME::DeleteAnnotation( bool aCurrentSheetOnly, bool* aAppendUndo
SaveCopyInUndoList( aScreen, component, UNDO_REDO::CHANGED, *aAppendUndo ); SaveCopyInUndoList( aScreen, component, UNDO_REDO::CHANGED, *aAppendUndo );
*aAppendUndo = true; *aAppendUndo = true;
component->ClearAnnotation( aSheet ); component->ClearAnnotation( aSheet );
// Clear the modified component flag set by component->ClearAnnotation
// because we do not use it here and we should not leave this flag set,
// when an editing is finished:
component->ClearFlags();
} }
}; };

4
eeschema/sch_component.cpp
View File

@ -946,7 +946,7 @@ bool SCH_COMPONENT::ResolveTextVar( wxString* token, int aDepth ) const
} }
void SCH_COMPONENT::ClearAnnotation( SCH_SHEET_PATH* aSheetPath ) void SCH_COMPONENT::ClearAnnotation( const SCH_SHEET_PATH* aSheetPath )
{ {
// Build a reference with no annotation, // Build a reference with no annotation,
// i.e. a reference ended by only one '?' // i.e. a reference ended by only one '?'
@ -986,8 +986,6 @@ void SCH_COMPONENT::ClearAnnotation( SCH_SHEET_PATH* aSheetPath )
// UpdateAllScreenReferences for the active sheet. // UpdateAllScreenReferences for the active sheet.
// But this call cannot made here. // But this call cannot made here.
m_Fields[REFERENCE].SetText( defRef ); //for drawing. m_Fields[REFERENCE].SetText( defRef ); //for drawing.
SetModified();
} }

2
eeschema/sch_component.h
View File

@ -327,7 +327,7 @@ public:
* @param aSheetPath is the hierarchical path of the symbol to clear or remove all * @param aSheetPath is the hierarchical path of the symbol to clear or remove all
* annotations for this symbol if NULL. * annotations for this symbol if NULL.
*/ */
void ClearAnnotation( SCH_SHEET_PATH* aSheetPath ); void ClearAnnotation( const SCH_SHEET_PATH* aSheetPath );
/** /**
* Add an instance to the alternate references list (m_instanceReferences), if this entry * Add an instance to the alternate references list (m_instanceReferences), if this entry

9
eeschema/sch_screen.cpp
View File

@ -929,11 +929,6 @@ void SCH_SCREEN::ClearAnnotation( SCH_SHEET_PATH* aSheetPath )
SCH_COMPONENT* component = static_cast<SCH_COMPONENT*>( item ); SCH_COMPONENT* component = static_cast<SCH_COMPONENT*>( item );
component->ClearAnnotation( aSheetPath ); component->ClearAnnotation( aSheetPath );
// Clear the modified component flag set by component->ClearAnnotation
// because we do not use it here and we should not leave this flag set,
// when an editing is finished:
component->ClearFlags();
} }
} }
@ -945,10 +940,10 @@ void SCH_SCREEN::EnsureAlternateReferencesExist()
for( SCH_ITEM* item : Items().OfType( SCH_COMPONENT_T ) ) for( SCH_ITEM* item : Items().OfType( SCH_COMPONENT_T ) )
{ {
auto component = static_cast<SCH_COMPONENT*>( item ); SCH_COMPONENT* component = static_cast<SCH_COMPONENT*>( item );
// Add (when not existing) all sheet path entries // Add (when not existing) all sheet path entries
for( const auto& sheet : GetClientSheetPaths() ) for( const SCH_SHEET_PATH& sheet : GetClientSheetPaths() )
component->AddSheetPathReferenceEntryIfMissing( sheet.Path() ); component->AddSheetPathReferenceEntryIfMissing( sheet.Path() );
} }
} }