Fix back annotate field visibility bug in Eeschema. (fixes lp:1304835) (3cbf8a72) · Commits · Elphel / kicad-source-mirror

eeschema/backanno.cpp

+27 −33

Original line number	Original line	Diff line number	Diff line
	@@ -45,6 +45,7 @@
	#include <dsnlexer.h>		#include <dsnlexer.h>
	#include <ptree.h>		#include <ptree.h>
	#include <boost/property_tree/ptree.hpp>		#include <boost/property_tree/ptree.hpp>
			#include <wx/choicdlg.h>


	void SCH_EDIT_FRAME::backAnnotateFootprints( const std::string& aChangedSetOfReferences ) throw( IO_ERROR )		void SCH_EDIT_FRAME::backAnnotateFootprints( const std::string& aChangedSetOfReferences ) throw( IO_ERROR )
	@@ -88,7 +89,7 @@ void SCH_EDIT_FRAME::backAnnotateFootprints( const std::string& aChangedSetOfRef
	else		else
	footprint.Empty();		footprint.Empty();

	DBG( printf( "%s: ref:%s fpid:%s\n", __func__, TO_UTF8( reference ), TO_UTF8( footprint ) ); )		// DBG( printf( "%s: ref:%s fpid:%s\n", __func__, TO_UTF8( reference ), TO_UTF8( footprint ) ); )

	// Search the component in the flat list		// Search the component in the flat list
	for( unsigned ii = 0; ii < refs.GetCount(); ++ii )		for( unsigned ii = 0; ii < refs.GetCount(); ++ii )
	@@ -128,8 +129,8 @@ void SCH_EDIT_FRAME::backAnnotateFootprints( const std::string& aChangedSetOfRef


	bool SCH_EDIT_FRAME::ProcessCmpToFootprintLinkFile( const wxString& aFullFilename,		bool SCH_EDIT_FRAME::ProcessCmpToFootprintLinkFile( const wxString& aFullFilename,
	bool aForceFieldsVisibleAttribute,		bool aForceVisibilityState,
	bool aFieldsVisibleAttributeState )		bool aVisibilityState )
	{		{
	// Build a flat list of components in schematic:		// Build a flat list of components in schematic:
	SCH_REFERENCE_LIST referencesList;		SCH_REFERENCE_LIST referencesList;
	@@ -138,6 +139,7 @@ bool SCH_EDIT_FRAME::ProcessCmpToFootprintLinkFile( const wxString& aFullFilenam
	sheetList.GetComponents( Prj().SchLibs(), referencesList, false );		sheetList.GetComponents( Prj().SchLibs(), referencesList, false );

	FILE* cmpFile = wxFopen( aFullFilename, wxT( "rt" ) );		FILE* cmpFile = wxFopen( aFullFilename, wxT( "rt" ) );

	if( cmpFile == NULL )		if( cmpFile == NULL )
	return false;		return false;

	@@ -185,7 +187,7 @@ bool SCH_EDIT_FRAME::ProcessCmpToFootprintLinkFile( const wxString& aFullFilenam
	}		}
	}		}

	// A block is read: initialize the footprint field of the correponding component		// A block is read: initialize the footprint field of the corresponding component
	// if the footprint name is not empty		// if the footprint name is not empty
	if( reference.IsEmpty() )		if( reference.IsEmpty() )
	continue;		continue;
	@@ -203,10 +205,9 @@ bool SCH_EDIT_FRAME::ProcessCmpToFootprintLinkFile( const wxString& aFullFilenam

	fpfield->SetText( footprint );		fpfield->SetText( footprint );

	if( aForceFieldsVisibleAttribute )		if( aForceVisibilityState )
	{		{
	component->GetField( FOOTPRINT )		component->GetField( FOOTPRINT )->SetVisible( aVisibilityState );
	->SetVisible( aFieldsVisibleAttributeState );
	}		}
	}		}
	}		}
	@@ -220,7 +221,7 @@ bool SCH_EDIT_FRAME::LoadCmpToFootprintLinkFile()
	{		{
	wxString path = wxPathOnly( Prj().GetProjectFullName() );		wxString path = wxPathOnly( Prj().GetProjectFullName() );

	wxFileDialog dlg( this, _( "Load Component-Footprint Link File" ),		wxFileDialog dlg( this, _( "Load Component Footprint Link File" ),
	path, wxEmptyString,		path, wxEmptyString,
	ComponentFileExtensionWildcard,		ComponentFileExtensionWildcard,
	wxFD_OPEN \| wxFD_FILE_MUST_EXIST );		wxFD_OPEN \| wxFD_FILE_MUST_EXIST );
	@@ -233,33 +234,26 @@ bool SCH_EDIT_FRAME::LoadCmpToFootprintLinkFile()

	SetTitle( title );		SetTitle( title );

	int response = wxMessageBox( _( "Do you want to force all the footprint fields visibility?" ),		wxArrayString choices;
	_( "Field Visibility Change" ),		choices.Add( _( "Keep existing footprint field visibility" ) );
	wxYES_NO \| wxICON_QUESTION \| wxCANCEL, this );		choices.Add( _( "Show all footprint fields" ) );
			choices.Add( _( "Hide all footprint fields" ) );

	if( response == wxCANCEL )		wxSingleChoiceDialog choiceDlg( this, _( "Select the footprint field visibility setting." ),
	return false;		_( "Change Visibility" ), choices );

	bool changevisibility = response == wxYES;
	bool visible = false;

	if( changevisibility )		if( choiceDlg.ShowModal() == wxID_CANCEL )
	{
	response = wxMessageBox( _( "Do you want to make all the footprint fields visible?" ),
	_( "Field Visibility Option" ),
	wxYES_NO \| wxICON_QUESTION \| wxCANCEL, this );
	if( response == wxCANCEL )
	return false;		return false;

	visible = response == wxYES;		bool forceVisibility = (choiceDlg.GetSelection() != 0 );
	}		bool visibilityState = (choiceDlg.GetSelection() == 1 );

	if( !ProcessCmpToFootprintLinkFile( filename, changevisibility, visible ) )		if( !ProcessCmpToFootprintLinkFile( filename, forceVisibility, visibilityState ) )
	{		{
	wxString msg = wxString::Format( _(		wxString msg = wxString::Format( _( "Failed to open component-footprint link file '%s'" ),
	"Failed to open component-footprint link file '%s'" ),		filename.GetData() );
	filename.GetData()
	);
	DisplayError( this, msg );		DisplayError( this, msg );
	return false;		return false;
	}		}

include/wxEeschemaStruct.h

+7 −6

Original line number	Original line	Diff line number	Diff line
	@@ -701,15 +701,16 @@ public:
	* EndCmp		* EndCmp
	*		*
	* @param aFullFilename = the full filename to read		* @param aFullFilename = the full filename to read
	* @param aForceFieldsVisibleAttribute = true to change the footprint field flag		* @param aForceVisibilityState = Set to true to change the footprint field visibility
	* visible or invisible		* state to \a aVisibilityState. False retains the
	* false = keep old state.		* current footprint field visibility state.
	* @param aFieldsVisibleAttributeState = footprint field flag visible new state		* @param aVisiblityState True to show the footprint field or false to hide the footprint
			* field if \a aForceVisibilityState is true.
	* @return bool = true if success.		* @return bool = true if success.
	*/		*/
	bool ProcessCmpToFootprintLinkFile( const wxString& aFullFilename,		bool ProcessCmpToFootprintLinkFile( const wxString& aFullFilename,
	bool aForceFieldsVisibleAttribute,		bool aForceVisibilityState,
	bool aFieldsVisibleAttributeState );		bool aVisibilityState );

	/**		/**
	* Function SaveEEFile		* Function SaveEEFile

Admin message