Browse Source
Combine PCBnew and ModEdit Graphic Item Properties dialogs.
Combine PCBnew and ModEdit Graphic Item Properties dialogs.
Also UNIT_BINDERizes the result. (cherry picked from commit edd3b25)pull/17/head
15 changed files with 234 additions and 1059 deletions
-
1pcbnew/CMakeLists.txt
-
4pcbnew/dialogs/dialog_SVG_print.cpp
-
12pcbnew/dialogs/dialog_design_rules.cpp
-
255pcbnew/dialogs/dialog_graphic_item_properties.cpp
-
125pcbnew/dialogs/dialog_graphic_item_properties_base.cpp
-
430pcbnew/dialogs/dialog_graphic_item_properties_base.fbp
-
48pcbnew/dialogs/dialog_graphic_item_properties_base.h
-
389pcbnew/dialogs/dialog_graphic_item_properties_for_fp_editor.cpp
-
9pcbnew/edit.cpp
-
7pcbnew/footprint_edit_frame.h
-
4pcbnew/footprint_editor_onclick.cpp
-
4pcbnew/footprint_editor_utils.cpp
-
2pcbnew/onleftclick.cpp
-
2pcbnew/pcb_base_edit_frame.h
-
1pcbnew/pcb_edit_frame.h
@ -1,389 +0,0 @@ |
|||
/*
|
|||
* This program source code file is part of KiCad, a free EDA CAD application. |
|||
* |
|||
* Copyright (C) 2012-2018 Jean-Pierre Charras, jp.charras at wanadoo.fr |
|||
* Copyright (C) 1992-2018 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 |
|||
*/ |
|||
|
|||
/**
|
|||
* @file dialog_graphic_item_properties_for_fp_editor.cpp |
|||
*/ |
|||
|
|||
/* Edit parameters values of graphic items in a footprint body:
|
|||
* Lines |
|||
* Circles |
|||
* Arcs |
|||
* used as graphic elements found on non copper layers in boards |
|||
* Footprint texts are not graphic items and are not handled here |
|||
*/ |
|||
#include <fctsys.h>
|
|||
#include <macros.h>
|
|||
#include <confirm.h>
|
|||
#include <class_drawpanel.h>
|
|||
#include <pcbnew.h>
|
|||
#include <pcb_edit_frame.h>
|
|||
#include <board_design_settings.h>
|
|||
#include <footprint_edit_frame.h>
|
|||
#include <base_units.h>
|
|||
#include <wx/valnum.h>
|
|||
#include <board_commit.h>
|
|||
|
|||
#include <class_board.h>
|
|||
#include <class_module.h>
|
|||
#include <class_edge_mod.h>
|
|||
|
|||
#include <dialog_graphic_item_properties_base.h>
|
|||
#include <pcb_layer_box_selector.h>
|
|||
#include <html_messagebox.h>
|
|||
#include <widgets/text_ctrl_eval.h>
|
|||
|
|||
class DIALOG_MODEDIT_FP_BODY_ITEM_PROPERTIES : public DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE |
|||
{ |
|||
private: |
|||
FOOTPRINT_EDIT_FRAME* m_parent; |
|||
EDGE_MODULE* m_item; |
|||
BOARD_DESIGN_SETTINGS m_brdSettings; |
|||
MODULE* m_module; |
|||
|
|||
wxFloatingPointValidator<double> m_AngleValidator; |
|||
double m_AngleValue; |
|||
|
|||
public: |
|||
DIALOG_MODEDIT_FP_BODY_ITEM_PROPERTIES( FOOTPRINT_EDIT_FRAME* aParent, |
|||
EDGE_MODULE* aItem ); |
|||
~DIALOG_MODEDIT_FP_BODY_ITEM_PROPERTIES() {}; |
|||
|
|||
private: |
|||
bool TransferDataToWindow() override; |
|||
bool TransferDataFromWindow() override; |
|||
void OnLayerChoice( wxCommandEvent& event ); |
|||
|
|||
void OnInitDlg( wxInitDialogEvent& event ) override |
|||
{ |
|||
// Call the default wxDialog handler of a wxInitDialogEvent
|
|||
TransferDataToWindow(); |
|||
|
|||
// Now all widgets have the size fixed, call FinishDialogSettings
|
|||
FinishDialogSettings(); |
|||
} |
|||
|
|||
bool Validate() override; |
|||
}; |
|||
|
|||
DIALOG_MODEDIT_FP_BODY_ITEM_PROPERTIES::DIALOG_MODEDIT_FP_BODY_ITEM_PROPERTIES( |
|||
FOOTPRINT_EDIT_FRAME* aParent, |
|||
EDGE_MODULE * aItem ): |
|||
DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( aParent ), |
|||
m_AngleValidator( 1, &m_AngleValue ), |
|||
m_AngleValue( 0.0 ) |
|||
{ |
|||
m_parent = aParent; |
|||
m_item = aItem; |
|||
m_brdSettings = m_parent->GetDesignSettings(); |
|||
m_module = m_parent->GetBoard()->m_Modules; |
|||
|
|||
m_AngleValidator.SetRange( -360.0, 360.0 ); |
|||
m_AngleCtrl->SetValidator( m_AngleValidator ); |
|||
m_AngleValidator.SetWindow( m_AngleCtrl ); |
|||
|
|||
SetFocus(); |
|||
m_StandardButtonsSizerOK->SetDefault(); |
|||
|
|||
Layout(); |
|||
GetSizer()->SetSizeHints( this ); |
|||
Centre(); |
|||
} |
|||
|
|||
|
|||
/*
|
|||
* Dialog to edit a graphic item of a footprint body. |
|||
*/ |
|||
void FOOTPRINT_EDIT_FRAME::InstallFootprintBodyItemPropertiesDlg( EDGE_MODULE* aItem ) |
|||
{ |
|||
if( aItem == NULL ) |
|||
{ |
|||
wxMessageBox( wxT( "InstallGraphicItemPropertiesDialog() error: NULL item" ) ); |
|||
return; |
|||
} |
|||
|
|||
m_canvas->SetIgnoreMouseEvents( true ); |
|||
DIALOG_MODEDIT_FP_BODY_ITEM_PROPERTIES* dialog = |
|||
new DIALOG_MODEDIT_FP_BODY_ITEM_PROPERTIES( this, aItem ); |
|||
dialog->ShowModal(); |
|||
dialog->Destroy(); |
|||
m_canvas->MoveCursorToCrossHair(); |
|||
m_canvas->SetIgnoreMouseEvents( false ); |
|||
} |
|||
|
|||
|
|||
bool DIALOG_MODEDIT_FP_BODY_ITEM_PROPERTIES::TransferDataToWindow() |
|||
{ |
|||
// Set unit symbol
|
|||
wxStaticText* texts_unit[] = |
|||
{ |
|||
m_StartPointXUnit, |
|||
m_StartPointYUnit, |
|||
m_EndPointXUnit, |
|||
m_EndPointYUnit, |
|||
m_ThicknessTextUnit, |
|||
m_DefaulThicknessTextUnit, |
|||
}; |
|||
|
|||
for( size_t ii = 0; ii < DIM( texts_unit ); ii++ ) |
|||
{ |
|||
texts_unit[ii]->SetLabel( GetAbbreviatedUnitsLabel() ); |
|||
} |
|||
|
|||
// Only an arc has a angle parameter. So do not show this parameter for other shapes
|
|||
if( m_item->GetShape() != S_ARC ) |
|||
{ |
|||
m_AngleText->Show( false ); |
|||
m_AngleCtrl->Show( false ); |
|||
m_AngleUnit->Show( false ); |
|||
} |
|||
|
|||
wxString msg; |
|||
|
|||
// Change texts according to the segment shape:
|
|||
switch( m_item->GetShape() ) |
|||
{ |
|||
case S_CIRCLE: |
|||
SetTitle( _( "Circle Properties" ) ); |
|||
m_StartPointXLabel->SetLabel( _( "Center X:" ) ); |
|||
m_StartPointYLabel->SetLabel( _( "Center Y:" ) ); |
|||
m_EndPointXLabel->SetLabel( _( "Radius:" ) ); |
|||
m_EndPointYLabel->Show( false ); |
|||
m_EndPointYUnit->Show( false ); |
|||
m_EndY_Ctrl->Show( false ); |
|||
break; |
|||
|
|||
case S_ARC: |
|||
SetTitle( _( "Arc Properties" ) ); |
|||
m_StartPointXLabel->SetLabel( _( "Center X:" ) ); |
|||
m_StartPointYLabel->SetLabel( _( "Center Y:" ) ); |
|||
m_EndPointXLabel->SetLabel( _( "Start Point X:" ) ); |
|||
m_EndPointYLabel->SetLabel( _( "Start Point Y:" ) ); |
|||
|
|||
m_AngleValue = m_item->GetAngle() / 10.0; |
|||
break; |
|||
|
|||
case S_POLYGON: |
|||
SetTitle( _( "Polygon Properties" ) ); |
|||
m_fgUpperLeftGridSizer->Show( false ); |
|||
break; |
|||
|
|||
case S_SEGMENT: |
|||
SetTitle( _( "Line Segment Properties" ) ); |
|||
break; |
|||
|
|||
default: |
|||
break; |
|||
} |
|||
|
|||
PutValueInLocalUnits( *m_Center_StartXCtrl, m_item->GetStart().x ); |
|||
|
|||
PutValueInLocalUnits( *m_Center_StartYCtrl, m_item->GetStart().y ); |
|||
|
|||
if( m_item->GetShape() == S_CIRCLE ) |
|||
{ |
|||
PutValueInLocalUnits( *m_EndX_Radius_Ctrl, m_item->GetRadius() ); |
|||
} |
|||
else |
|||
{ |
|||
PutValueInLocalUnits( *m_EndX_Radius_Ctrl, m_item->GetEnd().x ); |
|||
PutValueInLocalUnits( *m_EndY_Ctrl, m_item->GetEnd().y ); |
|||
} |
|||
|
|||
PutValueInLocalUnits( *m_ThicknessCtrl, m_item->GetWidth() ); |
|||
|
|||
PutValueInLocalUnits( *m_DefaultThicknessCtrl, m_brdSettings.m_ModuleSegmentWidth ); |
|||
|
|||
// Configure the layers list selector
|
|||
m_LayerSelectionCtrl->SetLayersHotkeys( false ); |
|||
m_LayerSelectionCtrl->SetNotAllowedLayerSet( LSET::InternalCuMask().set( Edge_Cuts ) ); |
|||
m_LayerSelectionCtrl->SetBoardFrame( m_parent ); |
|||
m_LayerSelectionCtrl->Resync(); |
|||
|
|||
if( m_LayerSelectionCtrl->SetLayerSelection( m_item->GetLayer() ) < 0 ) |
|||
{ |
|||
wxMessageBox( _( "This item was on an unknown layer.\n" |
|||
"It has been moved to the front silk screen layer. Please fix it." ) ); |
|||
m_LayerSelectionCtrl->SetLayerSelection( F_SilkS ); |
|||
} |
|||
|
|||
return DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::TransferDataToWindow(); |
|||
} |
|||
|
|||
|
|||
void DIALOG_MODEDIT_FP_BODY_ITEM_PROPERTIES::OnLayerChoice( wxCommandEvent& event ) |
|||
{ |
|||
} |
|||
|
|||
|
|||
bool DIALOG_MODEDIT_FP_BODY_ITEM_PROPERTIES::TransferDataFromWindow() |
|||
{ |
|||
BOARD_COMMIT commit( m_parent ); |
|||
commit.Modify( m_module ); |
|||
|
|||
if( !DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::TransferDataFromWindow() ) |
|||
return false; |
|||
|
|||
LAYER_NUM layer = m_LayerSelectionCtrl->GetLayerSelection(); |
|||
|
|||
if( IsCopperLayer( layer ) ) |
|||
{ |
|||
// An graphic item is put on a copper layer.
|
|||
// This is sometimes useful, for instance for microwave applications ans net tees.
|
|||
// Because the DRC does not handle graphic items, it can break boards.
|
|||
// Therefore a confirmation is requested
|
|||
if( !IsOK( this, |
|||
_( "The graphic item will be on a copper layer.\n" |
|||
"This is very dangerous because DRC does not handle it.\n" |
|||
"Are you sure?" ) ) ) |
|||
return false; |
|||
} |
|||
|
|||
wxString msg; |
|||
wxPoint coord; |
|||
|
|||
msg = m_Center_StartXCtrl->GetValue(); |
|||
coord.x = ValueFromString( g_UserUnit, msg ); |
|||
msg = m_Center_StartYCtrl->GetValue(); |
|||
coord.y = ValueFromString( g_UserUnit, msg ); |
|||
m_item->SetStart( coord ); |
|||
m_item->SetStart0( coord ); |
|||
|
|||
if( m_item->GetShape() == S_CIRCLE ) |
|||
{ |
|||
msg = m_EndX_Radius_Ctrl->GetValue(); |
|||
m_item->SetEnd( coord + wxPoint( ValueFromString( g_UserUnit, msg ), 0 ) ); |
|||
m_item->SetEnd0( m_item->GetEnd() ); |
|||
} |
|||
else |
|||
{ |
|||
msg = m_EndX_Radius_Ctrl->GetValue(); |
|||
coord.x = ValueFromString( g_UserUnit, msg ); |
|||
msg = m_EndY_Ctrl->GetValue(); |
|||
coord.y = ValueFromString( g_UserUnit, msg ); |
|||
m_item->SetEnd( coord ); |
|||
m_item->SetEnd0( coord ); |
|||
} |
|||
|
|||
msg = m_ThicknessCtrl->GetValue(); |
|||
m_item->SetWidth( ValueFromString( g_UserUnit, msg ) ); |
|||
|
|||
msg = m_DefaultThicknessCtrl->GetValue(); |
|||
int thickness = ValueFromString( g_UserUnit, msg ); |
|||
m_brdSettings.m_ModuleSegmentWidth = thickness; |
|||
m_parent->SetDesignSettings( m_brdSettings ); |
|||
m_parent->OnModify(); |
|||
|
|||
m_item->SetLayer( ToLAYER_ID( layer ) ); |
|||
|
|||
if( m_item->GetShape() == S_ARC ) |
|||
{ |
|||
m_item->SetAngle( m_AngleValue * 10.0 ); |
|||
} |
|||
|
|||
commit.Push( "Modify footprint graphic item" ); |
|||
|
|||
m_parent->SetMsgPanel( m_item ); |
|||
|
|||
return true; |
|||
} |
|||
|
|||
|
|||
bool DIALOG_MODEDIT_FP_BODY_ITEM_PROPERTIES::Validate() |
|||
{ |
|||
wxArrayString error_msgs; |
|||
|
|||
if( !DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::Validate() ) |
|||
return false; |
|||
|
|||
// Load the start and end points -- all types use these in the checks.
|
|||
int startx = ValueFromString( g_UserUnit, m_Center_StartXCtrl->GetValue() ); |
|||
int starty = ValueFromString( g_UserUnit, m_Center_StartYCtrl->GetValue() ); |
|||
int endx = ValueFromString( g_UserUnit, m_EndX_Radius_Ctrl->GetValue() ); |
|||
int endy = ValueFromString( g_UserUnit, m_EndY_Ctrl->GetValue() ); |
|||
|
|||
// Type specific checks.
|
|||
switch( m_item->GetShape() ) |
|||
{ |
|||
case S_ARC: |
|||
// Check angle of arc.
|
|||
double angle; |
|||
m_AngleCtrl->GetValue().ToDouble( &angle ); |
|||
|
|||
if( angle == 0.0 ) |
|||
{ |
|||
error_msgs.Add( _( "The arc angle cannot be zero." ) ); |
|||
} |
|||
|
|||
// Fall through.
|
|||
case S_CIRCLE: |
|||
// Check radius.
|
|||
if( (startx == endx) && (starty == endy) ) |
|||
{ |
|||
error_msgs.Add( _( "The radius must be greater than zero." ) ); |
|||
} |
|||
|
|||
break; |
|||
|
|||
case S_POLYGON: |
|||
break; |
|||
|
|||
default: |
|||
// Check start and end are not the same.
|
|||
if( (startx == endx) && (starty == endy) ) |
|||
{ |
|||
error_msgs.Add( _( "The start and end points cannot be the same." ) ); |
|||
} |
|||
|
|||
break; |
|||
} |
|||
|
|||
// Check the item thickness. Note the polygon outline thickness is allowed
|
|||
// to be set to 0, because if the shape is exactly the polygon, its outline
|
|||
// thickness must be 0
|
|||
int thickness = ValueFromString( g_UserUnit, m_ThicknessCtrl->GetValue() ); |
|||
|
|||
if( m_item->GetShape() == S_POLYGON ) |
|||
{ |
|||
if( thickness < 0 ) |
|||
error_msgs.Add( _( "The polygon outline thickness must be >= 0." ) ); |
|||
} |
|||
else if( thickness <= 0 ) |
|||
error_msgs.Add( _( "The item thickness must be greater than zero." ) ); |
|||
|
|||
// And the default thickness.
|
|||
thickness = ValueFromString( g_UserUnit, m_DefaultThicknessCtrl->GetValue() ); |
|||
|
|||
if( thickness <= 0 ) |
|||
error_msgs.Add( _( "The default thickness must be greater than zero." ) ); |
|||
|
|||
if( error_msgs.GetCount() ) |
|||
{ |
|||
HTML_MESSAGE_BOX dlg( this, _( "Error List" ) ); |
|||
dlg.ListSet( error_msgs ); |
|||
dlg.ShowModal(); |
|||
} |
|||
|
|||
return error_msgs.GetCount() == 0; |
|||
} |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue