diff --git a/pcbnew/class_zone.h b/pcbnew/class_zone.h index 769ff58dde..b59f8a7108 100644 --- a/pcbnew/class_zone.h +++ b/pcbnew/class_zone.h @@ -726,7 +726,7 @@ private: int m_ZoneMinThickness; ///< Minimum thickness value in filled areas. /** The number of segments to convert a circle to a polygon. Valid values are - #ARC_APPROX_SEGMENTS_COUNT_LOW_DEF or #ARC_APPROX_SEGMENTS_COUNT_HIGHT_DEF. */ + #ARC_APPROX_SEGMENTS_COUNT_LOW_DEF or #ARC_APPROX_SEGMENTS_COUNT_HIGH_DEF. */ int m_ArcToSegmentsCount; /** True when a zone was filled, false after deleting the filled areas. */ diff --git a/pcbnew/legacy_plugin.cpp b/pcbnew/legacy_plugin.cpp index 49d728c772..81b8ff83fd 100644 --- a/pcbnew/legacy_plugin.cpp +++ b/pcbnew/legacy_plugin.cpp @@ -2617,7 +2617,7 @@ void LEGACY_PLUGIN::loadZONE_CONTAINER() zc->SetFillMode( fillmode ? ZFM_SEGMENTS : ZFM_POLYGONS ); - // @todo ARC_APPROX_SEGMENTS_COUNT_HIGHT_DEF: don't really want pcbnew.h + // @todo ARC_APPROX_SEGMENTS_COUNT_HIGH_DEF: don't really want pcbnew.h // in here, after all, its a PLUGIN and global data is evil. // put in accessor if( arcsegcount >= 32 ) diff --git a/pcbnew/pcbnew.h b/pcbnew/pcbnew.h index e472adf83d..5334909fa9 100644 --- a/pcbnew/pcbnew.h +++ b/pcbnew/pcbnew.h @@ -39,7 +39,7 @@ // Arcs are approximated by segments: define the number of segments per 360 deg (KiCad uses 0.1 // deg approximation). Be aware 3600 / ARC_APPROX_SEGMENTS_COUNT_LOW_DEF is an integer. #define ARC_APPROX_SEGMENTS_COUNT_LOW_DEF 16 -#define ARC_APPROX_SEGMENTS_COUNT_HIGHT_DEF 32 +#define ARC_APPROX_SEGMENTS_COUNT_HIGH_DEF 32 // The new absolute-error-based algorithm uses the stored segment count as a hint on whether // to use ARC_HIGH_DEF or ARC_LOW_DEF. This defines the crossover point. diff --git a/pcbnew/zone_filler.cpp b/pcbnew/zone_filler.cpp index 1a07341e74..044cf8b8cf 100644 --- a/pcbnew/zone_filler.cpp +++ b/pcbnew/zone_filler.cpp @@ -317,7 +317,7 @@ void ZONE_FILLER::buildZoneFeatureHoleList( const ZONE_CONTAINER* aZone, // the fill to our high-def count to avoid jagged knock-outs // However, if the user has edited their zone to increase the segment count, // we keep this preference - int segsPerCircle = std::max( aZone->GetArcSegmentCount(), ARC_APPROX_SEGMENTS_COUNT_HIGHT_DEF ); + int segsPerCircle = std::max( aZone->GetArcSegmentCount(), ARC_APPROX_SEGMENTS_COUNT_HIGH_DEF ); /* calculates the coeff to compensate radius reduction of holes clearance * due to the segment approx. @@ -705,7 +705,7 @@ void ZONE_FILLER::computeRawFilledAreas( const ZONE_CONTAINER* aZone, s_DumpZonesWhenFilling ? "zones_dump.txt" : "", SHAPE_FILE_IO::IOM_APPEND ) ); // Set the number of segments in arc approximations - int segsPerCircle = std::max( aZone->GetArcSegmentCount(), ARC_APPROX_SEGMENTS_COUNT_HIGHT_DEF ); + int segsPerCircle = std::max( aZone->GetArcSegmentCount(), ARC_APPROX_SEGMENTS_COUNT_HIGH_DEF ); /* calculates the coeff to compensate radius reduction of holes clearance */ diff --git a/pcbnew/zone_settings.cpp b/pcbnew/zone_settings.cpp index be59a8fd6a..f5a2cd8cbc 100644 --- a/pcbnew/zone_settings.cpp +++ b/pcbnew/zone_settings.cpp @@ -51,9 +51,9 @@ ZONE_SETTINGS::ZONE_SETTINGS() m_CurrentZone_Layer = F_Cu; // Layer used to create the current zone m_Zone_HatchingStyle = ZONE_CONTAINER::DIAGONAL_EDGE; // Option to show the zone area (outlines only, short hatches or full hatches - m_ArcToSegmentsCount = ARC_APPROX_SEGMENTS_COUNT_HIGHT_DEF; // Option to select number of segments to approximate a circle + m_ArcToSegmentsCount = ARC_APPROX_SEGMENTS_COUNT_HIGH_DEF; // Option to select number of segments to approximate a circle // ARC_APPROX_SEGMENTS_COUNT_LOW_DEF - // or ARC_APPROX_SEGMENTS_COUNT_HIGHT_DEF segments + // or ARC_APPROX_SEGMENTS_COUNT_HIGH_DEF segments // thickness of the gap in thermal reliefs: m_ThermalReliefGap = Mils2iu( ZONE_THERMAL_RELIEF_GAP_MIL );