diff --git a/include/eda_text.h b/include/eda_text.h index cd14c46307..5a0e48ba39 100644 --- a/include/eda_text.h +++ b/include/eda_text.h @@ -135,7 +135,6 @@ public: void SetOrientation( double aOrientation ) { - NORMALIZE_ANGLE_POS( aOrientation ); m_Orient = aOrientation; } double GetOrientation() const { return m_Orient; } diff --git a/pcbnew/class_text_mod.cpp b/pcbnew/class_text_mod.cpp index 09cd57a0dd..005cefede9 100644 --- a/pcbnew/class_text_mod.cpp +++ b/pcbnew/class_text_mod.cpp @@ -340,12 +340,13 @@ double TEXTE_MODULE::GetDrawRotation() const if( module ) rotation += module->GetOrientation(); - NORMALIZE_ANGLE_POS( rotation ); - - // For angle = 0 .. 180 deg + // For angle = -90 .. 90 deg while( rotation > 900 ) rotation -= 1800; + while( rotation < -900 ) + rotation += 1800; + return rotation; } diff --git a/pcbnew/dialogs/dialog_edit_module_text.cpp b/pcbnew/dialogs/dialog_edit_module_text.cpp index 03ecc1fd52..a5346d0b37 100644 --- a/pcbnew/dialogs/dialog_edit_module_text.cpp +++ b/pcbnew/dialogs/dialog_edit_module_text.cpp @@ -159,6 +159,34 @@ void DialogEditModuleText::initDlg( ) if( !m_currentText->IsVisible() ) m_Show->SetSelection( 1 ); + bool select = false; + switch( int( m_currentText->GetOrientation() ) ) + { + case 0: + m_Orient->SetSelection( 0 ); + break; + + case 900: + case -2700: + m_Orient->SetSelection( 1 ); + break; + + case -900: + case 2700: + m_Orient->SetSelection( 2 ); + break; + + default: + m_Orient->SetSelection( 3 ); + select = true; + break; + } + + wxString msg2; + msg2 << m_currentText->GetOrientation(); + m_OrientValue->SetValue( msg2 ); + m_OrientValue->Enable( select ); + // Configure the layers list selector if( !m_parent->GetBoard()->IsLayerEnabled( m_currentText->GetLayer() ) ) // Footprints are built outside the current board, so items cann be @@ -178,6 +206,30 @@ void DialogEditModuleText::initDlg( ) } } +void DialogEditModuleText::ModuleOrientEvent( wxCommandEvent& event ) +{ + switch( m_Orient->GetSelection() ) + { + case 0: + m_OrientValue->Enable( false ); + m_OrientValue->SetValue( wxT( "0" ) ); + break; + + case 1: + m_OrientValue->Enable( false ); + m_OrientValue->SetValue( wxT( "900" ) ); + break; + + case 2: + m_OrientValue->Enable( false ); + m_OrientValue->SetValue( wxT( "-900" ) ); + break; + + default: + m_OrientValue->Enable( true ); + break; + } +} void DialogEditModuleText::OnOkClick( wxCommandEvent& event ) { @@ -239,8 +291,65 @@ void DialogEditModuleText::OnOkClick( wxCommandEvent& event ) m_currentText->SetVisible( m_Show->GetSelection() == 0 ); - int text_orient = (m_Orient->GetSelection() == 0) ? 0 : 900; - m_currentText->SetOrientation( text_orient ); + bool select = false; + switch( m_Orient->GetSelection() ) + { + case 0: + m_currentText->SetOrientation( 0 ); + break; + + case 1: + m_currentText->SetOrientation( 900 ); + break; + + case 2: + m_currentText->SetOrientation( -900 ); + break; + + default: + select = true; + long orient = 0; + msg = m_OrientValue->GetValue(); + msg.ToLong( &orient ); + m_currentText->SetOrientation( orient ); + break; + }; + + switch( int( m_currentText->GetOrientation() ) ) + { + case 0: + m_Orient->SetSelection( 0 ); + break; + + case 900: + case -2700: + m_Orient->SetSelection( 1 ); + break; + + case -900: + case 2700: + m_Orient->SetSelection( 2 ); + break; + + default: + m_Orient->SetSelection( 3 ); + long orient = 0; + msg = m_OrientValue->GetValue(); + msg.ToLong( &orient ); + + while( orient < -900 ) + orient += 1800; + + while( orient > 900 ) + orient -= 1800; + + m_currentText->SetOrientation( orient ); + select = true; + break; + } + msg << m_currentText->GetOrientation(); + m_OrientValue->SetValue( msg ); + m_OrientValue->Enable( select ); m_currentText->SetDrawCoord(); diff --git a/pcbnew/dialogs/dialog_edit_module_text.h b/pcbnew/dialogs/dialog_edit_module_text.h index 674481b891..d5a868e287 100644 --- a/pcbnew/dialogs/dialog_edit_module_text.h +++ b/pcbnew/dialogs/dialog_edit_module_text.h @@ -48,6 +48,7 @@ private: void initDlg( ); void OnOkClick( wxCommandEvent& event ); void OnCancelClick( wxCommandEvent& event ); + void ModuleOrientEvent( wxCommandEvent& event ); }; #endif /* DIALOG_EDIT_MODULE_TEXT_H */ diff --git a/pcbnew/dialogs/dialog_edit_module_text_base.cpp b/pcbnew/dialogs/dialog_edit_module_text_base.cpp index 3e074cfde6..efca3b4e10 100644 --- a/pcbnew/dialogs/dialog_edit_module_text_base.cpp +++ b/pcbnew/dialogs/dialog_edit_module_text_base.cpp @@ -1,10 +1,12 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2013) +// C++ code generated with wxFormBuilder (version Apr 1 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// +#include "class_pcb_layer_box_selector.h" + #include "dialog_edit_module_text_base.h" /////////////////////////////////////////////////////////////////////////// @@ -12,146 +14,158 @@ DialogEditModuleText_base::DialogEditModuleText_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* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - + m_ModuleInfoText = new wxStaticText( this, wxID_ANY, _("Footprint %s (%s) orientation %.1f"), wxDefaultPosition, wxDefaultSize, 0 ); m_ModuleInfoText->Wrap( -1 ); m_ModuleInfoText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - + bMainSizer->Add( m_ModuleInfoText, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); - + m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bMainSizer->Add( m_staticline1, 0, wxALL|wxEXPAND, 5 ); - + wxBoxSizer* bSizer9; bSizer9 = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizer10; bSizer10 = new wxBoxSizer( wxHORIZONTAL ); - + wxFlexGridSizer* fgSizer1; fgSizer1 = new wxFlexGridSizer( 7, 2, 0, 0 ); fgSizer1->AddGrowableCol( 1 ); - fgSizer1->SetFlexibleDirection( wxBOTH ); - fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + fgSizer1->SetFlexibleDirection( wxHORIZONTAL ); + fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL ); + m_TextDataTitle = new wxStaticText( this, wxID_ANY, _("Reference:"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextDataTitle->Wrap( -1 ); fgSizer1->Add( m_TextDataTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_Name = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_Name->SetMaxLength( 0 ); fgSizer1->Add( m_Name, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_SizeXTitle = new wxStaticText( this, wxID_ANY, _("Width"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeXTitle->Wrap( -1 ); fgSizer1->Add( m_SizeXTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_TxtSizeCtrlX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_TxtSizeCtrlX->SetMaxLength( 0 ); fgSizer1->Add( m_TxtSizeCtrlX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_SizeYTitle = new wxStaticText( this, wxID_ANY, _("Height"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeYTitle->Wrap( -1 ); fgSizer1->Add( m_SizeYTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_TxtSizeCtrlY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_TxtSizeCtrlY->SetMaxLength( 0 ); fgSizer1->Add( m_TxtSizeCtrlY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_WidthTitle = new wxStaticText( this, wxID_ANY, _("Thickness"), wxDefaultPosition, wxDefaultSize, 0 ); m_WidthTitle->Wrap( -1 ); fgSizer1->Add( m_WidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_TxtWidthCtlr = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_TxtWidthCtlr->SetMaxLength( 0 ); fgSizer1->Add( m_TxtWidthCtlr, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_PosXTitle = new wxStaticText( this, wxID_ANY, _("Offset X"), wxDefaultPosition, wxDefaultSize, 0 ); m_PosXTitle->Wrap( -1 ); fgSizer1->Add( m_PosXTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_TxtPosCtrlX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_TxtPosCtrlX->SetMaxLength( 0 ); fgSizer1->Add( m_TxtPosCtrlX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_PosYTitle = new wxStaticText( this, wxID_ANY, _("Offset Y"), wxDefaultPosition, wxDefaultSize, 0 ); m_PosYTitle->Wrap( -1 ); fgSizer1->Add( m_PosYTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_TxtPosCtrlY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - 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 ); + + 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 ); - - - bSizer9->Add( bSizer10, 0, wxEXPAND, 5 ); - - wxBoxSizer* bSizer4; - bSizer4 = new wxBoxSizer( wxHORIZONTAL ); - - wxString m_StyleChoices[] = { _("Normal"), _("Italic") }; - int m_StyleNChoices = sizeof( m_StyleChoices ) / sizeof( wxString ); - m_Style = new wxRadioBox( this, wxID_ANY, _("Style"), wxDefaultPosition, wxDefaultSize, m_StyleNChoices, m_StyleChoices, 1, wxRA_SPECIFY_COLS ); - m_Style->SetSelection( 0 ); - bSizer4->Add( m_Style, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - - wxString m_OrientChoices[] = { _("Horizontal"), _("Vertical") }; - int m_OrientNChoices = sizeof( m_OrientChoices ) / sizeof( wxString ); - m_Orient = new wxRadioBox( this, wxID_ANY, _("Orientation"), wxDefaultPosition, wxDefaultSize, m_OrientNChoices, m_OrientChoices, 1, wxRA_SPECIFY_COLS ); - m_Orient->SetSelection( 0 ); - bSizer4->Add( m_Orient, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - + + + bSizer10->Add( fgSizer1, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + + wxFlexGridSizer* fgSizer3; + fgSizer3 = new wxFlexGridSizer( 4, 1, 0, 0 ); + fgSizer3->SetFlexibleDirection( wxBOTH ); + fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL ); + + wxFlexGridSizer* fgSizer2; + fgSizer2 = new wxFlexGridSizer( 1, 2, 0, 0 ); + fgSizer2->SetFlexibleDirection( wxVERTICAL ); + fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL ); + wxString m_ShowChoices[] = { _("Visible"), _("Invisible") }; int m_ShowNChoices = sizeof( m_ShowChoices ) / sizeof( wxString ); m_Show = new wxRadioBox( this, wxID_ANY, _("Display"), wxDefaultPosition, wxDefaultSize, m_ShowNChoices, m_ShowChoices, 1, wxRA_SPECIFY_COLS ); m_Show->SetSelection( 0 ); - bSizer4->Add( m_Show, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - - - bSizer9->Add( bSizer4, 0, wxEXPAND, 5 ); - - + fgSizer2->Add( m_Show, 1, wxEXPAND|wxRIGHT, 5 ); + + wxString m_StyleChoices[] = { _("Normal"), _("Italic") }; + int m_StyleNChoices = sizeof( m_StyleChoices ) / sizeof( wxString ); + m_Style = new wxRadioBox( this, wxID_ANY, _("Style"), wxDefaultPosition, wxDefaultSize, m_StyleNChoices, m_StyleChoices, 1, wxRA_SPECIFY_COLS ); + m_Style->SetSelection( 0 ); + fgSizer2->Add( m_Style, 1, wxEXPAND|wxLEFT, 5 ); + + + fgSizer3->Add( fgSizer2, 1, wxALL|wxEXPAND, 5 ); + + wxString m_OrientChoices[] = { _("0.0"), _("+90.0"), _("-90.0"), _("Other") }; + int m_OrientNChoices = sizeof( m_OrientChoices ) / sizeof( wxString ); + m_Orient = new wxRadioBox( this, wxID_ANY, _("Orientation"), wxDefaultPosition, wxDefaultSize, m_OrientNChoices, m_OrientChoices, 1, wxRA_SPECIFY_COLS ); + m_Orient->SetSelection( 2 ); + fgSizer3->Add( m_Orient, 1, wxALL|wxEXPAND, 5 ); + + m_staticTextRotation = new wxStaticText( this, wxID_ANY, _("Rotation (in 0.1 degrees):"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextRotation->Wrap( -1 ); + fgSizer3->Add( m_staticTextRotation, 0, wxEXPAND, 5 ); + + m_OrientValue = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer3->Add( m_OrientValue, 0, wxEXPAND, 5 ); + + + bSizer10->Add( fgSizer3, 0, wxALL|wxEXPAND, 5 ); + + + bSizer9->Add( bSizer10, 0, wxEXPAND, 5 ); + + bMainSizer->Add( bSizer9, 0, wxALL|wxEXPAND, 5 ); - + m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bMainSizer->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 ); - - + + bMainSizer->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - + bMainSizer->Add( m_sdbSizer1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - - + + this->SetSizer( bMainSizer ); this->Layout(); - bMainSizer->Fit( this ); - + // Connect Events + m_Orient->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DialogEditModuleText_base::ModuleOrientEvent ), NULL, this ); m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogEditModuleText_base::OnOkClick ), NULL, this ); } DialogEditModuleText_base::~DialogEditModuleText_base() { // Disconnect Events + m_Orient->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DialogEditModuleText_base::ModuleOrientEvent ), NULL, this ); m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogEditModuleText_base::OnOkClick ), NULL, this ); - + } diff --git a/pcbnew/dialogs/dialog_edit_module_text_base.fbp b/pcbnew/dialogs/dialog_edit_module_text_base.fbp index da604b2357..a3ed7c37e1 100644 --- a/pcbnew/dialogs/dialog_edit_module_text_base.fbp +++ b/pcbnew/dialogs/dialog_edit_module_text_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -44,7 +44,7 @@ DialogEditModuleText_base - -1,-1 + 410,391 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Footprint Text Properties @@ -281,13 +281,13 @@ 1 2 - wxBOTH + wxHORIZONTAL 1 0 fgSizer1 - wxFLEX_GROWMODE_SPECIFIED + wxFLEX_GROWMODE_ALL none 7 0 @@ -1511,285 +1511,484 @@ - - - - 5 - wxEXPAND - 0 - - - bSizer4 - wxHORIZONTAL - none 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxALL|wxEXPAND 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Normal" "Italic" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Style - 1 - - 0 - - - 0 + + 1 + wxBOTH + + + 0 - 1 - m_Style - 1 - - - protected - 1 - - Resizable - 0 - 1 - - wxRA_SPECIFY_COLS - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Horizontal" "Vertical" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Orientation - 1 - - 0 - - - 0 - - 1 - m_Orient - 1 - - - protected - 1 - - Resizable - 0 - 1 - - wxRA_SPECIFY_COLS - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Visible" "Invisible" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Display - 1 - - 0 - - - 0 - - 1 - m_Show - 1 - - - protected - 1 - - Resizable - 0 - 1 - - wxRA_SPECIFY_COLS - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + fgSizer3 + wxFLEX_GROWMODE_ALL + none + 4 + 0 + + 5 + wxALL|wxEXPAND + 1 + + 2 + wxVERTICAL + + + 0 + + fgSizer2 + wxFLEX_GROWMODE_ALL + none + 1 + 0 + + 5 + wxEXPAND|wxRIGHT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Visible" "Invisible" + 1 + + 1 + 0 + Dock + 1 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Display + 1 + + 0 + + + 0 + + 1 + m_Show + 1 + + + protected + 1 + + Resizable + 0 + 1 + + wxRA_SPECIFY_COLS + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Normal" "Italic" + 1 + + 1 + 0 + Dock + 1 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Style + 1 + + 0 + + + 0 + + 1 + m_Style + 1 + + + protected + 1 + + Resizable + 0 + 1 + + wxRA_SPECIFY_COLS + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "0.0" "+90.0" "-90.0" "Other" + 1 + + 1 + 0 + Dock + 0 + Center + 1 + + 1 + + 0 + 0 + wxID_ANY + Orientation + 1 + + 0 + + + 0 + + 1 + m_Orient + 1 + + + protected + 1 + + Resizable + 2 + 1 + + wxRA_SPECIFY_COLS + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + ModuleOrientEvent + + + + + + + + + + 5 + wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Rotation (in 0.1 degrees): + + 0 + + + 0 + + 1 + m_staticTextRotation + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_OrientValue + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcbnew/dialogs/dialog_edit_module_text_base.h b/pcbnew/dialogs/dialog_edit_module_text_base.h index c8cb0606e4..a2f5704c25 100644 --- a/pcbnew/dialogs/dialog_edit_module_text_base.h +++ b/pcbnew/dialogs/dialog_edit_module_text_base.h @@ -35,7 +35,7 @@ class DialogEditModuleText_base : public DIALOG_SHIM { private: - + protected: wxStaticText* m_ModuleInfoText; wxStaticLine* m_staticline1; @@ -53,23 +53,26 @@ class DialogEditModuleText_base : public DIALOG_SHIM wxTextCtrl* m_TxtPosCtrlY; wxStaticText* m_LayerLabel; PCB_LAYER_BOX_SELECTOR* m_LayerSelectionCtrl; + wxRadioBox* m_Show; wxRadioBox* m_Style; wxRadioBox* m_Orient; - wxRadioBox* m_Show; + wxStaticText* m_staticTextRotation; + wxTextCtrl* m_OrientValue; wxStaticLine* m_staticline2; wxStdDialogButtonSizer* m_sdbSizer1; wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1Cancel; - + // Virtual event handlers, overide them in your derived class + virtual void ModuleOrientEvent( wxCommandEvent& event ) { event.Skip(); } virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - DialogEditModuleText_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DialogEditModuleText_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 410,391 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DialogEditModuleText_base(); - + }; #endif //__DIALOG_EDIT_MODULE_TEXT_BASE_H__