QA: Reinstate polygon_triangulation utility
This utility has been disabled since the eeschema GAL merge. It can be reinstated as part of the qa_pcbnew_tools framework.
This commit is contained in:
parent
11745f8f44
commit
adddc41bc5
|
@ -172,6 +172,7 @@ parameters, refer to the tools' usage test (`-h`).
|
||||||
* `drc`: Run and benchmark certain DRC functions on a user-provided `.kicad_pcb` files
|
* `drc`: Run and benchmark certain DRC functions on a user-provided `.kicad_pcb` files
|
||||||
* `pcb_parser`: Parse user-provided `.kicad_pcb` files
|
* `pcb_parser`: Parse user-provided `.kicad_pcb` files
|
||||||
* `polygon_generator`: Dump polygons found on a PCB to the console
|
* `polygon_generator`: Dump polygons found on a PCB to the console
|
||||||
|
* `polygon_triangulation`: Perform triangulation of zone polygons on PCBs
|
||||||
|
|
||||||
# Fuzz testing {#fuzz-testing}
|
# Fuzz testing {#fuzz-testing}
|
||||||
|
|
||||||
|
|
|
@ -27,4 +27,3 @@ add_subdirectory( common_tools )
|
||||||
add_subdirectory( pcbnew_tools )
|
add_subdirectory( pcbnew_tools )
|
||||||
|
|
||||||
# add_subdirectory( pcb_test_window )
|
# add_subdirectory( pcb_test_window )
|
||||||
# add_subdirectory( polygon_triangulation )
|
|
||||||
|
|
|
@ -35,6 +35,8 @@ add_executable( qa_pcbnew_tools
|
||||||
|
|
||||||
tools/polygon_generator/polygon_generator.cpp
|
tools/polygon_generator/polygon_generator.cpp
|
||||||
|
|
||||||
|
tools/polygon_triangulation/polygon_triangulation.cpp
|
||||||
|
|
||||||
# Older CMakes cannot link OBJECT libraries
|
# Older CMakes cannot link OBJECT libraries
|
||||||
# https://cmake.org/pipermail/cmake/2013-November/056263.html
|
# https://cmake.org/pipermail/cmake/2013-November/056263.html
|
||||||
$<TARGET_OBJECTS:pcbnew_kiface_objects>
|
$<TARGET_OBJECTS:pcbnew_kiface_objects>
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include "tools/drc_tool/drc_tool.h"
|
#include "tools/drc_tool/drc_tool.h"
|
||||||
#include "tools/pcb_parser/pcb_parser_tool.h"
|
#include "tools/pcb_parser/pcb_parser_tool.h"
|
||||||
#include "tools/polygon_generator/polygon_generator.h"
|
#include "tools/polygon_generator/polygon_generator.h"
|
||||||
|
#include "tools/polygon_triangulation/polygon_triangulation.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* List of registered tools.
|
* List of registered tools.
|
||||||
|
@ -37,6 +38,7 @@ const static std::vector<KI_TEST::UTILITY_PROGRAM*> known_tools = {
|
||||||
&drc_tool,
|
&drc_tool,
|
||||||
&pcb_parser_tool,
|
&pcb_parser_tool,
|
||||||
&polygon_generator_tool,
|
&polygon_generator_tool,
|
||||||
|
&polygon_triangulation_tool,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,8 @@
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "polygon_triangulation.h"
|
||||||
|
|
||||||
#include <geometry/shape_poly_set.h>
|
#include <geometry/shape_poly_set.h>
|
||||||
#include <geometry/shape_line_chain.h>
|
#include <geometry/shape_line_chain.h>
|
||||||
|
|
||||||
|
@ -198,7 +200,7 @@ aResult->clear();
|
||||||
std::swap( (*aResult) [0], (*aResult)[outline] );
|
std::swap( (*aResult) [0], (*aResult)[outline] );
|
||||||
}
|
}
|
||||||
|
|
||||||
BOARD* loadBoard( const std::string& filename )
|
BOARD* loadBoardTri( const std::string& filename )
|
||||||
{
|
{
|
||||||
PLUGIN::RELEASER pi( new PCB_IO );
|
PLUGIN::RELEASER pi( new PCB_IO );
|
||||||
BOARD* brd = nullptr;
|
BOARD* brd = nullptr;
|
||||||
|
@ -219,12 +221,18 @@ BOARD* loadBoard( const std::string& filename )
|
||||||
return brd;
|
return brd;
|
||||||
}
|
}
|
||||||
|
|
||||||
int main( int argc, char *argv[] )
|
enum POLY_TRI_RET_CODES
|
||||||
{
|
{
|
||||||
auto brd = loadBoard( argc > 1 ? argv[1] : "../../../../tests/dp.kicad_pcb" );
|
LOAD_FAILED = KI_TEST::RET_CODES::TOOL_SPECIFIC,
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
int polygon_triangulation_main( int argc, char *argv[] )
|
||||||
|
{
|
||||||
|
auto brd = loadBoardTri( argc > 1 ? argv[1] : "../../../../tests/dp.kicad_pcb" );
|
||||||
|
|
||||||
if( !brd )
|
if( !brd )
|
||||||
return -1;
|
return POLY_TRI_RET_CODES::LOAD_FAILED;
|
||||||
|
|
||||||
|
|
||||||
PROF_COUNTER cnt( "allBoard" );
|
PROF_COUNTER cnt( "allBoard" );
|
||||||
|
@ -278,6 +286,15 @@ int main( int argc, char *argv[] )
|
||||||
|
|
||||||
delete brd;
|
delete brd;
|
||||||
|
|
||||||
return 0;
|
return KI_TEST::RET_CODES::OK;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Define the tool interface
|
||||||
|
*/
|
||||||
|
KI_TEST::UTILITY_PROGRAM polygon_triangulation_tool = {
|
||||||
|
"polygon_triangulation",
|
||||||
|
"Process polygon trianguation on a PCB",
|
||||||
|
polygon_triangulation_main,
|
||||||
|
};
|
|
@ -0,0 +1,32 @@
|
||||||
|
/*
|
||||||
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
||||||
|
*
|
||||||
|
* Copyright (C) 2019 KiCad Developers, see CHANGELOG.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
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef PCBNEW_TOOLS_POLYGON_TRIANGULATION_UTILITY_H
|
||||||
|
#define PCBNEW_TOOLS_POLYGON_TRIANGULATION_UTILITY_H
|
||||||
|
|
||||||
|
#include <utility_program.h>
|
||||||
|
|
||||||
|
/// A tool to parse kicad PCBs from the command line
|
||||||
|
extern KI_TEST::UTILITY_PROGRAM polygon_triangulation_tool;
|
||||||
|
|
||||||
|
#endif //PCBNEW_TOOLS_POLYGON_TRIANGULATION_UTILITY_H
|
|
@ -1,92 +0,0 @@
|
||||||
#
|
|
||||||
# This program source code file is part of KiCad, a free EDA CAD application.
|
|
||||||
#
|
|
||||||
# Copyright (C) 2017 CERN
|
|
||||||
# @author Alejandro García Montoro <alejandro.garciamontoro@gmail.com>
|
|
||||||
#
|
|
||||||
# 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
|
|
||||||
|
|
||||||
#find_package(Boost COMPONENTS unit_test_framework REQUIRED)
|
|
||||||
#find_package( wxWidgets 3.0.0 COMPONENTS gl aui adv html core net base xml stc REQUIRED )
|
|
||||||
|
|
||||||
add_definitions(-DPCBNEW -DBOOST_TEST_DYN_LINK)
|
|
||||||
|
|
||||||
if( BUILD_GITHUB_PLUGIN )
|
|
||||||
set( GITHUB_PLUGIN_LIBRARIES github_plugin )
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_dependencies( pnsrouter pcbcommon pcad2kicadpcb ${GITHUB_PLUGIN_LIBRARIES} )
|
|
||||||
|
|
||||||
add_executable(test_polygon_triangulation
|
|
||||||
../qa_utils/mocks.cpp
|
|
||||||
../../common/base_units.cpp
|
|
||||||
test_polygon_triangulation.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
include_directories( BEFORE ${INC_BEFORE} )
|
|
||||||
include_directories(
|
|
||||||
${CMAKE_SOURCE_DIR}
|
|
||||||
${CMAKE_SOURCE_DIR}/include
|
|
||||||
${CMAKE_SOURCE_DIR}/3d-viewer
|
|
||||||
${CMAKE_SOURCE_DIR}/common
|
|
||||||
${CMAKE_SOURCE_DIR}/pcbnew
|
|
||||||
${CMAKE_SOURCE_DIR}/pcbnew/router
|
|
||||||
${CMAKE_SOURCE_DIR}/pcbnew/tools
|
|
||||||
${CMAKE_SOURCE_DIR}/pcbnew/dialogs
|
|
||||||
${CMAKE_SOURCE_DIR}/polygon
|
|
||||||
${CMAKE_SOURCE_DIR}/common/geometry
|
|
||||||
${CMAKE_SOURCE_DIR}/qa/common
|
|
||||||
${Boost_INCLUDE_DIR}
|
|
||||||
${INC_AFTER}
|
|
||||||
)
|
|
||||||
|
|
||||||
target_link_libraries( test_polygon_triangulation
|
|
||||||
polygon
|
|
||||||
pnsrouter
|
|
||||||
common
|
|
||||||
pcbcommon
|
|
||||||
bitmaps
|
|
||||||
polygon
|
|
||||||
pnsrouter
|
|
||||||
common
|
|
||||||
pcbcommon
|
|
||||||
bitmaps
|
|
||||||
polygon
|
|
||||||
pnsrouter
|
|
||||||
common
|
|
||||||
pcbcommon
|
|
||||||
bitmaps
|
|
||||||
polygon
|
|
||||||
pnsrouter
|
|
||||||
common
|
|
||||||
pcbcommon
|
|
||||||
bitmaps
|
|
||||||
gal
|
|
||||||
pcad2kicadpcb
|
|
||||||
common
|
|
||||||
pcbcommon
|
|
||||||
${GITHUB_PLUGIN_LIBRARIES}
|
|
||||||
common
|
|
||||||
pcbcommon
|
|
||||||
${Boost_FILESYSTEM_LIBRARY}
|
|
||||||
${Boost_SYSTEM_LIBRARY}
|
|
||||||
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
|
|
||||||
${wxWidgets_LIBRARIES}
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue