diff --git a/common/dialogs/panel_design_block_lib_table_base.cpp b/common/dialogs/panel_design_block_lib_table_base.cpp index e60d633f6b..82e225afb0 100644 --- a/common/dialogs/panel_design_block_lib_table_base.cpp +++ b/common/dialogs/panel_design_block_lib_table_base.cpp @@ -94,7 +94,7 @@ PANEL_DESIGN_BLOCK_LIB_TABLE_BASE::PANEL_DESIGN_BLOCK_LIB_TABLE_BASE( wxWindow* m_project_grid->SetColLabelValue( 1, _("Visible") ); m_project_grid->SetColLabelValue( 2, _("Nickname") ); m_project_grid->SetColLabelValue( 3, _("Library Path") ); - m_project_grid->SetColLabelValue( 4, _("LIbrary Format") ); + m_project_grid->SetColLabelValue( 4, _("Library Format") ); m_project_grid->SetColLabelValue( 5, _("Options") ); m_project_grid->SetColLabelValue( 6, _("Description") ); m_project_grid->SetColLabelSize( 22 ); diff --git a/common/dialogs/panel_design_block_lib_table_base.fbp b/common/dialogs/panel_design_block_lib_table_base.fbp index 748097e474..4acbe255e8 100644 --- a/common/dialogs/panel_design_block_lib_table_base.fbp +++ b/common/dialogs/panel_design_block_lib_table_base.fbp @@ -1,1048 +1,1064 @@ - + - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - panel_design_block_lib_table_base - 1000 - none - - - 1 - panel_design_block_lib_table - - . - - 1 - 1 - 1 - 1 - UI - 0 - 0 - 0 - - 0 - wxAUI_MGR_DEFAULT + + + C++ + + 1 + connect + none + + + 0 + 0 + res + UTF-8 + panel_design_block_lib_table_base + 1000 + 1 + 1 + UI + panel_design_block_lib_table + . + 0 + source_name + 1 + 0 + source_name + + + 1 + 1 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 0 + 1 + impl_virtual + + + 0 + wxID_ANY + + + PANEL_DESIGN_BLOCK_LIB_TABLE_BASE + + -1,-1 + ; forward_declare + + 0 + + + wxTAB_TRAVERSAL + OnUpdateUI + + + bMainSizer + wxVERTICAL + none + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left + 0 1 - impl_virtual + 1 + 0 0 wxID_ANY + + 0 + + 0 - PANEL_DESIGN_BLOCK_LIB_TABLE_BASE + 1 + m_notebook + 1 + + + protected + 1 - -1,-1 - ; forward_declare + Resizable + 1 + + + ; ; forward_declare + 0 - 0 - wxTAB_TRAVERSAL - OnUpdateUI - + + + + Global Libraries + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + + 0 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 - bMainSizer - wxVERTICAL - none - + 1 + m_global_panel + 1 + + + protected + 0 + + Resizable + 1 + + + 0 + + + + wxTAB_TRAVERSAL + + + m_global_sizer + wxVERTICAL + none + 5 - wxEXPAND|wxRIGHT|wxLEFT + wxALL|wxEXPAND 1 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_notebook - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - - - Global Libraries - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_global_panel - 1 - - - protected - 0 - - Resizable - 1 - - - 0 - - - - wxTAB_TRAVERSAL - - - m_global_sizer - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - 0 - 0 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - 22 - "Active" "Visible" "Nickname" "Library Path" "Library Format" "Options" "Description" - wxALIGN_CENTER - 7 - 48,48,100,240,100,80,240 - - 1 - 0 - Dock - 1 - Left - 0 - 1 - 0 - 0 - 1 - 1 - - 0 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - - 0 - - 0 - m_global_grid - 1 - - - protected - 1 - - Fixed - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 1 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - - - - - - - - - - - - Project Specific Libraries - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_project_panel - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - wxTAB_TRAVERSAL - - - m_project_sizer - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - 0 - 0 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - 22 - "Active" "Visible" "Nickname" "Library Path" "LIbrary Format" "Options" "Description" - wxALIGN_CENTER - 7 - 48,48,100,240,100,80,240 - - 1 - 0 - Dock - 1 - Left - 0 - 1 - 0 - 0 - 1 - 1 - - 0 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - - 0 - - 0 - m_project_grid - 1 - - - protected - 1 - - Fixed - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 1 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - - - - - - - - - - - - - 8 - wxEXPAND|wxALL - 0 - - - bButtonsSizer - wxHORIZONTAL - none - - 5 - wxTOP|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Add Library - - 0 - - 0 - - - 0 - - 1 - m_append_button - 1 - - - protected - 1 - - - - Resizable - 1 - -1,-1 - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Add empty row to table - - wxFILTER_NONE - wxDefaultValidator - - - - - appendRowHandler - - - - 5 - wxTOP|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - SPLIT_BUTTON - 1 - m_browseButton = new SPLIT_BUTTON( this, wxID_ANY, _( "Add Existing" ), wxDefaultPosition ); - - 1 - - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - #include <widgets/split_button.h> - - 0 - - - 0 - -1,-1 - 1 - m_browseButton - 1 - - - protected - 1 - - Resizable - - 1 - -1,-1 - ; ; forward_declare - 0 - Add Existing - - - - - - - 5 - wxTOP|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Move Up - - 0 - - 0 - - - 0 - - 1 - m_move_up_button - 1 - - - protected - 1 - - - - Resizable - 1 - -1,-1 - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Move up - - wxFILTER_NONE - wxDefaultValidator - - - - - moveUpHandler - - - - 5 - wxTOP|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Move Down - - 0 - - 0 - - - 0 - - 1 - m_move_down_button - 1 - - - protected - 1 - - - - Resizable - 1 - -1,-1 - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Move down - - wxFILTER_NONE - wxDefaultValidator - - - - - moveDownHandler - - - - 5 - wxEXPAND - 0 - - 0 - protected - 20 - - - - 5 - wxTOP|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Remove Library - - 0 - - 0 - - - 0 - - 1 - m_delete_button - 1 - - - protected - 1 - - - - Resizable - 1 - -1,-1 - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Remove library from table - - wxFILTER_NONE - wxDefaultValidator - - - - - deleteRowHandler - - - - 5 - wxEXPAND - 1 - - 0 - protected - 20 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Migrate Libraries - - 0 - - 0 - - - 0 - - 1 - m_migrate_libs_button - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - onMigrateLibraries - - - - - - 8 - wxTOP|wxRIGHT|wxLEFT|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Available path substitutions: - 0 - - 0 - - - 0 - - 1 - stPathsLabel - 1 - - - none - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND - 0 - - 2 - protected - 0 - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - 1 - 0 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - 2 - 150,500 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - 0 - 1 - 0 - 1 - - 1 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - - 0 - - 1 - m_path_subs_grid - 1 - - - protected - 1 - - Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 1 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - This is a read-only table which shows pertinent environment variables. - - - - onSizeGrid + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + 0 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_CENTER + 0 + 1 + wxALIGN_CENTER + 22 + "Active" "Visible" "Nickname" "Library Path" "Library Format" "Options" "Description" + wxALIGN_CENTER + 7 + 48,48,100,240,100,80,240 + + 1 + 0 + Dock + 1 + Left + 0 + 0 + 1 + 0 + 0 + 1 + 1 + + 0 + + + 1 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + + 0 + + 0 + m_global_grid + 1 + + + protected + 1 + + Fixed + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 1 + 1 + + WX_GRID; widgets/wx_grid.h; forward_declare + 0 + + + + + + + + + Project Specific Libraries + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 0 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_project_panel + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + wxTAB_TRAVERSAL + + + m_project_sizer + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + 0 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_CENTER + 0 + 1 + wxALIGN_CENTER + 22 + "Active" "Visible" "Nickname" "Library Path" "Library Format" "Options" "Description" + wxALIGN_CENTER + 7 + 48,48,100,240,100,80,240 + + 1 + 0 + Dock + 1 + Left + 0 + 0 + 1 + 0 + 0 + 1 + 1 + + 0 + + + 1 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + + 0 + + 0 + m_project_grid + 1 + + + protected + 1 + + Fixed + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 1 + 1 + + WX_GRID; widgets/wx_grid.h; forward_declare + 0 + + + + + + + + + + + + 8 + wxEXPAND|wxALL + 0 + + + bButtonsSizer + wxHORIZONTAL + none + + 5 + wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Add Library + + 0 + + 0 + + + 0 + + 1 + m_append_button + 1 + + + protected + 1 + + + + Resizable + 1 + -1,-1 + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Add empty row to table + + wxFILTER_NONE + wxDefaultValidator + + + + + appendRowHandler + + + + 5 + wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + SPLIT_BUTTON + 1 + m_browseButton = new SPLIT_BUTTON( this, wxID_ANY, _( "Add Existing" ), wxDefaultPosition ); + + 1 + + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + #include <widgets/split_button.h> + + 0 + + + 0 + -1,-1 + 1 + m_browseButton + 1 + + + protected + 1 + + Resizable + + 1 + -1,-1 + ; ; forward_declare + 0 + Add Existing + + + + + + + 5 + wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Move Up + + 0 + + 0 + + + 0 + + 1 + m_move_up_button + 1 + + + protected + 1 + + + + Resizable + 1 + -1,-1 + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Move up + + wxFILTER_NONE + wxDefaultValidator + + + + + moveUpHandler + + + + 5 + wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Move Down + + 0 + + 0 + + + 0 + + 1 + m_move_down_button + 1 + + + protected + 1 + + + + Resizable + 1 + -1,-1 + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Move down + + wxFILTER_NONE + wxDefaultValidator + + + + + moveDownHandler + + + + 5 + wxEXPAND + 0 + + 0 + protected + 20 + + + + 5 + wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Remove Library + + 0 + + 0 + + + 0 + + 1 + m_delete_button + 1 + + + protected + 1 + + + + Resizable + 1 + -1,-1 + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Remove library from table + + wxFILTER_NONE + wxDefaultValidator + + + + + deleteRowHandler + + + + 5 + wxEXPAND + 1 + + 0 + protected + 20 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Migrate Libraries + + 0 + + 0 + + + 0 + + 1 + m_migrate_libs_button + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + onMigrateLibraries + + + + + + 8 + wxTOP|wxRIGHT|wxLEFT|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Available path substitutions: + 0 + + 0 + + + 0 + + 1 + stPathsLabel + 1 + + + none + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND + 0 + + 2 + protected + 0 + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 1 + 0 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_CENTER + 0 + 1 + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + 2 + 150,500 + + 1 + 0 + Dock + 0 + Left + 0 + 0 + 1 + 0 + 1 + 0 + 1 + + 1 + + + 1 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + + 0 + + 1 + m_path_subs_grid + 1 + + + protected + 1 + + Resizable + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 1 + 1 + + WX_GRID; widgets/wx_grid.h; forward_declare + 0 + This is a read-only table which shows pertinent environment variables. + + + + onSizeGrid + + + + diff --git a/common/dialogs/panel_toolbar_customization.cpp b/common/dialogs/panel_toolbar_customization.cpp index 7906b1bcda..f9697dfa51 100644 --- a/common/dialogs/panel_toolbar_customization.cpp +++ b/common/dialogs/panel_toolbar_customization.cpp @@ -46,7 +46,7 @@ static std::map s_toolbarNameMap = { { TOOLBAR_LOC::LEFT, _( "Left" ) }, { TOOLBAR_LOC::RIGHT, _( "Right" ) }, { TOOLBAR_LOC::TOP_MAIN, _( "Top main" ) }, - { TOOLBAR_LOC::TOP_AUX, _( "Top auxillary" ) } + { TOOLBAR_LOC::TOP_AUX, _( "Top auxiliary" ) } }; diff --git a/common/tool/actions.cpp b/common/tool/actions.cpp index e585dfdd8d..b10615bf51 100644 --- a/common/tool/actions.cpp +++ b/common/tool/actions.cpp @@ -591,7 +591,7 @@ TOOL_ACTION ACTIONS::pointEditorArcKeepRadius( TOOL_ACTION_ARGS() .Name( "pcbnew.PointEditor.arcKeepRadius" ) .Scope( AS_GLOBAL ) .FriendlyName( _( "Keep Arc Radius and Center, adjust angle" ) ) - .Tooltip( _( "Switch arc editing mode to maintainign radius when endpoint are moved" ) ) + .Tooltip( _( "Switch arc editing mode to maintaining radius when endpoint are moved" ) ) .Parameter( ARC_EDIT_MODE::KEEP_CENTER_ENDS_ADJUST_ANGLE ) ); TOOL_ACTION ACTIONS::cycleArcEditMode( TOOL_ACTION_ARGS() diff --git a/eeschema/dialogs/dialog_bom_help.md b/eeschema/dialogs/dialog_bom_help.md index d81bfae5ba..8d636a7639 100644 --- a/eeschema/dialogs/dialog_bom_help.md +++ b/eeschema/dialogs/dialog_bom_help.md @@ -14,7 +14,7 @@ Clicking the **Generate** button creates a BOM file with the selected generator. The default settings present several generator script options, although some additional scripts are installed with KiCad and can be added to the list with the **+** button. -**Note:** On Windows, there is an additional option **Show console window**. When this option is unchecked, BOM generators run in a hidden console window and any output is redirected and printed in the dialog. When this option is checked, BOM generators run in a visisble console window. +**Note:** On Windows, there is an additional option **Show console window**. When this option is unchecked, BOM generators run in a hidden console window and any output is redirected and printed in the dialog. When this option is checked, BOM generators run in a visible console window. # 3. Custom generators and command lines diff --git a/eeschema/dialogs/dialog_bom_help_md.h b/eeschema/dialogs/dialog_bom_help_md.h index 4e9015b34f..177c78239d 100644 --- a/eeschema/dialogs/dialog_bom_help_md.h +++ b/eeschema/dialogs/dialog_bom_help_md.h @@ -15,7 +15,7 @@ _HKI( "# 1. Summary\n" "\n" "The default settings present several generator script options, although some additional scripts are installed with KiCad and can be added to the list with the **+** button.\n" "\n" -"**Note:** On Windows, there is an additional option **Show console window**. When this option is unchecked, BOM generators run in a hidden console window and any output is redirected and printed in the dialog. When this option is checked, BOM generators run in a visisble console window.\n" +"**Note:** On Windows, there is an additional option **Show console window**. When this option is unchecked, BOM generators run in a hidden console window and any output is redirected and printed in the dialog. When this option is checked, BOM generators run in a visible console window.\n" "\n" "# 3. Custom generators and command lines\n" "\n" diff --git a/eeschema/dialogs/dialog_field_properties_base.cpp b/eeschema/dialogs/dialog_field_properties_base.cpp index ff02e25f02..e306451ae2 100644 --- a/eeschema/dialogs/dialog_field_properties_base.cpp +++ b/eeschema/dialogs/dialog_field_properties_base.cpp @@ -112,7 +112,7 @@ DIALOG_FIELD_PROPERTIES_BASE::DIALOG_FIELD_PROPERTIES_BASE( wxWindow* parent, wx m_nameVisible = new wxCheckBox( this, wxID_ANY, _("Show field name"), wxDefaultPosition, wxDefaultSize, 0 ); m_nameVisible->Hide(); - m_nameVisible->SetToolTip( _("Show the field name in addtion to its value") ); + m_nameVisible->SetToolTip( _("Show the field name in addition to its value") ); bSizer9->Add( m_nameVisible, 0, wxRIGHT|wxLEFT, 20 ); diff --git a/eeschema/dialogs/dialog_field_properties_base.fbp b/eeschema/dialogs/dialog_field_properties_base.fbp index 024909ac31..c31b633b6d 100644 --- a/eeschema/dialogs/dialog_field_properties_base.fbp +++ b/eeschema/dialogs/dialog_field_properties_base.fbp @@ -761,7 +761,7 @@ ; ; forward_declare 0 - Show the field name in addtion to its value + Show the field name in addition to its value wxFILTER_NONE wxDefaultValidator diff --git a/eeschema/tools/sch_actions.cpp b/eeschema/tools/sch_actions.cpp index bd6f8eaf8b..318be207be 100644 --- a/eeschema/tools/sch_actions.cpp +++ b/eeschema/tools/sch_actions.cpp @@ -163,7 +163,7 @@ TOOL_ACTION SCH_ACTIONS::editDesignBlockProperties( TOOL_ACTION_ARGS() .Name( "eeschema.SchDesignBlockControl.editDesignBlockProperties" ) .Scope( AS_GLOBAL ) .FriendlyName( _( "Properties..." ) ) - .Tooltip( _( "Edit properies of design block" ) ) + .Tooltip( _( "Edit properties of design block" ) ) .Icon( BITMAPS::edit ) ); // SYMBOL_EDITOR_CONTROL diff --git a/kicad/kicad_manager_frame.cpp b/kicad/kicad_manager_frame.cpp index c686052fda..87d61fc5bb 100644 --- a/kicad/kicad_manager_frame.cpp +++ b/kicad/kicad_manager_frame.cpp @@ -398,7 +398,7 @@ void KICAD_MANAGER_FRAME::CreatePCM() Pgm().GetNotificationsManager().CreateOrUpdate( wxS( "pcm" ), _( "PCM Updates Available" ), - wxString::Format( _( "%d package update(s) avaliable" ), aUpdateCount ), + wxString::Format( _( "%d package update(s) available" ), aUpdateCount ), wxT( "" ) ); } else diff --git a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.cpp b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.cpp index 4b9bd4dc11..12b731ac4c 100644 --- a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.cpp +++ b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -53,7 +53,7 @@ PANEL_ELECTRICAL_SPACING_IEC60664_BASE::PANEL_ELECTRICAL_SPACING_IEC60664_BASE( m_staticText52111 = new wxStaticText( sbSizerTop->GetStaticBox(), wxID_ANY, _("Overvoltage category:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText52111->Wrap( -1 ); - m_staticText52111->SetToolTip( _("OVC I: Equipment with no direct connection to mains supply\n\nOVC II: Energy-consuming equipment to be supplied from the fixed installation. (eg: appliances, portable tools, household loads). OVCIII applies if there are reliability and avaibility requirements\n\nOVC III : Equipment in fixed installations with reliability and avaibility requirements. (eg: electrical switches, equipment for industrial use)\n\nOVC IV: Equipment at the origin of the installation (eg: electricity meters, primary overcurrent protection devices)") ); + m_staticText52111->SetToolTip( _("OVC I: Equipment with no direct connection to mains supply\n\nOVC II: Energy-consuming equipment to be supplied from the fixed installation. (eg: appliances, portable tools, household loads). OVCIII applies if there are reliability and availability requirements\n\nOVC III : Equipment in fixed installations with reliability and availability requirements. (eg: electrical switches, equipment for industrial use)\n\nOVC IV: Equipment at the origin of the installation (eg: electricity meters, primary overcurrent protection devices)") ); fgSizer111->Add( m_staticText52111, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); diff --git a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.fbp b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.fbp index a985309007..f4c245b632 100644 --- a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.fbp +++ b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.fbp @@ -1,2916 +1,2961 @@ - + - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - panel_electrical_spacing_iec60664_base - 1000 - none - - - 1 - panel_electrical_spacing_iec60664_base - - . - - 1 - 1 - 1 - 1 - UI - 0 - 0 - 0 - - 0 - wxAUI_MGR_DEFAULT + + + C++ + + 1 + connect + none + + + 0 + 0 + res + UTF-8 + panel_electrical_spacing_iec60664_base + 1000 + 1 + 1 + UI + panel_electrical_spacing_iec60664_base + . + 0 + source_name + 1 + 0 + source_name + + + 1 + 1 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 0 + 1 + impl_virtual + + + 0 + wxID_ANY + + + PANEL_ELECTRICAL_SPACING_IEC60664_BASE + + -1,-1 + CALCULATOR_PANEL; calculator_panels/calculator_panel.h; + + 0 + + + wxTAB_TRAVERSAL + + + bSizerWindow + wxVERTICAL + none + + 5 + wxEXPAND | wxALL + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left + 0 1 - impl_virtual + 1 + 0 0 wxID_ANY + + 0 + + 0 - PANEL_ELECTRICAL_SPACING_IEC60664_BASE + 1 + m_scrolledWindow + 1 + + + protected + 1 - -1,-1 - CALCULATOR_PANEL; calculator_panels/calculator_panel.h; + Resizable + 5 + 5 + 1 + + ; ; forward_declare + 0 - 0 - wxTAB_TRAVERSAL - - - bSizerWindow - wxVERTICAL - none - - 5 - wxEXPAND | wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_scrolledWindow - 1 - - - protected - 1 - - Resizable - 5 - 5 - 1 - - ; ; forward_declare - 0 - - - - wxVSCROLL - - - bSizerMain - wxVERTICAL - none - - 5 - wxALIGN_CENTER|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,700,-1,70,0 - 0 - 0 - wxID_ANY - Insulation for equipment within low-voltage supply systems - 0 - - 0 - - - 0 - - 1 - m_stTitle - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxTOP|wxBOTTOM - 0 - - wxID_ANY - Determine the transient impulse voltage to withstand - - sbSizerTop - wxHORIZONTAL - 1 - none - - 5 - wxEXPAND - 1 - - - bSizerTopLeft - wxHORIZONTAL - none - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - 3 - wxBOTH - - - 0 - - fgSizer111 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Rated Voltage (RMS or DC): - 0 - - 0 - - - 0 - - 1 - m_staticText5211 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Voltage of the mains supply - - - - -1 - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_ratedVoltage - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - UpdateTransientImpulse - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - V - 0 - - 0 - - - 0 - - 1 - m_staticText52112 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Overvoltage category: - 0 - - 0 - - - 0 - - 1 - m_staticText52111 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - OVC I: Equipment with no direct connection to mains supply OVC II: Energy-consuming equipment to be supplied from the fixed installation. (eg: appliances, portable tools, household loads). OVCIII applies if there are reliability and avaibility requirements OVC III : Equipment in fixed installations with reliability and avaibility requirements. (eg: electrical switches, equipment for industrial use) OVC IV: Equipment at the origin of the installation (eg: electricity meters, primary overcurrent protection devices) - - - - -1 - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "OVC I" "OVC II" "OVC III" "OVC IV" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_OVCchoice - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - UpdateTransientImpulse - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - - - 5 - wxEXPAND - 1 - - - bSizerTopRight - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT - 0 - - 3 - wxBOTH - - - 0 - - fgSizerTopRight - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Impulse voltage: - 0 - - 0 - - - 0 - - 1 - m_staticText111111 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Given the rated voltage and the overvoltage category, a device should withstand this value without a breakdown of insulation. This impulse voltage is a standard 1.2/50µs wave - - - - -1 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - 100,-1 - 1 - m_impulseVotlage1TxtCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - kV - 0 - - 0 - - - 0 - - 1 - static_textkV - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - - - - - - - 5 - wxEXPAND|wxTOP|wxBOTTOM - 0 - - wxID_ANY - Compute the clearance and creepage distances - - sbSizerMiddle - wxHORIZONTAL - 1 - none - - 5 - wxEXPAND - 1 - - - bSizerMiddleLeft - wxHORIZONTAL - none - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - 3 - wxBOTH - - - 0 - - fgSizer11 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - RMS Voltage: - 0 - - 0 - - - 0 - - 1 - m_staticText11 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Expected RMS voltage. - - - - -1 - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - 100,-1 - 1 - m_RMSVoltage - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - UpdateClearanceCreepage - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - V - 0 - - 0 - - - 0 - - 1 - m_staticText11212 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Transient overvoltage: - 0 - - 0 - - - 0 - - 1 - m_staticText114 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Transient overvoltages due to: - Atmospheric disturbances transmitted by the mains supply (eg: a lightning strike) - Switching loads in the main supplys - External circuits - Internal generation Events that last for a few milliseconds or less. - - - - -1 - - - - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - 100,-1 - 1 - m_transientOvervoltage - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - UpdateClearanceCreepage - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - kV - 0 - - 0 - - - 0 - - 1 - m_staticText1121 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Recurring peak voltage: - 0 - - 0 - - - 0 - - 1 - m_staticText113 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - Steady-state voltage value - Temporary overvoltage - Recurring peak voltage Events of relatively long duration. - - - - -1 - - - - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - 100,-1 - 1 - m_peakVoltage - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - UpdateClearanceCreepage - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - kV - 0 - - 0 - - - 0 - - 1 - m_staticText11211 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Type of insulation: - 0 - - 0 - - - 0 - - 1 - m_staticText112 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Functional: insulation is necessary only for the functioning of the equipment Basic: Insulation of hazardous-live parts. Reinforced: Single insulation that provides a degree of protection equivalent to a double insulation. ( which is two separate basic insulations, in case one of them fails ). - - - - -1 - - - - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Functional" "Basic" "Reinforced" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_insulationType - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - UpdateClearanceCreepage - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Pollution Degree: - 0 - - 0 - - - 0 - - 1 - m_staticText52 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - PD1: No pollution or only dry, non-conductive pollution occurs PD2: Only non-conductive pollution occurs . Condensation may occur. PD3: Conductive pollution occurs, or non-conductive pollution occurs which becomes conductive due to expected condensation. PD4: Continous conductivity occurs due to conductive dust, rain, ... - - - - -1 - - - - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "PD1" "PD2" "PD3" "PD4" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_pollutionDegree - 1 - - - protected - 1 - - Resizable - 1 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - UpdateClearanceCreepage - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Material group: - 0 - - 0 - - - 0 - - 1 - m_materialGroupTxt - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Materials with a high comparative tracking index (CTI) are better at providing isolation. Material group I: 600 <= CTI Material group II: 400 <= CTI < 600 Material group IIIa: 175 <= CTI < 400 Material group IIIb: 100 <= CTI < 175 - - - - -1 - - - - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "I" "II" "IIIa" "IIIb" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_materialGroup - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - UpdateClearanceCreepage - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - PCB material: - 0 - - 0 - - - 0 - - 1 - m_staticText1112 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Printed wiring material can benefit of a creepage distance reduction for RMS voltages lower than 1000V - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_pcbMaterial - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - UpdateClearanceCreepage - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Max altitude: - 0 - - 0 - - - 0 - - 1 - m_staticText1112121 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Coating and potting allows for clearance and creepage distances reduction. Not supported by the calculator. A coating that could easily delaminate in the lifespan of the product (such as a soldermask) should not be considered for a reduction. - - - - -1 - - - - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - 100,-1 - 1 - m_altitude - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - UpdateClearanceCreepage - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - m - 0 - - 0 - - - 0 - - 1 - m_staticText11121211 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - - - - - 5 - wxEXPAND - 1 - - - bSizerMiddleRight - wxVERTICAL - none - - 5 - wxEXPAND - 0 - - - bSizerMiddleRightInfo - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT - 0 - - 3 - wxBOTH - 1 - - 0 - - fgSizer6 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Clearance: - 0 - - 0 - - - 0 - - 1 - m_staticText11111 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - 100,-1 - 1 - m_clearance - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - mm - 0 - - 0 - - - 0 - - 1 - m_staticText71111 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Creepage: - 0 - - 0 - - - 0 - - 1 - m_staticText1111 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxBOTTOM|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - 100,-1 - 1 - m_creepage - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - mm - 0 - - 0 - - - 0 - - 1 - m_staticText7111 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Min groove width: - 0 - - 0 - - - 0 - - 1 - m_staticText111 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - A groove which width is smaller has no effect on the path considered for creepage - - - - -1 - - - - 5 - wxBOTTOM|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - 100,-1 - 1 - m_minGrooveWidth - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - mm - 0 - - 0 - - - 0 - - 1 - m_staticText711 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - - - - - 5 - wxEXPAND - 0 - - - bSizerBitmapHelp - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - - bSizerBitmap - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_creepageclearanceBitmap - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - - - - - 10 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - solid: clearance dashed: creepage - 0 - - 0 - - - 0 - - 1 - m_stBitmapLegend - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - - - - - - - - - 5 - wxEXPAND|wxBOTTOM - 1 - - wxID_ANY - Help - -1,-1 - sbSizerBottom - wxVERTICAL - 1 - none - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - -1,100 - 0 - -1,-1 - 1 - m_panelHelp - 1 - - - protected - 1 - - Resizable - 1 - - wxHW_SCROLLBAR_AUTO - HTML_WINDOW; widgets/html_window.h; forward_declare - 0 - - - - - - - - - - + wxVSCROLL + + + bSizerMain + wxVERTICAL + none + + 5 + wxALIGN_CENTER|wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + ,90,700,-1,70,0 + 0 + 0 + wxID_ANY + Insulation for equipment within low-voltage supply systems + 0 + + 0 + + + 0 + + 1 + m_stTitle + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + 5 + wxEXPAND|wxTOP|wxBOTTOM + 0 + + wxID_ANY + Determine the transient impulse voltage to withstand + + sbSizerTop + wxHORIZONTAL + 1 + none + + 5 + wxEXPAND + 1 + + + bSizerTopLeft + wxHORIZONTAL + none + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + 3 + wxBOTH + + + 0 + + fgSizer111 + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 0 + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Rated Voltage (RMS or DC): + 0 + + 0 + + + 0 + + 1 + m_staticText5211 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Voltage of the mains supply + + + + -1 + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_ratedVoltage + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + UpdateTransientImpulse + + + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + V + 0 + + 0 + + + 0 + + 1 + m_staticText52112 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Overvoltage category: + 0 + + 0 + + + 0 + + 1 + m_staticText52111 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + OVC I: Equipment with no direct connection to mains supply OVC II: Energy-consuming equipment to be supplied from the fixed installation. (eg: appliances, portable tools, household loads). OVCIII applies if there are reliability and availability requirements OVC III : Equipment in fixed installations with reliability and availability requirements. (eg: electrical switches, equipment for industrial use) OVC IV: Equipment at the origin of the installation (eg: electricity meters, primary overcurrent protection devices) + + + + -1 + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "OVC I" "OVC II" "OVC III" "OVC IV" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_OVCchoice + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + UpdateTransientImpulse + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + + + 5 + wxEXPAND + 1 + + + bSizerTopRight + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT + 0 + + 3 + wxBOTH + + + 0 + + fgSizerTopRight + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 0 + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Impulse voltage: + 0 + + 0 + + + 0 + + 1 + m_staticText111111 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Given the rated voltage and the overvoltage category, a device should withstand this value without a breakdown of insulation. This impulse voltage is a standard 1.2/50µs wave + + + + -1 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 0 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 100,-1 + 1 + m_impulseVotlage1TxtCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + kV + 0 + + 0 + + + 0 + + 1 + static_textkV + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + + + + + + + 5 + wxEXPAND|wxTOP|wxBOTTOM + 0 + + wxID_ANY + Compute the clearance and creepage distances + + sbSizerMiddle + wxHORIZONTAL + 1 + none + + 5 + wxEXPAND + 1 + + + bSizerMiddleLeft + wxHORIZONTAL + none + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + 3 + wxBOTH + + + 0 + + fgSizer11 + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 0 + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + RMS Voltage: + 0 + + 0 + + + 0 + + 1 + m_staticText11 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Expected RMS voltage. + + + + -1 + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 100,-1 + 1 + m_RMSVoltage + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + UpdateClearanceCreepage + + + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + V + 0 + + 0 + + + 0 + + 1 + m_staticText11212 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Transient overvoltage: + 0 + + 0 + + + 0 + + 1 + m_staticText114 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Transient overvoltages due to: - Atmospheric disturbances transmitted by the mains supply (eg: a lightning strike) - Switching loads in the main supplys - External circuits - Internal generation Events that last for a few milliseconds or less. + + + + -1 + + + + 5 + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 100,-1 + 1 + m_transientOvervoltage + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + UpdateClearanceCreepage + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + kV + 0 + + 0 + + + 0 + + 1 + m_staticText1121 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Recurring peak voltage: + 0 + + 0 + + + 0 + + 1 + m_staticText113 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + - Steady-state voltage value - Temporary overvoltage - Recurring peak voltage Events of relatively long duration. + + + + -1 + + + + 5 + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 100,-1 + 1 + m_peakVoltage + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + UpdateClearanceCreepage + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + kV + 0 + + 0 + + + 0 + + 1 + m_staticText11211 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Type of insulation: + 0 + + 0 + + + 0 + + 1 + m_staticText112 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Functional: insulation is necessary only for the functioning of the equipment Basic: Insulation of hazardous-live parts. Reinforced: Single insulation that provides a degree of protection equivalent to a double insulation. ( which is two separate basic insulations, in case one of them fails ). + + + + -1 + + + + 5 + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "Functional" "Basic" "Reinforced" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_insulationType + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + UpdateClearanceCreepage + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Pollution Degree: + 0 + + 0 + + + 0 + + 1 + m_staticText52 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + PD1: No pollution or only dry, non-conductive pollution occurs PD2: Only non-conductive pollution occurs . Condensation may occur. PD3: Conductive pollution occurs, or non-conductive pollution occurs which becomes conductive due to expected condensation. PD4: Continous conductivity occurs due to conductive dust, rain, ... + + + + -1 + + + + 5 + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "PD1" "PD2" "PD3" "PD4" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_pollutionDegree + 1 + + + protected + 1 + + Resizable + 1 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + UpdateClearanceCreepage + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Material group: + 0 + + 0 + + + 0 + + 1 + m_materialGroupTxt + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Materials with a high comparative tracking index (CTI) are better at providing isolation. Material group I: 600 <= CTI Material group II: 400 <= CTI < 600 Material group IIIa: 175 <= CTI < 400 Material group IIIb: 100 <= CTI < 175 + + + + -1 + + + + 5 + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "I" "II" "IIIa" "IIIb" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_materialGroup + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + UpdateClearanceCreepage + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + PCB material: + 0 + + 0 + + + 0 + + 1 + m_staticText1112 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Printed wiring material can benefit of a creepage distance reduction for RMS voltages lower than 1000V + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + m_pcbMaterial + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + UpdateClearanceCreepage + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Max altitude: + 0 + + 0 + + + 0 + + 1 + m_staticText1112121 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Coating and potting allows for clearance and creepage distances reduction. Not supported by the calculator. A coating that could easily delaminate in the lifespan of the product (such as a soldermask) should not be considered for a reduction. + + + + -1 + + + + 5 + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 100,-1 + 1 + m_altitude + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + UpdateClearanceCreepage + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + m + 0 + + 0 + + + 0 + + 1 + m_staticText11121211 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + + + + + 5 + wxEXPAND + 1 + + + bSizerMiddleRight + wxVERTICAL + none + + 5 + wxEXPAND + 0 + + + bSizerMiddleRightInfo + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT + 0 + + 3 + wxBOTH + 1 + + 0 + + fgSizer6 + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 0 + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Clearance: + 0 + + 0 + + + 0 + + 1 + m_staticText11111 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 0 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 100,-1 + 1 + m_clearance + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + mm + 0 + + 0 + + + 0 + + 1 + m_staticText71111 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Creepage: + 0 + + 0 + + + 0 + + 1 + m_staticText1111 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 0 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 100,-1 + 1 + m_creepage + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + mm + 0 + + 0 + + + 0 + + 1 + m_staticText7111 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Min groove width: + 0 + + 0 + + + 0 + + 1 + m_staticText111 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + A groove which width is smaller has no effect on the path considered for creepage + + + + -1 + + + + 5 + wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 0 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 100,-1 + 1 + m_minGrooveWidth + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + mm + 0 + + 0 + + + 0 + + 1 + m_staticText711 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + + + + + 5 + wxEXPAND + 0 + + + bSizerBitmapHelp + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + + bSizerBitmap + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_creepageclearanceBitmap + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + + + + + 10 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + solid: clearance dashed: creepage + 0 + + 0 + + + 0 + + 1 + m_stBitmapLegend + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + + + + + + + + + 5 + wxEXPAND|wxBOTTOM + 1 + + wxID_ANY + Help + -1,-1 + sbSizerBottom + wxVERTICAL + 1 + none + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + -1,100 + 0 + -1,-1 + 1 + m_panelHelp + 1 + + + protected + 1 + + Resizable + 1 + + wxHW_SCROLLBAR_AUTO + HTML_WINDOW; widgets/html_window.h; forward_declare + 0 + + + + + + + + + + + diff --git a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.h b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.h index 0d01318540..a9d390136b 100644 --- a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.h +++ b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -34,7 +34,6 @@ class HTML_WINDOW; /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////////// /// Class PANEL_ELECTRICAL_SPACING_IEC60664_BASE /////////////////////////////////////////////////////////////////////////////// diff --git a/pcb_calculator/calculator_panels/panel_regulator.cpp b/pcb_calculator/calculator_panels/panel_regulator.cpp index b6b7556ea9..d3d555cb44 100644 --- a/pcb_calculator/calculator_panels/panel_regulator.cpp +++ b/pcb_calculator/calculator_panels/panel_regulator.cpp @@ -398,7 +398,7 @@ void PANEL_REGULATOR::RegulatorsSolve() // Some tests: if( ( vouttyp < vrefmin || vouttyp < vreftyp || vouttyp < vrefmax ) && id != 2 ) { - m_RegulMessage->SetLabel( _( "Vout must be greater than vref" ) ); + m_RegulMessage->SetLabel( _( "Vout must be greater than Vref" ) ); return; } diff --git a/pcb_calculator/iec60664_help.h b/pcb_calculator/iec60664_help.h index 74f8b643ca..6c3fa68d38 100644 --- a/pcb_calculator/iec60664_help.h +++ b/pcb_calculator/iec60664_help.h @@ -3,6 +3,6 @@ _HKI( "The goal of the IEC60664-1 is to provide guidance on designing insulation "\n" "However some cases are not covered by this calculator:\n" "\n" -"- For frequencies higher than 30kHz, the dielectric perfomances are degraded. IEC60664-4 covers those cases\n" +"- For frequencies higher than 30kHz, the dielectric performances are degraded. IEC60664-4 covers those cases\n" "- When using a conformal coating or a potting in order to protect for pollution, if all conditions specified by IEC60664-3 are met, the clearance and creepage distances can be reduced. Soldermask is usually not considered as a conformal coating.\n" "- Insulations trough liquids, compressed air or gases other than air are not in the scope of IEC60664" ); diff --git a/pcb_calculator/iec60664_help.md b/pcb_calculator/iec60664_help.md index 07e983be56..f951c86fc1 100644 --- a/pcb_calculator/iec60664_help.md +++ b/pcb_calculator/iec60664_help.md @@ -2,6 +2,6 @@ The goal of the IEC60664-1 is to provide guidance on designing insulation for pr However some cases are not covered by this calculator: -- For frequencies higher than 30kHz, the dielectric perfomances are degraded. IEC60664-4 covers those cases +- For frequencies higher than 30kHz, the dielectric performances are degraded. IEC60664-4 covers those cases - When using a conformal coating or a potting in order to protect for pollution, if all conditions specified by IEC60664-3 are met, the clearance and creepage distances can be reduced. Soldermask is usually not considered as a conformal coating. - Insulations trough liquids, compressed air or gases other than air are not in the scope of IEC60664 \ No newline at end of file diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.cpp b/pcbnew/dialogs/panel_fp_lib_table_base.cpp index ce89a15a6a..b54cd97202 100644 --- a/pcbnew/dialogs/panel_fp_lib_table_base.cpp +++ b/pcbnew/dialogs/panel_fp_lib_table_base.cpp @@ -94,7 +94,7 @@ PANEL_FP_LIB_TABLE_BASE::PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID i m_project_grid->SetColLabelValue( 1, _("Visible") ); m_project_grid->SetColLabelValue( 2, _("Nickname") ); m_project_grid->SetColLabelValue( 3, _("Library Path") ); - m_project_grid->SetColLabelValue( 4, _("LIbrary Format") ); + m_project_grid->SetColLabelValue( 4, _("Library Format") ); m_project_grid->SetColLabelValue( 5, _("Options") ); m_project_grid->SetColLabelValue( 6, _("Description") ); m_project_grid->SetColLabelSize( 22 ); diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.fbp b/pcbnew/dialogs/panel_fp_lib_table_base.fbp index c635e78b09..c1206561c4 100644 --- a/pcbnew/dialogs/panel_fp_lib_table_base.fbp +++ b/pcbnew/dialogs/panel_fp_lib_table_base.fbp @@ -362,7 +362,7 @@ 1 wxALIGN_CENTER 22 - "Active" "Visible" "Nickname" "Library Path" "LIbrary Format" "Options" "Description" + "Active" "Visible" "Nickname" "Library Path" "Library Format" "Options" "Description" wxALIGN_CENTER 7 48,48,100,240,100,80,240 diff --git a/pcbnew/drc/drc_engine.cpp b/pcbnew/drc/drc_engine.cpp index 9c36b6dd99..555eaa755d 100644 --- a/pcbnew/drc/drc_engine.cpp +++ b/pcbnew/drc/drc_engine.cpp @@ -1258,7 +1258,7 @@ DRC_CONSTRAINT DRC_ENGINE::EvalRules( DRC_CONSTRAINT_T aConstraintType, const BO break; case SOLDER_PASTE_ABS_MARGIN_CONSTRAINT: - REPORT( wxString::Format( _( "Checking %s solder paste absolute cleraance: %s." ), + REPORT( wxString::Format( _( "Checking %s solder paste absolute clearance: %s." ), EscapeHTML( c->constraint.GetName() ), MessageTextFromValue( c->constraint.m_Value.Opt() ) ) ) break; diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp index a4f1596517..8f8c3f2c7b 100644 --- a/pcbnew/tools/pcb_actions.cpp +++ b/pcbnew/tools/pcb_actions.cpp @@ -547,7 +547,7 @@ TOOL_ACTION PCB_ACTIONS::editDesignBlockProperties( TOOL_ACTION_ARGS() .Name( "pcbnew.PcbDesignBlockControl.editDesignBlockProperties" ) .Scope( AS_GLOBAL ) .FriendlyName( _( "Properties..." ) ) - .Tooltip( _( "Edit properies of design block" ) ) + .Tooltip( _( "Edit properties of design block" ) ) .Icon( BITMAPS::edit ) ); // EDIT_TOOL