diff --git a/pcbnew/footprint_editor_options.cpp b/pcbnew/footprint_editor_options.cpp index 2dec427773..1bb3f94dc3 100644 --- a/pcbnew/footprint_editor_options.cpp +++ b/pcbnew/footprint_editor_options.cpp @@ -107,17 +107,17 @@ PARAM_CFG_ARRAY& FOOTPRINT_EDIT_FRAME::GetConfigurationSettings() &settings.m_LineThickness[ LAYER_CLASS_SILK ], Millimeter2iu( DEFAULT_SILK_LINE_WIDTH ), Millimeter2iu( 0.01 ), Millimeter2iu( 100.0 ), nullptr, 1/IU_PER_MM, wxT( "FpEditorGrlineWidth" ) ) ); - + m_configParams.push_back( new PARAM_CFG_INT_WITH_SCALE( true, wxT( "FpEditorSilkTextSizeH" ), &settings.m_TextSize[ LAYER_CLASS_SILK ].x, Millimeter2iu( DEFAULT_SILK_TEXT_SIZE ), TEXTS_MIN_SIZE, TEXTS_MAX_SIZE, nullptr, 1/IU_PER_MM, wxT( "FpEditorTextsDefaultSizeH" ) ) ); - + m_configParams.push_back( new PARAM_CFG_INT_WITH_SCALE( true, wxT( "FpEditorSilkTextSizeV" ), &settings.m_TextSize[ LAYER_CLASS_SILK ].y, Millimeter2iu( DEFAULT_SILK_TEXT_SIZE ), TEXTS_MIN_SIZE, TEXTS_MAX_SIZE, nullptr, 1/IU_PER_MM, wxT( "FpEditorTextsDefaultSizeV" ) ) ); - + m_configParams.push_back( new PARAM_CFG_INT_WITH_SCALE( true, wxT( "FpEditorSilkTextThickness" ), &settings.m_TextThickness[ LAYER_CLASS_SILK ], Millimeter2iu( DEFAULT_SILK_TEXT_WIDTH ), 1, TEXTS_MAX_WIDTH, @@ -184,20 +184,20 @@ PARAM_CFG_ARRAY& FOOTPRINT_EDIT_FRAME::GetConfigurationSettings() m_configParams.push_back( new PARAM_CFG_WXSTRING( true, wxT( "FpEditorRefDefaultText" ), &settings.m_RefDefaultText, wxT( "REF**" ) ) ); - + m_configParams.push_back( new PARAM_CFG_BOOL( true, wxT( "FpEditorRefDefaultVisibility" ), &settings.m_RefDefaultVisibility, true ) ); - + m_configParams.push_back( new PARAM_CFG_INT( true, wxT( "FpEditorRefDefaultLayer" ), &settings.m_RefDefaultlayer, int( F_SilkS ), int( F_SilkS ), int( F_Fab ) ) ); m_configParams.push_back( new PARAM_CFG_WXSTRING( true, wxT( "FpEditorValueDefaultText" ), &settings.m_ValueDefaultText, wxT( "" ) ) ); - + m_configParams.push_back( new PARAM_CFG_BOOL( true, wxT( "FpEditorValueDefaultVisibility" ), &settings.m_ValueDefaultVisibility, true ) ); - + m_configParams.push_back( new PARAM_CFG_INT( true, wxT( "FpEditorValueDefaultLayer" ), &settings.m_ValueDefaultlayer, int( F_Fab ), int( F_SilkS ), int( F_Fab ) ) ); diff --git a/pcbnew/ratsnest_viewitem.cpp b/pcbnew/ratsnest_viewitem.cpp index d5fe3d0400..f50964f2ae 100644 --- a/pcbnew/ratsnest_viewitem.cpp +++ b/pcbnew/ratsnest_viewitem.cpp @@ -2,6 +2,8 @@ * This program source code file is part of KICAD, a free EDA CAD application. * * Copyright (C) 2013 CERN + * Copyright (C) 2018 KiCad Developers, see AUTHORS.txt for contributors. + * * @author Maciej Suminski * * This program is free software; you can redistribute it and/or @@ -55,6 +57,7 @@ const BOX2I RATSNEST_VIEWITEM::ViewBBox() const return bbox; } + void RATSNEST_VIEWITEM::ViewDraw( int aLayer, KIGFX::VIEW* aView ) const { if( !m_data->TryLock() ) @@ -78,9 +81,13 @@ void RATSNEST_VIEWITEM::ViewDraw( int aLayer, KIGFX::VIEW* aView ) const { if ( l.a == l.b ) { - gal->DrawLine( VECTOR2I( l.a.x - CROSS_SIZE, l.a.y - CROSS_SIZE ), VECTOR2I( l.b.x + CROSS_SIZE, l.b.y + CROSS_SIZE ) ); - gal->DrawLine( VECTOR2I( l.a.x - CROSS_SIZE, l.a.y + CROSS_SIZE ), VECTOR2I( l.b.x + CROSS_SIZE, l.b.y - CROSS_SIZE ) ); - } else { + gal->DrawLine( VECTOR2I( l.a.x - CROSS_SIZE, l.a.y - CROSS_SIZE ), + VECTOR2I( l.b.x + CROSS_SIZE, l.b.y + CROSS_SIZE ) ); + gal->DrawLine( VECTOR2I( l.a.x - CROSS_SIZE, l.a.y + CROSS_SIZE ), + VECTOR2I( l.b.x + CROSS_SIZE, l.b.y - CROSS_SIZE ) ); + } + else + { gal->DrawLine( l.a, l.b ); } } @@ -129,8 +136,10 @@ void RATSNEST_VIEWITEM::ViewDraw( int aLayer, KIGFX::VIEW* aView ) const { if ( source == target ) { - gal->DrawLine( VECTOR2I( source.x - CROSS_SIZE, source.y - CROSS_SIZE ), VECTOR2I( source.x + CROSS_SIZE, source.y + CROSS_SIZE ) ); - gal->DrawLine( VECTOR2I( source.x - CROSS_SIZE, source.y + CROSS_SIZE ), VECTOR2I( source.x + CROSS_SIZE, source.y - CROSS_SIZE ) ); + gal->DrawLine( VECTOR2I( source.x - CROSS_SIZE, source.y - CROSS_SIZE ), + VECTOR2I( source.x + CROSS_SIZE, source.y + CROSS_SIZE ) ); + gal->DrawLine( VECTOR2I( source.x - CROSS_SIZE, source.y + CROSS_SIZE ), + VECTOR2I( source.x + CROSS_SIZE, source.y - CROSS_SIZE ) ); } else { diff --git a/pcbnew/tool_pcb_editor.cpp b/pcbnew/tool_pcb_editor.cpp index d6f6ecc544..16e53b8df1 100644 --- a/pcbnew/tool_pcb_editor.cpp +++ b/pcbnew/tool_pcb_editor.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2012 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2012=2015 Wayne Stambaugh + * Copyright (C) 2012 Wayne Stambaugh * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or @@ -584,17 +584,17 @@ void PCB_EDIT_FRAME::ReCreateAuxiliaryToolbar() // Creates box to display and choose tracks widths: m_SelTrackWidthBox = new wxChoice( m_auxiliaryToolBar, - ID_AUX_TOOLBAR_PCB_TRACK_WIDTH, - wxDefaultPosition, wxDefaultSize, - 0, NULL ); + ID_AUX_TOOLBAR_PCB_TRACK_WIDTH, + wxDefaultPosition, wxDefaultSize, + 0, NULL ); UpdateTrackWidthSelectBox( m_SelTrackWidthBox ); m_auxiliaryToolBar->AddControl( m_SelTrackWidthBox ); // Creates box to display and choose vias diameters: m_SelViaSizeBox = new wxChoice( m_auxiliaryToolBar, - ID_AUX_TOOLBAR_PCB_VIA_SIZE, - wxDefaultPosition, wxDefaultSize, - 0, NULL ); + ID_AUX_TOOLBAR_PCB_VIA_SIZE, + wxDefaultPosition, wxDefaultSize, + 0, NULL ); UpdateViaSizeSelectBox( m_SelViaSizeBox ); m_auxiliaryToolBar->AddControl( m_SelViaSizeBox ); KiScaledSeparator( m_auxiliaryToolBar, this ); @@ -610,18 +610,19 @@ void PCB_EDIT_FRAME::ReCreateAuxiliaryToolbar() // Add the box to display and select the current grid size: KiScaledSeparator( m_auxiliaryToolBar, this ); m_gridSelectBox = new wxChoice( m_auxiliaryToolBar, - ID_ON_GRID_SELECT, - wxDefaultPosition, wxDefaultSize, - 0, NULL ); + ID_ON_GRID_SELECT, + wxDefaultPosition, wxDefaultSize, + 0, NULL ); UpdateGridSelectBox(); + m_auxiliaryToolBar->AddControl( m_gridSelectBox ); // Add the box to display and select the current Zoom KiScaledSeparator( m_auxiliaryToolBar, this ); m_zoomSelectBox = new wxChoice( m_auxiliaryToolBar, - ID_ON_ZOOM_SELECT, - wxDefaultPosition, wxDefaultSize, - 0, NULL ); + ID_ON_ZOOM_SELECT, + wxDefaultPosition, wxDefaultSize, + 0, NULL ); updateZoomSelectBox(); m_auxiliaryToolBar->AddControl( m_zoomSelectBox ); diff --git a/pcbnew/tools/pcb_editor_control.cpp b/pcbnew/tools/pcb_editor_control.cpp index e8e058ba70..6eb5631237 100644 --- a/pcbnew/tools/pcb_editor_control.cpp +++ b/pcbnew/tools/pcb_editor_control.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2014 CERN - * Copyright (C) 2014-2017 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2014-2018 KiCad Developers, see AUTHORS.txt for contributors. * @author Maciej Suminski * * This program is free software; you can redistribute it and/or @@ -667,6 +667,7 @@ int PCB_EDITOR_CONTROL::PlaceTarget( const TOOL_EVENT& aEvent ) return 0; } + static bool mergeZones( BOARD_COMMIT& aCommit, std::vector& aOriginZones, std::vector& aMergedZones ) { @@ -684,7 +685,7 @@ static bool mergeZones( BOARD_COMMIT& aCommit, std::vector& aO // but we should never have more than 2 polys if( aOriginZones[0]->Outline()->OutlineCount() > 1 ) { - wxLogMessage( wxT( "BOARD::CombineAreas error: more than 2 polys after merging" ) ); + wxLogMessage( "BOARD::CombineAreas error: more than 2 polys after merging" ); return false; } @@ -889,17 +890,19 @@ int PCB_EDITOR_CONTROL::DrillOrigin( const TOOL_EVENT& aEvent ) assert( picker ); m_frame->SetToolID( ID_PCB_PLACE_OFFSET_COORD_BUTT, wxCURSOR_HAND, _( "Adjust zero" ) ); - picker->SetClickHandler( std::bind( SetDrillOrigin, getView(), m_frame, m_placeOrigin.get(), _1 ) ); + picker->SetClickHandler( std::bind( SetDrillOrigin, getView(), m_frame, + m_placeOrigin.get(), _1 ) ); picker->Activate(); Wait(); return 0; } + /** - * Function highlightNet() - * Looks for a BOARD_CONNECTED_ITEM in a given spot, and if one is found - it enables + * Look for a BOARD_CONNECTED_ITEM in a given spot and if one is found - it enables * highlight for its net. + * * @param aToolMgr is the TOOL_MANAGER currently in use. * @param aPosition is the point where an item is expected (world coordinates). * @param aUseSelection is true if we should use the current selection to pick the netcode @@ -1119,7 +1122,8 @@ int PCB_EDITOR_CONTROL::ShowLocalRatsnest( const TOOL_EVENT& aEvent ) wxASSERT( picker ); wxASSERT( board ); - m_frame->SetToolID( ID_PCB_SHOW_1_RATSNEST_BUTT, wxCURSOR_PENCIL, _( "Pick Components for Local Ratsnest" ) ); + m_frame->SetToolID( ID_PCB_SHOW_1_RATSNEST_BUTT, wxCURSOR_PENCIL, + _( "Pick Components for Local Ratsnest" ) ); picker->SetClickHandler( std::bind( showLocalRatsnest, m_toolMgr, board, _1 ) ); picker->SetFinalizeHandler( [ board ]( int aCondition ){ auto vis = board->IsElementVisible( LAYER_RATSNEST );