diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp b/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp index 63ef5b328f..451d016573 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp @@ -1,10 +1,12 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 17 2012) +// C++ code generated with wxFormBuilder (version Oct 8 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// +#include "UnitSelector.h" + #include "pcb_calculator_frame_base.h" #include "../bitmaps/arrow_bottom.xpm" @@ -74,7 +76,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow bSizerRegulRight = new wxBoxSizer( wxVERTICAL ); wxFlexGridSizer* fgSizerRegParams; - fgSizerRegParams = new wxFlexGridSizer( 5, 4, 0, 0 ); + fgSizerRegParams = new wxFlexGridSizer( 6, 4, 0, 0 ); fgSizerRegParams->AddGrowableCol( 2 ); fgSizerRegParams->SetFlexibleDirection( wxBOTH ); fgSizerRegParams->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -88,6 +90,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerRegParams->Add( m_labelRegultR1, 0, wxALL, 5 ); m_RegulR1Value = new wxTextCtrl( m_panelRegulators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_RegulR1Value->SetMaxLength( 0 ); fgSizerRegParams->Add( m_RegulR1Value, 0, wxALL|wxEXPAND, 5 ); m_UnitRegultR11 = new wxStaticText( m_panelRegulators, wxID_ANY, _("KOhm"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -102,6 +105,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerRegParams->Add( m_labelRegultR2, 0, wxALL, 5 ); m_RegulR2Value = new wxTextCtrl( m_panelRegulators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_RegulR2Value->SetMaxLength( 0 ); fgSizerRegParams->Add( m_RegulR2Value, 0, wxALL|wxEXPAND, 5 ); m_UnitRegultR1 = new wxStaticText( m_panelRegulators, wxID_ANY, _("KOhm"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -116,6 +120,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerRegParams->Add( m_labelVout, 0, wxALL, 5 ); m_RegulVoutValue = new wxTextCtrl( m_panelRegulators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_RegulVoutValue->SetMaxLength( 0 ); fgSizerRegParams->Add( m_RegulVoutValue, 0, wxALL|wxEXPAND, 5 ); m_unitsVout = new wxStaticText( m_panelRegulators, wxID_ANY, _("V"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -132,6 +137,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerRegParams->Add( m_labelVRef, 0, wxALL, 5 ); m_RegulVrefValue = new wxTextCtrl( m_panelRegulators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_RegulVrefValue->SetMaxLength( 0 ); fgSizerRegParams->Add( m_RegulVrefValue, 0, wxALL|wxEXPAND, 5 ); m_unitsVref = new wxStaticText( m_panelRegulators, wxID_ANY, _("V"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -148,6 +154,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerRegParams->Add( m_RegulIadjTitle, 0, wxALL, 5 ); m_RegulIadjValue = new wxTextCtrl( m_panelRegulators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_RegulIadjValue->SetMaxLength( 0 ); fgSizerRegParams->Add( m_RegulIadjValue, 0, wxALL|wxEXPAND, 5 ); m_IadjUnitLabel = new wxStaticText( m_panelRegulators, wxID_ANY, _("uA"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -196,6 +203,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow bSizerDataFile = new wxBoxSizer( wxHORIZONTAL ); m_regulators_fileNameCtrl = new wxTextCtrl( m_panelRegulators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_regulators_fileNameCtrl->SetMaxLength( 0 ); bSizerDataFile->Add( m_regulators_fileNameCtrl, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_buttonDataFile = new wxButton( m_panelRegulators, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -264,6 +272,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerTWprms->Add( m_staticTextCurrent, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); m_TrackCurrentValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_TrackCurrentValue->SetMaxLength( 0 ); fgSizerTWprms->Add( m_TrackCurrentValue, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_staticText62 = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("A"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -275,6 +284,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerTWprms->Add( m_staticText63, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); m_TrackDeltaTValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_TrackDeltaTValue->SetMaxLength( 0 ); fgSizerTWprms->Add( m_TrackDeltaTValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticText64 = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("deg C"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -286,6 +296,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerTWprms->Add( m_staticText65, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); m_TrackThicknessValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_TrackThicknessValue->SetMaxLength( 0 ); fgSizerTWprms->Add( m_TrackThicknessValue, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); wxArrayString m_TW_CuThickness_choiceUnitChoices; @@ -298,6 +309,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerTWprms->Add( m_staticText66, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); m_TrackLengthValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_TrackLengthValue->SetMaxLength( 0 ); fgSizerTWprms->Add( m_TrackLengthValue, 0, wxEXPAND|wxALL, 5 ); wxArrayString m_TW_CuLength_choiceUnitChoices; @@ -334,6 +346,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerTW_Results->Add( m_staticTextWidth, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); m_ExtTrackWidthValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_ExtTrackWidthValue->SetMaxLength( 0 ); fgSizerTW_Results->Add( m_ExtTrackWidthValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); wxArrayString m_TW_ExtTrackWidth_choiceUnitChoices; @@ -346,6 +359,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerTW_Results->Add( m_staticTextArea, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); m_ExtTrackAreaValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_ExtTrackAreaValue->SetMaxLength( 0 ); fgSizerTW_Results->Add( m_ExtTrackAreaValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_ExtTrackAreaUnitLabel = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("mm ^ 2"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -357,6 +371,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerTW_Results->Add( m_staticText651, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); m_ExtTrackResistValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_ExtTrackResistValue->SetMaxLength( 0 ); fgSizerTW_Results->Add( m_ExtTrackResistValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticText84 = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("Ohm"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -368,6 +383,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerTW_Results->Add( m_staticText661, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); m_ExtTrackVDropValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_ExtTrackVDropValue->SetMaxLength( 0 ); fgSizerTW_Results->Add( m_ExtTrackVDropValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticText83 = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("Volt"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -379,6 +395,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerTW_Results->Add( m_staticText79, 0, wxRIGHT|wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); m_ExtTrackLossValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_ExtTrackLossValue->SetMaxLength( 0 ); fgSizerTW_Results->Add( m_ExtTrackLossValue, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); m_staticText791 = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("Watt"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -405,6 +422,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerTW_Results1->Add( m_staticTextWidth11, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); m_IntTrackWidthValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_IntTrackWidthValue->SetMaxLength( 0 ); fgSizerTW_Results1->Add( m_IntTrackWidthValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); wxArrayString m_TW_IntTrackWidth_choiceUnitChoices; @@ -417,6 +435,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerTW_Results1->Add( m_staticTextArea1, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); m_IntTrackAreaValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_IntTrackAreaValue->SetMaxLength( 0 ); fgSizerTW_Results1->Add( m_IntTrackAreaValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_IntTrackAreaUnitLabel = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("mm ^ 2"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -428,6 +447,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerTW_Results1->Add( m_staticText6511, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); m_IntTrackResistValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_IntTrackResistValue->SetMaxLength( 0 ); fgSizerTW_Results1->Add( m_IntTrackResistValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticText841 = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("Ohm"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -439,6 +459,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerTW_Results1->Add( m_staticText6611, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); m_IntTrackVDropValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_IntTrackVDropValue->SetMaxLength( 0 ); fgSizerTW_Results1->Add( m_IntTrackVDropValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticText831 = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("Volt"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -450,6 +471,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerTW_Results1->Add( m_staticText792, 0, wxRIGHT|wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); m_IntTrackLossValue = new wxTextCtrl( m_panelTrackWidth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_IntTrackLossValue->SetMaxLength( 0 ); fgSizerTW_Results1->Add( m_IntTrackLossValue, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); m_staticText7911 = new wxStaticText( m_panelTrackWidth, wxID_ANY, _("Watt"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -490,6 +512,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow bLeftSizerElectricalClearance->Add( m_staticText891, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_ElectricalSpacingVoltage = new wxTextCtrl( m_panelElectricalSpacing, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_ElectricalSpacingVoltage->SetMaxLength( 0 ); bLeftSizerElectricalClearance->Add( m_ElectricalSpacingVoltage, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_buttonElectSpacingRefresh = new wxButton( m_panelElectricalSpacing, wxID_ANY, _("Update Values"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -602,6 +625,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerSubstPrms->Add( m_EpsilonR_label, 0, wxRIGHT|wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); m_Value_EpsilonR = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Value_EpsilonR->SetMaxLength( 0 ); fgSizerSubstPrms->Add( m_Value_EpsilonR, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); m_button_EpsilonR = new wxButton( m_panelTransline, wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); @@ -612,6 +636,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerSubstPrms->Add( m_TanD_label, 0, wxRIGHT|wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); m_Value_TanD = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Value_TanD->SetMaxLength( 0 ); fgSizerSubstPrms->Add( m_Value_TanD, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_button_TanD = new wxButton( m_panelTransline, wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); @@ -624,6 +649,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerSubstPrms->Add( m_Rho_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); m_Value_Rho = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Value_Rho->SetMaxLength( 0 ); fgSizerSubstPrms->Add( m_Value_Rho, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_button_Rho = new wxButton( m_panelTransline, wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); @@ -634,6 +660,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerSubstPrms->Add( m_substrate_prm4_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); m_Substrate_prm4_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Substrate_prm4_Value->SetMaxLength( 0 ); fgSizerSubstPrms->Add( m_Substrate_prm4_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); wxArrayString m_SubsPrm4_choiceUnitChoices; @@ -646,6 +673,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerSubstPrms->Add( m_substrate_prm5_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); m_Substrate_prm5_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Substrate_prm5_Value->SetMaxLength( 0 ); fgSizerSubstPrms->Add( m_Substrate_prm5_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); wxArrayString m_SubsPrm5_choiceUnitChoices; @@ -658,6 +686,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerSubstPrms->Add( m_substrate_prm6_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); m_Substrate_prm6_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Substrate_prm6_Value->SetMaxLength( 0 ); fgSizerSubstPrms->Add( m_Substrate_prm6_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); wxArrayString m_SubsPrm6_choiceUnitChoices; @@ -670,6 +699,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerSubstPrms->Add( m_substrate_prm7_label, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); m_Substrate_prm7_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Substrate_prm7_Value->SetMaxLength( 0 ); fgSizerSubstPrms->Add( m_Substrate_prm7_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); wxArrayString m_SubsPrm7_choiceUnitChoices; @@ -682,6 +712,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerSubstPrms->Add( m_substrate_prm8_label, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); m_Substrate_prm8_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Substrate_prm8_Value->SetMaxLength( 0 ); fgSizerSubstPrms->Add( m_Substrate_prm8_Value, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); wxArrayString m_SubsPrm8_choiceUnitChoices; @@ -694,6 +725,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerSubstPrms->Add( m_substrate_prm9_label, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); m_Substrate_prm9_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Substrate_prm9_Value->SetMaxLength( 0 ); fgSizerSubstPrms->Add( m_Substrate_prm9_Value, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); wxArrayString m_SubsPrm9_choiceUnitChoices; @@ -721,6 +753,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizeCmpPrms->Add( m_Frequency_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); m_Value_Frequency_Ctrl = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Value_Frequency_Ctrl->SetMaxLength( 0 ); fgSizeCmpPrms->Add( m_Value_Frequency_Ctrl, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); wxArrayString m_choiceUnit_FrequencyChoices; @@ -757,6 +790,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerPhysPrms->Add( m_phys_prm1_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); m_Phys_prm1_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Phys_prm1_Value->SetMaxLength( 0 ); fgSizerPhysPrms->Add( m_Phys_prm1_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); wxArrayString m_choiceUnit_Param1Choices; @@ -772,6 +806,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerPhysPrms->Add( m_phys_prm2_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); m_Phys_prm2_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Phys_prm2_Value->SetMaxLength( 0 ); fgSizerPhysPrms->Add( m_Phys_prm2_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); wxArrayString m_choiceUnit_Param2Choices; @@ -787,6 +822,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerPhysPrms->Add( m_phys_prm3_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); m_Phys_prm3_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Phys_prm3_Value->SetMaxLength( 0 ); fgSizerPhysPrms->Add( m_Phys_prm3_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); wxArrayString m_choiceUnit_Param3Choices; @@ -844,6 +880,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerResults->Add( m_elec_prm1_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); m_Elec_prm1_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Elec_prm1_Value->SetMaxLength( 0 ); fgSizerResults->Add( m_Elec_prm1_Value, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); wxArrayString m_choiceUnit_ElecPrm1Choices; @@ -856,6 +893,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerResults->Add( m_elec_prm2_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); m_Elec_prm2_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Elec_prm2_Value->SetMaxLength( 0 ); fgSizerResults->Add( m_Elec_prm2_Value, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); wxArrayString m_choiceUnit_ElecPrm2Choices; @@ -868,6 +906,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerResults->Add( m_elec_prm3_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); m_Elec_prm3_Value = new wxTextCtrl( m_panelTransline, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Elec_prm3_Value->SetMaxLength( 0 ); fgSizerResults->Add( m_Elec_prm3_Value, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); wxArrayString m_choiceUnit_ElecPrm3Choices; @@ -996,6 +1035,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerAttPrms->Add( m_attenuationLabel, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_AttValueCtrl = new wxTextCtrl( m_panelAttenuators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_AttValueCtrl->SetMaxLength( 0 ); fgSizerAttPrms->Add( m_AttValueCtrl, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_attUnit = new wxStaticText( m_panelAttenuators, wxID_ANY, _("dB"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -1007,6 +1047,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerAttPrms->Add( m_attenuationZinLabel, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_ZinValueCtrl = new wxTextCtrl( m_panelAttenuators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_ZinValueCtrl->SetMaxLength( 0 ); fgSizerAttPrms->Add( m_ZinValueCtrl, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_attZinUnit = new wxStaticText( m_panelAttenuators, wxID_ANY, _("Ohms"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -1018,6 +1059,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerAttPrms->Add( m_ZoutLabel, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_ZoutValueCtrl = new wxTextCtrl( m_panelAttenuators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_ZoutValueCtrl->SetMaxLength( 0 ); fgSizerAttPrms->Add( m_ZoutValueCtrl, 0, wxALL, 5 ); m_attZoutUnit = new wxStaticText( m_panelAttenuators, wxID_ANY, _("Ohms"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -1056,6 +1098,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerAttResults->Add( m_attenuatorR1Label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_Att_R1_Value = new wxTextCtrl( m_panelAttenuators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Att_R1_Value->SetMaxLength( 0 ); fgSizerAttResults->Add( m_Att_R1_Value, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_attR1Unit = new wxStaticText( m_panelAttenuators, wxID_ANY, _("Ohms"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -1067,6 +1110,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerAttResults->Add( m_attenuatorR2Label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_Att_R2_Value = new wxTextCtrl( m_panelAttenuators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Att_R2_Value->SetMaxLength( 0 ); fgSizerAttResults->Add( m_Att_R2_Value, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_attR2Unit1 = new wxStaticText( m_panelAttenuators, wxID_ANY, _("Ohms"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -1078,6 +1122,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerAttResults->Add( m_attenuatorR3Label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_Att_R3_Value = new wxTextCtrl( m_panelAttenuators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Att_R3_Value->SetMaxLength( 0 ); fgSizerAttResults->Add( m_Att_R3_Value, 0, wxALL, 5 ); m_attR3Unit = new wxStaticText( m_panelAttenuators, wxID_ANY, _("Ohms"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -1095,6 +1140,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow bMiddleSizerAtt->Add( m_staticTextAttMsg, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_Attenuator_Messages = new wxTextCtrl( m_panelAttenuators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); + m_Attenuator_Messages->SetMaxLength( 0 ); bMiddleSizerAtt->Add( m_Attenuator_Messages, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp b/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp index 3103035ae3..e583f509b3 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp @@ -25,62 +25,28 @@ 0 0 - 1 - 1 - 1 - 1 - 0 - - - - + wxAUI_MGR_DEFAULT - - 1 wxBOTH - 0 - 1 1 - 0 - Dock - 0 - Left 1 impl_virtual - 1 - 0 0 wxID_ANY - - 0 - - 0 - 1 PCB_CALCULATOR_FRAME_BASE - 1 - - - 1 - Resizable - 1 670,489 wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER Pcb Calculator - 0 - - wxFILTER_NONE - wxDefaultValidator - wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL @@ -121,59 +87,24 @@ - 1 - 1 - 1 - 1 - - - - - - - 1 - 0 - 1 1 - 0 - Dock - 0 - Left 1 - 1 - 0 0 wxID_ANY MyMenuBar - - 0 - - 0 - 1 m_menubar - 1 - - protected - 1 - Resizable - 1 - 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -202,59 +133,24 @@ - 1 - 1 - 1 - 1 - - - - - - - 1 - 0 - 1 1 - 0 - Dock - 0 - Left 1 1 - 1 - 0 0 wxID_ANY - - 0 - - 0 - 1 m_statusBar - 1 - - protected - 1 - Resizable - 1 wxST_SIZEGRIP - 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -341,10 +237,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -425,10 +317,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - wxTAB_TRAVERSAL @@ -541,10 +429,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -626,10 +510,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -736,10 +616,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -796,7 +672,7 @@ fgSizerRegParams wxFLEX_GROWMODE_SPECIFIED none - 5 + 6 0 5 @@ -940,10 +816,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -1118,10 +990,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -1293,10 +1161,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -1471,10 +1335,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -1646,10 +1506,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -1824,10 +1680,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -1921,10 +1773,6 @@ 0 The internal reference voltage of the regulator. Should not be 0. - - wxFILTER_NONE - wxDefaultValidator - @@ -2099,10 +1947,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -2196,10 +2040,6 @@ 0 For 3 terminal regulators only, the Adjust pin current. - - wxFILTER_NONE - wxDefaultValidator - @@ -2374,10 +2214,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -2471,10 +2307,6 @@ 0 Type of the regulator. There are 2 types: - regulators which have a dedicted sense pin for the voltage regulation. - 3 terminal pins. - - wxFILTER_NONE - wxDefaultValidator - @@ -2846,10 +2678,6 @@ 0 The name of the data file which stores known regulators parameters. - - wxFILTER_NONE - wxDefaultValidator - @@ -3400,10 +3228,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -3490,10 +3314,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - wxTAB_TRAVERSAL @@ -3591,10 +3411,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -3694,10 +3510,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -3872,10 +3684,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -3959,10 +3767,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -4137,10 +3941,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -4224,10 +4024,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -4490,10 +4286,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -4757,10 +4549,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - wxSIMPLE_BORDER @@ -4973,10 +4761,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -5239,10 +5023,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -5417,10 +5197,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -5504,10 +5280,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -5682,10 +5454,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -5769,10 +5537,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -5947,10 +5711,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -6034,10 +5794,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -6212,10 +5968,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -6331,10 +6083,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -6597,10 +6345,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -6775,10 +6519,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -6862,10 +6602,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -7040,10 +6776,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -7127,10 +6859,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -7305,10 +7033,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -7392,10 +7116,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -7570,10 +7290,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -7664,10 +7380,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - wxTAB_TRAVERSAL @@ -7849,10 +7561,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -7935,10 +7643,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -8212,10 +7916,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -8328,10 +8028,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -8446,10 +8142,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -8536,10 +8228,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - wxTAB_TRAVERSAL @@ -8722,10 +8410,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - wxTAB_TRAVERSAL @@ -8809,10 +8493,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -8932,10 +8612,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -9198,10 +8874,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -9464,10 +9136,6 @@ 0 Specific resistance in ohms * meters - - wxFILTER_NONE - wxDefaultValidator - @@ -9730,10 +9398,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -9996,10 +9660,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -10262,10 +9922,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -10528,10 +10184,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -10794,10 +10446,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -11060,10 +10708,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -11358,10 +11002,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -11676,10 +11316,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -12030,10 +11666,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -12384,10 +12016,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -12683,10 +12311,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -12944,10 +12568,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -13062,10 +12682,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -13328,10 +12944,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -13594,10 +13206,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -13892,10 +13500,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -13979,10 +13583,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -14066,10 +13666,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -14153,10 +13749,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -14240,10 +13832,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -14327,10 +13915,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -14414,10 +13998,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -14501,10 +14081,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -14588,10 +14164,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -14675,10 +14247,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -14762,10 +14330,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -14849,10 +14413,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -14936,10 +14496,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -15023,10 +14579,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -15117,10 +14669,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - wxTAB_TRAVERSAL @@ -15306,10 +14854,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - wxSIMPLE_BORDER|wxTAB_TRAVERSAL @@ -15431,10 +14975,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -15609,10 +15149,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -15696,10 +15232,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -15874,10 +15406,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -15961,10 +15489,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -16139,10 +15663,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -16326,10 +15846,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -16442,10 +15958,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -16620,10 +16132,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -16707,10 +16215,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -16885,10 +16389,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -16972,10 +16472,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -17150,10 +16646,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -17241,10 +16733,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -17431,10 +16919,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - wxSIMPLE_BORDER|wxTAB_TRAVERSAL @@ -17520,10 +17004,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - wxTAB_TRAVERSAL @@ -17715,10 +17195,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -17802,10 +17278,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -17889,10 +17361,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -17976,10 +17444,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -18063,10 +17527,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -18150,10 +17610,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -18236,10 +17692,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -18321,10 +17773,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -18406,10 +17854,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -18491,10 +17935,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -18576,10 +18016,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -18661,10 +18097,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -18750,10 +18182,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - wxTAB_TRAVERSAL @@ -18936,10 +18364,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -19052,10 +18476,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -19168,10 +18588,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - wxTAB_TRAVERSAL diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.h b/pcb_calculator/dialogs/pcb_calculator_frame_base.h index a4e7f80ae5..370750eb6a 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.h +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 17 2012) +// C++ code generated with wxFormBuilder (version Oct 8 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -11,7 +11,11 @@ #include #include #include -#include "UnitSelector.h" +class UNIT_SELECTOR_ANGLE; +class UNIT_SELECTOR_FREQUENCY; +class UNIT_SELECTOR_LEN; +class UNIT_SELECTOR_RESISTOR; + #include #include #include diff --git a/pcbnew/kicad_plugin.cpp b/pcbnew/kicad_plugin.cpp index 0399a8a0a1..c63a6b65bd 100644 --- a/pcbnew/kicad_plugin.cpp +++ b/pcbnew/kicad_plugin.cpp @@ -1087,8 +1087,10 @@ void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const m_out->Print( 0, " (rect_delta %s )", FMT_IU( aPad->GetDelta() ).c_str() ); wxSize sz = aPad->GetDrillSize(); + wxPoint shapeoffset = aPad->GetOffset(); - if( (sz.GetWidth() > 0) || (sz.GetHeight() > 0) ) + if( (sz.GetWidth() > 0) || (sz.GetHeight() > 0) || + (shapeoffset.x > 0) || (shapeoffset.y > 0) ) { m_out->Print( 0, " (drill" ); @@ -1101,7 +1103,7 @@ void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const if( sz.GetHeight() > 0 && sz.GetWidth() != sz.GetHeight() ) m_out->Print( 0, " %s", FMT_IU( sz.GetHeight() ).c_str() ); - if( (aPad->GetOffset().x != 0) || (aPad->GetOffset().y != 0) ) + if( (shapeoffset.x != 0) || (shapeoffset.y != 0) ) m_out->Print( 0, " (offset %s)", FMT_IU( aPad->GetOffset() ).c_str() ); m_out->Print( 0, ")" );