AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-07 21:55:32 +00:00
Files Issues Releases Activity

Remove shadowed type (DRILL_MARKS).

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/20522
This commit is contained in:
Jeff Young 2025-03-31 19:59:13 +01:00
parent 688448f9ab
commit 6e566b2819
8 changed files with 17 additions and 36 deletions

7
common/jobs/job_export_pcb_pdf.cpp
View File

@ -22,13 +22,6 @@
#include <jobs/job_registry.h>
#include <i18n_utility.h>
NLOHMANN_JSON_SERIALIZE_ENUM( JOB_EXPORT_PCB_PDF::DRILL_MARKS,
{
{ JOB_EXPORT_PCB_PDF::DRILL_MARKS::NO_DRILL_SHAPE, "none" },
{ JOB_EXPORT_PCB_PDF::DRILL_MARKS::SMALL_DRILL_SHAPE, "small" },
{ JOB_EXPORT_PCB_PDF::DRILL_MARKS::FULL_DRILL_SHAPE, "full" }
} )
NLOHMANN_JSON_SERIALIZE_ENUM( JOB_EXPORT_PCB_PDF::GEN_MODE,
{
{ JOB_EXPORT_PCB_PDF::GEN_MODE::ALL_LAYERS_ONE_FILE, "all-layers-one-file" },

7
common/jobs/job_export_pcb_plot.cpp
View File

@ -19,6 +19,13 @@
#include <jobs/job_export_pcb_plot.h>
NLOHMANN_JSON_SERIALIZE_ENUM( DRILL_MARKS,
{
{ DRILL_MARKS::NO_DRILL_SHAPE, "none" },
{ DRILL_MARKS::SMALL_DRILL_SHAPE, "small" },
{ DRILL_MARKS::FULL_DRILL_SHAPE, "full" }
} )
JOB_EXPORT_PCB_PLOT::JOB_EXPORT_PCB_PLOT( PLOT_FORMAT aFormat, const std::string& aType,
bool aOutputIsDirectory ) :
JOB( aType, aOutputIsDirectory ),

9
common/jobs/job_export_pcb_plot.h
View File

@ -21,7 +21,7 @@
#pragma once
#include <kicommon.h>
#include <kicommon.h>
#include <plotprint_opts.h>
#include <layer_ids.h>
#include <lseq.h>
#include <wx/string.h>
@ -74,13 +74,6 @@ public:
///< Layers to include on all individual layer prints
LSEQ m_plotOnAllLayersSequence;
enum class DRILL_MARKS
{
NO_DRILL_SHAPE = 0,
SMALL_DRILL_SHAPE = 1,
FULL_DRILL_SHAPE = 2
};
///< Used by SVG & PDF
DRILL_MARKS m_drillShapeOption;

2
kicad/cli/command_pcb_export_dxf.cpp
View File

@ -144,7 +144,7 @@ int CLI::PCB_EXPORT_DXF_COMMAND::doPerform( KIWAY& aKiway )
wxFprintf( stdout, DEPRECATED_ARD_PLOT_INVISIBLE_TEXT_WARNING );
int drillShape = m_argParser.get<int>( ARG_DRILL_SHAPE_OPTION );
dxfJob->m_drillShapeOption = static_cast<JOB_EXPORT_PCB_DXF::DRILL_MARKS>( drillShape );
dxfJob->m_drillShapeOption = static_cast<DRILL_MARKS>( drillShape );
wxString units = From_UTF8( m_argParser.get<std::string>( ARG_OUTPUT_UNITS ).c_str() );

2
kicad/cli/command_pcb_export_pdf.cpp
View File

@ -151,7 +151,7 @@ int CLI::PCB_EXPORT_PDF_COMMAND::doPerform( KIWAY& aKiway )
pdfJob->m_crossoutDNPFPsOnFabLayers = m_argParser.get<bool>( ARG_CROSSOUT_DNP_FPS_ON_FAB_LAYERS );
int drillShape = m_argParser.get<int>( ARG_DRILL_SHAPE_OPTION );
pdfJob->m_drillShapeOption = static_cast<JOB_EXPORT_PCB_PDF::DRILL_MARKS>( drillShape );
pdfJob->m_drillShapeOption = static_cast<DRILL_MARKS>( drillShape );
bool argModeMulti = m_argParser.get<bool>( ARG_MODE_MULTIPAGE );
bool argModeSeparate = m_argParser.get<bool>( ARG_MODE_SEPARATE );

2
kicad/cli/command_pcb_export_svg.cpp
View File

@ -134,7 +134,7 @@ int CLI::PCB_EXPORT_SVG_COMMAND::doPerform( KIWAY& aKiway )
svgJob->m_sketchDNPFPsOnFabLayers = m_argParser.get<bool>( ARG_SKETCH_DNP_FPS_ON_FAB_LAYERS );
svgJob->m_crossoutDNPFPsOnFabLayers = m_argParser.get<bool>( ARG_CROSSOUT_DNP_FPS_ON_FAB_LAYERS );
int drillShape = m_argParser.get<int>( ARG_DRILL_SHAPE_OPTION );
svgJob->m_drillShapeOption = static_cast<JOB_EXPORT_PCB_SVG::DRILL_MARKS>( drillShape );
svgJob->m_drillShapeOption = static_cast<DRILL_MARKS>( drillShape );
svgJob->m_drawingSheet = m_argDrawingSheet;
svgJob->m_subtractSolderMaskFromSilk = m_argParser.get<bool>( ARG_SUBTRACT_SOLDERMASK );

12
pcbnew/dialogs/dialog_plot.cpp
View File

@ -498,16 +498,10 @@ void DIALOG_PLOT::transferPlotParamsToJob()
{
switch( m_plotOpts.GetDrillMarksType() )
{
case DRILL_MARKS::NO_DRILL_SHAPE:
m_job->m_drillShapeOption = JOB_EXPORT_PCB_PLOT::DRILL_MARKS::NO_DRILL_SHAPE;
break;
case DRILL_MARKS::SMALL_DRILL_SHAPE:
m_job->m_drillShapeOption = JOB_EXPORT_PCB_PLOT::DRILL_MARKS::SMALL_DRILL_SHAPE;
break;
case DRILL_MARKS::NO_DRILL_SHAPE: m_job->m_drillShapeOption = DRILL_MARKS::NO_DRILL_SHAPE; break;
case DRILL_MARKS::SMALL_DRILL_SHAPE: m_job->m_drillShapeOption = DRILL_MARKS::SMALL_DRILL_SHAPE; break;
default:
case DRILL_MARKS::FULL_DRILL_SHAPE:
m_job->m_drillShapeOption = JOB_EXPORT_PCB_PLOT::DRILL_MARKS::FULL_DRILL_SHAPE;
break;
case DRILL_MARKS::FULL_DRILL_SHAPE: m_job->m_drillShapeOption = DRILL_MARKS::FULL_DRILL_SHAPE; break;
}
}

12
pcbnew/pcb_plotter.cpp
View File

@ -434,16 +434,10 @@ void PCB_PLOTTER::PlotJobToPlotOpts( PCB_PLOT_PARAMS& aOpts, JOB_EXPORT_PCB_PLOT
switch( aJob->m_drillShapeOption )
{
case JOB_EXPORT_PCB_PLOT::DRILL_MARKS::NO_DRILL_SHAPE:
aOpts.SetDrillMarksType( DRILL_MARKS::NO_DRILL_SHAPE );
break;
case JOB_EXPORT_PCB_PLOT::DRILL_MARKS::SMALL_DRILL_SHAPE:
aOpts.SetDrillMarksType( DRILL_MARKS::SMALL_DRILL_SHAPE );
break;
case DRILL_MARKS::NO_DRILL_SHAPE: aOpts.SetDrillMarksType( DRILL_MARKS::NO_DRILL_SHAPE ); break;
case DRILL_MARKS::SMALL_DRILL_SHAPE: aOpts.SetDrillMarksType( DRILL_MARKS::SMALL_DRILL_SHAPE ); break;
default:
case JOB_EXPORT_PCB_PLOT::DRILL_MARKS::FULL_DRILL_SHAPE:
aOpts.SetDrillMarksType( DRILL_MARKS::FULL_DRILL_SHAPE );
break;
case DRILL_MARKS::FULL_DRILL_SHAPE: aOpts.SetDrillMarksType( DRILL_MARKS::FULL_DRILL_SHAPE ); break;
}
SETTINGS_MANAGER& mgr = Pgm().GetSettingsManager();