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

Gerbview: minor cosmetic enhancement: show if the file is X1 or X2 format.

This commit is contained in:
jean-pierre charras 2022-06-24 15:44:13 +02:00
parent f303d78723
commit 3fcd959757
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gerbview/gerber_file_image.cpp
View File

@ -162,7 +162,7 @@ void GERBER_FILE_IMAGE::ResetDefaultValues()
m_InUse = false; m_InUse = false;
m_GBRLayerParams.ResetDefaultValues(); m_GBRLayerParams.ResetDefaultValues();
m_FileName.Empty(); m_FileName.Empty();
m_ImageName = wxT( "no name" ); // Image name from the IN command m_ImageName = wxEmptyString; // Image name from the IN command (deprecated)
m_ImageNegative = false; // true = Negative image m_ImageNegative = false; // true = Negative image
m_IsX2_file = false; // true only if a %TF, %TA or %TD command m_IsX2_file = false; // true only if a %TF, %TA or %TD command
delete m_FileFunction; // file function parameters delete m_FileFunction; // file function parameters
@ -327,6 +327,7 @@ void GERBER_FILE_IMAGE::StepAndRepeatItem( const GERBER_DRAW_ITEM& aItem )
* Display info about Image Parameters. * Display info about Image Parameters.
* These parameters are valid for the entire file, and must set only once * These parameters are valid for the entire file, and must set only once
* (If more than once, only the last value is used) * (If more than once, only the last value is used)
* Some are deprecated
*/ */
void GERBER_FILE_IMAGE::DisplayImageInfo( GERBVIEW_FRAME* aMainFrame ) void GERBER_FILE_IMAGE::DisplayImageInfo( GERBVIEW_FRAME* aMainFrame )
{ {
@ -334,7 +335,12 @@ void GERBER_FILE_IMAGE::DisplayImageInfo( GERBVIEW_FRAME* aMainFrame )
aMainFrame->ClearMsgPanel(); aMainFrame->ClearMsgPanel();
// Display Image name (Image specific) // Display the Gerber variant (X1 / X2
aMainFrame->AppendMsgPanel( _( "Format" ), m_IsX2_file ? wxT( "X2" ) : wxT( "X1" ) );
// Display Image name (Image specific). IM command (Image Name) is deprecated
// So non empty image name is very rare, probably never found
if( !m_ImageName.IsEmpty() )
aMainFrame->AppendMsgPanel( _( "Image name" ), m_ImageName ); aMainFrame->AppendMsgPanel( _( "Image name" ), m_ImageName );
// Display graphic layer number used to draw this Image // Display graphic layer number used to draw this Image
@ -378,7 +384,6 @@ void GERBER_FILE_IMAGE::DisplayImageInfo( GERBVIEW_FRAME* aMainFrame )
wxASSERT_MSG( false, wxT( "Invalid unit" ) ); wxASSERT_MSG( false, wxT( "Invalid unit" ) );
} }
aMainFrame->AppendMsgPanel( _( "Image Justify Offset" ), msg ); aMainFrame->AppendMsgPanel( _( "Image Justify Offset" ), msg );
} }

2
pcbnew/exporters/gen_drill_report_files.cpp
View File

@ -40,8 +40,6 @@
#include <gendrill_file_writer_base.h> #include <gendrill_file_writer_base.h>
#include <pcb_painter.h> #include <pcb_painter.h>
#include <pcb_shape.h> #include <pcb_shape.h>
#include <pcb_text.h>
#include <pcb_textbox.h>
/* Conversion utilities - these will be used often in there... */ /* Conversion utilities - these will be used often in there... */