Browse Source

Remove ZONE_FILLER_TOOL since it's not really necessary.

It was causing intermittent failures on GTK.  We'll no doubt want
tools in the QA framework at some point, but probably not necessary
for 6.0....
6.0.7
Jeff Young 4 years ago
parent
commit
bceb3794f8
  1. 8
      pcbnew/board_commit.cpp
  2. 1
      pcbnew/board_commit.h
  3. 9
      qa/pcbnew/drc/test_drc_regressions.cpp
  4. 9
      qa/pcbnew/test_zone_filler.cpp

8
pcbnew/board_commit.cpp

@ -38,6 +38,14 @@
using namespace std::placeholders;
BOARD_COMMIT::BOARD_COMMIT( TOOL_MANAGER* aToolMgr ) :
m_toolMgr( aToolMgr ),
m_isFootprintEditor( false ),
m_resolveNetConflicts( false )
{
}
BOARD_COMMIT::BOARD_COMMIT( PCB_TOOL_BASE* aTool ) :
m_resolveNetConflicts( false )
{

1
pcbnew/board_commit.h

@ -37,6 +37,7 @@ class TOOL_BASE;
class BOARD_COMMIT : public COMMIT
{
public:
BOARD_COMMIT( TOOL_MANAGER* aToolMgr );
BOARD_COMMIT( EDA_DRAW_FRAME* aFrame );
BOARD_COMMIT( PCB_TOOL_BASE *aTool );

9
qa/pcbnew/drc/test_drc_regressions.cpp

@ -55,8 +55,9 @@ struct DRC_REGRESSION_TEST_FIXTURE
m_board = nullptr;
}
std::string boardPath = KI_TEST::GetPcbnewTestDataDir() + relPath.ToStdString() + ".kicad_pcb";
wxString projectPath = KI_TEST::GetPcbnewTestDataDir() + relPath.ToStdString() + ".kicad_pro";
std::string absPath = KI_TEST::GetPcbnewTestDataDir() + relPath.ToStdString();
std::string projectPath = absPath + ".kicad_pro";
std::string boardPath = absPath + ".kicad_pcb";
wxFileName pro( projectPath );
@ -74,13 +75,11 @@ struct DRC_REGRESSION_TEST_FIXTURE
m_toolMgr = std::make_unique<TOOL_MANAGER>();
m_toolMgr->SetEnvironment( m_board.get(), nullptr, nullptr, nullptr, nullptr );
m_toolMgr->RegisterTool( new ZONE_FILLER_TOOL );
}
void fillZones( int aFillVersion )
{
ZONE_FILLER_TOOL* fillerTool = m_toolMgr->GetTool<ZONE_FILLER_TOOL>();
BOARD_COMMIT commit( fillerTool );
BOARD_COMMIT commit( m_toolMgr.get() );
ZONE_FILLER filler( m_board.get(), &commit );
std::vector<ZONE*> toFill;

9
qa/pcbnew/test_zone_filler.cpp

@ -55,8 +55,9 @@ struct ZONE_FILL_TEST_FIXTURE
m_board = nullptr;
}
std::string boardPath = KI_TEST::GetPcbnewTestDataDir() + relPath.ToStdString() + ".kicad_pcb";
wxString projectPath = KI_TEST::GetPcbnewTestDataDir() + relPath.ToStdString() + ".kicad_pro";
std::string absPath = KI_TEST::GetPcbnewTestDataDir() + relPath.ToStdString();
std::string projectPath = absPath + ".kicad_pro";
std::string boardPath = absPath + ".kicad_pcb";
wxFileName pro( projectPath );
@ -74,13 +75,11 @@ struct ZONE_FILL_TEST_FIXTURE
m_toolMgr = std::make_unique<TOOL_MANAGER>();
m_toolMgr->SetEnvironment( m_board.get(), nullptr, nullptr, nullptr, nullptr );
m_toolMgr->RegisterTool( new ZONE_FILLER_TOOL );
}
void fillZones( int aFillVersion )
{
ZONE_FILLER_TOOL* fillerTool = m_toolMgr->GetTool<ZONE_FILLER_TOOL>();
BOARD_COMMIT commit( fillerTool );
BOARD_COMMIT commit( m_toolMgr.get() );
ZONE_FILLER filler( m_board.get(), &commit );
std::vector<ZONE*> toFill;

Loading…
Cancel
Save