diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp b/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp index e5fa7b1bbd..c92d128339 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 2 2018) +// C++ code generated with wxFormBuilder (version v3.8.0) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -24,221 +24,221 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : KIWAY_PLAYER( parent, id, title, pos, size, style, name ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + m_menubar = new wxMenuBar( 0 ); this->SetMenuBar( m_menubar ); - + m_statusBar = this->CreateStatusBar( 1, wxSTB_SIZEGRIP, wxID_ANY ); wxBoxSizer* bmainFrameSizer; bmainFrameSizer = new wxBoxSizer( wxVERTICAL ); - + m_Notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_panelRegulators = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerMainReg; bSizerMainReg = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizeLeftpReg; bSizeLeftpReg = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizerBitmapReg; bSizerBitmapReg = new wxBoxSizer( wxVERTICAL ); - - + + bSizerBitmapReg->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_bitmapRegul4pins = new wxStaticBitmap( m_panelRegulators, wxID_ANY, wxBitmap( regul_xpm ), wxDefaultPosition, wxDefaultSize, 0 ); bSizerBitmapReg->Add( m_bitmapRegul4pins, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - + m_bitmapRegul3pins = new wxStaticBitmap( m_panelRegulators, wxID_ANY, wxBitmap( regul_3pins_xpm ), wxDefaultPosition, wxDefaultSize, 0 ); bSizerBitmapReg->Add( m_bitmapRegul3pins, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - + + bSizerBitmapReg->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + bSizeLeftpReg->Add( bSizerBitmapReg, 1, wxEXPAND, 5 ); - + wxStaticBoxSizer* sbSizerRegFormula; sbSizerRegFormula = new wxStaticBoxSizer( new wxStaticBox( m_panelRegulators, wxID_ANY, _("Formula:") ), wxVERTICAL ); - + m_RegulFormula = new wxStaticText( sbSizerRegFormula->GetStaticBox(), wxID_ANY, _("Vout = Vref * (R1 + R2) / R2"), wxDefaultPosition, wxDefaultSize, 0 ); m_RegulFormula->Wrap( -1 ); m_RegulFormula->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); - + sbSizerRegFormula->Add( m_RegulFormula, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - + + bSizeLeftpReg->Add( sbSizerRegFormula, 0, wxEXPAND, 5 ); - - + + bSizerMainReg->Add( bSizeLeftpReg, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizerRegulRight; bSizerRegulRight = new wxBoxSizer( wxVERTICAL ); - + wxFlexGridSizer* fgSizerRegParams; fgSizerRegParams = new wxFlexGridSizer( 6, 4, 0, 0 ); fgSizerRegParams->AddGrowableCol( 2 ); fgSizerRegParams->SetFlexibleDirection( wxBOTH ); fgSizerRegParams->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_rbRegulR1 = new wxRadioButton( m_panelRegulators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); - m_rbRegulR1->SetValue( true ); + m_rbRegulR1->SetValue( true ); fgSizerRegParams->Add( m_rbRegulR1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_labelRegultR1 = new wxStaticText( m_panelRegulators, wxID_ANY, _("R1:"), wxDefaultPosition, wxDefaultSize, 0 ); m_labelRegultR1->Wrap( -1 ); fgSizerRegParams->Add( m_labelRegultR1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_RegulR1Value = new wxTextCtrl( m_panelRegulators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerRegParams->Add( m_RegulR1Value, 0, wxALL|wxEXPAND, 5 ); - + m_UnitRegultR11 = new wxStaticText( m_panelRegulators, wxID_ANY, _("KOhm"), wxDefaultPosition, wxDefaultSize, 0 ); m_UnitRegultR11->Wrap( -1 ); fgSizerRegParams->Add( m_UnitRegultR11, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_rbRegulR2 = new wxRadioButton( m_panelRegulators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerRegParams->Add( m_rbRegulR2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_labelRegultR2 = new wxStaticText( m_panelRegulators, wxID_ANY, _("R2:"), wxDefaultPosition, wxDefaultSize, 0 ); m_labelRegultR2->Wrap( -1 ); fgSizerRegParams->Add( m_labelRegultR2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_RegulR2Value = new wxTextCtrl( m_panelRegulators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerRegParams->Add( m_RegulR2Value, 0, wxALL|wxEXPAND, 5 ); - + m_UnitRegultR1 = new wxStaticText( m_panelRegulators, wxID_ANY, _("KOhm"), wxDefaultPosition, wxDefaultSize, 0 ); m_UnitRegultR1->Wrap( -1 ); fgSizerRegParams->Add( m_UnitRegultR1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_rbRegulVout = new wxRadioButton( m_panelRegulators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerRegParams->Add( m_rbRegulVout, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_labelVout = new wxStaticText( m_panelRegulators, wxID_ANY, _("Vout:"), wxDefaultPosition, wxDefaultSize, 0 ); m_labelVout->Wrap( -1 ); fgSizerRegParams->Add( m_labelVout, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_RegulVoutValue = new wxTextCtrl( m_panelRegulators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerRegParams->Add( m_RegulVoutValue, 0, wxALL|wxEXPAND, 5 ); - + m_unitsVout = new wxStaticText( m_panelRegulators, wxID_ANY, _("V"), wxDefaultPosition, wxDefaultSize, 0 ); m_unitsVout->Wrap( -1 ); fgSizerRegParams->Add( m_unitsVout, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - + + fgSizerRegParams->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_labelVRef = new wxStaticText( m_panelRegulators, wxID_ANY, _("Vref:"), wxDefaultPosition, wxDefaultSize, 0 ); m_labelVRef->Wrap( -1 ); m_labelVRef->SetToolTip( _("The internal reference voltage of the regulator.\nShould not be 0.") ); - + fgSizerRegParams->Add( m_labelVRef, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_RegulVrefValue = new wxTextCtrl( m_panelRegulators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerRegParams->Add( m_RegulVrefValue, 0, wxALL|wxEXPAND, 5 ); - + m_unitsVref = new wxStaticText( m_panelRegulators, wxID_ANY, _("V"), wxDefaultPosition, wxDefaultSize, 0 ); m_unitsVref->Wrap( -1 ); fgSizerRegParams->Add( m_unitsVref, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - + + fgSizerRegParams->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_RegulIadjTitle = new wxStaticText( m_panelRegulators, wxID_ANY, _("Iadj:"), wxDefaultPosition, wxDefaultSize, 0 ); m_RegulIadjTitle->Wrap( -1 ); m_RegulIadjTitle->SetToolTip( _("For 3 terminal regulators only, the Adjust pin current.") ); - + fgSizerRegParams->Add( m_RegulIadjTitle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_RegulIadjValue = new wxTextCtrl( m_panelRegulators, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerRegParams->Add( m_RegulIadjValue, 0, wxALL|wxEXPAND, 5 ); - + m_IadjUnitLabel = new wxStaticText( m_panelRegulators, wxID_ANY, _("uA"), wxDefaultPosition, wxDefaultSize, 0 ); m_IadjUnitLabel->Wrap( -1 ); fgSizerRegParams->Add( m_IadjUnitLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - + + fgSizerRegParams->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_staticTextRegType = new wxStaticText( m_panelRegulators, wxID_ANY, _("Type:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRegType->Wrap( -1 ); m_staticTextRegType->SetToolTip( _("Type of the regulator.\nThere are 2 types:\n- regulators which have a dedicated sense pin for the voltage regulation.\n- 3 terminal pins.") ); - + fgSizerRegParams->Add( m_staticTextRegType, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + wxString m_choiceRegTypeChoices[] = { _("Standard Type"), _("3 Terminal Type") }; int m_choiceRegTypeNChoices = sizeof( m_choiceRegTypeChoices ) / sizeof( wxString ); m_choiceRegType = new wxChoice( m_panelRegulators, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceRegTypeNChoices, m_choiceRegTypeChoices, 0 ); m_choiceRegType->SetSelection( 0 ); fgSizerRegParams->Add( m_choiceRegType, 0, wxALL|wxEXPAND, 5 ); - - + + fgSizerRegParams->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + bSizerRegulRight->Add( fgSizerRegParams, 0, wxEXPAND, 5 ); - + m_buttonCalculate = new wxButton( m_panelRegulators, wxID_ANY, _("Calculate"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerRegulRight->Add( m_buttonCalculate, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); - + wxStaticBoxSizer* sbSizerRegulatorsChooser; sbSizerRegulatorsChooser = new wxStaticBoxSizer( new wxStaticBox( m_panelRegulators, wxID_ANY, _("Regulator:") ), wxVERTICAL ); - + wxArrayString m_choiceRegulatorSelectorChoices; m_choiceRegulatorSelector = new wxChoice( sbSizerRegulatorsChooser->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceRegulatorSelectorChoices, 0 ); m_choiceRegulatorSelector->SetSelection( 0 ); sbSizerRegulatorsChooser->Add( m_choiceRegulatorSelector, 0, wxALL|wxEXPAND, 5 ); - + m_staticTextRegFile = new wxStaticText( sbSizerRegulatorsChooser->GetStaticBox(), wxID_ANY, _("Regulators data file:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRegFile->Wrap( -1 ); m_staticTextRegFile->SetToolTip( _("The name of the data file which stores known regulators parameters.") ); - + sbSizerRegulatorsChooser->Add( m_staticTextRegFile, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + wxBoxSizer* bSizerDataFile; bSizerDataFile = new wxBoxSizer( wxHORIZONTAL ); - + m_regulators_fileNameCtrl = new wxTextCtrl( sbSizerRegulatorsChooser->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizerDataFile->Add( m_regulators_fileNameCtrl, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_buttonDataFile = new wxButton( sbSizerRegulatorsChooser->GetStaticBox(), wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerDataFile->Add( m_buttonDataFile, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + sbSizerRegulatorsChooser->Add( bSizerDataFile, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizerReulBtn; bSizerReulBtn = new wxBoxSizer( wxHORIZONTAL ); - + m_buttonEditItem = new wxButton( sbSizerRegulatorsChooser->GetStaticBox(), wxID_ANY, _("Edit Regulator"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonEditItem->SetToolTip( _("Edit the current selected regulator.") ); - + bSizerReulBtn->Add( m_buttonEditItem, 0, wxALL, 5 ); - + m_buttonAddItem = new wxButton( sbSizerRegulatorsChooser->GetStaticBox(), wxID_ANY, _("Add Regulator"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonAddItem->SetToolTip( _("Enter a new item to the current list of available regulators") ); - + bSizerReulBtn->Add( m_buttonAddItem, 1, wxALL, 5 ); - + m_buttonRemoveItem = new wxButton( sbSizerRegulatorsChooser->GetStaticBox(), wxID_ANY, _("Remove Regulator"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonRemoveItem->SetToolTip( _("Remove an item from the current list of available regulators") ); - + bSizerReulBtn->Add( m_buttonRemoveItem, 1, wxALL, 5 ); - - + + sbSizerRegulatorsChooser->Add( bSizerReulBtn, 1, wxEXPAND, 5 ); - - + + bSizerRegulRight->Add( sbSizerRegulatorsChooser, 0, wxEXPAND, 5 ); - + m_RegulMessage = new wxStaticText( m_panelRegulators, wxID_ANY, _("Message"), wxDefaultPosition, wxDefaultSize, 0 ); m_RegulMessage->Wrap( -1 ); bSizerRegulRight->Add( m_RegulMessage, 0, wxALL, 5 ); - - + + bSizerMainReg->Add( bSizerRegulRight, 1, wxEXPAND, 5 ); - - + + m_panelRegulators->SetSizer( bSizerMainReg ); m_panelRegulators->Layout(); bSizerMainReg->Fit( m_panelRegulators ); @@ -246,275 +246,275 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_panelTrackWidth = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerTrackWidth; bSizerTrackWidth = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizeLeft; bSizeLeft = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbSizerTW_Prms; sbSizerTW_Prms = new wxStaticBoxSizer( new wxStaticBox( m_panelTrackWidth, wxID_ANY, _("Parameters:") ), wxVERTICAL ); - + wxFlexGridSizer* fgSizerTWprms; fgSizerTWprms = new wxFlexGridSizer( 4, 3, 0, 0 ); fgSizerTWprms->AddGrowableCol( 1 ); fgSizerTWprms->SetFlexibleDirection( wxBOTH ); fgSizerTWprms->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticTextCurrent = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Current:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextCurrent->Wrap( -1 ); m_staticTextCurrent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + fgSizerTWprms->Add( m_staticTextCurrent, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxALIGN_RIGHT, 5 ); - + m_TrackCurrentValue = new wxTextCtrl( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerTWprms->Add( m_TrackCurrentValue, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - + m_staticText62 = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("A"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText62->Wrap( -1 ); fgSizerTWprms->Add( m_staticText62, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_staticText63 = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Temperature rise:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText63->Wrap( -1 ); fgSizerTWprms->Add( m_staticText63, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_TrackDeltaTValue = new wxTextCtrl( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerTWprms->Add( m_TrackDeltaTValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 ); - + m_staticText64 = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("deg C"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText64->Wrap( -1 ); fgSizerTWprms->Add( m_staticText64, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_staticText66 = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Conductor length:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText66->Wrap( -1 ); fgSizerTWprms->Add( m_staticText66, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); - + m_TrackLengthValue = new wxTextCtrl( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerTWprms->Add( m_TrackLengthValue, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - + wxArrayString m_TW_CuLength_choiceUnitChoices; m_TW_CuLength_choiceUnit = new UNIT_SELECTOR_LEN( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_TW_CuLength_choiceUnitChoices, 0 ); m_TW_CuLength_choiceUnit->SetSelection( 0 ); fgSizerTWprms->Add( m_TW_CuLength_choiceUnit, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - + m_staticText103 = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Resistivity:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText103->Wrap( -1 ); fgSizerTWprms->Add( m_staticText103, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_TWResistivity = new wxTextCtrl( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerTWprms->Add( m_TWResistivity, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - + m_staticText104 = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Ohm-meter"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText104->Wrap( -1 ); fgSizerTWprms->Add( m_staticText104, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - + + sbSizerTW_Prms->Add( fgSizerTWprms, 0, wxEXPAND, 5 ); - - + + bSizeLeft->Add( sbSizerTW_Prms, 0, wxALL|wxEXPAND, 5 ); - + m_htmlWinFormulas = new wxHtmlWindow( m_panelTrackWidth, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_NO_SELECTION|wxHW_SCROLLBAR_AUTO|wxBORDER_SIMPLE ); m_htmlWinFormulas->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); m_htmlWinFormulas->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); - + bSizeLeft->Add( m_htmlWinFormulas, 1, wxTOP|wxEXPAND, 5 ); - - + + bSizerTrackWidth->Add( bSizeLeft, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizeRight; bSizeRight = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbSizerTW_Result; sbSizerTW_Result = new wxStaticBoxSizer( new wxStaticBox( m_panelTrackWidth, wxID_ANY, _("External layer traces:") ), wxVERTICAL ); - + wxFlexGridSizer* fgSizerTW_Results; fgSizerTW_Results = new wxFlexGridSizer( 0, 3, 0, 0 ); fgSizerTW_Results->AddGrowableCol( 1 ); fgSizerTW_Results->SetFlexibleDirection( wxBOTH ); fgSizerTW_Results->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticTextExtWidth = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Trace width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextExtWidth->Wrap( -1 ); m_staticTextExtWidth->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + fgSizerTW_Results->Add( m_staticTextExtWidth, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT, 5 ); - + m_ExtTrackWidthValue = new wxTextCtrl( sbSizerTW_Result->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerTW_Results->Add( m_ExtTrackWidthValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - + wxArrayString m_TW_ExtTrackWidth_choiceUnitChoices; m_TW_ExtTrackWidth_choiceUnit = new UNIT_SELECTOR_LEN( sbSizerTW_Result->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_TW_ExtTrackWidth_choiceUnitChoices, 0 ); m_TW_ExtTrackWidth_choiceUnit->SetSelection( 0 ); fgSizerTW_Results->Add( m_TW_ExtTrackWidth_choiceUnit, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - + m_staticText65 = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Trace thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText65->Wrap( -1 ); fgSizerTW_Results->Add( m_staticText65, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); - + m_ExtTrackThicknessValue = new wxTextCtrl( sbSizerTW_Result->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerTW_Results->Add( m_ExtTrackThicknessValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - + wxArrayString m_ExtTrackThicknessUnitChoices; m_ExtTrackThicknessUnit = new UNIT_SELECTOR_THICKNESS( sbSizerTW_Result->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_ExtTrackThicknessUnitChoices, 0 ); m_ExtTrackThicknessUnit->SetSelection( 0 ); fgSizerTW_Results->Add( m_ExtTrackThicknessUnit, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_staticline3 = new wxStaticLine( sbSizerTW_Result->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); fgSizerTW_Results->Add( m_staticline3, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - + m_staticline4 = new wxStaticLine( sbSizerTW_Result->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); fgSizerTW_Results->Add( m_staticline4, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - + m_staticline5 = new wxStaticLine( sbSizerTW_Result->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); fgSizerTW_Results->Add( m_staticline5, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - + m_staticTextArea = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Cross-section area:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextArea->Wrap( -1 ); fgSizerTW_Results->Add( m_staticTextArea, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_ExtTrackAreaValue = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ExtTrackAreaValue->Wrap( -1 ); fgSizerTW_Results->Add( m_ExtTrackAreaValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 ); - + m_ExtTrackAreaUnitLabel = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("mm ^ 2"), wxDefaultPosition, wxDefaultSize, 0 ); m_ExtTrackAreaUnitLabel->Wrap( -1 ); fgSizerTW_Results->Add( m_ExtTrackAreaUnitLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_staticText651 = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Resistance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText651->Wrap( -1 ); fgSizerTW_Results->Add( m_staticText651, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_ExtTrackResistValue = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ExtTrackResistValue->Wrap( -1 ); fgSizerTW_Results->Add( m_ExtTrackResistValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_staticText84 = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Ohm"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText84->Wrap( -1 ); fgSizerTW_Results->Add( m_staticText84, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_staticText661 = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Voltage drop:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText661->Wrap( -1 ); fgSizerTW_Results->Add( m_staticText661, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_ExtTrackVDropValue = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ExtTrackVDropValue->Wrap( -1 ); fgSizerTW_Results->Add( m_ExtTrackVDropValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 ); - + m_staticText83 = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Volt"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText83->Wrap( -1 ); fgSizerTW_Results->Add( m_staticText83, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_staticText79 = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Power loss:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText79->Wrap( -1 ); fgSizerTW_Results->Add( m_staticText79, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_ExtTrackLossValue = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ExtTrackLossValue->Wrap( -1 ); fgSizerTW_Results->Add( m_ExtTrackLossValue, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - + m_staticText791 = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Watt"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText791->Wrap( -1 ); fgSizerTW_Results->Add( m_staticText791, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - + + sbSizerTW_Result->Add( fgSizerTW_Results, 0, wxEXPAND, 5 ); - - + + bSizeRight->Add( sbSizerTW_Result, 1, wxEXPAND|wxALL, 5 ); - + wxStaticBoxSizer* sbSizerTW_Result1; sbSizerTW_Result1 = new wxStaticBoxSizer( new wxStaticBox( m_panelTrackWidth, wxID_ANY, _("Internal layer traces:") ), wxVERTICAL ); - + wxFlexGridSizer* fgSizerTW_Results1; fgSizerTW_Results1 = new wxFlexGridSizer( 6, 3, 0, 0 ); fgSizerTW_Results1->AddGrowableCol( 1 ); fgSizerTW_Results1->SetFlexibleDirection( wxBOTH ); fgSizerTW_Results1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticTextIntWidth = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Trace width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextIntWidth->Wrap( -1 ); m_staticTextIntWidth->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + fgSizerTW_Results1->Add( m_staticTextIntWidth, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_IntTrackWidthValue = new wxTextCtrl( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerTW_Results1->Add( m_IntTrackWidthValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - + wxArrayString m_TW_IntTrackWidth_choiceUnitChoices; m_TW_IntTrackWidth_choiceUnit = new UNIT_SELECTOR_LEN( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_TW_IntTrackWidth_choiceUnitChoices, 0 ); m_TW_IntTrackWidth_choiceUnit->SetSelection( 0 ); fgSizerTW_Results1->Add( m_TW_IntTrackWidth_choiceUnit, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_staticText652 = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Trace thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText652->Wrap( -1 ); fgSizerTW_Results1->Add( m_staticText652, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_IntTrackThicknessValue = new wxTextCtrl( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerTW_Results1->Add( m_IntTrackThicknessValue, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - + wxArrayString m_IntTrackThicknessUnitChoices; m_IntTrackThicknessUnit = new UNIT_SELECTOR_THICKNESS( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_IntTrackThicknessUnitChoices, 0 ); m_IntTrackThicknessUnit->SetSelection( 0 ); fgSizerTW_Results1->Add( m_IntTrackThicknessUnit, 0, wxALL, 5 ); - + m_staticTextArea1 = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Cross-section area:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextArea1->Wrap( -1 ); fgSizerTW_Results1->Add( m_staticTextArea1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_IntTrackAreaValue = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_IntTrackAreaValue->Wrap( -1 ); fgSizerTW_Results1->Add( m_IntTrackAreaValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 ); - + m_IntTrackAreaUnitLabel = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("mm ^ 2"), wxDefaultPosition, wxDefaultSize, 0 ); m_IntTrackAreaUnitLabel->Wrap( -1 ); fgSizerTW_Results1->Add( m_IntTrackAreaUnitLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_staticText6511 = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Resistance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText6511->Wrap( -1 ); fgSizerTW_Results1->Add( m_staticText6511, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_IntTrackResistValue = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_IntTrackResistValue->Wrap( -1 ); fgSizerTW_Results1->Add( m_IntTrackResistValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 ); - + m_staticText841 = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Ohm"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText841->Wrap( -1 ); fgSizerTW_Results1->Add( m_staticText841, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_staticText6611 = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Voltage drop:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText6611->Wrap( -1 ); fgSizerTW_Results1->Add( m_staticText6611, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_IntTrackVDropValue = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_IntTrackVDropValue->Wrap( -1 ); fgSizerTW_Results1->Add( m_IntTrackVDropValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 ); - + m_staticText831 = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Volt"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText831->Wrap( -1 ); fgSizerTW_Results1->Add( m_staticText831, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_staticText792 = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Power loss:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText792->Wrap( -1 ); fgSizerTW_Results1->Add( m_staticText792, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_IntTrackLossValue = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_IntTrackLossValue->Wrap( -1 ); fgSizerTW_Results1->Add( m_IntTrackLossValue, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - + m_staticText7911 = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Watt"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText7911->Wrap( -1 ); fgSizerTW_Results1->Add( m_staticText7911, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - + + sbSizerTW_Result1->Add( fgSizerTW_Results1, 0, wxEXPAND, 5 ); - - + + bSizeRight->Add( sbSizerTW_Result1, 1, wxEXPAND|wxALL, 5 ); - - + + bSizerTrackWidth->Add( bSizeRight, 0, wxEXPAND, 5 ); - - + + m_panelTrackWidth->SetSizer( bSizerTrackWidth ); m_panelTrackWidth->Layout(); bSizerTrackWidth->Fit( m_panelTrackWidth ); @@ -522,49 +522,49 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_panelElectricalSpacing = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerElectricalClearance; bSizerElectricalClearance = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bLeftSizerElectricalClearance; bLeftSizerElectricalClearance = new wxBoxSizer( wxVERTICAL ); - + wxArrayString m_ElectricalSpacingUnitsSelectorChoices; m_ElectricalSpacingUnitsSelector = new UNIT_SELECTOR_LEN( m_panelElectricalSpacing, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_ElectricalSpacingUnitsSelectorChoices, 0 ); m_ElectricalSpacingUnitsSelector->SetSelection( -1 ); bLeftSizerElectricalClearance->Add( m_ElectricalSpacingUnitsSelector, 0, wxALL|wxEXPAND, 5 ); - + m_staticline2 = new wxStaticLine( m_panelElectricalSpacing, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bLeftSizerElectricalClearance->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 ); - + m_staticText891 = new wxStaticText( m_panelElectricalSpacing, wxID_ANY, _("Voltage > 500V:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText891->Wrap( -1 ); bLeftSizerElectricalClearance->Add( m_staticText891, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_ElectricalSpacingVoltage = new wxTextCtrl( m_panelElectricalSpacing, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bLeftSizerElectricalClearance->Add( m_ElectricalSpacingVoltage, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_buttonElectSpacingRefresh = new wxButton( m_panelElectricalSpacing, wxID_ANY, _("Update Values"), wxDefaultPosition, wxDefaultSize, 0 ); bLeftSizerElectricalClearance->Add( m_buttonElectSpacingRefresh, 0, wxALL|wxEXPAND, 5 ); - - + + bSizerElectricalClearance->Add( bLeftSizerElectricalClearance, 0, wxEXPAND, 5 ); - + wxBoxSizer* bElectricalSpacingSizerRight; bElectricalSpacingSizerRight = new wxBoxSizer( wxVERTICAL ); - + m_staticTextElectricalSpacing = new wxStaticText( m_panelElectricalSpacing, wxID_ANY, _("Note: Values are minimal values (from IPC 2221)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextElectricalSpacing->Wrap( -1 ); m_staticTextElectricalSpacing->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); - + bElectricalSpacingSizerRight->Add( m_staticTextElectricalSpacing, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_gridElectricalSpacingValues = new wxGrid( m_panelElectricalSpacing, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + // Grid m_gridElectricalSpacingValues->CreateGrid( 10, 7 ); m_gridElectricalSpacingValues->EnableEditing( false ); m_gridElectricalSpacingValues->EnableGridLines( true ); m_gridElectricalSpacingValues->EnableDragGridSize( false ); m_gridElectricalSpacingValues->SetMargins( 0, 0 ); - + // Columns m_gridElectricalSpacingValues->EnableDragColMove( false ); m_gridElectricalSpacingValues->EnableDragColSize( true ); @@ -576,8 +576,8 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_gridElectricalSpacingValues->SetColLabelValue( 4, _("A5") ); m_gridElectricalSpacingValues->SetColLabelValue( 5, _("A6") ); m_gridElectricalSpacingValues->SetColLabelValue( 6, _("A7") ); - m_gridElectricalSpacingValues->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridElectricalSpacingValues->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_gridElectricalSpacingValues->AutoSizeRows(); m_gridElectricalSpacingValues->EnableDragRowSize( false ); @@ -592,22 +592,22 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_gridElectricalSpacingValues->SetRowLabelValue( 7, _("251 ... 300V") ); m_gridElectricalSpacingValues->SetRowLabelValue( 8, _("301 ... 500V") ); m_gridElectricalSpacingValues->SetRowLabelValue( 9, _(" > 500V") ); - m_gridElectricalSpacingValues->SetRowLabelAlignment( wxALIGN_RIGHT, wxALIGN_CENTRE ); - + m_gridElectricalSpacingValues->SetRowLabelAlignment( wxALIGN_RIGHT, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults - m_gridElectricalSpacingValues->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_TOP ); + m_gridElectricalSpacingValues->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_TOP ); bElectricalSpacingSizerRight->Add( m_gridElectricalSpacingValues, 0, wxALL|wxEXPAND, 5 ); - + m_staticText88 = new wxStaticText( m_panelElectricalSpacing, wxID_ANY, _("* B1 - Internal Conductors\n* B2 - External Conductors, uncoated, sea level to 3050 m\n* B3 - External Conductors, uncoated, over 3050 m\n* B4 - External Conductors, with permanent polymer coating (any elevation)\n* A5 - External Conductors, with conformal coating over assembly (any elevation)\n* A6 - External Component lead/termination, uncoated\n* A7 - External Component lead termination, with conformal coating (any elevation)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText88->Wrap( -1 ); bElectricalSpacingSizerRight->Add( m_staticText88, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + bSizerElectricalClearance->Add( bElectricalSpacingSizerRight, 1, wxEXPAND, 5 ); - - + + m_panelElectricalSpacing->SetSizer( bSizerElectricalClearance ); m_panelElectricalSpacing->Layout(); bSizerElectricalClearance->Fit( m_panelElectricalSpacing ); @@ -615,430 +615,430 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_panelTransline = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizeTransline; bSizeTransline = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bLeftSizer; bLeftSizer = new wxBoxSizer( wxVERTICAL ); - + wxString m_TranslineSelectionChoices[] = { _("Microstrip Line"), _("Coplanar wave guide"), _("Coplanar wave guide with ground plane"), _("Rectangular Waveguide"), _("Coaxial Line"), _("Coupled Microstrip Line"), _("Stripline"), _("Twisted Pair") }; int m_TranslineSelectionNChoices = sizeof( m_TranslineSelectionChoices ) / sizeof( wxString ); m_TranslineSelection = new wxRadioBox( m_panelTransline, wxID_ANY, _("Transmission Line Type:"), wxDefaultPosition, wxDefaultSize, m_TranslineSelectionNChoices, m_TranslineSelectionChoices, 1, wxRA_SPECIFY_COLS ); m_TranslineSelection->SetSelection( 0 ); bLeftSizer->Add( m_TranslineSelection, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_panelDisplayshape = new wxPanel( m_panelTransline, wxID_ANY, wxDefaultPosition, wxSize( 205,205 ), wxTAB_TRAVERSAL ); bLeftSizer->Add( m_panelDisplayshape, 1, wxEXPAND, 5 ); - - + + bSizeTransline->Add( bLeftSizer, 0, wxEXPAND, 5 ); - + m_staticline1 = new wxStaticLine( m_panelTransline, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); bSizeTransline->Add( m_staticline1, 0, wxEXPAND, 5 ); - + wxBoxSizer* bMiddleSizer; bMiddleSizer = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbSubstrateBoxSizer; sbSubstrateBoxSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelTransline, wxID_ANY, _("Substrate Parameters") ), wxVERTICAL ); - + wxFlexGridSizer* fgSizerSubstPrms; fgSizerSubstPrms = new wxFlexGridSizer( 9, 3, 0, 0 ); fgSizerSubstPrms->AddGrowableCol( 1 ); fgSizerSubstPrms->SetFlexibleDirection( wxBOTH ); fgSizerSubstPrms->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_EpsilonR_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("Er:"), wxDefaultPosition, wxDefaultSize, 0 ); m_EpsilonR_label->Wrap( -1 ); fgSizerSubstPrms->Add( m_EpsilonR_label, 0, wxRIGHT|wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_Value_EpsilonR = new wxTextCtrl( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerSubstPrms->Add( m_Value_EpsilonR, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_button_EpsilonR = new wxButton( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); fgSizerSubstPrms->Add( m_button_EpsilonR, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_TanD_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("TanD:"), wxDefaultPosition, wxDefaultSize, 0 ); m_TanD_label->Wrap( -1 ); fgSizerSubstPrms->Add( m_TanD_label, 0, wxRIGHT|wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_Value_TanD = new wxTextCtrl( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerSubstPrms->Add( m_Value_TanD, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + m_button_TanD = new wxButton( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); fgSizerSubstPrms->Add( m_button_TanD, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_Rho_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("Rho:"), wxDefaultPosition, wxDefaultSize, 0 ); m_Rho_label->Wrap( -1 ); m_Rho_label->SetToolTip( _("Specific resistance in ohms * meters") ); - + fgSizerSubstPrms->Add( m_Rho_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_Value_Rho = new wxTextCtrl( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerSubstPrms->Add( m_Value_Rho, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + m_button_Rho = new wxButton( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); fgSizerSubstPrms->Add( m_button_Rho, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_substrate_prm4_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("H:"), wxDefaultPosition, wxDefaultSize, 0 ); m_substrate_prm4_label->Wrap( -1 ); fgSizerSubstPrms->Add( m_substrate_prm4_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_Substrate_prm4_Value = new wxTextCtrl( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerSubstPrms->Add( m_Substrate_prm4_Value, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + wxArrayString m_SubsPrm4_choiceUnitChoices; m_SubsPrm4_choiceUnit = new UNIT_SELECTOR_LEN( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_SubsPrm4_choiceUnitChoices, 0 ); m_SubsPrm4_choiceUnit->SetSelection( 0 ); fgSizerSubstPrms->Add( m_SubsPrm4_choiceUnit, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_substrate_prm5_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("H_t:"), wxDefaultPosition, wxDefaultSize, 0 ); m_substrate_prm5_label->Wrap( -1 ); fgSizerSubstPrms->Add( m_substrate_prm5_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_Substrate_prm5_Value = new wxTextCtrl( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerSubstPrms->Add( m_Substrate_prm5_Value, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + wxArrayString m_SubsPrm5_choiceUnitChoices; m_SubsPrm5_choiceUnit = new UNIT_SELECTOR_LEN( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_SubsPrm5_choiceUnitChoices, 0 ); m_SubsPrm5_choiceUnit->SetSelection( 0 ); fgSizerSubstPrms->Add( m_SubsPrm5_choiceUnit, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + m_substrate_prm6_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("T:"), wxDefaultPosition, wxDefaultSize, 0 ); m_substrate_prm6_label->Wrap( -1 ); fgSizerSubstPrms->Add( m_substrate_prm6_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_Substrate_prm6_Value = new wxTextCtrl( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerSubstPrms->Add( m_Substrate_prm6_Value, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + wxArrayString m_SubsPrm6_choiceUnitChoices; m_SubsPrm6_choiceUnit = new UNIT_SELECTOR_LEN( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_SubsPrm6_choiceUnitChoices, 0 ); m_SubsPrm6_choiceUnit->SetSelection( 0 ); fgSizerSubstPrms->Add( m_SubsPrm6_choiceUnit, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + m_substrate_prm7_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("Rough:"), wxDefaultPosition, wxDefaultSize, 0 ); m_substrate_prm7_label->Wrap( -1 ); fgSizerSubstPrms->Add( m_substrate_prm7_label, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); - + m_Substrate_prm7_Value = new wxTextCtrl( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerSubstPrms->Add( m_Substrate_prm7_Value, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + wxArrayString m_SubsPrm7_choiceUnitChoices; m_SubsPrm7_choiceUnit = new UNIT_SELECTOR_LEN( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_SubsPrm7_choiceUnitChoices, 0 ); m_SubsPrm7_choiceUnit->SetSelection( 0 ); fgSizerSubstPrms->Add( m_SubsPrm7_choiceUnit, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_substrate_prm8_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("mu Rel:"), wxDefaultPosition, wxDefaultSize, 0 ); m_substrate_prm8_label->Wrap( -1 ); fgSizerSubstPrms->Add( m_substrate_prm8_label, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); - + m_Substrate_prm8_Value = new wxTextCtrl( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerSubstPrms->Add( m_Substrate_prm8_Value, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + wxArrayString m_SubsPrm8_choiceUnitChoices; m_SubsPrm8_choiceUnit = new UNIT_SELECTOR_LEN( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_SubsPrm8_choiceUnitChoices, 0 ); m_SubsPrm8_choiceUnit->SetSelection( 0 ); fgSizerSubstPrms->Add( m_SubsPrm8_choiceUnit, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + m_substrate_prm9_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("mu Rel C:"), wxDefaultPosition, wxDefaultSize, 0 ); m_substrate_prm9_label->Wrap( -1 ); fgSizerSubstPrms->Add( m_substrate_prm9_label, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_Substrate_prm9_Value = new wxTextCtrl( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerSubstPrms->Add( m_Substrate_prm9_Value, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + wxArrayString m_SubsPrm9_choiceUnitChoices; m_SubsPrm9_choiceUnit = new UNIT_SELECTOR_LEN( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_SubsPrm9_choiceUnitChoices, 0 ); m_SubsPrm9_choiceUnit->SetSelection( 0 ); fgSizerSubstPrms->Add( m_SubsPrm9_choiceUnit, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + sbSubstrateBoxSizer->Add( fgSizerSubstPrms, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - - + + bMiddleSizer->Add( sbSubstrateBoxSizer, 0, wxEXPAND|wxBOTTOM, 5 ); - + wxStaticBoxSizer* sbCmpPrmsSizer; sbCmpPrmsSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelTransline, wxID_ANY, _("Component Parameters:") ), wxVERTICAL ); - + wxFlexGridSizer* fgSizeCmpPrms; fgSizeCmpPrms = new wxFlexGridSizer( 1, 3, 0, 0 ); fgSizeCmpPrms->AddGrowableCol( 1 ); fgSizeCmpPrms->SetFlexibleDirection( wxBOTH ); fgSizeCmpPrms->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_Frequency_label = new wxStaticText( sbCmpPrmsSizer->GetStaticBox(), wxID_ANY, _("Frequency:"), wxDefaultPosition, wxDefaultSize, 0 ); m_Frequency_label->Wrap( -1 ); fgSizeCmpPrms->Add( m_Frequency_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_Value_Frequency_Ctrl = new wxTextCtrl( sbCmpPrmsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizeCmpPrms->Add( m_Value_Frequency_Ctrl, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + wxArrayString m_choiceUnit_FrequencyChoices; m_choiceUnit_Frequency = new UNIT_SELECTOR_FREQUENCY( sbCmpPrmsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_FrequencyChoices, 0 ); m_choiceUnit_Frequency->SetSelection( 0 ); fgSizeCmpPrms->Add( m_choiceUnit_Frequency, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + sbCmpPrmsSizer->Add( fgSizeCmpPrms, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - - + + bMiddleSizer->Add( sbCmpPrmsSizer, 0, wxEXPAND|wxTOP, 5 ); - + wxBoxSizer* bSizerHelpBitmaps; bSizerHelpBitmaps = new wxBoxSizer( wxVERTICAL ); - + m_bmCMicrostripZoddZeven = new wxStaticBitmap( m_panelTransline, wxID_ANY, wxBitmap( microstrip_zodd_zeven_xpm ), wxDefaultPosition, wxDefaultSize, 0 ); bSizerHelpBitmaps->Add( m_bmCMicrostripZoddZeven, 0, wxALL, 5 ); - + m_fgSizerZcomment = new wxFlexGridSizer( 0, 2, 0, 0 ); m_fgSizerZcomment->AddGrowableCol( 0 ); m_fgSizerZcomment->AddGrowableCol( 1 ); m_fgSizerZcomment->SetFlexibleDirection( wxBOTH ); m_fgSizerZcomment->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticTextZdiff = new wxStaticText( m_panelTransline, wxID_ANY, _("Zdiff = Zodd * 2"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextZdiff->Wrap( -1 ); m_staticTextZdiff->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); - + m_fgSizerZcomment->Add( m_staticTextZdiff, 0, wxALL, 5 ); - + m_staticTextZcommon = new wxStaticText( m_panelTransline, wxID_ANY, _("Zcommon = Zeven / 2"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextZcommon->Wrap( -1 ); m_staticTextZcommon->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); - + m_fgSizerZcomment->Add( m_staticTextZcommon, 0, wxALL, 5 ); - - + + bSizerHelpBitmaps->Add( m_fgSizerZcomment, 0, wxEXPAND, 5 ); - - + + bMiddleSizer->Add( bSizerHelpBitmaps, 1, wxALIGN_CENTER_HORIZONTAL, 5 ); - - + + bSizeTransline->Add( bMiddleSizer, 1, wxALL|wxEXPAND, 5 ); - + wxBoxSizer* bRightSizer; bRightSizer = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* btranslineRightSizer; btranslineRightSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelTransline, wxID_ANY, _("Physical Parameters:") ), wxVERTICAL ); - + wxBoxSizer* sbRightBoxizer; sbRightBoxizer = new wxBoxSizer( wxVERTICAL ); - + wxFlexGridSizer* fgSizerPhysPrms; fgSizerPhysPrms = new wxFlexGridSizer( 4, 4, 0, 0 ); fgSizerPhysPrms->AddGrowableCol( 1 ); fgSizerPhysPrms->SetFlexibleDirection( wxBOTH ); fgSizerPhysPrms->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_phys_prm1_label = new wxStaticText( btranslineRightSizer->GetStaticBox(), wxID_ANY, _("Prm1"), wxDefaultPosition, wxDefaultSize, 0 ); m_phys_prm1_label->Wrap( -1 ); fgSizerPhysPrms->Add( m_phys_prm1_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_Phys_prm1_Value = new wxTextCtrl( btranslineRightSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerPhysPrms->Add( m_Phys_prm1_Value, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + wxArrayString m_choiceUnit_Param1Choices; m_choiceUnit_Param1 = new UNIT_SELECTOR_LEN( btranslineRightSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_Param1Choices, 0 ); m_choiceUnit_Param1->SetSelection( 0 ); fgSizerPhysPrms->Add( m_choiceUnit_Param1, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_radioBtnPrm1 = new wxRadioButton( btranslineRightSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); fgSizerPhysPrms->Add( m_radioBtnPrm1, 0, wxALIGN_CENTER_VERTICAL, 5 ); - + m_phys_prm2_label = new wxStaticText( btranslineRightSizer->GetStaticBox(), wxID_ANY, _("prm2"), wxDefaultPosition, wxDefaultSize, 0 ); m_phys_prm2_label->Wrap( -1 ); fgSizerPhysPrms->Add( m_phys_prm2_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_Phys_prm2_Value = new wxTextCtrl( btranslineRightSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerPhysPrms->Add( m_Phys_prm2_Value, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + wxArrayString m_choiceUnit_Param2Choices; m_choiceUnit_Param2 = new UNIT_SELECTOR_LEN( btranslineRightSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_Param2Choices, 0 ); m_choiceUnit_Param2->SetSelection( 0 ); fgSizerPhysPrms->Add( m_choiceUnit_Param2, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_radioBtnPrm2 = new wxRadioButton( btranslineRightSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerPhysPrms->Add( m_radioBtnPrm2, 0, wxALIGN_CENTER_VERTICAL, 5 ); - + m_phys_prm3_label = new wxStaticText( btranslineRightSizer->GetStaticBox(), wxID_ANY, _("prm3"), wxDefaultPosition, wxDefaultSize, 0 ); m_phys_prm3_label->Wrap( -1 ); fgSizerPhysPrms->Add( m_phys_prm3_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_Phys_prm3_Value = new wxTextCtrl( btranslineRightSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerPhysPrms->Add( m_Phys_prm3_Value, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + wxArrayString m_choiceUnit_Param3Choices; m_choiceUnit_Param3 = new UNIT_SELECTOR_LEN( btranslineRightSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_Param3Choices, 0 ); m_choiceUnit_Param3->SetSelection( 0 ); fgSizerPhysPrms->Add( m_choiceUnit_Param3, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + fgSizerPhysPrms->Add( 0, 0, 0, 0, 5 ); - - + + sbRightBoxizer->Add( fgSizerPhysPrms, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - - + + btranslineRightSizer->Add( sbRightBoxizer, 0, wxBOTTOM|wxEXPAND, 5 ); - - + + bRightSizer->Add( btranslineRightSizer, 0, wxALL|wxEXPAND, 5 ); - + wxBoxSizer* btranslineButtonsSizer; btranslineButtonsSizer = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizerButtons; bSizerButtons = new wxBoxSizer( wxHORIZONTAL ); - - m_bpButtonAnalyze = new wxBitmapButton( m_panelTransline, wxID_ANY, wxBitmap( arrow_bottom_xpm ), wxDefaultPosition, wxDefaultSize, 0 ); - + + m_bpButtonAnalyze = new wxBitmapButton( m_panelTransline, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + m_bpButtonAnalyze->SetBitmap( wxBitmap( arrow_bottom_xpm ) ); bSizerButtons->Add( m_bpButtonAnalyze, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - + m_AnalyseButton = new wxButton( m_panelTransline, wxID_ANY, _("Analyze"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerButtons->Add( m_AnalyseButton, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_SynthetizeButton = new wxButton( m_panelTransline, wxID_ANY, _("Synthesize"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerButtons->Add( m_SynthetizeButton, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - - m_bpButtonSynthetize = new wxBitmapButton( m_panelTransline, wxID_ANY, wxBitmap( arrow_top_xpm ), wxDefaultPosition, wxDefaultSize, 0 ); - + + m_bpButtonSynthetize = new wxBitmapButton( m_panelTransline, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + m_bpButtonSynthetize->SetBitmap( wxBitmap( arrow_top_xpm ) ); bSizerButtons->Add( m_bpButtonSynthetize, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - + + btranslineButtonsSizer->Add( bSizerButtons, 0, wxALIGN_CENTER_HORIZONTAL, 5 ); - - + + bRightSizer->Add( btranslineButtonsSizer, 0, wxALIGN_CENTER_HORIZONTAL, 5 ); - + wxStaticBoxSizer* sbElectricalResultsSizer; sbElectricalResultsSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelTransline, wxID_ANY, _("Electrical Parameters:") ), wxVERTICAL ); - + wxFlexGridSizer* fgSizerResults; fgSizerResults = new wxFlexGridSizer( 3, 3, 0, 0 ); fgSizerResults->AddGrowableCol( 1 ); fgSizerResults->SetFlexibleDirection( wxBOTH ); fgSizerResults->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_elec_prm1_label = new wxStaticText( sbElectricalResultsSizer->GetStaticBox(), wxID_ANY, _("Z"), wxDefaultPosition, wxDefaultSize, 0 ); m_elec_prm1_label->Wrap( -1 ); fgSizerResults->Add( m_elec_prm1_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_Elec_prm1_Value = new wxTextCtrl( sbElectricalResultsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerResults->Add( m_Elec_prm1_Value, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + wxArrayString m_choiceUnit_ElecPrm1Choices; m_choiceUnit_ElecPrm1 = new UNIT_SELECTOR_RESISTOR( sbElectricalResultsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_ElecPrm1Choices, 0 ); m_choiceUnit_ElecPrm1->SetSelection( 0 ); fgSizerResults->Add( m_choiceUnit_ElecPrm1, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + m_elec_prm2_label = new wxStaticText( sbElectricalResultsSizer->GetStaticBox(), wxID_ANY, _("Z"), wxDefaultPosition, wxDefaultSize, 0 ); m_elec_prm2_label->Wrap( -1 ); fgSizerResults->Add( m_elec_prm2_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_Elec_prm2_Value = new wxTextCtrl( sbElectricalResultsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerResults->Add( m_Elec_prm2_Value, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + wxArrayString m_choiceUnit_ElecPrm2Choices; m_choiceUnit_ElecPrm2 = new UNIT_SELECTOR_RESISTOR( sbElectricalResultsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_ElecPrm2Choices, 0 ); m_choiceUnit_ElecPrm2->SetSelection( 0 ); fgSizerResults->Add( m_choiceUnit_ElecPrm2, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_elec_prm3_label = new wxStaticText( sbElectricalResultsSizer->GetStaticBox(), wxID_ANY, _("Angle"), wxDefaultPosition, wxDefaultSize, 0 ); m_elec_prm3_label->Wrap( -1 ); fgSizerResults->Add( m_elec_prm3_label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_Elec_prm3_Value = new wxTextCtrl( sbElectricalResultsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerResults->Add( m_Elec_prm3_Value, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + wxArrayString m_choiceUnit_ElecPrm3Choices; m_choiceUnit_ElecPrm3 = new UNIT_SELECTOR_ANGLE( sbElectricalResultsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_ElecPrm3Choices, 0 ); m_choiceUnit_ElecPrm3->SetSelection( 0 ); fgSizerResults->Add( m_choiceUnit_ElecPrm3, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - - + + sbElectricalResultsSizer->Add( fgSizerResults, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - - + + bRightSizer->Add( sbElectricalResultsSizer, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - + wxStaticBoxSizer* sbMessagesSizer; sbMessagesSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelTransline, wxID_ANY, _("Results:") ), wxVERTICAL ); - + wxFlexGridSizer* fgSizerTranslResults; fgSizerTranslResults = new wxFlexGridSizer( 7, 2, 0, 0 ); fgSizerTranslResults->AddGrowableCol( 1 ); fgSizerTranslResults->SetFlexibleDirection( wxBOTH ); fgSizerTranslResults->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_left_message1 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message1->Wrap( -1 ); fgSizerTranslResults->Add( m_left_message1, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_Message1 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message1->Wrap( -1 ); fgSizerTranslResults->Add( m_Message1, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_left_message2 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message2->Wrap( -1 ); fgSizerTranslResults->Add( m_left_message2, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_Message2 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message2->Wrap( -1 ); fgSizerTranslResults->Add( m_Message2, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_left_message3 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message3->Wrap( -1 ); fgSizerTranslResults->Add( m_left_message3, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_Message3 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message3->Wrap( -1 ); fgSizerTranslResults->Add( m_Message3, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_left_message4 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message4->Wrap( -1 ); fgSizerTranslResults->Add( m_left_message4, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_Message4 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message4->Wrap( -1 ); fgSizerTranslResults->Add( m_Message4, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_left_message5 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message5->Wrap( -1 ); fgSizerTranslResults->Add( m_left_message5, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxALIGN_RIGHT, 5 ); - + m_Message5 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message5->Wrap( -1 ); fgSizerTranslResults->Add( m_Message5, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_left_message6 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message6->Wrap( -1 ); fgSizerTranslResults->Add( m_left_message6, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_Message6 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message6->Wrap( -1 ); fgSizerTranslResults->Add( m_Message6, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_left_message7 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message7->Wrap( -1 ); fgSizerTranslResults->Add( m_left_message7, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - + m_Message7 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message7->Wrap( -1 ); fgSizerTranslResults->Add( m_Message7, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + sbMessagesSizer->Add( fgSizerTranslResults, 1, wxEXPAND, 5 ); - - + + bRightSizer->Add( sbMessagesSizer, 1, wxEXPAND|wxTOP, 5 ); - - + + bSizeTransline->Add( bRightSizer, 1, wxEXPAND, 5 ); - - + + m_panelTransline->SetSizer( bSizeTransline ); m_panelTransline->Layout(); bSizeTransline->Fit( m_panelTransline ); @@ -1046,155 +1046,155 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_panelAttenuators = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerAtt; bSizerAtt = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bLeftSizerAtt; bLeftSizerAtt = new wxBoxSizer( wxVERTICAL ); - + wxString m_AttenuatorsSelectionChoices[] = { _("PI"), _("Tee"), _("Bridged Tee"), _("Resistive Splitter") }; int m_AttenuatorsSelectionNChoices = sizeof( m_AttenuatorsSelectionChoices ) / sizeof( wxString ); m_AttenuatorsSelection = new wxRadioBox( m_panelAttenuators, wxID_ANY, _("Attenuators:"), wxDefaultPosition, wxDefaultSize, m_AttenuatorsSelectionNChoices, m_AttenuatorsSelectionChoices, 1, wxRA_SPECIFY_COLS ); m_AttenuatorsSelection->SetSelection( 0 ); bLeftSizerAtt->Add( m_AttenuatorsSelection, 0, wxEXPAND|wxALL, 5 ); - + m_panelDisplayAttenuator = new wxPanel( m_panelAttenuators, wxID_ANY, wxDefaultPosition, wxSize( 256,256 ), wxTAB_TRAVERSAL|wxBORDER_SIMPLE ); bLeftSizerAtt->Add( m_panelDisplayAttenuator, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); - - + + bSizerAtt->Add( bLeftSizerAtt, 0, wxEXPAND, 5 ); - + wxBoxSizer* bMiddleSizerAtt; bMiddleSizerAtt = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbSizerAttPrms; sbSizerAttPrms = new wxStaticBoxSizer( new wxStaticBox( m_panelAttenuators, wxID_ANY, _("Parameters:") ), wxVERTICAL ); - + wxFlexGridSizer* fgSizerAttPrms; fgSizerAttPrms = new wxFlexGridSizer( 3, 3, 0, 0 ); fgSizerAttPrms->AddGrowableRow( 1 ); fgSizerAttPrms->SetFlexibleDirection( wxBOTH ); fgSizerAttPrms->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_attenuationLabel = new wxStaticText( sbSizerAttPrms->GetStaticBox(), wxID_ANY, _("Attenuation"), wxDefaultPosition, wxDefaultSize, 0 ); m_attenuationLabel->Wrap( -1 ); fgSizerAttPrms->Add( m_attenuationLabel, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_AttValueCtrl = new wxTextCtrl( sbSizerAttPrms->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerAttPrms->Add( m_AttValueCtrl, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_attUnit = new wxStaticText( sbSizerAttPrms->GetStaticBox(), wxID_ANY, _("dB"), wxDefaultPosition, wxDefaultSize, 0 ); m_attUnit->Wrap( -1 ); fgSizerAttPrms->Add( m_attUnit, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_attenuationZinLabel = new wxStaticText( sbSizerAttPrms->GetStaticBox(), wxID_ANY, _("Zin"), wxDefaultPosition, wxDefaultSize, 0 ); m_attenuationZinLabel->Wrap( -1 ); fgSizerAttPrms->Add( m_attenuationZinLabel, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_ZinValueCtrl = new wxTextCtrl( sbSizerAttPrms->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerAttPrms->Add( m_ZinValueCtrl, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_attZinUnit = new wxStaticText( sbSizerAttPrms->GetStaticBox(), wxID_ANY, _("Ohms"), wxDefaultPosition, wxDefaultSize, 0 ); m_attZinUnit->Wrap( -1 ); fgSizerAttPrms->Add( m_attZinUnit, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_ZoutLabel = new wxStaticText( sbSizerAttPrms->GetStaticBox(), wxID_ANY, _("Zout"), wxDefaultPosition, wxDefaultSize, 0 ); m_ZoutLabel->Wrap( -1 ); fgSizerAttPrms->Add( m_ZoutLabel, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_ZoutValueCtrl = new wxTextCtrl( sbSizerAttPrms->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerAttPrms->Add( m_ZoutValueCtrl, 0, wxALL, 5 ); - + m_attZoutUnit = new wxStaticText( sbSizerAttPrms->GetStaticBox(), wxID_ANY, _("Ohms"), wxDefaultPosition, wxDefaultSize, 0 ); m_attZoutUnit->Wrap( -1 ); fgSizerAttPrms->Add( m_attZoutUnit, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - - + + sbSizerAttPrms->Add( fgSizerAttPrms, 0, wxEXPAND, 5 ); - - + + bMiddleSizerAtt->Add( sbSizerAttPrms, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - + wxBoxSizer* bSizerAttButt; bSizerAttButt = new wxBoxSizer( wxHORIZONTAL ); - + m_buttonAlcAtt = new wxButton( m_panelAttenuators, wxID_ANY, _("Calculate"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerAttButt->Add( m_buttonAlcAtt, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - m_bpButtonCalcAtt = new wxBitmapButton( m_panelAttenuators, wxID_ANY, wxBitmap( arrow_bottom_xpm ), wxDefaultPosition, wxDefaultSize, 0 ); - + + m_bpButtonCalcAtt = new wxBitmapButton( m_panelAttenuators, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + m_bpButtonCalcAtt->SetBitmap( wxBitmap( arrow_bottom_xpm ) ); bSizerAttButt->Add( m_bpButtonCalcAtt, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - + + bMiddleSizerAtt->Add( bSizerAttButt, 0, wxALIGN_CENTER_HORIZONTAL, 5 ); - + wxStaticBoxSizer* sbSizerAttValues; sbSizerAttValues = new wxStaticBoxSizer( new wxStaticBox( m_panelAttenuators, wxID_ANY, _("Values") ), wxVERTICAL ); - + wxFlexGridSizer* fgSizerAttResults; fgSizerAttResults = new wxFlexGridSizer( 3, 3, 0, 0 ); fgSizerAttResults->AddGrowableRow( 1 ); fgSizerAttResults->SetFlexibleDirection( wxBOTH ); fgSizerAttResults->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_attenuatorR1Label = new wxStaticText( sbSizerAttValues->GetStaticBox(), wxID_ANY, _("R1"), wxDefaultPosition, wxDefaultSize, 0 ); m_attenuatorR1Label->Wrap( -1 ); fgSizerAttResults->Add( m_attenuatorR1Label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_Att_R1_Value = new wxTextCtrl( sbSizerAttValues->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerAttResults->Add( m_Att_R1_Value, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_attR1Unit = new wxStaticText( sbSizerAttValues->GetStaticBox(), wxID_ANY, _("Ohms"), wxDefaultPosition, wxDefaultSize, 0 ); m_attR1Unit->Wrap( -1 ); fgSizerAttResults->Add( m_attR1Unit, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_attenuatorR2Label = new wxStaticText( sbSizerAttValues->GetStaticBox(), wxID_ANY, _("R2"), wxDefaultPosition, wxDefaultSize, 0 ); m_attenuatorR2Label->Wrap( -1 ); fgSizerAttResults->Add( m_attenuatorR2Label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_Att_R2_Value = new wxTextCtrl( sbSizerAttValues->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerAttResults->Add( m_Att_R2_Value, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_attR2Unit1 = new wxStaticText( sbSizerAttValues->GetStaticBox(), wxID_ANY, _("Ohms"), wxDefaultPosition, wxDefaultSize, 0 ); m_attR2Unit1->Wrap( -1 ); fgSizerAttResults->Add( m_attR2Unit1, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_attenuatorR3Label = new wxStaticText( sbSizerAttValues->GetStaticBox(), wxID_ANY, _("R3"), wxDefaultPosition, wxDefaultSize, 0 ); m_attenuatorR3Label->Wrap( -1 ); fgSizerAttResults->Add( m_attenuatorR3Label, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_Att_R3_Value = new wxTextCtrl( sbSizerAttValues->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerAttResults->Add( m_Att_R3_Value, 0, wxALL, 5 ); - + m_attR3Unit = new wxStaticText( sbSizerAttValues->GetStaticBox(), wxID_ANY, _("Ohms"), wxDefaultPosition, wxDefaultSize, 0 ); m_attR3Unit->Wrap( -1 ); fgSizerAttResults->Add( m_attR3Unit, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - - + + sbSizerAttValues->Add( fgSizerAttResults, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - - + + bMiddleSizerAtt->Add( sbSizerAttValues, 0, wxEXPAND|wxTOP, 5 ); - + m_staticTextAttMsg = new wxStaticText( m_panelAttenuators, wxID_ANY, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextAttMsg->Wrap( -1 ); bMiddleSizerAtt->Add( m_staticTextAttMsg, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_Attenuator_Messages = new wxHtmlWindow( m_panelAttenuators, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_NO_SELECTION|wxHW_SCROLLBAR_AUTO|wxBORDER_SIMPLE ); bMiddleSizerAtt->Add( m_Attenuator_Messages, 1, wxALL|wxEXPAND, 5 ); - - + + bSizerAtt->Add( bMiddleSizerAtt, 0, wxEXPAND, 5 ); - + wxStaticBoxSizer* sbRightSizerFormula; sbRightSizerFormula = new wxStaticBoxSizer( new wxStaticBox( m_panelAttenuators, wxID_ANY, _("Formula") ), wxVERTICAL ); - + m_panelAttFormula = new wxHtmlWindow( sbRightSizerFormula->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO ); sbRightSizerFormula->Add( m_panelAttFormula, 1, wxALL|wxEXPAND, 5 ); - - + + bSizerAtt->Add( sbRightSizerFormula, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - - + + m_panelAttenuators->SetSizer( bSizerAtt ); m_panelAttenuators->Layout(); bSizerAtt->Fit( m_panelAttenuators ); @@ -1202,64 +1202,64 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_panelColorCode = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerPanelColorCode; bSizerPanelColorCode = new wxBoxSizer( wxHORIZONTAL ); - + wxString m_rbToleranceSelectionChoices[] = { _("10% / 5%"), _("<= 2%") }; int m_rbToleranceSelectionNChoices = sizeof( m_rbToleranceSelectionChoices ) / sizeof( wxString ); m_rbToleranceSelection = new wxRadioBox( m_panelColorCode, wxID_ANY, _("Tolerance"), wxDefaultPosition, wxDefaultSize, m_rbToleranceSelectionNChoices, m_rbToleranceSelectionChoices, 1, wxRA_SPECIFY_COLS ); m_rbToleranceSelection->SetSelection( 0 ); bSizerPanelColorCode->Add( m_rbToleranceSelection, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - + wxFlexGridSizer* fgSizerColoCode; fgSizerColoCode = new wxFlexGridSizer( 2, 6, 0, 0 ); fgSizerColoCode->SetFlexibleDirection( wxBOTH ); fgSizerColoCode->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticText31 = new wxStaticText( m_panelColorCode, wxID_ANY, _("1st Band"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText31->Wrap( -1 ); fgSizerColoCode->Add( m_staticText31, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); - + m_staticText34 = new wxStaticText( m_panelColorCode, wxID_ANY, _("2nd Band"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText34->Wrap( -1 ); fgSizerColoCode->Add( m_staticText34, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); - + m_staticText35 = new wxStaticText( m_panelColorCode, wxID_ANY, _("3rd Band"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText35->Wrap( -1 ); fgSizerColoCode->Add( m_staticText35, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); - + m_Band4Label = new wxStaticText( m_panelColorCode, wxID_ANY, _("4th Band"), wxDefaultPosition, wxDefaultSize, 0 ); m_Band4Label->Wrap( -1 ); fgSizerColoCode->Add( m_Band4Label, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); - + m_staticText37 = new wxStaticText( m_panelColorCode, wxID_ANY, _("Multiplier"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText37->Wrap( -1 ); fgSizerColoCode->Add( m_staticText37, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); - + m_staticText38 = new wxStaticText( m_panelColorCode, wxID_ANY, _("Tolerance"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText38->Wrap( -1 ); fgSizerColoCode->Add( m_staticText38, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); - + m_Band1bitmap = new wxStaticBitmap( m_panelColorCode, wxID_ANY, wxBitmap( color_code_value_and_name_xpm ), wxDefaultPosition, wxDefaultSize, 0 ); fgSizerColoCode->Add( m_Band1bitmap, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - + m_Band2bitmap = new wxStaticBitmap( m_panelColorCode, wxID_ANY, wxBitmap( color_code_value_xpm ), wxDefaultPosition, wxDefaultSize, 0 ); fgSizerColoCode->Add( m_Band2bitmap, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - + m_Band3bitmap = new wxStaticBitmap( m_panelColorCode, wxID_ANY, wxBitmap( color_code_value_xpm ), wxDefaultPosition, wxDefaultSize, 0 ); fgSizerColoCode->Add( m_Band3bitmap, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - + m_Band4bitmap = new wxStaticBitmap( m_panelColorCode, wxID_ANY, wxBitmap( color_code_value_xpm ), wxDefaultPosition, wxDefaultSize, 0 ); fgSizerColoCode->Add( m_Band4bitmap, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); - + m_Band_mult_bitmap = new wxStaticBitmap( m_panelColorCode, wxID_ANY, wxBitmap( color_code_multiplier_xpm ), wxDefaultPosition, wxDefaultSize, 0 ); fgSizerColoCode->Add( m_Band_mult_bitmap, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); - + m_Band_tol_bitmap = new wxStaticBitmap( m_panelColorCode, wxID_ANY, wxBitmap( color_code_tolerance_xpm ), wxDefaultPosition, wxDefaultSize, 0 ); fgSizerColoCode->Add( m_Band_tol_bitmap, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - + + bSizerPanelColorCode->Add( fgSizerColoCode, 1, wxEXPAND|wxLEFT, 5 ); - - + + m_panelColorCode->SetSizer( bSizerPanelColorCode ); m_panelColorCode->Layout(); bSizerPanelColorCode->Fit( m_panelColorCode ); @@ -1267,30 +1267,30 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_panelBoardClass = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerBoardClass; bSizerBoardClass = new wxBoxSizer( wxHORIZONTAL ); - + wxArrayString m_BoardClassesUnitsSelectorChoices; m_BoardClassesUnitsSelector = new UNIT_SELECTOR_LEN( m_panelBoardClass, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_BoardClassesUnitsSelectorChoices, 0 ); m_BoardClassesUnitsSelector->SetSelection( 0 ); bSizerBoardClass->Add( m_BoardClassesUnitsSelector, 0, wxALL, 5 ); - + wxBoxSizer* brdclsSizerRight; brdclsSizerRight = new wxBoxSizer( wxVERTICAL ); - + m_staticTextBrdClass = new wxStaticText( m_panelBoardClass, wxID_ANY, _("Note: Values are minimal values"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextBrdClass->Wrap( -1 ); m_staticTextBrdClass->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); - + brdclsSizerRight->Add( m_staticTextBrdClass, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); - + m_gridClassesValuesDisplay = new wxGrid( m_panelBoardClass, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + // Grid m_gridClassesValuesDisplay->CreateGrid( 5, 6 ); m_gridClassesValuesDisplay->EnableEditing( false ); m_gridClassesValuesDisplay->EnableGridLines( true ); m_gridClassesValuesDisplay->EnableDragGridSize( false ); m_gridClassesValuesDisplay->SetMargins( 0, 0 ); - + // Columns m_gridClassesValuesDisplay->EnableDragColMove( false ); m_gridClassesValuesDisplay->EnableDragColSize( true ); @@ -1301,8 +1301,8 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_gridClassesValuesDisplay->SetColLabelValue( 3, _("Class 4") ); m_gridClassesValuesDisplay->SetColLabelValue( 4, _("Class 5") ); m_gridClassesValuesDisplay->SetColLabelValue( 5, _("Class 6") ); - m_gridClassesValuesDisplay->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridClassesValuesDisplay->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_gridClassesValuesDisplay->AutoSizeRows(); m_gridClassesValuesDisplay->EnableDragRowSize( false ); @@ -1312,34 +1312,34 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_gridClassesValuesDisplay->SetRowLabelValue( 2, _("Via: (diam - drill)") ); m_gridClassesValuesDisplay->SetRowLabelValue( 3, _("Plated Pad: (diam - drill)") ); m_gridClassesValuesDisplay->SetRowLabelValue( 4, _("NP Pad: (diam - drill)") ); - m_gridClassesValuesDisplay->SetRowLabelAlignment( wxALIGN_RIGHT, wxALIGN_CENTRE ); - + m_gridClassesValuesDisplay->SetRowLabelAlignment( wxALIGN_RIGHT, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults - m_gridClassesValuesDisplay->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_TOP ); + m_gridClassesValuesDisplay->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_TOP ); brdclsSizerRight->Add( m_gridClassesValuesDisplay, 0, wxALL|wxEXPAND, 5 ); - + m_panelShowClassPrms = new wxPanel( m_panelBoardClass, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); brdclsSizerRight->Add( m_panelShowClassPrms, 1, wxEXPAND | wxALL, 5 ); - - + + bSizerBoardClass->Add( brdclsSizerRight, 1, wxEXPAND, 5 ); - - + + m_panelBoardClass->SetSizer( bSizerBoardClass ); m_panelBoardClass->Layout(); bSizerBoardClass->Fit( m_panelBoardClass ); m_Notebook->AddPage( m_panelBoardClass, _("Board Classes"), true ); - + bmainFrameSizer->Add( m_Notebook, 1, wxEXPAND, 5 ); - - + + this->SetSizer( bmainFrameSizer ); this->Layout(); - + this->Centre( wxBOTH ); - + // Connect Events this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( PCB_CALCULATOR_FRAME_BASE::OnClosePcbCalc ) ); m_choiceRegType->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnRegulTypeSelection ), NULL, this ); @@ -1422,5 +1422,5 @@ PCB_CALCULATOR_FRAME_BASE::~PCB_CALCULATOR_FRAME_BASE() m_bpButtonCalcAtt->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnCalculateAttenuator ), NULL, this ); m_rbToleranceSelection->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnToleranceSelection ), NULL, this ); m_BoardClassesUnitsSelector->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnBoardClassesUnitsSelection ), NULL, this ); - + } diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp b/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp index 185deda71e..914865e6a7 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -54,54 +54,7 @@ pcb_calculator wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL 1 - - - - - - - - - - - - - - - - OnClosePcbCalc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -124,36 +77,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -177,36 +100,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -270,38 +163,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Regulators @@ -357,36 +218,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerMainReg @@ -476,36 +307,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -564,36 +365,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -620,7 +391,6 @@ wxVERTICAL 1 none - 5 wxALL|wxALIGN_CENTER_HORIZONTAL @@ -680,36 +450,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -803,37 +543,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -895,36 +604,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -989,40 +668,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1084,36 +729,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1178,37 +793,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1270,36 +854,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1364,40 +918,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1459,36 +979,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1553,37 +1043,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1645,36 +1104,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1739,40 +1168,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1834,36 +1229,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1935,36 +1300,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2029,40 +1364,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2124,36 +1425,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2225,36 +1496,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2319,40 +1560,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2414,36 +1621,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2515,36 +1692,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2609,37 +1756,7 @@ - - - - - - - - OnRegulTypeSelection - - - - - - - - - - - - - - - - - - - - - - @@ -2724,37 +1841,7 @@ - - - - - - OnRegulatorCalcButtonClick - - - - - - - - - - - - - - - - - - - - - - - - @@ -2769,7 +1856,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -2832,37 +1918,7 @@ - - - - - - - - OnRegulatorSelection - - - - - - - - - - - - - - - - - - - - - - @@ -2924,36 +1980,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3027,40 +2053,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3133,37 +2125,7 @@ - - - - - - OnDataFileSelection - - - - - - - - - - - - - - - - - - - - - - - - @@ -3247,37 +2209,7 @@ - - - - - - OnEditRegulator - - - - - - - - - - - - - - - - - - - - - - - - @@ -3350,37 +2282,7 @@ - - - - - - OnAddRegulator - - - - - - - - - - - - - - - - - - - - - - - - @@ -3453,37 +2355,7 @@ - - - - - - OnRemoveRegulator - - - - - - - - - - - - - - - - - - - - - - - - @@ -3549,36 +2421,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3641,36 +2483,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerTrackWidth @@ -3697,7 +2509,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -3773,36 +2584,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3867,40 +2648,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTWCalculateFromCurrent - - - - @@ -3962,36 +2710,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4053,36 +2771,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4147,40 +2835,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTWParametersChanged - - - - @@ -4242,36 +2897,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4333,36 +2958,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4427,40 +3022,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTWParametersChanged - - - - @@ -4525,37 +3087,7 @@ - - - - - - - - OnTWParametersChanged - - - - - - - - - - - - - - - - - - - - - - @@ -4617,36 +3149,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4711,40 +3213,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTWParametersChanged - - - - @@ -4806,36 +3275,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4898,39 +3337,6 @@ wxBORDER_SIMPLE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4956,7 +3362,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -5032,36 +3437,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5126,40 +3501,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTWCalculateFromExtWidth - - - - @@ -5224,37 +3566,7 @@ - - - - - - - - OnTWParametersChanged - - - - - - - - - - - - - - - - - - - - - - @@ -5316,36 +3628,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5410,40 +3692,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTWParametersChanged - - - - @@ -5508,37 +3757,7 @@ - - - - - - - - OnTWParametersChanged - - - - - - - - - - - - - - - - - - - - - - @@ -5597,36 +3816,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5685,36 +3874,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5773,36 +3932,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5864,36 +3993,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5955,36 +4054,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6046,36 +4115,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6137,36 +4176,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6228,36 +4237,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6319,36 +4298,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6410,36 +4359,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6501,36 +4420,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6592,36 +4481,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6683,36 +4542,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6774,36 +4603,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6865,36 +4664,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6913,7 +4682,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -6989,36 +4757,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7083,40 +4821,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTWCalculateFromIntWidth - - - - @@ -7181,37 +4886,7 @@ - - - - - - - - OnTWParametersChanged - - - - - - - - - - - - - - - - - - - - - - @@ -7273,36 +4948,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7367,40 +5012,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTWParametersChanged - - - - @@ -7465,37 +5077,7 @@ - - - - - - - - OnTWParametersChanged - - - - - - - - - - - - - - - - - - - - - - @@ -7557,36 +5139,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7648,36 +5200,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7739,36 +5261,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7830,36 +5322,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7921,36 +5383,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8012,36 +5444,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8103,36 +5505,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8194,36 +5566,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8285,36 +5627,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8376,36 +5688,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8467,36 +5749,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8558,36 +5810,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8654,36 +5876,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerElectricalClearance @@ -8760,37 +5952,7 @@ - - - - - - - - OnElectricalSpacingUnitsSelection - - - - - - - - - - - - - - - - - - - - - - @@ -8849,36 +6011,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8940,36 +6072,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9034,40 +6136,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9140,37 +6208,7 @@ - - - - - - OnElectricalSpacingRefresh - - - - - - - - - - - - - - - - - - - - - - - - @@ -9243,36 +6281,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9296,15 +6304,15 @@ 1 - wxALIGN_CENTRE + wxALIGN_CENTER wxALIGN_TOP 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 70 "B1" "B2" "B3" "B4" "A5" "A6" "A7" - wxALIGN_CENTRE + wxALIGN_CENTER 7 @@ -9350,7 +6358,7 @@ wxALIGN_RIGHT 100 "0 ... 15V" "16 ... 30V" "31 ... 50V" "51 ... 100V" "101 ... 150V" "151 ... 170V" "171 ... 250V" "251 ... 300V" "301 ... 500V" " > 500V" - wxALIGN_CENTRE + wxALIGN_CENTER 10 1 @@ -9361,68 +6369,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9484,36 +6430,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9576,36 +6492,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizeTransline @@ -9684,37 +6570,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - OnTranslineSelection - - - - - - @@ -9772,36 +6628,7 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - OnPaintTranslinePanel - - - - - - @@ -9862,36 +6689,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9915,7 +6712,6 @@ wxVERTICAL 1 none - 5 wxEXPAND|wxTOP|wxBOTTOM @@ -9991,36 +6787,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10085,40 +6851,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10191,37 +6923,7 @@ - - - - - - OnTranslineEpsilonR_Button - - - - - - - - - - - - - - - - - - - - - - - - @@ -10283,36 +6985,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10377,40 +7049,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10483,37 +7121,7 @@ - - - - - - OnTranslineTanD_Button - - - - - - - - - - - - - - - - - - - - - - - - @@ -10575,36 +7183,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10669,40 +7247,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10775,37 +7319,7 @@ - - - - - - OnTranslineRho_Button - - - - - - - - - - - - - - - - - - - - - - - - @@ -10867,36 +7381,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10961,40 +7445,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11059,37 +7509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11151,36 +7570,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11245,40 +7634,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11343,37 +7698,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11435,36 +7759,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11529,40 +7823,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11627,37 +7887,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11719,36 +7948,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11813,40 +8012,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11911,37 +8076,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12003,36 +8137,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12097,40 +8201,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12195,37 +8265,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12287,36 +8326,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12381,40 +8390,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12479,37 +8454,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12528,7 +8472,6 @@ wxVERTICAL 1 none - 5 wxEXPAND|wxTOP|wxBOTTOM @@ -12604,36 +8547,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12698,40 +8611,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12796,37 +8675,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12898,36 +8746,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13005,36 +8823,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13096,36 +8884,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13155,7 +8913,6 @@ wxVERTICAL 1 none - 5 wxBOTTOM|wxEXPAND @@ -13240,36 +8997,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13334,40 +9061,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13432,37 +9125,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13527,37 +9189,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13619,36 +9250,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13713,40 +9314,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13811,37 +9378,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13906,37 +9442,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13998,36 +9503,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14092,40 +9567,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14190,37 +9631,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14327,37 +9737,7 @@ - - - - - - OnTranslineAnalyse - - - - - - - - - - - - - - - - - - - - - - - - @@ -14430,37 +9810,7 @@ - - - - - - OnTranslineAnalyse - - - - - - - - - - - - - - - - - - - - - - - - @@ -14533,37 +9883,7 @@ - - - - - - OnTranslineSynthetize - - - - - - - - - - - - - - - - - - - - - - - - @@ -14636,37 +9956,7 @@ - - - - - - OnTranslineSynthetize - - - - - - - - - - - - - - - - - - - - - - - - @@ -14685,7 +9975,6 @@ wxVERTICAL 1 none - 5 wxEXPAND|wxTOP|wxBOTTOM @@ -14761,36 +10050,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14855,40 +10114,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14953,37 +10178,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15045,36 +10239,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15139,40 +10303,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15237,37 +10367,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15329,36 +10428,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15423,40 +10492,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15521,37 +10556,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15570,7 +10574,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -15646,36 +10649,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15737,36 +10710,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15828,36 +10771,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15919,36 +10832,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16010,36 +10893,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16101,36 +10954,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16192,36 +11015,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16283,36 +11076,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16374,36 +11137,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16465,36 +11198,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16556,36 +11259,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16647,36 +11320,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16738,36 +11381,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16829,36 +11442,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16925,36 +11508,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerAtt @@ -17033,37 +11586,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - OnAttenuatorSelection - - - - - - @@ -17121,36 +11644,7 @@ wxTAB_TRAVERSAL|wxBORDER_SIMPLE - - - - - - - - - - - - - - - - - - - - - - - OnPaintAttenuatorPanel - - - - - - @@ -17176,7 +11670,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -17252,36 +11745,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17346,40 +11809,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17441,36 +11870,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17532,36 +11931,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17626,40 +11995,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17721,36 +12056,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17812,36 +12117,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17906,40 +12181,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18001,36 +12242,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18116,37 +12327,7 @@ - - - - - - OnCalculateAttenuator - - - - - - - - - - - - - - - - - - - - - - - - @@ -18219,37 +12400,7 @@ - - - - - - OnCalculateAttenuator - - - - - - - - - - - - - - - - - - - - - - - - @@ -18266,7 +12417,6 @@ wxVERTICAL 1 none - 5 wxEXPAND|wxTOP|wxBOTTOM @@ -18342,36 +12492,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18436,40 +12556,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18531,36 +12617,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18622,36 +12678,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18716,40 +12742,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18811,36 +12803,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18902,36 +12864,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18996,40 +12928,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19091,36 +12989,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19186,36 +13054,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19274,39 +13112,6 @@ wxBORDER_SIMPLE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19323,7 +13128,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -19380,39 +13184,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19475,36 +13246,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerPanelColorCode @@ -19574,37 +13315,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - OnToleranceSelection - - - - - - @@ -19682,36 +13393,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19773,36 +13454,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19864,36 +13515,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19955,36 +13576,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20046,36 +13637,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20137,36 +13698,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20225,36 +13756,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20313,36 +13814,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20401,36 +13872,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20489,36 +13930,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20577,36 +13988,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20665,36 +14046,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20757,36 +14108,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerBoardClass @@ -20854,37 +14175,7 @@ - - - - - - - - OnBoardClassesUnitsSelection - - - - - - - - - - - - - - - - - - - - - - @@ -20955,36 +14246,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -21008,15 +14269,15 @@ 1 - wxALIGN_CENTRE + wxALIGN_CENTER wxALIGN_TOP 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 70 "Class 1" "Class 2" "Class 3" "Class 4" "Class 5" "Class 6" - wxALIGN_CENTRE + wxALIGN_CENTER 6 @@ -21062,7 +14323,7 @@ wxALIGN_RIGHT 160 "Lines width" "Min clearance" "Via: (diam - drill)" "Plated Pad: (diam - drill)" "NP Pad: (diam - drill)" - wxALIGN_CENTRE + wxALIGN_CENTER 5 1 @@ -21073,68 +14334,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -21192,36 +14391,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.h b/pcb_calculator/dialogs/pcb_calculator_frame_base.h index db40dfe6bf..14197d3ef7 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.h +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 2 2018) +// C++ code generated with wxFormBuilder (version v3.8.0) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __PCB_CALCULATOR_FRAME_BASE_H__ -#define __PCB_CALCULATOR_FRAME_BASE_H__ +#pragma once #include #include @@ -54,7 +53,7 @@ class UNIT_SELECTOR_THICKNESS; class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER { private: - + protected: wxMenuBar* m_menubar; wxStatusBar* m_statusBar; @@ -275,7 +274,7 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER wxStaticText* m_staticTextBrdClass; wxGrid* m_gridClassesValuesDisplay; wxPanel* m_panelShowClassPrms; - + // Virtual event handlers, overide them in your derived class virtual void OnClosePcbCalc( wxCloseEvent& event ) { event.Skip(); } virtual void OnRegulTypeSelection( wxCommandEvent& event ) { event.Skip(); } @@ -303,14 +302,13 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER virtual void OnCalculateAttenuator( wxCommandEvent& event ) { event.Skip(); } virtual void OnToleranceSelection( wxCommandEvent& event ) { event.Skip(); } virtual void OnBoardClassesUnitsSelection( wxCommandEvent& event ) { event.Skip(); } - - + + public: - + PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PCB Calculator"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 877,580 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL, const wxString& name = wxT("pcb_calculator") ); - + ~PCB_CALCULATOR_FRAME_BASE(); - + }; -#endif //__PCB_CALCULATOR_FRAME_BASE_H__