Add rotation field to pcbnew text item property dialog. (096f4a10) · Commits · Elphel / kicad-source-mirror

pcbnew/dialogs/dialog_pcb_text_properties.cpp

+7 −22

Original line number	Diff line number	Diff line
		@@ -135,27 +135,9 @@ void DIALOG_PCB_TEXT_PROPERTIES::MyInit()
		}
		}

		switch( (int) m_SelectedPCBText->GetOrientation() )
		{
		default:
		m_OrientationCtrl->SetSelection( 0 );
		break;

		case 900:
		case -2700:
		m_OrientationCtrl->SetSelection( 1 );
		break;

		case 1800:
		case -1800:
		m_OrientationCtrl->SetSelection( 2 );
		break;

		case 2700:
		case -900:
		m_OrientationCtrl->SetSelection( 3 );
		break;
		}
		wxString orientationStr;
		orientationStr << m_SelectedPCBText->GetOrientation();
		m_OrientationCtrl->SetValue( orientationStr );

		if( m_SelectedPCBText->m_Mirror )
		m_DisplayCtrl->SetSelection( 1 );
		@@ -263,7 +245,10 @@ void DIALOG_PCB_TEXT_PROPERTIES::OnOkClick( wxCommandEvent& event )
		m_SelectedPCBText->m_Mirror = (m_DisplayCtrl->GetSelection() == 1) ? true : false;

		// Set the text orientation
		m_SelectedPCBText->m_Orient = m_OrientationCtrl->GetSelection() * 900;
		long orientation;
		m_OrientationCtrl->GetValue().ToLong( &orientation );
		orientation = orientation % 3600;
		m_SelectedPCBText->SetOrientation( orientation );

		// Set whether the PCB text is slanted (it is not italics, as italics has additional curves in style)
		m_SelectedPCBText->m_Italic = m_StyleCtrl->GetSelection() ? 1 : 0;

pcbnew/dialogs/dialog_pcb_text_properties_base.cpp

+63 −78

