Added layer change to the module text dialog (both user text and reference/value) (12472644) · Commits · Elphel / kicad-source-mirror

pcbnew/dialogs/dialog_edit_module_text.cpp

+17 −1

Original line number	Diff line number	Diff line
		@@ -155,6 +155,19 @@ void DialogEditModuleText::initDlg( )

		if( !m_currentText->IsVisible() )
		m_Show->SetSelection( 1 );;

		// Configure the layers list selector
		m_LayerSelectionCtrl->SetLayersHotkeys( false );
		m_LayerSelectionCtrl->SetLayerSet( LSET::InternalCuMask().set( Edge_Cuts ) );
		m_LayerSelectionCtrl->SetBoardFrame( m_parent );
		m_LayerSelectionCtrl->Resync();

		if( m_LayerSelectionCtrl->SetLayerSelection( m_currentText->GetLayer() ) < 0 )
		{
		wxMessageBox( _( "This item has an illegal layer id.\n"
		"Now, forced on the front silk screen layer. Please, fix it" ) );
		m_LayerSelectionCtrl->SetLayerSelection( F_SilkS );
		}
		}


		@@ -223,6 +236,9 @@ void DialogEditModuleText::OnOkClick( wxCommandEvent& event )

		m_currentText->SetDrawCoord();

		LAYER_NUM layer = m_LayerSelectionCtrl->GetLayerSelection();
		m_currentText->SetLayer( ToLAYER_ID( layer ) );

		#ifndef USE_WX_OVERLAY
		if( m_dc ) // Display new text
		{

pcbnew/dialogs/dialog_edit_module_text_base.cpp

+8 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ DialogEditModuleText_base::DialogEditModuleText_base( wxWindow* parent, wxWindow
		bSizer10 = new wxBoxSizer( wxHORIZONTAL );

		wxFlexGridSizer* fgSizer1;
		fgSizer1 = new wxFlexGridSizer( 6, 2, 0, 0 );
		fgSizer1 = new wxFlexGridSizer( 7, 2, 0, 0 );
		fgSizer1->AddGrowableCol( 1 );
		fgSizer1->SetFlexibleDirection( wxBOTH );
		fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
		@@ -85,6 +85,13 @@ DialogEditModuleText_base::DialogEditModuleText_base( wxWindow* parent, wxWindow
		m_TxtPosCtrlY->SetMaxLength( 0 );
		fgSizer1->Add( m_TxtPosCtrlY, 0, wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND, 5 );

		m_LayerLabel = new wxStaticText( this, wxID_ANY, _("Layer:"), wxDefaultPosition, wxDefaultSize, 0 );
		m_LayerLabel->Wrap( -1 );
		fgSizer1->Add( m_LayerLabel, 0, wxALL, 5 );

		m_LayerSelectionCtrl = new PCB_LAYER_BOX_SELECTOR( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
		fgSizer1->Add( m_LayerSelectionCtrl, 0, wxBOTTOM\|wxEXPAND\|wxLEFT\|wxRIGHT, 5 );


		bSizer10->Add( fgSizer1, 1, wxALL\|wxEXPAND, 5 );

pcbnew/dialogs/dialog_edit_module_text_base.fbp

+175 −1

Original line number	Diff line number	Diff line
		@@ -289,7 +289,7 @@
		<property name="name">fgSizer1</property>
		<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
		<property name="permission">none</property>
		<property name="rows">6</property>
		<property name="rows">7</property>
		<property name="vgap">0</property>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		@@ -1335,6 +1335,180 @@
		<event name="OnUpdateUI"></event>
		</object>
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxALL</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">0</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">Layer:</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"></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>
		<event name="OnChar"></event>
		<event name="OnEnterWindow"></event>
		<event name="OnEraseBackground"></event>
		<event name="OnKeyDown"></event>
		<event name="OnKeyUp"></event>
		<event name="OnKillFocus"></event>
		<event name="OnLeaveWindow"></event>
		<event name="OnLeftDClick"></event>
		<event name="OnLeftDown"></event>
		<event name="OnLeftUp"></event>
		<event name="OnMiddleDClick"></event>
		<event name="OnMiddleDown"></event>
		<event name="OnMiddleUp"></event>
		<event name="OnMotion"></event>
		<event name="OnMouseEvents"></event>
		<event name="OnMouseWheel"></event>
		<event name="OnPaint"></event>
		<event name="OnRightDClick"></event>
		<event name="OnRightDown"></event>
		<event name="OnRightUp"></event>
		<event name="OnSetFocus"></event>
		<event name="OnSize"></event>
		<event name="OnUpdateUI"></event>
		</object>
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxBOTTOM\|wxEXPAND\|wxLEFT\|wxRIGHT</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="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; class_pcb_layer_box_selector.h</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>
		<event name="OnChar"></event>
		<event name="OnCombobox"></event>
		<event name="OnEnterWindow"></event>
		<event name="OnEraseBackground"></event>
		<event name="OnKeyDown"></event>
		<event name="OnKeyUp"></event>
		<event name="OnKillFocus"></event>
		<event name="OnLeaveWindow"></event>
		<event name="OnLeftDClick"></event>
		<event name="OnLeftDown"></event>
		<event name="OnLeftUp"></event>
		<event name="OnMiddleDClick"></event>
		<event name="OnMiddleDown"></event>
		<event name="OnMiddleUp"></event>
		<event name="OnMotion"></event>
		<event name="OnMouseEvents"></event>
		<event name="OnMouseWheel"></event>
		<event name="OnPaint"></event>
		<event name="OnRightDClick"></event>
		<event name="OnRightDown"></event>
		<event name="OnRightUp"></event>
		<event name="OnSetFocus"></event>
		<event name="OnSize"></event>
		<event name="OnText"></event>
		<event name="OnTextEnter"></event>
		<event name="OnUpdateUI"></event>
		</object>
		</object>
		</object>
		</object>
		</object>

pcbnew/dialogs/dialog_edit_module_text_base.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -11,8 +11,7 @@
		#include <wx/artprov.h>
		#include <wx/xrc/xmlres.h>
		#include <wx/intl.h>
		class DIALOG_SHIM;

		#include "class_pcb_layer_box_selector.h"
		#include "dialog_shim.h"
		#include <wx/string.h>
		#include <wx/stattext.h>
		@@ -22,6 +21,7 @@ class DIALOG_SHIM;
		#include <wx/settings.h>
		#include <wx/statline.h>
		#include <wx/textctrl.h>
		#include <wx/bmpcbox.h>
		#include <wx/sizer.h>
		#include <wx/radiobox.h>
		#include <wx/button.h>
		@@ -51,6 +51,8 @@ class DialogEditModuleText_base : public DIALOG_SHIM
		wxTextCtrl* m_TxtPosCtrlX;
		wxStaticText* m_PosYTitle;
		wxTextCtrl* m_TxtPosCtrlY;
		wxStaticText* m_LayerLabel;
		PCB_LAYER_BOX_SELECTOR* m_LayerSelectionCtrl;
		wxRadioBox* m_Style;
		wxRadioBox* m_Orient;
		wxRadioBox* m_Show;

pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		* Circles
		* Arcs
		* used as graphic elements found on non copper layers in boards
		* Footprint texts are not always graphic items and are not handled here
		* Footprint texts are not graphic items and are not handled here
		*/
		#include <fctsys.h>
		#include <macros.h>

Admin message