From 9bd55224199850975dd541950be4fdf6e9c371d9 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 23 Oct 2017 09:20:10 +0200 Subject: [PATCH] Add a gerber test file remove a few minor coverity warnings --- .../Ucamco_Polarities_and_Apertures.gbr | 89 +++++++++++++++++++ pcbnew/specctra.cpp | 3 + pcbnew/tools/position_relative_tool.cpp | 6 +- 3 files changed, 93 insertions(+), 5 deletions(-) create mode 100644 gerbview/gerber_test_files/Ucamco_Polarities_and_Apertures.gbr diff --git a/gerbview/gerber_test_files/Ucamco_Polarities_and_Apertures.gbr b/gerbview/gerber_test_files/Ucamco_Polarities_and_Apertures.gbr new file mode 100644 index 0000000000..721fe74bc2 --- /dev/null +++ b/gerbview/gerber_test_files/Ucamco_Polarities_and_Apertures.gbr @@ -0,0 +1,89 @@ +G04 Ucamco ex. 2: Shapes* +%FSLAX26Y26*% +%MOIN*% +%TF.Part,Other,sample*% +%LPD*% +G04 Define Apertures* +%AMTARGET125* +6,0,0,0.125,.01,0.01,3,0.003, 0.150,0*% +%AMTHERMAL80* +7,0,0,0.080,0.055,0.0125,45*% +%ADD10C,0.01*% +%ADD11C,0.06*% +%ADD12R,0.06X0.06*% +%ADD13R,0.04X0.100*% +%ADD14R,0.100X0.04*% +%ADD15O,0.04X0.100*% +%ADD16P,0.100X3*% +%ADD18TARGET125*% +%ADD19THERMAL80*% +G04 Start image generation* +D10* +X0Y250000D02* +G01* +X0Y0D01* +X250000Y0D01* +X1000000Y1000000D02* +X1500000D01* +X2000000Y1500000D01* +X2500000D02* +Y1000000D01* +D11* +X1000000Y1000000D03* +X2000000D03* +X2500000D03* +Y1500000D03* +X2000000D03* +D12* +X1000000Y1500000D03* +D13* +X3000000Y1500000D03* +D14* +Y1250000D03* +D15* +Y1000000D03* +D10* +X3750000Y1000000D02* +G75* +G03* +X3750000Y1000000I250000J0D01* +D16* +X3400000Y1000000D03* +X3500000Y900000D03* +D10* +G36* +X500000Y2000000D02* +G01* +Y3750000D01* +X3750000D01* +Y2000000D01* +X500000D01* +G37* +D18* +X0Y3875000D03* +X3875000Y3875000D03* +%LPC*% +G36* +X1000000Y2500000D02* +Y3000000D01* +G74* +G02* +X1250000Y3250000I250000J0D01* +G01* +X3000000D01* +G75* +G02* +X3000000Y2500000I0J-375000D01* +G01* +X1000000D01* +G37* +%LPD*% +D10* +X1500000Y2875000D02* +X2000000D01* +D11* +X1500000Y2875000D03* +X2000000D03* +D19* +X2875000Y2875000D03* +M02* \ No newline at end of file diff --git a/pcbnew/specctra.cpp b/pcbnew/specctra.cpp index 6bcd060988..0040a25dd2 100644 --- a/pcbnew/specctra.cpp +++ b/pcbnew/specctra.cpp @@ -842,6 +842,7 @@ void SPECCTRA_DB::doKEEPOUT( KEEPOUT* growth ) case T_polyline_path: tok = T_path; + // Fall through case T_path: case T_polygon: if( growth->shape ) @@ -936,6 +937,7 @@ void SPECCTRA_DB::doWINDOW( WINDOW* growth ) case T_polyline_path: tok = T_path; + // Fall through case T_path: case T_polygon: if( growth->shape ) @@ -2053,6 +2055,7 @@ void SPECCTRA_DB::doSHAPE( SHAPE* growth ) { case T_polyline_path: tok = T_path; + // Fall through case T_rect: case T_circle: case T_path: diff --git a/pcbnew/tools/position_relative_tool.cpp b/pcbnew/tools/position_relative_tool.cpp index 765a8ebd14..e016f077b9 100644 --- a/pcbnew/tools/position_relative_tool.cpp +++ b/pcbnew/tools/position_relative_tool.cpp @@ -48,11 +48,7 @@ TOOL_ACTION PCB_ACTIONS::positionRelative( "pcbnew.PositionRelative.positionRela TOOL_ACTION PCB_ACTIONS::selectpositionRelativeItem( "pcbnew.PositionRelative.selectpositionRelativeItem", - AS_GLOBAL, - 0, - "", - "", - nullptr ); + AS_GLOBAL, 0, "", "", nullptr ); POSITION_RELATIVE_TOOL::POSITION_RELATIVE_TOOL() :