From cf7dbf6f94786f536a6ad5d234026305e980061c Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 18 Nov 2013 18:52:18 +0100 Subject: [PATCH] Fix some minor issues --- eeschema/dialogs/dialog_edit_label.cpp | 8 ++-- .../dialogs/dialog_lib_edit_text_base.cpp | 6 +-- .../dialogs/dialog_lib_edit_text_base.fbp | 6 ++- eeschema/dialogs/dialog_lib_edit_text_base.h | 2 +- eeschema/edit_label.cpp | 8 ++-- pcbnew/board_undo_redo.cpp | 26 +----------- pcbnew/class_mire.cpp | 10 ----- pcbnew/class_mire.h | 6 --- .../dialog_graphic_item_properties.cpp | 42 ++++++++++++------- .../dialogs/dialog_target_properties_base.cpp | 36 ++++++++-------- .../dialogs/dialog_target_properties_base.fbp | 28 +++++++------ .../dialogs/dialog_target_properties_base.h | 10 ++--- pcbnew/target_edit.cpp | 12 +++--- 13 files changed, 90 insertions(+), 110 deletions(-) diff --git a/eeschema/dialogs/dialog_edit_label.cpp b/eeschema/dialogs/dialog_edit_label.cpp index addeb7cee6..fb1805e298 100644 --- a/eeschema/dialogs/dialog_edit_label.cpp +++ b/eeschema/dialogs/dialog_edit_label.cpp @@ -1,9 +1,9 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2008 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com - * Copyright (C) 2011 Wayne Stambaugh - * Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr + * Copyright (C) 2013 Wayne Stambaugh + * Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -295,7 +295,7 @@ void DIALOG_LABEL_EDITOR::TextPropertiesAccept( wxCommandEvent& aEvent ) m_Parent->OnModify(); - /* Make the text size as new default size if it is a new text */ + // Make the text size the new default size ( if it is a new text ): if( m_CurrentText->IsNew() ) m_Parent->SetDefaultLabelSize( m_CurrentText->GetSize().x ); diff --git a/eeschema/dialogs/dialog_lib_edit_text_base.cpp b/eeschema/dialogs/dialog_lib_edit_text_base.cpp index 14cf94f803..89ab85728e 100644 --- a/eeschema/dialogs/dialog_lib_edit_text_base.cpp +++ b/eeschema/dialogs/dialog_lib_edit_text_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Nov 6 2013) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -93,8 +93,8 @@ DIALOG_LIB_EDIT_TEXT_BASE::DIALOG_LIB_EDIT_TEXT_BASE( wxWindow* parent, wxWindow wxString m_TextVJustificationOptChoices[] = { _("Align bottom"), _("Align center"), _("Align top") }; int m_TextVJustificationOptNChoices = sizeof( m_TextVJustificationOptChoices ) / sizeof( wxString ); - m_TextVJustificationOpt = new wxRadioBox( this, wxID_ANY, _("Verticle Justify"), wxDefaultPosition, wxDefaultSize, m_TextVJustificationOptNChoices, m_TextVJustificationOptChoices, 1, wxRA_SPECIFY_COLS ); - m_TextVJustificationOpt->SetSelection( 1 ); + m_TextVJustificationOpt = new wxRadioBox( this, wxID_ANY, _("Vertical Justify"), wxDefaultPosition, wxDefaultSize, m_TextVJustificationOptNChoices, m_TextVJustificationOptChoices, 1, wxRA_SPECIFY_COLS ); + m_TextVJustificationOpt->SetSelection( 0 ); bBottomtBoxSizer->Add( m_TextVJustificationOpt, 1, wxALL|wxEXPAND, 5 ); diff --git a/eeschema/dialogs/dialog_lib_edit_text_base.fbp b/eeschema/dialogs/dialog_lib_edit_text_base.fbp index 4cb52473d6..0e2b8746db 100644 --- a/eeschema/dialogs/dialog_lib_edit_text_base.fbp +++ b/eeschema/dialogs/dialog_lib_edit_text_base.fbp @@ -20,8 +20,10 @@ . 1 + 1 1 1 + UI 1 0 @@ -1150,7 +1152,7 @@ 0 0 wxID_ANY - Verticle Justify + Vertical Justify 1 0 @@ -1167,7 +1169,7 @@ 1 Resizable - 1 + 0 1 wxRA_SPECIFY_COLS diff --git a/eeschema/dialogs/dialog_lib_edit_text_base.h b/eeschema/dialogs/dialog_lib_edit_text_base.h index fe68b8be27..3cafc4f1f4 100644 --- a/eeschema/dialogs/dialog_lib_edit_text_base.h +++ b/eeschema/dialogs/dialog_lib_edit_text_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Nov 6 2013) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/eeschema/edit_label.cpp b/eeschema/edit_label.cpp index 07f466af74..0a6f87fbcd 100644 --- a/eeschema/edit_label.cpp +++ b/eeschema/edit_label.cpp @@ -1,8 +1,8 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com - * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr + * Copyright (C) 2004-2013 KiCad Developers, see change_log.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -105,7 +105,6 @@ SCH_TEXT* SCH_EDIT_FRAME::CreateNewText( wxDC* aDC, int aType ) textItem->SetSize( wxSize( GetDefaultLabelSize(), GetDefaultLabelSize() ) ); textItem->SetFlags( IS_NEW | IS_MOVED ); - textItem->Draw( m_canvas, aDC, wxPoint( 0, 0 ), g_XorMode ); EditSchematicText( textItem ); if( textItem->GetText().IsEmpty() ) @@ -123,7 +122,8 @@ SCH_TEXT* SCH_EDIT_FRAME::CreateNewText( wxDC* aDC, int aType ) lastGlobalLabelShape = textItem->GetShape(); } - textItem->Draw( m_canvas, aDC, wxPoint( 0, 0 ), GR_DEFAULT_DRAWMODE ); + // Prepare display to move the new item + textItem->Draw( m_canvas, aDC, wxPoint( 0, 0 ), g_XorMode ); MoveItem( (SCH_ITEM*) textItem, aDC ); return textItem; diff --git a/pcbnew/board_undo_redo.cpp b/pcbnew/board_undo_redo.cpp index 58a39e8aa6..2eb67aed38 100644 --- a/pcbnew/board_undo_redo.cpp +++ b/pcbnew/board_undo_redo.cpp @@ -181,17 +181,6 @@ void SwapData( BOARD_ITEM* aItem, BOARD_ITEM* aImage ) return; } - // Swap layers: - if( aItem->Type() != PCB_MODULE_T && aItem->Type() != PCB_ZONE_AREA_T ) - { - // These items have a global swap function. - LAYER_NUM layer, layerimg; - layer = aItem->GetLayer(); - layerimg = aImage->GetLayer(); - aItem->SetLayer( layerimg ); - aImage->SetLayer( layer ); - } - switch( aItem->Type() ) { case PCB_MODULE_T: @@ -213,18 +202,7 @@ void SwapData( BOARD_ITEM* aItem, BOARD_ITEM* aImage ) break; case PCB_LINE_T: -#if 0 - EXCHG( ( (DRAWSEGMENT*) aItem )->m_Start, ( (DRAWSEGMENT*) aImage )->m_Start ); - EXCHG( ( (DRAWSEGMENT*) aItem )->m_End, ( (DRAWSEGMENT*) aImage )->m_End ); - EXCHG( ( (DRAWSEGMENT*) aItem )->m_Width, ( (DRAWSEGMENT*) aImage )->m_Width ); - EXCHG( ( (DRAWSEGMENT*) aItem )->m_Shape, ( (DRAWSEGMENT*) aImage )->m_Shape ); -#else - { - DRAWSEGMENT tmp = *(DRAWSEGMENT*) aImage; - *aImage = *aItem; - *aItem = tmp; - } -#endif + std::swap( *((DRAWSEGMENT*)aItem), *((DRAWSEGMENT*)aImage) ); break; case PCB_TRACE_T: @@ -277,7 +255,7 @@ void SwapData( BOARD_ITEM* aItem, BOARD_ITEM* aImage ) break; case PCB_TARGET_T: - ( (PCB_TARGET*) aItem )->Exchg( (PCB_TARGET*) aImage ); + std::swap( *((PCB_TARGET*)aItem), *((PCB_TARGET*)aImage) ); break; case PCB_DIMENSION_T: diff --git a/pcbnew/class_mire.cpp b/pcbnew/class_mire.cpp index f03413cd4b..d2c6845b94 100644 --- a/pcbnew/class_mire.cpp +++ b/pcbnew/class_mire.cpp @@ -71,16 +71,6 @@ PCB_TARGET::~PCB_TARGET() { } - -void PCB_TARGET::Exchg( PCB_TARGET* source ) -{ - EXCHG( m_Pos, source->m_Pos ); - EXCHG( m_Width, source->m_Width ); - EXCHG( m_Size, source->m_Size ); - EXCHG( m_Shape, source->m_Shape ); -} - - void PCB_TARGET::Copy( PCB_TARGET* source ) { m_Layer = source->m_Layer; diff --git a/pcbnew/class_mire.h b/pcbnew/class_mire.h index 8d6f240db5..fe5ab536f6 100644 --- a/pcbnew/class_mire.h +++ b/pcbnew/class_mire.h @@ -71,12 +71,6 @@ public: void SetWidth( int aWidth ) { m_Width = aWidth; } int GetWidth() const { return m_Width; } - /** - * Function Exchg - * swaps data with another PCB_TARGET for use by undo-redo. - */ - void Exchg( PCB_TARGET* aTarget ); - void Move( const wxPoint& aMoveVector ) { m_Pos += aMoveVector; diff --git a/pcbnew/dialogs/dialog_graphic_item_properties.cpp b/pcbnew/dialogs/dialog_graphic_item_properties.cpp index 561c29fa2a..86d75949ac 100644 --- a/pcbnew/dialogs/dialog_graphic_item_properties.cpp +++ b/pcbnew/dialogs/dialog_graphic_item_properties.cpp @@ -1,6 +1,28 @@ -/**************************************/ -/* dialog_graphic_item_properties.cpp */ -/**************************************/ +/** + * @file dialog_graphic_item_properties.cpp + */ +/* + * This program source code file is part of KiCad, a free EDA CAD application. + * + * Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors. + * + * 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 Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, you may find one here: + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * or you may search the http://www.gnu.org website for the version 2 license, + * or you may write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ /* Edit parameters values of graphic items type DRAWSEGMENTS: * Lines @@ -41,7 +63,7 @@ public: private: void initDlg( ); void OnOkClick( wxCommandEvent& event ); - void OnCancelClick( wxCommandEvent& event ); + void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } void OnLayerChoice( wxCommandEvent& event ); }; @@ -71,9 +93,8 @@ void PCB_EDIT_FRAME::InstallGraphicItemPropertiesDialog(DRAWSEGMENT * aItem, wxD } m_canvas->SetIgnoreMouseEvents( true ); - DIALOG_GRAPHIC_ITEM_PROPERTIES* dialog = new DIALOG_GRAPHIC_ITEM_PROPERTIES( this, aItem, aDC ); - dialog->ShowModal(); - dialog->Destroy(); + DIALOG_GRAPHIC_ITEM_PROPERTIES dlg( this, aItem, aDC ); + dlg.ShowModal(); m_canvas->MoveCursorToCrossHair(); m_canvas->SetIgnoreMouseEvents( false ); } @@ -85,7 +106,6 @@ void DIALOG_GRAPHIC_ITEM_PROPERTIES::initDlg( ) * according to the item parameters values */ { - SetFocus(); m_StandardButtonsSizerOK->SetDefault(); // Set unit symbol @@ -246,9 +266,3 @@ void DIALOG_GRAPHIC_ITEM_PROPERTIES::OnOkClick( wxCommandEvent& event ) Close( true ); } - -void DIALOG_GRAPHIC_ITEM_PROPERTIES::OnCancelClick( wxCommandEvent& event ) -{ - event.Skip(); -} - diff --git a/pcbnew/dialogs/dialog_target_properties_base.cpp b/pcbnew/dialogs/dialog_target_properties_base.cpp index 4027e64c0c..24e12b6ffb 100644 --- a/pcbnew/dialogs/dialog_target_properties_base.cpp +++ b/pcbnew/dialogs/dialog_target_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Nov 6 2013) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -27,38 +27,38 @@ TARGET_PROPERTIES_DIALOG_EDITOR_BASE::TARGET_PROPERTIES_DIALOG_EDITOR_BASE( wxWi m_staticTextSize = new wxStaticText( this, wxID_ANY, wxT("Size"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextSize->Wrap( -1 ); - fgSizer->Add( m_staticTextSize, 0, wxALL, 5 ); + fgSizer->Add( m_staticTextSize, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - m_MireWidthCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer->Add( m_MireWidthCtrl, 0, wxALL|wxEXPAND, 5 ); + m_TargetSizeCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer->Add( m_TargetSizeCtrl, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_staticTextSizeUnits = new wxStaticText( this, wxID_ANY, wxT("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextSizeUnits->Wrap( -1 ); - fgSizer->Add( m_staticTextSizeUnits, 0, wxALL, 5 ); + fgSizer->Add( m_staticTextSizeUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); m_staticTextThickness = new wxStaticText( this, wxID_ANY, wxT("Thickness"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextThickness->Wrap( -1 ); - fgSizer->Add( m_staticTextThickness, 0, wxALL, 5 ); + fgSizer->Add( m_staticTextThickness, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - m_MireSizeCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer->Add( m_MireSizeCtrl, 0, wxALL|wxEXPAND, 5 ); + m_TargetThicknessCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer->Add( m_TargetThicknessCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_staticTextThicknessUnits = new wxStaticText( this, wxID_ANY, wxT("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextThicknessUnits->Wrap( -1 ); - fgSizer->Add( m_staticTextThicknessUnits, 0, wxALL, 5 ); + fgSizer->Add( m_staticTextThicknessUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); m_staticTextShape = new wxStaticText( this, wxID_ANY, wxT("Shape"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextShape->Wrap( -1 ); - fgSizer->Add( m_staticTextShape, 0, wxALL, 5 ); + fgSizer->Add( m_staticTextShape, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - wxString m_MireShapeChoices[] = { wxT("+"), wxT("X") }; - int m_MireShapeNChoices = sizeof( m_MireShapeChoices ) / sizeof( wxString ); - m_MireShape = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_MireShapeNChoices, m_MireShapeChoices, 0 ); - m_MireShape->SetSelection( 0 ); - fgSizer->Add( m_MireShape, 0, wxALL|wxEXPAND, 5 ); + wxString m_TargetShapeChoices[] = { wxT("+"), wxT("X") }; + int m_TargetShapeNChoices = sizeof( m_TargetShapeChoices ) / sizeof( wxString ); + m_TargetShape = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_TargetShapeNChoices, m_TargetShapeChoices, 0 ); + m_TargetShape->SetSelection( 0 ); + fgSizer->Add( m_TargetShape, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); - fgSizer->Add( 0, 0, 1, wxEXPAND, 5 ); + fgSizer->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); bSizerUpper->Add( fgSizer, 1, wxEXPAND, 5 ); @@ -66,8 +66,8 @@ TARGET_PROPERTIES_DIALOG_EDITOR_BASE::TARGET_PROPERTIES_DIALOG_EDITOR_BASE( wxWi bSizerMain->Add( bSizerUpper, 1, wxEXPAND, 5 ); - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizerMain->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); + m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + bSizerMain->Add( m_staticline, 0, wxEXPAND | wxALL, 5 ); m_sdbSizerButts = new wxStdDialogButtonSizer(); m_sdbSizerButtsOK = new wxButton( this, wxID_OK ); diff --git a/pcbnew/dialogs/dialog_target_properties_base.fbp b/pcbnew/dialogs/dialog_target_properties_base.fbp index e10ec98e5b..a60d8751bc 100644 --- a/pcbnew/dialogs/dialog_target_properties_base.fbp +++ b/pcbnew/dialogs/dialog_target_properties_base.fbp @@ -20,8 +20,10 @@ . 1 + 1 1 1 + UI 0 0 @@ -118,7 +120,7 @@ 0 5 - wxALL + wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -201,7 +203,7 @@ 5 - wxALL|wxEXPAND + wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL 0 1 @@ -239,7 +241,7 @@ 0 1 - m_MireWidthCtrl + m_TargetSizeCtrl 1 @@ -292,7 +294,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT 0 1 @@ -375,7 +377,7 @@ 5 - wxALL + wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -458,7 +460,7 @@ 5 - wxALL|wxEXPAND + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -496,7 +498,7 @@ 0 1 - m_MireSizeCtrl + m_TargetThicknessCtrl 1 @@ -549,7 +551,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT 0 1 @@ -632,7 +634,7 @@ 5 - wxALL + wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -715,7 +717,7 @@ 5 - wxALL|wxEXPAND + wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL 0 1 @@ -753,7 +755,7 @@ 0 1 - m_MireShape + m_TargetShape 1 @@ -803,7 +805,7 @@ 5 - wxEXPAND + wxEXPAND|wxALIGN_CENTER_VERTICAL 1 0 @@ -854,7 +856,7 @@ 0 1 - m_staticline1 + m_staticline 1 diff --git a/pcbnew/dialogs/dialog_target_properties_base.h b/pcbnew/dialogs/dialog_target_properties_base.h index e8a815dd7a..d4a6d05391 100644 --- a/pcbnew/dialogs/dialog_target_properties_base.h +++ b/pcbnew/dialogs/dialog_target_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Nov 6 2013) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -38,14 +38,14 @@ class TARGET_PROPERTIES_DIALOG_EDITOR_BASE : public DIALOG_SHIM protected: wxStaticText* m_staticTextSize; - wxTextCtrl* m_MireWidthCtrl; + wxTextCtrl* m_TargetSizeCtrl; wxStaticText* m_staticTextSizeUnits; wxStaticText* m_staticTextThickness; - wxTextCtrl* m_MireSizeCtrl; + wxTextCtrl* m_TargetThicknessCtrl; wxStaticText* m_staticTextThicknessUnits; wxStaticText* m_staticTextShape; - wxChoice* m_MireShape; - wxStaticLine* m_staticline1; + wxChoice* m_TargetShape; + wxStaticLine* m_staticline; wxStdDialogButtonSizer* m_sdbSizerButts; wxButton* m_sdbSizerButtsOK; wxButton* m_sdbSizerButtsCancel; diff --git a/pcbnew/target_edit.cpp b/pcbnew/target_edit.cpp index ed31e1dfc8..0e752bc7ab 100644 --- a/pcbnew/target_edit.cpp +++ b/pcbnew/target_edit.cpp @@ -100,14 +100,14 @@ TARGET_PROPERTIES_DIALOG_EDITOR::TARGET_PROPERTIES_DIALOG_EDITOR( PCB_EDIT_FRAME // Size: m_staticTextSizeUnits->SetLabel( GetUnitsLabel( g_UserUnit ) ); - m_MireSizeCtrl->SetValue( ReturnStringFromValue( g_UserUnit, m_Target->GetSize() ) ); + m_TargetSizeCtrl->SetValue( ReturnStringFromValue( g_UserUnit, m_Target->GetSize() ) ); // Thickness: m_staticTextThicknessUnits->SetLabel( GetUnitsLabel( g_UserUnit ) ); - m_MireWidthCtrl->SetValue( ReturnStringFromValue( g_UserUnit, m_Target->GetWidth() ) ); + m_TargetThicknessCtrl->SetValue( ReturnStringFromValue( g_UserUnit, m_Target->GetWidth() ) ); // Shape - m_MireShape->SetSelection( m_Target->GetShape() ? 1 : 0 ); + m_TargetShape->SetSelection( m_Target->GetShape() ? 1 : 0 ); GetSizer()->Fit( this ); GetSizer()->SetSizeHints( this ); @@ -135,13 +135,13 @@ void TARGET_PROPERTIES_DIALOG_EDITOR::OnOkClick( wxCommandEvent& event ) m_Target->SetFlags( IN_EDIT ); // set flag in edit to force // undo/redo/abort proper operation - int tmp = ReturnValueFromString( g_UserUnit, m_MireWidthCtrl->GetValue() ); + int tmp = ReturnValueFromString( g_UserUnit, m_TargetThicknessCtrl->GetValue() ); m_Target->SetWidth( tmp ); - MireDefaultSize = ReturnValueFromString( g_UserUnit, m_MireSizeCtrl->GetValue() ); + MireDefaultSize = ReturnValueFromString( g_UserUnit, m_TargetSizeCtrl->GetValue() ); m_Target->SetSize( MireDefaultSize ); - m_Target->SetShape( m_MireShape->GetSelection() ? 1 : 0 ); + m_Target->SetShape( m_TargetShape->GetSelection() ? 1 : 0 ); m_Target->Draw( m_Parent->GetCanvas(), m_DC, ( m_Target->IsMoving() ) ? GR_XOR : GR_OR );