From f5e9a2a6da16f9955ffd1e3aace77f60c9c238f3 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Sun, 22 Nov 2020 15:44:57 -0500 Subject: [PATCH] Use "microns" as the name to be consistent with DXF specification --- pcbnew/import_gfx/dxf_import_plugin.cpp | 4 ++-- pcbnew/import_gfx/dxf_import_plugin.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pcbnew/import_gfx/dxf_import_plugin.cpp b/pcbnew/import_gfx/dxf_import_plugin.cpp index bba97f007a..5329deab8c 100644 --- a/pcbnew/import_gfx/dxf_import_plugin.cpp +++ b/pcbnew/import_gfx/dxf_import_plugin.cpp @@ -787,7 +787,7 @@ double DXF_IMPORT_PLUGIN::getCurrentUnitScale() scale = 1.0e-6; break; - case DXF_IMPORT_UNITS::MICROMETERS: + case DXF_IMPORT_UNITS::MICRONS: scale = 1.0e-3; break; @@ -873,7 +873,7 @@ void DXF_IMPORT_PLUGIN::setVariableInt( const std::string& key, int value, int c break; case 13: // micrometers - m_currentUnit = DXF_IMPORT_UNITS::MICROMETERS; + m_currentUnit = DXF_IMPORT_UNITS::MICRONS; break; case 14: // decimeters diff --git a/pcbnew/import_gfx/dxf_import_plugin.h b/pcbnew/import_gfx/dxf_import_plugin.h index 0fdd84aeb9..615f3d1833 100644 --- a/pcbnew/import_gfx/dxf_import_plugin.h +++ b/pcbnew/import_gfx/dxf_import_plugin.h @@ -147,7 +147,7 @@ enum class DXF_IMPORT_UNITS YARDS = 10, ANGSTROMS = 11, NANOMETERS = 12, - MICROMETERS = 13, + MICRONS = 13, DECIMETERS = 14, DECAMETERS = 15, HECTOMETERS = 16,