From 6d7f0b45f4767fc15d6e3624d6e3006431aa73c0 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 25 Nov 2016 12:05:51 +0100 Subject: [PATCH] dialog_export_step_base: cosmetic enhancements, add tool tips and better messages. --- pcbnew/dialogs/dialog_export_step_base.cpp | 108 ++- pcbnew/dialogs/dialog_export_step_base.fbp | 873 +++++++++++++-------- pcbnew/dialogs/dialog_export_step_base.h | 6 +- 3 files changed, 645 insertions(+), 342 deletions(-) diff --git a/pcbnew/dialogs/dialog_export_step_base.cpp b/pcbnew/dialogs/dialog_export_step_base.cpp index 3bfba5dc5a..f60336a589 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 Jun 12 2016) +// C++ code generated with wxFormBuilder (version Sep 8 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -16,64 +16,96 @@ 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 ); + m_txtBrdFile = new wxStaticText( this, wxID_ANY, _("STEP File name:"), wxDefaultPosition, wxDefaultSize, 0 ); m_txtBrdFile->Wrap( -1 ); - bSizerSTEPFile->Add( m_txtBrdFile, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxTOP, 5 ); + bSizerSTEPFile->Add( m_txtBrdFile, 0, wxALL, 5 ); m_filePickerSTEP = new wxFilePickerCtrl( this, wxID_ANY, wxEmptyString, _("Select a STEP export filename"), wxT("*.stp,*.step"), wxDefaultPosition, wxSize( 450,-1 ), wxFLP_OVERWRITE_PROMPT|wxFLP_SAVE|wxFLP_USE_TEXTCTRL ); bSizerSTEPFile->Add( m_filePickerSTEP, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + bSizerSTEPFile->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 ); + wxBoxSizer* bSizer2; bSizer2 = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer* bSizer7; bSizer7 = new wxBoxSizer( wxVERTICAL ); - m_staticText6 = new wxStaticText( this, wxID_ANY, _("Origin Options:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText6 = new wxStaticText( this, wxID_ANY, _("STEP coordinates origin options:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText6->Wrap( -1 ); + m_staticText6->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); + bSizer7->Add( m_staticText6, 0, wxALL, 5 ); - m_cbDrillOrigin = new wxCheckBox( this, wxID_ANY, _("Drill origin"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer7->Add( m_cbDrillOrigin, 0, wxALL, 5 ); + wxFlexGridSizer* fgSizer2; + fgSizer2 = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizer2->SetFlexibleDirection( wxBOTH ); + fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_cbAuxOrigin = new wxCheckBox( this, wxID_ANY, _("Aux Origin"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer7->Add( m_cbAuxOrigin, 0, wxALL, 5 ); + + fgSizer2->Add( 0, 0, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + + m_cbDrillOrigin = new wxCheckBox( this, wxID_ANY, _("Drill and plot axis origin"), wxDefaultPosition, wxDefaultSize, 0 ); + m_cbDrillOrigin->SetToolTip( _("Use the auxiliary axis origin (used in plot and drill geneation) as STEP coordinates origin.") ); + + fgSizer2->Add( m_cbDrillOrigin, 0, wxALL, 5 ); + + + fgSizer2->Add( 0, 0, 1, wxEXPAND, 5 ); + + m_cbAuxOrigin = new wxCheckBox( this, wxID_ANY, _("Grid origin"), wxDefaultPosition, wxDefaultSize, 0 ); + m_cbAuxOrigin->SetToolTip( _("Use the grid origin as STEP coordinates origin.") ); + + fgSizer2->Add( m_cbAuxOrigin, 0, wxALL, 5 ); + + + fgSizer2->Add( 0, 0, 1, wxEXPAND, 5 ); m_cbUserOrigin = new wxCheckBox( this, wxID_ANY, _("User defined origin"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer7->Add( m_cbUserOrigin, 0, wxALL, 5 ); + m_cbUserOrigin->SetToolTip( _("Use this option if you want to define a specific coordinate origin value.") ); + + fgSizer2->Add( m_cbUserOrigin, 0, wxALL, 5 ); - bSizer2->Add( bSizer7, 1, wxEXPAND, 5 ); + bSizer7->Add( fgSizer2, 1, wxEXPAND, 5 ); + + + bSizer2->Add( bSizer7, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); wxBoxSizer* bSizer3; bSizer3 = new wxBoxSizer( wxVERTICAL ); - m_staticText2 = new wxStaticText( this, wxID_ANY, _("User Defined Origin:"), wxDefaultPosition, wxDefaultSize, 0 ); + 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 ); - wxBoxSizer* bSizer6; - bSizer6 = new wxBoxSizer( wxHORIZONTAL ); + wxFlexGridSizer* fgSizer1; + fgSizer1 = new wxFlexGridSizer( 0, 3, 0, 0 ); + fgSizer1->SetFlexibleDirection( wxBOTH ); + fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + + fgSizer1->Add( 0, 0, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_staticText5 = new wxStaticText( this, wxID_ANY, _("Units:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText5->Wrap( -1 ); - bSizer6->Add( m_staticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgSizer1->Add( m_staticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 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->SetSelection( 0 ); - bSizer6->Add( m_STEP_OrgUnitChoice, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgSizer1->Add( m_STEP_OrgUnitChoice, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - bSizer3->Add( bSizer6, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer4; - bSizer4 = new wxBoxSizer( wxHORIZONTAL ); + fgSizer1->Add( 0, 0, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_staticText3 = new wxStaticText( this, wxID_ANY, _("X Position:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText3->Wrap( -1 ); - bSizer4->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgSizer1->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_STEP_Xorg = new wxTextCtrl( this, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); #ifdef __WXGTK__ @@ -84,17 +116,14 @@ DIALOG_EXPORT_STEP_BASE::DIALOG_EXPORT_STEP_BASE( wxWindow* parent, wxWindowID i #else m_STEP_Xorg->SetMaxLength( 8 ); #endif - bSizer4->Add( m_STEP_Xorg, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgSizer1->Add( m_STEP_Xorg, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - bSizer3->Add( bSizer4, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer5; - bSizer5 = new wxBoxSizer( wxHORIZONTAL ); + fgSizer1->Add( 0, 0, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_staticText4 = new wxStaticText( this, wxID_ANY, _("Y Position:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText4->Wrap( -1 ); - bSizer5->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgSizer1->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_STEP_Yorg = new wxTextCtrl( this, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); #ifdef __WXGTK__ @@ -105,22 +134,39 @@ DIALOG_EXPORT_STEP_BASE::DIALOG_EXPORT_STEP_BASE( wxWindow* parent, wxWindowID i #else m_STEP_Yorg->SetMaxLength( 8 ); #endif - bSizer5->Add( m_STEP_Yorg, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgSizer1->Add( m_STEP_Yorg, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - bSizer3->Add( bSizer5, 1, wxEXPAND, 5 ); + bSizer3->Add( fgSizer1, 1, wxEXPAND, 5 ); - bSizer2->Add( bSizer3, 1, wxEXPAND|wxLEFT, 5 ); + bSizer2->Add( bSizer3, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); wxBoxSizer* bSizer8; bSizer8 = new wxBoxSizer( 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 ) ); + + bSizer8->Add( m_staticText7, 0, wxALL, 5 ); + + wxFlexGridSizer* fgSizer3; + fgSizer3 = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizer3->SetFlexibleDirection( wxBOTH ); + fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + + fgSizer3->Add( 0, 0, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + m_cbRemoveVirtual = new wxCheckBox( this, wxID_ANY, _("Ignore Virtual Components"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer8->Add( m_cbRemoveVirtual, 0, wxALL, 5 ); + fgSizer3->Add( m_cbRemoveVirtual, 0, wxALL, 5 ); - bSizer2->Add( bSizer8, 1, wxEXPAND, 5 ); + bSizer8->Add( fgSizer3, 1, wxEXPAND, 5 ); + + + bSizer2->Add( bSizer8, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); bSizerSTEPFile->Add( bSizer2, 1, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/dialog_export_step_base.fbp b/pcbnew/dialogs/dialog_export_step_base.fbp index d46d219d15..34564daf59 100644 --- a/pcbnew/dialogs/dialog_export_step_base.fbp +++ b/pcbnew/dialogs/dialog_export_step_base.fbp @@ -95,7 +95,7 @@ none 5 - wxBOTTOM|wxLEFT|wxRIGHT|wxTOP + wxALL 0 1 @@ -125,7 +125,7 @@ 0 0 wxID_ANY - File name: + STEP File name: 0 @@ -265,6 +265,87 @@ + + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxEXPAND @@ -276,7 +357,7 @@ none 5 - wxEXPAND + wxEXPAND|wxRIGHT|wxLEFT 1 @@ -311,11 +392,11 @@ 1 1 - + ,90,92,-1,70,0 0 0 wxID_ANY - Origin Options: + STEP coordinates origin options: 0 @@ -366,277 +447,325 @@ - + 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Drill origin - - 0 - - - 0 + wxEXPAND + 1 + + 2 + wxBOTH + + + 0 - 1 - m_cbDrillOrigin - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Aux Origin - - 0 - - - 0 - - 1 - m_cbAuxOrigin - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - User defined origin - - 0 - - - 0 - - 1 - m_cbUserOrigin - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + fgSizer2 + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 0 + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 1 + + 0 + protected + 0 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Drill and plot axis origin + + 0 + + + 0 + + 1 + m_cbDrillOrigin + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Use the auxiliary axis origin (used in plot and drill geneation) as STEP coordinates origin. + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Grid origin + + 0 + + + 0 + + 1 + m_cbAuxOrigin + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Use the grid origin as STEP coordinates origin. + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + User defined origin + + 0 + + + 0 + + 1 + m_cbUserOrigin + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Use this option if you want to define a specific coordinate origin value. + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - wxEXPAND|wxLEFT + wxEXPAND|wxRIGHT|wxLEFT 1 - + bSizer3 wxVERTICAL @@ -669,11 +798,11 @@ 1 1 - + ,90,92,-1,70,0 0 0 wxID_ANY - User Defined Origin: + User defined origin: 0 @@ -724,15 +853,32 @@ - + 5 wxEXPAND 1 - + + 3 + wxBOTH + + + 0 - bSizer6 - wxHORIZONTAL + fgSizer1 + wxFLEX_GROWMODE_SPECIFIED none + 0 + 0 + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 1 + + 0 + protected + 0 + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -818,7 +964,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND 0 1 @@ -904,17 +1050,16 @@ - - - - 5 - wxEXPAND - 1 - - - bSizer4 - wxHORIZONTAL - none + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 1 + + 0 + protected + 0 + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -1000,7 +1145,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND 0 1 @@ -1089,17 +1234,16 @@ - - - - 5 - wxEXPAND - 1 - - - bSizer5 - wxHORIZONTAL - none + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 1 + + 0 + protected + 0 + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -1185,7 +1329,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND 0 1 @@ -1280,7 +1424,7 @@ 5 - wxEXPAND + wxEXPAND|wxRIGHT|wxLEFT 1 @@ -1291,7 +1435,7 @@ 5 wxALL 0 - + 1 1 1 @@ -1305,7 +1449,6 @@ 1 0 - 0 1 1 @@ -1316,11 +1459,11 @@ 1 1 - + ,90,92,-1,70,0 0 0 wxID_ANY - Ignore Virtual Components + Other options: 0 @@ -1328,7 +1471,7 @@ 0 1 - m_cbRemoveVirtual + m_staticText7 1 @@ -1342,15 +1485,11 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - + -1 - @@ -1375,6 +1514,122 @@ + + 5 + wxEXPAND + 1 + + 2 + wxBOTH + + + 0 + + fgSizer3 + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 0 + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 1 + + 0 + protected + 0 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Ignore Virtual Components + + 0 + + + 0 + + 1 + m_cbRemoveVirtual + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcbnew/dialogs/dialog_export_step_base.h b/pcbnew/dialogs/dialog_export_step_base.h index 16f21ad830..74e0a9108f 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 Jun 12 2016) +// C++ code generated with wxFormBuilder (version Sep 8 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -21,12 +21,12 @@ class DIALOG_SHIM; #include #include #include +#include #include #include #include #include #include -#include #include #include @@ -42,6 +42,7 @@ class DIALOG_EXPORT_STEP_BASE : public DIALOG_SHIM protected: wxStaticText* m_txtBrdFile; wxFilePickerCtrl* m_filePickerSTEP; + wxStaticLine* m_staticline2; wxStaticText* m_staticText6; wxCheckBox* m_cbDrillOrigin; wxCheckBox* m_cbAuxOrigin; @@ -53,6 +54,7 @@ class DIALOG_EXPORT_STEP_BASE : public DIALOG_SHIM wxTextCtrl* m_STEP_Xorg; wxStaticText* m_staticText4; wxTextCtrl* m_STEP_Yorg; + wxStaticText* m_staticText7; wxCheckBox* m_cbRemoveVirtual; wxStaticLine* m_staticline1; wxStdDialogButtonSizer* m_sdbSizer;