haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Excellon file writer: remove not very useful comments outsider the header section. 

Looks like comments outside header section can create problems in some readers.
Note: comments inside header section are clearly allowed in Excellon file format)
(trial to fix bug 8032)
This commit is contained in:
jean-pierre charras 2021-03-26 09:46:32 +01:00
parent 132ec37b56
commit d18323dcf0
2 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pcbnew/exporters/gendrill_Excellon_writer.cpp
View File

@ -149,7 +149,7 @@ void EXCELLON_WRITER::CreateDrillandMapFilesSet( const wxString& aPlotDirectory,
} }
void EXCELLON_WRITER::writeHoleAttribute( HOLE_ATTRIBUTE aAttribute, bool aToolAttr ) void EXCELLON_WRITER::writeHoleAttribute( HOLE_ATTRIBUTE aAttribute )
{ {
// Hole attributes are comments (lines starting by ';') in the drill files // Hole attributes are comments (lines starting by ';') in the drill files
// For tools (file header), they are similar to X2 apertures attributes. // For tools (file header), they are similar to X2 apertures attributes.
@ -159,31 +159,19 @@ void EXCELLON_WRITER::writeHoleAttribute( HOLE_ATTRIBUTE aAttribute, bool aToolA
switch( aAttribute ) switch( aAttribute )
{ {
case HOLE_ATTRIBUTE::HOLE_VIA: case HOLE_ATTRIBUTE::HOLE_VIA:
if( aToolAttr ) fprintf( m_file, "; #@! TA.AperFunction,ViaDrill\n" );
fprintf( m_file, "; #@! TA.AperFunction,ViaDrill\n" );
else
fprintf( m_file, "; via hole\n" );
break; break;
case HOLE_ATTRIBUTE::HOLE_PAD: case HOLE_ATTRIBUTE::HOLE_PAD:
if( aToolAttr ) fprintf( m_file, "; #@! TA.AperFunction,ComponentDrill,Plated,PTH\n" );
fprintf( m_file, "; #@! TA.AperFunction,ComponentDrill,Plated,PTH\n" );
else
fprintf( m_file, "; plated pad hole\n" );
break; break;
case HOLE_ATTRIBUTE::HOLE_MECHANICAL: case HOLE_ATTRIBUTE::HOLE_MECHANICAL:
if( aToolAttr ) fprintf( m_file, "; #@! TA.AperFunction,ComponentDrill,NonPlated,NPTH\n" );
fprintf( m_file, "; #@! TA.AperFunction,ComponentDrill,NonPlated,NPTH\n" );
else
fprintf( m_file, "; not plated pad hole\n" );
break; break;
case HOLE_ATTRIBUTE::HOLE_UNKNOWN: case HOLE_ATTRIBUTE::HOLE_UNKNOWN:
if( aToolAttr ) fprintf( m_file, "; #@! TD\n" );
fprintf( m_file, "; #@! TD\n" );
else
fprintf( m_file, "; unknown\n" );
break; break;
} }
} }
@ -212,7 +200,7 @@ int EXCELLON_WRITER::createDrillFile( FILE* aFile, DRILL_LAYER_PAIR aLayerPair,
DRILL_TOOL& tool_descr = m_toolListBuffer[ii]; DRILL_TOOL& tool_descr = m_toolListBuffer[ii];
#if USE_ATTRIB_FOR_HOLES #if USE_ATTRIB_FOR_HOLES
writeHoleAttribute( tool_descr.m_HoleAttribute, true ); writeHoleAttribute( tool_descr.m_HoleAttribute );
#endif #endif
// if units are mm, the resolution is 0.001 mm (3 digits in mantissa) // if units are mm, the resolution is 0.001 mm (3 digits in mantissa)
// if units are inches, the resolution is 0.1 mil (4 digits in mantissa) // if units are inches, the resolution is 0.1 mil (4 digits in mantissa)
@ -230,8 +218,6 @@ int EXCELLON_WRITER::createDrillFile( FILE* aFile, DRILL_LAYER_PAIR aLayerPair,
* holes will be created later) */ * holes will be created later) */
int tool_reference = -2; int tool_reference = -2;
HOLE_ATTRIBUTE last_item_type = HOLE_ATTRIBUTE::HOLE_UNKNOWN;
for( unsigned ii = 0; ii < m_holeListBuffer.size(); ii++ ) for( unsigned ii = 0; ii < m_holeListBuffer.size(); ii++ )
{ {
HOLE_INFO& hole_descr = m_holeListBuffer[ii]; HOLE_INFO& hole_descr = m_holeListBuffer[ii];
@ -245,13 +231,6 @@ int EXCELLON_WRITER::createDrillFile( FILE* aFile, DRILL_LAYER_PAIR aLayerPair,
fprintf( m_file, "T%d\n", tool_reference ); fprintf( m_file, "T%d\n", tool_reference );
} }
HOLE_ATTRIBUTE curr_item_type = hole_descr.m_HoleAttribute;
if( curr_item_type != last_item_type )
writeHoleAttribute( curr_item_type, false );
last_item_type = curr_item_type;
x0 = hole_descr.m_Hole_Pos.x - m_offset.x; x0 = hole_descr.m_Hole_Pos.x - m_offset.x;
y0 = hole_descr.m_Hole_Pos.y - m_offset.y; y0 = hole_descr.m_Hole_Pos.y - m_offset.y;
@ -270,7 +249,6 @@ int EXCELLON_WRITER::createDrillFile( FILE* aFile, DRILL_LAYER_PAIR aLayerPair,
*/ */
tool_reference = -2; // set to a value not used for tool_reference = -2; // set to a value not used for
// m_holeListBuffer[ii].m_Tool_Reference // m_holeListBuffer[ii].m_Tool_Reference
last_item_type = HOLE_ATTRIBUTE::HOLE_UNKNOWN;
for( unsigned ii = 0; ii < m_holeListBuffer.size(); ii++ ) for( unsigned ii = 0; ii < m_holeListBuffer.size(); ii++ )
{ {
@ -285,13 +263,6 @@ int EXCELLON_WRITER::createDrillFile( FILE* aFile, DRILL_LAYER_PAIR aLayerPair,
fprintf( m_file, "T%d\n", tool_reference ); fprintf( m_file, "T%d\n", tool_reference );
} }
HOLE_ATTRIBUTE curr_item_type = hole_descr.m_HoleAttribute;
if( curr_item_type != last_item_type )
writeHoleAttribute( curr_item_type, false );
last_item_type = curr_item_type;
diam = std::min( hole_descr.m_Hole_Size.x, hole_descr.m_Hole_Size.y ); diam = std::min( hole_descr.m_Hole_Size.x, hole_descr.m_Hole_Size.y );
if( diam == 0 ) if( diam == 0 )

4
pcbnew/exporters/gendrill_Excellon_writer.h
View File

@ -158,10 +158,8 @@ private:
* write a comment string giving the hole attribute like * write a comment string giving the hole attribute like
* "; #@! TO.P,viatype\n" * "; #@! TO.P,viatype\n"
* @param aAttribute is the hole attribute * @param aAttribute is the hole attribute
* @param aToolAttr = true if the comment is for a tool (like T1C0.5),
* false for a hole in coord list
*/ */
void writeHoleAttribute( HOLE_ATTRIBUTE aAttribute, bool aToolAttr ); void writeHoleAttribute( HOLE_ATTRIBUTE aAttribute );
}; };
#endif // #ifndef _GENDRILL_EXCELLON_WRITER_ #endif // #ifndef _GENDRILL_EXCELLON_WRITER_