Preparing work on trapezoidal pad DRC: cleaning code. some comments and... (e66a007e) · Commits · Elphel / kicad-source-mirror

README.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,8 @@ Subdirectories
	--------------		--------------
	3d-viewer - Sourcecode of 3D viewer		3d-viewer - Sourcecode of 3D viewer
	bitmaps - Menu and program icons		bitmaps - Menu and program icons
			bitmap2component - Sourcecode of a small application to create a footprint or a component from a B&W bitmap
			this component or footprint has just graphic items that show the bitmap
	CMakeModules - Modules for the CMAKE build tool		CMakeModules - Modules for the CMAKE build tool
	common - Sourcecode of the common library (common functions shared across whole suite)		common - Sourcecode of the common library (common functions shared across whole suite)
	cvpcb - Sourcecode of CvPCB, tool to link components with footprints sourcecode		cvpcb - Sourcecode of CvPCB, tool to link components with footprints sourcecode

include/wxPcbStruct.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -655,7 +655,6 @@ public:
	void ListNetsAndSelect( wxCommandEvent& event );		void ListNetsAndSelect( wxCommandEvent& event );

	void Swap_Layers( wxCommandEvent& event );		void Swap_Layers( wxCommandEvent& event );
	void Install_Test_DRC_Frame( wxDC* DC );

	// Handling texts on the board		// Handling texts on the board
	void Rotate_Texte_Pcb( TEXTE_PCB* TextePcb, wxDC* DC );		void Rotate_Texte_Pcb( TEXTE_PCB* TextePcb, wxDC* DC );

pcbnew/dialog_pad_properties.cpp

+30 −21

