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

Add pl_editor_doc.icns, from Orson. Fix Bug #1217504 (bad look of Module... 

Add pl_editor_doc.icns, from Orson. Fix Bug #1217504  (bad look of Module Properties Dialog, 3D fields).
Add Dick's workaround in plot_board_layers.cpp to try to avoid crash in solder mask calculations, due to a bug in boost::polygon, in resize function.
parent a7e32b03

3d-viewer/3d_aux.cpp

+25 −50
Original line number Diff line number Diff line
@@ -176,64 +176,39 @@ GLuint EDA_3D_CANVAS::DisplayCubeforTest() 
    return gllist;

}



VERTEX_VALUE_CTRL::VERTEX_VALUE_CTRL( wxWindow* parent, const wxString& title,

                                      wxBoxSizer* BoxSizer )

VERTEX_VALUE_CTRL::VERTEX_VALUE_CTRL( wxWindow* aParent, wxBoxSizer* aBoxSizer )

{

    wxString text;

    wxStaticText* msgtitle;



    if( title.IsEmpty() )

        text = _( "Vertex " );

    else

        text = title;

    wxFlexGridSizer* gridSizer = new wxFlexGridSizer( 0, 2, 0, 0 );

	gridSizer->AddGrowableCol( 1 );

	gridSizer->SetFlexibleDirection( wxHORIZONTAL );

	gridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );



    msgtitle = new wxStaticText( parent, -1, text, wxDefaultPosition, wxSize( -1, -1 ), 0 );

    aBoxSizer->Add( gridSizer, 0, wxEXPAND, 5 );



    BoxSizer->Add( msgtitle, wxGROW | wxLEFT | wxRIGHT | wxTOP | wxBOTTOM );

    wxStaticText* msgtitle = new wxStaticText( aParent, wxID_ANY, wxT( "X:" ) );

    gridSizer->Add( msgtitle, 0, wxALL , 5 );



    wxFlexGridSizer* GridSizer = new wxFlexGridSizer( 3, 2, 0, 0 );

    m_XValueCtrl = new wxTextCtrl( aParent, wxID_ANY, wxEmptyString,

                                   wxDefaultPosition,wxDefaultSize, 0 );

    gridSizer->Add( m_XValueCtrl, 0, wxALL|wxEXPAND, 5 );



    BoxSizer->Add( GridSizer, 0, wxGROW | wxALL, 5 );

    msgtitle = new wxStaticText( aParent, wxID_ANY, wxT( "Y:" ), wxDefaultPosition,

                                 wxDefaultSize, 0 );

    gridSizer->Add( msgtitle, 0, wxALL, 5 );



    msgtitle = new wxStaticText( parent, -1, wxT( "X:" ) );

    m_YValueCtrl = new wxTextCtrl( aParent, wxID_ANY, wxEmptyString,

                                   wxDefaultPosition, wxDefaultSize, 0 );

    gridSizer->Add( m_YValueCtrl, 0, wxALL|wxEXPAND, 5 );



    GridSizer->Add( msgtitle, 0,

                    wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL |

                    wxLEFT | wxRIGHT , 5 );

    m_XValueCtrl = new wxTextCtrl( parent, -1, wxEmptyString,

                                   wxDefaultPosition, wxSize( -1, -1 ), 0 );

    msgtitle = new wxStaticText( aParent, wxID_ANY, wxT( "Z:" ), wxDefaultPosition,

                                 wxDefaultSize, 0 );

    gridSizer->Add( msgtitle, 0, wxALL, 5 );



    GridSizer->Add( m_XValueCtrl,

                    0,

                    wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL |

                    wxLEFT | wxRIGHT, 5 );



    msgtitle = new wxStaticText( parent, -1, wxT( "Y:" ), wxDefaultPosition,

                                 wxSize( -1, -1 ), 0 );



    GridSizer->Add( msgtitle,

                    0,

                    wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL |

                    wxLEFT | wxRIGHT, 5 );

    m_YValueCtrl = new wxTextCtrl( parent, -1, wxEmptyString,

                                   wxDefaultPosition, wxSize( -1, -1 ), 0 );



    GridSizer->Add( m_YValueCtrl, 0,

                    wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL |

                    wxLEFT | wxRIGHT, 5 );



    msgtitle = new wxStaticText( parent, -1, wxT( "Z:" ), wxDefaultPosition,

                                 wxSize( -1, -1 ), 0 );



    GridSizer->Add( msgtitle, 0,

                    wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL |

                    wxLEFT | wxRIGHT, 5 );

    m_ZValueCtrl = new wxTextCtrl( parent, -1, wxEmptyString,

                                   wxDefaultPosition, wxSize( -1, -1 ), 0 );



    GridSizer->Add( m_ZValueCtrl, 0,

                    wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL |

                    wxLEFT | wxRIGHT, 5 );

    m_ZValueCtrl = new wxTextCtrl( aParent, wxID_ANY, wxEmptyString,

                                   wxDefaultPosition, wxDefaultSize, 0 );

    gridSizer->Add( m_ZValueCtrl, 0, wxALL|wxEXPAND, 5 );

}

