From 3fcd9597578b938935017b54403848c88236a729 Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Fri, 24 Jun 2022 15:44:13 +0200
Subject: [PATCH] Gerbview: minor cosmetic enhancement: show if the file is X1
 or X2 format.

---
 gerbview/gerber_file_image.cpp              | 13 +++++++++----
 pcbnew/exporters/gen_drill_report_files.cpp |  2 --
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/gerbview/gerber_file_image.cpp b/gerbview/gerber_file_image.cpp
index 508a4929bf..26bf46b9d6 100644
--- a/gerbview/gerber_file_image.cpp
+++ b/gerbview/gerber_file_image.cpp
@@ -162,7 +162,7 @@ void GERBER_FILE_IMAGE::ResetDefaultValues()
     m_InUse         = false;
     m_GBRLayerParams.ResetDefaultValues();
     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_IsX2_file     = false;                        // true only if a %TF, %TA or %TD command
     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.
  * These parameters are valid for the entire file, and must set only once
  * (If more than once, only the last value is used)
+ * Some are deprecated
  */
 void GERBER_FILE_IMAGE::DisplayImageInfo(  GERBVIEW_FRAME* aMainFrame  )
 {
@@ -334,8 +335,13 @@ void GERBER_FILE_IMAGE::DisplayImageInfo(  GERBVIEW_FRAME* aMainFrame  )
 
     aMainFrame->ClearMsgPanel();
 
-    // Display Image name (Image specific)
-    aMainFrame->AppendMsgPanel( _( "Image name" ), m_ImageName );
+    // 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 );
 
     // Display graphic layer number used to draw this Image
     // (not a Gerber parameter but is also image specific)
@@ -378,7 +384,6 @@ void GERBER_FILE_IMAGE::DisplayImageInfo(  GERBVIEW_FRAME* aMainFrame  )
         wxASSERT_MSG( false, wxT( "Invalid unit" ) );
     }
 
-
     aMainFrame->AppendMsgPanel( _( "Image Justify Offset" ), msg );
 }
 
diff --git a/pcbnew/exporters/gen_drill_report_files.cpp b/pcbnew/exporters/gen_drill_report_files.cpp
index cd120bec9b..c0281608be 100644
--- a/pcbnew/exporters/gen_drill_report_files.cpp
+++ b/pcbnew/exporters/gen_drill_report_files.cpp
@@ -40,8 +40,6 @@
 #include <gendrill_file_writer_base.h>
 #include <pcb_painter.h>
 #include <pcb_shape.h>
-#include <pcb_text.h>
-#include <pcb_textbox.h>
 
 
 /* Conversion utilities - these will be used often in there... */