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

Fix some issues in drawing_stackup_table_tool.cpp

This commit is contained in:
jean-pierre charras 2021-03-14 17:44:01 +01:00
parent 3ba7fc0cc2
commit c763b0088e
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pcbnew/tools/drawing_stackup_table_tool.cpp
View File

@ -25,7 +25,6 @@
#include "drawing_tool.h"
#include "pcb_actions.h"
#include <pcb_edit_frame.h>
#include <confirm.h>
#include <view/view.h>
#include <tool/tool_manager.h>
#include <tools/pcb_actions.h>
@ -38,8 +37,6 @@
#include <board.h>
#include <fp_shape.h>
#include <pcb_text.h>
#include <pcbnew_id.h>
#include <dialogs/dialog_track_via_size.h>
#include <kicad_string.h>
using SCOPED_DRAW_MODE = SCOPED_SET_RESET<DRAWING_TOOL::MODE>;
@ -497,6 +494,8 @@ std::vector<BOARD_ITEM*> DRAWING_TOOL::DrawBoardCharacteristics(
return objects;
}
#include <wx/utils.h>
int DRAWING_TOOL::InteractivePlaceWithPreview( const TOOL_EVENT& aEvent, std::vector<BOARD_ITEM*> aItems,
std::vector<BOARD_ITEM*> aPreview, LSET* aLayers )
{
@ -585,18 +584,20 @@ int DRAWING_TOOL::InteractivePlaceWithPreview( const TOOL_EVENT& aEvent, std::ve
}
else if( evt->IsClick( BUT_LEFT ) )
{
if( aLayers != NULL )
{
PCB_LAYER_ID targetLayer = frame()->SelectOneLayer(
PCB_LAYER_ID::PCB_LAYER_ID_COUNT, *aLayers, wxPoint( pos.x, pos.y ) );
PCB_LAYER_ID::PCB_LAYER_ID_COUNT,
*aLayers, wxGetMousePosition() );
view()->ClearPreview();
if( targetLayer == PCB_LAYER_ID::PCB_LAYER_ID_COUNT )
if( targetLayer == PCB_LAYER_ID::UNDEFINED_LAYER )
{
// The user did not pick any layer.
m_frame->PopTool( tool );
cancelled = true;
break; // The user did not pick any layer.
break;
}
for( auto item : aItems )