3d-viewer/3d_struct.h

+1 −2
Original line number Diff line number Diff line
@@ -155,10 +155,9 @@ class VERTEX_VALUE_CTRL 
{

private:

    wxTextCtrl*   m_XValueCtrl, * m_YValueCtrl, * m_ZValueCtrl;

    wxStaticText* m_Text;



public:

    VERTEX_VALUE_CTRL( wxWindow* parent, const wxString& title, wxBoxSizer* BoxSizer );

    VERTEX_VALUE_CTRL( wxWindow* parent, wxBoxSizer* BoxSizer );



    ~VERTEX_VALUE_CTRL();

pagelayout_editor/pl_editor_doc.icns

0 → 100644
+53.9 KiB

File added.

No diff preview for this file type.

View file

pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp

+3 −13
Original line number Diff line number Diff line
@@ -308,19 +308,9 @@ void DIALOG_MODULE_BOARD_EDITOR::InitModeditProperties() 
    m_CostRot180Ctrl->SetValue( m_CurrentModule->GetPlacementCost180() );



    // Initialize 3D parameters



    wxBoxSizer* BoxSizer = new wxBoxSizer( wxVERTICAL );

    m_3D_Scale = new VERTEX_VALUE_CTRL( m_Panel3D, _( "Shape Scale:" ), BoxSizer );

    m_Sizer3DValues->Add( BoxSizer, 0, wxGROW | wxALL, 5 );



    BoxSizer    = new wxBoxSizer( wxVERTICAL );

    m_3D_Offset = new VERTEX_VALUE_CTRL( m_Panel3D, _( "Shape Offset (inch):" ), BoxSizer );

    m_Sizer3DValues->Add( BoxSizer, 0, wxGROW | wxALL, 5 );



    BoxSizer = new wxBoxSizer( wxVERTICAL );

    m_3D_Rotation = new VERTEX_VALUE_CTRL( m_Panel3D,

                                           _( "Shape Rotation (degrees):" ), BoxSizer );

    m_Sizer3DValues->Add( BoxSizer, 0, wxGROW | wxALL, 5 );

    m_3D_Scale = new VERTEX_VALUE_CTRL( m_Panel3D, m_bSizerShapeScale );

    m_3D_Offset = new VERTEX_VALUE_CTRL( m_Panel3D, m_bSizerShapeOffset );

    m_3D_Rotation = new VERTEX_VALUE_CTRL( m_Panel3D, m_bSizerShapeRotation );



    // if m_3D_ShapeNameListBox is not empty, preselect first 3D shape

    if( m_3D_ShapeNameListBox->GetCount() > 0 )

pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp

+27 −0
Original line number Diff line number Diff line
@@ -307,6 +307,33 @@ 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 );

	

	m_bSizerShapeScale = new wxBoxSizer( wxVERTICAL );

	

	m_staticTextShapeScale = new wxStaticText( m_Panel3D, wxID_ANY, _("Shape Scale:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextShapeScale->Wrap( -1 );

	m_bSizerShapeScale->Add( m_staticTextShapeScale, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	

	m_Sizer3DValues->Add( m_bSizerShapeScale, 0, wxEXPAND, 5 );

	

	m_bSizerShapeOffset = new wxBoxSizer( wxVERTICAL );

	

	m_staticTextShapeOffset = new wxStaticText( m_Panel3D, wxID_ANY, _("Shape Offset (inch):"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextShapeOffset->Wrap( -1 );

	m_bSizerShapeOffset->Add( m_staticTextShapeOffset, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	

	m_Sizer3DValues->Add( m_bSizerShapeOffset, 0, wxEXPAND, 5 );

	

	m_bSizerShapeRotation = new wxBoxSizer( wxVERTICAL );

	

	m_staticTextShapeRotation = new wxStaticText( m_Panel3D, wxID_ANY, _("Shape Rotation (degrees):"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextShapeRotation->Wrap( -1 );

	m_bSizerShapeRotation->Add( m_staticTextShapeRotation, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	

	m_Sizer3DValues->Add( m_bSizerShapeRotation, 0, wxEXPAND, 5 );

	

	

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