haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix signed/unsigned comparison that was destined to fail.

This commit is contained in:
Jeff Young 2020-08-31 12:53:15 +01:00
parent 34d069ffd8
commit d0479eb92c
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pcbnew/autorouter/autoplacer_tool.cpp → pcbnew/autorouter/autoplace_tool.cpp
View File

@ -1,7 +1,7 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2017 Kicad Developers, see change_log.txt for contributors.
* Copyright (C) 2017-2020 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
@ -23,24 +23,13 @@
#include <board_commit.h>
#include <class_draw_panel_gal.h>
#include <confirm.h>
#include <gal/graphics_abstraction_layer.h>
#include <preview_items/centreline_rect_item.h>
#include <preview_items/two_point_geom_manager.h>
#include <tool/tool_manager.h>
#include <view/view.h>
#include <view/view_controls.h>
// For action icons
#include <bitmaps.h>
#include <class_board_item.h>
#include <class_module.h>
//#include <confirm.h>
//#include <tool/tool_manager.h>
//#include <view/view_controls.h>
//#include <bitmaps.h>
//#include <class_module.h>
#include <tools/pcb_actions.h>
#include <tools/selection_tool.h>
#include <tools/tool_event_utils.h>
#include <widgets/infobar.h>
#include <widgets/progress_reporter.h>
#include "ar_autoplacer.h"
@ -61,6 +50,7 @@ AUTOPLACE_TOOL::~AUTOPLACE_TOOL()
// It is called by the autoplacer to update the view, when something must be displayed
// especially each time a footprint is autoplaced,
static PCB_BASE_EDIT_FRAME* fparent;
static int refreshCallback( MODULE* aModule )
{
if( aModule )
@ -76,15 +66,25 @@ static int refreshCallback( MODULE* aModule )
int AUTOPLACE_TOOL::autoplace( std::vector<MODULE*>& aModules, bool aPlaceOffboard )
{
auto overlay = view()->MakeOverlay();
EDA_RECT bbox = board()->GetBoardEdgesBoundingBox();
if( bbox.GetWidth() == 0 || bbox.GetHeight() == 0 )
{
wxString msg = wxString::Format( _( "Board edges must be defined on the %s layer." ),
LayerName( Edge_Cuts ) );
frame()->GetInfoBar()->ShowMessageFor( msg, 4000, wxICON_ERROR );
return 0;
}
Activate();
AR_AUTOPLACER autoplacer( board() );
BOARD_COMMIT commit( frame() );
BOARD_COMMIT commit( frame() );
std::shared_ptr<KIGFX::VIEW_OVERLAY> overlay = view()->MakeOverlay();
autoplacer.SetOverlay( overlay );
fparent = frame();
std::function<int( MODULE* aModule )> callback = refreshCallback;
autoplacer.SetRefreshCallback( callback );
@ -108,7 +108,7 @@ int AUTOPLACE_TOOL::autoplaceSelected( const TOOL_EVENT& aEvent )
{
std::vector<MODULE*> mods;
for( auto item : selection() )
for( EDA_ITEM* item : selection() )
{
if( item->Type() == PCB_MODULE_T )
mods.push_back( static_cast<MODULE*>( item ) );

0
pcbnew/autorouter/autoplacer_tool.h → pcbnew/autorouter/autoplace_tool.h
View File

4
pcbnew/pcb_edit_frame.cpp
View File

@ -81,7 +81,7 @@
#include <tools/pcb_actions.h>
#include <router/router_tool.h>
#include <router/length_tuner_tool.h>
#include <autorouter/autoplacer_tool.h>
#include <autorouter/autoplace_tool.h>
#include <gestfich.h>
#include <executable_names.h>
#include <netlist_reader/board_netlist_updater.h>
@ -366,7 +366,7 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
wxString strK2S = Pgm().GetExecutablePath();
#ifdef __WXMAC__
if (strK2S.find( "pcbnew.app" ) != wxNOT_FOUND )
if( strK2S.Find( "pcbnew.app" ) != wxNOT_FOUND )
{
// On macOS, we have standalone applications inside the main bundle, so we handle that here:
strK2S += "../../";