Commit c7f6343b authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Pcbnew: fix 2 minor issues, noticeable only in debug mode. 

When reading board files, the net 0 was stored twice.
It creates only log messges in debug mode, because the list of nets is rebuild after reading files.
parent 20f0a5f8

pcbnew/class_board.cpp

+4 −7
Original line number Diff line number Diff line
@@ -1381,14 +1381,11 @@ NETINFO_ITEM* BOARD::FindNet( int aNetcode ) const 
    NETINFO_ITEM* net = m_NetInfo.GetNetItem( aNetcode );



#if defined(DEBUG)

    if( net )     // item can be NULL if anetcode is not valid

    if( net && aNetcode != net->GetNet())     // item can be NULL if anetcode is not valid

    {

        if( aNetcode != net->GetNet() )

        {

            printf( "FindNet() anetcode %d != GetNet() %d (net: %s)\n",

        wxLogError( wxT( "FindNet() anetcode %d != GetNet() %d (net: %s)\n" ),

                      aNetcode, net->GetNet(), TO_UTF8( net->GetNetname() ) );

    }

    }

#endif



    return net;

pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp

+364 −342
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Aug 24 2011)

// C++ code generated with wxFormBuilder (version Apr 10 2012)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -32,6 +32,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	m_button4 = new wxButton( m_PanelProperties, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );

	sbSizerRef->Add( m_button4, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxTOP, 5 );

	

	

	bSizer13->Add( sbSizerRef, 0, wxALL|wxEXPAND, 5 );

	

	wxStaticBoxSizer* sbSizerValue;
@@ -43,6 +44,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	m_button5 = new wxButton( m_PanelProperties, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );

	sbSizerValue->Add( m_button5, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxTOP, 5 );

	

	

	bSizer13->Add( sbSizerValue, 0, wxALL|wxEXPAND, 5 );

	

	wxString m_LayerCtrlChoices[] = { _("Top"), _("Bottom") };
@@ -67,6 +69,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	m_OrientValue = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	sbSizerOrientation->Add( m_OrientValue, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );

	

	

	bSizer13->Add( sbSizerOrientation, 0, wxALL|wxEXPAND, 5 );

	

	wxStaticBoxSizer* sbSizerPosition;
@@ -75,7 +78,6 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	wxFlexGridSizer* fgSizer2;

	fgSizer2 = new wxFlexGridSizer( 2, 2, 0, 0 );

	fgSizer2->AddGrowableCol( 1 );

	fgSizer2->AddGrowableRow( 2 );

	fgSizer2->SetFlexibleDirection( wxHORIZONTAL );

	fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@@ -93,10 +95,13 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	m_ModPositionY = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	fgSizer2->Add( m_ModPositionY, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );

	

	

	sbSizerPosition->Add( fgSizer2, 1, wxEXPAND, 5 );

	

	

	bSizer13->Add( sbSizerPosition, 0, wxALL|wxEXPAND, 5 );

	

	

	m_PanelPropertiesBoxSizer->Add( bSizer13, 1, wxEXPAND, 5 );

	

	m_PropRightSizer = new wxBoxSizer( wxVERTICAL );
@@ -122,6 +127,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	m_AutoPlaceCtrl->SetSelection( 0 );

	bSizer12->Add( m_AutoPlaceCtrl, 1, wxALL|wxEXPAND, 5 );

	

	

	m_PropRightSizer->Add( bSizer12, 1, wxEXPAND, 5 );

	

	wxStaticBoxSizer* sbSizerAutoplace;
@@ -137,6 +143,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	m_CostRot90Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );

	bSizerRotOpt->Add( m_CostRot90Ctrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );

	

	

	sbSizerAutoplace->Add( bSizerRotOpt, 1, wxEXPAND, 5 );

	

	wxBoxSizer* bSizerMoveOpt;
@@ -149,8 +156,10 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	m_CostRot180Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );

	bSizerMoveOpt->Add( m_CostRot180Ctrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );

	

	

	sbSizerAutoplace->Add( bSizerMoveOpt, 1, wxEXPAND, 5 );

	

	

	m_PropRightSizer->Add( sbSizerAutoplace, 1, wxEXPAND|wxALL, 5 );

	

	wxStaticBoxSizer* sbSizerLocalProperties;
