diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 44caf5778b..78d697ee63 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -200,8 +200,8 @@ set( PCBNEW_BRDSTACKUP_MGR
)
set( PCBNEW_IMPORT_GFX
- import_gfx/dialog_import_gfx_base.cpp
- import_gfx/dialog_import_gfx.cpp
+ import_gfx/dialog_import_gfx_pcb_base.cpp
+ import_gfx/dialog_import_gfx_pcb.cpp
import_gfx/graphics_importer_pcbnew.cpp
)
diff --git a/pcbnew/import_gfx/dialog_import_gfx.cpp b/pcbnew/import_gfx/dialog_import_gfx_pcb.cpp
similarity index 92%
rename from pcbnew/import_gfx/dialog_import_gfx.cpp
rename to pcbnew/import_gfx/dialog_import_gfx_pcb.cpp
index ff77ef2b56..dc51cd8422 100644
--- a/pcbnew/import_gfx/dialog_import_gfx.cpp
+++ b/pcbnew/import_gfx/dialog_import_gfx_pcb.cpp
@@ -24,7 +24,7 @@
#include <dialogs/html_message_box.h>
-#include "dialog_import_gfx.h"
+#include "dialog_import_gfx_pcb.h"
#include <import_gfx/dxf_import_plugin.h>
#include <base_units.h>
#include <kiface_base.h>
@@ -39,10 +39,10 @@
#include <memory>
-// Static members of DIALOG_IMPORT_GFX, to remember the user's choices during the session
-bool DIALOG_IMPORT_GFX::m_placementInteractive = true;
-bool DIALOG_IMPORT_GFX::m_shouldGroupItems = true;
-double DIALOG_IMPORT_GFX::m_importScale = 1.0; // Do not change the imported items size
+// Static members of DIALOG_IMPORT_GFX_PCB, to remember the user's choices during the session
+bool DIALOG_IMPORT_GFX_PCB::m_placementInteractive = true;
+bool DIALOG_IMPORT_GFX_PCB::m_shouldGroupItems = true;
+double DIALOG_IMPORT_GFX_PCB::m_importScale = 1.0; // Do not change the imported items size
const std::map<DXF_IMPORT_UNITS, wxString> dxfUnitsMap = {
@@ -54,8 +54,8 @@ const std::map<DXF_IMPORT_UNITS, wxString> dxfUnitsMap = {
};
-DIALOG_IMPORT_GFX::DIALOG_IMPORT_GFX( PCB_BASE_FRAME* aParent, bool aImportAsFootprintGraphic ) :
- DIALOG_IMPORT_GFX_BASE( aParent ),
+DIALOG_IMPORT_GFX_PCB::DIALOG_IMPORT_GFX_PCB( PCB_BASE_FRAME* aParent, bool aImportAsFootprintGraphic ) :
+ DIALOG_IMPORT_GFX_PCB_BASE( aParent ),
m_parent( aParent ),
m_xOrigin( aParent, m_xLabel, m_xCtrl, m_xUnits ),
m_yOrigin( aParent, m_yLabel, m_yCtrl, m_yUnits ),
@@ -123,12 +123,12 @@ DIALOG_IMPORT_GFX::DIALOG_IMPORT_GFX( PCB_BASE_FRAME* aParent, bool aImportAsFoo
Centre();
m_textCtrlFileName->Connect( wxEVT_COMMAND_TEXT_UPDATED,
- wxCommandEventHandler( DIALOG_IMPORT_GFX::onFilename ),
+ wxCommandEventHandler( DIALOG_IMPORT_GFX_PCB::onFilename ),
nullptr, this );
}
-DIALOG_IMPORT_GFX::~DIALOG_IMPORT_GFX()
+DIALOG_IMPORT_GFX_PCB::~DIALOG_IMPORT_GFX_PCB()
{
PCBNEW_SETTINGS* cfg = m_parent->GetPcbNewSettings();
@@ -143,12 +143,12 @@ DIALOG_IMPORT_GFX::~DIALOG_IMPORT_GFX()
m_importScale = EDA_UNIT_UTILS::UI::DoubleValueFromString( m_importScaleCtrl->GetValue() );
m_textCtrlFileName->Disconnect( wxEVT_COMMAND_TEXT_UPDATED,
- wxCommandEventHandler( DIALOG_IMPORT_GFX::onFilename ),
+ wxCommandEventHandler( DIALOG_IMPORT_GFX_PCB::onFilename ),
nullptr, this );
}
-void DIALOG_IMPORT_GFX::onFilename( wxCommandEvent& event )
+void DIALOG_IMPORT_GFX_PCB::onFilename( wxCommandEvent& event )
{
bool enableDXFControls = true;
wxString ext = wxFileName( m_textCtrlFileName->GetValue() ).GetExt();
@@ -163,7 +163,7 @@ void DIALOG_IMPORT_GFX::onFilename( wxCommandEvent& event )
}
-void DIALOG_IMPORT_GFX::onBrowseFiles( wxCommandEvent& event )
+void DIALOG_IMPORT_GFX_PCB::onBrowseFiles( wxCommandEvent& event )
{
wxString path;
wxString filename = m_textCtrlFileName->GetValue();
@@ -198,7 +198,7 @@ void DIALOG_IMPORT_GFX::onBrowseFiles( wxCommandEvent& event )
}
-bool DIALOG_IMPORT_GFX::TransferDataFromWindow()
+bool DIALOG_IMPORT_GFX_PCB::TransferDataFromWindow()
{
if( !wxDialog::TransferDataFromWindow() )
return false;
@@ -284,7 +284,7 @@ bool DIALOG_IMPORT_GFX::TransferDataFromWindow()
}
-void DIALOG_IMPORT_GFX::originOptionOnUpdateUI( wxUpdateUIEvent& event )
+void DIALOG_IMPORT_GFX_PCB::originOptionOnUpdateUI( wxUpdateUIEvent& event )
{
if( m_rbInteractivePlacement->GetValue() != m_placementInteractive )
m_rbInteractivePlacement->SetValue( m_placementInteractive );
diff --git a/pcbnew/import_gfx/dialog_import_gfx.h b/pcbnew/import_gfx/dialog_import_gfx_pcb.h
similarity index 90%
rename from pcbnew/import_gfx/dialog_import_gfx.h
rename to pcbnew/import_gfx/dialog_import_gfx_pcb.h
index aba74e89bc..9bcf9df55b 100644
--- a/pcbnew/import_gfx/dialog_import_gfx.h
+++ b/pcbnew/import_gfx/dialog_import_gfx_pcb.h
@@ -22,23 +22,23 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#ifndef __DIALOG_IMPORT_GFX_H__
-#define __DIALOG_IMPORT_GFX_H__
+#ifndef __DIALOG_IMPORT_GFX_PCB_H__
+#define __DIALOG_IMPORT_GFX_PCB_H__
#include <widgets/unit_binder.h>
#include <pcb_edit_frame.h>
#include <pcbnew_settings.h>
-#include "dialog_import_gfx_base.h"
+#include "dialog_import_gfx_pcb_base.h"
#include <import_gfx/graphics_importer_pcbnew.h>
class GRAPHICS_IMPORT_MGR;
-class DIALOG_IMPORT_GFX : public DIALOG_IMPORT_GFX_BASE
+class DIALOG_IMPORT_GFX_PCB : public DIALOG_IMPORT_GFX_PCB_BASE
{
public:
- DIALOG_IMPORT_GFX( PCB_BASE_FRAME* aParent, bool aUseModuleItems = false );
- ~DIALOG_IMPORT_GFX();
+ DIALOG_IMPORT_GFX_PCB( PCB_BASE_FRAME* aParent, bool aUseModuleItems = false );
+ ~DIALOG_IMPORT_GFX_PCB();
/**
* @return a list of items imported from a vector graphics file.
@@ -98,4 +98,4 @@ private:
// items m_importScale =1.0 means keep original size
};
-#endif // __DIALOG_IMPORT_GFX_H__
+#endif // __DIALOG_IMPORT_GFX_PCB_H__
diff --git a/pcbnew/import_gfx/dialog_import_gfx_base.cpp b/pcbnew/import_gfx/dialog_import_gfx_pcb_base.cpp
similarity index 88%
rename from pcbnew/import_gfx/dialog_import_gfx_base.cpp
rename to pcbnew/import_gfx/dialog_import_gfx_pcb_base.cpp
index 9e4e21cf6c..b37b8b7be4 100644
--- a/pcbnew/import_gfx/dialog_import_gfx_base.cpp
+++ b/pcbnew/import_gfx/dialog_import_gfx_pcb_base.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@@ -8,11 +8,11 @@
#include "pcb_layer_box_selector.h"
#include "widgets/std_bitmap_button.h"
-#include "dialog_import_gfx_base.h"
+#include "dialog_import_gfx_pcb_base.h"
///////////////////////////////////////////////////////////////////////////
-DIALOG_IMPORT_GFX_BASE::DIALOG_IMPORT_GFX_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
+DIALOG_IMPORT_GFX_PCB_BASE::DIALOG_IMPORT_GFX_PCB_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
@@ -229,22 +229,22 @@ DIALOG_IMPORT_GFX_BASE::DIALOG_IMPORT_GFX_BASE( wxWindow* parent, wxWindowID id,
this->Centre( wxBOTH );
// Connect Events
- m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_IMPORT_GFX_BASE::onBrowseFiles ), NULL, this );
- m_rbInteractivePlacement->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_IMPORT_GFX_BASE::onInteractivePlacement ), NULL, this );
- m_rbInteractivePlacement->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_IMPORT_GFX_BASE::originOptionOnUpdateUI ), NULL, this );
- m_rbAbsolutePlacement->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_IMPORT_GFX_BASE::onAbsolutePlacement ), NULL, this );
- m_rbAbsolutePlacement->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_IMPORT_GFX_BASE::originOptionOnUpdateUI ), NULL, this );
- m_groupItems->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_IMPORT_GFX_BASE::onGroupItems ), NULL, this );
+ m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_IMPORT_GFX_PCB_BASE::onBrowseFiles ), NULL, this );
+ m_rbInteractivePlacement->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_IMPORT_GFX_PCB_BASE::onInteractivePlacement ), NULL, this );
+ m_rbInteractivePlacement->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_IMPORT_GFX_PCB_BASE::originOptionOnUpdateUI ), NULL, this );
+ m_rbAbsolutePlacement->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_IMPORT_GFX_PCB_BASE::onAbsolutePlacement ), NULL, this );
+ m_rbAbsolutePlacement->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_IMPORT_GFX_PCB_BASE::originOptionOnUpdateUI ), NULL, this );
+ m_groupItems->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_IMPORT_GFX_PCB_BASE::onGroupItems ), NULL, this );
}
-DIALOG_IMPORT_GFX_BASE::~DIALOG_IMPORT_GFX_BASE()
+DIALOG_IMPORT_GFX_PCB_BASE::~DIALOG_IMPORT_GFX_PCB_BASE()
{
// Disconnect Events
- m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_IMPORT_GFX_BASE::onBrowseFiles ), NULL, this );
- m_rbInteractivePlacement->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_IMPORT_GFX_BASE::onInteractivePlacement ), NULL, this );
- m_rbInteractivePlacement->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_IMPORT_GFX_BASE::originOptionOnUpdateUI ), NULL, this );
- m_rbAbsolutePlacement->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_IMPORT_GFX_BASE::onAbsolutePlacement ), NULL, this );
- m_rbAbsolutePlacement->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_IMPORT_GFX_BASE::originOptionOnUpdateUI ), NULL, this );
- m_groupItems->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_IMPORT_GFX_BASE::onGroupItems ), NULL, this );
+ m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_IMPORT_GFX_PCB_BASE::onBrowseFiles ), NULL, this );
+ m_rbInteractivePlacement->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_IMPORT_GFX_PCB_BASE::onInteractivePlacement ), NULL, this );
+ m_rbInteractivePlacement->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_IMPORT_GFX_PCB_BASE::originOptionOnUpdateUI ), NULL, this );
+ m_rbAbsolutePlacement->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_IMPORT_GFX_PCB_BASE::onAbsolutePlacement ), NULL, this );
+ m_rbAbsolutePlacement->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_IMPORT_GFX_PCB_BASE::originOptionOnUpdateUI ), NULL, this );
+ m_groupItems->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_IMPORT_GFX_PCB_BASE::onGroupItems ), NULL, this );
}
diff --git a/pcbnew/import_gfx/dialog_import_gfx_base.fbp b/pcbnew/import_gfx/dialog_import_gfx_pcb_base.fbp
similarity index 99%
rename from pcbnew/import_gfx/dialog_import_gfx_base.fbp
rename to pcbnew/import_gfx/dialog_import_gfx_pcb_base.fbp
index 23c24d1ccf..e4247e07dc 100644
--- a/pcbnew/import_gfx/dialog_import_gfx_base.fbp
+++ b/pcbnew/import_gfx/dialog_import_gfx_pcb_base.fbp
@@ -11,13 +11,13 @@
<property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property>
<property name="event_generation">connect</property>
- <property name="file">dialog_import_gfx_base</property>
+ <property name="file">dialog_import_gfx_pcb_base</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
<property name="image_path_wrapper_function_name"></property>
<property name="indent_with_spaces"></property>
<property name="internationalize">1</property>
- <property name="name">dialog_dxf_import</property>
+ <property name="name">dialog_import_gfx_pcb_base</property>
<property name="namespace"></property>
<property name="path">.</property>
<property name="precompiled_header"></property>
@@ -45,7 +45,7 @@
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
- <property name="name">DIALOG_IMPORT_GFX_BASE</property>
+ <property name="name">DIALOG_IMPORT_GFX_PCB_BASE</property>
<property name="pos"></property>
<property name="size">-1,-1</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
diff --git a/pcbnew/import_gfx/dialog_import_gfx_base.h b/pcbnew/import_gfx/dialog_import_gfx_pcb_base.h
similarity index 86%
rename from pcbnew/import_gfx/dialog_import_gfx_base.h
rename to pcbnew/import_gfx/dialog_import_gfx_pcb_base.h
index 7130f6639c..a0762d5302 100644
--- a/pcbnew/import_gfx/dialog_import_gfx_base.h
+++ b/pcbnew/import_gfx/dialog_import_gfx_pcb_base.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@@ -40,9 +40,9 @@ class STD_BITMAP_BUTTON;
///////////////////////////////////////////////////////////////////////////////
-/// Class DIALOG_IMPORT_GFX_BASE
+/// Class DIALOG_IMPORT_GFX_PCB_BASE
///////////////////////////////////////////////////////////////////////////////
-class DIALOG_IMPORT_GFX_BASE : public DIALOG_SHIM
+class DIALOG_IMPORT_GFX_PCB_BASE : public DIALOG_SHIM
{
private:
@@ -83,9 +83,9 @@ class DIALOG_IMPORT_GFX_BASE : public DIALOG_SHIM
public:
- DIALOG_IMPORT_GFX_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Import Vector Graphics File"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ DIALOG_IMPORT_GFX_PCB_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Import Vector Graphics File"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~DIALOG_IMPORT_GFX_BASE();
+ ~DIALOG_IMPORT_GFX_PCB_BASE();
};
diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp
index 438bb794f9..d9d7d7154c 100644
--- a/pcbnew/tools/drawing_tool.cpp
+++ b/pcbnew/tools/drawing_tool.cpp
@@ -35,7 +35,7 @@
#include <gal/graphics_abstraction_layer.h>
#include <geometry/geometry_utils.h>
#include <geometry/shape_segment.h>
-#include <import_gfx/dialog_import_gfx.h>
+#include <import_gfx/dialog_import_gfx_pcb.h>
#include <preview_items/two_point_assistant.h>
#include <preview_items/two_point_geom_manager.h>
#include <ratsnest/ratsnest_data.h>
@@ -1471,7 +1471,7 @@ int DRAWING_TOOL::PlaceImportedGraphics( const TOOL_EVENT& aEvent )
// Note: PlaceImportedGraphics() will convert PCB_SHAPE_T and PCB_TEXT_T to footprint
// items if needed
- DIALOG_IMPORT_GFX dlg( m_frame, m_isFootprintEditor );
+ DIALOG_IMPORT_GFX_PCB dlg( m_frame, m_isFootprintEditor );
int dlgResult = dlg.ShowModal();
std::list<std::unique_ptr<EDA_ITEM>>& list = dlg.GetImportedItems();