Some more missing D()->DBG() changes. (6d151312) · Commits · Elphel / kicad-source-mirror

eeschema/dialogs/dialog_edit_component_in_schematic.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -188,7 +188,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC( wxWindow

		void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnListItemDeselected( wxListEvent& event )
		{
		D( printf( "OnListItemDeselected()\n" ); )
		DBG( printf( "OnListItemDeselected()\n" ); )

		if( !m_skipCopyFromPanel )
		{
		@@ -200,7 +200,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnListItemDeselected( wxListEvent& even

		void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnListItemSelected( wxListEvent& event )
		{
		D( printf( "OnListItemSelected()\n" ); )
		DBG( printf( "OnListItemSelected()\n" ); )

		// remember the selected row, statically
		s_SelectedRow = event.GetIndex();
		@@ -448,7 +448,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::moveUpButtonHandler( wxCommandEvent& ev
		// and in the fieldListCtrl
		SCH_FIELD tmp = m_FieldsBuf[fieldNdx - 1];

		D( printf( "tmp.m_Text=\"%s\" tmp.m_Name=\"%s\"\n",
		DBG( printf( "tmp.m_Text=\"%s\" tmp.m_Name=\"%s\"\n",
		TO_UTF8( tmp.GetText() ), TO_UTF8( tmp.GetName( false ) ) ); )

		m_FieldsBuf[fieldNdx - 1] = m_FieldsBuf[fieldNdx];
		@@ -866,12 +866,12 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::copyOptionsToPanel()
		if( mirror == CMP_MIRROR_X )
		{
		mirrorRadioBox->SetSelection( 1 );
		D( printf( "mirror=X,1\n" ); )
		DBG( printf( "mirror=X,1\n" ); )
		}
		else if( mirror == CMP_MIRROR_Y )
		{
		mirrorRadioBox->SetSelection( 2 );
		D( printf( "mirror=Y,2\n" ); )
		DBG( printf( "mirror=Y,2\n" ); )
		}
		else
		mirrorRadioBox->SetSelection( 0 );
		@@ -891,7 +891,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::copyOptionsToPanel()
		// Show the "Parts Locked" option?
		if( !m_LibEntry \|\| !m_LibEntry->UnitsLocked() )
		{
		D( printf( "partsAreLocked->false\n" ); )
		DBG( printf( "partsAreLocked->false\n" ); )
		partsAreLockedLabel->Show( false );
		}

eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -472,7 +472,7 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::initBuffers()
		// fixed fields:
		for( int i=0; i<MANDATORY_FIELDS; ++i )
		{
		D( printf( "add fixed:%s\n", TO_UTF8( cmpFields[i].GetName() ) ); )
		DBG( printf( "add fixed:%s\n", TO_UTF8( cmpFields[i].GetName() ) ); )
		m_FieldsBuf.push_back( cmpFields[i] );
		}

		@@ -497,7 +497,7 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::initBuffers()
		// values from the component will be set.
		if( !libField )
		{
		D( printf( "add template:%s\n", TO_UTF8( it->m_Name ) ); )
		DBG( printf( "add template:%s\n", TO_UTF8( it->m_Name ) ); )

		fld.SetName( it->m_Name );
		fld.SetText( it->m_Value ); // empty? ok too.
		@@ -509,7 +509,7 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::initBuffers()
		}
		else
		{
		D( printf( "match template:%s\n", TO_UTF8( libField->GetName() ) ); )
		DBG( printf( "match template:%s\n", TO_UTF8( libField->GetName() ) ); )
		fld = *libField; // copy values from component, m_Name too
		}

		@@ -525,7 +525,7 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::initBuffers()

		if( !buf )
		{
		D( printf( "add cmp:%s\n", TO_UTF8( cmp->GetName() ) ); )
		DBG( printf( "add cmp:%s\n", TO_UTF8( cmp->GetName() ) ); )
		m_FieldsBuf.push_back( *cmp );
		}
		}
		@@ -721,11 +721,11 @@ bool DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::copyPanelToSelectedField()
		if( field.GetId() >= MANDATORY_FIELDS )
		{
		wxString name = fieldNameTextCtrl->GetValue();
		D( printf("name:%s\n", TO_UTF8( name ) ); )
		DBG( printf("name:%s\n", TO_UTF8( name ) ); )
		field.SetName( name );
		}

		D( printf("setname:%s\n", TO_UTF8( field.GetName() ) ); )
		DBG( printf("setname:%s\n", TO_UTF8( field.GetName() ) ); )

		setRowItem( fieldNdx, field ); // update fieldListCtrl

eeschema/eeschema_config.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -292,7 +292,7 @@ void SCH_EDIT_FRAME::OnSetOptions( wxCommandEvent& event )

		for( unsigned i=0; i<tfnames.size(); ++i )
		{
		D(printf("dlg.SetFieldName(%d, '%s')\n", i, TO_UTF8( tfnames[i].m_Name) );)
		DBG(printf("dlg.SetFieldName(%d, '%s')\n", i, TO_UTF8( tfnames[i].m_Name) );)

		dlg.SetFieldName( i, tfnames[i].m_Name );
		}
		@@ -680,7 +680,7 @@ void SCH_EDIT_FRAME::LoadSettings()
		catch( IO_ERROR& e )
		{
		// @todo show error msg
		D( printf( "templatefieldnames parsing error: '%s'\n",
		DBG( printf( "templatefieldnames parsing error: '%s'\n",
		TO_UTF8( e.errorText ) ); )
		}
		}
		@@ -751,7 +751,7 @@ void SCH_EDIT_FRAME::SaveSettings()

		m_TemplateFieldNames.Format( &sf, 0 );

		D(printf("saving formatted template fieldnames:'%s'\n", sf.GetString().c_str() );)
		DBG(printf("saving formatted template fieldnames:'%s'\n", sf.GetString().c_str() );)

		wxString record = FROM_UTF8( sf.GetString().c_str() );
		record.Replace( wxT("\n"), wxT(""), true ); // strip all newlines

eeschema/lib_field.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -640,7 +640,7 @@ void LIB_FIELD::SetName( const wxString& aName )
		// Besides, m_id is a relic that is untrustworthy now.
		if( m_id >=0 && m_id < MANDATORY_FIELDS )
		{
		D(printf( "trying to set a MANDATORY_FIELD's name\n" );)
		DBG(printf( "trying to set a MANDATORY_FIELD's name\n" );)
		return;
		}

eeschema/netform.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -417,7 +417,7 @@ bool SCH_EDIT_FRAME::WriteNetListFile( int aFormat, const wxString& aFullFileNam
		wxFileName tmpFile = aFullFileName;
		tmpFile.SetExt( INTERMEDIATE_NETLIST_EXT );

		D(printf("tmpFile:'%s'\n", TO_UTF8( tmpFile.GetFullPath() ) );)
		DBG(printf("tmpFile:'%s'\n", TO_UTF8( tmpFile.GetFullPath() ) );)

		ret = helper.WriteGENERICNetList( tmpFile.GetFullPath() );
		if( !ret )
		@@ -435,7 +435,7 @@ bool SCH_EDIT_FRAME::WriteNetListFile( int aFormat, const wxString& aFullFileNam
		tmpFile.GetFullPath(),
		aFullFileName );

		D(printf("commandLine:'%s'\n", TO_UTF8( commandLine ) );)
		DBG(printf("commandLine:'%s'\n", TO_UTF8( commandLine ) );)

		ProcessExecute( commandLine, wxEXEC_SYNC );

Admin message