Functionally it's a "reference image".
The implementation happens to be a "bitmap". Fixes https://gitlab.com/kicad/code/kicad/-/issues/15932
This commit is contained in:
parent
00904e8e23
commit
791aa64950
|
@ -676,7 +676,7 @@ set( PCB_COMMON_SRCS
|
||||||
${CMAKE_SOURCE_DIR}/pcbnew/netinfo_list.cpp
|
${CMAKE_SOURCE_DIR}/pcbnew/netinfo_list.cpp
|
||||||
${CMAKE_SOURCE_DIR}/pcbnew/pad.cpp
|
${CMAKE_SOURCE_DIR}/pcbnew/pad.cpp
|
||||||
${CMAKE_SOURCE_DIR}/pcbnew/pcb_target.cpp
|
${CMAKE_SOURCE_DIR}/pcbnew/pcb_target.cpp
|
||||||
${CMAKE_SOURCE_DIR}/pcbnew/pcb_bitmap.cpp
|
${CMAKE_SOURCE_DIR}/pcbnew/pcb_reference_image.cpp
|
||||||
${CMAKE_SOURCE_DIR}/pcbnew/pcb_field.cpp
|
${CMAKE_SOURCE_DIR}/pcbnew/pcb_field.cpp
|
||||||
${CMAKE_SOURCE_DIR}/pcbnew/pcb_text.cpp
|
${CMAKE_SOURCE_DIR}/pcbnew/pcb_text.cpp
|
||||||
${CMAKE_SOURCE_DIR}/pcbnew/pcb_textbox.cpp
|
${CMAKE_SOURCE_DIR}/pcbnew/pcb_textbox.cpp
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
#include <confirm.h>
|
#include <confirm.h>
|
||||||
#include <bitmap_base.h>
|
#include <bitmap_base.h>
|
||||||
#include <pcb_base_edit_frame.h>
|
#include <pcb_base_edit_frame.h>
|
||||||
#include <pcb_bitmap.h>
|
|
||||||
#include <tool/tool_manager.h>
|
#include <tool/tool_manager.h>
|
||||||
#include <tool/actions.h>
|
#include <tool/actions.h>
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// C++ code generated with wxFormBuilder (version 3.10.1-282-g1fa54006)
|
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
|
||||||
// http://www.wxformbuilder.org/
|
// http://www.wxformbuilder.org/
|
||||||
//
|
//
|
||||||
// PLEASE DO *NOT* EDIT THIS FILE!
|
// PLEASE DO *NOT* EDIT THIS FILE!
|
||||||
|
@ -21,42 +21,37 @@ PANEL_IMAGE_EDITOR_BASE::PANEL_IMAGE_EDITOR_BASE( wxWindow* parent, wxWindowID i
|
||||||
bSizerLeft = new wxBoxSizer( wxHORIZONTAL );
|
bSizerLeft = new wxBoxSizer( wxHORIZONTAL );
|
||||||
|
|
||||||
m_panelDraw = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL|wxBORDER_SIMPLE );
|
m_panelDraw = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL|wxBORDER_SIMPLE );
|
||||||
m_panelDraw->SetMinSize( wxSize( 256,256 ) );
|
m_panelDraw->SetMinSize( wxSize( 300,300 ) );
|
||||||
|
|
||||||
bSizerLeft->Add( m_panelDraw, 1, wxEXPAND | wxALL, 5 );
|
bSizerLeft->Add( m_panelDraw, 1, wxEXPAND | wxALL, 5 );
|
||||||
|
|
||||||
wxBoxSizer* bSizerRight;
|
wxGridBagSizer* gbSizer1;
|
||||||
bSizerRight = new wxBoxSizer( wxVERTICAL );
|
gbSizer1 = new wxGridBagSizer( 5, 5 );
|
||||||
|
gbSizer1->SetFlexibleDirection( wxBOTH );
|
||||||
|
gbSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
||||||
|
|
||||||
m_buttonGrey = new wxButton( this, wxID_ANY, _("Grey"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticTextScale = new wxStaticText( this, wxID_ANY, _("Scale:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizerRight->Add( m_buttonGrey, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
|
|
||||||
|
|
||||||
|
|
||||||
bSizerRight->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 10 );
|
|
||||||
|
|
||||||
m_staticTextScale = new wxStaticText( this, wxID_ANY, _("Image Scale:"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_staticTextScale->Wrap( -1 );
|
m_staticTextScale->Wrap( -1 );
|
||||||
bSizerRight->Add( m_staticTextScale, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
gbSizer1->Add( m_staticTextScale, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
|
||||||
|
|
||||||
m_textCtrlScale = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_textCtrlScale = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizerRight->Add( m_textCtrlScale, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
|
gbSizer1->Add( m_textCtrlScale, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
|
||||||
|
|
||||||
wxBoxSizer* bSizerPPI;
|
|
||||||
bSizerPPI = new wxBoxSizer( wxHORIZONTAL );
|
|
||||||
|
|
||||||
m_staticTextPPI = new wxStaticText( this, wxID_ANY, _("PPI:"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticTextPPI = new wxStaticText( this, wxID_ANY, _("PPI:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticTextPPI->Wrap( -1 );
|
m_staticTextPPI->Wrap( -1 );
|
||||||
bSizerPPI->Add( m_staticTextPPI, 0, wxALL, 5 );
|
gbSizer1->Add( m_staticTextPPI, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
|
||||||
|
|
||||||
m_stPPI_Value = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_stPPI_Value = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_stPPI_Value->Wrap( -1 );
|
m_stPPI_Value->Wrap( -1 );
|
||||||
bSizerPPI->Add( m_stPPI_Value, 1, wxALL|wxEXPAND, 5 );
|
gbSizer1->Add( m_stPPI_Value, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
|
||||||
|
|
||||||
|
m_buttonGrey = new wxButton( this, wxID_ANY, _("Convert to Greyscale"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
gbSizer1->Add( m_buttonGrey, wxGBPosition( 4, 0 ), wxGBSpan( 1, 2 ), wxEXPAND, 5 );
|
||||||
|
|
||||||
|
|
||||||
bSizerRight->Add( bSizerPPI, 0, wxEXPAND, 5 );
|
gbSizer1->AddGrowableCol( 1 );
|
||||||
|
|
||||||
|
bSizerLeft->Add( gbSizer1, 0, wxEXPAND|wxALL, 10 );
|
||||||
bSizerLeft->Add( bSizerRight, 0, wxEXPAND|wxALL, 5 );
|
|
||||||
|
|
||||||
|
|
||||||
bUpperSizer->Add( bSizerLeft, 1, wxEXPAND, 5 );
|
bUpperSizer->Add( bSizerLeft, 1, wxEXPAND, 5 );
|
||||||
|
@ -67,6 +62,7 @@ PANEL_IMAGE_EDITOR_BASE::PANEL_IMAGE_EDITOR_BASE( wxWindow* parent, wxWindowID i
|
||||||
|
|
||||||
this->SetSizer( bSizerMain );
|
this->SetSizer( bSizerMain );
|
||||||
this->Layout();
|
this->Layout();
|
||||||
|
bSizerMain->Fit( this );
|
||||||
|
|
||||||
// Connect Events
|
// Connect Events
|
||||||
m_panelDraw->Connect( wxEVT_PAINT, wxPaintEventHandler( PANEL_IMAGE_EDITOR_BASE::OnRedrawPanel ), NULL, this );
|
m_panelDraw->Connect( wxEVT_PAINT, wxPaintEventHandler( PANEL_IMAGE_EDITOR_BASE::OnRedrawPanel ), NULL, this );
|
||||||
|
|
|
@ -35,7 +35,6 @@
|
||||||
<property name="bg"></property>
|
<property name="bg"></property>
|
||||||
<property name="context_help"></property>
|
<property name="context_help"></property>
|
||||||
<property name="context_menu">1</property>
|
<property name="context_menu">1</property>
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
<property name="enabled">1</property>
|
||||||
<property name="event_handler">impl_virtual</property>
|
<property name="event_handler">impl_virtual</property>
|
||||||
<property name="fg"></property>
|
<property name="fg"></property>
|
||||||
|
@ -46,7 +45,7 @@
|
||||||
<property name="minimum_size"></property>
|
<property name="minimum_size"></property>
|
||||||
<property name="name">PANEL_IMAGE_EDITOR_BASE</property>
|
<property name="name">PANEL_IMAGE_EDITOR_BASE</property>
|
||||||
<property name="pos"></property>
|
<property name="pos"></property>
|
||||||
<property name="size">500,300</property>
|
<property name="size">-1,-1</property>
|
||||||
<property name="subclass">; ; forward_declare</property>
|
<property name="subclass">; ; forward_declare</property>
|
||||||
<property name="tooltip"></property>
|
<property name="tooltip"></property>
|
||||||
<property name="two_step_creation">0</property>
|
<property name="two_step_creation">0</property>
|
||||||
|
@ -101,7 +100,6 @@
|
||||||
<property name="dock">Dock</property>
|
<property name="dock">Dock</property>
|
||||||
<property name="dock_fixed">0</property>
|
<property name="dock_fixed">0</property>
|
||||||
<property name="docking">Left</property>
|
<property name="docking">Left</property>
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
<property name="enabled">1</property>
|
||||||
<property name="fg"></property>
|
<property name="fg"></property>
|
||||||
<property name="floatable">1</property>
|
<property name="floatable">1</property>
|
||||||
|
@ -114,7 +112,7 @@
|
||||||
<property name="maximum_size"></property>
|
<property name="maximum_size"></property>
|
||||||
<property name="min_size"></property>
|
<property name="min_size"></property>
|
||||||
<property name="minimize_button">0</property>
|
<property name="minimize_button">0</property>
|
||||||
<property name="minimum_size">256,256</property>
|
<property name="minimum_size">300,300</property>
|
||||||
<property name="moveable">1</property>
|
<property name="moveable">1</property>
|
||||||
<property name="name">m_panelDraw</property>
|
<property name="name">m_panelDraw</property>
|
||||||
<property name="pane_border">1</property>
|
<property name="pane_border">1</property>
|
||||||
|
@ -136,103 +134,27 @@
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem" expanded="1">
|
<object class="sizeritem" expanded="1">
|
||||||
<property name="border">5</property>
|
<property name="border">10</property>
|
||||||
<property name="flag">wxEXPAND|wxALL</property>
|
<property name="flag">wxEXPAND|wxALL</property>
|
||||||
<property name="proportion">0</property>
|
<property name="proportion">0</property>
|
||||||
<object class="wxBoxSizer" expanded="1">
|
<object class="wxGridBagSizer" expanded="1">
|
||||||
|
<property name="empty_cell_size"></property>
|
||||||
|
<property name="flexible_direction">wxBOTH</property>
|
||||||
|
<property name="growablecols">1</property>
|
||||||
|
<property name="growablerows"></property>
|
||||||
|
<property name="hgap">5</property>
|
||||||
<property name="minimum_size"></property>
|
<property name="minimum_size"></property>
|
||||||
<property name="name">bSizerRight</property>
|
<property name="name">gbSizer1</property>
|
||||||
<property name="orient">wxVERTICAL</property>
|
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
|
||||||
<property name="permission">none</property>
|
<property name="permission">none</property>
|
||||||
<object class="sizeritem" expanded="1">
|
<property name="vgap">5</property>
|
||||||
|
<object class="gbsizeritem" expanded="1">
|
||||||
<property name="border">5</property>
|
<property name="border">5</property>
|
||||||
<property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
|
<property name="colspan">1</property>
|
||||||
<property name="proportion">0</property>
|
<property name="column">0</property>
|
||||||
<object class="wxButton" expanded="1">
|
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
|
||||||
<property name="BottomDockable">1</property>
|
<property name="row">0</property>
|
||||||
<property name="LeftDockable">1</property>
|
<property name="rowspan">1</property>
|
||||||
<property name="RightDockable">1</property>
|
|
||||||
<property name="TopDockable">1</property>
|
|
||||||
<property name="aui_layer"></property>
|
|
||||||
<property name="aui_name"></property>
|
|
||||||
<property name="aui_position"></property>
|
|
||||||
<property name="aui_row"></property>
|
|
||||||
<property name="auth_needed">0</property>
|
|
||||||
<property name="best_size"></property>
|
|
||||||
<property name="bg"></property>
|
|
||||||
<property name="bitmap"></property>
|
|
||||||
<property name="caption"></property>
|
|
||||||
<property name="caption_visible">1</property>
|
|
||||||
<property name="center_pane">0</property>
|
|
||||||
<property name="close_button">1</property>
|
|
||||||
<property name="context_help"></property>
|
|
||||||
<property name="context_menu">1</property>
|
|
||||||
<property name="current"></property>
|
|
||||||
<property name="default">0</property>
|
|
||||||
<property name="default_pane">0</property>
|
|
||||||
<property name="disabled"></property>
|
|
||||||
<property name="dock">Dock</property>
|
|
||||||
<property name="dock_fixed">0</property>
|
|
||||||
<property name="docking">Left</property>
|
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
|
||||||
<property name="fg"></property>
|
|
||||||
<property name="floatable">1</property>
|
|
||||||
<property name="focus"></property>
|
|
||||||
<property name="font"></property>
|
|
||||||
<property name="gripper">0</property>
|
|
||||||
<property name="hidden">0</property>
|
|
||||||
<property name="id">wxID_ANY</property>
|
|
||||||
<property name="label">Grey</property>
|
|
||||||
<property name="margins"></property>
|
|
||||||
<property name="markup">0</property>
|
|
||||||
<property name="max_size"></property>
|
|
||||||
<property name="maximize_button">0</property>
|
|
||||||
<property name="maximum_size"></property>
|
|
||||||
<property name="min_size"></property>
|
|
||||||
<property name="minimize_button">0</property>
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="moveable">1</property>
|
|
||||||
<property name="name">m_buttonGrey</property>
|
|
||||||
<property name="pane_border">1</property>
|
|
||||||
<property name="pane_position"></property>
|
|
||||||
<property name="pane_size"></property>
|
|
||||||
<property name="permission">protected</property>
|
|
||||||
<property name="pin_button">1</property>
|
|
||||||
<property name="pos"></property>
|
|
||||||
<property name="position"></property>
|
|
||||||
<property name="pressed"></property>
|
|
||||||
<property name="resize">Resizable</property>
|
|
||||||
<property name="show">1</property>
|
|
||||||
<property name="size"></property>
|
|
||||||
<property name="style"></property>
|
|
||||||
<property name="subclass"></property>
|
|
||||||
<property name="toolbar_pane">0</property>
|
|
||||||
<property name="tooltip"></property>
|
|
||||||
<property name="validator_data_type"></property>
|
|
||||||
<property name="validator_style">wxFILTER_NONE</property>
|
|
||||||
<property name="validator_type">wxDefaultValidator</property>
|
|
||||||
<property name="validator_variable"></property>
|
|
||||||
<property name="window_extra_style"></property>
|
|
||||||
<property name="window_name"></property>
|
|
||||||
<property name="window_style"></property>
|
|
||||||
<event name="OnButtonClick">OnGreyScaleConvert</event>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
<object class="sizeritem" expanded="1">
|
|
||||||
<property name="border">10</property>
|
|
||||||
<property name="flag">wxEXPAND|wxTOP|wxBOTTOM</property>
|
|
||||||
<property name="proportion">0</property>
|
|
||||||
<object class="spacer" expanded="1">
|
|
||||||
<property name="height">0</property>
|
|
||||||
<property name="permission">protected</property>
|
|
||||||
<property name="width">0</property>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
<object class="sizeritem" expanded="1">
|
|
||||||
<property name="border">5</property>
|
|
||||||
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
|
|
||||||
<property name="proportion">0</property>
|
|
||||||
<object class="wxStaticText" expanded="1">
|
<object class="wxStaticText" expanded="1">
|
||||||
<property name="BottomDockable">1</property>
|
<property name="BottomDockable">1</property>
|
||||||
<property name="LeftDockable">1</property>
|
<property name="LeftDockable">1</property>
|
||||||
|
@ -254,7 +176,6 @@
|
||||||
<property name="dock">Dock</property>
|
<property name="dock">Dock</property>
|
||||||
<property name="dock_fixed">0</property>
|
<property name="dock_fixed">0</property>
|
||||||
<property name="docking">Left</property>
|
<property name="docking">Left</property>
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
<property name="enabled">1</property>
|
||||||
<property name="fg"></property>
|
<property name="fg"></property>
|
||||||
<property name="floatable">1</property>
|
<property name="floatable">1</property>
|
||||||
|
@ -262,7 +183,7 @@
|
||||||
<property name="gripper">0</property>
|
<property name="gripper">0</property>
|
||||||
<property name="hidden">0</property>
|
<property name="hidden">0</property>
|
||||||
<property name="id">wxID_ANY</property>
|
<property name="id">wxID_ANY</property>
|
||||||
<property name="label">Image Scale:</property>
|
<property name="label">Scale:</property>
|
||||||
<property name="markup">0</property>
|
<property name="markup">0</property>
|
||||||
<property name="max_size"></property>
|
<property name="max_size"></property>
|
||||||
<property name="maximize_button">0</property>
|
<property name="maximize_button">0</property>
|
||||||
|
@ -291,10 +212,13 @@
|
||||||
<property name="wrap">-1</property>
|
<property name="wrap">-1</property>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem" expanded="1">
|
<object class="gbsizeritem" expanded="1">
|
||||||
<property name="border">5</property>
|
<property name="border">5</property>
|
||||||
<property name="flag">wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND</property>
|
<property name="colspan">1</property>
|
||||||
<property name="proportion">0</property>
|
<property name="column">1</property>
|
||||||
|
<property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
|
||||||
|
<property name="row">0</property>
|
||||||
|
<property name="rowspan">1</property>
|
||||||
<object class="wxTextCtrl" expanded="1">
|
<object class="wxTextCtrl" expanded="1">
|
||||||
<property name="BottomDockable">1</property>
|
<property name="BottomDockable">1</property>
|
||||||
<property name="LeftDockable">1</property>
|
<property name="LeftDockable">1</property>
|
||||||
|
@ -316,7 +240,6 @@
|
||||||
<property name="dock">Dock</property>
|
<property name="dock">Dock</property>
|
||||||
<property name="dock_fixed">0</property>
|
<property name="dock_fixed">0</property>
|
||||||
<property name="docking">Left</property>
|
<property name="docking">Left</property>
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
<property name="enabled">1</property>
|
||||||
<property name="fg"></property>
|
<property name="fg"></property>
|
||||||
<property name="floatable">1</property>
|
<property name="floatable">1</property>
|
||||||
|
@ -356,19 +279,13 @@
|
||||||
<property name="window_style"></property>
|
<property name="window_style"></property>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem" expanded="1">
|
<object class="gbsizeritem" expanded="1">
|
||||||
<property name="border">5</property>
|
<property name="border">5</property>
|
||||||
<property name="flag">wxEXPAND</property>
|
<property name="colspan">1</property>
|
||||||
<property name="proportion">0</property>
|
<property name="column">0</property>
|
||||||
<object class="wxBoxSizer" expanded="1">
|
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
|
||||||
<property name="minimum_size"></property>
|
<property name="row">1</property>
|
||||||
<property name="name">bSizerPPI</property>
|
<property name="rowspan">1</property>
|
||||||
<property name="orient">wxHORIZONTAL</property>
|
|
||||||
<property name="permission">none</property>
|
|
||||||
<object class="sizeritem" expanded="1">
|
|
||||||
<property name="border">5</property>
|
|
||||||
<property name="flag">wxALL</property>
|
|
||||||
<property name="proportion">0</property>
|
|
||||||
<object class="wxStaticText" expanded="1">
|
<object class="wxStaticText" expanded="1">
|
||||||
<property name="BottomDockable">1</property>
|
<property name="BottomDockable">1</property>
|
||||||
<property name="LeftDockable">1</property>
|
<property name="LeftDockable">1</property>
|
||||||
|
@ -390,7 +307,6 @@
|
||||||
<property name="dock">Dock</property>
|
<property name="dock">Dock</property>
|
||||||
<property name="dock_fixed">0</property>
|
<property name="dock_fixed">0</property>
|
||||||
<property name="docking">Left</property>
|
<property name="docking">Left</property>
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
<property name="enabled">1</property>
|
||||||
<property name="fg"></property>
|
<property name="fg"></property>
|
||||||
<property name="floatable">1</property>
|
<property name="floatable">1</property>
|
||||||
|
@ -427,10 +343,13 @@
|
||||||
<property name="wrap">-1</property>
|
<property name="wrap">-1</property>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem" expanded="1">
|
<object class="gbsizeritem" expanded="1">
|
||||||
<property name="border">5</property>
|
<property name="border">5</property>
|
||||||
<property name="flag">wxALL|wxEXPAND</property>
|
<property name="colspan">1</property>
|
||||||
<property name="proportion">1</property>
|
<property name="column">1</property>
|
||||||
|
<property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
|
||||||
|
<property name="row">1</property>
|
||||||
|
<property name="rowspan">1</property>
|
||||||
<object class="wxStaticText" expanded="1">
|
<object class="wxStaticText" expanded="1">
|
||||||
<property name="BottomDockable">1</property>
|
<property name="BottomDockable">1</property>
|
||||||
<property name="LeftDockable">1</property>
|
<property name="LeftDockable">1</property>
|
||||||
|
@ -452,7 +371,6 @@
|
||||||
<property name="dock">Dock</property>
|
<property name="dock">Dock</property>
|
||||||
<property name="dock_fixed">0</property>
|
<property name="dock_fixed">0</property>
|
||||||
<property name="docking">Left</property>
|
<property name="docking">Left</property>
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
<property name="enabled">1</property>
|
||||||
<property name="fg"></property>
|
<property name="fg"></property>
|
||||||
<property name="floatable">1</property>
|
<property name="floatable">1</property>
|
||||||
|
@ -489,6 +407,81 @@
|
||||||
<property name="wrap">-1</property>
|
<property name="wrap">-1</property>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
<object class="gbsizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="colspan">2</property>
|
||||||
|
<property name="column">0</property>
|
||||||
|
<property name="flag">wxEXPAND</property>
|
||||||
|
<property name="row">4</property>
|
||||||
|
<property name="rowspan">1</property>
|
||||||
|
<object class="wxButton" expanded="1">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="auth_needed">0</property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="bitmap"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="current"></property>
|
||||||
|
<property name="default">0</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="disabled"></property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="focus"></property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="label">Convert to Greyscale</property>
|
||||||
|
<property name="margins"></property>
|
||||||
|
<property name="markup">0</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_buttonGrey</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="position"></property>
|
||||||
|
<property name="pressed"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="validator_data_type"></property>
|
||||||
|
<property name="validator_style">wxFILTER_NONE</property>
|
||||||
|
<property name="validator_type">wxDefaultValidator</property>
|
||||||
|
<property name="validator_variable"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<event name="OnButtonClick">OnGreyScaleConvert</event>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// C++ code generated with wxFormBuilder (version 3.10.1-282-g1fa54006)
|
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
|
||||||
// http://www.wxformbuilder.org/
|
// http://www.wxformbuilder.org/
|
||||||
//
|
//
|
||||||
// PLEASE DO *NOT* EDIT THIS FILE!
|
// PLEASE DO *NOT* EDIT THIS FILE!
|
||||||
|
@ -16,12 +16,13 @@
|
||||||
#include <wx/colour.h>
|
#include <wx/colour.h>
|
||||||
#include <wx/settings.h>
|
#include <wx/settings.h>
|
||||||
#include <wx/string.h>
|
#include <wx/string.h>
|
||||||
|
#include <wx/stattext.h>
|
||||||
|
#include <wx/textctrl.h>
|
||||||
#include <wx/button.h>
|
#include <wx/button.h>
|
||||||
#include <wx/bitmap.h>
|
#include <wx/bitmap.h>
|
||||||
#include <wx/image.h>
|
#include <wx/image.h>
|
||||||
#include <wx/icon.h>
|
#include <wx/icon.h>
|
||||||
#include <wx/stattext.h>
|
#include <wx/gbsizer.h>
|
||||||
#include <wx/textctrl.h>
|
|
||||||
#include <wx/sizer.h>
|
#include <wx/sizer.h>
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
@ -36,11 +37,11 @@ class PANEL_IMAGE_EDITOR_BASE : public wxPanel
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
wxPanel* m_panelDraw;
|
wxPanel* m_panelDraw;
|
||||||
wxButton* m_buttonGrey;
|
|
||||||
wxStaticText* m_staticTextScale;
|
wxStaticText* m_staticTextScale;
|
||||||
wxTextCtrl* m_textCtrlScale;
|
wxTextCtrl* m_textCtrlScale;
|
||||||
wxStaticText* m_staticTextPPI;
|
wxStaticText* m_staticTextPPI;
|
||||||
wxStaticText* m_stPPI_Value;
|
wxStaticText* m_stPPI_Value;
|
||||||
|
wxButton* m_buttonGrey;
|
||||||
|
|
||||||
// Virtual event handlers, override them in your derived class
|
// Virtual event handlers, override them in your derived class
|
||||||
virtual void OnRedrawPanel( wxPaintEvent& event ) { event.Skip(); }
|
virtual void OnRedrawPanel( wxPaintEvent& event ) { event.Skip(); }
|
||||||
|
@ -49,7 +50,7 @@ class PANEL_IMAGE_EDITOR_BASE : public wxPanel
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
PANEL_IMAGE_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
|
PANEL_IMAGE_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
|
||||||
|
|
||||||
~PANEL_IMAGE_EDITOR_BASE();
|
~PANEL_IMAGE_EDITOR_BASE();
|
||||||
|
|
||||||
|
|
|
@ -344,7 +344,7 @@ static struct EDA_ITEM_DESC
|
||||||
.Map( PCB_FOOTPRINT_T, _HKI( "Footprint" ) )
|
.Map( PCB_FOOTPRINT_T, _HKI( "Footprint" ) )
|
||||||
.Map( PCB_PAD_T, _HKI( "Pad" ) )
|
.Map( PCB_PAD_T, _HKI( "Pad" ) )
|
||||||
.Map( PCB_SHAPE_T, _HKI( "Graphic" ) )
|
.Map( PCB_SHAPE_T, _HKI( "Graphic" ) )
|
||||||
.Map( PCB_BITMAP_T, _HKI( "Bitmap" ) )
|
.Map( PCB_REFERENCE_IMAGE_T, _HKI( "Reference Image" ) )
|
||||||
.Map( PCB_GENERATOR_T, _HKI( "Generator" ) )
|
.Map( PCB_GENERATOR_T, _HKI( "Generator" ) )
|
||||||
.Map( PCB_FIELD_T, _HKI( "Field" ) )
|
.Map( PCB_FIELD_T, _HKI( "Field" ) )
|
||||||
.Map( PCB_TEXT_T, _HKI( "Text" ) )
|
.Map( PCB_TEXT_T, _HKI( "Text" ) )
|
||||||
|
|
|
@ -86,7 +86,7 @@ enum KICAD_T
|
||||||
PCB_FOOTPRINT_T, ///< class FOOTPRINT, a footprint
|
PCB_FOOTPRINT_T, ///< class FOOTPRINT, a footprint
|
||||||
PCB_PAD_T, ///< class PAD, a pad in a footprint
|
PCB_PAD_T, ///< class PAD, a pad in a footprint
|
||||||
PCB_SHAPE_T, ///< class PCB_SHAPE, a segment not on copper layers
|
PCB_SHAPE_T, ///< class PCB_SHAPE, a segment not on copper layers
|
||||||
PCB_BITMAP_T, ///< class PCB_BITMAP, bitmap on a layer
|
PCB_REFERENCE_IMAGE_T, ///< class PCB_REFERENCE_IMAGE, bitmap on a layer
|
||||||
PCB_FIELD_T, ///< class PCB_FIELD, text associated with a footprint property
|
PCB_FIELD_T, ///< class PCB_FIELD, text associated with a footprint property
|
||||||
PCB_GENERATOR_T, ///< class PCB_GENERATOR, generator on a layer
|
PCB_GENERATOR_T, ///< class PCB_GENERATOR, generator on a layer
|
||||||
PCB_TEXT_T, ///< class PCB_TEXT, text on a layer
|
PCB_TEXT_T, ///< class PCB_TEXT, text on a layer
|
||||||
|
@ -434,7 +434,7 @@ constexpr bool IsPcbnewType( const KICAD_T aType )
|
||||||
case PCB_FOOTPRINT_T:
|
case PCB_FOOTPRINT_T:
|
||||||
case PCB_PAD_T:
|
case PCB_PAD_T:
|
||||||
case PCB_SHAPE_T:
|
case PCB_SHAPE_T:
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
case PCB_FIELD_T:
|
case PCB_FIELD_T:
|
||||||
case PCB_TEXT_T:
|
case PCB_TEXT_T:
|
||||||
case PCB_TEXTBOX_T:
|
case PCB_TEXTBOX_T:
|
||||||
|
|
|
@ -100,8 +100,8 @@ set( PCBNEW_DIALOGS
|
||||||
dialogs/dialog_push_pad_properties_base.cpp
|
dialogs/dialog_push_pad_properties_base.cpp
|
||||||
dialogs/dialog_shape_properties.cpp
|
dialogs/dialog_shape_properties.cpp
|
||||||
dialogs/dialog_shape_properties_base.cpp
|
dialogs/dialog_shape_properties_base.cpp
|
||||||
dialogs/dialog_image_properties.cpp
|
dialogs/dialog_reference_image_properties.cpp
|
||||||
dialogs/dialog_image_properties_base.cpp
|
dialogs/dialog_reference_image_properties_base.cpp
|
||||||
dialogs/dialog_import_settings.cpp
|
dialogs/dialog_import_settings.cpp
|
||||||
dialogs/dialog_import_settings_base.cpp
|
dialogs/dialog_import_settings_base.cpp
|
||||||
dialogs/dialog_imported_layers_base.cpp
|
dialogs/dialog_imported_layers_base.cpp
|
||||||
|
|
|
@ -118,7 +118,7 @@ void ARRAY_CREATOR::Invoke()
|
||||||
{
|
{
|
||||||
case PCB_FOOTPRINT_T:
|
case PCB_FOOTPRINT_T:
|
||||||
case PCB_SHAPE_T:
|
case PCB_SHAPE_T:
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
case PCB_GENERATOR_T:
|
case PCB_GENERATOR_T:
|
||||||
case PCB_TEXT_T:
|
case PCB_TEXT_T:
|
||||||
case PCB_TEXTBOX_T:
|
case PCB_TEXTBOX_T:
|
||||||
|
|
|
@ -45,7 +45,6 @@
|
||||||
#include <pcb_generator.h>
|
#include <pcb_generator.h>
|
||||||
#include <pcb_target.h>
|
#include <pcb_target.h>
|
||||||
#include <pcb_shape.h>
|
#include <pcb_shape.h>
|
||||||
#include <pcb_bitmap.h>
|
|
||||||
#include <pcb_text.h>
|
#include <pcb_text.h>
|
||||||
#include <pcb_textbox.h>
|
#include <pcb_textbox.h>
|
||||||
#include <pcb_dimension.h>
|
#include <pcb_dimension.h>
|
||||||
|
@ -898,7 +897,7 @@ void BOARD::Add( BOARD_ITEM* aBoardItem, ADD_MODE aMode, bool aSkipConnectivity
|
||||||
case PCB_DIM_ORTHOGONAL_T:
|
case PCB_DIM_ORTHOGONAL_T:
|
||||||
case PCB_DIM_LEADER_T:
|
case PCB_DIM_LEADER_T:
|
||||||
case PCB_SHAPE_T:
|
case PCB_SHAPE_T:
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
case PCB_FIELD_T:
|
case PCB_FIELD_T:
|
||||||
case PCB_TEXT_T:
|
case PCB_TEXT_T:
|
||||||
case PCB_TEXTBOX_T:
|
case PCB_TEXTBOX_T:
|
||||||
|
@ -1016,7 +1015,7 @@ void BOARD::Remove( BOARD_ITEM* aBoardItem, REMOVE_MODE aRemoveMode )
|
||||||
case PCB_DIM_ORTHOGONAL_T:
|
case PCB_DIM_ORTHOGONAL_T:
|
||||||
case PCB_DIM_LEADER_T:
|
case PCB_DIM_LEADER_T:
|
||||||
case PCB_SHAPE_T:
|
case PCB_SHAPE_T:
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
case PCB_FIELD_T:
|
case PCB_FIELD_T:
|
||||||
case PCB_TEXT_T:
|
case PCB_TEXT_T:
|
||||||
case PCB_TEXTBOX_T:
|
case PCB_TEXTBOX_T:
|
||||||
|
@ -1502,7 +1501,7 @@ INSPECT_RESULT BOARD::Visit( INSPECTOR inspector, void* testData,
|
||||||
case PCB_FOOTPRINT_T:
|
case PCB_FOOTPRINT_T:
|
||||||
case PCB_PAD_T:
|
case PCB_PAD_T:
|
||||||
case PCB_SHAPE_T:
|
case PCB_SHAPE_T:
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
case PCB_FIELD_T:
|
case PCB_FIELD_T:
|
||||||
case PCB_TEXT_T:
|
case PCB_TEXT_T:
|
||||||
case PCB_TEXTBOX_T:
|
case PCB_TEXTBOX_T:
|
||||||
|
|
|
@ -308,7 +308,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage, int aCommitFlags )
|
||||||
case PCB_TEXT_T:
|
case PCB_TEXT_T:
|
||||||
case PCB_PAD_T:
|
case PCB_PAD_T:
|
||||||
case PCB_SHAPE_T: // a shape (normally not on copper layers)
|
case PCB_SHAPE_T: // a shape (normally not on copper layers)
|
||||||
case PCB_BITMAP_T: // a bitmap on a user layer
|
case PCB_REFERENCE_IMAGE_T: // a bitmap on an associated layer
|
||||||
case PCB_GENERATOR_T: // a generator on a layer
|
case PCB_GENERATOR_T: // a generator on a layer
|
||||||
case PCB_TEXTBOX_T: // a wrapped text on a layer
|
case PCB_TEXTBOX_T: // a wrapped text on a layer
|
||||||
case PCB_TRACE_T: // a track segment (segment on a copper layer)
|
case PCB_TRACE_T: // a track segment (segment on a copper layer)
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
const std::vector<KICAD_T> GENERAL_COLLECTOR::AllBoardItems = {
|
const std::vector<KICAD_T> GENERAL_COLLECTOR::AllBoardItems = {
|
||||||
PCB_MARKER_T, // in m_markers
|
PCB_MARKER_T, // in m_markers
|
||||||
PCB_TEXT_T, // in m_drawings
|
PCB_TEXT_T, // in m_drawings
|
||||||
PCB_BITMAP_T, // in m_drawings
|
PCB_REFERENCE_IMAGE_T, // in m_drawings
|
||||||
PCB_TEXTBOX_T, // in m_drawings
|
PCB_TEXTBOX_T, // in m_drawings
|
||||||
PCB_SHAPE_T, // in m_drawings
|
PCB_SHAPE_T, // in m_drawings
|
||||||
PCB_DIM_ALIGNED_T, // in m_drawings
|
PCB_DIM_ALIGNED_T, // in m_drawings
|
||||||
|
@ -63,7 +63,7 @@ const std::vector<KICAD_T> GENERAL_COLLECTOR::AllBoardItems = {
|
||||||
|
|
||||||
const std::vector<KICAD_T> GENERAL_COLLECTOR::BoardLevelItems = {
|
const std::vector<KICAD_T> GENERAL_COLLECTOR::BoardLevelItems = {
|
||||||
PCB_MARKER_T,
|
PCB_MARKER_T,
|
||||||
PCB_BITMAP_T,
|
PCB_REFERENCE_IMAGE_T,
|
||||||
PCB_TEXT_T,
|
PCB_TEXT_T,
|
||||||
PCB_TEXTBOX_T,
|
PCB_TEXTBOX_T,
|
||||||
PCB_SHAPE_T,
|
PCB_SHAPE_T,
|
||||||
|
@ -110,7 +110,7 @@ const std::vector<KICAD_T> GENERAL_COLLECTOR::FootprintItems = {
|
||||||
PCB_PAD_T,
|
PCB_PAD_T,
|
||||||
PCB_ZONE_T,
|
PCB_ZONE_T,
|
||||||
PCB_GROUP_T,
|
PCB_GROUP_T,
|
||||||
PCB_BITMAP_T
|
PCB_REFERENCE_IMAGE_T
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -282,7 +282,7 @@ bool DIALOG_FOOTPRINT_PROPERTIES::TransferDataToWindow()
|
||||||
m_cbLocked->SetValue( m_footprint->IsLocked() );
|
m_cbLocked->SetValue( m_footprint->IsLocked() );
|
||||||
m_cbLocked->SetToolTip( _( "Locked footprints cannot be freely moved and oriented on the "
|
m_cbLocked->SetToolTip( _( "Locked footprints cannot be freely moved and oriented on the "
|
||||||
"canvas and can only be selected when the 'Locked items' checkbox "
|
"canvas and can only be selected when the 'Locked items' checkbox "
|
||||||
"is enabled in the selection filter." ) );
|
"is checked in the selection filter." ) );
|
||||||
|
|
||||||
if( m_footprint->GetAttributes() & FP_THROUGH_HOLE )
|
if( m_footprint->GetAttributes() & FP_THROUGH_HOLE )
|
||||||
m_componentType->SetSelection( 0 );
|
m_componentType->SetSelection( 0 );
|
||||||
|
|
|
@ -1,103 +0,0 @@
|
||||||
///////////////////////////////////////////////////////////////////////////
|
|
||||||
// C++ code generated with wxFormBuilder (version 3.10.1-282-g1fa54006)
|
|
||||||
// http://www.wxformbuilder.org/
|
|
||||||
//
|
|
||||||
// PLEASE DO *NOT* EDIT THIS FILE!
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
#include "pcb_layer_box_selector.h"
|
|
||||||
|
|
||||||
#include "dialog_image_properties_base.h"
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
DIALOG_IMAGE_PROPERTIES_BASE::DIALOG_IMAGE_PROPERTIES_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 );
|
|
||||||
|
|
||||||
wxBoxSizer* m_GeneralBoxSizer;
|
|
||||||
m_GeneralBoxSizer = new wxBoxSizer( wxVERTICAL );
|
|
||||||
|
|
||||||
m_Notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_PanelGeneral = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
|
||||||
wxBoxSizer* bSizerProperties;
|
|
||||||
bSizerProperties = new wxBoxSizer( wxVERTICAL );
|
|
||||||
|
|
||||||
wxStaticBoxSizer* sbSizerProperties;
|
|
||||||
sbSizerProperties = new wxStaticBoxSizer( new wxStaticBox( m_PanelGeneral, wxID_ANY, wxT("Position") ), wxVERTICAL );
|
|
||||||
|
|
||||||
wxFlexGridSizer* fgSizerPos;
|
|
||||||
fgSizerPos = new wxFlexGridSizer( 3, 3, 1, 0 );
|
|
||||||
fgSizerPos->AddGrowableCol( 1 );
|
|
||||||
fgSizerPos->AddGrowableRow( 2 );
|
|
||||||
fgSizerPos->SetFlexibleDirection( wxBOTH );
|
|
||||||
fgSizerPos->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
|
||||||
|
|
||||||
m_XPosLabel = new wxStaticText( sbSizerProperties->GetStaticBox(), wxID_ANY, wxT("X:"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_XPosLabel->Wrap( -1 );
|
|
||||||
fgSizerPos->Add( m_XPosLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
|
|
||||||
|
|
||||||
m_ModPositionX = new wxTextCtrl( sbSizerProperties->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
fgSizerPos->Add( m_ModPositionX, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
|
|
||||||
|
|
||||||
m_XPosUnit = new wxStaticText( sbSizerProperties->GetStaticBox(), wxID_ANY, wxT("unit"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_XPosUnit->Wrap( -1 );
|
|
||||||
fgSizerPos->Add( m_XPosUnit, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
|
|
||||||
|
|
||||||
m_YPosLabel = new wxStaticText( sbSizerProperties->GetStaticBox(), wxID_ANY, wxT("Y:"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_YPosLabel->Wrap( -1 );
|
|
||||||
fgSizerPos->Add( m_YPosLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
|
|
||||||
|
|
||||||
m_ModPositionY = new wxTextCtrl( sbSizerProperties->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
fgSizerPos->Add( m_ModPositionY, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP, 1 );
|
|
||||||
|
|
||||||
m_YPosUnit = new wxStaticText( sbSizerProperties->GetStaticBox(), wxID_ANY, wxT("unit"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_YPosUnit->Wrap( -1 );
|
|
||||||
fgSizerPos->Add( m_YPosUnit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
|
|
||||||
|
|
||||||
m_LayerLabel = new wxStaticText( sbSizerProperties->GetStaticBox(), wxID_ANY, wxT("Layer:"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_LayerLabel->Wrap( -1 );
|
|
||||||
fgSizerPos->Add( m_LayerLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
|
|
||||||
|
|
||||||
m_LayerSelectionCtrl = new PCB_LAYER_BOX_SELECTOR( sbSizerProperties->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
|
|
||||||
fgSizerPos->Add( m_LayerSelectionCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
|
|
||||||
|
|
||||||
|
|
||||||
fgSizerPos->Add( 0, 0, 1, wxEXPAND, 5 );
|
|
||||||
|
|
||||||
|
|
||||||
sbSizerProperties->Add( fgSizerPos, 0, wxBOTTOM|wxEXPAND, 3 );
|
|
||||||
|
|
||||||
m_cbLocked = new wxCheckBox( sbSizerProperties->GetStaticBox(), wxID_ANY, wxT("Locked"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
sbSizerProperties->Add( m_cbLocked, 0, wxALL, 5 );
|
|
||||||
|
|
||||||
|
|
||||||
bSizerProperties->Add( sbSizerProperties, 1, wxALL|wxEXPAND, 5 );
|
|
||||||
|
|
||||||
|
|
||||||
m_PanelGeneral->SetSizer( bSizerProperties );
|
|
||||||
m_PanelGeneral->Layout();
|
|
||||||
bSizerProperties->Fit( m_PanelGeneral );
|
|
||||||
m_Notebook->AddPage( m_PanelGeneral, wxT("General"), false );
|
|
||||||
|
|
||||||
m_GeneralBoxSizer->Add( m_Notebook, 1, wxEXPAND | wxALL, 5 );
|
|
||||||
|
|
||||||
m_sdbSizerStdButtons = new wxStdDialogButtonSizer();
|
|
||||||
m_sdbSizerStdButtonsOK = new wxButton( this, wxID_OK );
|
|
||||||
m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsOK );
|
|
||||||
m_sdbSizerStdButtonsCancel = new wxButton( this, wxID_CANCEL );
|
|
||||||
m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsCancel );
|
|
||||||
m_sdbSizerStdButtons->Realize();
|
|
||||||
|
|
||||||
m_GeneralBoxSizer->Add( m_sdbSizerStdButtons, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 );
|
|
||||||
|
|
||||||
|
|
||||||
this->SetSizer( m_GeneralBoxSizer );
|
|
||||||
this->Layout();
|
|
||||||
|
|
||||||
this->Centre( wxBOTH );
|
|
||||||
}
|
|
||||||
|
|
||||||
DIALOG_IMAGE_PROPERTIES_BASE::~DIALOG_IMAGE_PROPERTIES_BASE()
|
|
||||||
{
|
|
||||||
}
|
|
|
@ -1,823 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
|
||||||
<wxFormBuilder_Project>
|
|
||||||
<FileVersion major="1" minor="16" />
|
|
||||||
<object class="Project" expanded="1">
|
|
||||||
<property name="class_decoration">; </property>
|
|
||||||
<property name="code_generation">C++</property>
|
|
||||||
<property name="disconnect_events">1</property>
|
|
||||||
<property name="disconnect_mode">source_name</property>
|
|
||||||
<property name="disconnect_php_events">0</property>
|
|
||||||
<property name="disconnect_python_events">0</property>
|
|
||||||
<property name="embedded_files_path">res</property>
|
|
||||||
<property name="encoding">UTF-8</property>
|
|
||||||
<property name="event_generation">connect</property>
|
|
||||||
<property name="file">dialog_image_properties_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">0</property>
|
|
||||||
<property name="name">DIALOG_IMAGE_PROPERTIES_BASE</property>
|
|
||||||
<property name="namespace"></property>
|
|
||||||
<property name="path">.</property>
|
|
||||||
<property name="precompiled_header"></property>
|
|
||||||
<property name="relative_path">1</property>
|
|
||||||
<property name="skip_lua_events">1</property>
|
|
||||||
<property name="skip_php_events">1</property>
|
|
||||||
<property name="skip_python_events">1</property>
|
|
||||||
<property name="ui_table">UI</property>
|
|
||||||
<property name="use_array_enum">0</property>
|
|
||||||
<property name="use_enum">0</property>
|
|
||||||
<property name="use_microsoft_bom">0</property>
|
|
||||||
<object class="Dialog" expanded="1">
|
|
||||||
<property name="aui_managed">0</property>
|
|
||||||
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
|
|
||||||
<property name="bg"></property>
|
|
||||||
<property name="center">wxBOTH</property>
|
|
||||||
<property name="context_help"></property>
|
|
||||||
<property name="context_menu">1</property>
|
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
|
||||||
<property name="event_handler">impl_virtual</property>
|
|
||||||
<property name="extra_style"></property>
|
|
||||||
<property name="fg"></property>
|
|
||||||
<property name="font"></property>
|
|
||||||
<property name="hidden">0</property>
|
|
||||||
<property name="id">wxID_ANY</property>
|
|
||||||
<property name="maximum_size"></property>
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="name">DIALOG_IMAGE_PROPERTIES_BASE</property>
|
|
||||||
<property name="pos"></property>
|
|
||||||
<property name="size">353,260</property>
|
|
||||||
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
|
|
||||||
<property name="subclass">DIALOG_SHIM; dialog_shim.h; forward_declare</property>
|
|
||||||
<property name="title">Image Properties</property>
|
|
||||||
<property name="tooltip"></property>
|
|
||||||
<property name="two_step_creation">0</property>
|
|
||||||
<property name="window_extra_style"></property>
|
|
||||||
<property name="window_name"></property>
|
|
||||||
<property name="window_style"></property>
|
|
||||||
<object class="wxBoxSizer" expanded="1">
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="name">m_GeneralBoxSizer</property>
|
|
||||||
<property name="orient">wxVERTICAL</property>
|
|
||||||
<property name="permission">none</property>
|
|
||||||
<object class="sizeritem" expanded="1">
|
|
||||||
<property name="border">5</property>
|
|
||||||
<property name="flag">wxEXPAND | wxALL</property>
|
|
||||||
<property name="proportion">1</property>
|
|
||||||
<object class="wxNotebook" expanded="1">
|
|
||||||
<property name="BottomDockable">1</property>
|
|
||||||
<property name="LeftDockable">1</property>
|
|
||||||
<property name="RightDockable">1</property>
|
|
||||||
<property name="TopDockable">1</property>
|
|
||||||
<property name="aui_layer"></property>
|
|
||||||
<property name="aui_name"></property>
|
|
||||||
<property name="aui_position"></property>
|
|
||||||
<property name="aui_row"></property>
|
|
||||||
<property name="best_size"></property>
|
|
||||||
<property name="bg"></property>
|
|
||||||
<property name="bitmapsize"></property>
|
|
||||||
<property name="caption"></property>
|
|
||||||
<property name="caption_visible">1</property>
|
|
||||||
<property name="center_pane">0</property>
|
|
||||||
<property name="close_button">1</property>
|
|
||||||
<property name="context_help"></property>
|
|
||||||
<property name="context_menu">1</property>
|
|
||||||
<property name="default_pane">0</property>
|
|
||||||
<property name="dock">Dock</property>
|
|
||||||
<property name="dock_fixed">0</property>
|
|
||||||
<property name="docking">Left</property>
|
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
|
||||||
<property name="fg"></property>
|
|
||||||
<property name="floatable">1</property>
|
|
||||||
<property name="font"></property>
|
|
||||||
<property name="gripper">0</property>
|
|
||||||
<property name="hidden">0</property>
|
|
||||||
<property name="id">wxID_ANY</property>
|
|
||||||
<property name="max_size"></property>
|
|
||||||
<property name="maximize_button">0</property>
|
|
||||||
<property name="maximum_size"></property>
|
|
||||||
<property name="min_size"></property>
|
|
||||||
<property name="minimize_button">0</property>
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="moveable">1</property>
|
|
||||||
<property name="name">m_Notebook</property>
|
|
||||||
<property name="pane_border">1</property>
|
|
||||||
<property name="pane_position"></property>
|
|
||||||
<property name="pane_size"></property>
|
|
||||||
<property name="permission">protected</property>
|
|
||||||
<property name="pin_button">1</property>
|
|
||||||
<property name="pos"></property>
|
|
||||||
<property name="resize">Resizable</property>
|
|
||||||
<property name="show">1</property>
|
|
||||||
<property name="size"></property>
|
|
||||||
<property name="style"></property>
|
|
||||||
<property name="subclass">; ; forward_declare</property>
|
|
||||||
<property name="toolbar_pane">0</property>
|
|
||||||
<property name="tooltip"></property>
|
|
||||||
<property name="window_extra_style"></property>
|
|
||||||
<property name="window_name"></property>
|
|
||||||
<property name="window_style"></property>
|
|
||||||
<object class="notebookpage" expanded="1">
|
|
||||||
<property name="bitmap"></property>
|
|
||||||
<property name="label">General</property>
|
|
||||||
<property name="select">0</property>
|
|
||||||
<object class="wxPanel" expanded="1">
|
|
||||||
<property name="BottomDockable">1</property>
|
|
||||||
<property name="LeftDockable">1</property>
|
|
||||||
<property name="RightDockable">1</property>
|
|
||||||
<property name="TopDockable">1</property>
|
|
||||||
<property name="aui_layer"></property>
|
|
||||||
<property name="aui_name"></property>
|
|
||||||
<property name="aui_position"></property>
|
|
||||||
<property name="aui_row"></property>
|
|
||||||
<property name="best_size"></property>
|
|
||||||
<property name="bg"></property>
|
|
||||||
<property name="caption"></property>
|
|
||||||
<property name="caption_visible">1</property>
|
|
||||||
<property name="center_pane">0</property>
|
|
||||||
<property name="close_button">1</property>
|
|
||||||
<property name="context_help"></property>
|
|
||||||
<property name="context_menu">1</property>
|
|
||||||
<property name="default_pane">0</property>
|
|
||||||
<property name="dock">Dock</property>
|
|
||||||
<property name="dock_fixed">0</property>
|
|
||||||
<property name="docking">Left</property>
|
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
|
||||||
<property name="fg"></property>
|
|
||||||
<property name="floatable">1</property>
|
|
||||||
<property name="font"></property>
|
|
||||||
<property name="gripper">0</property>
|
|
||||||
<property name="hidden">0</property>
|
|
||||||
<property name="id">wxID_ANY</property>
|
|
||||||
<property name="max_size"></property>
|
|
||||||
<property name="maximize_button">0</property>
|
|
||||||
<property name="maximum_size"></property>
|
|
||||||
<property name="min_size"></property>
|
|
||||||
<property name="minimize_button">0</property>
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="moveable">1</property>
|
|
||||||
<property name="name">m_PanelGeneral</property>
|
|
||||||
<property name="pane_border">1</property>
|
|
||||||
<property name="pane_position"></property>
|
|
||||||
<property name="pane_size"></property>
|
|
||||||
<property name="permission">protected</property>
|
|
||||||
<property name="pin_button">1</property>
|
|
||||||
<property name="pos"></property>
|
|
||||||
<property name="resize">Resizable</property>
|
|
||||||
<property name="show">1</property>
|
|
||||||
<property name="size"></property>
|
|
||||||
<property name="subclass">; ; forward_declare</property>
|
|
||||||
<property name="toolbar_pane">0</property>
|
|
||||||
<property name="tooltip"></property>
|
|
||||||
<property name="window_extra_style"></property>
|
|
||||||
<property name="window_name"></property>
|
|
||||||
<property name="window_style">wxTAB_TRAVERSAL</property>
|
|
||||||
<object class="wxBoxSizer" expanded="1">
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="name">bSizerProperties</property>
|
|
||||||
<property name="orient">wxVERTICAL</property>
|
|
||||||
<property name="permission">none</property>
|
|
||||||
<object class="sizeritem" expanded="1">
|
|
||||||
<property name="border">5</property>
|
|
||||||
<property name="flag">wxALL|wxEXPAND</property>
|
|
||||||
<property name="proportion">1</property>
|
|
||||||
<object class="wxStaticBoxSizer" expanded="1">
|
|
||||||
<property name="id">wxID_ANY</property>
|
|
||||||
<property name="label">Position</property>
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="name">sbSizerProperties</property>
|
|
||||||
<property name="orient">wxVERTICAL</property>
|
|
||||||
<property name="parent">1</property>
|
|
||||||
<property name="permission">none</property>
|
|
||||||
<object class="sizeritem" expanded="1">
|
|
||||||
<property name="border">3</property>
|
|
||||||
<property name="flag">wxBOTTOM|wxEXPAND</property>
|
|
||||||
<property name="proportion">0</property>
|
|
||||||
<object class="wxFlexGridSizer" expanded="1">
|
|
||||||
<property name="cols">3</property>
|
|
||||||
<property name="flexible_direction">wxBOTH</property>
|
|
||||||
<property name="growablecols">1</property>
|
|
||||||
<property name="growablerows">2</property>
|
|
||||||
<property name="hgap">0</property>
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="name">fgSizerPos</property>
|
|
||||||
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
|
|
||||||
<property name="permission">none</property>
|
|
||||||
<property name="rows">3</property>
|
|
||||||
<property name="vgap">1</property>
|
|
||||||
<object class="sizeritem" expanded="0">
|
|
||||||
<property name="border">5</property>
|
|
||||||
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
|
|
||||||
<property name="proportion">0</property>
|
|
||||||
<object class="wxStaticText" expanded="0">
|
|
||||||
<property name="BottomDockable">1</property>
|
|
||||||
<property name="LeftDockable">1</property>
|
|
||||||
<property name="RightDockable">1</property>
|
|
||||||
<property name="TopDockable">1</property>
|
|
||||||
<property name="aui_layer"></property>
|
|
||||||
<property name="aui_name"></property>
|
|
||||||
<property name="aui_position"></property>
|
|
||||||
<property name="aui_row"></property>
|
|
||||||
<property name="best_size"></property>
|
|
||||||
<property name="bg"></property>
|
|
||||||
<property name="caption"></property>
|
|
||||||
<property name="caption_visible">1</property>
|
|
||||||
<property name="center_pane">0</property>
|
|
||||||
<property name="close_button">1</property>
|
|
||||||
<property name="context_help"></property>
|
|
||||||
<property name="context_menu">1</property>
|
|
||||||
<property name="default_pane">0</property>
|
|
||||||
<property name="dock">Dock</property>
|
|
||||||
<property name="dock_fixed">0</property>
|
|
||||||
<property name="docking">Left</property>
|
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
|
||||||
<property name="fg"></property>
|
|
||||||
<property name="floatable">1</property>
|
|
||||||
<property name="font"></property>
|
|
||||||
<property name="gripper">0</property>
|
|
||||||
<property name="hidden">0</property>
|
|
||||||
<property name="id">wxID_ANY</property>
|
|
||||||
<property name="label">X:</property>
|
|
||||||
<property name="markup">0</property>
|
|
||||||
<property name="max_size"></property>
|
|
||||||
<property name="maximize_button">0</property>
|
|
||||||
<property name="maximum_size"></property>
|
|
||||||
<property name="min_size"></property>
|
|
||||||
<property name="minimize_button">0</property>
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="moveable">1</property>
|
|
||||||
<property name="name">m_XPosLabel</property>
|
|
||||||
<property name="pane_border">1</property>
|
|
||||||
<property name="pane_position"></property>
|
|
||||||
<property name="pane_size"></property>
|
|
||||||
<property name="permission">protected</property>
|
|
||||||
<property name="pin_button">1</property>
|
|
||||||
<property name="pos"></property>
|
|
||||||
<property name="resize">Resizable</property>
|
|
||||||
<property name="show">1</property>
|
|
||||||
<property name="size"></property>
|
|
||||||
<property name="style"></property>
|
|
||||||
<property name="subclass"></property>
|
|
||||||
<property name="toolbar_pane">0</property>
|
|
||||||
<property name="tooltip"></property>
|
|
||||||
<property name="window_extra_style"></property>
|
|
||||||
<property name="window_name"></property>
|
|
||||||
<property name="window_style"></property>
|
|
||||||
<property name="wrap">-1</property>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
<object class="sizeritem" expanded="0">
|
|
||||||
<property name="border">5</property>
|
|
||||||
<property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
|
|
||||||
<property name="proportion">1</property>
|
|
||||||
<object class="wxTextCtrl" expanded="0">
|
|
||||||
<property name="BottomDockable">1</property>
|
|
||||||
<property name="LeftDockable">1</property>
|
|
||||||
<property name="RightDockable">1</property>
|
|
||||||
<property name="TopDockable">1</property>
|
|
||||||
<property name="aui_layer"></property>
|
|
||||||
<property name="aui_name"></property>
|
|
||||||
<property name="aui_position"></property>
|
|
||||||
<property name="aui_row"></property>
|
|
||||||
<property name="best_size"></property>
|
|
||||||
<property name="bg"></property>
|
|
||||||
<property name="caption"></property>
|
|
||||||
<property name="caption_visible">1</property>
|
|
||||||
<property name="center_pane">0</property>
|
|
||||||
<property name="close_button">1</property>
|
|
||||||
<property name="context_help"></property>
|
|
||||||
<property name="context_menu">1</property>
|
|
||||||
<property name="default_pane">0</property>
|
|
||||||
<property name="dock">Dock</property>
|
|
||||||
<property name="dock_fixed">0</property>
|
|
||||||
<property name="docking">Left</property>
|
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
|
||||||
<property name="fg"></property>
|
|
||||||
<property name="floatable">1</property>
|
|
||||||
<property name="font"></property>
|
|
||||||
<property name="gripper">0</property>
|
|
||||||
<property name="hidden">0</property>
|
|
||||||
<property name="id">wxID_ANY</property>
|
|
||||||
<property name="max_size"></property>
|
|
||||||
<property name="maximize_button">0</property>
|
|
||||||
<property name="maximum_size"></property>
|
|
||||||
<property name="maxlength">0</property>
|
|
||||||
<property name="min_size"></property>
|
|
||||||
<property name="minimize_button">0</property>
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="moveable">1</property>
|
|
||||||
<property name="name">m_ModPositionX</property>
|
|
||||||
<property name="pane_border">1</property>
|
|
||||||
<property name="pane_position"></property>
|
|
||||||
<property name="pane_size"></property>
|
|
||||||
<property name="permission">protected</property>
|
|
||||||
<property name="pin_button">1</property>
|
|
||||||
<property name="pos"></property>
|
|
||||||
<property name="resize">Resizable</property>
|
|
||||||
<property name="show">1</property>
|
|
||||||
<property name="size"></property>
|
|
||||||
<property name="style"></property>
|
|
||||||
<property name="subclass">; ; forward_declare</property>
|
|
||||||
<property name="toolbar_pane">0</property>
|
|
||||||
<property name="tooltip"></property>
|
|
||||||
<property name="validator_data_type"></property>
|
|
||||||
<property name="validator_style">wxFILTER_NONE</property>
|
|
||||||
<property name="validator_type">wxDefaultValidator</property>
|
|
||||||
<property name="validator_variable"></property>
|
|
||||||
<property name="value"></property>
|
|
||||||
<property name="window_extra_style"></property>
|
|
||||||
<property name="window_name"></property>
|
|
||||||
<property name="window_style"></property>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
<object class="sizeritem" expanded="0">
|
|
||||||
<property name="border">5</property>
|
|
||||||
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT</property>
|
|
||||||
<property name="proportion">0</property>
|
|
||||||
<object class="wxStaticText" expanded="0">
|
|
||||||
<property name="BottomDockable">1</property>
|
|
||||||
<property name="LeftDockable">1</property>
|
|
||||||
<property name="RightDockable">1</property>
|
|
||||||
<property name="TopDockable">1</property>
|
|
||||||
<property name="aui_layer"></property>
|
|
||||||
<property name="aui_name"></property>
|
|
||||||
<property name="aui_position"></property>
|
|
||||||
<property name="aui_row"></property>
|
|
||||||
<property name="best_size"></property>
|
|
||||||
<property name="bg"></property>
|
|
||||||
<property name="caption"></property>
|
|
||||||
<property name="caption_visible">1</property>
|
|
||||||
<property name="center_pane">0</property>
|
|
||||||
<property name="close_button">1</property>
|
|
||||||
<property name="context_help"></property>
|
|
||||||
<property name="context_menu">1</property>
|
|
||||||
<property name="default_pane">0</property>
|
|
||||||
<property name="dock">Dock</property>
|
|
||||||
<property name="dock_fixed">0</property>
|
|
||||||
<property name="docking">Left</property>
|
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
|
||||||
<property name="fg"></property>
|
|
||||||
<property name="floatable">1</property>
|
|
||||||
<property name="font"></property>
|
|
||||||
<property name="gripper">0</property>
|
|
||||||
<property name="hidden">0</property>
|
|
||||||
<property name="id">wxID_ANY</property>
|
|
||||||
<property name="label">unit</property>
|
|
||||||
<property name="markup">0</property>
|
|
||||||
<property name="max_size"></property>
|
|
||||||
<property name="maximize_button">0</property>
|
|
||||||
<property name="maximum_size"></property>
|
|
||||||
<property name="min_size"></property>
|
|
||||||
<property name="minimize_button">0</property>
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="moveable">1</property>
|
|
||||||
<property name="name">m_XPosUnit</property>
|
|
||||||
<property name="pane_border">1</property>
|
|
||||||
<property name="pane_position"></property>
|
|
||||||
<property name="pane_size"></property>
|
|
||||||
<property name="permission">protected</property>
|
|
||||||
<property name="pin_button">1</property>
|
|
||||||
<property name="pos"></property>
|
|
||||||
<property name="resize">Resizable</property>
|
|
||||||
<property name="show">1</property>
|
|
||||||
<property name="size"></property>
|
|
||||||
<property name="style"></property>
|
|
||||||
<property name="subclass"></property>
|
|
||||||
<property name="toolbar_pane">0</property>
|
|
||||||
<property name="tooltip"></property>
|
|
||||||
<property name="window_extra_style"></property>
|
|
||||||
<property name="window_name"></property>
|
|
||||||
<property name="window_style"></property>
|
|
||||||
<property name="wrap">-1</property>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
<object class="sizeritem" expanded="0">
|
|
||||||
<property name="border">5</property>
|
|
||||||
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
|
|
||||||
<property name="proportion">0</property>
|
|
||||||
<object class="wxStaticText" expanded="0">
|
|
||||||
<property name="BottomDockable">1</property>
|
|
||||||
<property name="LeftDockable">1</property>
|
|
||||||
<property name="RightDockable">1</property>
|
|
||||||
<property name="TopDockable">1</property>
|
|
||||||
<property name="aui_layer"></property>
|
|
||||||
<property name="aui_name"></property>
|
|
||||||
<property name="aui_position"></property>
|
|
||||||
<property name="aui_row"></property>
|
|
||||||
<property name="best_size"></property>
|
|
||||||
<property name="bg"></property>
|
|
||||||
<property name="caption"></property>
|
|
||||||
<property name="caption_visible">1</property>
|
|
||||||
<property name="center_pane">0</property>
|
|
||||||
<property name="close_button">1</property>
|
|
||||||
<property name="context_help"></property>
|
|
||||||
<property name="context_menu">1</property>
|
|
||||||
<property name="default_pane">0</property>
|
|
||||||
<property name="dock">Dock</property>
|
|
||||||
<property name="dock_fixed">0</property>
|
|
||||||
<property name="docking">Left</property>
|
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
|
||||||
<property name="fg"></property>
|
|
||||||
<property name="floatable">1</property>
|
|
||||||
<property name="font"></property>
|
|
||||||
<property name="gripper">0</property>
|
|
||||||
<property name="hidden">0</property>
|
|
||||||
<property name="id">wxID_ANY</property>
|
|
||||||
<property name="label">Y:</property>
|
|
||||||
<property name="markup">0</property>
|
|
||||||
<property name="max_size"></property>
|
|
||||||
<property name="maximize_button">0</property>
|
|
||||||
<property name="maximum_size"></property>
|
|
||||||
<property name="min_size"></property>
|
|
||||||
<property name="minimize_button">0</property>
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="moveable">1</property>
|
|
||||||
<property name="name">m_YPosLabel</property>
|
|
||||||
<property name="pane_border">1</property>
|
|
||||||
<property name="pane_position"></property>
|
|
||||||
<property name="pane_size"></property>
|
|
||||||
<property name="permission">protected</property>
|
|
||||||
<property name="pin_button">1</property>
|
|
||||||
<property name="pos"></property>
|
|
||||||
<property name="resize">Resizable</property>
|
|
||||||
<property name="show">1</property>
|
|
||||||
<property name="size"></property>
|
|
||||||
<property name="style"></property>
|
|
||||||
<property name="subclass"></property>
|
|
||||||
<property name="toolbar_pane">0</property>
|
|
||||||
<property name="tooltip"></property>
|
|
||||||
<property name="window_extra_style"></property>
|
|
||||||
<property name="window_name"></property>
|
|
||||||
<property name="window_style"></property>
|
|
||||||
<property name="wrap">-1</property>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
<object class="sizeritem" expanded="0">
|
|
||||||
<property name="border">1</property>
|
|
||||||
<property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP</property>
|
|
||||||
<property name="proportion">1</property>
|
|
||||||
<object class="wxTextCtrl" expanded="0">
|
|
||||||
<property name="BottomDockable">1</property>
|
|
||||||
<property name="LeftDockable">1</property>
|
|
||||||
<property name="RightDockable">1</property>
|
|
||||||
<property name="TopDockable">1</property>
|
|
||||||
<property name="aui_layer"></property>
|
|
||||||
<property name="aui_name"></property>
|
|
||||||
<property name="aui_position"></property>
|
|
||||||
<property name="aui_row"></property>
|
|
||||||
<property name="best_size"></property>
|
|
||||||
<property name="bg"></property>
|
|
||||||
<property name="caption"></property>
|
|
||||||
<property name="caption_visible">1</property>
|
|
||||||
<property name="center_pane">0</property>
|
|
||||||
<property name="close_button">1</property>
|
|
||||||
<property name="context_help"></property>
|
|
||||||
<property name="context_menu">1</property>
|
|
||||||
<property name="default_pane">0</property>
|
|
||||||
<property name="dock">Dock</property>
|
|
||||||
<property name="dock_fixed">0</property>
|
|
||||||
<property name="docking">Left</property>
|
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
|
||||||
<property name="fg"></property>
|
|
||||||
<property name="floatable">1</property>
|
|
||||||
<property name="font"></property>
|
|
||||||
<property name="gripper">0</property>
|
|
||||||
<property name="hidden">0</property>
|
|
||||||
<property name="id">wxID_ANY</property>
|
|
||||||
<property name="max_size"></property>
|
|
||||||
<property name="maximize_button">0</property>
|
|
||||||
<property name="maximum_size"></property>
|
|
||||||
<property name="maxlength">0</property>
|
|
||||||
<property name="min_size"></property>
|
|
||||||
<property name="minimize_button">0</property>
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="moveable">1</property>
|
|
||||||
<property name="name">m_ModPositionY</property>
|
|
||||||
<property name="pane_border">1</property>
|
|
||||||
<property name="pane_position"></property>
|
|
||||||
<property name="pane_size"></property>
|
|
||||||
<property name="permission">protected</property>
|
|
||||||
<property name="pin_button">1</property>
|
|
||||||
<property name="pos"></property>
|
|
||||||
<property name="resize">Resizable</property>
|
|
||||||
<property name="show">1</property>
|
|
||||||
<property name="size"></property>
|
|
||||||
<property name="style"></property>
|
|
||||||
<property name="subclass">; ; forward_declare</property>
|
|
||||||
<property name="toolbar_pane">0</property>
|
|
||||||
<property name="tooltip"></property>
|
|
||||||
<property name="validator_data_type"></property>
|
|
||||||
<property name="validator_style">wxFILTER_NONE</property>
|
|
||||||
<property name="validator_type">wxDefaultValidator</property>
|
|
||||||
<property name="validator_variable"></property>
|
|
||||||
<property name="value"></property>
|
|
||||||
<property name="window_extra_style"></property>
|
|
||||||
<property name="window_name"></property>
|
|
||||||
<property name="window_style"></property>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
<object class="sizeritem" expanded="0">
|
|
||||||
<property name="border">5</property>
|
|
||||||
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
|
|
||||||
<property name="proportion">0</property>
|
|
||||||
<object class="wxStaticText" expanded="0">
|
|
||||||
<property name="BottomDockable">1</property>
|
|
||||||
<property name="LeftDockable">1</property>
|
|
||||||
<property name="RightDockable">1</property>
|
|
||||||
<property name="TopDockable">1</property>
|
|
||||||
<property name="aui_layer"></property>
|
|
||||||
<property name="aui_name"></property>
|
|
||||||
<property name="aui_position"></property>
|
|
||||||
<property name="aui_row"></property>
|
|
||||||
<property name="best_size"></property>
|
|
||||||
<property name="bg"></property>
|
|
||||||
<property name="caption"></property>
|
|
||||||
<property name="caption_visible">1</property>
|
|
||||||
<property name="center_pane">0</property>
|
|
||||||
<property name="close_button">1</property>
|
|
||||||
<property name="context_help"></property>
|
|
||||||
<property name="context_menu">1</property>
|
|
||||||
<property name="default_pane">0</property>
|
|
||||||
<property name="dock">Dock</property>
|
|
||||||
<property name="dock_fixed">0</property>
|
|
||||||
<property name="docking">Left</property>
|
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
|
||||||
<property name="fg"></property>
|
|
||||||
<property name="floatable">1</property>
|
|
||||||
<property name="font"></property>
|
|
||||||
<property name="gripper">0</property>
|
|
||||||
<property name="hidden">0</property>
|
|
||||||
<property name="id">wxID_ANY</property>
|
|
||||||
<property name="label">unit</property>
|
|
||||||
<property name="markup">0</property>
|
|
||||||
<property name="max_size"></property>
|
|
||||||
<property name="maximize_button">0</property>
|
|
||||||
<property name="maximum_size"></property>
|
|
||||||
<property name="min_size"></property>
|
|
||||||
<property name="minimize_button">0</property>
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="moveable">1</property>
|
|
||||||
<property name="name">m_YPosUnit</property>
|
|
||||||
<property name="pane_border">1</property>
|
|
||||||
<property name="pane_position"></property>
|
|
||||||
<property name="pane_size"></property>
|
|
||||||
<property name="permission">protected</property>
|
|
||||||
<property name="pin_button">1</property>
|
|
||||||
<property name="pos"></property>
|
|
||||||
<property name="resize">Resizable</property>
|
|
||||||
<property name="show">1</property>
|
|
||||||
<property name="size"></property>
|
|
||||||
<property name="style"></property>
|
|
||||||
<property name="subclass"></property>
|
|
||||||
<property name="toolbar_pane">0</property>
|
|
||||||
<property name="tooltip"></property>
|
|
||||||
<property name="window_extra_style"></property>
|
|
||||||
<property name="window_name"></property>
|
|
||||||
<property name="window_style"></property>
|
|
||||||
<property name="wrap">-1</property>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
<object class="sizeritem" expanded="0">
|
|
||||||
<property name="border">5</property>
|
|
||||||
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
|
|
||||||
<property name="proportion">0</property>
|
|
||||||
<object class="wxStaticText" expanded="0">
|
|
||||||
<property name="BottomDockable">1</property>
|
|
||||||
<property name="LeftDockable">1</property>
|
|
||||||
<property name="RightDockable">1</property>
|
|
||||||
<property name="TopDockable">1</property>
|
|
||||||
<property name="aui_layer"></property>
|
|
||||||
<property name="aui_name"></property>
|
|
||||||
<property name="aui_position"></property>
|
|
||||||
<property name="aui_row"></property>
|
|
||||||
<property name="best_size"></property>
|
|
||||||
<property name="bg"></property>
|
|
||||||
<property name="caption"></property>
|
|
||||||
<property name="caption_visible">1</property>
|
|
||||||
<property name="center_pane">0</property>
|
|
||||||
<property name="close_button">1</property>
|
|
||||||
<property name="context_help"></property>
|
|
||||||
<property name="context_menu">1</property>
|
|
||||||
<property name="default_pane">0</property>
|
|
||||||
<property name="dock">Dock</property>
|
|
||||||
<property name="dock_fixed">0</property>
|
|
||||||
<property name="docking">Left</property>
|
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
|
||||||
<property name="fg"></property>
|
|
||||||
<property name="floatable">1</property>
|
|
||||||
<property name="font"></property>
|
|
||||||
<property name="gripper">0</property>
|
|
||||||
<property name="hidden">0</property>
|
|
||||||
<property name="id">wxID_ANY</property>
|
|
||||||
<property name="label">Layer:</property>
|
|
||||||
<property name="markup">0</property>
|
|
||||||
<property name="max_size"></property>
|
|
||||||
<property name="maximize_button">0</property>
|
|
||||||
<property name="maximum_size"></property>
|
|
||||||
<property name="min_size"></property>
|
|
||||||
<property name="minimize_button">0</property>
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="moveable">1</property>
|
|
||||||
<property name="name">m_LayerLabel</property>
|
|
||||||
<property name="pane_border">1</property>
|
|
||||||
<property name="pane_position"></property>
|
|
||||||
<property name="pane_size"></property>
|
|
||||||
<property name="permission">protected</property>
|
|
||||||
<property name="pin_button">1</property>
|
|
||||||
<property name="pos"></property>
|
|
||||||
<property name="resize">Resizable</property>
|
|
||||||
<property name="show">1</property>
|
|
||||||
<property name="size"></property>
|
|
||||||
<property name="style"></property>
|
|
||||||
<property name="subclass">; forward_declare</property>
|
|
||||||
<property name="toolbar_pane">0</property>
|
|
||||||
<property name="tooltip"></property>
|
|
||||||
<property name="window_extra_style"></property>
|
|
||||||
<property name="window_name"></property>
|
|
||||||
<property name="window_style"></property>
|
|
||||||
<property name="wrap">-1</property>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
<object class="sizeritem" expanded="1">
|
|
||||||
<property name="border">5</property>
|
|
||||||
<property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
|
|
||||||
<property name="proportion">0</property>
|
|
||||||
<object class="wxBitmapComboBox" expanded="1">
|
|
||||||
<property name="BottomDockable">1</property>
|
|
||||||
<property name="LeftDockable">1</property>
|
|
||||||
<property name="RightDockable">1</property>
|
|
||||||
<property name="TopDockable">1</property>
|
|
||||||
<property name="aui_layer"></property>
|
|
||||||
<property name="aui_name"></property>
|
|
||||||
<property name="aui_position"></property>
|
|
||||||
<property name="aui_row"></property>
|
|
||||||
<property name="best_size"></property>
|
|
||||||
<property name="bg"></property>
|
|
||||||
<property name="caption"></property>
|
|
||||||
<property name="caption_visible">1</property>
|
|
||||||
<property name="center_pane">0</property>
|
|
||||||
<property name="choices"></property>
|
|
||||||
<property name="close_button">1</property>
|
|
||||||
<property name="context_help"></property>
|
|
||||||
<property name="context_menu">1</property>
|
|
||||||
<property name="default_pane">0</property>
|
|
||||||
<property name="dock">Dock</property>
|
|
||||||
<property name="dock_fixed">0</property>
|
|
||||||
<property name="docking">Left</property>
|
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
|
||||||
<property name="fg"></property>
|
|
||||||
<property name="floatable">1</property>
|
|
||||||
<property name="font"></property>
|
|
||||||
<property name="gripper">0</property>
|
|
||||||
<property name="hidden">0</property>
|
|
||||||
<property name="id">wxID_ANY</property>
|
|
||||||
<property name="max_size"></property>
|
|
||||||
<property name="maximize_button">0</property>
|
|
||||||
<property name="maximum_size"></property>
|
|
||||||
<property name="min_size"></property>
|
|
||||||
<property name="minimize_button">0</property>
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="moveable">1</property>
|
|
||||||
<property name="name">m_LayerSelectionCtrl</property>
|
|
||||||
<property name="pane_border">1</property>
|
|
||||||
<property name="pane_position"></property>
|
|
||||||
<property name="pane_size"></property>
|
|
||||||
<property name="permission">protected</property>
|
|
||||||
<property name="pin_button">1</property>
|
|
||||||
<property name="pos"></property>
|
|
||||||
<property name="resize">Resizable</property>
|
|
||||||
<property name="selection">-1</property>
|
|
||||||
<property name="show">1</property>
|
|
||||||
<property name="size"></property>
|
|
||||||
<property name="style"></property>
|
|
||||||
<property name="subclass">PCB_LAYER_BOX_SELECTOR; pcb_layer_box_selector.h; forward_declare</property>
|
|
||||||
<property name="toolbar_pane">0</property>
|
|
||||||
<property name="tooltip"></property>
|
|
||||||
<property name="validator_data_type"></property>
|
|
||||||
<property name="validator_style">wxFILTER_NONE</property>
|
|
||||||
<property name="validator_type">wxDefaultValidator</property>
|
|
||||||
<property name="validator_variable"></property>
|
|
||||||
<property name="value"></property>
|
|
||||||
<property name="window_extra_style"></property>
|
|
||||||
<property name="window_name"></property>
|
|
||||||
<property name="window_style"></property>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
<object class="sizeritem" expanded="1">
|
|
||||||
<property name="border">5</property>
|
|
||||||
<property name="flag">wxEXPAND</property>
|
|
||||||
<property name="proportion">1</property>
|
|
||||||
<object class="spacer" expanded="1">
|
|
||||||
<property name="height">0</property>
|
|
||||||
<property name="permission">protected</property>
|
|
||||||
<property name="width">0</property>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
<object class="sizeritem" expanded="0">
|
|
||||||
<property name="border">5</property>
|
|
||||||
<property name="flag">wxALL</property>
|
|
||||||
<property name="proportion">0</property>
|
|
||||||
<object class="wxCheckBox" expanded="0">
|
|
||||||
<property name="BottomDockable">1</property>
|
|
||||||
<property name="LeftDockable">1</property>
|
|
||||||
<property name="RightDockable">1</property>
|
|
||||||
<property name="TopDockable">1</property>
|
|
||||||
<property name="aui_layer"></property>
|
|
||||||
<property name="aui_name"></property>
|
|
||||||
<property name="aui_position"></property>
|
|
||||||
<property name="aui_row"></property>
|
|
||||||
<property name="best_size"></property>
|
|
||||||
<property name="bg"></property>
|
|
||||||
<property name="caption"></property>
|
|
||||||
<property name="caption_visible">1</property>
|
|
||||||
<property name="center_pane">0</property>
|
|
||||||
<property name="checked">0</property>
|
|
||||||
<property name="close_button">1</property>
|
|
||||||
<property name="context_help"></property>
|
|
||||||
<property name="context_menu">1</property>
|
|
||||||
<property name="default_pane">0</property>
|
|
||||||
<property name="dock">Dock</property>
|
|
||||||
<property name="dock_fixed">0</property>
|
|
||||||
<property name="docking">Left</property>
|
|
||||||
<property name="drag_accept_files">0</property>
|
|
||||||
<property name="enabled">1</property>
|
|
||||||
<property name="fg"></property>
|
|
||||||
<property name="floatable">1</property>
|
|
||||||
<property name="font"></property>
|
|
||||||
<property name="gripper">0</property>
|
|
||||||
<property name="hidden">0</property>
|
|
||||||
<property name="id">wxID_ANY</property>
|
|
||||||
<property name="label">Locked</property>
|
|
||||||
<property name="max_size"></property>
|
|
||||||
<property name="maximize_button">0</property>
|
|
||||||
<property name="maximum_size"></property>
|
|
||||||
<property name="min_size"></property>
|
|
||||||
<property name="minimize_button">0</property>
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="moveable">1</property>
|
|
||||||
<property name="name">m_cbLocked</property>
|
|
||||||
<property name="pane_border">1</property>
|
|
||||||
<property name="pane_position"></property>
|
|
||||||
<property name="pane_size"></property>
|
|
||||||
<property name="permission">protected</property>
|
|
||||||
<property name="pin_button">1</property>
|
|
||||||
<property name="pos"></property>
|
|
||||||
<property name="resize">Resizable</property>
|
|
||||||
<property name="show">1</property>
|
|
||||||
<property name="size"></property>
|
|
||||||
<property name="style"></property>
|
|
||||||
<property name="subclass">; ; forward_declare</property>
|
|
||||||
<property name="toolbar_pane">0</property>
|
|
||||||
<property name="tooltip"></property>
|
|
||||||
<property name="validator_data_type"></property>
|
|
||||||
<property name="validator_style">wxFILTER_NONE</property>
|
|
||||||
<property name="validator_type">wxDefaultValidator</property>
|
|
||||||
<property name="validator_variable"></property>
|
|
||||||
<property name="window_extra_style"></property>
|
|
||||||
<property name="window_name"></property>
|
|
||||||
<property name="window_style"></property>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
<object class="sizeritem" expanded="1">
|
|
||||||
<property name="border">5</property>
|
|
||||||
<property name="flag">wxBOTTOM|wxEXPAND|wxTOP</property>
|
|
||||||
<property name="proportion">0</property>
|
|
||||||
<object class="wxStdDialogButtonSizer" expanded="1">
|
|
||||||
<property name="Apply">0</property>
|
|
||||||
<property name="Cancel">1</property>
|
|
||||||
<property name="ContextHelp">0</property>
|
|
||||||
<property name="Help">0</property>
|
|
||||||
<property name="No">0</property>
|
|
||||||
<property name="OK">1</property>
|
|
||||||
<property name="Save">0</property>
|
|
||||||
<property name="Yes">0</property>
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="name">m_sdbSizerStdButtons</property>
|
|
||||||
<property name="permission">protected</property>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
</wxFormBuilder_Project>
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* This program source code file is part of KiCad, a free EDA CAD application.
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
||||||
*
|
*
|
||||||
* Copyright (C) 2018-2022 KiCad Developers, see AUTHORS.txt for contributors.
|
* Copyright (C) 2018-2023 KiCad Developers, see AUTHORS.txt for contributors.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
|
@ -21,18 +21,21 @@
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <dialogs/dialog_image_properties.h>
|
#include <dialogs/dialog_reference_image_properties.h>
|
||||||
#include <dialogs/panel_image_editor.h>
|
#include <dialogs/panel_image_editor.h>
|
||||||
|
|
||||||
#include <pcb_base_edit_frame.h>
|
#include <pcb_base_edit_frame.h>
|
||||||
#include <pcb_bitmap.h>
|
#include <pcb_reference_image.h>
|
||||||
#include <tool/tool_manager.h>
|
#include <tool/tool_manager.h>
|
||||||
#include <tool/actions.h>
|
#include <tool/actions.h>
|
||||||
#include <pcb_layer_box_selector.h>
|
#include <pcb_layer_box_selector.h>
|
||||||
|
|
||||||
|
|
||||||
DIALOG_IMAGE_PROPERTIES::DIALOG_IMAGE_PROPERTIES( PCB_BASE_FRAME* aParent, PCB_BITMAP* aBitmap ) :
|
DIALOG_REFERENCE_IMAGE_PROPERTIES::DIALOG_REFERENCE_IMAGE_PROPERTIES( PCB_BASE_FRAME* aParent,
|
||||||
DIALOG_IMAGE_PROPERTIES_BASE( aParent ), m_frame( aParent ), m_bitmap( aBitmap ),
|
PCB_REFERENCE_IMAGE* aBitmap ) :
|
||||||
|
DIALOG_REFERENCE_IMAGE_PROPERTIES_BASE( aParent ),
|
||||||
|
m_frame( aParent ),
|
||||||
|
m_bitmap( aBitmap ),
|
||||||
m_posX( aParent, m_XPosLabel, m_ModPositionX, m_XPosUnit ),
|
m_posX( aParent, m_XPosLabel, m_ModPositionX, m_XPosUnit ),
|
||||||
m_posY( aParent, m_YPosLabel, m_ModPositionY, m_YPosUnit )
|
m_posY( aParent, m_YPosLabel, m_ModPositionY, m_YPosUnit )
|
||||||
{
|
{
|
||||||
|
@ -57,10 +60,10 @@ DIALOG_IMAGE_PROPERTIES::DIALOG_IMAGE_PROPERTIES( PCB_BASE_FRAME* aParent, PCB_B
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void PCB_BASE_EDIT_FRAME::ShowBitmapPropertiesDialog( BOARD_ITEM* aBitmap )
|
void PCB_BASE_EDIT_FRAME::ShowReferenceImagePropertiesDialog( BOARD_ITEM* aBitmap )
|
||||||
{
|
{
|
||||||
PCB_BITMAP* bitmap = static_cast<PCB_BITMAP*>( aBitmap );
|
PCB_REFERENCE_IMAGE* bitmap = static_cast<PCB_REFERENCE_IMAGE*>( aBitmap );
|
||||||
DIALOG_IMAGE_PROPERTIES dlg( this, bitmap );
|
DIALOG_REFERENCE_IMAGE_PROPERTIES dlg( this, bitmap );
|
||||||
|
|
||||||
if( dlg.ShowModal() == wxID_OK )
|
if( dlg.ShowModal() == wxID_OK )
|
||||||
{
|
{
|
||||||
|
@ -72,7 +75,7 @@ void PCB_BASE_EDIT_FRAME::ShowBitmapPropertiesDialog( BOARD_ITEM* aBitmap )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool DIALOG_IMAGE_PROPERTIES::TransferDataToWindow()
|
bool DIALOG_REFERENCE_IMAGE_PROPERTIES::TransferDataToWindow()
|
||||||
{
|
{
|
||||||
m_posX.SetValue( m_bitmap->GetPosition().x );
|
m_posX.SetValue( m_bitmap->GetPosition().x );
|
||||||
m_posY.SetValue( m_bitmap->GetPosition().y );
|
m_posY.SetValue( m_bitmap->GetPosition().y );
|
||||||
|
@ -80,15 +83,15 @@ bool DIALOG_IMAGE_PROPERTIES::TransferDataToWindow()
|
||||||
m_LayerSelectionCtrl->SetLayerSelection( m_bitmap->GetLayer() );
|
m_LayerSelectionCtrl->SetLayerSelection( m_bitmap->GetLayer() );
|
||||||
|
|
||||||
m_cbLocked->SetValue( m_bitmap->IsLocked() );
|
m_cbLocked->SetValue( m_bitmap->IsLocked() );
|
||||||
m_cbLocked->SetToolTip( _( "Locked footprints cannot be freely moved and oriented on the "
|
m_cbLocked->SetToolTip( _( "Locked items cannot be freely moved and oriented on the canvas "
|
||||||
"canvas and can only be selected when the 'Locked items' checkbox "
|
"and can only be selected when the 'Locked items' checkbox is "
|
||||||
"is enabled in the selection filter." ) );
|
"checked in the selection filter." ) );
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool DIALOG_IMAGE_PROPERTIES::TransferDataFromWindow()
|
bool DIALOG_REFERENCE_IMAGE_PROPERTIES::TransferDataFromWindow()
|
||||||
{
|
{
|
||||||
if( m_imageEditor->TransferDataFromWindow() )
|
if( m_imageEditor->TransferDataFromWindow() )
|
||||||
{
|
{
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* This program source code file is part of KiCad, a free EDA CAD application.
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
||||||
*
|
*
|
||||||
* Copyright (C) 2018-2022 KiCad Developers, see AUTHORS.txt for contributors.
|
* Copyright (C) 2018-2023 KiCad Developers, see AUTHORS.txt for contributors.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
|
@ -21,23 +21,23 @@
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef DIALOG_IMAGE_PROPERTIES_H
|
#ifndef DIALOG_REFERENCE_IMAGE_PROPERTIES_H
|
||||||
#define DIALOG_IMAGE_PROPERTIES_H
|
#define DIALOG_REFERENCE_IMAGE_PROPERTIES_H
|
||||||
|
|
||||||
#include <dialogs/dialog_image_properties_base.h>
|
#include <dialogs/dialog_reference_image_properties_base.h>
|
||||||
#include <widgets/unit_binder.h>
|
#include <widgets/unit_binder.h>
|
||||||
|
|
||||||
|
|
||||||
class PCB_BASE_FRAME;
|
class PCB_BASE_FRAME;
|
||||||
class PCB_BITMAP;
|
class PCB_REFERENCE_IMAGE;
|
||||||
class PANEL_IMAGE_EDITOR;
|
class PANEL_IMAGE_EDITOR;
|
||||||
|
|
||||||
|
|
||||||
class DIALOG_IMAGE_PROPERTIES : public DIALOG_IMAGE_PROPERTIES_BASE
|
class DIALOG_REFERENCE_IMAGE_PROPERTIES : public DIALOG_REFERENCE_IMAGE_PROPERTIES_BASE
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
DIALOG_IMAGE_PROPERTIES( PCB_BASE_FRAME* aParent, PCB_BITMAP* aBitmap );
|
DIALOG_REFERENCE_IMAGE_PROPERTIES( PCB_BASE_FRAME* aParent, PCB_REFERENCE_IMAGE* aBitmap );
|
||||||
~DIALOG_IMAGE_PROPERTIES() override {}
|
~DIALOG_REFERENCE_IMAGE_PROPERTIES() override {}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool TransferDataToWindow() override;
|
bool TransferDataToWindow() override;
|
||||||
|
@ -45,11 +45,11 @@ private:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
PCB_BASE_FRAME* m_frame;
|
PCB_BASE_FRAME* m_frame;
|
||||||
PCB_BITMAP* m_bitmap;
|
PCB_REFERENCE_IMAGE* m_bitmap;
|
||||||
PANEL_IMAGE_EDITOR* m_imageEditor;
|
PANEL_IMAGE_EDITOR* m_imageEditor;
|
||||||
|
|
||||||
UNIT_BINDER m_posX;
|
UNIT_BINDER m_posX;
|
||||||
UNIT_BINDER m_posY;
|
UNIT_BINDER m_posY;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif // DIALOG_REFERENCE_IMAGE_PROPERTIES_H
|
|
@ -0,0 +1,97 @@
|
||||||
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
|
||||||
|
// http://www.wxformbuilder.org/
|
||||||
|
//
|
||||||
|
// PLEASE DO *NOT* EDIT THIS FILE!
|
||||||
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#include "pcb_layer_box_selector.h"
|
||||||
|
|
||||||
|
#include "dialog_reference_image_properties_base.h"
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
DIALOG_REFERENCE_IMAGE_PROPERTIES_BASE::DIALOG_REFERENCE_IMAGE_PROPERTIES_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 );
|
||||||
|
|
||||||
|
wxBoxSizer* m_GeneralBoxSizer;
|
||||||
|
m_GeneralBoxSizer = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
|
m_Notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
m_PanelGeneral = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
||||||
|
wxBoxSizer* bSizerProperties;
|
||||||
|
bSizerProperties = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
|
wxGridBagSizer* gbSizer1;
|
||||||
|
gbSizer1 = new wxGridBagSizer( 3, 5 );
|
||||||
|
gbSizer1->SetFlexibleDirection( wxBOTH );
|
||||||
|
gbSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL );
|
||||||
|
gbSizer1->SetEmptyCellSize( wxSize( -1,5 ) );
|
||||||
|
|
||||||
|
m_XPosLabel = new wxStaticText( m_PanelGeneral, wxID_ANY, wxT("Position X:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
m_XPosLabel->Wrap( -1 );
|
||||||
|
gbSizer1->Add( m_XPosLabel, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
|
||||||
|
|
||||||
|
m_ModPositionX = new wxTextCtrl( m_PanelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
gbSizer1->Add( m_ModPositionX, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
|
||||||
|
|
||||||
|
m_XPosUnit = new wxStaticText( m_PanelGeneral, wxID_ANY, wxT("unit"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
m_XPosUnit->Wrap( -1 );
|
||||||
|
gbSizer1->Add( m_XPosUnit, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
|
||||||
|
|
||||||
|
m_YPosLabel = new wxStaticText( m_PanelGeneral, wxID_ANY, wxT("Position Y:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
m_YPosLabel->Wrap( -1 );
|
||||||
|
gbSizer1->Add( m_YPosLabel, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
|
||||||
|
|
||||||
|
m_ModPositionY = new wxTextCtrl( m_PanelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
gbSizer1->Add( m_ModPositionY, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
|
||||||
|
|
||||||
|
m_YPosUnit = new wxStaticText( m_PanelGeneral, wxID_ANY, wxT("unit"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
m_YPosUnit->Wrap( -1 );
|
||||||
|
gbSizer1->Add( m_YPosUnit, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
|
||||||
|
|
||||||
|
m_LayerLabel = new wxStaticText( m_PanelGeneral, wxID_ANY, wxT("Associated layer:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
m_LayerLabel->Wrap( -1 );
|
||||||
|
gbSizer1->Add( m_LayerLabel, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
|
||||||
|
|
||||||
|
m_LayerSelectionCtrl = new PCB_LAYER_BOX_SELECTOR( m_PanelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
|
||||||
|
gbSizer1->Add( m_LayerSelectionCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
|
||||||
|
|
||||||
|
m_cbLocked = new wxCheckBox( m_PanelGeneral, wxID_ANY, wxT("Locked"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
gbSizer1->Add( m_cbLocked, wxGBPosition( 4, 0 ), wxGBSpan( 1, 3 ), wxALIGN_CENTER_VERTICAL, 5 );
|
||||||
|
|
||||||
|
|
||||||
|
gbSizer1->AddGrowableCol( 1 );
|
||||||
|
gbSizer1->AddGrowableRow( 0 );
|
||||||
|
|
||||||
|
bSizerProperties->Add( gbSizer1, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 );
|
||||||
|
|
||||||
|
|
||||||
|
m_PanelGeneral->SetSizer( bSizerProperties );
|
||||||
|
m_PanelGeneral->Layout();
|
||||||
|
bSizerProperties->Fit( m_PanelGeneral );
|
||||||
|
m_Notebook->AddPage( m_PanelGeneral, wxT("General"), false );
|
||||||
|
|
||||||
|
m_GeneralBoxSizer->Add( m_Notebook, 1, wxEXPAND|wxALL, 10 );
|
||||||
|
|
||||||
|
m_sdbSizerStdButtons = new wxStdDialogButtonSizer();
|
||||||
|
m_sdbSizerStdButtonsOK = new wxButton( this, wxID_OK );
|
||||||
|
m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsOK );
|
||||||
|
m_sdbSizerStdButtonsCancel = new wxButton( this, wxID_CANCEL );
|
||||||
|
m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsCancel );
|
||||||
|
m_sdbSizerStdButtons->Realize();
|
||||||
|
|
||||||
|
m_GeneralBoxSizer->Add( m_sdbSizerStdButtons, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
|
|
||||||
|
this->SetSizer( m_GeneralBoxSizer );
|
||||||
|
this->Layout();
|
||||||
|
m_GeneralBoxSizer->Fit( this );
|
||||||
|
|
||||||
|
this->Centre( wxBOTH );
|
||||||
|
}
|
||||||
|
|
||||||
|
DIALOG_REFERENCE_IMAGE_PROPERTIES_BASE::~DIALOG_REFERENCE_IMAGE_PROPERTIES_BASE()
|
||||||
|
{
|
||||||
|
}
|
|
@ -0,0 +1,813 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||||
|
<wxFormBuilder_Project>
|
||||||
|
<FileVersion major="1" minor="16" />
|
||||||
|
<object class="Project" expanded="1">
|
||||||
|
<property name="class_decoration">; </property>
|
||||||
|
<property name="code_generation">C++</property>
|
||||||
|
<property name="disconnect_events">1</property>
|
||||||
|
<property name="disconnect_mode">source_name</property>
|
||||||
|
<property name="disconnect_php_events">0</property>
|
||||||
|
<property name="disconnect_python_events">0</property>
|
||||||
|
<property name="embedded_files_path">res</property>
|
||||||
|
<property name="encoding">UTF-8</property>
|
||||||
|
<property name="event_generation">connect</property>
|
||||||
|
<property name="file">dialog_reference_image_properties_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">0</property>
|
||||||
|
<property name="name">DIALOG_REFERENCE_IMAGE_PROPERTIES_BASE</property>
|
||||||
|
<property name="namespace"></property>
|
||||||
|
<property name="path">.</property>
|
||||||
|
<property name="precompiled_header"></property>
|
||||||
|
<property name="relative_path">1</property>
|
||||||
|
<property name="skip_lua_events">1</property>
|
||||||
|
<property name="skip_php_events">1</property>
|
||||||
|
<property name="skip_python_events">1</property>
|
||||||
|
<property name="ui_table">UI</property>
|
||||||
|
<property name="use_array_enum">0</property>
|
||||||
|
<property name="use_enum">0</property>
|
||||||
|
<property name="use_microsoft_bom">0</property>
|
||||||
|
<object class="Dialog" expanded="1">
|
||||||
|
<property name="aui_managed">0</property>
|
||||||
|
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="center">wxBOTH</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="event_handler">impl_virtual</property>
|
||||||
|
<property name="extra_style"></property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="name">DIALOG_REFERENCE_IMAGE_PROPERTIES_BASE</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="size">-1,-1</property>
|
||||||
|
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
|
||||||
|
<property name="subclass">DIALOG_SHIM; dialog_shim.h; forward_declare</property>
|
||||||
|
<property name="title">Reference Image Properties</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="two_step_creation">0</property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<object class="wxBoxSizer" expanded="1">
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="name">m_GeneralBoxSizer</property>
|
||||||
|
<property name="orient">wxVERTICAL</property>
|
||||||
|
<property name="permission">none</property>
|
||||||
|
<object class="sizeritem" expanded="1">
|
||||||
|
<property name="border">10</property>
|
||||||
|
<property name="flag">wxEXPAND|wxALL</property>
|
||||||
|
<property name="proportion">1</property>
|
||||||
|
<object class="wxNotebook" expanded="1">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="bitmapsize"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_Notebook</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass">; ; forward_declare</property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<object class="notebookpage" expanded="1">
|
||||||
|
<property name="bitmap"></property>
|
||||||
|
<property name="label">General</property>
|
||||||
|
<property name="select">0</property>
|
||||||
|
<object class="wxPanel" expanded="1">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_PanelGeneral</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="subclass">; ; forward_declare</property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style">wxTAB_TRAVERSAL</property>
|
||||||
|
<object class="wxBoxSizer" expanded="1">
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="name">bSizerProperties</property>
|
||||||
|
<property name="orient">wxVERTICAL</property>
|
||||||
|
<property name="permission">none</property>
|
||||||
|
<object class="sizeritem" expanded="1">
|
||||||
|
<property name="border">10</property>
|
||||||
|
<property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
|
||||||
|
<property name="proportion">0</property>
|
||||||
|
<object class="wxGridBagSizer" expanded="1">
|
||||||
|
<property name="empty_cell_size">-1,5</property>
|
||||||
|
<property name="flexible_direction">wxBOTH</property>
|
||||||
|
<property name="growablecols">1</property>
|
||||||
|
<property name="growablerows">0</property>
|
||||||
|
<property name="hgap">5</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="name">gbSizer1</property>
|
||||||
|
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_ALL</property>
|
||||||
|
<property name="permission">none</property>
|
||||||
|
<property name="vgap">3</property>
|
||||||
|
<object class="gbsizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="colspan">1</property>
|
||||||
|
<property name="column">0</property>
|
||||||
|
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
|
||||||
|
<property name="row">0</property>
|
||||||
|
<property name="rowspan">1</property>
|
||||||
|
<object class="wxStaticText" expanded="0">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="label">Position X:</property>
|
||||||
|
<property name="markup">0</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_XPosLabel</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<property name="wrap">-1</property>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="gbsizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="colspan">1</property>
|
||||||
|
<property name="column">1</property>
|
||||||
|
<property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
|
||||||
|
<property name="row">0</property>
|
||||||
|
<property name="rowspan">1</property>
|
||||||
|
<object class="wxTextCtrl" expanded="0">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="maxlength">0</property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_ModPositionX</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass">; ; forward_declare</property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="validator_data_type"></property>
|
||||||
|
<property name="validator_style">wxFILTER_NONE</property>
|
||||||
|
<property name="validator_type">wxDefaultValidator</property>
|
||||||
|
<property name="validator_variable"></property>
|
||||||
|
<property name="value"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="gbsizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="colspan">1</property>
|
||||||
|
<property name="column">2</property>
|
||||||
|
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
|
||||||
|
<property name="row">0</property>
|
||||||
|
<property name="rowspan">1</property>
|
||||||
|
<object class="wxStaticText" expanded="0">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="label">unit</property>
|
||||||
|
<property name="markup">0</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_XPosUnit</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<property name="wrap">-1</property>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="gbsizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="colspan">1</property>
|
||||||
|
<property name="column">0</property>
|
||||||
|
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
|
||||||
|
<property name="row">1</property>
|
||||||
|
<property name="rowspan">1</property>
|
||||||
|
<object class="wxStaticText" expanded="0">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="label">Position Y:</property>
|
||||||
|
<property name="markup">0</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_YPosLabel</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<property name="wrap">-1</property>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="gbsizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="colspan">1</property>
|
||||||
|
<property name="column">1</property>
|
||||||
|
<property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
|
||||||
|
<property name="row">1</property>
|
||||||
|
<property name="rowspan">1</property>
|
||||||
|
<object class="wxTextCtrl" expanded="0">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="maxlength">0</property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_ModPositionY</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass">; ; forward_declare</property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="validator_data_type"></property>
|
||||||
|
<property name="validator_style">wxFILTER_NONE</property>
|
||||||
|
<property name="validator_type">wxDefaultValidator</property>
|
||||||
|
<property name="validator_variable"></property>
|
||||||
|
<property name="value"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="gbsizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="colspan">1</property>
|
||||||
|
<property name="column">2</property>
|
||||||
|
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
|
||||||
|
<property name="row">1</property>
|
||||||
|
<property name="rowspan">1</property>
|
||||||
|
<object class="wxStaticText" expanded="0">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="label">unit</property>
|
||||||
|
<property name="markup">0</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_YPosUnit</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<property name="wrap">-1</property>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="gbsizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="colspan">1</property>
|
||||||
|
<property name="column">0</property>
|
||||||
|
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
|
||||||
|
<property name="row">2</property>
|
||||||
|
<property name="rowspan">1</property>
|
||||||
|
<object class="wxStaticText" expanded="0">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="label">Associated layer:</property>
|
||||||
|
<property name="markup">0</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_LayerLabel</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass">; forward_declare</property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<property name="wrap">-1</property>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="gbsizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="colspan">1</property>
|
||||||
|
<property name="column">1</property>
|
||||||
|
<property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
|
||||||
|
<property name="row">2</property>
|
||||||
|
<property name="rowspan">1</property>
|
||||||
|
<object class="wxBitmapComboBox" expanded="1">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="choices"></property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_LayerSelectionCtrl</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="selection">-1</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass">PCB_LAYER_BOX_SELECTOR; pcb_layer_box_selector.h; forward_declare</property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="validator_data_type"></property>
|
||||||
|
<property name="validator_style">wxFILTER_NONE</property>
|
||||||
|
<property name="validator_type">wxDefaultValidator</property>
|
||||||
|
<property name="validator_variable"></property>
|
||||||
|
<property name="value"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="gbsizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="colspan">3</property>
|
||||||
|
<property name="column">0</property>
|
||||||
|
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
|
||||||
|
<property name="row">4</property>
|
||||||
|
<property name="rowspan">1</property>
|
||||||
|
<object class="wxCheckBox" expanded="0">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="checked">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="label">Locked</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_cbLocked</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass">; ; forward_declare</property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="validator_data_type"></property>
|
||||||
|
<property name="validator_style">wxFILTER_NONE</property>
|
||||||
|
<property name="validator_type">wxDefaultValidator</property>
|
||||||
|
<property name="validator_variable"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="sizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
|
||||||
|
<property name="proportion">0</property>
|
||||||
|
<object class="wxStdDialogButtonSizer" expanded="1">
|
||||||
|
<property name="Apply">0</property>
|
||||||
|
<property name="Cancel">1</property>
|
||||||
|
<property name="ContextHelp">0</property>
|
||||||
|
<property name="Help">0</property>
|
||||||
|
<property name="No">0</property>
|
||||||
|
<property name="OK">1</property>
|
||||||
|
<property name="Save">0</property>
|
||||||
|
<property name="Yes">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="name">m_sdbSizerStdButtons</property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
</wxFormBuilder_Project>
|
|
@ -1,5 +1,5 @@
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// C++ code generated with wxFormBuilder (version 3.10.1-282-g1fa54006)
|
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
|
||||||
// http://www.wxformbuilder.org/
|
// http://www.wxformbuilder.org/
|
||||||
//
|
//
|
||||||
// PLEASE DO *NOT* EDIT THIS FILE!
|
// PLEASE DO *NOT* EDIT THIS FILE!
|
||||||
|
@ -20,9 +20,9 @@ class PCB_LAYER_BOX_SELECTOR;
|
||||||
#include <wx/settings.h>
|
#include <wx/settings.h>
|
||||||
#include <wx/textctrl.h>
|
#include <wx/textctrl.h>
|
||||||
#include <wx/bmpcbox.h>
|
#include <wx/bmpcbox.h>
|
||||||
#include <wx/sizer.h>
|
|
||||||
#include <wx/checkbox.h>
|
#include <wx/checkbox.h>
|
||||||
#include <wx/statbox.h>
|
#include <wx/gbsizer.h>
|
||||||
|
#include <wx/sizer.h>
|
||||||
#include <wx/panel.h>
|
#include <wx/panel.h>
|
||||||
#include <wx/bitmap.h>
|
#include <wx/bitmap.h>
|
||||||
#include <wx/image.h>
|
#include <wx/image.h>
|
||||||
|
@ -35,9 +35,9 @@ class PCB_LAYER_BOX_SELECTOR;
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
/// Class DIALOG_IMAGE_PROPERTIES_BASE
|
/// Class DIALOG_REFERENCE_IMAGE_PROPERTIES_BASE
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
class DIALOG_IMAGE_PROPERTIES_BASE : public DIALOG_SHIM
|
class DIALOG_REFERENCE_IMAGE_PROPERTIES_BASE : public DIALOG_SHIM
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
@ -59,9 +59,9 @@ class DIALOG_IMAGE_PROPERTIES_BASE : public DIALOG_SHIM
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
DIALOG_IMAGE_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Image Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 353,260 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
|
DIALOG_REFERENCE_IMAGE_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Reference Image Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
|
||||||
|
|
||||||
~DIALOG_IMAGE_PROPERTIES_BASE();
|
~DIALOG_REFERENCE_IMAGE_PROPERTIES_BASE();
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -1018,6 +1018,9 @@ void DRC_TEST_PROVIDER_COPPER_CLEARANCE::testGraphicClearances( )
|
||||||
auto testGraphicAgainstZone =
|
auto testGraphicAgainstZone =
|
||||||
[&]( BOARD_ITEM* item )
|
[&]( BOARD_ITEM* item )
|
||||||
{
|
{
|
||||||
|
if( item->Type() == PCB_REFERENCE_IMAGE_T )
|
||||||
|
return;
|
||||||
|
|
||||||
if( !IsCopperLayer( item->GetLayer() ) )
|
if( !IsCopperLayer( item->GetLayer() ) )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -123,8 +123,8 @@ void PCB_EDIT_FRAME::OnEditItemRequest( BOARD_ITEM* aItem )
|
||||||
{
|
{
|
||||||
switch( aItem->Type() )
|
switch( aItem->Type() )
|
||||||
{
|
{
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
ShowBitmapPropertiesDialog( aItem);
|
ShowReferenceImagePropertiesDialog( aItem );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PCB_FIELD_T:
|
case PCB_FIELD_T:
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
#include <pcb_group.h>
|
#include <pcb_group.h>
|
||||||
#include <pcb_track.h>
|
#include <pcb_track.h>
|
||||||
#include <pcb_dimension.h>
|
#include <pcb_dimension.h>
|
||||||
#include <pcb_bitmap.h>
|
#include <pcb_reference_image.h>
|
||||||
#include <pcb_textbox.h>
|
#include <pcb_textbox.h>
|
||||||
#include <pcb_field.h>
|
#include <pcb_field.h>
|
||||||
#include <footprint.h>
|
#include <footprint.h>
|
||||||
|
@ -736,7 +736,7 @@ void FOOTPRINT::Add( BOARD_ITEM* aBoardItem, ADD_MODE aMode, bool aSkipConnectiv
|
||||||
case PCB_DIM_ORTHOGONAL_T:
|
case PCB_DIM_ORTHOGONAL_T:
|
||||||
case PCB_SHAPE_T:
|
case PCB_SHAPE_T:
|
||||||
case PCB_TEXTBOX_T:
|
case PCB_TEXTBOX_T:
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
if( aMode == ADD_MODE::APPEND )
|
if( aMode == ADD_MODE::APPEND )
|
||||||
m_drawings.push_back( aBoardItem );
|
m_drawings.push_back( aBoardItem );
|
||||||
else
|
else
|
||||||
|
@ -810,7 +810,7 @@ void FOOTPRINT::Remove( BOARD_ITEM* aBoardItem, REMOVE_MODE aMode )
|
||||||
case PCB_DIM_LEADER_T:
|
case PCB_DIM_LEADER_T:
|
||||||
case PCB_SHAPE_T:
|
case PCB_SHAPE_T:
|
||||||
case PCB_TEXTBOX_T:
|
case PCB_TEXTBOX_T:
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
for( auto it = m_drawings.begin(); it != m_drawings.end(); ++it )
|
for( auto it = m_drawings.begin(); it != m_drawings.end(); ++it )
|
||||||
{
|
{
|
||||||
if( *it == aBoardItem )
|
if( *it == aBoardItem )
|
||||||
|
@ -1016,7 +1016,7 @@ const BOX2I FOOTPRINT::GetBoundingBox( bool aIncludeText, bool aIncludeInvisible
|
||||||
|
|
||||||
// We want the bitmap bounding box just in the footprint editor
|
// We want the bitmap bounding box just in the footprint editor
|
||||||
// so it will start with the correct initial zoom
|
// so it will start with the correct initial zoom
|
||||||
if( item->Type() == PCB_BITMAP_T && !isFPEdit )
|
if( item->Type() == PCB_REFERENCE_IMAGE_T && !isFPEdit )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// Handle text separately
|
// Handle text separately
|
||||||
|
@ -1145,7 +1145,7 @@ const BOX2I FOOTPRINT::GetLayerBoundingBox( LSET aLayers ) const
|
||||||
|
|
||||||
// We want the bitmap bounding box just in the footprint editor
|
// We want the bitmap bounding box just in the footprint editor
|
||||||
// so it will start with the correct initial zoom
|
// so it will start with the correct initial zoom
|
||||||
if( item->Type() == PCB_BITMAP_T && !isFPEdit )
|
if( item->Type() == PCB_REFERENCE_IMAGE_T && !isFPEdit )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
bbox.Merge( item->GetBoundingBox() );
|
bbox.Merge( item->GetBoundingBox() );
|
||||||
|
@ -1190,7 +1190,7 @@ SHAPE_POLY_SET FOOTPRINT::GetBoundingHull() const
|
||||||
if( !isFPEdit && m_privateLayers.test( item->GetLayer() ) )
|
if( !isFPEdit && m_privateLayers.test( item->GetLayer() ) )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if( item->Type() != PCB_TEXT_T && item->Type() != PCB_BITMAP_T )
|
if( item->Type() != PCB_TEXT_T && item->Type() != PCB_REFERENCE_IMAGE_T )
|
||||||
{
|
{
|
||||||
item->TransformShapeToPolygon( rawPolys, UNDEFINED_LAYER, 0, ARC_LOW_DEF,
|
item->TransformShapeToPolygon( rawPolys, UNDEFINED_LAYER, 0, ARC_LOW_DEF,
|
||||||
ERROR_OUTSIDE );
|
ERROR_OUTSIDE );
|
||||||
|
|
|
@ -1281,7 +1281,7 @@ void FOOTPRINT_EDIT_FRAME::setupUIConditions()
|
||||||
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawArc );
|
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawArc );
|
||||||
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawPolygon );
|
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawPolygon );
|
||||||
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawRuleArea );
|
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawRuleArea );
|
||||||
CURRENT_EDIT_TOOL( PCB_ACTIONS::placeImage );
|
CURRENT_EDIT_TOOL( PCB_ACTIONS::placeReferenceImage );
|
||||||
CURRENT_EDIT_TOOL( PCB_ACTIONS::placeText );
|
CURRENT_EDIT_TOOL( PCB_ACTIONS::placeText );
|
||||||
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawTextBox );
|
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawTextBox );
|
||||||
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawAlignedDimension );
|
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawAlignedDimension );
|
||||||
|
|
|
@ -182,8 +182,8 @@ void FOOTPRINT_EDIT_FRAME::OnEditItemRequest( BOARD_ITEM* aItem )
|
||||||
{
|
{
|
||||||
switch( aItem->Type() )
|
switch( aItem->Type() )
|
||||||
{
|
{
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
ShowBitmapPropertiesDialog( aItem );
|
ShowReferenceImagePropertiesDialog( aItem );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PCB_PAD_T:
|
case PCB_PAD_T:
|
||||||
|
|
|
@ -169,7 +169,7 @@ void FOOTPRINT_EDIT_FRAME::doReCreateMenuBar()
|
||||||
placeMenu->Add( PCB_ACTIONS::drawRectangle );
|
placeMenu->Add( PCB_ACTIONS::drawRectangle );
|
||||||
placeMenu->Add( PCB_ACTIONS::drawCircle );
|
placeMenu->Add( PCB_ACTIONS::drawCircle );
|
||||||
placeMenu->Add( PCB_ACTIONS::drawPolygon );
|
placeMenu->Add( PCB_ACTIONS::drawPolygon );
|
||||||
placeMenu->Add( PCB_ACTIONS::placeImage );
|
placeMenu->Add( PCB_ACTIONS::placeReferenceImage );
|
||||||
placeMenu->Add( PCB_ACTIONS::placeText );
|
placeMenu->Add( PCB_ACTIONS::placeText );
|
||||||
placeMenu->Add( PCB_ACTIONS::drawTextBox );
|
placeMenu->Add( PCB_ACTIONS::drawTextBox );
|
||||||
|
|
||||||
|
|
|
@ -308,7 +308,7 @@ void PCB_EDIT_FRAME::doReCreateMenuBar()
|
||||||
placeMenu->Add( PCB_ACTIONS::drawRectangle );
|
placeMenu->Add( PCB_ACTIONS::drawRectangle );
|
||||||
placeMenu->Add( PCB_ACTIONS::drawCircle );
|
placeMenu->Add( PCB_ACTIONS::drawCircle );
|
||||||
placeMenu->Add( PCB_ACTIONS::drawPolygon );
|
placeMenu->Add( PCB_ACTIONS::drawPolygon );
|
||||||
placeMenu->Add( PCB_ACTIONS::placeImage );
|
placeMenu->Add( PCB_ACTIONS::placeReferenceImage );
|
||||||
placeMenu->Add( PCB_ACTIONS::placeText );
|
placeMenu->Add( PCB_ACTIONS::placeText );
|
||||||
placeMenu->Add( PCB_ACTIONS::drawTextBox );
|
placeMenu->Add( PCB_ACTIONS::drawTextBox );
|
||||||
|
|
||||||
|
|
|
@ -175,7 +175,7 @@ public:
|
||||||
*/
|
*/
|
||||||
//void SetRotationAngle( EDA_ANGLE aRotationAngle );
|
//void SetRotationAngle( EDA_ANGLE aRotationAngle );
|
||||||
|
|
||||||
void ShowBitmapPropertiesDialog( BOARD_ITEM* aBitmap );
|
void ShowReferenceImagePropertiesDialog( BOARD_ITEM* aBitmap );
|
||||||
void ShowTextPropertiesDialog( PCB_TEXT* aText );
|
void ShowTextPropertiesDialog( PCB_TEXT* aText );
|
||||||
int ShowTextBoxPropertiesDialog( PCB_TEXTBOX* aTextBox );
|
int ShowTextBoxPropertiesDialog( PCB_TEXTBOX* aTextBox );
|
||||||
void ShowGraphicItemPropertiesDialog( PCB_SHAPE* aShape );
|
void ShowGraphicItemPropertiesDialog( PCB_SHAPE* aShape );
|
||||||
|
|
|
@ -951,7 +951,7 @@ void PCB_EDIT_FRAME::setupUIConditions()
|
||||||
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawCircle );
|
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawCircle );
|
||||||
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawArc );
|
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawArc );
|
||||||
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawPolygon );
|
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawPolygon );
|
||||||
CURRENT_EDIT_TOOL( PCB_ACTIONS::placeImage );
|
CURRENT_EDIT_TOOL( PCB_ACTIONS::placeReferenceImage );
|
||||||
CURRENT_EDIT_TOOL( PCB_ACTIONS::placeText );
|
CURRENT_EDIT_TOOL( PCB_ACTIONS::placeText );
|
||||||
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawTextBox );
|
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawTextBox );
|
||||||
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawAlignedDimension );
|
CURRENT_EDIT_TOOL( PCB_ACTIONS::drawAlignedDimension );
|
||||||
|
|
|
@ -53,7 +53,7 @@ bool PCB_GROUP::IsGroupableType( KICAD_T aType )
|
||||||
case PCB_FOOTPRINT_T:
|
case PCB_FOOTPRINT_T:
|
||||||
case PCB_PAD_T:
|
case PCB_PAD_T:
|
||||||
case PCB_SHAPE_T:
|
case PCB_SHAPE_T:
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
case PCB_FIELD_T:
|
case PCB_FIELD_T:
|
||||||
case PCB_TEXT_T:
|
case PCB_TEXT_T:
|
||||||
case PCB_TEXTBOX_T:
|
case PCB_TEXTBOX_T:
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
#include <pcb_shape.h>
|
#include <pcb_shape.h>
|
||||||
#include <string_utils.h>
|
#include <string_utils.h>
|
||||||
#include <zone.h>
|
#include <zone.h>
|
||||||
#include <pcb_bitmap.h>
|
#include <pcb_reference_image.h>
|
||||||
#include <pcb_text.h>
|
#include <pcb_text.h>
|
||||||
#include <pcb_textbox.h>
|
#include <pcb_textbox.h>
|
||||||
#include <pcb_marker.h>
|
#include <pcb_marker.h>
|
||||||
|
@ -439,9 +439,9 @@ COLOR4D PCB_RENDER_SETTINGS::GetColor( const VIEW_ITEM* aItem, int aLayer ) cons
|
||||||
{
|
{
|
||||||
color = color.Mix( m_layerColors[LAYER_PCB_BACKGROUND], m_hiContrastFactor );
|
color = color.Mix( m_layerColors[LAYER_PCB_BACKGROUND], m_hiContrastFactor );
|
||||||
|
|
||||||
// Bitmaps can't have their color mixed so just reduce the opacity a bit so they
|
// Reference images can't have their color mixed so just reduce the opacity a bit
|
||||||
// show through less
|
// so they show through less
|
||||||
if( item->Type() == PCB_BITMAP_T )
|
if( item->Type() == PCB_REFERENCE_IMAGE_T )
|
||||||
color.a *= m_hiContrastFactor;
|
color.a *= m_hiContrastFactor;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -468,7 +468,7 @@ COLOR4D PCB_RENDER_SETTINGS::GetColor( const VIEW_ITEM* aItem, int aLayer ) cons
|
||||||
color.a *= m_trackOpacity;
|
color.a *= m_trackOpacity;
|
||||||
else if( item->Type() == PCB_ZONE_T )
|
else if( item->Type() == PCB_ZONE_T )
|
||||||
color.a *= m_zoneOpacity;
|
color.a *= m_zoneOpacity;
|
||||||
else if( item->Type() == PCB_BITMAP_T )
|
else if( item->Type() == PCB_REFERENCE_IMAGE_T )
|
||||||
color.a *= m_imageOpacity;
|
color.a *= m_imageOpacity;
|
||||||
else if( item->Type() == PCB_SHAPE_T && item->IsOnCopperLayer() )
|
else if( item->Type() == PCB_SHAPE_T && item->IsOnCopperLayer() )
|
||||||
color.a *= m_trackOpacity;
|
color.a *= m_trackOpacity;
|
||||||
|
@ -546,8 +546,8 @@ bool PCB_PAINTER::Draw( const VIEW_ITEM* aItem, int aLayer )
|
||||||
{
|
{
|
||||||
FOOTPRINT* parentFP = item->GetParentFootprint();
|
FOOTPRINT* parentFP = item->GetParentFootprint();
|
||||||
|
|
||||||
// Never draw footprint bitmaps on board
|
// Never draw footprint reference images on board
|
||||||
if( item->Type() == PCB_BITMAP_T )
|
if( item->Type() == PCB_REFERENCE_IMAGE_T )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -597,8 +597,8 @@ bool PCB_PAINTER::Draw( const VIEW_ITEM* aItem, int aLayer )
|
||||||
draw( static_cast<const PCB_SHAPE*>( item ), aLayer );
|
draw( static_cast<const PCB_SHAPE*>( item ), aLayer );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
draw( static_cast<const PCB_BITMAP*>( item ), aLayer );
|
draw( static_cast<const PCB_REFERENCE_IMAGE*>( item ), aLayer );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PCB_FIELD_T:
|
case PCB_FIELD_T:
|
||||||
|
@ -1990,7 +1990,7 @@ void PCB_PAINTER::strokeText( const wxString& aText, const VECTOR2I& aPosition,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void PCB_PAINTER::draw( const PCB_BITMAP* aBitmap, int aLayer )
|
void PCB_PAINTER::draw( const PCB_REFERENCE_IMAGE* aBitmap, int aLayer )
|
||||||
{
|
{
|
||||||
m_gal->Save();
|
m_gal->Save();
|
||||||
m_gal->Translate( aBitmap->GetPosition() );
|
m_gal->Translate( aBitmap->GetPosition() );
|
||||||
|
@ -2022,10 +2022,9 @@ void PCB_PAINTER::draw( const PCB_BITMAP* aBitmap, int aLayer )
|
||||||
|
|
||||||
m_gal->DrawRectangle( origin, end );
|
m_gal->DrawRectangle( origin, end );
|
||||||
|
|
||||||
// Hard code bitmaps as opaque when selected. Otherwise cached layers
|
// Hard code reference images as opaque when selected. Otherwise cached layers will
|
||||||
// will not be rendered under the selected bitmap because cached layers
|
// not be rendered under the selected image because cached layers are rendered after
|
||||||
// are rendered after non-cached layers (e.g. bitmaps), which will have
|
// non-cached layers (e.g. bitmaps), which will have a closer Z order.
|
||||||
// a closer Z order.
|
|
||||||
m_gal->DrawBitmap( *aBitmap->GetImage(), 1.0 );
|
m_gal->DrawBitmap( *aBitmap->GetImage(), 1.0 );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -49,7 +49,7 @@ class PCB_SHAPE;
|
||||||
class PCB_GROUP;
|
class PCB_GROUP;
|
||||||
class FOOTPRINT;
|
class FOOTPRINT;
|
||||||
class ZONE;
|
class ZONE;
|
||||||
class PCB_BITMAP;
|
class PCB_REFERENCE_IMAGE;
|
||||||
class PCB_TEXT;
|
class PCB_TEXT;
|
||||||
class PCB_TEXTBOX;
|
class PCB_TEXTBOX;
|
||||||
class PCB_DIMENSION_BASE;
|
class PCB_DIMENSION_BASE;
|
||||||
|
@ -182,7 +182,7 @@ protected:
|
||||||
void draw( const PCB_VIA* aVia, int aLayer );
|
void draw( const PCB_VIA* aVia, int aLayer );
|
||||||
void draw( const PAD* aPad, int aLayer );
|
void draw( const PAD* aPad, int aLayer );
|
||||||
void draw( const PCB_SHAPE* aSegment, int aLayer );
|
void draw( const PCB_SHAPE* aSegment, int aLayer );
|
||||||
void draw( const PCB_BITMAP* aBitmap, int aLayer );
|
void draw( const PCB_REFERENCE_IMAGE* aBitmap, int aLayer );
|
||||||
void draw( const PCB_TEXT* aText, int aLayer );
|
void draw( const PCB_TEXT* aText, int aLayer );
|
||||||
void draw( const PCB_TEXTBOX* aText, int aLayer );
|
void draw( const PCB_TEXTBOX* aText, int aLayer );
|
||||||
void draw( const FOOTPRINT* aFootprint, int aLayer );
|
void draw( const FOOTPRINT* aFootprint, int aLayer );
|
||||||
|
|
|
@ -23,10 +23,6 @@
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
|
||||||
* @file pcb_bitmap.cpp
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pcb_draw_panel_gal.h>
|
#include <pcb_draw_panel_gal.h>
|
||||||
#include <plotters/plotter.h>
|
#include <plotters/plotter.h>
|
||||||
#include <settings/color_settings.h>
|
#include <settings/color_settings.h>
|
||||||
|
@ -37,7 +33,7 @@
|
||||||
#include <eda_draw_frame.h>
|
#include <eda_draw_frame.h>
|
||||||
#include <core/mirror.h>
|
#include <core/mirror.h>
|
||||||
#include <board.h>
|
#include <board.h>
|
||||||
#include <pcb_bitmap.h>
|
#include <pcb_reference_image.h>
|
||||||
#include <trigo.h>
|
#include <trigo.h>
|
||||||
#include <geometry/shape_rect.h>
|
#include <geometry/shape_rect.h>
|
||||||
|
|
||||||
|
@ -47,8 +43,10 @@ using KIGFX::PCB_PAINTER;
|
||||||
using KIGFX::PCB_RENDER_SETTINGS;
|
using KIGFX::PCB_RENDER_SETTINGS;
|
||||||
|
|
||||||
|
|
||||||
PCB_BITMAP::PCB_BITMAP( BOARD_ITEM* aParent, const VECTOR2I& pos, PCB_LAYER_ID aLayer ) :
|
|
||||||
BOARD_ITEM( aParent, PCB_BITMAP_T, aLayer )
|
PCB_REFERENCE_IMAGE::PCB_REFERENCE_IMAGE( BOARD_ITEM* aParent, const VECTOR2I& pos,
|
||||||
|
PCB_LAYER_ID aLayer ) :
|
||||||
|
BOARD_ITEM( aParent, PCB_REFERENCE_IMAGE_T, aLayer )
|
||||||
{
|
{
|
||||||
m_pos = pos;
|
m_pos = pos;
|
||||||
m_bitmapBase = new BITMAP_BASE();
|
m_bitmapBase = new BITMAP_BASE();
|
||||||
|
@ -56,7 +54,8 @@ PCB_BITMAP::PCB_BITMAP( BOARD_ITEM* aParent, const VECTOR2I& pos, PCB_LAYER_ID a
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
PCB_BITMAP::PCB_BITMAP( const PCB_BITMAP& aPCBBitmap ) : BOARD_ITEM( aPCBBitmap )
|
PCB_REFERENCE_IMAGE::PCB_REFERENCE_IMAGE( const PCB_REFERENCE_IMAGE& aPCBBitmap ) :
|
||||||
|
BOARD_ITEM( aPCBBitmap )
|
||||||
{
|
{
|
||||||
m_pos = aPCBBitmap.m_pos;
|
m_pos = aPCBBitmap.m_pos;
|
||||||
m_bitmapBase = new BITMAP_BASE( *aPCBBitmap.m_bitmapBase );
|
m_bitmapBase = new BITMAP_BASE( *aPCBBitmap.m_bitmapBase );
|
||||||
|
@ -64,7 +63,7 @@ PCB_BITMAP::PCB_BITMAP( const PCB_BITMAP& aPCBBitmap ) : BOARD_ITEM( aPCBBitmap
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
PCB_BITMAP& PCB_BITMAP::operator=( const BOARD_ITEM& aItem )
|
PCB_REFERENCE_IMAGE& PCB_REFERENCE_IMAGE::operator=( const BOARD_ITEM& aItem )
|
||||||
{
|
{
|
||||||
wxCHECK_MSG( Type() == aItem.Type(), *this,
|
wxCHECK_MSG( Type() == aItem.Type(), *this,
|
||||||
wxT( "Cannot assign object type " ) + aItem.GetClass() + wxT( " to type " )
|
wxT( "Cannot assign object type " ) + aItem.GetClass() + wxT( " to type " )
|
||||||
|
@ -74,7 +73,7 @@ PCB_BITMAP& PCB_BITMAP::operator=( const BOARD_ITEM& aItem )
|
||||||
{
|
{
|
||||||
BOARD_ITEM::operator=( aItem );
|
BOARD_ITEM::operator=( aItem );
|
||||||
|
|
||||||
PCB_BITMAP* bitmap = (PCB_BITMAP*) &aItem;
|
PCB_REFERENCE_IMAGE* bitmap = (PCB_REFERENCE_IMAGE*) &aItem;
|
||||||
|
|
||||||
delete m_bitmapBase;
|
delete m_bitmapBase;
|
||||||
m_bitmapBase = new BITMAP_BASE( *bitmap->m_bitmapBase );
|
m_bitmapBase = new BITMAP_BASE( *bitmap->m_bitmapBase );
|
||||||
|
@ -86,7 +85,7 @@ PCB_BITMAP& PCB_BITMAP::operator=( const BOARD_ITEM& aItem )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool PCB_BITMAP::ReadImageFile( const wxString& aFullFilename )
|
bool PCB_REFERENCE_IMAGE::ReadImageFile( const wxString& aFullFilename )
|
||||||
{
|
{
|
||||||
if( m_bitmapBase->ReadImageFile( aFullFilename ) )
|
if( m_bitmapBase->ReadImageFile( aFullFilename ) )
|
||||||
{
|
{
|
||||||
|
@ -98,7 +97,7 @@ bool PCB_BITMAP::ReadImageFile( const wxString& aFullFilename )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool PCB_BITMAP::ReadImageFile( wxMemoryBuffer& aBuffer )
|
bool PCB_REFERENCE_IMAGE::ReadImageFile( wxMemoryBuffer& aBuffer )
|
||||||
{
|
{
|
||||||
if( m_bitmapBase->ReadImageFile( aBuffer ) )
|
if( m_bitmapBase->ReadImageFile( aBuffer ) )
|
||||||
{
|
{
|
||||||
|
@ -110,19 +109,19 @@ bool PCB_BITMAP::ReadImageFile( wxMemoryBuffer& aBuffer )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
EDA_ITEM* PCB_BITMAP::Clone() const
|
EDA_ITEM* PCB_REFERENCE_IMAGE::Clone() const
|
||||||
{
|
{
|
||||||
return new PCB_BITMAP( *this );
|
return new PCB_REFERENCE_IMAGE( *this );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void PCB_BITMAP::swapData( BOARD_ITEM* aItem )
|
void PCB_REFERENCE_IMAGE::swapData( BOARD_ITEM* aItem )
|
||||||
{
|
{
|
||||||
wxCHECK_RET( aItem->Type() == PCB_BITMAP_T,
|
wxCHECK_RET( aItem->Type() == PCB_REFERENCE_IMAGE_T,
|
||||||
wxString::Format( wxT( "PCB_BITMAP object cannot swap data with %s object." ),
|
wxString::Format( wxT( "% object cannot swap data with %s object." ),
|
||||||
aItem->GetClass() ) );
|
GetClass(), aItem->GetClass() ) );
|
||||||
|
|
||||||
PCB_BITMAP* item = (PCB_BITMAP*) aItem;
|
PCB_REFERENCE_IMAGE* item = (PCB_REFERENCE_IMAGE*) aItem;
|
||||||
std::swap( m_layer, item->m_layer );
|
std::swap( m_layer, item->m_layer );
|
||||||
std::swap( m_isKnockout, item->m_isKnockout );
|
std::swap( m_isKnockout, item->m_isKnockout );
|
||||||
std::swap( m_isLocked, item->m_isLocked );
|
std::swap( m_isLocked, item->m_isLocked );
|
||||||
|
@ -134,7 +133,7 @@ void PCB_BITMAP::swapData( BOARD_ITEM* aItem )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
double PCB_BITMAP::ViewGetLOD( int aLayer, KIGFX::VIEW* aView ) const
|
double PCB_REFERENCE_IMAGE::ViewGetLOD( int aLayer, KIGFX::VIEW* aView ) const
|
||||||
{
|
{
|
||||||
constexpr double HIDE = std::numeric_limits<double>::max();
|
constexpr double HIDE = std::numeric_limits<double>::max();
|
||||||
|
|
||||||
|
@ -157,7 +156,7 @@ double PCB_BITMAP::ViewGetLOD( int aLayer, KIGFX::VIEW* aView ) const
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const BOX2I PCB_BITMAP::GetBoundingBox() const
|
const BOX2I PCB_REFERENCE_IMAGE::GetBoundingBox() const
|
||||||
{
|
{
|
||||||
// Bitmaps are center origin, BOX2Is need top-left origin
|
// Bitmaps are center origin, BOX2Is need top-left origin
|
||||||
VECTOR2I size = m_bitmapBase->GetSize();
|
VECTOR2I size = m_bitmapBase->GetSize();
|
||||||
|
@ -167,21 +166,21 @@ const BOX2I PCB_BITMAP::GetBoundingBox() const
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
std::shared_ptr<SHAPE> PCB_BITMAP::GetEffectiveShape( PCB_LAYER_ID aLayer, FLASHING aFlash ) const
|
std::shared_ptr<SHAPE> PCB_REFERENCE_IMAGE::GetEffectiveShape( PCB_LAYER_ID aLayer,
|
||||||
|
FLASHING aFlash ) const
|
||||||
{
|
{
|
||||||
BOX2I box = GetBoundingBox();
|
BOX2I box = GetBoundingBox();
|
||||||
return std::shared_ptr<SHAPE_RECT>( new SHAPE_RECT( box.GetPosition(), box.GetWidth(),
|
return std::make_shared<SHAPE_RECT>( box.GetPosition(), box.GetWidth(), box.GetHeight() );
|
||||||
box.GetHeight() ) );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const VECTOR2I PCB_BITMAP::GetSize() const
|
const VECTOR2I PCB_REFERENCE_IMAGE::GetSize() const
|
||||||
{
|
{
|
||||||
return m_bitmapBase->GetSize();
|
return m_bitmapBase->GetSize();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void PCB_BITMAP::Flip( const VECTOR2I& aCentre, bool aFlipLeftRight )
|
void PCB_REFERENCE_IMAGE::Flip( const VECTOR2I& aCentre, bool aFlipLeftRight )
|
||||||
{
|
{
|
||||||
if( aFlipLeftRight )
|
if( aFlipLeftRight )
|
||||||
{
|
{
|
||||||
|
@ -195,7 +194,7 @@ void PCB_BITMAP::Flip( const VECTOR2I& aCentre, bool aFlipLeftRight )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void PCB_BITMAP::Rotate( const VECTOR2I& aCenter, const EDA_ANGLE& aAngle )
|
void PCB_REFERENCE_IMAGE::Rotate( const VECTOR2I& aCenter, const EDA_ANGLE& aAngle )
|
||||||
{
|
{
|
||||||
EDA_ANGLE norm( aAngle.AsDegrees(), DEGREES_T );
|
EDA_ANGLE norm( aAngle.AsDegrees(), DEGREES_T );
|
||||||
|
|
||||||
|
@ -210,7 +209,7 @@ void PCB_BITMAP::Rotate( const VECTOR2I& aCenter, const EDA_ANGLE& aAngle )
|
||||||
|
|
||||||
|
|
||||||
#if defined( DEBUG )
|
#if defined( DEBUG )
|
||||||
void PCB_BITMAP::Show( int nestLevel, std::ostream& os ) const
|
void PCB_REFERENCE_IMAGE::Show( int nestLevel, std::ostream& os ) const
|
||||||
{
|
{
|
||||||
// XML output:
|
// XML output:
|
||||||
wxString s = GetClass();
|
wxString s = GetClass();
|
||||||
|
@ -220,7 +219,7 @@ void PCB_BITMAP::Show( int nestLevel, std::ostream& os ) const
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
bool PCB_BITMAP::HitTest( const VECTOR2I& aPosition, int aAccuracy ) const
|
bool PCB_REFERENCE_IMAGE::HitTest( const VECTOR2I& aPosition, int aAccuracy ) const
|
||||||
{
|
{
|
||||||
BOX2I rect = GetBoundingBox();
|
BOX2I rect = GetBoundingBox();
|
||||||
|
|
||||||
|
@ -230,7 +229,7 @@ bool PCB_BITMAP::HitTest( const VECTOR2I& aPosition, int aAccuracy ) const
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool PCB_BITMAP::HitTest( const BOX2I& aRect, bool aContained, int aAccuracy ) const
|
bool PCB_REFERENCE_IMAGE::HitTest( const BOX2I& aRect, bool aContained, int aAccuracy ) const
|
||||||
{
|
{
|
||||||
BOX2I rect = aRect;
|
BOX2I rect = aRect;
|
||||||
|
|
||||||
|
@ -243,15 +242,16 @@ bool PCB_BITMAP::HitTest( const BOX2I& aRect, bool aContained, int aAccuracy ) c
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
BITMAPS PCB_BITMAP::GetMenuImage() const
|
BITMAPS PCB_REFERENCE_IMAGE::GetMenuImage() const
|
||||||
{
|
{
|
||||||
return BITMAPS::image;
|
return BITMAPS::image;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void PCB_BITMAP::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList )
|
void PCB_REFERENCE_IMAGE::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame,
|
||||||
|
std::vector<MSG_PANEL_ITEM>& aList )
|
||||||
{
|
{
|
||||||
aList.emplace_back( _( "Bitmap" ), wxEmptyString );
|
aList.emplace_back( _( "Reference Image" ), wxEmptyString );
|
||||||
|
|
||||||
aList.emplace_back( _( "PPI" ), wxString::Format( wxT( "%d "), GetImage()->GetPPI() ) );
|
aList.emplace_back( _( "PPI" ), wxString::Format( wxT( "%d "), GetImage()->GetPPI() ) );
|
||||||
aList.emplace_back( _( "Scale" ), wxString::Format( wxT( "%f "), GetImageScale() ) );
|
aList.emplace_back( _( "Scale" ), wxString::Format( wxT( "%f "), GetImageScale() ) );
|
||||||
|
@ -262,19 +262,19 @@ void PCB_BITMAP::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void PCB_BITMAP::ViewGetLayers( int aLayers[], int& aCount ) const
|
void PCB_REFERENCE_IMAGE::ViewGetLayers( int aLayers[], int& aCount ) const
|
||||||
{
|
{
|
||||||
aCount = 1;
|
aCount = 1;
|
||||||
aLayers[0] = BITMAP_LAYER_FOR( m_layer );
|
aLayers[0] = BITMAP_LAYER_FOR( m_layer );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool PCB_BITMAP::operator==( const BOARD_ITEM& aOther ) const
|
bool PCB_REFERENCE_IMAGE::operator==( const BOARD_ITEM& aOther ) const
|
||||||
{
|
{
|
||||||
if( aOther.Type() != Type() )
|
if( aOther.Type() != Type() )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
const PCB_BITMAP& other = static_cast<const PCB_BITMAP&>( aOther );
|
const PCB_REFERENCE_IMAGE& other = static_cast<const PCB_REFERENCE_IMAGE&>( aOther );
|
||||||
|
|
||||||
if( m_layer != other.m_layer )
|
if( m_layer != other.m_layer )
|
||||||
return false;
|
return false;
|
||||||
|
@ -301,12 +301,12 @@ bool PCB_BITMAP::operator==( const BOARD_ITEM& aOther ) const
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
double PCB_BITMAP::Similarity( const BOARD_ITEM& aOther ) const
|
double PCB_REFERENCE_IMAGE::Similarity( const BOARD_ITEM& aOther ) const
|
||||||
{
|
{
|
||||||
if( aOther.Type() != Type() )
|
if( aOther.Type() != Type() )
|
||||||
return 0.0;
|
return 0.0;
|
||||||
|
|
||||||
const PCB_BITMAP& other = static_cast<const PCB_BITMAP&>( aOther );
|
const PCB_REFERENCE_IMAGE& other = static_cast<const PCB_REFERENCE_IMAGE&>( aOther );
|
||||||
|
|
||||||
double similarity = 1.0;
|
double similarity = 1.0;
|
||||||
|
|
||||||
|
@ -335,21 +335,26 @@ double PCB_BITMAP::Similarity( const BOARD_ITEM& aOther ) const
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static struct PCB_BITMAP_DESC
|
static struct PCB_REFERENCE_IMAGE_DESC
|
||||||
{
|
{
|
||||||
PCB_BITMAP_DESC()
|
PCB_REFERENCE_IMAGE_DESC()
|
||||||
{
|
{
|
||||||
PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();
|
PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();
|
||||||
REGISTER_TYPE( PCB_BITMAP );
|
REGISTER_TYPE( PCB_REFERENCE_IMAGE );
|
||||||
propMgr.InheritsAfter( TYPE_HASH( PCB_BITMAP ), TYPE_HASH( BOARD_ITEM ) );
|
propMgr.InheritsAfter( TYPE_HASH( PCB_REFERENCE_IMAGE ), TYPE_HASH( BOARD_ITEM ) );
|
||||||
|
|
||||||
const wxString groupBitmap = _HKI( "Bitmap Properties" );
|
propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _HKI( "Layer" ),
|
||||||
|
new PROPERTY_ENUM<PCB_REFERENCE_IMAGE, PCB_LAYER_ID, BOARD_ITEM>( _HKI( "Associated Layer" ),
|
||||||
|
&PCB_REFERENCE_IMAGE::SetLayer, &PCB_REFERENCE_IMAGE::GetLayer ) );
|
||||||
|
|
||||||
propMgr.AddProperty( new PROPERTY<PCB_BITMAP, double>( _HKI( "Scale" ),
|
const wxString groupImage = _HKI( "Image Properties" );
|
||||||
&PCB_BITMAP::SetImageScale, &PCB_BITMAP::GetImageScale ),
|
|
||||||
groupBitmap );
|
propMgr.AddProperty( new PROPERTY<PCB_REFERENCE_IMAGE, double>( _HKI( "Scale" ),
|
||||||
|
&PCB_REFERENCE_IMAGE::SetImageScale,
|
||||||
|
&PCB_REFERENCE_IMAGE::GetImageScale ),
|
||||||
|
groupImage );
|
||||||
|
|
||||||
// For future use
|
// For future use
|
||||||
const wxString greyscale = _HKI( "Greyscale" );
|
const wxString greyscale = _HKI( "Greyscale" );
|
||||||
}
|
}
|
||||||
} _PCB_BITMAP_DESC;
|
} _PCB_REFERENCE_IMAGE_DESC;
|
|
@ -3,7 +3,7 @@
|
||||||
*
|
*
|
||||||
* Copyright (C) 2011 jean-pierre.charras
|
* Copyright (C) 2011 jean-pierre.charras
|
||||||
* Copyright (C) 2022 Mike Williams
|
* Copyright (C) 2022 Mike Williams
|
||||||
* Copyright (C) 2011-2022 KiCad Developers, see AUTHORS.txt for contributors.
|
* Copyright (C) 2011-2023 KiCad Developers, see AUTHORS.txt for contributors.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
|
@ -23,12 +23,8 @@
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
#ifndef PCB_REFERENCE_IMAGE_H
|
||||||
* @file pcb_bitmap.h
|
#define PCB_REFERENCE_IMAGE_H
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _PCB_BITMAP_H_
|
|
||||||
#define _PCB_BITMAP_H_
|
|
||||||
|
|
||||||
|
|
||||||
#include <board_item.h>
|
#include <board_item.h>
|
||||||
|
@ -38,22 +34,22 @@
|
||||||
/**
|
/**
|
||||||
* Object to handle a bitmap image that can be inserted in a PCB.
|
* Object to handle a bitmap image that can be inserted in a PCB.
|
||||||
*/
|
*/
|
||||||
class PCB_BITMAP : public BOARD_ITEM
|
class PCB_REFERENCE_IMAGE : public BOARD_ITEM
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
PCB_BITMAP( BOARD_ITEM* aParent, const VECTOR2I& pos = VECTOR2I( 0, 0 ),
|
PCB_REFERENCE_IMAGE( BOARD_ITEM* aParent, const VECTOR2I& pos = VECTOR2I( 0, 0 ),
|
||||||
PCB_LAYER_ID aLayer = F_Cu );
|
PCB_LAYER_ID aLayer = F_Cu );
|
||||||
|
|
||||||
PCB_BITMAP( const PCB_BITMAP& aPcbBitmap );
|
PCB_REFERENCE_IMAGE( const PCB_REFERENCE_IMAGE& aPcbBitmap );
|
||||||
|
|
||||||
~PCB_BITMAP() { delete m_bitmapBase; }
|
~PCB_REFERENCE_IMAGE() { delete m_bitmapBase; }
|
||||||
|
|
||||||
PCB_BITMAP& operator=( const BOARD_ITEM& aItem );
|
PCB_REFERENCE_IMAGE& operator=( const BOARD_ITEM& aItem );
|
||||||
|
|
||||||
const BITMAP_BASE* GetImage() const
|
const BITMAP_BASE* GetImage() const
|
||||||
{
|
{
|
||||||
wxCHECK_MSG( m_bitmapBase != nullptr, nullptr,
|
wxCHECK_MSG( m_bitmapBase != nullptr, nullptr,
|
||||||
"Invalid PCB_BITMAP init, m_bitmapBase is NULL." );
|
wxS( "Invalid PCB_REFERENCE_IMAGE init, m_bitmapBase is NULL." ) );
|
||||||
return m_bitmapBase;
|
return m_bitmapBase;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -77,10 +73,10 @@ public:
|
||||||
|
|
||||||
static inline bool ClassOf( const EDA_ITEM* aItem )
|
static inline bool ClassOf( const EDA_ITEM* aItem )
|
||||||
{
|
{
|
||||||
return aItem && PCB_BITMAP_T == aItem->Type();
|
return aItem && PCB_REFERENCE_IMAGE_T == aItem->Type();
|
||||||
}
|
}
|
||||||
|
|
||||||
wxString GetClass() const override { return wxT( "PCB_BITMAP" ); }
|
wxString GetClass() const override { return wxT( "PCB_REFERENCE_IMAGE" ); }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the actual size (in user units, not in pixels) of the image.
|
* @return the actual size (in user units, not in pixels) of the image.
|
||||||
|
@ -126,7 +122,7 @@ public:
|
||||||
|
|
||||||
wxString GetItemDescription( UNITS_PROVIDER* aUnitsProvider ) const override
|
wxString GetItemDescription( UNITS_PROVIDER* aUnitsProvider ) const override
|
||||||
{
|
{
|
||||||
return wxString( _( "Image" ) );
|
return wxString( _( "Reference Image" ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
BITMAPS GetMenuImage() const override;
|
BITMAPS GetMenuImage() const override;
|
||||||
|
@ -157,4 +153,4 @@ private:
|
||||||
BITMAP_BASE* m_bitmapBase; // the BITMAP_BASE item
|
BITMAP_BASE* m_bitmapBase; // the BITMAP_BASE item
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // _PCB_BITMAP_H_
|
#endif // PCB_REFERENCE_IMAGE_H
|
|
@ -38,7 +38,7 @@
|
||||||
#include <board_design_settings.h>
|
#include <board_design_settings.h>
|
||||||
#include <pcb_dimension.h>
|
#include <pcb_dimension.h>
|
||||||
#include <pcb_shape.h>
|
#include <pcb_shape.h>
|
||||||
#include <pcb_bitmap.h>
|
#include <pcb_reference_image.h>
|
||||||
#include <pcb_group.h>
|
#include <pcb_group.h>
|
||||||
#include <pcb_generator.h>
|
#include <pcb_generator.h>
|
||||||
#include <pcb_target.h>
|
#include <pcb_target.h>
|
||||||
|
@ -67,7 +67,7 @@
|
||||||
#include <pgm_base.h>
|
#include <pgm_base.h>
|
||||||
|
|
||||||
// For some reason wxWidgets is built with wxUSE_BASE64 unset so expose the wxWidgets
|
// For some reason wxWidgets is built with wxUSE_BASE64 unset so expose the wxWidgets
|
||||||
// base64 code. Needed for PCB_BITMAP
|
// base64 code. Needed for PCB_REFERENCE_IMAGE
|
||||||
#define wxUSE_BASE64 1
|
#define wxUSE_BASE64 1
|
||||||
#include <wx/base64.h>
|
#include <wx/base64.h>
|
||||||
#include <wx/mstream.h>
|
#include <wx/mstream.h>
|
||||||
|
@ -916,7 +916,7 @@ BOARD* PCB_PARSER::parseBOARD_unchecked()
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case T_image:
|
case T_image:
|
||||||
item = parsePCB_BITMAP( m_board );
|
item = parsePCB_REFERENCE_IMAGE( m_board );
|
||||||
m_board->Add( item, ADD_MODE::BULK_APPEND, true );
|
m_board->Add( item, ADD_MODE::BULK_APPEND, true );
|
||||||
bulkAddedItems.push_back( item );
|
bulkAddedItems.push_back( item );
|
||||||
break;
|
break;
|
||||||
|
@ -2958,13 +2958,13 @@ PCB_SHAPE* PCB_PARSER::parsePCB_SHAPE( BOARD_ITEM* aParent )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
PCB_BITMAP* PCB_PARSER::parsePCB_BITMAP( BOARD_ITEM* aParent )
|
PCB_REFERENCE_IMAGE* PCB_PARSER::parsePCB_REFERENCE_IMAGE( BOARD_ITEM* aParent )
|
||||||
{
|
{
|
||||||
wxCHECK_MSG( CurTok() == T_image, nullptr,
|
wxCHECK_MSG( CurTok() == T_image, nullptr,
|
||||||
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as an image." ) );
|
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as a reference image." ) );
|
||||||
|
|
||||||
T token;
|
T token;
|
||||||
std::unique_ptr<PCB_BITMAP> bitmap = std::make_unique<PCB_BITMAP>( aParent );
|
std::unique_ptr<PCB_REFERENCE_IMAGE> bitmap = std::make_unique<PCB_REFERENCE_IMAGE>( aParent );
|
||||||
|
|
||||||
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
|
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
|
||||||
{
|
{
|
||||||
|
@ -4143,7 +4143,7 @@ FOOTPRINT* PCB_PARSER::parseFOOTPRINT_unchecked( wxArrayString* aInitialComments
|
||||||
|
|
||||||
case T_image:
|
case T_image:
|
||||||
{
|
{
|
||||||
PCB_BITMAP* image = parsePCB_BITMAP( footprint.get() );
|
PCB_REFERENCE_IMAGE* image = parsePCB_REFERENCE_IMAGE( footprint.get() );
|
||||||
footprint->Add( image, ADD_MODE::APPEND, true );
|
footprint->Add( image, ADD_MODE::APPEND, true );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,7 +50,7 @@ class PAD;
|
||||||
class BOARD_DESIGN_SETTINGS;
|
class BOARD_DESIGN_SETTINGS;
|
||||||
class PCB_DIMENSION_BASE;
|
class PCB_DIMENSION_BASE;
|
||||||
class PCB_SHAPE;
|
class PCB_SHAPE;
|
||||||
class PCB_BITMAP;
|
class PCB_REFERENCE_IMAGE;
|
||||||
class EDA_TEXT;
|
class EDA_TEXT;
|
||||||
class FP_SHAPE;
|
class FP_SHAPE;
|
||||||
class PCB_TEXT;
|
class PCB_TEXT;
|
||||||
|
@ -210,7 +210,7 @@ private:
|
||||||
PCB_SHAPE* parsePCB_SHAPE( BOARD_ITEM* aParent );
|
PCB_SHAPE* parsePCB_SHAPE( BOARD_ITEM* aParent );
|
||||||
PCB_TEXT* parsePCB_TEXT( BOARD_ITEM* aParent );
|
PCB_TEXT* parsePCB_TEXT( BOARD_ITEM* aParent );
|
||||||
void parsePCB_TEXT_effects( PCB_TEXT* aText );
|
void parsePCB_TEXT_effects( PCB_TEXT* aText );
|
||||||
PCB_BITMAP* parsePCB_BITMAP( BOARD_ITEM* aParent );
|
PCB_REFERENCE_IMAGE* parsePCB_REFERENCE_IMAGE( BOARD_ITEM* aParent );
|
||||||
PCB_TEXTBOX* parsePCB_TEXTBOX( BOARD_ITEM* aParent );
|
PCB_TEXTBOX* parsePCB_TEXTBOX( BOARD_ITEM* aParent );
|
||||||
PCB_DIMENSION_BASE* parseDIMENSION( BOARD_ITEM* aParent );
|
PCB_DIMENSION_BASE* parseDIMENSION( BOARD_ITEM* aParent );
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
#include <pcb_generator.h>
|
#include <pcb_generator.h>
|
||||||
#include <pcb_shape.h>
|
#include <pcb_shape.h>
|
||||||
#include <pcb_dimension.h>
|
#include <pcb_dimension.h>
|
||||||
#include <pcb_bitmap.h>
|
#include <pcb_reference_image.h>
|
||||||
#include <pcb_target.h>
|
#include <pcb_target.h>
|
||||||
#include <pcb_text.h>
|
#include <pcb_text.h>
|
||||||
#include <pcb_textbox.h>
|
#include <pcb_textbox.h>
|
||||||
|
@ -57,7 +57,7 @@
|
||||||
#include <wx/log.h>
|
#include <wx/log.h>
|
||||||
|
|
||||||
// For some reason wxWidgets is built with wxUSE_BASE64 unset so expose the wxWidgets
|
// For some reason wxWidgets is built with wxUSE_BASE64 unset so expose the wxWidgets
|
||||||
// base64 code. Needed for PCB_BITMAP
|
// base64 code. Needed for PCB_REFERENCE_IMAGE
|
||||||
#define wxUSE_BASE64 1
|
#define wxUSE_BASE64 1
|
||||||
#include <wx/base64.h>
|
#include <wx/base64.h>
|
||||||
#include <wx/mstream.h>
|
#include <wx/mstream.h>
|
||||||
|
@ -374,8 +374,8 @@ void PCB_PLUGIN::Format( const BOARD_ITEM* aItem, int aNestLevel ) const
|
||||||
format( static_cast<const PCB_SHAPE*>( aItem ), aNestLevel );
|
format( static_cast<const PCB_SHAPE*>( aItem ), aNestLevel );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
format( static_cast<const PCB_BITMAP*>( aItem ), aNestLevel );
|
format( static_cast<const PCB_REFERENCE_IMAGE*>( aItem ), aNestLevel );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PCB_TARGET_T:
|
case PCB_TARGET_T:
|
||||||
|
@ -1030,7 +1030,7 @@ void PCB_PLUGIN::format( const PCB_SHAPE* aShape, int aNestLevel ) const
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void PCB_PLUGIN::format( const PCB_BITMAP* aBitmap, int aNestLevel ) const
|
void PCB_PLUGIN::format( const PCB_REFERENCE_IMAGE* aBitmap, int aNestLevel ) const
|
||||||
{
|
{
|
||||||
wxCHECK_RET( aBitmap != nullptr && m_out != nullptr, "" );
|
wxCHECK_RET( aBitmap != nullptr && m_out != nullptr, "" );
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ class NETINFO_MAPPING;
|
||||||
class BOARD_DESIGN_SETTINGS;
|
class BOARD_DESIGN_SETTINGS;
|
||||||
class PCB_DIMENSION_BASE;
|
class PCB_DIMENSION_BASE;
|
||||||
class PCB_SHAPE;
|
class PCB_SHAPE;
|
||||||
class PCB_BITMAP;
|
class PCB_REFERENCE_IMAGE;
|
||||||
class PCB_TARGET;
|
class PCB_TARGET;
|
||||||
class PAD;
|
class PAD;
|
||||||
class PCB_GROUP;
|
class PCB_GROUP;
|
||||||
|
@ -407,7 +407,7 @@ private:
|
||||||
|
|
||||||
void format( const PCB_DIMENSION_BASE* aDimension, int aNestLevel = 0 ) const;
|
void format( const PCB_DIMENSION_BASE* aDimension, int aNestLevel = 0 ) const;
|
||||||
|
|
||||||
void format( const PCB_BITMAP* aBitmap, int aNestLevel = 0 ) const;
|
void format( const PCB_REFERENCE_IMAGE* aBitmap, int aNestLevel = 0 ) const;
|
||||||
|
|
||||||
void format( const PCB_GROUP* aGroup, int aNestLevel = 0 ) const;
|
void format( const PCB_GROUP* aGroup, int aNestLevel = 0 ) const;
|
||||||
|
|
||||||
|
|
|
@ -63,7 +63,7 @@ HANDLE_EXCEPTIONS(BOARD::TracksInNetBetweenPoints)
|
||||||
%include netclass.i
|
%include netclass.i
|
||||||
%include pcb_plot_params.i
|
%include pcb_plot_params.i
|
||||||
%include pcb_group.i
|
%include pcb_group.i
|
||||||
%include pcb_bitmap.i
|
%include pcb_reference_image.i
|
||||||
|
|
||||||
// std::vector templates
|
// std::vector templates
|
||||||
%template(VIA_DIMENSION_Vector) std::vector<VIA_DIMENSION>;
|
%template(VIA_DIMENSION_Vector) std::vector<VIA_DIMENSION>;
|
||||||
|
|
|
@ -64,7 +64,7 @@ class PCB_VIA;
|
||||||
class PCB_ARC;
|
class PCB_ARC;
|
||||||
class ZONE;
|
class ZONE;
|
||||||
class PCB_TARGET;
|
class PCB_TARGET;
|
||||||
class PCB_BITMAP;
|
class PCB_REFERENCE_IMAGE;
|
||||||
|
|
||||||
// Anything targeted to the %wrapper section is extern "C" whereas code targeted
|
// Anything targeted to the %wrapper section is extern "C" whereas code targeted
|
||||||
// to %header section is C++.
|
// to %header section is C++.
|
||||||
|
@ -90,7 +90,7 @@ static PCB_VIA* Cast_to_PCB_VIA( BOARD_ITEM* );
|
||||||
static PCB_ARC* Cast_to_PCB_ARC( BOARD_ITEM* );
|
static PCB_ARC* Cast_to_PCB_ARC( BOARD_ITEM* );
|
||||||
static ZONE* Cast_to_ZONE( BOARD_ITEM* );
|
static ZONE* Cast_to_ZONE( BOARD_ITEM* );
|
||||||
static PCB_TARGET* Cast_to_PCB_TARGET( BOARD_ITEM* );
|
static PCB_TARGET* Cast_to_PCB_TARGET( BOARD_ITEM* );
|
||||||
static PCB_BITMAP* Cast_to_PCB_BITMAP( BOARD_ITEM* );
|
static PCB_REFERENCE_IMAGE* Cast_to_PCB_REFERENCE_IMAGE( BOARD_ITEM* );
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
|
@ -116,7 +116,7 @@ static PCB_VIA* Cast_to_PCB_VIA( BOARD_ITEM* );
|
||||||
static PCB_ARC* Cast_to_PCB_ARC( BOARD_ITEM* );
|
static PCB_ARC* Cast_to_PCB_ARC( BOARD_ITEM* );
|
||||||
static ZONE* Cast_to_ZONE( BOARD_ITEM* );
|
static ZONE* Cast_to_ZONE( BOARD_ITEM* );
|
||||||
static PCB_TARGET* Cast_to_PCB_TARGET( BOARD_ITEM* );
|
static PCB_TARGET* Cast_to_PCB_TARGET( BOARD_ITEM* );
|
||||||
static PCB_BITMAP* Cast_to_PCB_BITMAP( BOARD_ITEM* );
|
static PCB_REFERENCE_IMAGE* Cast_to_PCB_REFERENCE_IMAGE( BOARD_ITEM* );
|
||||||
|
|
||||||
|
|
||||||
%extend BOARD_ITEM
|
%extend BOARD_ITEM
|
||||||
|
@ -159,8 +159,8 @@ static PCB_BITMAP* Cast_to_PCB_BITMAP( BOARD_ITEM* );
|
||||||
return Cast_to_PCB_ARC(self)
|
return Cast_to_PCB_ARC(self)
|
||||||
elif ct=="PCB_TARGET":
|
elif ct=="PCB_TARGET":
|
||||||
return Cast_to_PCB_TARGET(self)
|
return Cast_to_PCB_TARGET(self)
|
||||||
elif ct=="PCB_BITMAP":
|
elif ct=="PCB_REFERENCE_IMAGE":
|
||||||
return Cast_to_PCB_BITMAP(self)
|
return Cast_to_PCB_REFERENCE_IMAGE(self)
|
||||||
elif ct=="ZONE":
|
elif ct=="ZONE":
|
||||||
return Cast_to_ZONE(self)
|
return Cast_to_ZONE(self)
|
||||||
else:
|
else:
|
||||||
|
@ -212,5 +212,5 @@ static PCB_VIA* Cast_to_PCB_VIA( BOARD_ITEM* self ) {
|
||||||
static PCB_ARC* Cast_to_PCB_ARC( BOARD_ITEM* self ) { return dynamic_cast<PCB_ARC *>(self); }
|
static PCB_ARC* Cast_to_PCB_ARC( BOARD_ITEM* self ) { return dynamic_cast<PCB_ARC *>(self); }
|
||||||
static ZONE* Cast_to_ZONE( BOARD_ITEM* self ) { return dynamic_cast<ZONE*>(self); }
|
static ZONE* Cast_to_ZONE( BOARD_ITEM* self ) { return dynamic_cast<ZONE*>(self); }
|
||||||
static PCB_TARGET* Cast_to_PCB_TARGET( BOARD_ITEM* self ) { return dynamic_cast<PCB_TARGET*>(self); }
|
static PCB_TARGET* Cast_to_PCB_TARGET( BOARD_ITEM* self ) { return dynamic_cast<PCB_TARGET*>(self); }
|
||||||
static PCB_BITMAP* Cast_to_PCB_BITMAP( BOARD_ITEM* self ) { return dynamic_cast<PCB_BITMAP*>(self); }
|
static PCB_REFERENCE_IMAGE* Cast_to_PCB_REFERENCE_IMAGE( BOARD_ITEM* self ) { return dynamic_cast<PCB_REFERENCE_IMAGE*>(self); }
|
||||||
%}
|
%}
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
|
|
||||||
|
|
||||||
%include pcb_bitmap.h
|
|
||||||
%{
|
|
||||||
#include <pcb_bitmap.h>
|
|
||||||
%}
|
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
%include pcb_reference_image.h
|
||||||
|
%{
|
||||||
|
#include <pcb_reference_image.h>
|
||||||
|
%}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
* Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
|
* Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
|
||||||
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
|
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
|
||||||
* Copyright (C) 2012 Wayne Stambaugh <stambaughw@gmail.com>
|
* Copyright (C) 2012 Wayne Stambaugh <stambaughw@gmail.com>
|
||||||
* Copyright (C) 1992-2022 KiCad Developers, see AUTHORS.txt for contributors.
|
* Copyright (C) 1992-2023 KiCad Developers, see AUTHORS.txt for contributors.
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify it
|
* This program is free software: you can redistribute it and/or modify it
|
||||||
* under the terms of the GNU General Public License as published by the
|
* under the terms of the GNU General Public License as published by the
|
||||||
|
@ -184,7 +184,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateVToolbar()
|
||||||
m_drawToolBar->Add( PCB_ACTIONS::drawRectangle, ACTION_TOOLBAR::TOGGLE );
|
m_drawToolBar->Add( PCB_ACTIONS::drawRectangle, ACTION_TOOLBAR::TOGGLE );
|
||||||
m_drawToolBar->Add( PCB_ACTIONS::drawCircle, ACTION_TOOLBAR::TOGGLE );
|
m_drawToolBar->Add( PCB_ACTIONS::drawCircle, ACTION_TOOLBAR::TOGGLE );
|
||||||
m_drawToolBar->Add( PCB_ACTIONS::drawPolygon, ACTION_TOOLBAR::TOGGLE );
|
m_drawToolBar->Add( PCB_ACTIONS::drawPolygon, ACTION_TOOLBAR::TOGGLE );
|
||||||
m_drawToolBar->Add( PCB_ACTIONS::placeImage, ACTION_TOOLBAR::TOGGLE );
|
m_drawToolBar->Add( PCB_ACTIONS::placeReferenceImage, ACTION_TOOLBAR::TOGGLE );
|
||||||
m_drawToolBar->Add( PCB_ACTIONS::placeText, ACTION_TOOLBAR::TOGGLE );
|
m_drawToolBar->Add( PCB_ACTIONS::placeText, ACTION_TOOLBAR::TOGGLE );
|
||||||
m_drawToolBar->Add( PCB_ACTIONS::drawTextBox, ACTION_TOOLBAR::TOGGLE );
|
m_drawToolBar->Add( PCB_ACTIONS::drawTextBox, ACTION_TOOLBAR::TOGGLE );
|
||||||
m_drawToolBar->AddGroup( dimensionGroup, ACTION_TOOLBAR::TOGGLE );
|
m_drawToolBar->AddGroup( dimensionGroup, ACTION_TOOLBAR::TOGGLE );
|
||||||
|
|
|
@ -437,7 +437,7 @@ void PCB_EDIT_FRAME::ReCreateVToolbar()
|
||||||
m_drawToolBar->Add( PCB_ACTIONS::drawRectangle, ACTION_TOOLBAR::TOGGLE );
|
m_drawToolBar->Add( PCB_ACTIONS::drawRectangle, ACTION_TOOLBAR::TOGGLE );
|
||||||
m_drawToolBar->Add( PCB_ACTIONS::drawCircle, ACTION_TOOLBAR::TOGGLE );
|
m_drawToolBar->Add( PCB_ACTIONS::drawCircle, ACTION_TOOLBAR::TOGGLE );
|
||||||
m_drawToolBar->Add( PCB_ACTIONS::drawPolygon, ACTION_TOOLBAR::TOGGLE );
|
m_drawToolBar->Add( PCB_ACTIONS::drawPolygon, ACTION_TOOLBAR::TOGGLE );
|
||||||
m_drawToolBar->Add( PCB_ACTIONS::placeImage, ACTION_TOOLBAR::TOGGLE );
|
m_drawToolBar->Add( PCB_ACTIONS::placeReferenceImage, ACTION_TOOLBAR::TOGGLE );
|
||||||
m_drawToolBar->Add( PCB_ACTIONS::placeText, ACTION_TOOLBAR::TOGGLE );
|
m_drawToolBar->Add( PCB_ACTIONS::placeText, ACTION_TOOLBAR::TOGGLE );
|
||||||
m_drawToolBar->Add( PCB_ACTIONS::drawTextBox, ACTION_TOOLBAR::TOGGLE );
|
m_drawToolBar->Add( PCB_ACTIONS::drawTextBox, ACTION_TOOLBAR::TOGGLE );
|
||||||
m_drawToolBar->AddGroup( dimensionGroup, ACTION_TOOLBAR::TOGGLE );
|
m_drawToolBar->AddGroup( dimensionGroup, ACTION_TOOLBAR::TOGGLE );
|
||||||
|
|
|
@ -63,7 +63,7 @@
|
||||||
#include <gal/painter.h>
|
#include <gal/painter.h>
|
||||||
#include <pcb_edit_frame.h>
|
#include <pcb_edit_frame.h>
|
||||||
#include <pcb_group.h>
|
#include <pcb_group.h>
|
||||||
#include <pcb_bitmap.h>
|
#include <pcb_reference_image.h>
|
||||||
#include <pcb_text.h>
|
#include <pcb_text.h>
|
||||||
#include <pcb_textbox.h>
|
#include <pcb_textbox.h>
|
||||||
#include <pcb_dimension.h>
|
#include <pcb_dimension.h>
|
||||||
|
@ -536,14 +536,14 @@ int DRAWING_TOOL::DrawArc( const TOOL_EVENT& aEvent )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int DRAWING_TOOL::PlaceImage( const TOOL_EVENT& aEvent )
|
int DRAWING_TOOL::PlaceReferenceImage( const TOOL_EVENT& aEvent )
|
||||||
{
|
{
|
||||||
if( m_inDrawingTool )
|
if( m_inDrawingTool )
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
REENTRANCY_GUARD guard( &m_inDrawingTool );
|
REENTRANCY_GUARD guard( &m_inDrawingTool );
|
||||||
|
|
||||||
PCB_BITMAP* image = aEvent.Parameter<PCB_BITMAP*>();
|
PCB_REFERENCE_IMAGE* image = aEvent.Parameter<PCB_REFERENCE_IMAGE*>();
|
||||||
bool immediateMode = image != nullptr;
|
bool immediateMode = image != nullptr;
|
||||||
PCB_GRID_HELPER grid( m_toolMgr, m_frame->GetMagneticItemsSettings() );
|
PCB_GRID_HELPER grid( m_toolMgr, m_frame->GetMagneticItemsSettings() );
|
||||||
bool ignorePrimePosition = false;
|
bool ignorePrimePosition = false;
|
||||||
|
@ -696,7 +696,7 @@ int DRAWING_TOOL::PlaceImage( const TOOL_EVENT& aEvent )
|
||||||
wxString fullFilename = dlg.GetPath();
|
wxString fullFilename = dlg.GetPath();
|
||||||
|
|
||||||
if( wxFileExists( fullFilename ) )
|
if( wxFileExists( fullFilename ) )
|
||||||
image = new PCB_BITMAP( m_frame->GetModel(), cursorPos );
|
image = new PCB_REFERENCE_IMAGE( m_frame->GetModel(), cursorPos );
|
||||||
|
|
||||||
if( !image || !image->ReadImageFile( fullFilename ) )
|
if( !image || !image->ReadImageFile( fullFilename ) )
|
||||||
{
|
{
|
||||||
|
@ -2871,8 +2871,8 @@ int DRAWING_TOOL::DrawVia( const TOOL_EVENT& aEvent )
|
||||||
|
|
||||||
for( PCB_LAYER_ID layer : aOther->GetLayerSet().Seq() )
|
for( PCB_LAYER_ID layer : aOther->GetLayerSet().Seq() )
|
||||||
{
|
{
|
||||||
// Bitmaps are "on" a copper layer but are not actually part of it
|
// Reference images are "on" a copper layer but are not actually part of it
|
||||||
if( !IsCopperLayer( layer ) || aOther->Type() == PCB_BITMAP_T )
|
if( !IsCopperLayer( layer ) || aOther->Type() == PCB_REFERENCE_IMAGE_T )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
constraint = m_drcEngine->EvalRules( CLEARANCE_CONSTRAINT, aVia, aOther, layer );
|
constraint = m_drcEngine->EvalRules( CLEARANCE_CONSTRAINT, aVia, aOther, layer );
|
||||||
|
@ -3419,7 +3419,7 @@ void DRAWING_TOOL::setTransitions()
|
||||||
Go( &DRAWING_TOOL::DrawZone, PCB_ACTIONS::drawZoneCutout.MakeEvent() );
|
Go( &DRAWING_TOOL::DrawZone, PCB_ACTIONS::drawZoneCutout.MakeEvent() );
|
||||||
Go( &DRAWING_TOOL::DrawZone, PCB_ACTIONS::drawSimilarZone.MakeEvent() );
|
Go( &DRAWING_TOOL::DrawZone, PCB_ACTIONS::drawSimilarZone.MakeEvent() );
|
||||||
Go( &DRAWING_TOOL::DrawVia, PCB_ACTIONS::drawVia.MakeEvent() );
|
Go( &DRAWING_TOOL::DrawVia, PCB_ACTIONS::drawVia.MakeEvent() );
|
||||||
Go( &DRAWING_TOOL::PlaceImage, PCB_ACTIONS::placeImage.MakeEvent() );
|
Go( &DRAWING_TOOL::PlaceReferenceImage, PCB_ACTIONS::placeReferenceImage.MakeEvent() );
|
||||||
Go( &DRAWING_TOOL::PlaceText, PCB_ACTIONS::placeText.MakeEvent() );
|
Go( &DRAWING_TOOL::PlaceText, PCB_ACTIONS::placeText.MakeEvent() );
|
||||||
Go( &DRAWING_TOOL::DrawRectangle, PCB_ACTIONS::drawTextBox.MakeEvent() );
|
Go( &DRAWING_TOOL::DrawRectangle, PCB_ACTIONS::drawTextBox.MakeEvent() );
|
||||||
Go( &DRAWING_TOOL::PlaceImportedGraphics, PCB_ACTIONS::placeImportedGraphics.MakeEvent() );
|
Go( &DRAWING_TOOL::PlaceImportedGraphics, PCB_ACTIONS::placeImportedGraphics.MakeEvent() );
|
||||||
|
|
|
@ -146,10 +146,10 @@ public:
|
||||||
int DrawArc( const TOOL_EVENT& aEvent );
|
int DrawArc( const TOOL_EVENT& aEvent );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Display a dialog that allows one to select and image then decide where to place the
|
* Display a dialog that allows one to select a reference image and then decide where to
|
||||||
* image in the editor.
|
* place the image in the editor.
|
||||||
*/
|
*/
|
||||||
int PlaceImage( const TOOL_EVENT& aEvent );
|
int PlaceReferenceImage( const TOOL_EVENT& aEvent );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Display a dialog that allows one to input text and its settings and then lets the user
|
* Display a dialog that allows one to input text and its settings and then lets the user
|
||||||
|
|
|
@ -70,7 +70,7 @@ using namespace std::placeholders;
|
||||||
#include <dialogs/dialog_unit_entry.h>
|
#include <dialogs/dialog_unit_entry.h>
|
||||||
#include <board_commit.h>
|
#include <board_commit.h>
|
||||||
#include <zone_filler.h>
|
#include <zone_filler.h>
|
||||||
#include <pcb_bitmap.h>
|
#include <pcb_reference_image.h>
|
||||||
|
|
||||||
const unsigned int EDIT_TOOL::COORDS_PADDING = pcbIUScale.mmToIU( 20 );
|
const unsigned int EDIT_TOOL::COORDS_PADDING = pcbIUScale.mmToIU( 20 );
|
||||||
|
|
||||||
|
@ -2111,7 +2111,7 @@ void EDIT_TOOL::DeleteItems( const PCB_SELECTION& aItems, bool aIsCut )
|
||||||
case PCB_TEXT_T:
|
case PCB_TEXT_T:
|
||||||
case PCB_SHAPE_T:
|
case PCB_SHAPE_T:
|
||||||
case PCB_TEXTBOX_T:
|
case PCB_TEXTBOX_T:
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
case PCB_DIMENSION_T:
|
case PCB_DIMENSION_T:
|
||||||
case PCB_DIM_ALIGNED_T:
|
case PCB_DIM_ALIGNED_T:
|
||||||
case PCB_DIM_LEADER_T:
|
case PCB_DIM_LEADER_T:
|
||||||
|
@ -2518,7 +2518,7 @@ int EDIT_TOOL::Duplicate( const TOOL_EVENT& aEvent )
|
||||||
case PCB_FOOTPRINT_T:
|
case PCB_FOOTPRINT_T:
|
||||||
case PCB_TEXT_T:
|
case PCB_TEXT_T:
|
||||||
case PCB_TEXTBOX_T:
|
case PCB_TEXTBOX_T:
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
case PCB_GENERATOR_T:
|
case PCB_GENERATOR_T:
|
||||||
case PCB_SHAPE_T:
|
case PCB_SHAPE_T:
|
||||||
case PCB_TRACE_T:
|
case PCB_TRACE_T:
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
#include <router/pns_routing_settings.h>
|
#include <router/pns_routing_settings.h>
|
||||||
|
|
||||||
// Forward declarations for types needed in the parameters
|
// Forward declarations for types needed in the parameters
|
||||||
class PCB_BITMAP;
|
class PCB_REFERENCE_IMAGE;
|
||||||
|
|
||||||
// Actions, being statically-defined, require specialized I18N handling. We continue to
|
// Actions, being statically-defined, require specialized I18N handling. We continue to
|
||||||
// use the _() macro so that string harvesting by the I18N framework doesn't have to be
|
// use the _() macro so that string harvesting by the I18N framework doesn't have to be
|
||||||
|
@ -159,14 +159,14 @@ TOOL_ACTION PCB_ACTIONS::placeStackup( TOOL_ACTION_ARGS()
|
||||||
.Tooltip( _( "Add a board stackup table on a graphic layer" ) )
|
.Tooltip( _( "Add a board stackup table on a graphic layer" ) )
|
||||||
.Flags( AF_ACTIVATE ) );
|
.Flags( AF_ACTIVATE ) );
|
||||||
|
|
||||||
TOOL_ACTION PCB_ACTIONS::placeImage( TOOL_ACTION_ARGS()
|
TOOL_ACTION PCB_ACTIONS::placeReferenceImage( TOOL_ACTION_ARGS()
|
||||||
.Name( "pcbnew.InteractiveDrawing.placeImage" )
|
.Name( "pcbnew.InteractiveDrawing.placeReferenceImage" )
|
||||||
.Scope( AS_GLOBAL )
|
.Scope( AS_GLOBAL )
|
||||||
.MenuText( _( "Add Image" ) )
|
.MenuText( _( "Add Reference Image" ) )
|
||||||
.Tooltip( _( "Add bitmap image" ) )
|
.Tooltip( _( "Add a bitmap image to be used as a reference (image will not be included in any output)" ) )
|
||||||
.Icon( BITMAPS::image )
|
.Icon( BITMAPS::image )
|
||||||
.Flags( AF_ACTIVATE )
|
.Flags( AF_ACTIVATE )
|
||||||
.Parameter<PCB_BITMAP*>( nullptr ) );
|
.Parameter<PCB_REFERENCE_IMAGE*>( nullptr ) );
|
||||||
|
|
||||||
TOOL_ACTION PCB_ACTIONS::placeText( TOOL_ACTION_ARGS()
|
TOOL_ACTION PCB_ACTIONS::placeText( TOOL_ACTION_ARGS()
|
||||||
.Name( "pcbnew.InteractiveDrawing.text" )
|
.Name( "pcbnew.InteractiveDrawing.text" )
|
||||||
|
|
|
@ -197,7 +197,7 @@ public:
|
||||||
static TOOL_ACTION drawRectangle;
|
static TOOL_ACTION drawRectangle;
|
||||||
static TOOL_ACTION drawCircle;
|
static TOOL_ACTION drawCircle;
|
||||||
static TOOL_ACTION drawArc;
|
static TOOL_ACTION drawArc;
|
||||||
static TOOL_ACTION placeImage;
|
static TOOL_ACTION placeReferenceImage;
|
||||||
static TOOL_ACTION placeText;
|
static TOOL_ACTION placeText;
|
||||||
static TOOL_ACTION drawTextBox;
|
static TOOL_ACTION drawTextBox;
|
||||||
static TOOL_ACTION spacingIncrease;
|
static TOOL_ACTION spacingIncrease;
|
||||||
|
|
|
@ -408,7 +408,7 @@ GRID_HELPER_GRIDS PCB_GRID_HELPER::GetItemGrid( const EDA_ITEM* aItem ) const
|
||||||
|
|
||||||
case PCB_SHAPE_T:
|
case PCB_SHAPE_T:
|
||||||
case PCB_DIMENSION_T:
|
case PCB_DIMENSION_T:
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
case PCB_TEXTBOX_T:
|
case PCB_TEXTBOX_T:
|
||||||
return GRID_GRAPHICS;
|
return GRID_GRAPHICS;
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@ using namespace std::placeholders;
|
||||||
#include <dialogs/dialog_unit_entry.h>
|
#include <dialogs/dialog_unit_entry.h>
|
||||||
#include <board_commit.h>
|
#include <board_commit.h>
|
||||||
#include <pcb_edit_frame.h>
|
#include <pcb_edit_frame.h>
|
||||||
#include <pcb_bitmap.h>
|
#include <pcb_reference_image.h>
|
||||||
#include <pcb_generator.h>
|
#include <pcb_generator.h>
|
||||||
#include <pcb_dimension.h>
|
#include <pcb_dimension.h>
|
||||||
#include <pcb_textbox.h>
|
#include <pcb_textbox.h>
|
||||||
|
@ -198,9 +198,9 @@ std::shared_ptr<EDIT_POINTS> PCB_POINT_EDITOR::makePoints( EDA_ITEM* aItem )
|
||||||
// Generate list of edit points basing on the item type
|
// Generate list of edit points basing on the item type
|
||||||
switch( aItem->Type() )
|
switch( aItem->Type() )
|
||||||
{
|
{
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
{
|
{
|
||||||
PCB_BITMAP* bitmap = (PCB_BITMAP*) aItem;
|
PCB_REFERENCE_IMAGE* bitmap = (PCB_REFERENCE_IMAGE*) aItem;
|
||||||
VECTOR2I topLeft = bitmap->GetPosition() - bitmap->GetSize() / 2;
|
VECTOR2I topLeft = bitmap->GetPosition() - bitmap->GetSize() / 2;
|
||||||
VECTOR2I botRight = bitmap->GetPosition() + bitmap->GetSize() / 2;
|
VECTOR2I botRight = bitmap->GetPosition() + bitmap->GetSize() / 2;
|
||||||
|
|
||||||
|
@ -1163,9 +1163,9 @@ void PCB_POINT_EDITOR::updateItem( BOARD_COMMIT* aCommit )
|
||||||
|
|
||||||
switch( item->Type() )
|
switch( item->Type() )
|
||||||
{
|
{
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
{
|
{
|
||||||
PCB_BITMAP* bitmap = (PCB_BITMAP*) item;
|
PCB_REFERENCE_IMAGE* bitmap = (PCB_REFERENCE_IMAGE*) item;
|
||||||
VECTOR2I topLeft = m_editPoints->Point( RECT_TOP_LEFT ).GetPosition();
|
VECTOR2I topLeft = m_editPoints->Point( RECT_TOP_LEFT ).GetPosition();
|
||||||
VECTOR2I topRight = m_editPoints->Point( RECT_TOP_RIGHT ).GetPosition();
|
VECTOR2I topRight = m_editPoints->Point( RECT_TOP_RIGHT ).GetPosition();
|
||||||
VECTOR2I botLeft = m_editPoints->Point( RECT_BOT_LEFT ).GetPosition();
|
VECTOR2I botLeft = m_editPoints->Point( RECT_BOT_LEFT ).GetPosition();
|
||||||
|
@ -1750,9 +1750,9 @@ void PCB_POINT_EDITOR::updatePoints()
|
||||||
|
|
||||||
switch( item->Type() )
|
switch( item->Type() )
|
||||||
{
|
{
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
{
|
{
|
||||||
PCB_BITMAP* bitmap = (PCB_BITMAP*) item;
|
PCB_REFERENCE_IMAGE* bitmap = (PCB_REFERENCE_IMAGE*) item;
|
||||||
VECTOR2I topLeft = bitmap->GetPosition() - bitmap->GetSize() / 2;
|
VECTOR2I topLeft = bitmap->GetPosition() - bitmap->GetSize() / 2;
|
||||||
VECTOR2I botRight = bitmap->GetPosition() + bitmap->GetSize() / 2;
|
VECTOR2I botRight = bitmap->GetPosition() + bitmap->GetSize() / 2;
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@ using namespace std::placeholders;
|
||||||
#include <board_design_settings.h>
|
#include <board_design_settings.h>
|
||||||
#include <board_item.h>
|
#include <board_item.h>
|
||||||
#include <clipper.hpp>
|
#include <clipper.hpp>
|
||||||
#include <pcb_bitmap.h>
|
#include <pcb_reference_image.h>
|
||||||
#include <pcb_track.h>
|
#include <pcb_track.h>
|
||||||
#include <footprint.h>
|
#include <footprint.h>
|
||||||
#include <pad.h>
|
#include <pad.h>
|
||||||
|
@ -2416,11 +2416,11 @@ bool PCB_SELECTION_TOOL::itemPassesFilter( BOARD_ITEM* aItem, bool aMultiSelect
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PCB_BITMAP_T:
|
case PCB_REFERENCE_IMAGE_T:
|
||||||
if( !m_filter.graphics )
|
if( !m_filter.graphics )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// a bitmap living in a footprint must not be selected inside the board editor
|
// a reference image living in a footprint must not be selected inside the board editor
|
||||||
if( !m_isFootprintEditor && aItem->GetParentFootprint() )
|
if( !m_isFootprintEditor && aItem->GetParentFootprint() )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
@ -3157,9 +3157,9 @@ void PCB_SELECTION_TOOL::GuessSelectionCandidates( GENERAL_COLLECTOR& aCollector
|
||||||
// segments underneath them -- so artificially reduce their size from πr² to 1.5r².
|
// segments underneath them -- so artificially reduce their size from πr² to 1.5r².
|
||||||
area = (double) SEG::Square( static_cast<PCB_VIA*>( item )->GetDrill() / 2 ) * 1.5;
|
area = (double) SEG::Square( static_cast<PCB_VIA*>( item )->GetDrill() / 2 ) * 1.5;
|
||||||
}
|
}
|
||||||
else if( item->Type() == PCB_BITMAP_T )
|
else if( item->Type() == PCB_REFERENCE_IMAGE_T )
|
||||||
{
|
{
|
||||||
VECTOR2D size = static_cast<const PCB_BITMAP*>( item )->GetSize();
|
VECTOR2D size = static_cast<const PCB_REFERENCE_IMAGE*>( item )->GetSize();
|
||||||
area = size.x * size.y;
|
area = size.x * size.y;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
#include <pcb_shape.h>
|
#include <pcb_shape.h>
|
||||||
#include <pcb_text.h>
|
#include <pcb_text.h>
|
||||||
#include <pcb_textbox.h>
|
#include <pcb_textbox.h>
|
||||||
#include <pcb_bitmap.h>
|
#include <pcb_reference_image.h>
|
||||||
#include <zone.h>
|
#include <zone.h>
|
||||||
#include <pcb_track.h>
|
#include <pcb_track.h>
|
||||||
#include <pcb_marker.h>
|
#include <pcb_marker.h>
|
||||||
|
@ -79,7 +79,7 @@ public:
|
||||||
case PCB_SHAPE_T: return new PCB_SHAPE( &m_board );
|
case PCB_SHAPE_T: return new PCB_SHAPE( &m_board );
|
||||||
case PCB_TEXT_T: return new PCB_TEXT( &m_board );
|
case PCB_TEXT_T: return new PCB_TEXT( &m_board );
|
||||||
case PCB_TEXTBOX_T: return new PCB_TEXTBOX( &m_board );
|
case PCB_TEXTBOX_T: return new PCB_TEXTBOX( &m_board );
|
||||||
case PCB_BITMAP_T: return new PCB_BITMAP( &m_board );
|
case PCB_REFERENCE_IMAGE_T: return new PCB_REFERENCE_IMAGE( &m_board );
|
||||||
case PCB_TRACE_T: return new PCB_TRACK( &m_board );
|
case PCB_TRACE_T: return new PCB_TRACK( &m_board );
|
||||||
case PCB_VIA_T: return new PCB_VIA( &m_board );
|
case PCB_VIA_T: return new PCB_VIA( &m_board );
|
||||||
case PCB_ARC_T: return new PCB_ARC( &m_board );
|
case PCB_ARC_T: return new PCB_ARC( &m_board );
|
||||||
|
|
Loading…
Reference in New Issue