@@ -172,6 +181,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	m_ZoneConnectionChoice->SetSelection( 0 );

	bSizer10->Add( m_ZoneConnectionChoice, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );

	

	

	bSizer11->Add( bSizer10, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );

	

	m_staticTextInfo = new wxStaticText( m_PanelProperties, wxID_ANY, _("Set clearances to 0 to use global values"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -180,10 +190,12 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	

	bSizer11->Add( m_staticTextInfo, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 );

	

	

	sbSizerLocalProperties->Add( bSizer11, 0, 0, 5 );

	

	wxFlexGridSizer* fgSizerClearances;

	fgSizerClearances = new wxFlexGridSizer( 5, 3, 0, 0 );

	fgSizerClearances->AddGrowableCol( 1 );

	fgSizerClearances->SetFlexibleDirection( wxBOTH );

	fgSizerClearances->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@@ -194,20 +206,20 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	fgSizerClearances->Add( m_staticTextNetClearance, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );

	

	m_NetClearanceValueCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	fgSizerClearances->Add( m_NetClearanceValueCtrl, 0, wxALL|wxEXPAND, 5 );

	fgSizerClearances->Add( m_NetClearanceValueCtrl, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );

	

	m_NetClearanceUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );

	m_NetClearanceUnits->Wrap( -1 );

	fgSizerClearances->Add( m_NetClearanceUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );

	

	m_staticline1 = new wxStaticLine( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );

	fgSizerClearances->Add( m_staticline1, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );

	fgSizerClearances->Add( m_staticline1, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );

	

	m_staticline2 = new wxStaticLine( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );

	fgSizerClearances->Add( m_staticline2, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );

	fgSizerClearances->Add( m_staticline2, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );

	

	m_staticline3 = new wxStaticLine( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );

	fgSizerClearances->Add( m_staticline3, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );

	fgSizerClearances->Add( m_staticline3, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );

	

	m_MaskClearanceTitle = new wxStaticText( m_PanelProperties, wxID_ANY, _("Solder mask clearance:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_MaskClearanceTitle->Wrap( -1 );
@@ -216,7 +228,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	fgSizerClearances->Add( m_MaskClearanceTitle, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );

	

	m_SolderMaskMarginCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	fgSizerClearances->Add( m_SolderMaskMarginCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );

	fgSizerClearances->Add( m_SolderMaskMarginCtrl, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );

	

	m_SolderMaskMarginUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );

	m_SolderMaskMarginUnits->Wrap( -1 );
@@ -229,7 +241,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	fgSizerClearances->Add( m_staticTextSolderPaste, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 );

	

	m_SolderPasteMarginCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	fgSizerClearances->Add( m_SolderPasteMarginCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );

	fgSizerClearances->Add( m_SolderPasteMarginCtrl, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );

	

	m_SolderPasteMarginUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );

	m_SolderPasteMarginUnits->Wrap( -1 );
@@ -242,18 +254,22 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	fgSizerClearances->Add( m_staticTextRatio, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );

	

	m_SolderPasteMarginRatioCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	fgSizerClearances->Add( m_SolderPasteMarginRatioCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );

	fgSizerClearances->Add( m_SolderPasteMarginRatioCtrl, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );

	

	m_SolderPasteRatioMarginUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 );

	m_SolderPasteRatioMarginUnits->Wrap( -1 );

	fgSizerClearances->Add( m_SolderPasteRatioMarginUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );

	

	

	sbSizerLocalProperties->Add( fgSizerClearances, 1, wxEXPAND, 5 );

	

	

	m_PropRightSizer->Add( sbSizerLocalProperties, 0, wxALL|wxEXPAND, 5 );

	

	

	m_PanelPropertiesBoxSizer->Add( m_PropRightSizer, 0, 0, 5 );

	

	

	m_PanelProperties->SetSizer( m_PanelPropertiesBoxSizer );

	m_PanelProperties->Layout();

	m_PanelPropertiesBoxSizer->Fit( m_PanelProperties );
