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

Eeschema: fix crash when changing a label type to a global label during creation. 

Pcbnew: code cleaning in polygons
parent ef39c5f3

eeschema/edit_label.cpp

+4 −0
Original line number Diff line number Diff line
@@ -230,6 +230,10 @@ void SCH_EDIT_FRAME::OnConvertTextType( wxCommandEvent& aEvent ) 
    newtext->Draw( m_canvas, &dc, wxPoint( 0, 0 ), GR_DEFAULT_DRAWMODE );

    m_canvas->CrossHairOn( &dc );    // redraw schematic cursor



    // if the old item is the current schematic item, replace it by the new text:

    if( screen->GetCurItem() == text )

        screen->SetCurItem( newtext );



    if( text->IsNew() )

    {

        // if the previous text is new, no undo command to prepare here

eeschema/sch_sheet.cpp

+0 −2
Original line number Diff line number Diff line
@@ -950,8 +950,6 @@ void SCH_SHEET::renumberPins() 


void SCH_SHEET::GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList )

{

    // Using BOOST_FOREACH here creates problems (bad pointer value to pinsheet).

    // I do not know why.

    for( unsigned ii = 0; ii < GetPins().size(); ii++ )

    {

        SCH_SHEET_PIN &pinsheet = GetPins()[ii];

pcbnew/class_board.h

+2 −4
Original line number Diff line number Diff line
@@ -1115,11 +1115,9 @@ public: 
     * area_to_test must be after area_ref in m_ZoneDescriptorList

     * @param area_ref = area reference

     * @param area_to_test = area to compare for intersection calculations

     * @return : 0 if no intersection

     *         1 if intersection

     *         2 if arcs intersect

     * @return : false if no intersection, true if intersection

     */

    int TestAreaIntersection( ZONE_CONTAINER* area_ref, ZONE_CONTAINER* area_to_test );

    bool TestAreaIntersection( ZONE_CONTAINER* area_ref, ZONE_CONTAINER* area_to_test );



    /**

     * Function CombineAreas

pcbnew/dialogs/dialog_copper_zones_base.cpp

+47 −45
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Mar 17 2012)

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

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

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -19,8 +19,8 @@ BEGIN_EVENT_TABLE( DIALOG_COPPER_ZONE_BASE, DIALOG_SHIM ) 
	EVT_CHOICE( ID_CORNER_SMOOTHING, DIALOG_COPPER_ZONE_BASE::_wxFB_OnCornerSmoothingModeChoice )

	EVT_CHOICE( ID_M_PADINZONEOPT, DIALOG_COPPER_ZONE_BASE::_wxFB_OnPadsInZoneClick )

	EVT_BUTTON( wxID_BUTTON_EXPORT, DIALOG_COPPER_ZONE_BASE::_wxFB_ExportSetupToOtherCopperZones )

	EVT_BUTTON( wxID_OK, DIALOG_COPPER_ZONE_BASE::_wxFB_OnButtonOkClick )

	EVT_BUTTON( wxID_CANCEL, DIALOG_COPPER_ZONE_BASE::_wxFB_OnButtonCancelClick )

	EVT_BUTTON( wxID_OK, DIALOG_COPPER_ZONE_BASE::_wxFB_OnButtonOkClick )

END_EVENT_TABLE()



DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
@@ -37,10 +37,10 @@ DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID i 
	

	m_staticText17 = new wxStaticText( this, wxID_ANY, _("Layer:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText17->Wrap( -1 );

	m_layerSizer->Add( m_staticText17, 0, wxLEFT|wxRIGHT|wxTOP, 5 );

	m_layerSizer->Add( m_staticText17, 0, wxTOP|wxRIGHT, 5 );

	

	m_LayerSelectionCtrl = new wxListView( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_ALIGN_LEFT|wxLC_NO_HEADER|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_SMALL_ICON );

	m_layerSizer->Add( m_LayerSelectionCtrl, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	m_LayerSelectionCtrl = new wxListView( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_HEADER|wxLC_REPORT|wxLC_SINGLE_SEL );

	m_layerSizer->Add( m_LayerSelectionCtrl, 1, wxEXPAND|wxRIGHT, 5 );

	

	

	m_OptionsBoxSizer->Add( m_layerSizer, 1, wxEXPAND, 5 );
@@ -53,7 +53,7 @@ DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID i 
	bSizer7->Add( m_staticText2, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	m_ListNetNameSelection = new wxListBox( this, ID_NETNAME_SELECTION, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 

	bSizer7->Add( m_ListNetNameSelection, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	bSizer7->Add( m_ListNetNameSelection, 1, wxEXPAND, 5 );

	

	

	m_OptionsBoxSizer->Add( bSizer7, 1, wxEXPAND, 5 );
@@ -93,92 +93,92 @@ DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID i 
	m_NetSortOptSizer->Add( m_buttonRunFilter, 0, wxALL|wxEXPAND, 5 );

	

	

	m_OptionsBoxSizer->Add( m_NetSortOptSizer, 0, wxALL, 5 );

	m_OptionsBoxSizer->Add( m_NetSortOptSizer, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );

	

	

	m_MainBoxSizer->Add( m_OptionsBoxSizer, 1, wxALL|wxEXPAND, 5 );

	m_MainBoxSizer->Add( m_OptionsBoxSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );

	

	wxStaticBoxSizer* m_ExportableSetupSizer;

	m_ExportableSetupSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Settings") ), wxHORIZONTAL );

	

	wxBoxSizer* bSizer9;

	bSizer9 = new wxBoxSizer( wxVERTICAL );

	wxBoxSizer* bSizerSettings;

	bSizerSettings = new wxBoxSizer( wxVERTICAL );

	

	m_ClearanceValueTitle = new wxStaticText( this, wxID_ANY, _("Clearance"), wxDefaultPosition, wxDefaultSize, 0 );

	m_ClearanceValueTitle->Wrap( -1 );

	bSizer9->Add( m_ClearanceValueTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	bSizerSettings->Add( m_ClearanceValueTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	m_ZoneClearanceCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	bSizer9->Add( m_ZoneClearanceCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	bSizerSettings->Add( m_ZoneClearanceCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	m_MinThicknessValueTitle = new wxStaticText( this, wxID_ANY, _("Minimum width"), wxDefaultPosition, wxDefaultSize, 0 );

	m_MinThicknessValueTitle->Wrap( -1 );

	m_MinThicknessValueTitle->SetToolTip( _("Minimun thickness of filled areas.") );

	

	bSizer9->Add( m_MinThicknessValueTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	bSizerSettings->Add( m_MinThicknessValueTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	m_ZoneMinThicknessCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	bSizer9->Add( m_ZoneMinThicknessCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	bSizerSettings->Add( m_ZoneMinThicknessCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	m_staticText151 = new wxStaticText( this, wxID_ANY, _("Corner smoothing:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText151->Wrap( -1 );

	bSizer9->Add( m_staticText151, 0, wxLEFT|wxRIGHT|wxTOP, 5 );

	bSizerSettings->Add( m_staticText151, 0, wxLEFT|wxRIGHT|wxTOP, 5 );

	

	wxString m_cornerSmoothingChoiceChoices[] = { _("None"), _("Chamfer"), _("Fillet") };

	int m_cornerSmoothingChoiceNChoices = sizeof( m_cornerSmoothingChoiceChoices ) / sizeof( wxString );

	m_cornerSmoothingChoice = new wxChoice( this, ID_CORNER_SMOOTHING, wxDefaultPosition, wxDefaultSize, m_cornerSmoothingChoiceNChoices, m_cornerSmoothingChoiceChoices, 0 );

	m_cornerSmoothingChoice->SetSelection( 0 );

	bSizer9->Add( m_cornerSmoothingChoice, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );

	bSizerSettings->Add( m_cornerSmoothingChoice, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );

	

	m_cornerSmoothingTitle = new wxStaticText( this, wxID_ANY, _("Chamfer distance (mm):"), wxDefaultPosition, wxDefaultSize, 0 );

	m_cornerSmoothingTitle->Wrap( -1 );

	bSizer9->Add( m_cornerSmoothingTitle, 0, wxRIGHT|wxLEFT, 5 );

	bSizerSettings->Add( m_cornerSmoothingTitle, 0, wxRIGHT|wxLEFT, 5 );

	

	m_cornerSmoothingCtrl = new wxTextCtrl( this, ID_M_CORNERSMOOTHINGCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	bSizer9->Add( m_cornerSmoothingCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );

	bSizerSettings->Add( m_cornerSmoothingCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );

	

	

	m_ExportableSetupSizer->Add( bSizer9, 0, wxEXPAND, 5 );

	m_ExportableSetupSizer->Add( bSizerSettings, 0, wxEXPAND, 5 );

	

	wxBoxSizer* m_LeftBox;

	m_LeftBox = new wxBoxSizer( wxVERTICAL );

	wxBoxSizer* bSizerPadsConnection;

	bSizerPadsConnection = new wxBoxSizer( wxVERTICAL );

	

	m_staticText13 = new wxStaticText( this, wxID_ANY, _("Pad connection:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText13->Wrap( -1 );

	m_LeftBox->Add( m_staticText13, 0, wxLEFT|wxRIGHT|wxTOP, 5 );

	bSizerPadsConnection->Add( m_staticText13, 0, wxLEFT|wxRIGHT|wxTOP, 5 );

	

	wxString m_PadInZoneOptChoices[] = { _("Solid"), _("Thermal relief"), _("THT thermal"), _("None") };

	int m_PadInZoneOptNChoices = sizeof( m_PadInZoneOptChoices ) / sizeof( wxString );

	m_PadInZoneOpt = new wxChoice( this, ID_M_PADINZONEOPT, wxDefaultPosition, wxDefaultSize, m_PadInZoneOptNChoices, m_PadInZoneOptChoices, 0 );

	m_PadInZoneOpt->SetSelection( 0 );

	m_LeftBox->Add( m_PadInZoneOpt, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );

	bSizerPadsConnection->Add( m_PadInZoneOpt, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );

	

	wxStaticBoxSizer* m_ThermalShapesParamsSizer;

	m_ThermalShapesParamsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Thermal Reliefs") ), wxVERTICAL );

	

	m_AntipadSizeText = new wxStaticText( this, wxID_ANY, _("Antipad clearance"), wxDefaultPosition, wxDefaultSize, 0 );

	m_AntipadSizeText->Wrap( -1 );

	m_ThermalShapesParamsSizer->Add( m_AntipadSizeText, 0, wxLEFT|wxRIGHT|wxTOP, 5 );

	m_ThermalShapesParamsSizer->Add( m_AntipadSizeText, 0, wxTOP|wxRIGHT, 5 );

	

	m_AntipadSizeValue = new wxTextCtrl( this, wxID_ANTIPAD_SIZE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_AntipadSizeValue->SetToolTip( _("Clearance between pads in the same net and filled areas.") );

	

	m_ThermalShapesParamsSizer->Add( m_AntipadSizeValue, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );

	m_ThermalShapesParamsSizer->Add( m_AntipadSizeValue, 0, wxEXPAND|wxBOTTOM, 5 );

	

	m_CopperBridgeWidthText = new wxStaticText( this, wxID_ANY, _("Spoke width"), wxDefaultPosition, wxDefaultSize, 0 );

	m_CopperBridgeWidthText->Wrap( -1 );

	m_ThermalShapesParamsSizer->Add( m_CopperBridgeWidthText, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	m_ThermalShapesParamsSizer->Add( m_CopperBridgeWidthText, 0, wxTOP|wxRIGHT, 5 );

	

	m_CopperWidthValue = new wxTextCtrl( this, wxID_COPPER_BRIDGE_VALUE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_CopperWidthValue->SetToolTip( _("Width of copper in thermal reliefs.") );

	

	m_ThermalShapesParamsSizer->Add( m_CopperWidthValue, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );

	m_ThermalShapesParamsSizer->Add( m_CopperWidthValue, 0, wxEXPAND|wxBOTTOM, 5 );

	

	

	m_LeftBox->Add( m_ThermalShapesParamsSizer, 0, wxALL|wxEXPAND, 5 );

	bSizerPadsConnection->Add( m_ThermalShapesParamsSizer, 0, wxALL|wxEXPAND, 5 );

	

	

	m_ExportableSetupSizer->Add( m_LeftBox, 0, wxEXPAND, 5 );

	m_ExportableSetupSizer->Add( bSizerPadsConnection, 0, wxEXPAND, 5 );

	

	wxBoxSizer* m_MiddleBox;

	m_MiddleBox = new wxBoxSizer( wxVERTICAL );
@@ -215,52 +215,54 @@ DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID i 
	

	m_ExportableSetupSizer->Add( m_MiddleBox, 0, wxEXPAND, 5 );

	

	wxBoxSizer* bSizer81;

	bSizer81 = new wxBoxSizer( wxVERTICAL );

	wxBoxSizer* bSizerLowerRight;

	bSizerLowerRight = new wxBoxSizer( wxVERTICAL );

	

	m_staticText14 = new wxStaticText( this, wxID_ANY, _("Outline slope:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText14->Wrap( -1 );

	bSizer81->Add( m_staticText14, 0, wxLEFT|wxRIGHT|wxTOP, 5 );

	bSizerLowerRight->Add( m_staticText14, 0, wxLEFT|wxRIGHT|wxTOP, 5 );

	

	wxString m_OrientEdgesOptChoices[] = { _("Arbitrary"), _("H, V, and 45 deg only") };

	int m_OrientEdgesOptNChoices = sizeof( m_OrientEdgesOptChoices ) / sizeof( wxString );

	m_OrientEdgesOpt = new wxChoice( this, ID_M_ORIENTEDGESOPT, wxDefaultPosition, wxDefaultSize, m_OrientEdgesOptNChoices, m_OrientEdgesOptChoices, 0 );

	m_OrientEdgesOpt->SetSelection( 0 );

	bSizer81->Add( m_OrientEdgesOpt, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );

	bSizerLowerRight->Add( m_OrientEdgesOpt, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );

	

	m_staticText15 = new wxStaticText( this, wxID_ANY, _("Outline style:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText15->Wrap( -1 );

	bSizer81->Add( m_staticText15, 0, wxLEFT|wxRIGHT|wxTOP, 5 );

	bSizerLowerRight->Add( m_staticText15, 0, wxLEFT|wxRIGHT|wxTOP, 5 );

	

	wxString m_OutlineAppearanceCtrlChoices[] = { _("Line"), _("Hatched"), _("Fully hatched") };

	int m_OutlineAppearanceCtrlNChoices = sizeof( m_OutlineAppearanceCtrlChoices ) / sizeof( wxString );

	m_OutlineAppearanceCtrl = new wxChoice( this, ID_M_OUTLINEAPPEARANCECTRL, wxDefaultPosition, wxDefaultSize, m_OutlineAppearanceCtrlNChoices, m_OutlineAppearanceCtrlChoices, 0 );

	m_OutlineAppearanceCtrl->SetSelection( 0 );

	bSizer81->Add( m_OutlineAppearanceCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );

	bSizerLowerRight->Add( m_OutlineAppearanceCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );

	

	

	m_ExportableSetupSizer->Add( bSizer81, 0, wxEXPAND, 5 );

	m_ExportableSetupSizer->Add( bSizerLowerRight, 0, wxEXPAND, 5 );

	

	

	m_MainBoxSizer->Add( m_ExportableSetupSizer, 0, wxALL|wxEXPAND, 5 );

	

	wxBoxSizer* bSizer10;

	bSizer10 = new wxBoxSizer( wxHORIZONTAL );

	wxBoxSizer* bSizerbottom;

	bSizerbottom = new wxBoxSizer( wxHORIZONTAL );

	

	m_ExportSetupButton = new wxButton( this, wxID_BUTTON_EXPORT, _("Export Settings to Other Zones"), wxDefaultPosition, wxDefaultSize, 0 );

	m_ExportSetupButton->SetToolTip( _("Export this zone setup (excluding layer and net selection) to all other copper zones.") );

	

	bSizer10->Add( m_ExportSetupButton, 0, wxALL|wxEXPAND, 5 );

	bSizerbottom->Add( m_ExportSetupButton, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );

	

	m_OkButton = new wxButton( this, wxID_OK, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );

	m_OkButton->SetDefault(); 

	bSizer10->Add( m_OkButton, 0, wxALL|wxEXPAND, 5 );

	m_sdbSizer = new wxStdDialogButtonSizer();

	m_sdbSizerOK = new wxButton( this, wxID_OK );

	m_sdbSizer->AddButton( m_sdbSizerOK );

	m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );

	m_sdbSizer->AddButton( m_sdbSizerCancel );

	m_sdbSizer->Realize();

	

	m_ButtonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizer10->Add( m_ButtonCancel, 0, wxALL|wxEXPAND, 5 );

	bSizerbottom->Add( m_sdbSizer, 1, wxEXPAND, 5 );

	

	

	m_MainBoxSizer->Add( bSizer10, 0, wxALIGN_RIGHT|wxALL, 5 );

	m_MainBoxSizer->Add( bSizerbottom, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	

	this->SetSizer( m_MainBoxSizer );

pcbnew/dialogs/dialog_copper_zones_base.fbp

+39 −295

File changed.

Preview size limit exceeded, changes collapsed.