Original line number	Diff line number	Diff line
		///////////////////////////////////////////////////////////////////////////
		// C++ code generated with wxFormBuilder (version Mar 19 2012)
		// C++ code generated with wxFormBuilder (version Apr 11 2012)
		// http://www.wxformbuilder.org/
		//
		// PLEASE DO "NOT" EDIT THIS FILE!
		@@ -29,121 +29,106 @@ DIALOG_PCB_TEXT_PROPERTIES_BASE::DIALOG_PCB_TEXT_PROPERTIES_BASE( wxWindow* pare

		bSizer9->Add( m_TextContentCtrl, 1, wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND, 5 );

		wxBoxSizer* bSizerLower;
		bSizerLower = new wxBoxSizer( wxHORIZONTAL );

		wxBoxSizer* bSizerLeft;
		bSizerLeft = new wxBoxSizer( wxVERTICAL );
		wxFlexGridSizer* fgSizer1;
		fgSizer1 = new wxFlexGridSizer( 6, 4, 0, 0 );
		fgSizer1->AddGrowableCol( 0 );
		fgSizer1->AddGrowableCol( 1 );
		fgSizer1->AddGrowableCol( 2 );
		fgSizer1->AddGrowableCol( 3 );
		fgSizer1->SetFlexibleDirection( wxBOTH );
		fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );

		m_SizeXLabel = new wxStaticText( this, wxID_ANY, _("Size X"), wxDefaultPosition, wxDefaultSize, 0 );
		m_SizeXLabel->Wrap( -1 );
		bSizerLeft->Add( m_SizeXLabel, 0, wxLEFT\|wxRIGHT\|wxTOP, 5 );

		m_SizeXCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		bSizerLeft->Add( m_SizeXCtrl, 0, wxBOTTOM\|wxEXPAND\|wxLEFT\|wxRIGHT, 5 );

		m_SizeYLabel = new wxStaticText( this, wxID_ANY, _("Size Y"), wxDefaultPosition, wxDefaultSize, 0 );
		m_SizeYLabel->Wrap( -1 );
		bSizerLeft->Add( m_SizeYLabel, 0, wxLEFT\|wxRIGHT\|wxTOP, 5 );

		m_SizeYCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		bSizerLeft->Add( m_SizeYCtrl, 0, wxBOTTOM\|wxEXPAND\|wxLEFT\|wxRIGHT, 5 );

		m_ThicknessLabel = new wxStaticText( this, wxID_ANY, _("Thickness"), wxDefaultPosition, wxDefaultSize, 0 );
		m_ThicknessLabel->Wrap( -1 );
		bSizerLeft->Add( m_ThicknessLabel, 0, wxLEFT\|wxRIGHT\|wxTOP, 5 );

		m_ThicknessCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		bSizerLeft->Add( m_ThicknessCtrl, 0, wxBOTTOM\|wxEXPAND\|wxLEFT\|wxRIGHT, 5 );


		bSizerLower->Add( bSizerLeft, 1, 0, 5 );

		wxBoxSizer* bSizerRight;
		bSizerRight = new wxBoxSizer( wxVERTICAL );
		fgSizer1->Add( m_SizeXLabel, 0, wxLEFT\|wxRIGHT\|wxTOP, 5 );

		m_PositionXLabel = new wxStaticText( this, wxID_ANY, _("Position X"), wxDefaultPosition, wxDefaultSize, 0 );
		m_PositionXLabel->Wrap( -1 );
		bSizerRight->Add( m_PositionXLabel, 0, wxLEFT\|wxRIGHT\|wxTOP, 5 );
		fgSizer1->Add( m_PositionXLabel, 0, wxLEFT\|wxRIGHT\|wxTOP, 5 );

		m_PositionXCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		bSizerRight->Add( m_PositionXCtrl, 0, wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );
		m_LayerLabel = new wxStaticText( this, wxID_ANY, _("Layer:"), wxDefaultPosition, wxDefaultSize, 0 );
		m_LayerLabel->Wrap( -1 );
		fgSizer1->Add( m_LayerLabel, 0, wxLEFT\|wxRIGHT\|wxTOP, 5 );

		m_PositionYLabel = new wxStaticText( this, wxID_ANY, _("Position Y"), wxDefaultPosition, wxDefaultSize, 0 );
		m_PositionYLabel->Wrap( -1 );
		bSizerRight->Add( m_PositionYLabel, 0, wxLEFT\|wxRIGHT\|wxTOP, 5 );
		m_staticText10 = new wxStaticText( this, wxID_ANY, _("Display:"), wxDefaultPosition, wxDefaultSize, 0 );
		m_staticText10->Wrap( -1 );
		fgSizer1->Add( m_staticText10, 0, wxLEFT\|wxRIGHT\|wxTOP, 5 );

		m_PositionYCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		bSizerRight->Add( m_PositionYCtrl, 0, wxBOTTOM\|wxEXPAND\|wxLEFT\|wxRIGHT, 5 );
		m_SizeXCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		fgSizer1->Add( m_SizeXCtrl, 0, wxBOTTOM\|wxEXPAND\|wxLEFT\|wxRIGHT, 5 );

		m_LayerLabel = new wxStaticText( this, wxID_ANY, _("Layer:"), wxDefaultPosition, wxDefaultSize, 0 );
		m_LayerLabel->Wrap( -1 );
		bSizerRight->Add( m_LayerLabel, 0, wxLEFT\|wxRIGHT, 5 );
		m_PositionXCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		fgSizer1->Add( m_PositionXCtrl, 0, wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );

		wxArrayString m_LayerSelectionCtrlChoices;
		m_LayerSelectionCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_LayerSelectionCtrlChoices, 0 );
		m_LayerSelectionCtrl->SetSelection( 0 );
		m_LayerSelectionCtrl->SetToolTip( _("Select the layer on which text should lay.") );

		bSizerRight->Add( m_LayerSelectionCtrl, 0, wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );
		fgSizer1->Add( m_LayerSelectionCtrl, 0, wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );

		wxString m_DisplayCtrlChoices[] = { _("Normal"), _("Mirrored") };
		int m_DisplayCtrlNChoices = sizeof( m_DisplayCtrlChoices ) / sizeof( wxString );
		m_DisplayCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_DisplayCtrlNChoices, m_DisplayCtrlChoices, 0 );
		m_DisplayCtrl->SetSelection( 0 );
		fgSizer1->Add( m_DisplayCtrl, 0, wxBOTTOM\|wxEXPAND\|wxLEFT\|wxRIGHT, 5 );

		bSizerLower->Add( bSizerRight, 1, 0, 5 );

		wxBoxSizer* bSizer5;
		bSizer5 = new wxBoxSizer( wxVERTICAL );

		m_staticText8 = new wxStaticText( this, wxID_ANY, _("Orientation:"), wxDefaultPosition, wxDefaultSize, 0 );
		m_staticText8->Wrap( -1 );
		bSizer5->Add( m_staticText8, 0, wxLEFT\|wxRIGHT, 5 );
		m_SizeYLabel = new wxStaticText( this, wxID_ANY, _("Size Y"), wxDefaultPosition, wxDefaultSize, 0 );
		m_SizeYLabel->Wrap( -1 );
		fgSizer1->Add( m_SizeYLabel, 0, wxLEFT\|wxRIGHT\|wxTOP, 5 );

		wxString m_OrientationCtrlChoices[] = { _("0"), _("90"), _("180"), _("-90") };
		int m_OrientationCtrlNChoices = sizeof( m_OrientationCtrlChoices ) / sizeof( wxString );
		m_OrientationCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_OrientationCtrlNChoices, m_OrientationCtrlChoices, 0 );
		m_OrientationCtrl->SetSelection( 0 );
		bSizer5->Add( m_OrientationCtrl, 0, wxBOTTOM\|wxEXPAND\|wxLEFT\|wxRIGHT, 5 );
		m_PositionYLabel = new wxStaticText( this, wxID_ANY, _("Position Y"), wxDefaultPosition, wxDefaultSize, 0 );
		m_PositionYLabel->Wrap( -1 );
		fgSizer1->Add( m_PositionYLabel, 0, wxLEFT\|wxRIGHT\|wxTOP, 5 );

		m_staticText9 = new wxStaticText( this, wxID_ANY, _("Style:"), wxDefaultPosition, wxDefaultSize, 0 );
		m_staticText9->Wrap( -1 );
		bSizer5->Add( m_staticText9, 0, wxLEFT\|wxRIGHT, 5 );
		fgSizer1->Add( m_staticText9, 0, wxLEFT\|wxRIGHT\|wxTOP, 5 );

		m_staticText11 = new wxStaticText( this, wxID_ANY, _("Justification:"), wxDefaultPosition, wxDefaultSize, 0 );
		m_staticText11->Wrap( -1 );
		fgSizer1->Add( m_staticText11, 0, wxLEFT\|wxRIGHT\|wxTOP, 5 );

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

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

		wxString m_StyleCtrlChoices[] = { _("Normal"), _("Italic") };
		int m_StyleCtrlNChoices = sizeof( m_StyleCtrlChoices ) / sizeof( wxString );
		m_StyleCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_StyleCtrlNChoices, m_StyleCtrlChoices, 0 );
		m_StyleCtrl->SetSelection( 0 );
		bSizer5->Add( m_StyleCtrl, 0, wxBOTTOM\|wxEXPAND\|wxLEFT\|wxRIGHT, 5 );
		fgSizer1->Add( m_StyleCtrl, 0, wxBOTTOM\|wxEXPAND\|wxLEFT\|wxRIGHT, 5 );

		wxString m_justifyChoiceChoices[] = { _("Left"), _("Center"), _("Right") };
		int m_justifyChoiceNChoices = sizeof( m_justifyChoiceChoices ) / sizeof( wxString );
		m_justifyChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_justifyChoiceNChoices, m_justifyChoiceChoices, 0 );
		m_justifyChoice->SetSelection( 0 );
		fgSizer1->Add( m_justifyChoice, 0, wxBOTTOM\|wxEXPAND\|wxLEFT\|wxRIGHT, 5 );

		bSizerLower->Add( bSizer5, 0, wxEXPAND, 5 );
		m_ThicknessLabel = new wxStaticText( this, wxID_ANY, _("Thickness"), wxDefaultPosition, wxDefaultSize, 0 );
		m_ThicknessLabel->Wrap( -1 );
		fgSizer1->Add( m_ThicknessLabel, 0, wxLEFT\|wxRIGHT\|wxTOP, 5 );

		wxBoxSizer* bSizer6;
		bSizer6 = new wxBoxSizer( wxVERTICAL );
		m_orientationLabel = new wxStaticText( this, wxID_ANY, _("Orientation (0.1 deg):"), wxDefaultPosition, wxDefaultSize, 0 );
		m_orientationLabel->Wrap( -1 );
		fgSizer1->Add( m_orientationLabel, 0, wxLEFT\|wxRIGHT\|wxTOP, 5 );

		m_staticText10 = new wxStaticText( this, wxID_ANY, _("Display:"), wxDefaultPosition, wxDefaultSize, 0 );
		m_staticText10->Wrap( -1 );
		bSizer6->Add( m_staticText10, 0, wxLEFT\|wxRIGHT, 5 );

		wxString m_DisplayCtrlChoices[] = { _("Normal"), _("Mirrored") };
		int m_DisplayCtrlNChoices = sizeof( m_DisplayCtrlChoices ) / sizeof( wxString );
		m_DisplayCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_DisplayCtrlNChoices, m_DisplayCtrlChoices, 0 );
		m_DisplayCtrl->SetSelection( 0 );
		bSizer6->Add( m_DisplayCtrl, 0, wxBOTTOM\|wxEXPAND\|wxLEFT\|wxRIGHT, 5 );
		fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 );

		m_staticText11 = new wxStaticText( this, wxID_ANY, _("Justification:"), wxDefaultPosition, wxDefaultSize, 0 );
		m_staticText11->Wrap( -1 );
		bSizer6->Add( m_staticText11, 0, wxLEFT\|wxRIGHT, 5 );

		wxString m_justifyChoiceChoices[] = { _("Left"), _("Center"), _("Right") };
		int m_justifyChoiceNChoices = sizeof( m_justifyChoiceChoices ) / sizeof( wxString );
		m_justifyChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_justifyChoiceNChoices, m_justifyChoiceChoices, 0 );
		m_justifyChoice->SetSelection( 0 );
		bSizer6->Add( m_justifyChoice, 0, wxBOTTOM\|wxEXPAND\|wxLEFT\|wxRIGHT, 5 );
		fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 );

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

		bSizerLower->Add( bSizer6, 0, wxEXPAND, 5 );
		m_OrientationCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		fgSizer1->Add( m_OrientationCtrl, 0, wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );


		bSizer9->Add( bSizerLower, 0, wxEXPAND, 5 );
		bSizer9->Add( fgSizer1, 1, wxEXPAND, 5 );

		m_StandardSizer = new wxStdDialogButtonSizer();
		m_StandardSizerOK = new wxButton( this, wxID_OK );