Original line number	Original line	Diff line number	Diff line
	@@ -232,8 +232,7 @@ void DIALOG_PAD_PROPERTIES::initValues()
	m_PadShapeSizeY_Unit->SetLabel( GetUnitsLabel( g_UserUnit ) );		m_PadShapeSizeY_Unit->SetLabel( GetUnitsLabel( g_UserUnit ) );
	m_PadShapeOffsetX_Unit->SetLabel( GetUnitsLabel( g_UserUnit ) );		m_PadShapeOffsetX_Unit->SetLabel( GetUnitsLabel( g_UserUnit ) );
	m_PadShapeOffsetY_Unit->SetLabel( GetUnitsLabel( g_UserUnit ) );		m_PadShapeOffsetY_Unit->SetLabel( GetUnitsLabel( g_UserUnit ) );
	m_PadShapeDeltaX_Unit->SetLabel( GetUnitsLabel( g_UserUnit ) );		m_PadShapeDelta_Unit->SetLabel( GetUnitsLabel( g_UserUnit ) );
	m_PadShapeDeltaY_Unit->SetLabel( GetUnitsLabel( g_UserUnit ) );
	m_NetClearanceUnits->SetLabel( GetUnitsLabel( g_UserUnit ) );		m_NetClearanceUnits->SetLabel( GetUnitsLabel( g_UserUnit ) );

	// Display current pad masks clearances units		// Display current pad masks clearances units
	@@ -254,8 +253,16 @@ void DIALOG_PAD_PROPERTIES::initValues()
	PutValueInLocalUnits( *m_ShapeOffset_X_Ctrl, m_dummyPad->m_Offset.x, internalUnits );		PutValueInLocalUnits( *m_ShapeOffset_X_Ctrl, m_dummyPad->m_Offset.x, internalUnits );
	PutValueInLocalUnits( *m_ShapeOffset_Y_Ctrl, m_dummyPad->m_Offset.y, internalUnits );		PutValueInLocalUnits( *m_ShapeOffset_Y_Ctrl, m_dummyPad->m_Offset.y, internalUnits );

	PutValueInLocalUnits( *m_ShapeDelta_X_Ctrl, m_dummyPad->m_DeltaSize.x, internalUnits );		if( m_dummyPad->m_DeltaSize.x )
	PutValueInLocalUnits( *m_ShapeDelta_Y_Ctrl, m_dummyPad->m_DeltaSize.y, internalUnits );		{
			PutValueInLocalUnits( *m_ShapeDelta_Ctrl, m_dummyPad->m_DeltaSize.x, internalUnits );
			m_radioBtnDeltaXdir->SetValue(true);
			}
			else
			{
			PutValueInLocalUnits( *m_ShapeDelta_Ctrl, m_dummyPad->m_DeltaSize.y, internalUnits );
			m_radioBtnDeltaYdir->SetValue(true);
			}

	PutValueInLocalUnits( *m_NetClearanceValueCtrl, m_dummyPad->m_LocalClearance, internalUnits );		PutValueInLocalUnits( *m_NetClearanceValueCtrl, m_dummyPad->m_LocalClearance, internalUnits );
	PutValueInLocalUnits( *m_SolderMaskMarginCtrl,		PutValueInLocalUnits( *m_SolderMaskMarginCtrl,
	@@ -391,26 +398,30 @@ void DIALOG_PAD_PROPERTIES::OnPadShapeSelection( wxCommandEvent& event )
	switch( m_PadShape->GetSelection() )		switch( m_PadShape->GetSelection() )
	{		{
	case 0: //CIRCLE:		case 0: //CIRCLE:
	m_ShapeDelta_X_Ctrl->Enable( false );		m_ShapeDelta_Ctrl->Enable( false );
	m_ShapeDelta_Y_Ctrl->Enable( false );		m_radioBtnDeltaXdir->Enable( false );
			m_radioBtnDeltaYdir->Enable( false );
	m_ShapeSize_Y_Ctrl->Enable( false );		m_ShapeSize_Y_Ctrl->Enable( false );
	break;		break;

	case 1: //OVALE:		case 1: //OVALE:
	m_ShapeDelta_X_Ctrl->Enable( false );		m_ShapeDelta_Ctrl->Enable( false );
	m_ShapeDelta_Y_Ctrl->Enable( false );		m_radioBtnDeltaXdir->Enable( false );
			m_radioBtnDeltaYdir->Enable( false );
	m_ShapeSize_Y_Ctrl->Enable( true );		m_ShapeSize_Y_Ctrl->Enable( true );
	break;		break;

	case 2: // PAD_RECT:		case 2: // PAD_RECT:
	m_ShapeDelta_X_Ctrl->Enable( false );		m_ShapeDelta_Ctrl->Enable( false );
	m_ShapeDelta_Y_Ctrl->Enable( false );		m_radioBtnDeltaXdir->Enable( false );
			m_radioBtnDeltaYdir->Enable( false );
	m_ShapeSize_Y_Ctrl->Enable( true );		m_ShapeSize_Y_Ctrl->Enable( true );
	break;		break;

	case 3: //TRAPEZE:		case 3: //TRAPEZE:
	m_ShapeDelta_X_Ctrl->Enable( true );		m_ShapeDelta_Ctrl->Enable( true );
	m_ShapeDelta_Y_Ctrl->Enable( true );		m_radioBtnDeltaXdir->Enable( true );
			m_radioBtnDeltaYdir->Enable( true );
	m_ShapeSize_Y_Ctrl->Enable( true );		m_ShapeSize_Y_Ctrl->Enable( true );
	break;		break;
	}		}
	@@ -704,11 +715,15 @@ bool DIALOG_PAD_PROPERTIES::TransfertDataToPad( D_PAD* aPad, bool aPromptOnError

	// Read pad shape delta size:		// Read pad shape delta size:
	// m_DeltaSize.x or m_DeltaSize.y must be NULL. for a trapezoid.		// m_DeltaSize.x or m_DeltaSize.y must be NULL. for a trapezoid.
	aPad->m_DeltaSize.x = ReturnValueFromTextCtrl( *m_ShapeDelta_X_Ctrl, internalUnits );		wxSize delta;
	aPad->m_DeltaSize.y = ReturnValueFromTextCtrl( *m_ShapeDelta_Y_Ctrl, internalUnits );		if( m_radioBtnDeltaXdir->GetValue() )
			delta.x = ReturnValueFromTextCtrl( *m_ShapeDelta_Ctrl, internalUnits );
			else
			delta.y = ReturnValueFromTextCtrl( *m_ShapeDelta_Ctrl, internalUnits );
			aPad->m_DeltaSize = delta;

	// Test bad values (be sure delta values are not to large)		// Test bad values (be sure delta values are not to large)
	// rememver DeltaSize.x is the Y size variation		// remember DeltaSize.x is the Y size variation
	bool error = false;		bool error = false;
	if( (aPad->m_DeltaSize.x < 0) && (aPad->m_DeltaSize.x <= -aPad->m_Size.y) )		if( (aPad->m_DeltaSize.x < 0) && (aPad->m_DeltaSize.x <= -aPad->m_Size.y) )
	{		{
	@@ -848,12 +863,6 @@ bool DIALOG_PAD_PROPERTIES::TransfertDataToPad( D_PAD* aPad, bool aPromptOnError
	DisplayError( this, _( "Too large value for pad delta size" ) );		DisplayError( this, _( "Too large value for pad delta size" ) );
	return false;		return false;
	}		}

	if( aPad->m_DeltaSize.x && aPad->m_DeltaSize.y )
	{
	DisplayError( this, _( "Incorrect value for pad delta size: X or Y value must be NULL" ) );
	return false;
	}
	}		}

	return true;		return true;

pcbnew/dialog_pad_properties_base.cpp

+29 −30

pcbnew/dialog_pad_properties_base.fbp

+3685 −3206

File changed.

File size exceeds preview limit.

View original file

View changed file

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	// C++ code generated with wxFormBuilder (version Apr 16 2008)		// C++ code generated with wxFormBuilder (version Sep 8 2010)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	@@ -150,27 +150,36 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind
	m_PadShapeOffsetY_Unit->Wrap( -1 );		m_PadShapeOffsetY_Unit->Wrap( -1 );
	fgSizerGeometry->Add( m_PadShapeOffsetY_Unit, 0, wxRIGHT\|wxALIGN_CENTER_VERTICAL, 5 );		fgSizerGeometry->Add( m_PadShapeOffsetY_Unit, 0, wxRIGHT\|wxALIGN_CENTER_VERTICAL, 5 );

	m_staticText21 = new wxStaticText( this, wxID_ANY, _("Shape delta X"), wxDefaultPosition, wxDefaultSize, 0 );		m_staticText21 = new wxStaticText( this, wxID_ANY, _("Shape Delta Dim"), wxDefaultPosition, wxDefaultSize, 0 );
	m_staticText21->Wrap( -1 );		m_staticText21->Wrap( -1 );
	fgSizerGeometry->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL\|wxALIGN_RIGHT\|wxLEFT, 5 );		fgSizerGeometry->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL\|wxALIGN_RIGHT\|wxLEFT, 5 );

	m_ShapeDelta_X_Ctrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );		m_ShapeDelta_Ctrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
	fgSizerGeometry->Add( m_ShapeDelta_X_Ctrl, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );		fgSizerGeometry->Add( m_ShapeDelta_Ctrl, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_PadShapeDeltaX_Unit = new wxStaticText( this, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );		m_PadShapeDelta_Unit = new wxStaticText( this, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );
	m_PadShapeDeltaX_Unit->Wrap( -1 );		m_PadShapeDelta_Unit->Wrap( -1 );
	fgSizerGeometry->Add( m_PadShapeDeltaX_Unit, 0, wxRIGHT\|wxALIGN_CENTER_VERTICAL, 5 );		fgSizerGeometry->Add( m_PadShapeDelta_Unit, 0, wxRIGHT\|wxALIGN_CENTER_VERTICAL, 5 );

	m_staticText23 = new wxStaticText( this, wxID_ANY, _("Shape delta Y"), wxDefaultPosition, wxDefaultSize, 0 );		m_staticText23 = new wxStaticText( this, wxID_ANY, _("Trap. Direction"), wxDefaultPosition, wxDefaultSize, 0 );
	m_staticText23->Wrap( -1 );		m_staticText23->Wrap( -1 );
	fgSizerGeometry->Add( m_staticText23, 0, wxLEFT\|wxALIGN_CENTER_VERTICAL\|wxALIGN_RIGHT, 5 );		fgSizerGeometry->Add( m_staticText23, 0, wxLEFT\|wxALIGN_CENTER_VERTICAL\|wxALIGN_RIGHT, 5 );

	m_ShapeDelta_Y_Ctrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );		wxBoxSizer* bSizerbdir;
	fgSizerGeometry->Add( m_ShapeDelta_Y_Ctrl, 0, wxALL, 5 );		bSizerbdir = new wxBoxSizer( wxHORIZONTAL );

	m_PadShapeDeltaY_Unit = new wxStaticText( this, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );		m_radioBtnDeltaXdir = new wxRadioButton( this, wxID_DDIRX, _(">"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
	m_PadShapeDeltaY_Unit->Wrap( -1 );		m_radioBtnDeltaXdir->SetValue( true );
	fgSizerGeometry->Add( m_PadShapeDeltaY_Unit, 0, wxALIGN_CENTER_VERTICAL\|wxRIGHT, 5 );		bSizerbdir->Add( m_radioBtnDeltaXdir, 0, wxALL, 5 );

			m_radioBtnDeltaYdir = new wxRadioButton( this, wxID_DDIRY, _("^"), wxDefaultPosition, wxDefaultSize, 0 );
			bSizerbdir->Add( m_radioBtnDeltaYdir, 0, wxALL, 5 );

			fgSizerGeometry->Add( bSizerbdir, 0, wxALIGN_CENTER_VERTICAL\|wxALIGN_CENTER_HORIZONTAL, 5 );

			m_staticTextDDirInfo = new wxStaticText( this, wxID_ANY, _("Rot 0"), wxDefaultPosition, wxDefaultSize, 0 );
			m_staticTextDDirInfo->Wrap( -1 );
			fgSizerGeometry->Add( m_staticTextDDirInfo, 0, wxALIGN_CENTER_VERTICAL\|wxRIGHT, 5 );

Admin message