@@ -274,6 +290,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	

	m_Sizer3DValues = new wxStaticBoxSizer( new wxStaticBox( m_Panel3D, wxID_ANY, _("3D Scale and Position") ), wxVERTICAL );

	

	

	bLowerSizer3D->Add( m_Sizer3DValues, 1, wxEXPAND, 5 );

	

	wxBoxSizer* bSizer3DButtons;
@@ -288,10 +305,13 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	m_buttonRemove = new wxButton( m_Panel3D, ID_REMOVE_3D_SHAPE, _("Remove 3D Shape"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizer3DButtons->Add( m_buttonRemove, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );

	

	

	bLowerSizer3D->Add( bSizer3DButtons, 0, wxALIGN_CENTER_VERTICAL, 5 );

	

	

	bSizerMain3D->Add( bLowerSizer3D, 1, wxEXPAND, 5 );

	

	

	m_Panel3D->SetSizer( bSizerMain3D );

	m_Panel3D->Layout();

	bSizerMain3D->Fit( m_Panel3D );
@@ -305,8 +325,10 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	m_sdbSizerStdButtonsCancel = new wxButton( this, wxID_CANCEL );

	m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsCancel );

	m_sdbSizerStdButtons->Realize();

	

	m_GeneralBoxSizer->Add( m_sdbSizerStdButtons, 0, wxEXPAND|wxALIGN_RIGHT|wxALL, 5 );

	

	

	this->SetSizer( m_GeneralBoxSizer );

	this->Layout();

pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp

+4370 −4489

File changed.

Preview size limit exceeded, changes collapsed.

pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h

+128 −128
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Aug 24 2011)

// C++ code generated with wxFormBuilder (version Apr 10 2012)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -120,7 +120,7 @@ class DIALOG_MODULE_BOARD_EDITOR_BASE : public wxDialog 
	public:

		wxStaticBoxSizer* m_Sizer3DValues;

		

		DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Module properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 550,800 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 

		DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Module properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 544,599 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 

		~DIALOG_MODULE_BOARD_EDITOR_BASE();

	

};

pcbnew/legacy_plugin.cpp

+13 −4
Original line number Diff line number Diff line
@@ -1713,13 +1713,11 @@ void LEGACY_PLUGIN::loadPCB_LINE() 
    THROW_IO_ERROR( "Missing '$EndDRAWSEGMENT'" );

}





void LEGACY_PLUGIN::loadNETINFO_ITEM()

{

    char  buf[1024];



    NETINFO_ITEM* net = new NETINFO_ITEM( m_board );

    m_board->AppendNet( net );



    while( READLINE( m_reader ) )

    {
@@ -1738,8 +1736,16 @@ void LEGACY_PLUGIN::loadNETINFO_ITEM() 
        }



        else if( TESTLINE( "$EndEQUIPOT" ) )

        {

            // net 0 should be already in list, so store this net

            // if it is not the net 0, or if the net 0 does not exists.

            if( net->GetNet() > 0 || m_board->FindNet( 0 ) == NULL )

                m_board->AppendNet( net );

            else

                delete net;

            return;     // preferred exit

        }

    }



    THROW_IO_ERROR( "Missing '$EndEQUIPOT'" );

}
@@ -2135,8 +2141,11 @@ void LEGACY_PLUGIN::loadZONE_CONTAINER() 
            }



            zc->SetTimeStamp( timestamp );

            zc->SetNet( netcode );

            zc->SetNetName( FROM_UTF8( buf ) );

            // Init the net code only, not the netname, to be sure

            // the zone net name is the name read in file.

            // (When mismatch, the user will be prompted in DRC, to fix the actual name)

            zc->BOARD_CONNECTED_ITEM::SetNet( netcode );

            zc->SetNetName( FROM_UTF8( buf ) );     // init the net name here

        }



        else if( TESTLINE( "ZLayer" ) )     // layer found