pcbnew/dialogs/dialog_pcb_text_properties_base.fbp

+1738 −1830

File changed.

Preview size limit exceeded, changes collapsed.

pcbnew/dialogs/dialog_pcb_text_properties_base.h

+16 −16

Original line number	Diff line number	Diff line
		///////////////////////////////////////////////////////////////////////////
		// C++ code generated with wxFormBuilder (version Mar 19 2012)
		// C++ code generated with wxFormBuilder (version Apr 11 2012)
		// http://www.wxformbuilder.org/
		//
		// PLEASE DO "NOT" EDIT THIS FILE!
		@@ -19,8 +19,8 @@
		#include <wx/colour.h>
		#include <wx/settings.h>
		#include <wx/textctrl.h>
		#include <wx/sizer.h>
		#include <wx/choice.h>
		#include <wx/sizer.h>
		#include <wx/button.h>
		#include <wx/dialog.h>

		@@ -38,25 +38,25 @@ class DIALOG_PCB_TEXT_PROPERTIES_BASE : public DIALOG_SHIM
		wxStaticText* m_TextLabel;
		wxTextCtrl* m_TextContentCtrl;
		wxStaticText* m_SizeXLabel;
		wxTextCtrl* m_SizeXCtrl;
		wxStaticText* m_SizeYLabel;
		wxTextCtrl* m_SizeYCtrl;
		wxStaticText* m_ThicknessLabel;
		wxTextCtrl* m_ThicknessCtrl;
		wxStaticText* m_PositionXLabel;
		wxTextCtrl* m_PositionXCtrl;
		wxStaticText* m_PositionYLabel;
		wxTextCtrl* m_PositionYCtrl;
		wxStaticText* m_LayerLabel;
		wxChoice* m_LayerSelectionCtrl;
		wxStaticText* m_staticText8;
		wxChoice* m_OrientationCtrl;
		wxStaticText* m_staticText9;
		wxChoice* m_StyleCtrl;
		wxStaticText* m_staticText10;
		wxTextCtrl* m_SizeXCtrl;
		wxTextCtrl* m_PositionXCtrl;
		wxChoice* m_LayerSelectionCtrl;
		wxChoice* m_DisplayCtrl;
		wxStaticText* m_SizeYLabel;
		wxStaticText* m_PositionYLabel;
		wxStaticText* m_staticText9;
		wxStaticText* m_staticText11;
		wxTextCtrl* m_SizeYCtrl;
		wxTextCtrl* m_PositionYCtrl;
		wxChoice* m_StyleCtrl;
		wxChoice* m_justifyChoice;
		wxStaticText* m_ThicknessLabel;
		wxStaticText* m_orientationLabel;
		wxTextCtrl* m_ThicknessCtrl;
		wxTextCtrl* m_OrientationCtrl;
		wxStdDialogButtonSizer* m_StandardSizer;
		wxButton* m_StandardSizerOK;
		wxButton* m_StandardSizerCancel;
		@@ -69,7 +69,7 @@ class DIALOG_PCB_TEXT_PROPERTIES_BASE : public DIALOG_SHIM

		public:

		DIALOG_PCB_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 433,465 ), long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER\|wxSYSTEM_MENU );
		DIALOG_PCB_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 433,450 ), long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER\|wxSYSTEM_MENU );
		~DIALOG_PCB_TEXT_PROPERTIES_BASE();

		};