diff --git a/pcbnew/dialogs/dialog_export_step_base.cpp b/pcbnew/dialogs/dialog_export_step_base.cpp index 3036fe13e9..ac86542d88 100644 --- a/pcbnew/dialogs/dialog_export_step_base.cpp +++ b/pcbnew/dialogs/dialog_export_step_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Apr 22 2021) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -18,78 +18,63 @@ DIALOG_EXPORT_STEP_BASE::DIALOG_EXPORT_STEP_BASE( wxWindow* parent, wxWindowID i wxBoxSizer* bSizerSTEPFile; bSizerSTEPFile = new wxBoxSizer( wxVERTICAL ); - m_txtBrdFile = new wxStaticText( this, wxID_ANY, _("File name:"), wxDefaultPosition, wxDefaultSize, 0 ); + wxBoxSizer* bSizerTop; + bSizerTop = new wxBoxSizer( wxHORIZONTAL ); + + m_txtBrdFile = new wxStaticText( this, wxID_ANY, _("File:"), wxDefaultPosition, wxDefaultSize, 0 ); m_txtBrdFile->Wrap( -1 ); - bSizerSTEPFile->Add( m_txtBrdFile, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + bSizerTop->Add( m_txtBrdFile, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); m_filePickerSTEP = new wxFilePickerCtrl( this, wxID_ANY, wxEmptyString, _("Select a STEP export filename"), _("STEP files (*.stp;*.step)|*.stp;*.step"), wxDefaultPosition, wxSize( -1,-1 ), wxFLP_SAVE|wxFLP_USE_TEXTCTRL ); - bSizerSTEPFile->Add( m_filePickerSTEP, 0, wxEXPAND|wxALL, 5 ); + bSizerTop->Add( m_filePickerSTEP, 1, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizerSTEPFile->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 ); + + bSizerSTEPFile->Add( bSizerTop, 0, wxEXPAND|wxALL, 10 ); wxBoxSizer* bSizer2; bSizer2 = new wxBoxSizer( wxHORIZONTAL ); - wxBoxSizer* bSizer7; - bSizer7 = new wxBoxSizer( wxVERTICAL ); + wxStaticBoxSizer* sbCoordinates; + sbCoordinates = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Coordinates") ), wxVERTICAL ); - m_staticText6 = new wxStaticText( this, wxID_ANY, _("Coordinate origin options:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText6->Wrap( -1 ); - m_staticText6->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); + m_rbDrillAndPlotOrigin = new wxRadioButton( sbCoordinates->GetStaticBox(), wxID_ANY, _("Drill/place file origin"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + sbCoordinates->Add( m_rbDrillAndPlotOrigin, 0, wxBOTTOM|wxRIGHT, 5 ); - bSizer7->Add( m_staticText6, 0, wxALL, 5 ); + m_rbGridOrigin = new wxRadioButton( sbCoordinates->GetStaticBox(), wxID_ANY, _("Grid origin"), wxDefaultPosition, wxDefaultSize, 0 ); + sbCoordinates->Add( m_rbGridOrigin, 0, wxBOTTOM|wxRIGHT, 5 ); - m_rbDrillAndPlotOrigin = new wxRadioButton( this, wxID_ANY, _("Drill and plot origin"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); - bSizer7->Add( m_rbDrillAndPlotOrigin, 0, wxALL, 5 ); + m_rbUserDefinedOrigin = new wxRadioButton( sbCoordinates->GetStaticBox(), wxID_ANY, _("User defined origin"), wxDefaultPosition, wxDefaultSize, 0 ); + sbCoordinates->Add( m_rbUserDefinedOrigin, 0, wxBOTTOM|wxRIGHT, 5 ); - m_rbGridOrigin = new wxRadioButton( this, wxID_ANY, _("Grid origin"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer7->Add( m_rbGridOrigin, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - - m_rbUserDefinedOrigin = new wxRadioButton( this, wxID_ANY, _("User defined origin"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer7->Add( m_rbUserDefinedOrigin, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - - m_rbBoardCenterOrigin = new wxRadioButton( this, wxID_ANY, _("Board center origin"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer7->Add( m_rbBoardCenterOrigin, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + m_rbBoardCenterOrigin = new wxRadioButton( sbCoordinates->GetStaticBox(), wxID_ANY, _("Board center origin"), wxDefaultPosition, wxDefaultSize, 0 ); + sbCoordinates->Add( m_rbBoardCenterOrigin, 0, wxBOTTOM|wxRIGHT, 5 ); - bSizer2->Add( bSizer7, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bSizer2->Add( sbCoordinates, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); - wxBoxSizer* bSizer3; - bSizer3 = new wxBoxSizer( wxVERTICAL ); - - m_staticText2 = new wxStaticText( this, wxID_ANY, _("User defined origin:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText2->Wrap( -1 ); - m_staticText2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); - - bSizer3->Add( m_staticText2, 0, wxALL, 5 ); + wxStaticBoxSizer* sbUserDefinedOrigin; + sbUserDefinedOrigin = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User Defined Origin") ), wxVERTICAL ); wxFlexGridSizer* fgSizer1; - fgSizer1 = new wxFlexGridSizer( 0, 3, 0, 0 ); + fgSizer1 = new wxFlexGridSizer( 0, 2, 5, 0 ); fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - fgSizer1->Add( 0, 0, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - m_staticTextUnits = new wxStaticText( this, wxID_ANY, _("Units:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextUnits = new wxStaticText( sbUserDefinedOrigin->GetStaticBox(), wxID_ANY, _("Units:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextUnits->Wrap( -1 ); - fgSizer1->Add( m_staticTextUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgSizer1->Add( m_staticTextUnits, 0, wxALIGN_CENTER_VERTICAL, 5 ); wxString m_STEP_OrgUnitChoiceChoices[] = { _("mm"), _("inch") }; int m_STEP_OrgUnitChoiceNChoices = sizeof( m_STEP_OrgUnitChoiceChoices ) / sizeof( wxString ); - m_STEP_OrgUnitChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_STEP_OrgUnitChoiceNChoices, m_STEP_OrgUnitChoiceChoices, 0 ); + m_STEP_OrgUnitChoice = new wxChoice( sbUserDefinedOrigin->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_STEP_OrgUnitChoiceNChoices, m_STEP_OrgUnitChoiceChoices, 0 ); m_STEP_OrgUnitChoice->SetSelection( 0 ); - fgSizer1->Add( m_STEP_OrgUnitChoice, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + fgSizer1->Add( m_STEP_OrgUnitChoice, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - fgSizer1->Add( 0, 0, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - m_staticTextXpos = new wxStaticText( this, wxID_ANY, _("X position:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextXpos = new wxStaticText( sbUserDefinedOrigin->GetStaticBox(), wxID_ANY, _("X position:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextXpos->Wrap( -1 ); - fgSizer1->Add( m_staticTextXpos, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgSizer1->Add( m_staticTextXpos, 0, wxALIGN_CENTER_VERTICAL, 5 ); - m_STEP_Xorg = new TEXT_CTRL_EVAL( this, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); + m_STEP_Xorg = new TEXT_CTRL_EVAL( sbUserDefinedOrigin->GetStaticBox(), wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); #ifdef __WXGTK__ if ( !m_STEP_Xorg->HasFlag( wxTE_MULTILINE ) ) { @@ -98,16 +83,13 @@ DIALOG_EXPORT_STEP_BASE::DIALOG_EXPORT_STEP_BASE( wxWindow* parent, wxWindowID i #else m_STEP_Xorg->SetMaxLength( 8 ); #endif - fgSizer1->Add( m_STEP_Xorg, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + fgSizer1->Add( m_STEP_Xorg, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - fgSizer1->Add( 0, 0, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - m_staticTextYpos = new wxStaticText( this, wxID_ANY, _("Y position:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextYpos = new wxStaticText( sbUserDefinedOrigin->GetStaticBox(), wxID_ANY, _("Y position:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextYpos->Wrap( -1 ); - fgSizer1->Add( m_staticTextYpos, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgSizer1->Add( m_staticTextYpos, 0, wxALIGN_CENTER_VERTICAL, 5 ); - m_STEP_Yorg = new TEXT_CTRL_EVAL( this, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); + m_STEP_Yorg = new TEXT_CTRL_EVAL( sbUserDefinedOrigin->GetStaticBox(), wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); #ifdef __WXGTK__ if ( !m_STEP_Yorg->HasFlag( wxTE_MULTILINE ) ) { @@ -116,67 +98,54 @@ DIALOG_EXPORT_STEP_BASE::DIALOG_EXPORT_STEP_BASE( wxWindow* parent, wxWindowID i #else m_STEP_Yorg->SetMaxLength( 8 ); #endif - fgSizer1->Add( m_STEP_Yorg, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + fgSizer1->Add( m_STEP_Yorg, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); - bSizer3->Add( fgSizer1, 1, wxEXPAND, 5 ); + sbUserDefinedOrigin->Add( fgSizer1, 1, wxEXPAND, 5 ); - bSizer2->Add( bSizer3, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bSizer2->Add( sbUserDefinedOrigin, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); - wxBoxSizer* bSizer8; - bSizer8 = new wxBoxSizer( wxVERTICAL ); + wxStaticBoxSizer* sbOtherOptions; + sbOtherOptions = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Other Options") ), wxVERTICAL ); - m_staticText7 = new wxStaticText( this, wxID_ANY, _("Other options:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText7->Wrap( -1 ); - m_staticText7->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); + m_cbRemoveVirtual = new wxCheckBox( sbOtherOptions->GetStaticBox(), wxID_ANY, _("Ignore virtual components"), wxDefaultPosition, wxDefaultSize, 0 ); + sbOtherOptions->Add( m_cbRemoveVirtual, 0, wxBOTTOM|wxRIGHT, 5 ); - bSizer8->Add( m_staticText7, 0, wxALL, 5 ); - - m_cbRemoveVirtual = new wxCheckBox( this, wxID_ANY, _("Ignore virtual components"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer8->Add( m_cbRemoveVirtual, 0, wxALL, 5 ); - - m_cbSubstModels = new wxCheckBox( this, wxID_ANY, _("Substitute similarly named models"), wxDefaultPosition, wxDefaultSize, 0 ); + m_cbSubstModels = new wxCheckBox( sbOtherOptions->GetStaticBox(), wxID_ANY, _("Substitute similarly named models"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbSubstModels->SetToolTip( _("Replace VRML models with STEP models of the same name") ); - bSizer8->Add( m_cbSubstModels, 0, wxALL, 5 ); + sbOtherOptions->Add( m_cbSubstModels, 0, wxBOTTOM|wxRIGHT, 5 ); - m_cbOverwriteFile = new wxCheckBox( this, wxID_ANY, _("Overwrite old file"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer8->Add( m_cbOverwriteFile, 0, wxALL, 5 ); + m_cbOverwriteFile = new wxCheckBox( sbOtherOptions->GetStaticBox(), wxID_ANY, _("Overwrite old file"), wxDefaultPosition, wxDefaultSize, 0 ); + sbOtherOptions->Add( m_cbOverwriteFile, 0, wxBOTTOM|wxRIGHT, 5 ); - m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizer8->Add( m_staticline3, 0, wxEXPAND | wxALL, 5 ); - - m_staticText9 = new wxStaticText( this, wxID_ANY, _("Board outline builder:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText9->Wrap( -1 ); - bSizer8->Add( m_staticText9, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - wxBoxSizer* bSizerTolerance; - bSizerTolerance = new wxBoxSizer( wxHORIZONTAL ); - - m_staticTextTolerance = new wxStaticText( this, wxID_ANY, _("Tolerance:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextTolerance = new wxStaticText( sbOtherOptions->GetStaticBox(), wxID_ANY, _("Board outline chaining tolerance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextTolerance->Wrap( -1 ); - bSizerTolerance->Add( m_staticTextTolerance, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + sbOtherOptions->Add( m_staticTextTolerance, 0, wxTOP|wxRIGHT, 5 ); wxString m_toleranceChoices[] = { _("Tight (0.001 mm)"), _("Standard (0.01 mm)"), _("Loose (0.1 mm)") }; int m_toleranceNChoices = sizeof( m_toleranceChoices ) / sizeof( wxString ); - m_tolerance = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_toleranceNChoices, m_toleranceChoices, 0 ); + m_tolerance = new wxChoice( sbOtherOptions->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_toleranceNChoices, m_toleranceChoices, 0 ); m_tolerance->SetSelection( 1 ); m_tolerance->SetToolTip( _("Tolerance sets the distance between two points that are considered joined.") ); - bSizerTolerance->Add( m_tolerance, 1, wxALL, 5 ); + sbOtherOptions->Add( m_tolerance, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - bSizer8->Add( bSizerTolerance, 0, wxEXPAND, 5 ); + bSizer2->Add( sbOtherOptions, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 ); - bSizer2->Add( bSizer8, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bSizerSTEPFile->Add( bSizer2, 1, wxEXPAND|wxTOP, 5 ); + + wxBoxSizer* bSizer81; + bSizer81 = new wxBoxSizer( wxHORIZONTAL ); - bSizerSTEPFile->Add( bSizer2, 1, wxEXPAND, 5 ); + bSizerSTEPFile->Add( bSizer81, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizerSTEPFile->Add( m_staticline, 0, wxEXPAND | wxALL, 5 ); + bSizerSTEPFile->Add( m_staticline, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); diff --git a/pcbnew/dialogs/dialog_export_step_base.fbp b/pcbnew/dialogs/dialog_export_step_base.fbp index 8e55cdc378..0432e62983 100644 --- a/pcbnew/dialogs/dialog_export_step_base.fbp +++ b/pcbnew/dialogs/dialog_export_step_base.fbp @@ -14,7 +14,6 @@ dialog_export_step_base 1000 none - 1 dialog_export_step_base @@ -26,7 +25,6 @@ 1 1 UI - 0 1 0 @@ -60,272 +58,167 @@ bSizerSTEPFile wxVERTICAL none - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - File name: - 0 - - 0 - - - 0 - - 1 - m_txtBrdFile - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 + + 10 wxEXPAND|wxALL 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - Select a STEP export filename - - 0 - -1,-1 - 1 - m_filePickerSTEP - 1 - - - protected - 1 - - Resizable - 1 - -1,-1 - wxFLP_SAVE|wxFLP_USE_TEXTCTRL - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - STEP files (*.stp;*.step)|*.stp;*.step - - - - - - - 5 - wxEXPAND | wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 + - 1 - m_staticline2 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - - 0 - - - - + bSizerTop + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + File: + 0 + + 0 + + + 0 + + 1 + m_txtBrdFile + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + 5 + wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + Select a STEP export filename + + 0 + -1,-1 + 1 + m_filePickerSTEP + 1 + + + protected + 1 + + Resizable + 1 + -1,-1 + wxFLP_SAVE|wxFLP_USE_TEXTCTRL + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + STEP files (*.stp;*.step)|*.stp;*.step + + + + + 5 - wxEXPAND + wxEXPAND|wxTOP 1 bSizer2 wxHORIZONTAL none - - 5 + + 10 wxEXPAND|wxRIGHT|wxLEFT 0 - + + wxID_ANY + Coordinates - bSizer7 + sbCoordinates wxVERTICAL + 1 none - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,92,-1,70,0 - 0 - 0 - wxID_ANY - Coordinate origin options: - 0 - - 0 - - - 0 - - 1 - m_staticText6 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - 5 - wxALL + wxBOTTOM|wxRIGHT 0 1 @@ -355,7 +248,7 @@ 0 0 wxID_ANY - Drill and plot origin + Drill/place file origin 0 @@ -389,7 +282,7 @@ 5 - wxBOTTOM|wxLEFT|wxRIGHT + wxBOTTOM|wxRIGHT 0 1 @@ -453,7 +346,7 @@ 5 - wxBOTTOM|wxLEFT|wxRIGHT + wxBOTTOM|wxRIGHT 0 1 @@ -517,7 +410,7 @@ 5 - wxBOTTOM|wxLEFT|wxRIGHT + wxBOTTOM|wxRIGHT 0 1 @@ -582,81 +475,23 @@ - 5 + 10 wxEXPAND|wxRIGHT|wxLEFT 0 - + + wxID_ANY + User Defined Origin - bSizer3 + sbUserDefinedOrigin wxVERTICAL + 1 none - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,92,-1,70,0 - 0 - 0 - wxID_ANY - User defined origin: - 0 - - 0 - - - 0 - - 1 - m_staticText2 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - + 5 wxEXPAND 1 - - 3 + + 2 wxBOTH @@ -666,20 +501,10 @@ wxFLEX_GROWMODE_SPECIFIED none 0 - 0 + 5 5 - wxEXPAND|wxRIGHT|wxLEFT - 1 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL 0 1 @@ -740,7 +565,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT 0 1 @@ -805,17 +630,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT - 1 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL 0 1 @@ -876,7 +691,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT 0 1 @@ -941,17 +756,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT - 1 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL 0 1 @@ -1010,11 +815,11 @@ -1 - + 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -1080,78 +885,20 @@ - 5 + 10 wxEXPAND|wxRIGHT|wxLEFT - 0 - + 1 + + wxID_ANY + Other Options - bSizer8 + sbOtherOptions wxVERTICAL + 1 none 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,92,-1,70,0 - 0 - 0 - wxID_ANY - Other options: - 0 - - 0 - - - 0 - - 1 - m_staticText7 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxALL + wxBOTTOM|wxRIGHT 0 1 @@ -1215,7 +962,7 @@ 5 - wxALL + wxBOTTOM|wxRIGHT 0 1 @@ -1279,7 +1026,7 @@ 5 - wxALL + wxBOTTOM|wxRIGHT 0 1 @@ -1343,65 +1090,7 @@ 5 - wxEXPAND | wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline3 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; ; forward_declare - 0 - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT + wxTOP|wxRIGHT 0 1 @@ -1431,7 +1120,7 @@ 0 0 wxID_ANY - Board outline builder: + Board outline chaining tolerance: 0 0 @@ -1440,7 +1129,7 @@ 0 1 - m_staticText9 + m_staticTextTolerance 1 @@ -1462,147 +1151,86 @@ 5 - wxEXPAND + wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT 0 - + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Tight (0.001 mm)" "Standard (0.01 mm)" "Loose (0.1 mm)" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 - bSizerTolerance - wxHORIZONTAL - none - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Tolerance: - 0 - - 0 - - - 0 - - 1 - m_staticTextTolerance - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Tight (0.001 mm)" "Standard (0.01 mm)" "Loose (0.1 mm)" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_tolerance - 1 - - - protected - 1 - - Resizable - 1 - 1 - - - ; ; forward_declare - 0 - Tolerance sets the distance between two points that are considered joined. - - wxFILTER_NONE - wxDefaultValidator - - - - - - + 1 + m_tolerance + 1 + + + protected + 1 + + Resizable + 1 + 1 + + + ; ; forward_declare + 0 + Tolerance sets the distance between two points that are considered joined. + + wxFILTER_NONE + wxDefaultValidator + + + + + + 10 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + + bSizer81 + wxHORIZONTAL + none + + - 5 - wxEXPAND | wxALL + 10 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 diff --git a/pcbnew/dialogs/dialog_export_step_base.h b/pcbnew/dialogs/dialog_export_step_base.h index 7c4096cece..bbad15ef75 100644 --- a/pcbnew/dialogs/dialog_export_step_base.h +++ b/pcbnew/dialogs/dialog_export_step_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Apr 22 2021) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -20,13 +20,14 @@ class TEXT_CTRL_EVAL; #include #include #include -#include -#include #include +#include +#include #include #include #include #include +#include #include #include @@ -42,25 +43,19 @@ class DIALOG_EXPORT_STEP_BASE : public DIALOG_SHIM protected: wxStaticText* m_txtBrdFile; wxFilePickerCtrl* m_filePickerSTEP; - wxStaticLine* m_staticline2; - wxStaticText* m_staticText6; wxRadioButton* m_rbDrillAndPlotOrigin; wxRadioButton* m_rbGridOrigin; wxRadioButton* m_rbUserDefinedOrigin; wxRadioButton* m_rbBoardCenterOrigin; - wxStaticText* m_staticText2; wxStaticText* m_staticTextUnits; wxChoice* m_STEP_OrgUnitChoice; wxStaticText* m_staticTextXpos; TEXT_CTRL_EVAL* m_STEP_Xorg; wxStaticText* m_staticTextYpos; TEXT_CTRL_EVAL* m_STEP_Yorg; - wxStaticText* m_staticText7; wxCheckBox* m_cbRemoveVirtual; wxCheckBox* m_cbSubstModels; wxCheckBox* m_cbOverwriteFile; - wxStaticLine* m_staticline3; - wxStaticText* m_staticText9; wxStaticText* m_staticTextTolerance; wxChoice* m_tolerance; wxStaticLine* m_staticline; diff --git a/pcbnew/zone.cpp b/pcbnew/zone.cpp index 92f3375877..26fcaff94b 100644 --- a/pcbnew/zone.cpp +++ b/pcbnew/zone.cpp @@ -399,8 +399,8 @@ void ZONE::BuildHashValue( PCB_LAYER_ID aLayer ) bool ZONE::HitTest( const wxPoint& aPosition, int aAccuracy ) const { - // Normally accuracy is zoom-relative, but for the generic HitTest we just use - // a fixed (small) value. + // Normally accuracy is zoom-relative, but at high zooms zones can be too hard to select + // so we provide a minimum. int accuracy = std::max( aAccuracy, Millimeter2iu( 0.1 ) ); return HitTestForCorner( aPosition, accuracy * 2 ) || HitTestForEdge( aPosition, accuracy );