From f056777e6a6c9280d18edc6503dcb33b80c77711 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Tue, 9 Apr 2019 13:56:36 -0400 Subject: [PATCH] Pcbnew: fix Hyperlynx export reporting string formatting. --- pcbnew/exporters/export_hyperlynx.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pcbnew/exporters/export_hyperlynx.cpp b/pcbnew/exporters/export_hyperlynx.cpp index b6e907f3a4..2b21c5c352 100644 --- a/pcbnew/exporters/export_hyperlynx.cpp +++ b/pcbnew/exporters/export_hyperlynx.cpp @@ -57,7 +57,6 @@ public: HYPERLYNX_PAD_STACK( BOARD* aBoard, const VIA* aVia ); ~HYPERLYNX_PAD_STACK(){}; - bool isThrough() const { return m_type == PAD_ATTRIB_HOLE_NOT_PLATED || m_type == PAD_ATTRIB_STANDARD; @@ -126,7 +125,6 @@ public: } } - bool isEmpty() const { LSET layerMask = LSET::AllCuMask() & m_board->GetEnabledLayers(); @@ -135,7 +133,6 @@ public: return outLayers.none(); } - private: BOARD* m_board; int m_id; @@ -184,11 +181,12 @@ private: case PAD_SHAPE_RECT: shapeId = 1; break; default: shapeId = 0; + if( m_reporter ) { m_reporter->Report( - _( "File contains pad shapes that are not supported by the" - "Hyperlynx exporter (oval, rectangle, circle). They have been" + _( "File contains pad shapes that are not supported by the " + "Hyperlynx exporter (oval, rectangle, circle). They have been " "exported as oval pads." ), REPORTER::RPT_WARNING ); } @@ -197,7 +195,7 @@ private: snprintf( buf, sizeof( buf ), "%d, %.9f, %.9f, %.1f, M", shapeId, iu2hyp( aStack.m_sx ), - iu2hyp( aStack.m_sy ), + iu2hyp( aStack.m_sy ), aStack.m_angle ); return buf; @@ -290,6 +288,7 @@ void HYPERLYNX_EXPORTER::writeSinglePadStack( HYPERLYNX_PAD_STACK& aStack ) m_out->Print( 0, "}\n\n" ); } + bool HYPERLYNX_EXPORTER::writeBoardInfo() { SHAPE_POLY_SET outlines;