From c4b72c386a273157e237a7c64847ee1ca2ec435c Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sat, 13 Dec 2025 12:48:11 +0000 Subject: [PATCH] Formatting. --- common/eda_draw_frame.cpp | 17 +-- common/eda_text.cpp | 27 +++- common/gbr_metadata.cpp | 6 +- common/jobs/job_export_pcb_3d.cpp | 54 ++++---- common/kidialog.cpp | 6 +- common/libeval/numeric_evaluator.cpp | 2 +- common/tool/point_editor_behavior.cpp | 1 + common/widgets/wx_infobar.cpp | 14 +- .../dialogs/dialog_tablecell_properties.cpp | 16 +-- .../panel_eeschema_editing_options.cpp | 38 +++--- eeschema/pin_layout_cache.cpp | 47 +++---- eeschema/sch_edit_frame.cpp | 9 +- eeschema/sch_field.cpp | 70 ++++++---- .../easyedapro/sch_easyedapro_parser.cpp | 7 +- .../kicad_legacy/sch_io_kicad_legacy.cpp | 3 +- eeschema/sch_painter.cpp | 4 +- eeschema/sch_text.cpp | 12 +- eeschema/sch_textbox.cpp | 24 ++-- eeschema/sim/sim_model_behavioral.cpp | 11 +- eeschema/sim/sim_model_ibis.cpp | 18 ++- eeschema/sim/sim_model_source.cpp | 17 ++- eeschema/symbol_viewer_frame.cpp | 8 +- .../sheet_synchronization_agent.cpp | 9 +- eeschema/tools/sch_tool_utils.cpp | 7 +- .../tools/symbol_editor_drawing_tools.cpp | 4 +- .../dialogs/dialog_draw_layers_settings.cpp | 2 + gerbview/excellon_read_drill_file.cpp | 128 +++++++++--------- gerbview/export_to_pcbnew.cpp | 7 +- gerbview/gerber_draw_item.cpp | 9 +- gerbview/gerbview_frame.cpp | 2 - kicad/pcm/dialogs/panel_packages_view.cpp | 7 +- pagelayout_editor/files.cpp | 10 +- pagelayout_editor/pl_editor_frame.cpp | 8 +- pagelayout_editor/tools/pl_point_editor.cpp | 2 + pcbnew/connectivity/connectivity_algo.cpp | 3 +- pcbnew/connectivity/connectivity_items.cpp | 1 + pcbnew/dialogs/dialog_copper_zones.cpp | 1 + pcbnew/dialogs/dialog_export_step.cpp | 16 +-- pcbnew/dialogs/dialog_print_pcbnew.cpp | 5 + pcbnew/dialogs/panel_display_options.cpp | 8 +- pcbnew/drc/drc_creepage_utils.cpp | 27 ++-- .../drc/drc_test_provider_annular_width.cpp | 40 +++--- pcbnew/exporters/step/exporter_step.cpp | 60 ++++---- pcbnew/exporters/step/step_pcb_model.cpp | 2 + pcbnew/fix_board_shape.cpp | 8 +- pcbnew/footprint_edit_frame.cpp | 49 +++---- .../length_delay_calculation.cpp | 8 +- .../netlist_reader/kicad_netlist_reader.cpp | 6 +- pcbnew/padstack.cpp | 6 +- pcbnew/pcb_io/altium/altium_parser_pcb.cpp | 6 + .../cadstar/cadstar_pcb_archive_parser.cpp | 1 - pcbnew/pcb_io/fabmaster/import_fabmaster.cpp | 28 ++-- .../kicad_legacy/pcb_io_kicad_legacy.cpp | 11 +- pcbnew/pcb_plot_params.cpp | 2 +- pcbnew/pcb_track.cpp | 30 ++-- pcbnew/pcbnew_jobs_handler.cpp | 24 ++-- pcbnew/router/pns_meander.cpp | 11 +- pcbnew/teardrop/teardrop_parameters.cpp | 2 +- pcbnew/undo_redo.cpp | 8 +- pcbnew/widgets/search_handlers.cpp | 27 ++-- plugins/3d/vrml/v1/vrml1_base.cpp | 10 -- qa/tests/eeschema/test_ee_item.cpp | 5 + scripting/python_scripting.cpp | 7 +- 63 files changed, 526 insertions(+), 492 deletions(-) diff --git a/common/eda_draw_frame.cpp b/common/eda_draw_frame.cpp index 44ead2f5ce..f2f3037826 100644 --- a/common/eda_draw_frame.cpp +++ b/common/eda_draw_frame.cpp @@ -1388,8 +1388,8 @@ bool EDA_DRAW_FRAME::SaveCanvasImageToFile( const wxString& aFileName, wxBitmapType type = wxBITMAP_TYPE_PNG; switch( aBitmapType ) { - case BITMAP_TYPE::PNG: type = wxBITMAP_TYPE_PNG; break; - case BITMAP_TYPE::BMP: type = wxBITMAP_TYPE_BMP; break; + case BITMAP_TYPE::PNG: type = wxBITMAP_TYPE_PNG; break; + case BITMAP_TYPE::BMP: type = wxBITMAP_TYPE_BMP; break; case BITMAP_TYPE::JPG: type = wxBITMAP_TYPE_JPEG; break; } @@ -1401,8 +1401,7 @@ bool EDA_DRAW_FRAME::SaveCanvasImageToFile( const wxString& aFileName, } -bool EDA_DRAW_FRAME::IsPluginActionButtonVisible( const PLUGIN_ACTION& aAction, - APP_SETTINGS_BASE* aCfg ) +bool EDA_DRAW_FRAME::IsPluginActionButtonVisible( const PLUGIN_ACTION& aAction, APP_SETTINGS_BASE* aCfg ) { wxCHECK( aCfg, aAction.show_button ); @@ -1416,8 +1415,8 @@ bool EDA_DRAW_FRAME::IsPluginActionButtonVisible( const PLUGIN_ACTION& aAction, } -std::vector EDA_DRAW_FRAME::GetOrderedPluginActions( - PLUGIN_ACTION_SCOPE aScope, APP_SETTINGS_BASE* aCfg ) +std::vector EDA_DRAW_FRAME::GetOrderedPluginActions( PLUGIN_ACTION_SCOPE aScope, + APP_SETTINGS_BASE* aCfg ) { std::vector actions; wxCHECK( aCfg, actions ); @@ -1461,8 +1460,7 @@ void EDA_DRAW_FRAME::AddApiPluginTools( ACTION_TOOLBAR* aToolbar ) mgr.ButtonBindings().clear(); - std::vector actions = - GetOrderedPluginActions( PluginActionScope(), config() ); + std::vector actions = GetOrderedPluginActions( PluginActionScope(), config() ); for( const PLUGIN_ACTION* action : actions ) { @@ -1473,8 +1471,7 @@ void EDA_DRAW_FRAME::AddApiPluginTools( ACTION_TOOLBAR* aToolbar ) ? action->icon_dark : action->icon_light; - wxAuiToolBarItem* button = aToolbar->AddTool( wxID_ANY, wxEmptyString, icon, - action->name ); + wxAuiToolBarItem* button = aToolbar->AddTool( wxID_ANY, wxEmptyString, icon, action->name ); Connect( button->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( EDA_DRAW_FRAME::OnApiPluginInvoke ) ); diff --git a/common/eda_text.cpp b/common/eda_text.cpp index 6d51681703..274bd2e9fc 100644 --- a/common/eda_text.cpp +++ b/common/eda_text.cpp @@ -842,16 +842,22 @@ BOX2I EDA_TEXT::GetTextBox( const RENDER_SETTINGS* aSettings, int aLine ) const switch( GetVertJustify() ) { - case GR_TEXT_V_ALIGN_TOP: bbox.Offset( 0, -fudgeFactor ); break; + case GR_TEXT_V_ALIGN_TOP: + bbox.Offset( 0, -fudgeFactor ); + break; - case GR_TEXT_V_ALIGN_CENTER: bbox.SetY( bbox.GetY() - bbox.GetHeight() / 2 ); break; + case GR_TEXT_V_ALIGN_CENTER: + bbox.SetY( bbox.GetY() - bbox.GetHeight() / 2 ); + break; case GR_TEXT_V_ALIGN_BOTTOM: bbox.SetY( bbox.GetY() - bbox.GetHeight() ); bbox.Offset( 0, fudgeFactor ); break; - case GR_TEXT_V_ALIGN_INDETERMINATE: wxFAIL_MSG( wxT( "Indeterminate state legal only in dialogs." ) ); break; + case GR_TEXT_V_ALIGN_INDETERMINATE: + wxFAIL_MSG( wxT( "Indeterminate state legal only in dialogs." ) ); + break; } bbox.Normalize(); // Make h and v sizes always >= 0 @@ -920,13 +926,20 @@ void EDA_TEXT::GetLinePositions( const RENDER_SETTINGS* aSettings, std::vectorEndsWith( wxS( "\n" ) ) ) diff --git a/eeschema/dialogs/dialog_tablecell_properties.cpp b/eeschema/dialogs/dialog_tablecell_properties.cpp index 36ff30f45c..46c8702a63 100644 --- a/eeschema/dialogs/dialog_tablecell_properties.cpp +++ b/eeschema/dialogs/dialog_tablecell_properties.cpp @@ -272,18 +272,18 @@ bool DIALOG_TABLECELL_PROPERTIES::TransferDataToWindow() switch( hAlign ) { - case GR_TEXT_H_ALIGN_LEFT: m_hAlignLeft->Check(); break; - case GR_TEXT_H_ALIGN_CENTER: m_hAlignCenter->Check(); break; - case GR_TEXT_H_ALIGN_RIGHT: m_hAlignRight->Check(); break; - case GR_TEXT_H_ALIGN_INDETERMINATE: break; + case GR_TEXT_H_ALIGN_LEFT: m_hAlignLeft->Check(); break; + case GR_TEXT_H_ALIGN_CENTER: m_hAlignCenter->Check(); break; + case GR_TEXT_H_ALIGN_RIGHT: m_hAlignRight->Check(); break; + case GR_TEXT_H_ALIGN_INDETERMINATE: break; } switch( vAlign ) { - case GR_TEXT_V_ALIGN_TOP: m_vAlignTop->Check(); break; - case GR_TEXT_V_ALIGN_CENTER: m_vAlignCenter->Check(); break; - case GR_TEXT_V_ALIGN_BOTTOM: m_vAlignBottom->Check(); break; - case GR_TEXT_V_ALIGN_INDETERMINATE: break; + case GR_TEXT_V_ALIGN_TOP: m_vAlignTop->Check(); break; + case GR_TEXT_V_ALIGN_CENTER: m_vAlignCenter->Check(); break; + case GR_TEXT_V_ALIGN_BOTTOM: m_vAlignBottom->Check(); break; + case GR_TEXT_V_ALIGN_INDETERMINATE: break; } } diff --git a/eeschema/dialogs/panel_eeschema_editing_options.cpp b/eeschema/dialogs/panel_eeschema_editing_options.cpp index 2a898bdb81..b9c8c7d08b 100644 --- a/eeschema/dialogs/panel_eeschema_editing_options.cpp +++ b/eeschema/dialogs/panel_eeschema_editing_options.cpp @@ -35,16 +35,16 @@ static int arcEditModeToComboIndex( ARC_EDIT_MODE aMode ) { switch( aMode ) { - case ARC_EDIT_MODE::KEEP_CENTER_ADJUST_ANGLE_RADIUS: - return 0; - case ARC_EDIT_MODE::KEEP_ENDPOINTS_OR_START_DIRECTION: - return 1; - case ARC_EDIT_MODE::KEEP_CENTER_ENDS_ADJUST_ANGLE: - return 2; - // No default + case ARC_EDIT_MODE::KEEP_CENTER_ADJUST_ANGLE_RADIUS: + return 0; + case ARC_EDIT_MODE::KEEP_ENDPOINTS_OR_START_DIRECTION: + return 1; + case ARC_EDIT_MODE::KEEP_CENTER_ENDS_ADJUST_ANGLE: + return 2; + default: + wxFAIL_MSG( "Invalid ARC_EDIT_MODE" ); + return 0; } - wxFAIL_MSG( "Invalid ARC_EDIT_MODE" ); - return 0; }; @@ -52,18 +52,16 @@ static ARC_EDIT_MODE arcEditModeToEnum( int aIndex ) { switch( aIndex ) { - case 0: - return ARC_EDIT_MODE::KEEP_CENTER_ADJUST_ANGLE_RADIUS; - case 1: - return ARC_EDIT_MODE::KEEP_ENDPOINTS_OR_START_DIRECTION; - case 2: - return ARC_EDIT_MODE::KEEP_CENTER_ENDS_ADJUST_ANGLE; - default: - wxFAIL_MSG( wxString::Format( "Invalid index for ARC_EDIT_MODE: %d", aIndex ) ); - break; + case 0: + return ARC_EDIT_MODE::KEEP_CENTER_ADJUST_ANGLE_RADIUS; + case 1: + return ARC_EDIT_MODE::KEEP_ENDPOINTS_OR_START_DIRECTION; + case 2: + return ARC_EDIT_MODE::KEEP_CENTER_ENDS_ADJUST_ANGLE; + default: + wxFAIL_MSG( wxString::Format( "Invalid index for ARC_EDIT_MODE: %d", aIndex ) ); + return ARC_EDIT_MODE::KEEP_CENTER_ADJUST_ANGLE_RADIUS; } - - return ARC_EDIT_MODE::KEEP_CENTER_ADJUST_ANGLE_RADIUS; }; diff --git a/eeschema/pin_layout_cache.cpp b/eeschema/pin_layout_cache.cpp index e731b3b386..60d621d5c8 100644 --- a/eeschema/pin_layout_cache.cpp +++ b/eeschema/pin_layout_cache.cpp @@ -698,65 +698,60 @@ OPT_BOX2I PIN_LAYOUT_CACHE::getUntransformedDecorationBox() const const int decoSize = externalPinDecoSize( m_schSettings, m_pin ); const int intDecoSize = internalPinDecoSize( m_schSettings, m_pin ); - const auto makeInvertBox = [&]() - { - return BOX2I::ByCenter( { -decoSize, 0 }, { decoSize * 2, decoSize * 2 } ); - }; + const auto makeInvertBox = + [&]() + { + return BOX2I::ByCenter( { -decoSize, 0 }, { decoSize * 2, decoSize * 2 } ); + }; - const auto makeLowBox = [&]() - { - return BOX2I::ByCorners( { -decoSize * 2, -decoSize * 2 }, { 0, 0 } ); - }; + const auto makeLowBox = + [&]() + { + return BOX2I::ByCorners( { -decoSize * 2, -decoSize * 2 }, { 0, 0 } ); + }; - const auto makeClockBox = [&]() - { - return BOX2I::ByCorners( { 0, -intDecoSize }, { intDecoSize, intDecoSize } ); - }; + const auto makeClockBox = + [&]() + { + return BOX2I::ByCorners( { 0, -intDecoSize }, { intDecoSize, intDecoSize } ); + }; OPT_BOX2I box; switch( shape ) { case GRAPHIC_PINSHAPE::INVERTED: - { box = makeInvertBox(); break; - } + case GRAPHIC_PINSHAPE::CLOCK: - { box = makeClockBox(); break; - } + case GRAPHIC_PINSHAPE::INVERTED_CLOCK: - { box = makeInvertBox(); box->Merge( makeClockBox() ); break; - } + case GRAPHIC_PINSHAPE::INPUT_LOW: - { box = makeLowBox(); break; - } + case GRAPHIC_PINSHAPE::FALLING_EDGE_CLOCK: case GRAPHIC_PINSHAPE::CLOCK_LOW: - { box = makeLowBox(); box->Merge( makeClockBox() ); break; - } + case GRAPHIC_PINSHAPE::NONLOGIC: - { box = BOX2I::ByCenter( { 0, 0 }, { decoSize * 2, decoSize * 2 } ); break; - } + case GRAPHIC_PINSHAPE::LINE: default: - { // No decoration break; } - } if( box ) { diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp index c7cc258a67..e15c272dbb 100644 --- a/eeschema/sch_edit_frame.cpp +++ b/eeschema/sch_edit_frame.cpp @@ -2722,18 +2722,15 @@ void SCH_EDIT_FRAME::onNetNavigatorMenuCommand( wxCommandEvent& aEvent ) case ID_NET_NAVIGATOR_SEARCH_WILDCARD: case ID_NET_NAVIGATOR_SEARCH_REGEX: - { - EESCHEMA_SETTINGS* cfg = eeconfig(); - if( cfg ) + if( EESCHEMA_SETTINGS* cfg = eeconfig() ) { - cfg->m_AuiPanels.net_nav_search_mode_wildcard = - ( aEvent.GetId() == ID_NET_NAVIGATOR_SEARCH_WILDCARD ); + cfg->m_AuiPanels.net_nav_search_mode_wildcard = ( aEvent.GetId() == ID_NET_NAVIGATOR_SEARCH_WILDCARD ); // Refresh the navigator with current filter RefreshNetNavigator(); } + break; - } default: aEvent.Skip(); diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp index b602475fc4..e09bba1dd1 100644 --- a/eeschema/sch_field.cpp +++ b/eeschema/sch_field.cpp @@ -458,13 +458,13 @@ SCH_LAYER_ID SCH_FIELD::GetDefaultLayer() const switch( m_id ) { - case FIELD_T::REFERENCE: return LAYER_REFERENCEPART; - case FIELD_T::VALUE: return LAYER_VALUEPART; - case FIELD_T::SHEET_NAME: return LAYER_SHEETNAME; - case FIELD_T::SHEET_FILENAME: return LAYER_SHEETFILENAME; - case FIELD_T::SHEET_USER: return LAYER_SHEETFIELDS; + case FIELD_T::REFERENCE: return LAYER_REFERENCEPART; + case FIELD_T::VALUE: return LAYER_VALUEPART; + case FIELD_T::SHEET_NAME: return LAYER_SHEETNAME; + case FIELD_T::SHEET_FILENAME: return LAYER_SHEETFILENAME; + case FIELD_T::SHEET_USER: return LAYER_SHEETFIELDS; case FIELD_T::INTERSHEET_REFS: return LAYER_INTERSHEET_REFS; - default: return LAYER_FIELDS; + default: return LAYER_FIELDS; } } @@ -531,12 +531,15 @@ bool SCH_FIELD::IsHorizJustifyFlipped() const return render_center.y > pos.y; else return render_center.x < pos.x; + case GR_TEXT_H_ALIGN_RIGHT: if( GetDrawRotation().IsVertical() ) return render_center.y < pos.y; else return render_center.x > pos.x; - default: return false; + + default: + return false; } } @@ -550,10 +553,13 @@ void SCH_FIELD::SetEffectiveHorizJustify( GR_TEXT_H_ALIGN_T aJustify ) case GR_TEXT_H_ALIGN_LEFT: actualJustify = IsHorizJustifyFlipped() ? GR_TEXT_H_ALIGN_RIGHT : GR_TEXT_H_ALIGN_LEFT; break; + case GR_TEXT_H_ALIGN_RIGHT: actualJustify = IsHorizJustifyFlipped() ? GR_TEXT_H_ALIGN_LEFT : GR_TEXT_H_ALIGN_RIGHT; break; - default: actualJustify = aJustify; + + default: + actualJustify = aJustify; } SetHorizJustify( actualJustify ); @@ -564,9 +570,9 @@ GR_TEXT_H_ALIGN_T SCH_FIELD::GetEffectiveHorizJustify() const { switch( GetHorizJustify() ) { - case GR_TEXT_H_ALIGN_LEFT: return IsHorizJustifyFlipped() ? GR_TEXT_H_ALIGN_RIGHT : GR_TEXT_H_ALIGN_LEFT; + case GR_TEXT_H_ALIGN_LEFT: return IsHorizJustifyFlipped() ? GR_TEXT_H_ALIGN_RIGHT : GR_TEXT_H_ALIGN_LEFT; case GR_TEXT_H_ALIGN_RIGHT: return IsHorizJustifyFlipped() ? GR_TEXT_H_ALIGN_LEFT : GR_TEXT_H_ALIGN_RIGHT; - default: return GR_TEXT_H_ALIGN_CENTER; + default: return GR_TEXT_H_ALIGN_CENTER; } } @@ -583,12 +589,15 @@ bool SCH_FIELD::IsVertJustifyFlipped() const return render_center.x < pos.x; else return render_center.y < pos.y; + case GR_TEXT_V_ALIGN_BOTTOM: if( GetDrawRotation().IsVertical() ) return render_center.x > pos.x; else return render_center.y > pos.y; - default: return false; + + default: + return false; } } @@ -602,10 +611,13 @@ void SCH_FIELD::SetEffectiveVertJustify( GR_TEXT_V_ALIGN_T aJustify ) case GR_TEXT_V_ALIGN_TOP: actualJustify = IsVertJustifyFlipped() ? GR_TEXT_V_ALIGN_BOTTOM : GR_TEXT_V_ALIGN_TOP; break; + case GR_TEXT_V_ALIGN_BOTTOM: actualJustify = IsVertJustifyFlipped() ? GR_TEXT_V_ALIGN_TOP : GR_TEXT_V_ALIGN_BOTTOM; break; - default: actualJustify = aJustify; + + default: + actualJustify = aJustify; } SetVertJustify( actualJustify ); @@ -616,9 +628,9 @@ GR_TEXT_V_ALIGN_T SCH_FIELD::GetEffectiveVertJustify() const { switch( GetVertJustify() ) { - case GR_TEXT_V_ALIGN_TOP: return IsVertJustifyFlipped() ? GR_TEXT_V_ALIGN_BOTTOM : GR_TEXT_V_ALIGN_TOP; + case GR_TEXT_V_ALIGN_TOP: return IsVertJustifyFlipped() ? GR_TEXT_V_ALIGN_BOTTOM : GR_TEXT_V_ALIGN_TOP; case GR_TEXT_V_ALIGN_BOTTOM: return IsVertJustifyFlipped() ? GR_TEXT_V_ALIGN_TOP : GR_TEXT_V_ALIGN_BOTTOM; - default: return GR_TEXT_V_ALIGN_CENTER; + default: return GR_TEXT_V_ALIGN_CENTER; } } @@ -887,7 +899,8 @@ void SCH_FIELD::Rotate( const VECTOR2I& aCenter, bool aRotateCCW ) break; case GR_TEXT_H_ALIGN_CENTER: - case GR_TEXT_H_ALIGN_INDETERMINATE: break; + case GR_TEXT_H_ALIGN_INDETERMINATE: + break; } SetTextAngle( ANGLE_HORIZONTAL ); @@ -909,7 +922,8 @@ void SCH_FIELD::Rotate( const VECTOR2I& aCenter, bool aRotateCCW ) break; case GR_TEXT_H_ALIGN_CENTER: - case GR_TEXT_H_ALIGN_INDETERMINATE: break; + case GR_TEXT_H_ALIGN_INDETERMINATE: + break; } SetTextAngle( ANGLE_VERTICAL ); @@ -996,9 +1010,9 @@ void SCH_FIELD::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vectorType() ) { case SCH_SYMBOL_T: - { if( const SCH_SYMBOL* symbol = static_cast( m_parent ) ) { if( m_id == FIELD_T::REFERENCE ) @@ -1623,11 +1636,12 @@ wxString SCH_FIELD::getUnescapedText( const SCH_SHEET_PATH* aPath, const wxStrin } break; - } - case SCH_SHEET_T: break; + case SCH_SHEET_T: + break; - default: break; + default: + break; } } diff --git a/eeschema/sch_io/easyedapro/sch_easyedapro_parser.cpp b/eeschema/sch_io/easyedapro/sch_easyedapro_parser.cpp index fa5f880e9f..2ae6bff15b 100644 --- a/eeschema/sch_io/easyedapro/sch_easyedapro_parser.cpp +++ b/eeschema/sch_io/easyedapro/sch_easyedapro_parser.cpp @@ -505,10 +505,10 @@ SCH_EASYEDAPRO_PARSER::ParseSymbol( const std::vector& aLines, switch( i ) { - case 1: shape->SetStart( pt ); break; + case 1: shape->SetStart( pt ); break; case 3: shape->SetBezierC1( pt ); break; case 5: shape->SetBezierC2( pt ); break; - case 7: shape->SetEnd( pt ); break; + case 7: shape->SetEnd( pt ); break; } } @@ -1271,7 +1271,8 @@ void SCH_EASYEDAPRO_PARSER::ParseSchematic( SCHEMATIC* aSchematic, SCH_SHEET* aR case ELECTRICAL_PINTYPE::PT_BIDI: label->SetShape( LABEL_FLAG_SHAPE::L_BIDI ); break; - default: break; + default: + break; } } diff --git a/eeschema/sch_io/kicad_legacy/sch_io_kicad_legacy.cpp b/eeschema/sch_io/kicad_legacy/sch_io_kicad_legacy.cpp index ef1b27cd83..abe64212ed 100644 --- a/eeschema/sch_io/kicad_legacy/sch_io_kicad_legacy.cpp +++ b/eeschema/sch_io/kicad_legacy/sch_io_kicad_legacy.cpp @@ -612,8 +612,7 @@ SCH_SHEET* SCH_IO_KICAD_LEGACY::loadSheet( LINE_READER& aReader ) case 'T': sheetPin->SetSide( SHEET_SIDE::TOP ); break; case 'B': sheetPin->SetSide( SHEET_SIDE::BOTTOM ); break; case 'L': sheetPin->SetSide( SHEET_SIDE::LEFT ); break; - default: - SCH_PARSE_ERROR( "invalid sheet pin side", aReader, line ); + default: SCH_PARSE_ERROR( "invalid sheet pin side", aReader, line ); } VECTOR2I position; diff --git a/eeschema/sch_painter.cpp b/eeschema/sch_painter.cpp index 272b96c68e..2bd39a8345 100644 --- a/eeschema/sch_painter.cpp +++ b/eeschema/sch_painter.cpp @@ -219,8 +219,8 @@ void SCH_PAINTER::draw( const EDA_ITEM* aItem, int aLayer, bool aDimmed ) case SCH_GROUP_T: draw( static_cast( aItem ), aLayer ); break; - - default: return; + default: + return; } if( drawBoundingBox ) diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp index 41cb8247ee..ec8a5422ca 100644 --- a/eeschema/sch_text.cpp +++ b/eeschema/sch_text.cpp @@ -565,9 +565,9 @@ void SCH_TEXT::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector( *this ) ) { static PARAM::INFO resistor = makeParams( "r", "Expression for resistance", "Ω" ); - static PARAM::INFO capacitor = makeParams( "c", "Expression for capacitance", "F" ); - static PARAM::INFO inductor = makeParams( "l", "Expression for inductance", "H" ); - static PARAM::INFO vsource = makeParams( "v", "Expression for voltage", "V" ); - static PARAM::INFO isource = makeParams( "i", "Expression for current", "A" ); + static PARAM::INFO capacitor = makeParams( "c", "Expression for capacitance", "F" ); + static PARAM::INFO inductor = makeParams( "l", "Expression for inductance", "H" ); + static PARAM::INFO vsource = makeParams( "v", "Expression for voltage", "V" ); + static PARAM::INFO isource = makeParams( "i", "Expression for current", "A" ); switch( aType ) { @@ -85,8 +85,7 @@ SIM_MODEL_BEHAVIORAL::SIM_MODEL_BEHAVIORAL( TYPE aType ) : case TYPE::L_BEHAVIORAL: AddParam( inductor ); break; case TYPE::V_BEHAVIORAL: AddParam( vsource ); break; case TYPE::I_BEHAVIORAL: AddParam( isource ); break; - default: - wxFAIL_MSG( "Unhandled SIM_MODEL type in SIM_MODEL_IDEAL" ); + default: wxFAIL_MSG( "Unhandled SIM_MODEL type in SIM_MODEL_IDEAL" ); } } diff --git a/eeschema/sim/sim_model_ibis.cpp b/eeschema/sim/sim_model_ibis.cpp index 83260d26be..8b97500d8c 100644 --- a/eeschema/sim/sim_model_ibis.cpp +++ b/eeschema/sim/sim_model_ibis.cpp @@ -138,6 +138,7 @@ std::string SPICE_GENERATOR_IBIS::IbisDevice( const SPICE_ITEM& aItem, SCHEMATIC kpin->writeSpiceDiffDevice( result, aItem.modelName, *kmodel, kparams ); else kpin->writeSpiceDevice( result, aItem.modelName, *kmodel, kparams ); + break; case SIM_MODEL::TYPE::KIBIS_DRIVER_DC: @@ -148,22 +149,17 @@ std::string SPICE_GENERATOR_IBIS::IbisDevice( const SPICE_ITEM& aItem, SCHEMATIC paramValue = dc->value; if( paramValue == "hi-Z" ) - { kparams.m_waveform = new KIBIS_WAVEFORM_HIGH_Z( kibis ); - } else if( paramValue == "low" ) - { kparams.m_waveform = new KIBIS_WAVEFORM_STUCK_LOW( kibis ); - } else if( paramValue == "high" ) - { kparams.m_waveform = new KIBIS_WAVEFORM_STUCK_HIGH( kibis ); - } if( diffMode ) kpin->writeSpiceDiffDriver( result, aItem.modelName, *kmodel, kparams ); else kpin->writeSpiceDriver( result, aItem.modelName, *kmodel, kparams ); + break; } @@ -189,6 +185,7 @@ std::string SPICE_GENERATOR_IBIS::IbisDevice( const SPICE_ITEM& aItem, SCHEMATIC kpin->writeSpiceDiffDriver( result, aItem.modelName, *kmodel, kparams ); else kpin->writeSpiceDriver( result, aItem.modelName, *kmodel, kparams ); + break; } @@ -211,6 +208,7 @@ std::string SPICE_GENERATOR_IBIS::IbisDevice( const SPICE_ITEM& aItem, SCHEMATIC kpin->writeSpiceDiffDriver( result, aItem.modelName, *kmodel, kparams ); else kpin->writeSpiceDriver( result, aItem.modelName, *kmodel, kparams ); + break; } @@ -241,10 +239,7 @@ SIM_MODEL_IBIS::SIM_MODEL_IBIS( TYPE aType ) : case SIM_MODEL::TYPE::KIBIS_DRIVER_DC: paramInfos = &dcDriver; break; case SIM_MODEL::TYPE::KIBIS_DRIVER_RECT: paramInfos = &rectDriver; break; case SIM_MODEL::TYPE::KIBIS_DRIVER_PRBS: paramInfos = &prbsDriver; break; - - default: - wxFAIL; - return; + default: wxFAIL; return; } for( const PARAM::INFO& paramInfo : *paramInfos ) @@ -379,16 +374,19 @@ std::vector SIM_MODEL_IBIS::makeParamInfos( TYPE aType ) case TYPE::KIBIS_DRIVER_DC: for( const PARAM::INFO& param : makeDcWaveformParamInfos() ) paramInfos.push_back( param ); + break; case TYPE::KIBIS_DRIVER_RECT: for( const PARAM::INFO& param : makeRectWaveformParamInfos() ) paramInfos.push_back( param ); + break; case TYPE::KIBIS_DRIVER_PRBS: for( const PARAM::INFO& param : makePrbsWaveformParamInfos() ) paramInfos.push_back( param ); + break; default: diff --git a/eeschema/sim/sim_model_source.cpp b/eeschema/sim/sim_model_source.cpp index 2b1f74ff0d..c89c52679c 100644 --- a/eeschema/sim/sim_model_source.cpp +++ b/eeschema/sim/sim_model_source.cpp @@ -52,10 +52,13 @@ std::string SPICE_GENERATOR_SOURCE::TunerCommand( const SPICE_ITEM& aItem, doubl { case SIM_MODEL::TYPE::V: // VDC/IDC: it is clear which parameter should be used case SIM_MODEL::TYPE::I: - result = fmt::format( "alter @{}={:g}", aItem.model->SpiceGenerator().ItemName( aItem ), + result = fmt::format( "alter @{}={:g}", + aItem.model->SpiceGenerator().ItemName( aItem ), aValue ); break; - default: break; // other sources: unclear which parameter the user wants + + default: + break; // other sources: unclear which parameter the user wants } return result; } @@ -104,8 +107,7 @@ std::string SPICE_GENERATOR_SOURCE::ItemLine( const SPICE_ITEM& aItem ) const try { root = tao::pegtl::parse_tree::parse - ( in ); + SIM_MODEL_SOURCE_PARSER::pwlValuesSelector>( in ); } catch( const tao::pegtl::parse_error& ) { @@ -1228,8 +1230,11 @@ const SIM_MODEL::PARAM* SIM_MODEL_SOURCE::GetTunerParam() const switch( GetType() ) { case SIM_MODEL::TYPE::V: // VDC/IDC: it is clear which parameter should be used - case SIM_MODEL::TYPE::I: return &GetParam( 0 ); break; - default: break; // other sources: unclear which parameter the user wants + case SIM_MODEL::TYPE::I: + return &GetParam( 0 ); + + default: + break; // other sources: unclear which parameter the user wants } return nullptr; } diff --git a/eeschema/symbol_viewer_frame.cpp b/eeschema/symbol_viewer_frame.cpp index 08be08cc6d..9014326bfc 100644 --- a/eeschema/symbol_viewer_frame.cpp +++ b/eeschema/symbol_viewer_frame.cpp @@ -1076,10 +1076,9 @@ void SYMBOL_VIEWER_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail ) switch( mail.Command() ) { case MAIL_RELOAD_LIB: - { ReCreateLibList(); break; - } + case MAIL_REFRESH_SYMBOL: { LIB_SYMBOL* symbol = GetSelectedSymbol(); @@ -1095,8 +1094,8 @@ void SYMBOL_VIEWER_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail ) wxString libfullname = LIBRARY_MANAGER::GetFullURI( row, true ); wxString lib( mail.GetPayload() ); - wxLogTrace( traceLibWatch, "Received refresh symbol request for %s, current symbols " - "is %s", lib, libfullname ); + wxLogTrace( traceLibWatch, "Received refresh symbol request for %s, current symbols is %s", + lib, libfullname ); if( lib == libfullname ) { @@ -1104,6 +1103,7 @@ void SYMBOL_VIEWER_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail ) updatePreviewSymbol(); GetCanvas()->GetView()->UpdateAllItems( KIGFX::ALL ); } + break; } default:; diff --git a/eeschema/sync_sheet_pin/sheet_synchronization_agent.cpp b/eeschema/sync_sheet_pin/sheet_synchronization_agent.cpp index 6b3683abe0..fa97120f62 100644 --- a/eeschema/sync_sheet_pin/sheet_synchronization_agent.cpp +++ b/eeschema/sync_sheet_pin/sheet_synchronization_agent.cpp @@ -64,10 +64,9 @@ void SHEET_SYNCHRONIZATION_AGENT::ModifyItem( SCH_ITEM* sc switch( aKind ) { case SHEET_SYNCHRONIZATION_ITEM_KIND::HIERLABEL: - { m_doModify( sch_item, aPath, aDoModify ); break; - } + case SHEET_SYNCHRONIZATION_ITEM_KIND::SHEET_PIN: { SCH_SHEET_PATH path_cp = aPath; @@ -75,6 +74,7 @@ void SHEET_SYNCHRONIZATION_AGENT::ModifyItem( SCH_ITEM* sc m_doModify( sch_item, path_cp, aDoModify ); break; } + case SHEET_SYNCHRONIZATION_ITEM_KIND::HIERLABEL_AND_SHEET_PIN: break; } @@ -90,18 +90,17 @@ void SHEET_SYNCHRONIZATION_AGENT::RemoveItem( SHEET_SYNCHRONIZATION_ITEM& aItem, switch( aItem.GetKind() ) { case SHEET_SYNCHRONIZATION_ITEM_KIND::HIERLABEL: - { m_doDelete( aItem.GetItem(), aPath ); break; - } - case SHEET_SYNCHRONIZATION_ITEM_KIND::SHEET_PIN: + case SHEET_SYNCHRONIZATION_ITEM_KIND::SHEET_PIN: { SCH_SHEET_PATH path_cp = aPath; path_cp.pop_back(); m_doDelete( aItem.GetItem(), std::move( path_cp ) ); break; } + case SHEET_SYNCHRONIZATION_ITEM_KIND::HIERLABEL_AND_SHEET_PIN: break; } diff --git a/eeschema/tools/sch_tool_utils.cpp b/eeschema/tools/sch_tool_utils.cpp index 1ee40888c7..bef9564bbf 100644 --- a/eeschema/tools/sch_tool_utils.cpp +++ b/eeschema/tools/sch_tool_utils.cpp @@ -52,12 +52,14 @@ wxString GetSchItemAsText( const SCH_ITEM& aItem ) const SCH_TEXT& text = static_cast( aItem ); return text.GetShownText( true ); } + case SCH_FIELD_T: { // Goes via EDA_TEXT const SCH_FIELD& field = static_cast( aItem ); return field.GetShownText( true ); } + case SCH_TEXTBOX_T: case SCH_TABLECELL_T: { @@ -68,6 +70,7 @@ wxString GetSchItemAsText( const SCH_ITEM& aItem ) // This ensures proper variable expansion and escape marker conversion return textbox.GetShownText( nullptr, nullptr, true, 0 ); } + case SCH_PIN_T: { // This is a choice - probably the name makes more sense than the number @@ -75,6 +78,7 @@ wxString GetSchItemAsText( const SCH_ITEM& aItem ) const SCH_PIN& pin = static_cast( aItem ); return pin.GetShownName(); } + case SCH_TABLE_T: { // A simple tabbed list of the cells seems like a place to start here @@ -101,11 +105,10 @@ wxString GetSchItemAsText( const SCH_ITEM& aItem ) } return s; } + default: - { break; } - } return wxEmptyString; }; diff --git a/eeschema/tools/symbol_editor_drawing_tools.cpp b/eeschema/tools/symbol_editor_drawing_tools.cpp index aedf877ee0..b15bf0a3c1 100644 --- a/eeschema/tools/symbol_editor_drawing_tools.cpp +++ b/eeschema/tools/symbol_editor_drawing_tools.cpp @@ -215,14 +215,13 @@ int SYMBOL_EDITOR_DRAWING_TOOLS::TwoClickPlace( const TOOL_EVENT& aEvent ) switch( type ) { case SCH_PIN_T: - { item = pinTool->CreatePin( cursorPos, symbol ); if( item ) g_lastPin = item->m_Uuid; break; - } + case SCH_TEXT_T: { SCH_TEXT* text = new SCH_TEXT( cursorPos, wxEmptyString, LAYER_DEVICE ); @@ -252,6 +251,7 @@ int SYMBOL_EDITOR_DRAWING_TOOLS::TwoClickPlace( const TOOL_EVENT& aEvent ) break; } + default: wxFAIL_MSG( "TwoClickPlace(): unknown type" ); } diff --git a/gerbview/dialogs/dialog_draw_layers_settings.cpp b/gerbview/dialogs/dialog_draw_layers_settings.cpp index 527abe2514..fca2620741 100644 --- a/gerbview/dialogs/dialog_draw_layers_settings.cpp +++ b/gerbview/dialogs/dialog_draw_layers_settings.cpp @@ -85,6 +85,7 @@ bool DIALOG_DRAW_LAYERS_SETTINGS::TransferDataFromWindow() if( gbrImage ) gbrCandidates.push_back( gbrImage ); } + break; case 2: // All active layers @@ -95,6 +96,7 @@ bool DIALOG_DRAW_LAYERS_SETTINGS::TransferDataFromWindow() if( gbrImage && m_parent->IsLayerVisible( layer ) ) gbrCandidates.push_back( gbrImage ); } + break; } diff --git a/gerbview/excellon_read_drill_file.cpp b/gerbview/excellon_read_drill_file.cpp index 0eda6a450b..abdf6e5bcd 100644 --- a/gerbview/excellon_read_drill_file.cpp +++ b/gerbview/excellon_read_drill_file.cpp @@ -825,80 +825,78 @@ bool EXCELLON_IMAGE::Execute_Drill_Command( char*& text ) { switch( *text ) { - case 'X': - case 'Y': - ReadXYCoord( text, true ); + case 'X': + case 'Y': + ReadXYCoord( text, true ); - if( *text == 'I' || *text == 'J' ) - ReadIJCoord( text ); + if( *text == 'I' || *text == 'J' ) + ReadIJCoord( text ); - break; + break; - case 'G': // G85 is found here for oval holes - m_PreviousPos = m_CurrentPos; - Execute_EXCELLON_G_Command( text ); - break; + case 'G': // G85 is found here for oval holes + m_PreviousPos = m_CurrentPos; + Execute_EXCELLON_G_Command( text ); + break; - case 0: // E.O.L: execute command - if( m_RouteModeOn ) + case 0: // E.O.L: execute command + if( m_RouteModeOn ) + { + // We are in routing mode, and this is an intermediate point. + // So just store it + int rmode = 0; // linear routing. + + if( m_Iterpolation == GERB_INTERPOL_ARC_NEG ) + rmode = ROUTE_CW; + else if( m_Iterpolation == GERB_INTERPOL_ARC_POS ) + rmode = ROUTE_CCW; + + if( m_LastArcDataType == ARC_INFO_TYPE_CENTER ) { - // We are in routing mode, and this is an intermediate point. - // So just store it - int rmode = 0; // linear routing. - - if( m_Iterpolation == GERB_INTERPOL_ARC_NEG ) - rmode = ROUTE_CW; - else if( m_Iterpolation == GERB_INTERPOL_ARC_POS ) - rmode = ROUTE_CCW; - - if( m_LastArcDataType == ARC_INFO_TYPE_CENTER ) - { - EXCELLON_ROUTE_COORD point( m_CurrentPos, m_IJPos, rmode ); - m_RoutePositions.push_back( point ); - } - else - { - EXCELLON_ROUTE_COORD point( m_CurrentPos, m_ArcRadius, rmode ); - m_RoutePositions.push_back( point ); - } - return true; - } - - tool = GetDCODE( m_Current_Tool ); - if( !tool ) - { - wxString msg; - msg.Printf( _( "Tool %d not defined" ), m_Current_Tool ); - AddMessageToList( msg ); - return false; - } - - gbritem = new GERBER_DRAW_ITEM( this ); - AddItemToList( gbritem ); - - if( m_SlotOn ) // Oblong hole - { - fillLineGBRITEM( gbritem, tool->m_Num_Dcode, - m_PreviousPos, m_CurrentPos, - tool->m_Size, false ); - // the hole is made: reset the slot on command (G85) - // (it is needed for each oblong hole) - m_SlotOn = false; + EXCELLON_ROUTE_COORD point( m_CurrentPos, m_IJPos, rmode ); + m_RoutePositions.push_back( point ); } else { - fillFlashedGBRITEM( gbritem, tool->m_ApertType, tool->m_Num_Dcode, - m_CurrentPos, tool->m_Size, false ); + EXCELLON_ROUTE_COORD point( m_CurrentPos, m_ArcRadius, rmode ); + m_RoutePositions.push_back( point ); } - - StepAndRepeatItem( *gbritem ); - m_PreviousPos = m_CurrentPos; return true; - break; + } - default: - text++; - break; + tool = GetDCODE( m_Current_Tool ); + if( !tool ) + { + wxString msg; + msg.Printf( _( "Tool %d not defined" ), m_Current_Tool ); + AddMessageToList( msg ); + return false; + } + + gbritem = new GERBER_DRAW_ITEM( this ); + AddItemToList( gbritem ); + + if( m_SlotOn ) // Oblong hole + { + fillLineGBRITEM( gbritem, tool->m_Num_Dcode, m_PreviousPos, m_CurrentPos, tool->m_Size, false ); + // the hole is made: reset the slot on command (G85) + // (it is needed for each oblong hole) + m_SlotOn = false; + } + else + { + fillFlashedGBRITEM( gbritem, tool->m_ApertType, tool->m_Num_Dcode, m_CurrentPos, tool->m_Size, + false ); + } + + StepAndRepeatItem( *gbritem ); + m_PreviousPos = m_CurrentPos; + return true; + break; + + default: + text++; + break; } } @@ -1029,6 +1027,7 @@ bool EXCELLON_IMAGE::Execute_EXCELLON_G_Command( char*& text ) m_RoutePositions.emplace_back( m_CurrentPos, m_IJPos, ROUTE_CW ); else m_RoutePositions.emplace_back( m_CurrentPos, m_ArcRadius, ROUTE_CW ); + break; case DRILL_G_CCWMOVE: @@ -1042,6 +1041,7 @@ bool EXCELLON_IMAGE::Execute_EXCELLON_G_Command( char*& text ) m_RoutePositions.emplace_back( m_CurrentPos, m_IJPos, ROUTE_CCW ); else m_RoutePositions.emplace_back( m_CurrentPos, m_ArcRadius, ROUTE_CCW ); + break; case DRILL_G_ABSOLUTE: @@ -1055,8 +1055,10 @@ bool EXCELLON_IMAGE::Execute_EXCELLON_G_Command( char*& text ) case DRILL_G_UNKNOWN: default: AddMessageToList( wxString::Format( _( "Unknown Excellon G Code: <%s>" ), From_UTF8(gcmd) ) ); + while( *text ) text++; + return false; } diff --git a/gerbview/export_to_pcbnew.cpp b/gerbview/export_to_pcbnew.cpp index f79477dc5a..48b43a2aff 100644 --- a/gerbview/export_to_pcbnew.cpp +++ b/gerbview/export_to_pcbnew.cpp @@ -174,22 +174,22 @@ void GBR_TO_PCB_EXPORTER::export_non_copper_item( const GERBER_DRAW_ITEM* aGbrIt VECTOR2I center = aGbrItem->GetABPosition( seg_start ); int radius = d_codeDescr->m_Size.x / 2; writePcbFilledCircle( center, radius, aLayer ); - } break; + } case GBR_SPOT_RECT: case GBR_SPOT_OVAL: case GBR_SPOT_POLY: case GBR_SPOT_MACRO: + { d_codeDescr->ConvertShapeToPolygon( aGbrItem ); - { SHAPE_POLY_SET polyshape = d_codeDescr->m_Polygon; // Compensate the Y axis orientation ( writePcbPolygon invert the Y coordinate ) polyshape.Outline( 0 ).Mirror( { 0, 0 }, FLIP_DIRECTION::TOP_BOTTOM ); writePcbPolygon( polyshape, aLayer, aGbrItem->GetABPosition( seg_start ) ); - } break; + } case GBR_ARC: export_non_copper_arc( aGbrItem, aLayer ); @@ -238,6 +238,7 @@ void GBR_TO_PCB_EXPORTER::export_non_copper_item( const GERBER_DRAW_ITEM* aGbrIt export_stroke_info( aGbrItem->m_Size.x ); fprintf( m_fp, "\t)\n" ); } + break; } } diff --git a/gerbview/gerber_draw_item.cpp b/gerbview/gerber_draw_item.cpp index 590a317307..07d8359948 100644 --- a/gerbview/gerber_draw_item.cpp +++ b/gerbview/gerber_draw_item.cpp @@ -309,7 +309,6 @@ const BOX2I GERBER_DRAW_ITEM::GetBoundingBox() const } case GBR_SPOT_CIRCLE: - { if( code ) { int radius = code->m_Size.x >> 1; @@ -317,23 +316,18 @@ const BOX2I GERBER_DRAW_ITEM::GetBoundingBox() const } break; - } case GBR_SPOT_RECT: - { if( code ) bbox.Inflate( code->m_Size.x / 2, code->m_Size.y / 2 ); break; - } case GBR_SPOT_OVAL: - { if( code ) bbox.Inflate( code->m_Size.x /2, code->m_Size.y / 2 ); break; - } case GBR_SPOT_MACRO: case GBR_SPOT_POLY: @@ -349,7 +343,6 @@ const BOX2I GERBER_DRAW_ITEM::GetBoundingBox() const break; case GBR_SEGMENT: - { if( code && code->m_ApertType == APT_RECT ) { if( m_ShapeAsPolygon.OutlineCount() == 0 ) @@ -380,7 +373,7 @@ const BOX2I GERBER_DRAW_ITEM::GetBoundingBox() const } break; - } + default: wxASSERT_MSG( false, wxT( "GERBER_DRAW_ITEM shape is unknown!" ) ); break; diff --git a/gerbview/gerbview_frame.cpp b/gerbview/gerbview_frame.cpp index a8485affb3..c1c8fdd1e2 100644 --- a/gerbview/gerbview_frame.cpp +++ b/gerbview/gerbview_frame.cpp @@ -411,7 +411,6 @@ void GERBVIEW_FRAME::SetElementVisibility( int aLayerID, bool aNewState ) break; case LAYER_NEGATIVE_OBJECTS: - { gvconfig()->m_Appearance.show_negative_objects = aNewState; view->UpdateAllItemsConditionally( KIGFX::REPAINT, @@ -424,7 +423,6 @@ void GERBVIEW_FRAME::SetElementVisibility( int aLayerID, bool aNewState ) } ); break; - } case LAYER_GERBVIEW_DRAWINGSHEET: gvconfig()->m_Appearance.show_border_and_titleblock = aNewState; diff --git a/kicad/pcm/dialogs/panel_packages_view.cpp b/kicad/pcm/dialogs/panel_packages_view.cpp index 22381dcdd4..de43460613 100644 --- a/kicad/pcm/dialogs/panel_packages_view.cpp +++ b/kicad/pcm/dialogs/panel_packages_view.cpp @@ -434,8 +434,11 @@ bool PANEL_PACKAGES_VIEW::canRunAction() const { case PPS_PENDING_INSTALL: case PPS_PENDING_UNINSTALL: - case PPS_PENDING_UPDATE: return false; - default: break; + case PPS_PENDING_UPDATE: + return false; + + default: + break; } return m_gridVersions->GetNumberRows() == 1 || m_gridVersions->GetSelectedRows().size() == 1; diff --git a/pagelayout_editor/files.cpp b/pagelayout_editor/files.cpp index 8d636527f5..4d7dc9df3e 100644 --- a/pagelayout_editor/files.cpp +++ b/pagelayout_editor/files.cpp @@ -149,8 +149,9 @@ void PL_EDITOR_FRAME::Files_io( wxCommandEvent& event ) msg.Printf( _( "File '%s' inserted" ), filename ); SetStatusText( msg ); } - } + break; + } case wxID_OPEN: { @@ -173,8 +174,9 @@ void PL_EDITOR_FRAME::Files_io( wxCommandEvent& event ) msg.Printf( _( "File '%s' saved." ), filename ); SetStatusText( msg ); } - } + break; + } case wxID_SAVE: if( !SaveDrawingSheetFile( filename ) ) @@ -187,6 +189,7 @@ void PL_EDITOR_FRAME::Files_io( wxCommandEvent& event ) msg.Printf( _("File '%s' saved."), filename ); SetStatusText( msg ); } + break; case wxID_SAVEAS: @@ -222,8 +225,9 @@ void PL_EDITOR_FRAME::Files_io( wxCommandEvent& event ) SetCurrentFileName( filename ); UpdateTitleAndInfo(); } - } + break; + } default: break; diff --git a/pagelayout_editor/pl_editor_frame.cpp b/pagelayout_editor/pl_editor_frame.cpp index d29682bdbd..dbbeec43bb 100644 --- a/pagelayout_editor/pl_editor_frame.cpp +++ b/pagelayout_editor/pl_editor_frame.cpp @@ -747,10 +747,8 @@ void PL_EDITOR_FRAME::UpdateStatusBar() // Display absolute coordinates: VECTOR2D cursorPos = GetCanvas()->GetViewControls()->GetCursorPosition(); VECTOR2D coord = cursorPos - originCoord; - double dXpos = - EDA_UNIT_UTILS::UI::ToUserUnit( drawSheetIUScale, GetUserUnits(), coord.x * Xsign ); - double dYpos = - EDA_UNIT_UTILS::UI::ToUserUnit( drawSheetIUScale, GetUserUnits(), coord.y * Ysign ); + double dXpos = EDA_UNIT_UTILS::UI::ToUserUnit( drawSheetIUScale, GetUserUnits(), coord.x * Xsign ); + double dYpos = EDA_UNIT_UTILS::UI::ToUserUnit( drawSheetIUScale, GetUserUnits(), coord.y * Ysign ); wxString absformatter = wxT( "X %.4g Y %.4g" ); wxString locformatter = wxT( "dx %.4g dy %.4g" ); @@ -872,8 +870,8 @@ DS_DATA_ITEM* PL_EDITOR_FRAME::AddDrawingSheetItem( int aType ) // Set the scale factor for pl_editor (it is set for Eeschema by default) image->SetPixelSizeIu( drawSheetIUScale.IU_PER_MILS * 1000.0 / image->GetPPI() ); item = new DS_DATA_ITEM_BITMAP( image ); + break; } - break; } if( item == nullptr ) diff --git a/pagelayout_editor/tools/pl_point_editor.cpp b/pagelayout_editor/tools/pl_point_editor.cpp index 0ec9451959..3c93cc6e82 100644 --- a/pagelayout_editor/tools/pl_point_editor.cpp +++ b/pagelayout_editor/tools/pl_point_editor.cpp @@ -76,6 +76,7 @@ public: points->AddPoint( line->GetEnd() ); break; } + case WSG_RECT_T: { DS_DRAW_ITEM_RECT* rect = static_cast( aItem ); @@ -94,6 +95,7 @@ public: points->AddPoint( botRight ); break; } + default: points.reset(); break; diff --git a/pcbnew/connectivity/connectivity_algo.cpp b/pcbnew/connectivity/connectivity_algo.cpp index 1e6855150c..b5563ce700 100644 --- a/pcbnew/connectivity/connectivity_algo.cpp +++ b/pcbnew/connectivity/connectivity_algo.cpp @@ -206,8 +206,9 @@ bool CN_CONNECTIVITY_ALGO::Add( BOARD_ITEM* aItem ) for( CN_ITEM* zitem : m_itemList.Add( zone, layer ) ) m_itemMap[zone].Link( zitem ); } ); - } + break; + } default: return false; diff --git a/pcbnew/connectivity/connectivity_items.cpp b/pcbnew/connectivity/connectivity_items.cpp index 436a833630..8d65821070 100644 --- a/pcbnew/connectivity/connectivity_items.cpp +++ b/pcbnew/connectivity/connectivity_items.cpp @@ -177,6 +177,7 @@ CN_ITEM* CN_LIST::Add( PAD* pad ) break; } + default: break; } diff --git a/pcbnew/dialogs/dialog_copper_zones.cpp b/pcbnew/dialogs/dialog_copper_zones.cpp index 3cd310a6bb..ff43d09335 100644 --- a/pcbnew/dialogs/dialog_copper_zones.cpp +++ b/pcbnew/dialogs/dialog_copper_zones.cpp @@ -107,6 +107,7 @@ int InvokeCopperZonesEditor( PCB_BASE_FRAME* aCaller, ZONE* aZone, ZONE_SETTINGS { aCaller->GetToolManager()->RunAction( PCB_ACTIONS::zonesManager ); } ); + return wxID_OK; default: diff --git a/pcbnew/dialogs/dialog_export_step.cpp b/pcbnew/dialogs/dialog_export_step.cpp index fd17dc51cb..70ab96b839 100644 --- a/pcbnew/dialogs/dialog_export_step.cpp +++ b/pcbnew/dialogs/dialog_export_step.cpp @@ -587,15 +587,15 @@ void DIALOG_EXPORT_STEP::onExportButton( wxCommandEvent& aEvent ) // ensure the main format on the job is populated switch( m_job->m_3dparams.m_Format ) { - case EXPORTER_STEP_PARAMS::FORMAT::STEP: m_job->m_format = JOB_EXPORT_PCB_3D::FORMAT::STEP; break; + case EXPORTER_STEP_PARAMS::FORMAT::STEP: m_job->m_format = JOB_EXPORT_PCB_3D::FORMAT::STEP; break; case EXPORTER_STEP_PARAMS::FORMAT::STEPZ: m_job->m_format = JOB_EXPORT_PCB_3D::FORMAT::STEPZ; break; - case EXPORTER_STEP_PARAMS::FORMAT::GLB: m_job->m_format = JOB_EXPORT_PCB_3D::FORMAT::GLB; break; - case EXPORTER_STEP_PARAMS::FORMAT::XAO: m_job->m_format = JOB_EXPORT_PCB_3D::FORMAT::XAO; break; - case EXPORTER_STEP_PARAMS::FORMAT::BREP: m_job->m_format = JOB_EXPORT_PCB_3D::FORMAT::BREP; break; - case EXPORTER_STEP_PARAMS::FORMAT::PLY: m_job->m_format = JOB_EXPORT_PCB_3D::FORMAT::PLY; break; - case EXPORTER_STEP_PARAMS::FORMAT::STL: m_job->m_format = JOB_EXPORT_PCB_3D::FORMAT::STL; break; - case EXPORTER_STEP_PARAMS::FORMAT::U3D: m_job->m_format = JOB_EXPORT_PCB_3D::FORMAT::U3D; break; - case EXPORTER_STEP_PARAMS::FORMAT::PDF: m_job->m_format = JOB_EXPORT_PCB_3D::FORMAT::PDF; break; + case EXPORTER_STEP_PARAMS::FORMAT::GLB: m_job->m_format = JOB_EXPORT_PCB_3D::FORMAT::GLB; break; + case EXPORTER_STEP_PARAMS::FORMAT::XAO: m_job->m_format = JOB_EXPORT_PCB_3D::FORMAT::XAO; break; + case EXPORTER_STEP_PARAMS::FORMAT::BREP: m_job->m_format = JOB_EXPORT_PCB_3D::FORMAT::BREP; break; + case EXPORTER_STEP_PARAMS::FORMAT::PLY: m_job->m_format = JOB_EXPORT_PCB_3D::FORMAT::PLY; break; + case EXPORTER_STEP_PARAMS::FORMAT::STL: m_job->m_format = JOB_EXPORT_PCB_3D::FORMAT::STL; break; + case EXPORTER_STEP_PARAMS::FORMAT::U3D: m_job->m_format = JOB_EXPORT_PCB_3D::FORMAT::U3D; break; + case EXPORTER_STEP_PARAMS::FORMAT::PDF: m_job->m_format = JOB_EXPORT_PCB_3D::FORMAT::PDF; break; } m_job->m_3dparams.m_UseDrillOrigin = false; diff --git a/pcbnew/dialogs/dialog_print_pcbnew.cpp b/pcbnew/dialogs/dialog_print_pcbnew.cpp index 34fd5f7ebd..305d24f707 100644 --- a/pcbnew/dialogs/dialog_print_pcbnew.cpp +++ b/pcbnew/dialogs/dialog_print_pcbnew.cpp @@ -346,6 +346,7 @@ void DIALOG_PRINT_PCBNEW::onPopUpLayers( wxCommandEvent& event ) else m_layerCheckListBox->Check( i, false ); } + break; case ID_SELECT_COPPER_LAYERS: @@ -354,6 +355,7 @@ void DIALOG_PRINT_PCBNEW::onPopUpLayers( wxCommandEvent& event ) if( IsCopperLayer( m_layerList[i] ) ) m_layerCheckListBox->Check( i, true ); } + break; case ID_DESELECT_COPPER_LAYERS: @@ -362,16 +364,19 @@ void DIALOG_PRINT_PCBNEW::onPopUpLayers( wxCommandEvent& event ) if( IsCopperLayer( m_layerList[i] ) ) m_layerCheckListBox->Check( i, false ); } + break; case ID_SELECT_ALL_LAYERS: for( unsigned i = 0; i < m_layerList.size(); i++ ) m_layerCheckListBox->Check( i, true ); + break; case ID_DESELECT_ALL_LAYERS: for( unsigned i = 0; i < m_layerList.size(); i++ ) m_layerCheckListBox->Check( i, false ); + break; default: diff --git a/pcbnew/dialogs/panel_display_options.cpp b/pcbnew/dialogs/panel_display_options.cpp index d20abcb95f..24fbf5153d 100644 --- a/pcbnew/dialogs/panel_display_options.cpp +++ b/pcbnew/dialogs/panel_display_options.cpp @@ -56,8 +56,8 @@ public: { switch( aCol ) { - case 0: return _( "Layer" ); - case 1: return _( "Name" ); + case 0: return _( "Layer" ); + case 1: return _( "Name" ); default: return wxEmptyString; } } @@ -66,8 +66,8 @@ public: { switch( aCol ) { - case 0: return aTypeName == wxGRID_VALUE_NUMBER; - case 1: return aTypeName == wxGRID_VALUE_STRING; + case 0: return aTypeName == wxGRID_VALUE_NUMBER; + case 1: return aTypeName == wxGRID_VALUE_STRING; default: wxFAIL; return false; } } diff --git a/pcbnew/drc/drc_creepage_utils.cpp b/pcbnew/drc/drc_creepage_utils.cpp index 6ad9b8a3a2..ce681aefe2 100644 --- a/pcbnew/drc/drc_creepage_utils.cpp +++ b/pcbnew/drc/drc_creepage_utils.cpp @@ -528,6 +528,7 @@ void CREEPAGE_GRAPH::TransformEdgeToCreepShapes() m_shapeCollection.push_back( a ); break; } + case SHAPE_T::RECTANGLE: { BE_SHAPE_POINT* a = new BE_SHAPE_POINT( d->GetStart() ); @@ -540,15 +541,16 @@ void CREEPAGE_GRAPH::TransformEdgeToCreepShapes() m_shapeCollection.push_back( a ); break; } + case SHAPE_T::POLY: - { for( const VECTOR2I& p : d->GetPolyPoints() ) { BE_SHAPE_POINT* a = new BE_SHAPE_POINT( p ); m_shapeCollection.push_back( a ); } + break; - } + case SHAPE_T::CIRCLE: { BE_SHAPE_CIRCLE* a = new BE_SHAPE_CIRCLE( d->GetCenter(), d->GetRadius() ); @@ -575,7 +577,9 @@ void CREEPAGE_GRAPH::TransformEdgeToCreepShapes() m_shapeCollection.push_back( a ); break; } - default: break; + + default: + break; } } } @@ -1681,8 +1685,7 @@ bool SegmentIntersectsBoard( const VECTOR2I& aP1, const VECTOR2I& aP2, { case SHAPE_T::SEGMENT: { - bool intersects = segments_intersect( aP1, aP2, d->GetStart(), d->GetEnd(), - intersectionPoints ); + bool intersects = segments_intersect( aP1, aP2, d->GetStart(), d->GetEnd(), intersectionPoints ); if( intersects && !TestGrooveWidth ) return false; @@ -1761,8 +1764,8 @@ bool SegmentIntersectsBoard( const VECTOR2I& aP1, const VECTOR2I& aP2, break; } - - default: break; + default: + break; } } @@ -2043,6 +2046,7 @@ void CREEPAGE_GRAPH::Addshape( const SHAPE& aShape, std::shared_ptr& newshape = dynamic_cast( cuseg ); break; } + case SH_CIRCLE: { const SHAPE_CIRCLE& circle = dynamic_cast( aShape ); @@ -2050,6 +2054,7 @@ void CREEPAGE_GRAPH::Addshape( const SHAPE& aShape, std::shared_ptr& newshape = dynamic_cast( cucircle ); break; } + case SH_ARC: { const SHAPE_ARC& arc = dynamic_cast( aShape ); @@ -2079,6 +2084,7 @@ void CREEPAGE_GRAPH::Addshape( const SHAPE& aShape, std::shared_ptr& newshape = dynamic_cast( cuarc ); break; } + case SH_COMPOUND: { int nbShapes = static_cast( &aShape )->Shapes().size(); @@ -2093,6 +2099,7 @@ void CREEPAGE_GRAPH::Addshape( const SHAPE& aShape, std::shared_ptr& } break; } + case SH_POLY_SET: { const SHAPE_POLY_SET& polySet = dynamic_cast( aShape ); @@ -2105,6 +2112,7 @@ void CREEPAGE_GRAPH::Addshape( const SHAPE& aShape, std::shared_ptr& } break; } + case SH_LINE_CHAIN: { const SHAPE_LINE_CHAIN& lineChain = dynamic_cast( aShape ); @@ -2120,6 +2128,7 @@ void CREEPAGE_GRAPH::Addshape( const SHAPE& aShape, std::shared_ptr& break; } + case SH_RECT: { const SHAPE_RECT& rect = dynamic_cast( aShape ); @@ -2135,7 +2144,9 @@ void CREEPAGE_GRAPH::Addshape( const SHAPE& aShape, std::shared_ptr& Addshape( SHAPE_SEGMENT( point3, point0 ), aConnectTo, aParent ); break; } - default: break; + + default: + break; } if( !newshape ) diff --git a/pcbnew/drc/drc_test_provider_annular_width.cpp b/pcbnew/drc/drc_test_provider_annular_width.cpp index 3de05584fc..56dfca9879 100644 --- a/pcbnew/drc/drc_test_provider_annular_width.cpp +++ b/pcbnew/drc/drc_test_provider_annular_width.cpp @@ -94,32 +94,32 @@ bool DRC_TEST_PROVIDER_ANNULAR_WIDTH::Run() size_t effort = 0; pad->Padstack().ForEachUniqueLayer( - [&pad, &effort]( PCB_LAYER_ID aLayer ) - { - if( pad->GetOffset( aLayer ) == VECTOR2I( 0, 0 ) ) + [&pad, &effort]( PCB_LAYER_ID aLayer ) { - switch( pad->GetShape( aLayer ) ) + if( pad->GetOffset( aLayer ) == VECTOR2I( 0, 0 ) ) { - case PAD_SHAPE::CHAMFERED_RECT: - if( pad->GetChamferRectRatio( aLayer ) > 0.30 ) + switch( pad->GetShape( aLayer ) ) + { + case PAD_SHAPE::CHAMFERED_RECT: + if( pad->GetChamferRectRatio( aLayer ) > 0.30 ) + break; + + KI_FALLTHROUGH; + + case PAD_SHAPE::CIRCLE: + case PAD_SHAPE::OVAL: + case PAD_SHAPE::RECTANGLE: + case PAD_SHAPE::ROUNDRECT: + effort += 1; break; - KI_FALLTHROUGH; - - case PAD_SHAPE::CIRCLE: - case PAD_SHAPE::OVAL: - case PAD_SHAPE::RECTANGLE: - case PAD_SHAPE::ROUNDRECT: - effort += 1; - break; - - default: - break; + default: + break; + } } - } - effort += 5; - } ); + effort += 5; + } ); return effort; } diff --git a/pcbnew/exporters/step/exporter_step.cpp b/pcbnew/exporters/step/exporter_step.cpp index e0e6846a19..a059c7c0fc 100644 --- a/pcbnew/exporters/step/exporter_step.cpp +++ b/pcbnew/exporters/step/exporter_step.cpp @@ -1006,45 +1006,45 @@ void EXPORTER_STEP::initOutputVariant() // it can have some minor actions for the generator switch( m_params.m_Format ) { - case EXPORTER_STEP_PARAMS::FORMAT::STEP: - m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_STEP ); - break; + case EXPORTER_STEP_PARAMS::FORMAT::STEP: + m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_STEP ); + break; - case EXPORTER_STEP_PARAMS::FORMAT::STEPZ: - m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_STEPZ ); - break; + case EXPORTER_STEP_PARAMS::FORMAT::STEPZ: + m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_STEPZ ); + break; - case EXPORTER_STEP_PARAMS::FORMAT::BREP: - m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_BREP ); - break; + case EXPORTER_STEP_PARAMS::FORMAT::BREP: + m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_BREP ); + break; - case EXPORTER_STEP_PARAMS::FORMAT::XAO: - m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_XAO ); - break; + case EXPORTER_STEP_PARAMS::FORMAT::XAO: + m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_XAO ); + break; - case EXPORTER_STEP_PARAMS::FORMAT::GLB: - m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_GLTF ); - break; + case EXPORTER_STEP_PARAMS::FORMAT::GLB: + m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_GLTF ); + break; - case EXPORTER_STEP_PARAMS::FORMAT::PLY: - m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_PLY ); - break; + case EXPORTER_STEP_PARAMS::FORMAT::PLY: + m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_PLY ); + break; - case EXPORTER_STEP_PARAMS::FORMAT::STL: - m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_STL ); - break; + case EXPORTER_STEP_PARAMS::FORMAT::STL: + m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_STL ); + break; - case EXPORTER_STEP_PARAMS::FORMAT::U3D: - m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_U3D ); - break; + case EXPORTER_STEP_PARAMS::FORMAT::U3D: + m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_U3D ); + break; - case EXPORTER_STEP_PARAMS::FORMAT::PDF: - m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_PDF ); - break; + case EXPORTER_STEP_PARAMS::FORMAT::PDF: + m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_PDF ); + break; - default: - m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_UNKNOWN ); - break; + default: + m_pcbModel->SpecializeVariant( OUTPUT_FORMAT::FMT_OUT_UNKNOWN ); + break; } } diff --git a/pcbnew/exporters/step/step_pcb_model.cpp b/pcbnew/exporters/step/step_pcb_model.cpp index a12adb9391..4f6848b78f 100644 --- a/pcbnew/exporters/step/step_pcb_model.cpp +++ b/pcbnew/exporters/step/step_pcb_model.cpp @@ -3248,6 +3248,7 @@ bool STEP_PCB_MODEL::getModelLabel( const std::string& aFileNameUTF8, const VECT RPT_SEVERITY_ERROR ); return false; } + break; case FMT_STEP: @@ -3258,6 +3259,7 @@ bool STEP_PCB_MODEL::getModelLabel( const std::string& aFileNameUTF8, const VECT RPT_SEVERITY_ERROR ); return false; } + break; case FMT_STEPZ: diff --git a/pcbnew/fix_board_shape.cpp b/pcbnew/fix_board_shape.cpp index b15213379f..822655b7c0 100644 --- a/pcbnew/fix_board_shape.cpp +++ b/pcbnew/fix_board_shape.cpp @@ -204,8 +204,8 @@ void ConnectBoardShapes( std::vector& aShapeList, int aChainingEpsil { case 0: segShape->SetStart( arcPts[0] ); break; case 1: segShape->SetStart( arcPts[1] ); break; - case 2: segShape->SetEnd( arcPts[0] ); break; - case 3: segShape->SetEnd( arcPts[1] ); break; + case 2: segShape->SetEnd( arcPts[0] ); break; + case 3: segShape->SetEnd( arcPts[1] ); break; } success = true; @@ -313,8 +313,8 @@ void ConnectBoardShapes( std::vector& aShapeList, int aChainingEpsil { case 0: segShape->SetStart( bezPts[0] ); break; case 1: segShape->SetStart( bezPts[1] ); break; - case 2: segShape->SetEnd( bezPts[0] ); break; - case 3: segShape->SetEnd( bezPts[1] ); break; + case 2: segShape->SetEnd( bezPts[0] ); break; + case 3: segShape->SetEnd( bezPts[1] ); break; } success = true; diff --git a/pcbnew/footprint_edit_frame.cpp b/pcbnew/footprint_edit_frame.cpp index d1877b4ae3..c5baf277f7 100644 --- a/pcbnew/footprint_edit_frame.cpp +++ b/pcbnew/footprint_edit_frame.cpp @@ -539,32 +539,35 @@ void FOOTPRINT_EDIT_FRAME::updateEnabledLayers() // All FPs have these layers enabled LSET enabledLayers = LSET::AllTechMask() | LSET::UserMask(); - const auto configureStackup = [&]( FOOTPRINT_STACKUP aMode, const LSET& aLayerSet ) - { - const LSET cuLayers = aLayerSet & LSET::AllCuMask(); - board.SetCopperLayerCount( cuLayers.count() ); + const auto configureStackup = + [&]( FOOTPRINT_STACKUP aMode, const LSET& aLayerSet ) + { + const LSET cuLayers = aLayerSet & LSET::AllCuMask(); + board.SetCopperLayerCount( cuLayers.count() ); - switch( aMode ) - { - case FOOTPRINT_STACKUP::EXPAND_INNER_LAYERS: - { - enabledLayers |= LSET{ F_Cu, In1_Cu, B_Cu }; - enabledLayers |= LSET::UserDefinedLayersMask( 4 ); - board.SetLayerName( In1_Cu, _( "Inner layers" ) ); - break; - } - case FOOTPRINT_STACKUP::CUSTOM_LAYERS: - { - // Nothing extra to add + switch( aMode ) + { + case FOOTPRINT_STACKUP::EXPAND_INNER_LAYERS: + { + enabledLayers |= LSET{ F_Cu, In1_Cu, B_Cu }; + enabledLayers |= LSET::UserDefinedLayersMask( 4 ); + board.SetLayerName( In1_Cu, _( "Inner layers" ) ); + break; + } - // Clear layer name defaults - board.SetLayerName( In1_Cu, wxEmptyString ); - break; - } - } + case FOOTPRINT_STACKUP::CUSTOM_LAYERS: + { + // Nothing extra to add - enabledLayers |= aLayerSet; - }; + // Clear layer name defaults + board.SetLayerName( In1_Cu, wxEmptyString ); + break; + } + + } + + enabledLayers |= aLayerSet; + }; if( footprint ) { diff --git a/pcbnew/length_delay_calculation/length_delay_calculation.cpp b/pcbnew/length_delay_calculation/length_delay_calculation.cpp index f9fa838554..ff95a9e149 100644 --- a/pcbnew/length_delay_calculation/length_delay_calculation.cpp +++ b/pcbnew/length_delay_calculation/length_delay_calculation.cpp @@ -98,10 +98,10 @@ LENGTH_DELAY_STATS LENGTH_DELAY_CALCULATION::CalculateLengthDetails( std::vector { switch( item.Type() ) { - case LENGTH_DELAY_CALCULATION_ITEM::TYPE::PAD: initialPads++; break; - case LENGTH_DELAY_CALCULATION_ITEM::TYPE::VIA: initialVias++; break; - case LENGTH_DELAY_CALCULATION_ITEM::TYPE::LINE: initialLines++; break; - default: initialUnknown++; break; + case LENGTH_DELAY_CALCULATION_ITEM::TYPE::PAD: initialPads++; break; + case LENGTH_DELAY_CALCULATION_ITEM::TYPE::VIA: initialVias++; break; + case LENGTH_DELAY_CALCULATION_ITEM::TYPE::LINE: initialLines++; break; + default: initialUnknown++; break; } } wxLogTrace( wxT( "PNS_TUNE" ), wxT( "CalculateLengthDetails: initial items - PADs=%d, VIAs=%d, LINEs=%d, UNKNOWN=%d" ), diff --git a/pcbnew/netlist_reader/kicad_netlist_reader.cpp b/pcbnew/netlist_reader/kicad_netlist_reader.cpp index d4e229834f..3cf4eff307 100644 --- a/pcbnew/netlist_reader/kicad_netlist_reader.cpp +++ b/pcbnew/netlist_reader/kicad_netlist_reader.cpp @@ -105,6 +105,7 @@ void KICAD_NETLIST_PARSER::Parse() case T_components: // The section comp starts here. wxLogTrace( "CVPCB_PINCOUNT", wxT( "Parse: entering components section" ) ); + while( ( token = NextTok() ) != T_EOF ) { if( token == T_RIGHT ) @@ -134,6 +135,7 @@ void KICAD_NETLIST_PARSER::Parse() case T_nets: // The section nets starts here. wxLogTrace( "CVPCB_PINCOUNT", wxT( "Parse: entering nets section" ) ); + while( ( token = NextTok() ) != T_EOF ) { if( token == T_RIGHT ) @@ -149,6 +151,7 @@ void KICAD_NETLIST_PARSER::Parse() case T_libparts: // The section libparts starts here. wxLogTrace( "CVPCB_PINCOUNT", wxT( "Parse: entering libparts section" ) ); + while( ( token = NextTok() ) != T_EOF ) { if( token == T_RIGHT ) @@ -423,8 +426,8 @@ void KICAD_NETLIST_PARSER::parseComponent() if( !propName.IsEmpty() ) properties[propName] = std::move( propValue ); - } break; + } case T_fields: while( ( token = NextTok() ) != T_RIGHT ) @@ -576,6 +579,7 @@ void KICAD_NETLIST_PARSER::parseComponent() skipCurrent(); } } + break; } diff --git a/pcbnew/padstack.cpp b/pcbnew/padstack.cpp index 97c6c5fe86..a8b28bfbe8 100644 --- a/pcbnew/padstack.cpp +++ b/pcbnew/padstack.cpp @@ -686,9 +686,9 @@ void PADSTACK::Serialize( google::protobuf::Any& aContainer ) const switch( aProps.mode.value() ) { case PAD_DRILL_POST_MACHINING_MODE::NOT_POST_MACHINED: aProto->set_mode( VDPM_NOT_POST_MACHINED ); break; - case PAD_DRILL_POST_MACHINING_MODE::COUNTERBORE: aProto->set_mode( VDPM_COUNTERBORE ); break; - case PAD_DRILL_POST_MACHINING_MODE::COUNTERSINK: aProto->set_mode( VDPM_COUNTERSINK ); break; - default: break; + case PAD_DRILL_POST_MACHINING_MODE::COUNTERBORE: aProto->set_mode( VDPM_COUNTERBORE ); break; + case PAD_DRILL_POST_MACHINING_MODE::COUNTERSINK: aProto->set_mode( VDPM_COUNTERSINK ); break; + default: break; } } diff --git a/pcbnew/pcb_io/altium/altium_parser_pcb.cpp b/pcbnew/pcb_io/altium/altium_parser_pcb.cpp index 041bf38faf..32a0705618 100644 --- a/pcbnew/pcb_io/altium/altium_parser_pcb.cpp +++ b/pcbnew/pcb_io/altium/altium_parser_pcb.cpp @@ -1258,19 +1258,25 @@ AREGION6::AREGION6( ALTIUM_BINARY_PARSER& aReader, bool aExtendedVertices ) { kind = ALTIUM_REGION_KIND::COPPER; } + break; + case 1: kind = ALTIUM_REGION_KIND::POLYGON_CUTOUT; break; + case 2: kind = ALTIUM_REGION_KIND::DASHED_OUTLINE; break; + case 3: kind = ALTIUM_REGION_KIND::UNKNOWN_3; // TODO: what kind is this? break; + case 4: kind = ALTIUM_REGION_KIND::CAVITY_DEFINITION; break; + default: kind = ALTIUM_REGION_KIND::UNKNOWN; break; diff --git a/pcbnew/pcb_io/cadstar/cadstar_pcb_archive_parser.cpp b/pcbnew/pcb_io/cadstar/cadstar_pcb_archive_parser.cpp index f699be0382..f55781375e 100644 --- a/pcbnew/pcb_io/cadstar/cadstar_pcb_archive_parser.cpp +++ b/pcbnew/pcb_io/cadstar/cadstar_pcb_archive_parser.cpp @@ -726,7 +726,6 @@ void CADSTAR_PCB_ARCHIVE_PARSER::CADSTAR_PAD_SHAPE::Parse( XNODE* aNode, PARSER_ case PAD_SHAPE_TYPE::DIAMOND: case PAD_SHAPE_TYPE::OCTAGON: case PAD_SHAPE_TYPE::SQUARE: - if( aNode->GetChildren() ) { if( aNode->GetChildren()->GetName() == wxT( "ORIENT" ) ) diff --git a/pcbnew/pcb_io/fabmaster/import_fabmaster.cpp b/pcbnew/pcb_io/fabmaster/import_fabmaster.cpp index df23f1e9f4..b762e44866 100644 --- a/pcbnew/pcb_io/fabmaster/import_fabmaster.cpp +++ b/pcbnew/pcb_io/fabmaster/import_fabmaster.cpp @@ -2453,7 +2453,6 @@ bool FABMASTER::loadFootprints( BOARD* aBoard ) switch( seg->shape ) { - case GR_SHAPE_LINE: { const GRAPHIC_LINE* lsrc = static_cast( seg.get() ); @@ -2481,6 +2480,7 @@ bool FABMASTER::loadFootprints( BOARD* aBoard ) fp->Add( line, ADD_MODE::APPEND ); break; } + case GR_SHAPE_CIRCLE: { const GRAPHIC_ARC& lsrc = static_cast( *seg ); @@ -2517,6 +2517,7 @@ bool FABMASTER::loadFootprints( BOARD* aBoard ) fp->Add( circle, ADD_MODE::APPEND ); break; } + case GR_SHAPE_ARC: { const GRAPHIC_ARC* lsrc = static_cast( seg.get() ); @@ -2548,6 +2549,7 @@ bool FABMASTER::loadFootprints( BOARD* aBoard ) fp->Add( arc.release(), ADD_MODE::APPEND ); break; } + case GR_SHAPE_RECTANGLE: { const GRAPHIC_RECTANGLE *lsrc = @@ -2573,6 +2575,7 @@ bool FABMASTER::loadFootprints( BOARD* aBoard ) fp->Add( rect, ADD_MODE::APPEND ); break; } + case GR_SHAPE_TEXT: { const GRAPHIC_TEXT& lsrc = static_cast( *seg ); @@ -2601,6 +2604,7 @@ bool FABMASTER::loadFootprints( BOARD* aBoard ) break; } + default: continue; } @@ -2956,6 +2960,7 @@ bool FABMASTER::loadEtch( BOARD* aBoard, const std::unique_ptr aBoard->Add( trk, ADD_MODE::APPEND ); break; } + case GR_SHAPE_ARC: { const GRAPHIC_ARC* src = static_cast( seg.get() ); @@ -2970,17 +2975,14 @@ bool FABMASTER::loadEtch( BOARD* aBoard, const std::unique_ptr aBoard->Add( trk, ADD_MODE::APPEND ); break; } + default: - { // Defer to the generic graphics factory - for( std::unique_ptr& new_item : - createBoardItems( *aBoard, layer, *seg ) ) - { + for( std::unique_ptr& new_item : createBoardItems( *aBoard, layer, *seg ) ) aBoard->Add( new_item.release(), ADD_MODE::APPEND ); - } + break; } - } } else { @@ -3105,12 +3107,14 @@ bool FABMASTER::traceIsOpen( const FABMASTER::TRACE& aLine ) end = VECTOR2I{ line.end_x, line.end_y }; break; } + case GR_SHAPE_ARC: { const GRAPHIC_ARC& arc = static_cast( *last ); end = VECTOR2I{ arc.end_x, arc.end_y }; break; } + default: // These shapes don't have "ends" that make sense for a polyline break; @@ -3159,6 +3163,7 @@ FABMASTER::createBoardItems( BOARD& aBoard, PCB_LAYER_ID aLayer, FABMASTER::GRAP new_items.emplace_back( std::move( new_text ) ); break; } + case GR_SHAPE_CROSS: { const GRAPHIC_CROSS& src = static_cast( aGraphic ); @@ -3180,6 +3185,7 @@ FABMASTER::createBoardItems( BOARD& aBoard, PCB_LAYER_ID aLayer, FABMASTER::GRAP } break; } + default: { // Simple single shape @@ -3199,6 +3205,7 @@ FABMASTER::createBoardItems( BOARD& aBoard, PCB_LAYER_ID aLayer, FABMASTER::GRAP break; } + case GR_SHAPE_ARC: { const GRAPHIC_ARC& src = static_cast( aGraphic ); @@ -3208,6 +3215,7 @@ FABMASTER::createBoardItems( BOARD& aBoard, PCB_LAYER_ID aLayer, FABMASTER::GRAP src.result.GetP1() ); break; } + case GR_SHAPE_CIRCLE: { const GRAPHIC_ARC& src = static_cast( aGraphic ); @@ -3217,6 +3225,7 @@ FABMASTER::createBoardItems( BOARD& aBoard, PCB_LAYER_ID aLayer, FABMASTER::GRAP new_shape->SetRadius( src.radius ); break; } + case GR_SHAPE_RECTANGLE: { const GRAPHIC_RECTANGLE& src = static_cast( aGraphic ); @@ -3228,6 +3237,7 @@ FABMASTER::createBoardItems( BOARD& aBoard, PCB_LAYER_ID aLayer, FABMASTER::GRAP new_shape->SetFilled( src.fill ); break; } + case GR_SHAPE_POLYGON: { const GRAPHIC_POLYGON& src = static_cast( aGraphic ); @@ -3235,6 +3245,7 @@ FABMASTER::createBoardItems( BOARD& aBoard, PCB_LAYER_ID aLayer, FABMASTER::GRAP new_shape->SetPolyPoints( src.m_pts ); break; } + case GR_SHAPE_OBLONG: { // Create as a polygon, but we could also make a group of two lines and two arcs @@ -3264,12 +3275,11 @@ FABMASTER::createBoardItems( BOARD& aBoard, PCB_LAYER_ID aLayer, FABMASTER::GRAP new_shape->SetPolyShape( poly ); break; } + default: - { wxLogError( _( "Unhandled shape type %d in polygon on layer %s, seq %d %d" ), aGraphic.shape, aGraphic.layer, aGraphic.seq, aGraphic.subseq ); } - } new_items.emplace_back( std::move( new_shape ) ); } diff --git a/pcbnew/pcb_io/kicad_legacy/pcb_io_kicad_legacy.cpp b/pcbnew/pcb_io/kicad_legacy/pcb_io_kicad_legacy.cpp index 02f5b3f32a..d584ca4e92 100644 --- a/pcbnew/pcb_io/kicad_legacy/pcb_io_kicad_legacy.cpp +++ b/pcbnew/pcb_io/kicad_legacy/pcb_io_kicad_legacy.cpp @@ -1416,7 +1416,7 @@ void PCB_IO_KICAD_LEGACY::loadPAD( FOOTPRINT* aFootprint ) switch( padchar ) { case 'C': padshape = static_cast( PAD_SHAPE::CIRCLE ); break; - case 'R': padshape = static_cast( PAD_SHAPE::RECTANGLE ); break; + case 'R': padshape = static_cast( PAD_SHAPE::RECTANGLE ); break; case 'O': padshape = static_cast( PAD_SHAPE::OVAL ); break; case 'T': padshape = static_cast( PAD_SHAPE::TRAPEZOID ); break; default: @@ -1952,9 +1952,11 @@ void PCB_IO_KICAD_LEGACY::loadPCB_LINE() dseg->SetLayer( leg_layer2new( m_cu_count, layer ) ); break; + case 1: ignore_unused( intParse( data ) ); break; + case 2: { EDA_ANGLE angle = degParse( data ); @@ -1964,15 +1966,16 @@ void PCB_IO_KICAD_LEGACY::loadPCB_LINE() break; } + case 3: const_cast( dseg->m_Uuid ) = KIID( data ); break; + case 4: - { // Ignore state data hexParse( data ); break; - } + // Bezier Control Points case 5: x = biuParse( data ); @@ -2270,7 +2273,7 @@ void PCB_IO_KICAD_LEGACY::loadTrackList( int aStructType ) { default: case PCB_TRACE_T: newTrack = new PCB_TRACK( m_board ); break; - case PCB_VIA_T: newVia = new PCB_VIA( m_board ); break; + case PCB_VIA_T: newVia = new PCB_VIA( m_board ); break; } if( makeType == PCB_VIA_T ) // Ensure layers are OK when possible: diff --git a/pcbnew/pcb_plot_params.cpp b/pcbnew/pcb_plot_params.cpp index a362a3b158..ecdbbb527c 100644 --- a/pcbnew/pcb_plot_params.cpp +++ b/pcbnew/pcb_plot_params.cpp @@ -766,7 +766,7 @@ void PCB_PLOT_PARAMS_PARSER::Parse( PCB_PLOT_PARAMS* aPcbPlotParams ) case T_outputformat: aPcbPlotParams->m_format = static_cast( parseInt( static_cast( PLOT_FORMAT::FIRST_FORMAT ), - static_cast( PLOT_FORMAT::LAST_FORMAT ) ) ); + static_cast( PLOT_FORMAT::LAST_FORMAT ) ) ); break; case T_mirror: diff --git a/pcbnew/pcb_track.cpp b/pcbnew/pcb_track.cpp index 26f324088b..84e1844bf4 100644 --- a/pcbnew/pcb_track.cpp +++ b/pcbnew/pcb_track.cpp @@ -172,10 +172,10 @@ wxString PCB_VIA::GetItemDescription( UNITS_PROVIDER* aUnitsProvider, bool aFull switch( GetViaType() ) { - case VIATYPE::BLIND: formatStr = _( "Blind via %s on %s" ); break; + case VIATYPE::BLIND: formatStr = _( "Blind via %s on %s" ); break; case VIATYPE::BURIED: formatStr = _( "Buried via %s on %s" ); break; - case VIATYPE::MICROVIA: formatStr = _( "Micro via %s on %s" ); break; - default: formatStr = _( "Via %s on %s" ); break; + case VIATYPE::MICROVIA: formatStr = _( "Micro via %s on %s" ); break; + default: formatStr = _( "Via %s on %s" ); break; } return wxString::Format( formatStr, GetNetnameMsg(), LayerMaskDescribe() ); @@ -1935,13 +1935,11 @@ bool PCB_VIA::FlashLayer( int aLayer ) const return true; case UNCONNECTED_LAYER_MODE::REMOVE_EXCEPT_START_AND_END: - { if( layer == Padstack().Drill().start || layer == Padstack().Drill().end ) return true; // Check for removal below break; - } case UNCONNECTED_LAYER_MODE::REMOVE_ALL: // Check for removal below @@ -2393,11 +2391,11 @@ void PCB_VIA::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vectorMessageTextFromValue( GetWidth( PADSTACK::ALL_LAYERS ) ) ); + aList.emplace_back( _( "Diameter" ), aFrame->MessageTextFromValue( GetWidth( PADSTACK::ALL_LAYERS ) ) ); aList.emplace_back( _( "Hole" ), aFrame->MessageTextFromValue( GetDrillValue() ) ); wxString source; int clearance = GetOwnClearance( GetLayer(), &source ); - aList.emplace_back( wxString::Format( _( "Min Clearance: %s" ), - aFrame->MessageTextFromValue( clearance ) ), + aList.emplace_back( wxString::Format( _( "Min Clearance: %s" ), aFrame->MessageTextFromValue( clearance ) ), wxString::Format( _( "(from %s)" ), source ) ); int minAnnulus = GetMinAnnulus( GetLayer(), &source ); - aList.emplace_back( wxString::Format( _( "Min Annular Width: %s" ), - aFrame->MessageTextFromValue( minAnnulus ) ), + aList.emplace_back( wxString::Format( _( "Min Annular Width: %s" ), aFrame->MessageTextFromValue( minAnnulus ) ), wxString::Format( _( "(from %s)" ), source ) ); } -void PCB_TRACK::GetMsgPanelInfoBase_Common( EDA_DRAW_FRAME* aFrame, - std::vector& aList ) const +void PCB_TRACK::GetMsgPanelInfoBase_Common( EDA_DRAW_FRAME* aFrame, std::vector& aList ) const { aList.emplace_back( _( "Net" ), UnescapeString( GetNetname() ) ); diff --git a/pcbnew/pcbnew_jobs_handler.cpp b/pcbnew/pcbnew_jobs_handler.cpp index 5c9925357d..7fd980b715 100644 --- a/pcbnew/pcbnew_jobs_handler.cpp +++ b/pcbnew/pcbnew_jobs_handler.cpp @@ -608,15 +608,15 @@ int PCBNEW_JOBS_HANDLER::JobExportStep( JOB* aJob ) switch( aStepJob->m_format ) { - case JOB_EXPORT_PCB_3D::FORMAT::STEP: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::STEP; break; + case JOB_EXPORT_PCB_3D::FORMAT::STEP: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::STEP; break; case JOB_EXPORT_PCB_3D::FORMAT::STEPZ: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::STEPZ; break; - case JOB_EXPORT_PCB_3D::FORMAT::BREP: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::BREP; break; - case JOB_EXPORT_PCB_3D::FORMAT::XAO: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::XAO; break; - case JOB_EXPORT_PCB_3D::FORMAT::GLB: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::GLB; break; - case JOB_EXPORT_PCB_3D::FORMAT::PLY: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::PLY; break; - case JOB_EXPORT_PCB_3D::FORMAT::STL: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::STL; break; - case JOB_EXPORT_PCB_3D::FORMAT::U3D: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::U3D; break; - case JOB_EXPORT_PCB_3D::FORMAT::PDF: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::PDF; break; + case JOB_EXPORT_PCB_3D::FORMAT::BREP: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::BREP; break; + case JOB_EXPORT_PCB_3D::FORMAT::XAO: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::XAO; break; + case JOB_EXPORT_PCB_3D::FORMAT::GLB: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::GLB; break; + case JOB_EXPORT_PCB_3D::FORMAT::PLY: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::PLY; break; + case JOB_EXPORT_PCB_3D::FORMAT::STL: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::STL; break; + case JOB_EXPORT_PCB_3D::FORMAT::U3D: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::U3D; break; + case JOB_EXPORT_PCB_3D::FORMAT::PDF: params.m_Format = EXPORTER_STEP_PARAMS::FORMAT::PDF; break; default: m_reporter->Report( _( "Unknown export format" ), RPT_SEVERITY_ERROR ); return CLI::EXIT_CODES::ERR_UNKNOWN; // shouldnt have gotten here @@ -1699,17 +1699,21 @@ int PCBNEW_JOBS_HANDLER::JobExportDrill( JOB* aJob ) if( aDrillJob->m_format == JOB_EXPORT_PCB_DRILL::DRILL_FORMAT::EXCELLON ) { EXCELLON_WRITER::ZEROS_FMT zeroFmt; + switch( aDrillJob->m_zeroFormat ) { case JOB_EXPORT_PCB_DRILL::ZEROS_FORMAT::KEEP_ZEROS: zeroFmt = EXCELLON_WRITER::KEEP_ZEROS; break; + case JOB_EXPORT_PCB_DRILL::ZEROS_FORMAT::SUPPRESS_LEADING: zeroFmt = EXCELLON_WRITER::SUPPRESS_LEADING; break; + case JOB_EXPORT_PCB_DRILL::ZEROS_FORMAT::SUPPRESS_TRAILING: zeroFmt = EXCELLON_WRITER::SUPPRESS_TRAILING; break; + case JOB_EXPORT_PCB_DRILL::ZEROS_FORMAT::DECIMAL: default: zeroFmt = EXCELLON_WRITER::DECIMAL_FORMAT; @@ -2250,7 +2254,7 @@ int PCBNEW_JOBS_HANDLER::JobExportDrc( JOB* aJob ) switch( drcJob->m_units ) { - case JOB_PCB_DRC::UNITS::INCH: units = EDA_UNITS::INCH; break; + case JOB_PCB_DRC::UNITS::INCH: units = EDA_UNITS::INCH; break; case JOB_PCB_DRC::UNITS::MILS: units = EDA_UNITS::MILS; break; case JOB_PCB_DRC::UNITS::MM: units = EDA_UNITS::MM; break; default: units = EDA_UNITS::MM; break; @@ -2600,9 +2604,11 @@ int PCBNEW_JOBS_HANDLER::JobExportOdb( JOB* aJob ) case JOB_EXPORT_PCB_ODB::ODB_COMPRESSION::ZIP: fn.SetExt( FILEEXT::ArchiveFileExtension ); break; + case JOB_EXPORT_PCB_ODB::ODB_COMPRESSION::TGZ: fn.SetExt( "tgz" ); break; + default: break; }; diff --git a/pcbnew/router/pns_meander.cpp b/pcbnew/router/pns_meander.cpp index d93125cd9b..054f019dc9 100644 --- a/pcbnew/router/pns_meander.cpp +++ b/pcbnew/router/pns_meander.cpp @@ -561,12 +561,10 @@ SHAPE_LINE_CHAIN MEANDER_SHAPE::genMeanderShape( const VECTOR2D& aP, const VECTO switch( aType ) { case MT_EMPTY: - { lc.Append( aP + dir_v_b + aDir ); break; - } + case MT_START: - { if( targetBaseLen ) top = std::max( top, targetBaseLen - sCorner - uCorner * 2 + offset ); @@ -575,10 +573,8 @@ SHAPE_LINE_CHAIN MEANDER_SHAPE::genMeanderShape( const VECTOR2D& aP, const VECTO forward( std::min( sCorner, uCorner ) ); forward( std::abs( offset ) ); break; - } case MT_FINISH: - { if( targetBaseLen ) top = std::max( top, targetBaseLen - cr - spc ); @@ -595,10 +591,8 @@ SHAPE_LINE_CHAIN MEANDER_SHAPE::genMeanderShape( const VECTOR2D& aP, const VECTO lc.Append( aP + dir_v_b + aDir.Resize( 2 * spc - cr ) ); break; - } case MT_TURN: - { if( targetBaseLen ) top = std::max( top, targetBaseLen - uCorner * 2 + offset * 2 ); @@ -608,10 +602,8 @@ SHAPE_LINE_CHAIN MEANDER_SHAPE::genMeanderShape( const VECTOR2D& aP, const VECTO uShape( turnSide, uCorner, top ); forward( std::abs( offset ) ); break; - } case MT_SINGLE: - { if( targetBaseLen ) top = std::max( top, ( targetBaseLen - sCorner * 2 - uCorner * 2 ) / 2 ); @@ -620,7 +612,6 @@ SHAPE_LINE_CHAIN MEANDER_SHAPE::genMeanderShape( const VECTOR2D& aP, const VECTO miter( sCorner, false ); lc.Append( aP + dir_v_b + aDir.Resize( 2 * spc ) ); break; - } default: break; diff --git a/pcbnew/teardrop/teardrop_parameters.cpp b/pcbnew/teardrop/teardrop_parameters.cpp index b512dce3f1..a61b0d49e2 100644 --- a/pcbnew/teardrop/teardrop_parameters.cpp +++ b/pcbnew/teardrop/teardrop_parameters.cpp @@ -36,7 +36,7 @@ std::string GetTeardropTargetCanonicalName( TARGET_TD aTdType ) switch( aTdType ) { case TARGET_ROUND: name = TARGET_NAME_ROUND; break; - case TARGET_RECT: name = TARGET_NAME_RECT; break; + case TARGET_RECT: name = TARGET_NAME_RECT; break; case TARGET_TRACK: name = TARGET_NAME_TRACK; break; default: break; } diff --git a/pcbnew/undo_redo.cpp b/pcbnew/undo_redo.cpp index 0af2f77b3f..83f72f5ff0 100644 --- a/pcbnew/undo_redo.cpp +++ b/pcbnew/undo_redo.cpp @@ -326,7 +326,6 @@ void PCB_BASE_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList ) switch( item_itr->second ) { case ITEM_CHANGE_TYPE::ADDED: - { if( change_type == ITEM_CHANGE_TYPE::DELETED ) { // The item was previously added, now deleted - as far as bulk callbacks @@ -341,16 +340,14 @@ void PCB_BASE_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList ) // For all other cases, the item remains as ADDED as seen by the bulk callbacks break; - } + case ITEM_CHANGE_TYPE::DELETED: - { // This is an error condition - item has already been deleted so should not // be operated on further wxASSERT_MSG( false, wxT( "UndoRedo: should not alter already deleted item" ) ); break; - } + case ITEM_CHANGE_TYPE::CHANGED: - { if( change_type == ITEM_CHANGE_TYPE::DELETED ) { item_itr->second = ITEM_CHANGE_TYPE::DELETED; @@ -365,7 +362,6 @@ void PCB_BASE_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList ) // Otherwise, item remains CHANGED break; } - } }; // Undo in the reverse order of list creation: (this can allow stacked changes diff --git a/pcbnew/widgets/search_handlers.cpp b/pcbnew/widgets/search_handlers.cpp index 3c4e3911d5..72055b83b3 100644 --- a/pcbnew/widgets/search_handlers.cpp +++ b/pcbnew/widgets/search_handlers.cpp @@ -836,24 +836,15 @@ wxString DRILL_SEARCH_HANDLER::cellText( const DRILL_LINE_ITEM& e, int col ) con switch( col ) { - case 0: - return wxString::Format( "%d", e.m_Qty ); - case 1: - return e.shape == PAD_DRILL_SHAPE::CIRCLE ? _( "Round" ) : _( "Slot" ); - case 2: - return m_frame->MessageTextFromValue( e.xSize ); - case 3: - return m_frame->MessageTextFromValue( e.ySize ); - case 4: - return e.isPlated ? _( "PTH" ) : _( "NPTH" ); - case 5: - return e.isPad ? _( "Pad" ) : _( "Via" ); - case 6: - return ( e.startLayer == UNDEFINED_LAYER ) ? _( "N/A" ) : board->GetLayerName( e.startLayer ); - case 7: - return ( e.stopLayer == UNDEFINED_LAYER ) ? _( "N/A" ) : board->GetLayerName( e.stopLayer ); - default: - return wxEmptyString; + case 0: return wxString::Format( "%d", e.m_Qty ); + case 1: return e.shape == PAD_DRILL_SHAPE::CIRCLE ? _( "Round" ) : _( "Slot" ); + case 2: return m_frame->MessageTextFromValue( e.xSize ); + case 3: return m_frame->MessageTextFromValue( e.ySize ); + case 4: return e.isPlated ? _( "PTH" ) : _( "NPTH" ); + case 5: return e.isPad ? _( "Pad" ) : _( "Via" ); + case 6: return ( e.startLayer == UNDEFINED_LAYER ) ? _( "N/A" ) : board->GetLayerName( e.startLayer ); + case 7: return ( e.stopLayer == UNDEFINED_LAYER ) ? _( "N/A" ) : board->GetLayerName( e.stopLayer ); + default: return wxEmptyString; } } diff --git a/plugins/3d/vrml/v1/vrml1_base.cpp b/plugins/3d/vrml/v1/vrml1_base.cpp index e1b3f381e9..488c8c01c3 100644 --- a/plugins/3d/vrml/v1/vrml1_base.cpp +++ b/plugins/3d/vrml/v1/vrml1_base.cpp @@ -251,49 +251,42 @@ bool WRL1BASE::ReadNode( WRLPROC& proc, WRL1NODE* aParent, WRL1NODE** aNode ) switch( ntype ) { case WRL1NODES::WRL1_GROUP: - if( !readGroup( proc, aParent, aNode ) ) return false; break; case WRL1NODES::WRL1_SEPARATOR: - if( !readSeparator( proc, aParent, aNode ) ) return false; break; case WRL1NODES::WRL1_SWITCH: - if( !readSwitch( proc, aParent, aNode ) ) return false; break; case WRL1NODES::WRL1_MATERIAL: - if( !readMaterial( proc, aParent, aNode ) ) return false; break; case WRL1NODES::WRL1_MATERIALBINDING: - if( !readMatBinding( proc, aParent, aNode ) ) return false; break; case WRL1NODES::WRL1_COORDINATE3: - if( !readCoords( proc, aParent, aNode ) ) return false; break; case WRL1NODES::WRL1_INDEXEDFACESET: - if( !readFaceSet( proc, aParent, aNode ) ) return false; @@ -303,14 +296,12 @@ bool WRL1BASE::ReadNode( WRLPROC& proc, WRL1NODE* aParent, WRL1NODE** aNode ) case WRL1NODES::WRL1_TRANSLATION: case WRL1NODES::WRL1_ROTATION: case WRL1NODES::WRL1_SCALE: - if( !readTransform( proc, aParent, aNode ) ) return false; break; case WRL1NODES::WRL1_SHAPEHINTS: - if( !readShapeHints( proc, aParent, aNode ) ) return false; @@ -320,7 +311,6 @@ bool WRL1BASE::ReadNode( WRLPROC& proc, WRL1NODE* aParent, WRL1NODE** aNode ) // items not implemented or for optional future implementation: // default: - if( !proc.DiscardNode() ) { wxLogTrace( traceVrmlPlugin, diff --git a/qa/tests/eeschema/test_ee_item.cpp b/qa/tests/eeschema/test_ee_item.cpp index 97f9733add..b701c76fde 100644 --- a/qa/tests/eeschema/test_ee_item.cpp +++ b/qa/tests/eeschema/test_ee_item.cpp @@ -89,6 +89,7 @@ public: case SCH_BUS_WIRE_ENTRY_T: return new SCH_BUS_WIRE_ENTRY(); case SCH_BUS_BUS_ENTRY_T: return new SCH_BUS_BUS_ENTRY(); case SCH_LINE_T: return new SCH_LINE(); + case SCH_RULE_AREA_T: { SHAPE_POLY_SET ruleShape; @@ -107,11 +108,13 @@ public: return ruleArea; } + case SCH_SHAPE_T: return new SCH_SHAPE( SHAPE_T::ARC, LAYER_NOTES ); case SCH_BITMAP_T: return new SCH_BITMAP(); case SCH_TEXT_T: return new SCH_TEXT( VECTOR2I( 0, 0 ), "test text" ); case SCH_TEXTBOX_T: return new SCH_TEXTBOX( LAYER_NOTES, 0, FILL_T::NO_FILL, "test textbox" ); case SCH_TABLECELL_T: return new SCH_TABLECELL(); + case SCH_TABLE_T: { SCH_TABLE* table = new SCH_TABLE( schIUScale.mmToIU( 0.1 ) ); @@ -123,6 +126,7 @@ public: return table; } + case SCH_LABEL_T: return new SCH_LABEL( VECTOR2I( 0, 0 ), "test label" ); case SCH_DIRECTIVE_LABEL_T: return new SCH_DIRECTIVE_LABEL( VECTOR2I( 0, 0 ) ); case SCH_GLOBAL_LABEL_T: return new SCH_GLOBALLABEL(); @@ -139,6 +143,7 @@ public: case SCH_SHEET_T: return new SCH_SHEET(); case SCH_PIN_T: return new SCH_PIN( &m_symbol ); + case SCH_GROUP_T: { SCH_GROUP* group = new SCH_GROUP(); diff --git a/scripting/python_scripting.cpp b/scripting/python_scripting.cpp index 89c2aaf228..081b936ef6 100644 --- a/scripting/python_scripting.cpp +++ b/scripting/python_scripting.cpp @@ -554,15 +554,10 @@ wxString SCRIPTING::PyScriptingPath( PATH_TYPE aPathType ) { const ENV_VAR_MAP& env = Pgm().GetLocalEnvVariables(); - if( std::optional v = ENV_VAR::GetVersionedEnvVarValue( env, - wxT( "3RD_PARTY" ) ) ) - { + if( std::optional v = ENV_VAR::GetVersionedEnvVarValue( env, wxT( "3RD_PARTY" ) ) ) path = *v; - } else - { path = PATHS::GetDefault3rdPartyPath(); - } break; }