Resync with main branch + fix MSWin build (accidental inclusion of dlfcn.h)
This commit is contained in:
Cirilo Bernardo
commit
1940bd71e4
|
|
@ -81,7 +81,6 @@ S3D_PLUGIN_MANAGER::S3D_PLUGIN_MANAGER()
|
||||||
std::list< wxString >::const_iterator sFF = m_FileFilters.begin();
|
std::list< wxString >::const_iterator sFF = m_FileFilters.begin();
|
||||||
std::list< wxString >::const_iterator eFF = m_FileFilters.end();
|
std::list< wxString >::const_iterator eFF = m_FileFilters.end();
|
||||||
std::cout << "* File filters:\n";
|
std::cout << "* File filters:\n";
|
||||||
int i = 0;
|
|
||||||
|
|
||||||
while( sFF != eFF )
|
while( sFF != eFF )
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -159,41 +159,12 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
|
||||||
set( CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}" )
|
set( CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}" )
|
||||||
set( CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}" )
|
set( CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}" )
|
||||||
|
|
||||||
# The optimization level is -O1 instead of the usual -O2 level because
|
|
||||||
# boost::polygon has a function (inflate polygon) broken by the -O2 level
|
|
||||||
# with GCC 4.7.0 to 4.7.2 (works fine with with GCC 4.6 and 4.7.3).
|
|
||||||
# This lower optimization level does not have a significant change on the speed.
|
|
||||||
# See also:
|
|
||||||
# https://bugs.launchpad.net/kicad/+bug/1056926
|
|
||||||
# https://svn.boost.org/trac/boost/ticket/7983
|
|
||||||
if( GCC_VERSION VERSION_EQUAL 4.7.0 OR ( GCC_VERSION VERSION_GREATER 4.7.0 AND GCC_VERSION VERSION_LESS 4.7.3 ) )
|
|
||||||
set( CMAKE_C_FLAGS_RELEASE "-O1" )
|
|
||||||
set( CMAKE_CXX_FLAGS_RELEASE "-O1" )
|
|
||||||
else()
|
|
||||||
set( CMAKE_C_FLAGS_RELEASE "-O2" )
|
|
||||||
set( CMAKE_CXX_FLAGS_RELEASE "-O2" )
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set( CMAKE_C_FLAGS_DEBUG "-g3 -ggdb3 -DDEBUG" )
|
set( CMAKE_C_FLAGS_DEBUG "-g3 -ggdb3 -DDEBUG" )
|
||||||
set( CMAKE_CXX_FLAGS_DEBUG "-g3 -ggdb3 -DDEBUG -Wno-deprecated-declarations" )
|
set( CMAKE_CXX_FLAGS_DEBUG "-g3 -ggdb3 -DDEBUG -Wno-deprecated-declarations" )
|
||||||
|
|
||||||
set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG" )
|
set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG" )
|
||||||
set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG" )
|
set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG" )
|
||||||
|
|
||||||
find_package( OpenMP QUIET )
|
|
||||||
|
|
||||||
if( OPENMP_FOUND )
|
|
||||||
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}" )
|
|
||||||
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}" )
|
|
||||||
add_definitions( -DUSE_OPENMP )
|
|
||||||
|
|
||||||
# MinGW does not include the OpenMP link library and FindOpenMP.cmake does not
|
|
||||||
# set it either. Not sure this is the most elegant solution but it works.
|
|
||||||
if( MINGW )
|
|
||||||
set( OPENMP_LIBRARIES gomp )
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if( MINGW )
|
if( MINGW )
|
||||||
set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )
|
set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )
|
||||||
|
|
||||||
|
|
@ -446,6 +417,24 @@ include( ExternalProject )
|
||||||
#================================================
|
#================================================
|
||||||
include( CheckFindPackageResult )
|
include( CheckFindPackageResult )
|
||||||
|
|
||||||
|
#################################
|
||||||
|
# Find OpenMP support, optional #
|
||||||
|
#################################
|
||||||
|
|
||||||
|
find_package( OpenMP )
|
||||||
|
|
||||||
|
if( OPENMP_FOUND )
|
||||||
|
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}" )
|
||||||
|
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}" )
|
||||||
|
add_definitions( -DUSE_OPENMP )
|
||||||
|
|
||||||
|
# MinGW does not include the OpenMP link library and FindOpenMP.cmake does not
|
||||||
|
# set it either. Not sure this is the most elegant solution but it works.
|
||||||
|
if( MINGW )
|
||||||
|
set( OPENMP_LIBRARIES gomp )
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
##########################
|
##########################
|
||||||
# Find wxWidgets library #
|
# Find wxWidgets library #
|
||||||
##########################
|
##########################
|
||||||
|
|
|
||||||
|
|
@ -1,36 +1,31 @@
|
||||||
if( ${CMAKE_MAJOR_VERSION} STREQUAL "2" AND ${CMAKE_MINOR_VERSION} STREQUAL "8"
|
find_path( GLM_INCLUDE_DIR glm/glm.hpp
|
||||||
AND ( ${CMAKE_PATCH_VERSION} STREQUAL "2" OR ${CMAKE_PATCH_VERSION} STREQUAL "7"
|
PATHS ${GLM_ROOT_DIR} $ENV{GLM_ROOT_DIR}
|
||||||
OR ${CMAKE_PATCH_VERSION} STREQUAL "10" ) )
|
DOC "GLM library header path."
|
||||||
|
)
|
||||||
message( FATAL_ERROR "\nThis version of CMake is known to not work\n"
|
|
||||||
"Known bad versions: 2.8.2, 2.8.7, 2.8.10\n" )
|
|
||||||
|
|
||||||
endif()
|
|
||||||
|
|
||||||
|
|
||||||
find_path( GLM_INCLUDE_DIR glm/glm.hpp )
|
|
||||||
|
|
||||||
|
|
||||||
if( NOT ${GLM_INCLUDE_DIR} STREQUAL "GLM_INCLUDE_DIR-NOTFOUND" )
|
if( NOT ${GLM_INCLUDE_DIR} STREQUAL "GLM_INCLUDE_DIR-NOTFOUND" )
|
||||||
|
|
||||||
# attempt to extract the GLM Version information from setup.hpp
|
# attempt to extract the GLM Version information from setup.hpp
|
||||||
find_file( GLM_SETUP setup.hpp PATHS ${GLM_INCLUDE_DIR} PATH_SUFFIXES glm/core glm/detail NO_DEFAULT_PATH )
|
find_file( GLM_SETUP setup.hpp
|
||||||
|
PATHS ${GLM_INCLUDE_DIR}
|
||||||
|
PATH_SUFFIXES glm/core glm/detail
|
||||||
|
NO_DEFAULT_PATH )
|
||||||
|
|
||||||
if( NOT ${GLM_SETUP} STREQUAL "GLM_SETUP-NOTFOUND" )
|
if( NOT ${GLM_SETUP} STREQUAL "GLM_SETUP-NOTFOUND" )
|
||||||
|
|
||||||
# extract the "#define GLM_VERSION*" lines
|
# extract the "#define GLM_VERSION*" lines
|
||||||
file( STRINGS ${GLM_SETUP} _version REGEX "^#define.*GLM_VERSION.*" )
|
file( STRINGS ${GLM_SETUP} _version REGEX "^#define.*GLM_VERSION.*" )
|
||||||
|
|
||||||
foreach( SVAR ${_version} )
|
foreach( SVAR ${_version} )
|
||||||
string( REGEX MATCH GLM_VERSION_[M,A,J,O,R,I,N,P,T,C,H,E,V,I,S]* _VARNAME ${SVAR} )
|
string( REGEX MATCH GLM_VERSION_[M,A,J,O,R,I,N,P,T,C,H,E,V,I,S]* _VARNAME ${SVAR} )
|
||||||
string( REGEX MATCH [0-9]+ _VALUE ${SVAR} )
|
string( REGEX MATCH [0-9]+ _VALUE ${SVAR} )
|
||||||
|
|
||||||
if( NOT ${_VARNAME} STREQUAL "" AND NOT ${_VALUE} STREQUAL "" )
|
if( NOT ${_VARNAME} STREQUAL "" AND NOT ${_VALUE} STREQUAL "" )
|
||||||
set( _${_VARNAME} ${_VALUE} )
|
set( _${_VARNAME} ${_VALUE} )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
#ensure that NOT GLM_VERSION* will evaluate to '0'
|
#ensure that NOT GLM_VERSION* will evaluate to '0'
|
||||||
if( NOT _GLM_VERSION_MAJOR )
|
if( NOT _GLM_VERSION_MAJOR )
|
||||||
set( _GLM_VERSION_MAJOR 0 )
|
set( _GLM_VERSION_MAJOR 0 )
|
||||||
|
|
@ -50,9 +45,8 @@ if( NOT ${GLM_INCLUDE_DIR} STREQUAL "GLM_INCLUDE_DIR-NOTFOUND" )
|
||||||
|
|
||||||
set( GLM_VERSION ${_GLM_VERSION_MAJOR}.${_GLM_VERSION_MINOR}.${_GLM_VERSION_PATCH}.${_GLM_VERSION_REVISION} )
|
set( GLM_VERSION ${_GLM_VERSION_MAJOR}.${_GLM_VERSION_MINOR}.${_GLM_VERSION_PATCH}.${_GLM_VERSION_REVISION} )
|
||||||
unset( GLM_SETUP CACHE )
|
unset( GLM_SETUP CACHE )
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -63,7 +57,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS( GLM
|
||||||
GLM_VERSION
|
GLM_VERSION
|
||||||
VERSION_VAR GLM_VERSION )
|
VERSION_VAR GLM_VERSION )
|
||||||
|
|
||||||
|
|
||||||
mark_as_advanced( GLM_INCLUDE_DIR )
|
mark_as_advanced( GLM_INCLUDE_DIR )
|
||||||
set( GLM_VERSION_MAJOR ${_GLM_VERSION_MAJOR} CACHE INTERNAL "" )
|
set( GLM_VERSION_MAJOR ${_GLM_VERSION_MAJOR} CACHE INTERNAL "" )
|
||||||
set( GLM_VERSION_MINOR ${_GLM_VERSION_MINOR} CACHE INTERNAL "" )
|
set( GLM_VERSION_MINOR ${_GLM_VERSION_MINOR} CACHE INTERNAL "" )
|
||||||
|
|
|
||||||
|
|
@ -160,6 +160,7 @@ set( BMAPS_MID
|
||||||
auto_associe
|
auto_associe
|
||||||
auto_delete_track
|
auto_delete_track
|
||||||
auto_track_width
|
auto_track_width
|
||||||
|
autoplace_fields
|
||||||
axis3d_back
|
axis3d_back
|
||||||
axis3d_bottom
|
axis3d_bottom
|
||||||
axis3d_front
|
axis3d_front
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,79 @@
|
||||||
|
|
||||||
|
/* Do not modify this file, it was automatically generated by the
|
||||||
|
* PNG2cpp CMake script, using a *.png file as input.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <bitmaps.h>
|
||||||
|
|
||||||
|
static const unsigned char png[] = {
|
||||||
|
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
|
||||||
|
0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
|
||||||
|
0xce, 0x00, 0x00, 0x03, 0xe2, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x95, 0x5b, 0x4c, 0x1c,
|
||||||
|
0x55, 0x18, 0xc7, 0x17, 0x86, 0x65, 0x59, 0x96, 0xe5, 0xb6, 0x96, 0x94, 0x70, 0x09, 0x5a, 0x1e,
|
||||||
|
0xec, 0x83, 0x24, 0x0a, 0x18, 0xa5, 0xd4, 0x27, 0x6d, 0xc0, 0x5b, 0x63, 0x43, 0x13, 0x1a, 0x23,
|
||||||
|
0xd1, 0x90, 0xa6, 0x11, 0x1e, 0x2a, 0x0f, 0x5a, 0x48, 0x37, 0xb0, 0x4b, 0x40, 0x36, 0x43, 0x9b,
|
||||||
|
0x46, 0xc1, 0xe0, 0x72, 0xe9, 0x83, 0xc5, 0x18, 0x78, 0x30, 0x36, 0x28, 0x89, 0xed, 0x43, 0xfb,
|
||||||
|
0xd2, 0x9a, 0x1a, 0x74, 0x37, 0x69, 0x6d, 0x61, 0x4b, 0x69, 0xa1, 0x5c, 0xbb, 0x4b, 0x8a, 0x54,
|
||||||
|
0xd7, 0x86, 0x86, 0xfe, 0xfd, 0x9f, 0x99, 0xb3, 0x66, 0x84, 0x96, 0xd4, 0xb8, 0x7b, 0x92, 0x5f,
|
||||||
|
0x32, 0x33, 0x67, 0xe6, 0xfc, 0xce, 0xf9, 0xbe, 0xef, 0x9c, 0x31, 0x99, 0xfe, 0x7b, 0xeb, 0x24,
|
||||||
|
0x35, 0xc4, 0x4e, 0x86, 0xc9, 0x0b, 0xe4, 0x25, 0x79, 0x2d, 0x70, 0x93, 0x78, 0x53, 0x14, 0x9a,
|
||||||
|
0x9f, 0x1c, 0x27, 0x0e, 0x02, 0xf2, 0x26, 0x29, 0x26, 0x5e, 0xc9, 0x6f, 0xa4, 0x2b, 0x56, 0xa2,
|
||||||
|
0x44, 0x92, 0x21, 0x19, 0x20, 0x17, 0x63, 0x25, 0xda, 0x2f, 0xaf, 0x05, 0x2b, 0x64, 0x57, 0x34,
|
||||||
|
0x44, 0x2d, 0x64, 0x51, 0x0a, 0xa7, 0x48, 0x8e, 0x41, 0xb4, 0x4b, 0xde, 0x47, 0xad, 0x7d, 0x40,
|
||||||
|
0x3a, 0x0c, 0x83, 0x3e, 0x47, 0x3c, 0xc4, 0xfc, 0x24, 0x1f, 0xd7, 0x3f, 0xe6, 0xc5, 0x83, 0x86,
|
||||||
|
0x44, 0x3b, 0x49, 0x25, 0x69, 0x95, 0x7d, 0x75, 0x52, 0x9a, 0x46, 0xbe, 0x94, 0xef, 0x08, 0xe9,
|
||||||
|
0xeb, 0x86, 0x6f, 0xde, 0xdb, 0x38, 0x60, 0xd0, 0x6c, 0x36, 0x07, 0x12, 0x12, 0x12, 0x36, 0xc6,
|
||||||
|
0xf7, 0x23, 0x59, 0xb6, 0x33, 0xe4, 0x27, 0xe2, 0x22, 0xb3, 0xb2, 0xef, 0x47, 0xd9, 0xd7, 0x5c,
|
||||||
|
0x58, 0x58, 0x88, 0x92, 0x92, 0x12, 0x11, 0xbe, 0x33, 0x64, 0x9f, 0x7c, 0x3e, 0x46, 0xd6, 0x37,
|
||||||
|
0x89, 0x28, 0x41, 0x5c, 0x5c, 0x1c, 0xd2, 0xd3, 0xd3, 0xbf, 0xe7, 0x7d, 0xa6, 0xa1, 0x6f, 0x9b,
|
||||||
|
0x4c, 0xf2, 0xbb, 0x52, 0xf4, 0x17, 0xf9, 0x8e, 0x2c, 0xc9, 0x01, 0x4f, 0xcd, 0xce, 0xce, 0x62,
|
||||||
|
0x6d, 0x6d, 0x0d, 0x79, 0x79, 0x79, 0x01, 0xf9, 0x8d, 0x42, 0xbe, 0x26, 0x67, 0x37, 0x89, 0xda,
|
||||||
|
0xda, 0xda, 0x71, 0xe2, 0xc4, 0x67, 0xb0, 0xdb, 0xed, 0x48, 0x4a, 0x4a, 0xfa, 0x33, 0x39, 0x39,
|
||||||
|
0xf9, 0xa0, 0xec, 0xeb, 0x26, 0x3e, 0xb9, 0x11, 0x45, 0xe8, 0x3e, 0x97, 0x4c, 0x4b, 0xd1, 0x57,
|
||||||
|
0xe3, 0xe3, 0xe3, 0x58, 0x5d, 0x5d, 0x45, 0x76, 0x76, 0xf6, 0x04, 0xef, 0x2d, 0x64, 0x88, 0x7c,
|
||||||
|
0x4b, 0x92, 0x36, 0x89, 0x3c, 0x1e, 0x15, 0xf7, 0xef, 0x03, 0x93, 0x93, 0x73, 0x38, 0x70, 0xa0,
|
||||||
|
0x46, 0x5b, 0x1d, 0xa5, 0xa2, 0xba, 0x1e, 0x90, 0x57, 0x1f, 0x91, 0xbf, 0x48, 0xe8, 0x3e, 0x76,
|
||||||
|
0x38, 0x1c, 0xc8, 0xcd, 0xcd, 0x15, 0xa1, 0x3b, 0x25, 0xee, 0xc9, 0x43, 0xf2, 0x2b, 0xf9, 0x39,
|
||||||
|
0xf2, 0xf2, 0x4e, 0x72, 0x8c, 0x84, 0x3a, 0x3a, 0x54, 0x84, 0xc3, 0xe0, 0xcc, 0x80, 0xbb, 0x77,
|
||||||
|
0x81, 0xd3, 0xa7, 0xcf, 0xa3, 0xa0, 0x60, 0x07, 0xe2, 0xe3, 0xe3, 0xd7, 0x53, 0x53, 0x53, 0x5b,
|
||||||
|
0x65, 0x38, 0x8c, 0x4d, 0x94, 0xf5, 0xdb, 0xc4, 0x4a, 0x3e, 0x21, 0x47, 0x48, 0x3e, 0x79, 0x59,
|
||||||
|
0x5e, 0x1f, 0x91, 0xcf, 0xf9, 0x34, 0x3f, 0xff, 0x35, 0x9b, 0xcd, 0xe6, 0x57, 0x14, 0xe5, 0xf7,
|
||||||
|
0xf6, 0x76, 0x15, 0xf7, 0xee, 0xe9, 0x92, 0x50, 0x08, 0x58, 0x5a, 0x02, 0xa6, 0xa7, 0x1f, 0xc0,
|
||||||
|
0xe3, 0xf1, 0x22, 0x23, 0xc3, 0x01, 0xca, 0x66, 0x58, 0x30, 0x25, 0x52, 0x62, 0x95, 0xe7, 0xdc,
|
||||||
|
0x33, 0x4f, 0xb4, 0x21, 0x7a, 0x7b, 0x7b, 0x2b, 0xfb, 0xfa, 0xfa, 0x90, 0x92, 0x92, 0x82, 0xb6,
|
||||||
|
0x36, 0x15, 0x2b, 0x2b, 0xc0, 0xf2, 0xb2, 0x2e, 0x99, 0x9f, 0x07, 0x6e, 0xdf, 0x06, 0x6e, 0xde,
|
||||||
|
0x04, 0xc6, 0xc6, 0x42, 0xa8, 0xa9, 0x39, 0x0c, 0x16, 0xcc, 0x43, 0x4e, 0xec, 0x07, 0x7e, 0x3a,
|
||||||
|
0x6f, 0x38, 0x0d, 0xbe, 0x79, 0xc4, 0x6a, 0xff, 0xdd, 0x86, 0x87, 0x87, 0x95, 0xc1, 0xc1, 0xc1,
|
||||||
|
0x54, 0xe6, 0x23, 0xd4, 0xda, 0xaa, 0x6a, 0x92, 0x3b, 0x77, 0x80, 0x85, 0x05, 0x5d, 0x72, 0xeb,
|
||||||
|
0x16, 0x70, 0xe3, 0x06, 0x30, 0x31, 0x01, 0x5c, 0xbd, 0x0a, 0x0c, 0x0d, 0x8d, 0xc1, 0x66, 0xb3,
|
||||||
|
0x63, 0xf7, 0xee, 0x57, 0xe0, 0xf7, 0x4f, 0xe3, 0xe4, 0xc9, 0x51, 0x28, 0x4a, 0x02, 0x4a, 0x4b,
|
||||||
|
0x4b, 0x7d, 0x69, 0x69, 0x69, 0x55, 0xf2, 0x48, 0x7a, 0x6a, 0x2b, 0x67, 0xd0, 0xed, 0x56, 0x11,
|
||||||
|
0x0c, 0xea, 0x12, 0x56, 0x2b, 0xc3, 0xa6, 0x4b, 0x02, 0x01, 0xe0, 0xda, 0x35, 0xe0, 0xf2, 0x65,
|
||||||
|
0x70, 0x70, 0x20, 0x33, 0x33, 0x0b, 0x4e, 0xe7, 0xa7, 0x98, 0x9a, 0x02, 0x7c, 0x3e, 0x70, 0x3b,
|
||||||
|
0x6c, 0x83, 0x61, 0x75, 0x82, 0x3d, 0x5b, 0x8a, 0x5a, 0x5a, 0x54, 0x2c, 0x2e, 0x02, 0x73, 0x73,
|
||||||
|
0xba, 0x44, 0x0c, 0x74, 0xfd, 0xba, 0x2e, 0xb9, 0x72, 0x05, 0xb8, 0x74, 0x29, 0x8c, 0x43, 0x87,
|
||||||
|
0x5c, 0x2c, 0x0e, 0x05, 0x59, 0x59, 0xd9, 0x68, 0x6a, 0xfa, 0x02, 0x7b, 0xf7, 0x7e, 0xa8, 0x55,
|
||||||
|
0x67, 0x63, 0x63, 0x23, 0x98, 0x86, 0x30, 0x81, 0x48, 0x05, 0x19, 0xdc, 0x28, 0x10, 0xb1, 0x4d,
|
||||||
|
0x11, 0xa2, 0xe6, 0x66, 0x55, 0x93, 0xcc, 0xcc, 0xe8, 0x79, 0x11, 0x12, 0x6e, 0x0f, 0x4d, 0xd2,
|
||||||
|
0xd5, 0x35, 0x82, 0x9c, 0x9c, 0xa7, 0x29, 0xc8, 0x42, 0x7d, 0x7d, 0x3d, 0xca, 0xca, 0xca, 0xc4,
|
||||||
|
0xc6, 0xe6, 0xb3, 0x1c, 0xd4, 0xd6, 0xd6, 0x6a, 0x83, 0xf7, 0xf7, 0xf7, 0x5f, 0x24, 0x6f, 0x49,
|
||||||
|
0x9e, 0xdf, 0x28, 0x7a, 0x43, 0x2e, 0x77, 0xd9, 0xe9, 0x54, 0xff, 0x91, 0x4c, 0x4e, 0xea, 0x92,
|
||||||
|
0xd1, 0xd1, 0x00, 0xca, 0xcb, 0x2b, 0x99, 0x07, 0x05, 0x15, 0x15, 0x15, 0xe8, 0xe9, 0xe9, 0x89,
|
||||||
|
0xcc, 0xf8, 0x02, 0x39, 0x27, 0xaf, 0x05, 0x53, 0x64, 0xe7, 0x63, 0xe3, 0xd5, 0xd0, 0xd0, 0xb0,
|
||||||
|
0xa7, 0xae, 0xae, 0xce, 0x67, 0xb5, 0x5a, 0xd7, 0x8e, 0x1e, 0x55, 0xb5, 0xe4, 0x0b, 0x89, 0xdf,
|
||||||
|
0xff, 0x07, 0x67, 0xee, 0x42, 0x62, 0xa2, 0x05, 0xe2, 0x1c, 0x73, 0xbb, 0xdd, 0x91, 0x01, 0x57,
|
||||||
|
0x18, 0x9e, 0xc3, 0x2e, 0x97, 0x4b, 0xfb, 0x5d, 0x7b, 0xbd, 0xde, 0x1d, 0x62, 0xf6, 0x2c, 0xaa,
|
||||||
|
0xc4, 0x2d, 0xab, 0x4e, 0xcc, 0x82, 0x2f, 0x1e, 0xb7, 0x58, 0x2c, 0xe1, 0xa6, 0x26, 0x55, 0x4b,
|
||||||
|
0xbe, 0xd7, 0x3b, 0x82, 0xed, 0xdb, 0xf3, 0xc0, 0x23, 0x08, 0xd5, 0xd5, 0xd5, 0x30, 0xc4, 0x7d,
|
||||||
|
0x84, 0xe4, 0xfe, 0xdf, 0x7f, 0x4c, 0xb0, 0xaa, 0xea, 0x7d, 0x14, 0x17, 0x97, 0x6b, 0x95, 0x53,
|
||||||
|
0x54, 0x54, 0x84, 0xce, 0xce, 0xce, 0x88, 0x60, 0x8e, 0xec, 0x8b, 0xd6, 0xcf, 0x2c, 0x28, 0x04,
|
||||||
|
0x22, 0xc1, 0x0c, 0x65, 0x44, 0xb0, 0x4e, 0xbc, 0x03, 0x03, 0x03, 0xf6, 0x68, 0xfe, 0x35, 0x17,
|
||||||
|
0xb8, 0x8a, 0x5f, 0xba, 0xbb, 0xbb, 0x35, 0x09, 0xc3, 0xe5, 0x67, 0x48, 0x5f, 0x34, 0xc5, 0xa0,
|
||||||
|
0x3d, 0x4b, 0xc1, 0x31, 0x12, 0x26, 0x2e, 0x26, 0xd9, 0x6c, 0x8a, 0x55, 0xe3, 0x2a, 0xde, 0x61,
|
||||||
|
0xf9, 0x16, 0xc4, 0x62, 0xec, 0xbf, 0x01, 0x96, 0xa8, 0x5c, 0xe1, 0x12, 0x7e, 0x2a, 0x61, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
|
||||||
|
};
|
||||||
|
|
||||||
|
const BITMAP_OPAQUE autoplace_fields_xpm[1] = {{ png, sizeof( png ), "autoplace_fields_xpm" }};
|
||||||
|
|
||||||
|
//EOF
|
||||||
|
|
@ -0,0 +1,307 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
height="48"
|
||||||
|
width="48"
|
||||||
|
version="1.1"
|
||||||
|
viewBox="0 0 48 48"
|
||||||
|
id="svg2"
|
||||||
|
inkscape:version="0.91 r13725"
|
||||||
|
sodipodi:docname="autoplace_fields.svg">
|
||||||
|
<metadata
|
||||||
|
id="metadata151">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="1676"
|
||||||
|
inkscape:window-height="994"
|
||||||
|
id="namedview149"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="6.9532167"
|
||||||
|
inkscape:cx="19.533569"
|
||||||
|
inkscape:cy="26.564532"
|
||||||
|
inkscape:window-x="0"
|
||||||
|
inkscape:window-y="54"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="svg2" />
|
||||||
|
<defs
|
||||||
|
id="defs4">
|
||||||
|
<linearGradient
|
||||||
|
id="a">
|
||||||
|
<stop
|
||||||
|
stop-color="#fff"
|
||||||
|
offset="0"
|
||||||
|
id="stop7" />
|
||||||
|
<stop
|
||||||
|
stop-color="#babaff"
|
||||||
|
offset="1"
|
||||||
|
id="stop9" />
|
||||||
|
</linearGradient>
|
||||||
|
<linearGradient
|
||||||
|
id="j"
|
||||||
|
y2="10.441"
|
||||||
|
xlink:href="#a"
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
x2="12.136"
|
||||||
|
gradientTransform="matrix(2.2734557,0,0,2.6193664,-58.250764,5.4148976)"
|
||||||
|
y1="1.9828"
|
||||||
|
x1="3.4673" />
|
||||||
|
<linearGradient
|
||||||
|
id="b"
|
||||||
|
y2="7.8438"
|
||||||
|
xlink:href="#a"
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
x2="12.922"
|
||||||
|
y1="6.0625"
|
||||||
|
x1="11.078"
|
||||||
|
gradientTransform="matrix(2.5619,0,0,2.3244,-58.266136,5.4148976)" />
|
||||||
|
<linearGradient
|
||||||
|
id="k"
|
||||||
|
y2="14.691"
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
x2="30.432"
|
||||||
|
gradientTransform="translate(6.3922,12.185)"
|
||||||
|
y1="12.338"
|
||||||
|
x1="28.079">
|
||||||
|
<stop
|
||||||
|
stop-color="#fcaf3e"
|
||||||
|
offset="0"
|
||||||
|
id="stop14" />
|
||||||
|
<stop
|
||||||
|
stop-color="#ce5c00"
|
||||||
|
offset="1"
|
||||||
|
id="stop16" />
|
||||||
|
</linearGradient>
|
||||||
|
<linearGradient
|
||||||
|
id="l"
|
||||||
|
y2="22.119"
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
x2="22.81"
|
||||||
|
gradientTransform="translate(6.3922,12.185)"
|
||||||
|
y1="21.481"
|
||||||
|
x1="23.448">
|
||||||
|
<stop
|
||||||
|
stop-color="#ce5c00"
|
||||||
|
offset="0"
|
||||||
|
id="stop19" />
|
||||||
|
<stop
|
||||||
|
stop-color="#ce5c00"
|
||||||
|
offset="1"
|
||||||
|
id="stop21" />
|
||||||
|
</linearGradient>
|
||||||
|
<linearGradient
|
||||||
|
id="m"
|
||||||
|
y2="32.714"
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
x2="25.485"
|
||||||
|
y1="34.39"
|
||||||
|
x1="26.379">
|
||||||
|
<stop
|
||||||
|
stop-color="#e9b96e"
|
||||||
|
offset="0"
|
||||||
|
id="stop24" />
|
||||||
|
<stop
|
||||||
|
stop-color="#fff"
|
||||||
|
offset="1"
|
||||||
|
id="stop26" />
|
||||||
|
</linearGradient>
|
||||||
|
<radialGradient
|
||||||
|
id="p"
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
cy="128"
|
||||||
|
cx="-138.84"
|
||||||
|
gradientTransform="matrix(.35473 -.34328 .35696 .34544 130.15 -71.026)"
|
||||||
|
r="9.1267">
|
||||||
|
<stop
|
||||||
|
stop-color="#f9a9a9"
|
||||||
|
offset="0"
|
||||||
|
id="stop29" />
|
||||||
|
<stop
|
||||||
|
stop-color="#ab5f5f"
|
||||||
|
offset="1"
|
||||||
|
id="stop31" />
|
||||||
|
</radialGradient>
|
||||||
|
<linearGradient
|
||||||
|
id="n"
|
||||||
|
y2="134.25"
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
x2="-158.75"
|
||||||
|
gradientTransform="matrix(.20949 -.20274 .20949 .20274 129.28 -31.999)"
|
||||||
|
y1="115.94"
|
||||||
|
x1="-158.75">
|
||||||
|
<stop
|
||||||
|
stop-color="#ddd"
|
||||||
|
offset="0"
|
||||||
|
id="stop34" />
|
||||||
|
<stop
|
||||||
|
stop-color="#fff"
|
||||||
|
offset=".34468"
|
||||||
|
id="stop36" />
|
||||||
|
<stop
|
||||||
|
stop-color="#737373"
|
||||||
|
offset=".72695"
|
||||||
|
id="stop38" />
|
||||||
|
<stop
|
||||||
|
stop-color="#bbb"
|
||||||
|
offset="1"
|
||||||
|
id="stop40" />
|
||||||
|
</linearGradient>
|
||||||
|
<linearGradient
|
||||||
|
id="o"
|
||||||
|
y2="10.441"
|
||||||
|
xlink:href="#a"
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
x2="12.136"
|
||||||
|
gradientTransform="matrix(2.246184,0,0,2.7037,-1.2081619,11.548735)"
|
||||||
|
y1="1.9828"
|
||||||
|
x1="3.4673" />
|
||||||
|
<linearGradient
|
||||||
|
inkscape:collect="always"
|
||||||
|
xlink:href="#a"
|
||||||
|
id="linearGradient3479"
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
x1="11.078"
|
||||||
|
y1="6.0625"
|
||||||
|
x2="12.922"
|
||||||
|
y2="7.8438"
|
||||||
|
gradientTransform="matrix(2.531196,0,0,2.3993,-1.2229579,11.548735)" />
|
||||||
|
</defs>
|
||||||
|
<g
|
||||||
|
id="g4323">
|
||||||
|
<g
|
||||||
|
transform="matrix(2.531196,0,0,2.3993,-13.87883,-17.842265)"
|
||||||
|
id="g107"
|
||||||
|
style="fill:#9b9b9b">
|
||||||
|
<path
|
||||||
|
d="m 8,13.25 0,14 10.5,-7 -10.5,-7 z"
|
||||||
|
id="path109"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill-rule:evenodd" />
|
||||||
|
<rect
|
||||||
|
y="17.25"
|
||||||
|
width="1.9942"
|
||||||
|
x="6.0057998"
|
||||||
|
height="1"
|
||||||
|
id="rect111" />
|
||||||
|
<rect
|
||||||
|
y="22.25"
|
||||||
|
width="2"
|
||||||
|
x="6"
|
||||||
|
height="1"
|
||||||
|
id="rect113" />
|
||||||
|
<path
|
||||||
|
d="m 14.5,6.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
|
||||||
|
transform="matrix(1.3333,0,0,1.3333,0.66664,11.583)"
|
||||||
|
id="path115"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<rect
|
||||||
|
y="19.75"
|
||||||
|
width="2.4942"
|
||||||
|
x="19.506001"
|
||||||
|
height="1"
|
||||||
|
id="rect117" />
|
||||||
|
</g>
|
||||||
|
<rect
|
||||||
|
transform="matrix(-1.754568e-7,1,-1,-4.4663889e-8,0,0)"
|
||||||
|
height="2.5311959"
|
||||||
|
width="2.3993001"
|
||||||
|
y="-8.9018316"
|
||||||
|
x="16.347736"
|
||||||
|
id="rect119"
|
||||||
|
style="fill:#ffffff" />
|
||||||
|
<path
|
||||||
|
d="m 3.8394341,11.548735 0,33.591 26.5766399,-16.795 -26.5766399,-16.796 z"
|
||||||
|
id="path121"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill-rule:evenodd" />
|
||||||
|
<rect
|
||||||
|
y="21.146734"
|
||||||
|
width="2.5311959"
|
||||||
|
x="1.3082383"
|
||||||
|
height="2.3993001"
|
||||||
|
id="rect123" />
|
||||||
|
<rect
|
||||||
|
y="33.143135"
|
||||||
|
width="2.5311959"
|
||||||
|
x="1.3082383"
|
||||||
|
height="2.3993001"
|
||||||
|
id="rect125" />
|
||||||
|
<path
|
||||||
|
d="m 6.3853181,16.347735 0,23.993 20.2499999,-11.996 -20.2499999,-11.997 z"
|
||||||
|
id="path127"
|
||||||
|
style="fill:url(#o);fill-rule:evenodd"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
d="m 34.213624,28.344885 a 5.062338,4.79865 0 0 1 -10.124676,0 5.062338,4.79865 0 1 1 10.124676,0 z"
|
||||||
|
id="path129"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
d="m 31.68259,28.343835 a 2.531196,2.3993 0 0 1 -5.062392,0 2.531196,2.3993 0 1 1 5.062392,0 z"
|
||||||
|
id="path131"
|
||||||
|
style="fill:url(#linearGradient3479)"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<rect
|
||||||
|
y="27.144733"
|
||||||
|
width="6.3132482"
|
||||||
|
x="32.962929"
|
||||||
|
height="2.3993001"
|
||||||
|
id="rect133" />
|
||||||
|
<path
|
||||||
|
d="m 22.49337,0.60054242 0,7.19799968 2.531196,2.3992999 2.531196,0 2.531196,-2.3992999 0,-7.19799968 -2.531196,0 0,7.19799968 -2.531196,0 0,-7.19799968 -2.53152,0 z"
|
||||||
|
id="path135"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill-rule:evenodd" />
|
||||||
|
<path
|
||||||
|
d="m 32.61729,0.60054242 5.062392,0 2.531196,2.39929998 0,2.3993 -2.531196,2.3992997 -2.531196,0 0,2.3992999 -2.53044,0 0,-4.7986996 5.062392,0 0,-2.3993 -5.06196,0 0,-2.39929998 z"
|
||||||
|
id="path147"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill-rule:evenodd" />
|
||||||
|
<path
|
||||||
|
d="m 15.393889,11.860171 6.40475,0 0,2.3244 -3.84285,6.990866 -2.5619,0 3.84285,-6.9732 -3.84285,0 0,-2.342995 z"
|
||||||
|
id="path75"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill-rule:evenodd" />
|
||||||
|
<path
|
||||||
|
d="m 39.731939,11.860171 0,2.3244 3.84285,0 0,1.1622 -3.84285,3.4866 0,2.3244 6.40475,0 0,-2.3244 -3.84285,0 3.84285,-3.4866 0,-2.3244 -1.28095,-1.179842 -5.1238,0.01767 z"
|
||||||
|
id="path77"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill-rule:evenodd" />
|
||||||
|
<path
|
||||||
|
d="m 32.046239,14.312413 0.01947,4.520958 1.261505,2.3244 3.84285,0 1.300395,-2.452242 0,-4.6488 -1.300395,-2.196488 -3.84285,0 -1.28095,2.452242 z"
|
||||||
|
id="path79"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill-rule:evenodd" />
|
||||||
|
<path
|
||||||
|
d="m 33.327189,15.346771 1.28095,-1.1622 1.28095,0 1.28095,1.1622 0,2.3244 -1.28095,1.1622 -1.28095,0 -1.28095,-1.1622 0,-2.3244 z"
|
||||||
|
id="path81"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill:#ffffff;fill-rule:evenodd" />
|
||||||
|
<path
|
||||||
|
d="m 23.079589,11.860171 0,5.811 5.1238,0 0,3.4866 2.5619,0 0,-9.2976 -2.5619,0 0,3.4866 -2.5619,0 0,-3.4866 -2.5619,0 z"
|
||||||
|
id="path83"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill-rule:evenodd" />
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 8.8 KiB |
|
|
@ -416,6 +416,8 @@ bool PGM_BASE::initPgm()
|
||||||
{
|
{
|
||||||
wxString envVarName = wxT( "KIGITHUB" );
|
wxString envVarName = wxT( "KIGITHUB" );
|
||||||
ENV_VAR_ITEM envVarItem;
|
ENV_VAR_ITEM envVarItem;
|
||||||
|
wxString envValue;
|
||||||
|
wxFileName tmpFileName;
|
||||||
|
|
||||||
envVarItem.SetValue( wxString( wxT( "https://github.com/KiCad" ) ) );
|
envVarItem.SetValue( wxString( wxT( "https://github.com/KiCad" ) ) );
|
||||||
envVarItem.SetDefinedExternally( wxGetEnv( envVarName, NULL ) );
|
envVarItem.SetDefinedExternally( wxGetEnv( envVarName, NULL ) );
|
||||||
|
|
@ -429,24 +431,51 @@ bool PGM_BASE::initPgm()
|
||||||
baseSharePath.AppendDir( wxT( "kicad" ) );
|
baseSharePath.AppendDir( wxT( "kicad" ) );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
wxFileName tmpFileName = baseSharePath;
|
// KISYSMOD
|
||||||
tmpFileName.AppendDir( wxT( "modules" ) );
|
|
||||||
envVarName = wxT( "KISYSMOD" );
|
envVarName = wxT( "KISYSMOD" );
|
||||||
envVarItem.SetValue( tmpFileName.GetPath() );
|
if( wxGetEnv( envVarName, &envValue ) == true && !envValue.IsEmpty() )
|
||||||
envVarItem.SetDefinedExternally( wxGetEnv( envVarName, NULL ) );
|
{
|
||||||
|
tmpFileName.AssignDir( envValue );
|
||||||
|
envVarItem.SetDefinedExternally( true );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
tmpFileName = baseSharePath;
|
||||||
|
tmpFileName.AppendDir( wxT( "modules" ) );
|
||||||
|
envVarItem.SetDefinedExternally( false );
|
||||||
|
}
|
||||||
|
envVarItem.SetValue( tmpFileName.GetFullPath() );
|
||||||
m_local_env_vars[ envVarName ] = envVarItem;
|
m_local_env_vars[ envVarName ] = envVarItem;
|
||||||
|
|
||||||
|
// KISYS3DMOD
|
||||||
envVarName = wxT( "KISYS3DMOD" );
|
envVarName = wxT( "KISYS3DMOD" );
|
||||||
tmpFileName.AppendDir( wxT( "packages3d" ) );
|
if( wxGetEnv( envVarName, &envValue ) == true && !envValue.IsEmpty() )
|
||||||
envVarItem.SetValue( tmpFileName.GetPath() );
|
{
|
||||||
envVarItem.SetDefinedExternally( wxGetEnv( envVarName, NULL ) );
|
tmpFileName.AssignDir( envValue );
|
||||||
|
envVarItem.SetDefinedExternally( true );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
tmpFileName.AppendDir( wxT( "packages3d" ) );
|
||||||
|
envVarItem.SetDefinedExternally( false );
|
||||||
|
}
|
||||||
|
envVarItem.SetValue( tmpFileName.GetFullPath() );
|
||||||
m_local_env_vars[ envVarName ] = envVarItem;
|
m_local_env_vars[ envVarName ] = envVarItem;
|
||||||
|
|
||||||
|
// KICAD_PTEMPLATES
|
||||||
envVarName = wxT( "KICAD_PTEMPLATES" );
|
envVarName = wxT( "KICAD_PTEMPLATES" );
|
||||||
tmpFileName = baseSharePath;
|
if( wxGetEnv( envVarName, &envValue ) == true && !envValue.IsEmpty() )
|
||||||
tmpFileName.AppendDir( wxT( "template" ) );
|
{
|
||||||
envVarItem.SetValue( tmpFileName.GetPath() );
|
tmpFileName.AssignDir( envValue );
|
||||||
envVarItem.SetDefinedExternally( wxGetEnv( envVarName, NULL ) );
|
envVarItem.SetDefinedExternally( true );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
tmpFileName = baseSharePath;
|
||||||
|
tmpFileName.AppendDir( wxT( "template" ) );
|
||||||
|
envVarItem.SetDefinedExternally( false );
|
||||||
|
}
|
||||||
|
envVarItem.SetValue( tmpFileName.GetFullPath() );
|
||||||
m_local_env_vars[ envVarName ] = envVarItem;
|
m_local_env_vars[ envVarName ] = envVarItem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -36,11 +36,11 @@ popt = pctl.GetPlotOptions()
|
||||||
popt.SetOutputDirectory(plotDir)
|
popt.SetOutputDirectory(plotDir)
|
||||||
|
|
||||||
# Set some important plot options:
|
# Set some important plot options:
|
||||||
popt.SetPlotFrameRef(False)
|
popt.SetPlotFrameRef(False) #do not change it
|
||||||
popt.SetLineWidth(FromMM(0.35))
|
popt.SetLineWidth(FromMM(0.35))
|
||||||
|
|
||||||
popt.SetAutoScale(False)
|
popt.SetAutoScale(False) #do not change it
|
||||||
popt.SetScale(1)
|
popt.SetScale(1) #do not change it
|
||||||
popt.SetMirror(False)
|
popt.SetMirror(False)
|
||||||
popt.SetUseGerberAttributes(True)
|
popt.SetUseGerberAttributes(True)
|
||||||
popt.SetUseGerberProtelExtensions(False)
|
popt.SetUseGerberProtelExtensions(False)
|
||||||
|
|
@ -100,7 +100,10 @@ drlwriter.SetMapFileFormat( PLOT_FORMAT_PDF )
|
||||||
mirror = False
|
mirror = False
|
||||||
minimalHeader = False
|
minimalHeader = False
|
||||||
offset = wxPoint(0,0)
|
offset = wxPoint(0,0)
|
||||||
drlwriter.SetOptions( mirror, minimalHeader, offset )
|
# False to generate 2 separate drill files (one for plated holes, one for non plated holes)
|
||||||
|
# True to generate only one drill file
|
||||||
|
mergeNPTH = False
|
||||||
|
drlwriter.SetOptions( mirror, minimalHeader, offset, mergeNPTH )
|
||||||
|
|
||||||
metricFmt = True
|
metricFmt = True
|
||||||
drlwriter.SetFormat( metricFmt )
|
drlwriter.SetFormat( metricFmt )
|
||||||
|
|
|
||||||
|
|
@ -73,6 +73,7 @@ set( EESCHEMA_DLGS
|
||||||
)
|
)
|
||||||
|
|
||||||
set( EESCHEMA_SRCS
|
set( EESCHEMA_SRCS
|
||||||
|
autoplace_fields.cpp
|
||||||
annotate.cpp
|
annotate.cpp
|
||||||
backanno.cpp
|
backanno.cpp
|
||||||
block.cpp
|
block.cpp
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
/*
|
/*
|
||||||
* This program source code file is part of KiCad, a free EDA CAD application.
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
||||||
*
|
*
|
||||||
* Copyright (C) 2004-2013 KiCad Developers, see change_log.txt for contributors.
|
* Copyright (C) 2004-2015 KiCad Developers, see change_log.txt for contributors.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
|
|
@ -35,19 +35,18 @@
|
||||||
|
|
||||||
#include <sch_reference_list.h>
|
#include <sch_reference_list.h>
|
||||||
#include <class_library.h>
|
#include <class_library.h>
|
||||||
|
#include <sch_sheet.h>
|
||||||
|
|
||||||
|
|
||||||
void SCH_EDIT_FRAME::DeleteAnnotation( bool aCurrentSheetOnly )
|
void SCH_EDIT_FRAME::DeleteAnnotation( bool aCurrentSheetOnly )
|
||||||
{
|
{
|
||||||
if( aCurrentSheetOnly )
|
if( aCurrentSheetOnly )
|
||||||
{
|
{
|
||||||
SCH_SCREEN* screen = GetScreen();
|
m_CurrentSheet->Last()->ClearAnnotation();
|
||||||
wxCHECK_RET( screen != NULL, wxT( "Attempt to clear annotation of a NULL screen." ) );
|
|
||||||
screen->ClearAnnotation( m_CurrentSheet );
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
SCH_SCREENS ScreenList;
|
m_CurrentSheet->Last()->GetRootSheet()->ClearAnnotation( true );
|
||||||
ScreenList.ClearAnnotation();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update the references for the sheet that is currently being displayed.
|
// Update the references for the sheet that is currently being displayed.
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,648 @@
|
||||||
|
/*
|
||||||
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
||||||
|
*
|
||||||
|
* Copyright (C) 2015 Chris Pavlina <pavlina.chris@gmail.com>
|
||||||
|
* Copyright (C) 2015 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
|
||||||
|
* 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
|
||||||
|
*/
|
||||||
|
|
||||||
|
/******************************************************************************
|
||||||
|
* Field autoplacer: Tries to find an optimal place for component fields, and
|
||||||
|
* places them there. There are two modes: "auto"-autoplace, and "manual" autoplace.
|
||||||
|
* Auto mode is for when the process is run automatically, like when rotating parts,
|
||||||
|
* and it avoids doing things that would be helpful for the final positioning but
|
||||||
|
* annoying if they happened without permission.
|
||||||
|
* Short description of the process:
|
||||||
|
*
|
||||||
|
* 1. Compute the dimensions of the fields' bounding box ::ComputeFBoxSize
|
||||||
|
* 2. Determine which side the fields will go on. ::choose_side_for_fields
|
||||||
|
* 1. Sort the four sides in preference order,
|
||||||
|
* depending on the component's shape and
|
||||||
|
* orientation ::get_preferred_sides
|
||||||
|
* 2. If in manual mode, sift out the sides that would
|
||||||
|
* cause fields to overlap other items ::get_colliding_sides
|
||||||
|
* 3. If any remaining sides have zero pins there,
|
||||||
|
* choose the highest zero-pin side according to
|
||||||
|
* preference order.
|
||||||
|
* 4. If all sides have pins, choose the side with the
|
||||||
|
* fewest pins.
|
||||||
|
* 3. Compute the position of the fields' bounding box ::field_box_placement
|
||||||
|
* 4. In manual mode, shift the box vertically if possible
|
||||||
|
* to fit fields between adjacent wires ::fit_fields_between_wires
|
||||||
|
* 5. Move all fields to their final positions
|
||||||
|
* 1. Re-justify fields if options allow that ::justify_field
|
||||||
|
* 2. Round to a 50-mil grid coordinate if desired
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <schframe.h>
|
||||||
|
#include <hotkeys_basic.h>
|
||||||
|
#include <sch_component.h>
|
||||||
|
#include <sch_line.h>
|
||||||
|
#include <lib_pin.h>
|
||||||
|
#include <class_drawpanel.h>
|
||||||
|
#include <class_libentry.h>
|
||||||
|
#include <eeschema_config.h>
|
||||||
|
#include <kiface_i.h>
|
||||||
|
#include <boost/foreach.hpp>
|
||||||
|
#include <vector>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
|
#define FIELD_V_SPACING 100
|
||||||
|
#define HPADDING 25
|
||||||
|
#define VPADDING 50
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function round_n
|
||||||
|
* Round up/down to the nearest multiple of n
|
||||||
|
*/
|
||||||
|
template<typename T> T round_n( const T& value, const T& n, bool aRoundUp )
|
||||||
|
{
|
||||||
|
if( value % n )
|
||||||
|
return n * (value / n + (aRoundUp ? 1 : 0));
|
||||||
|
else
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function TO_HJUSTIFY
|
||||||
|
* Converts an integer to a horizontal justification; neg=L zero=C pos=R
|
||||||
|
*/
|
||||||
|
EDA_TEXT_HJUSTIFY_T TO_HJUSTIFY( int x )
|
||||||
|
{
|
||||||
|
return static_cast<EDA_TEXT_HJUSTIFY_T>( x );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class AUTOPLACER
|
||||||
|
{
|
||||||
|
SCH_SCREEN* m_screen;
|
||||||
|
SCH_COMPONENT* m_component;
|
||||||
|
std::vector<SCH_FIELD*> m_fields;
|
||||||
|
std::vector<SCH_ITEM*> m_colliders;
|
||||||
|
EDA_RECT m_comp_bbox;
|
||||||
|
wxSize m_fbox_size;
|
||||||
|
bool m_allow_rejustify, m_align_to_grid;
|
||||||
|
bool m_power_symbol;
|
||||||
|
|
||||||
|
public:
|
||||||
|
typedef wxPoint SIDE;
|
||||||
|
static const SIDE SIDE_TOP, SIDE_BOTTOM, SIDE_LEFT, SIDE_RIGHT;
|
||||||
|
enum COLLISION { COLLIDE_NONE, COLLIDE_OBJECTS, COLLIDE_H_WIRES };
|
||||||
|
|
||||||
|
struct SIDE_AND_NPINS
|
||||||
|
{
|
||||||
|
SIDE side;
|
||||||
|
unsigned pins;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct SIDE_AND_COLL
|
||||||
|
{
|
||||||
|
SIDE side;
|
||||||
|
COLLISION collision;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
AUTOPLACER( SCH_COMPONENT* aComponent, SCH_SCREEN* aScreen )
|
||||||
|
:m_screen( aScreen ), m_component( aComponent )
|
||||||
|
{
|
||||||
|
m_component->GetFields( m_fields, /* aVisibleOnly */ true );
|
||||||
|
Kiface().KifaceSettings()->Read( AUTOPLACE_JUSTIFY_KEY, &m_allow_rejustify, true );
|
||||||
|
Kiface().KifaceSettings()->Read( AUTOPLACE_ALIGN_KEY, &m_align_to_grid, false );
|
||||||
|
|
||||||
|
m_comp_bbox = m_component->GetBodyBoundingBox();
|
||||||
|
m_fbox_size = ComputeFBoxSize();
|
||||||
|
|
||||||
|
m_power_symbol = ! m_component->IsInNetlist();
|
||||||
|
|
||||||
|
if( aScreen )
|
||||||
|
get_possible_colliders( m_colliders );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Do the actual autoplacement.
|
||||||
|
* @param aManual - if true, use extra heuristics for smarter placement when manually
|
||||||
|
* called up.
|
||||||
|
*/
|
||||||
|
void DoAutoplace( bool aManual )
|
||||||
|
{
|
||||||
|
SIDE field_side = choose_side_for_fields( aManual );
|
||||||
|
wxPoint fbox_pos = field_box_placement( field_side );
|
||||||
|
EDA_RECT field_box( fbox_pos, m_fbox_size );
|
||||||
|
|
||||||
|
if( aManual )
|
||||||
|
{
|
||||||
|
fbox_pos = fit_fields_between_wires( field_box, field_side );
|
||||||
|
field_box.SetOrigin( fbox_pos );
|
||||||
|
}
|
||||||
|
|
||||||
|
// Move the fields
|
||||||
|
for( int field_idx = 0; field_idx < m_fields.size(); ++field_idx )
|
||||||
|
{
|
||||||
|
SCH_FIELD* field = m_fields[field_idx];
|
||||||
|
|
||||||
|
if( m_allow_rejustify )
|
||||||
|
justify_field( field, field_side );
|
||||||
|
|
||||||
|
wxPoint pos(
|
||||||
|
field_horiz_placement( field, field_box ),
|
||||||
|
field_box.GetY() + (FIELD_V_SPACING * field_idx) );
|
||||||
|
|
||||||
|
if( m_align_to_grid )
|
||||||
|
{
|
||||||
|
pos.x = round_n( pos.x, 50, field_side.x >= 0 );
|
||||||
|
pos.y = round_n( pos.y, 50, field_side.y == 1 );
|
||||||
|
}
|
||||||
|
|
||||||
|
field->SetPosition( pos );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
protected:
|
||||||
|
/**
|
||||||
|
* Compute and return the size of the fields' bounding box.
|
||||||
|
*/
|
||||||
|
wxSize ComputeFBoxSize()
|
||||||
|
{
|
||||||
|
int max_field_width = 0;
|
||||||
|
BOOST_FOREACH( SCH_FIELD* field, m_fields )
|
||||||
|
{
|
||||||
|
int field_width;
|
||||||
|
|
||||||
|
if( m_component->GetTransform().y1 )
|
||||||
|
{
|
||||||
|
field->SetOrientation( TEXT_ORIENT_VERT );
|
||||||
|
field_width = field->GetBoundingBox().GetHeight();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
field->SetOrientation( TEXT_ORIENT_HORIZ );
|
||||||
|
field_width = field->GetBoundingBox().GetWidth();
|
||||||
|
}
|
||||||
|
|
||||||
|
max_field_width = std::max( max_field_width, field_width );
|
||||||
|
}
|
||||||
|
|
||||||
|
return wxSize( max_field_width, int( FIELD_V_SPACING * (m_fields.size() - 1) ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function get_pin_side
|
||||||
|
* Return the side that a pin is on.
|
||||||
|
*/
|
||||||
|
SIDE get_pin_side( LIB_PIN* aPin )
|
||||||
|
{
|
||||||
|
int pin_orient = aPin->PinDrawOrient( m_component->GetTransform() );
|
||||||
|
switch( pin_orient )
|
||||||
|
{
|
||||||
|
case PIN_RIGHT: return SIDE_LEFT;
|
||||||
|
case PIN_LEFT: return SIDE_RIGHT;
|
||||||
|
case PIN_UP: return SIDE_BOTTOM;
|
||||||
|
case PIN_DOWN: return SIDE_TOP;
|
||||||
|
default:
|
||||||
|
wxFAIL_MSG( "Invalid pin orientation" );
|
||||||
|
return SIDE_LEFT;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function pins_on_side
|
||||||
|
* Count the number of pins on a side of the component.
|
||||||
|
*/
|
||||||
|
unsigned pins_on_side( SIDE aSide )
|
||||||
|
{
|
||||||
|
unsigned pin_count = 0;
|
||||||
|
|
||||||
|
std::vector<LIB_PIN*> pins;
|
||||||
|
m_component->GetPins( pins );
|
||||||
|
|
||||||
|
BOOST_FOREACH( LIB_PIN* each_pin, pins )
|
||||||
|
{
|
||||||
|
if( !each_pin->IsVisible() && !m_power_symbol )
|
||||||
|
continue;
|
||||||
|
if( get_pin_side( each_pin ) == aSide )
|
||||||
|
++pin_count;
|
||||||
|
}
|
||||||
|
|
||||||
|
return pin_count;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function get_possible_colliders
|
||||||
|
* Populate a list of all drawing items that *may* collide with the fields. That is,
|
||||||
|
* all drawing items, including other fields, that are not the current component or
|
||||||
|
* its own fields.
|
||||||
|
*/
|
||||||
|
void get_possible_colliders( std::vector<SCH_ITEM*>& aItems )
|
||||||
|
{
|
||||||
|
wxASSERT_MSG( m_screen, "get_possible_colliders() with null m_screen" );
|
||||||
|
for( SCH_ITEM* item = m_screen->GetDrawItems(); item; item = item->Next() )
|
||||||
|
{
|
||||||
|
if( SCH_COMPONENT* comp = dynamic_cast<SCH_COMPONENT*>( item ) )
|
||||||
|
{
|
||||||
|
if( comp == m_component ) continue;
|
||||||
|
|
||||||
|
std::vector<SCH_FIELD*> fields;
|
||||||
|
comp->GetFields( fields, /* aVisibleOnly */ true );
|
||||||
|
BOOST_FOREACH( SCH_FIELD* field, fields )
|
||||||
|
aItems.push_back( field );
|
||||||
|
}
|
||||||
|
aItems.push_back( item );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function filtered_colliders
|
||||||
|
* Filter a list of possible colliders to include only those that actually collide
|
||||||
|
* with a given rectangle. Returns the new vector.
|
||||||
|
*/
|
||||||
|
std::vector<SCH_ITEM*> filtered_colliders( const EDA_RECT& aRect )
|
||||||
|
{
|
||||||
|
std::vector<SCH_ITEM*> filtered;
|
||||||
|
BOOST_FOREACH( SCH_ITEM* item, m_colliders )
|
||||||
|
{
|
||||||
|
EDA_RECT item_box;
|
||||||
|
if( SCH_COMPONENT* item_comp = dynamic_cast<SCH_COMPONENT*>( item ) )
|
||||||
|
item_box = item_comp->GetBodyBoundingBox();
|
||||||
|
else
|
||||||
|
item_box = item->GetBoundingBox();
|
||||||
|
|
||||||
|
if( item_box.Intersects( aRect ) )
|
||||||
|
filtered.push_back( item );
|
||||||
|
}
|
||||||
|
return filtered;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function get_preferred_sides
|
||||||
|
* Return a list with the preferred field sides for the component, in
|
||||||
|
* decreasing order of preference.
|
||||||
|
*/
|
||||||
|
std::vector<SIDE_AND_NPINS> get_preferred_sides()
|
||||||
|
{
|
||||||
|
SIDE_AND_NPINS sides_init[] = {
|
||||||
|
{ SIDE_RIGHT, pins_on_side( SIDE_RIGHT ) },
|
||||||
|
{ SIDE_TOP, pins_on_side( SIDE_TOP ) },
|
||||||
|
{ SIDE_LEFT, pins_on_side( SIDE_LEFT ) },
|
||||||
|
{ SIDE_BOTTOM, pins_on_side( SIDE_BOTTOM ) },
|
||||||
|
};
|
||||||
|
std::vector<SIDE_AND_NPINS> sides( sides_init, sides_init + DIM( sides_init ) );
|
||||||
|
|
||||||
|
int orient = m_component->GetOrientation();
|
||||||
|
int orient_angle = orient & 0xff; // enum is a bitmask
|
||||||
|
bool h_mirrored = ( ( orient & CMP_MIRROR_X )
|
||||||
|
&& ( orient_angle == CMP_ORIENT_0 || orient_angle == CMP_ORIENT_180 ) );
|
||||||
|
double w = double( m_comp_bbox.GetWidth() );
|
||||||
|
double h = double( m_comp_bbox.GetHeight() );
|
||||||
|
|
||||||
|
// The preferred-sides heuristics are a bit magical. These were determined mostly
|
||||||
|
// by trial and error.
|
||||||
|
|
||||||
|
if( m_power_symbol )
|
||||||
|
{
|
||||||
|
// For power symbols, we generally want the label at the top first.
|
||||||
|
switch( orient_angle )
|
||||||
|
{
|
||||||
|
case CMP_ORIENT_0:
|
||||||
|
std::swap( sides[0], sides[1] );
|
||||||
|
std::swap( sides[1], sides[3] );
|
||||||
|
// TOP, BOTTOM, RIGHT, LEFT
|
||||||
|
break;
|
||||||
|
case CMP_ORIENT_90:
|
||||||
|
std::swap( sides[0], sides[2] );
|
||||||
|
std::swap( sides[1], sides[2] );
|
||||||
|
// LEFT, RIGHT, TOP, BOTTOM
|
||||||
|
break;
|
||||||
|
case CMP_ORIENT_180:
|
||||||
|
std::swap( sides[0], sides[3] );
|
||||||
|
// BOTTOM, TOP, LEFT, RIGHT
|
||||||
|
break;
|
||||||
|
case CMP_ORIENT_270:
|
||||||
|
std::swap( sides[1], sides[2] );
|
||||||
|
// RIGHT, LEFT, TOP, BOTTOM
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// If the component is horizontally mirrored, swap left and right
|
||||||
|
if( h_mirrored )
|
||||||
|
{
|
||||||
|
std::swap( sides[0], sides[2] );
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the component is very long or is a power symbol, swap H and V
|
||||||
|
if( w/h > 3.0 )
|
||||||
|
{
|
||||||
|
std::swap( sides[0], sides[1] );
|
||||||
|
std::swap( sides[1], sides[3] );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return sides;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function get_colliding_sides
|
||||||
|
* Return a list of the sides where a field set would collide with another item.
|
||||||
|
*/
|
||||||
|
std::vector<SIDE_AND_COLL> get_colliding_sides()
|
||||||
|
{
|
||||||
|
SIDE sides_init[] = { SIDE_RIGHT, SIDE_TOP, SIDE_LEFT, SIDE_BOTTOM };
|
||||||
|
std::vector<SIDE> sides( sides_init, sides_init + DIM( sides_init ) );
|
||||||
|
std::vector<SIDE_AND_COLL> colliding;
|
||||||
|
|
||||||
|
// Iterate over all sides and find the ones that collide
|
||||||
|
BOOST_FOREACH( SIDE side, sides )
|
||||||
|
{
|
||||||
|
EDA_RECT box( field_box_placement( side ), m_fbox_size );
|
||||||
|
|
||||||
|
COLLISION collision = COLLIDE_NONE;
|
||||||
|
BOOST_FOREACH( SCH_ITEM* collider, filtered_colliders( box ) )
|
||||||
|
{
|
||||||
|
SCH_LINE* line = dynamic_cast<SCH_LINE*>( collider );
|
||||||
|
if( line && !side.x )
|
||||||
|
{
|
||||||
|
wxPoint start = line->GetStartPoint(), end = line->GetEndPoint();
|
||||||
|
if( start.y == end.y && collision != COLLIDE_OBJECTS )
|
||||||
|
collision = COLLIDE_H_WIRES;
|
||||||
|
else
|
||||||
|
collision = COLLIDE_OBJECTS;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
collision = COLLIDE_OBJECTS;
|
||||||
|
}
|
||||||
|
|
||||||
|
if( collision != COLLIDE_NONE )
|
||||||
|
colliding.push_back( (SIDE_AND_COLL){ side, collision } );
|
||||||
|
}
|
||||||
|
|
||||||
|
return colliding;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function choose_side_filtered
|
||||||
|
* Choose a side for the fields, filtered on only one side collision type.
|
||||||
|
* Removes the sides matching the filter from the list.
|
||||||
|
*/
|
||||||
|
SIDE_AND_NPINS choose_side_filtered( std::vector<SIDE_AND_NPINS>& aSides,
|
||||||
|
const std::vector<SIDE_AND_COLL>& aCollidingSides, COLLISION aCollision,
|
||||||
|
SIDE_AND_NPINS aLastSelection)
|
||||||
|
{
|
||||||
|
SIDE_AND_NPINS sel = aLastSelection;
|
||||||
|
|
||||||
|
std::vector<SIDE_AND_NPINS>::iterator it = aSides.begin();
|
||||||
|
while( it != aSides.end() )
|
||||||
|
{
|
||||||
|
bool collide = false;
|
||||||
|
BOOST_FOREACH( SIDE_AND_COLL collision, aCollidingSides )
|
||||||
|
{
|
||||||
|
if( collision.side == it->side && collision.collision == aCollision )
|
||||||
|
collide = true;
|
||||||
|
}
|
||||||
|
if( !collide )
|
||||||
|
++it;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if( it->pins <= sel.pins )
|
||||||
|
{
|
||||||
|
sel.pins = it->pins;
|
||||||
|
sel.side = it->side;
|
||||||
|
}
|
||||||
|
it = aSides.erase( it );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return sel;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function choose_side_for_fields
|
||||||
|
* Look where a component's pins are to pick a side to put the fields on
|
||||||
|
* @param aAvoidCollisions - if true, pick last the sides where the label will collide
|
||||||
|
* with other items.
|
||||||
|
*/
|
||||||
|
SIDE choose_side_for_fields( bool aAvoidCollisions )
|
||||||
|
{
|
||||||
|
std::vector<SIDE_AND_NPINS> sides = get_preferred_sides();
|
||||||
|
|
||||||
|
std::reverse( sides.begin(), sides.end() );
|
||||||
|
SIDE_AND_NPINS side = { wxPoint( 1, 0 ), UINT_MAX };
|
||||||
|
|
||||||
|
if( aAvoidCollisions )
|
||||||
|
{
|
||||||
|
std::vector<SIDE_AND_COLL> colliding_sides = get_colliding_sides();
|
||||||
|
side = choose_side_filtered( sides, colliding_sides, COLLIDE_OBJECTS, side );
|
||||||
|
side = choose_side_filtered( sides, colliding_sides, COLLIDE_H_WIRES, side );
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_REVERSE_FOREACH( SIDE_AND_NPINS& each_side, sides )
|
||||||
|
{
|
||||||
|
if( !each_side.pins ) return each_side.side;
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_FOREACH( SIDE_AND_NPINS& each_side, sides )
|
||||||
|
{
|
||||||
|
if( each_side.pins <= side.pins )
|
||||||
|
{
|
||||||
|
side.pins = each_side.pins;
|
||||||
|
side.side = each_side.side;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return side.side;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function justify_field
|
||||||
|
* Set the justification of a field based on the side it's supposed to be on, taking
|
||||||
|
* into account whether the field will be displayed with flipped justification due to
|
||||||
|
* mirroring.
|
||||||
|
*/
|
||||||
|
void justify_field( SCH_FIELD* aField, SIDE aFieldSide )
|
||||||
|
{
|
||||||
|
// Justification is set twice to allow IsHorizJustifyFlipped() to work correctly.
|
||||||
|
aField->SetHorizJustify( TO_HJUSTIFY( -aFieldSide.x ) );
|
||||||
|
aField->SetHorizJustify( TO_HJUSTIFY( -aFieldSide.x *
|
||||||
|
( aField->IsHorizJustifyFlipped() ? -1 : 1 ) ) );
|
||||||
|
aField->SetVertJustify( GR_TEXT_VJUSTIFY_CENTER );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function field_box_placement
|
||||||
|
* Returns the position of the field bounding box.
|
||||||
|
*/
|
||||||
|
wxPoint field_box_placement( SIDE aFieldSide )
|
||||||
|
{
|
||||||
|
wxPoint fbox_center = m_comp_bbox.Centre();
|
||||||
|
int offs_x = ( m_comp_bbox.GetWidth() + m_fbox_size.GetWidth() ) / 2 + HPADDING;
|
||||||
|
int offs_y = ( m_comp_bbox.GetHeight() + m_fbox_size.GetHeight() ) / 2 + VPADDING;
|
||||||
|
|
||||||
|
fbox_center.x += aFieldSide.x * offs_x;
|
||||||
|
fbox_center.y += aFieldSide.y * offs_y;
|
||||||
|
|
||||||
|
wxPoint fbox_pos(
|
||||||
|
fbox_center.x - m_fbox_size.GetWidth() / 2,
|
||||||
|
fbox_center.y - m_fbox_size.GetHeight() / 2 );
|
||||||
|
|
||||||
|
return fbox_pos;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function fit_fields_between_wires
|
||||||
|
* Shift a field box up or down a bit to make the fields fit between some wires.
|
||||||
|
* Returns the new position of the field bounding box.
|
||||||
|
*/
|
||||||
|
wxPoint fit_fields_between_wires( const EDA_RECT& aBox, SIDE aSide )
|
||||||
|
{
|
||||||
|
if( aSide != SIDE_TOP && aSide != SIDE_BOTTOM )
|
||||||
|
return aBox.GetPosition();
|
||||||
|
|
||||||
|
std::vector<SCH_ITEM*> colliders = filtered_colliders( aBox );
|
||||||
|
if( colliders.empty() )
|
||||||
|
return aBox.GetPosition();
|
||||||
|
|
||||||
|
// Find the offset of the wires for proper positioning
|
||||||
|
int offset = 0;
|
||||||
|
|
||||||
|
BOOST_FOREACH( SCH_ITEM* item, colliders )
|
||||||
|
{
|
||||||
|
SCH_LINE* line = dynamic_cast<SCH_LINE*>( item );
|
||||||
|
if( !line )
|
||||||
|
return aBox.GetPosition();
|
||||||
|
wxPoint start = line->GetStartPoint(), end = line->GetEndPoint();
|
||||||
|
if( start.y != end.y )
|
||||||
|
return aBox.GetPosition();
|
||||||
|
|
||||||
|
int this_offset = (3 * FIELD_V_SPACING / 2) - ( start.y % FIELD_V_SPACING );
|
||||||
|
if( offset == 0 )
|
||||||
|
offset = this_offset;
|
||||||
|
else if( offset != this_offset )
|
||||||
|
return aBox.GetPosition();
|
||||||
|
}
|
||||||
|
|
||||||
|
if( aSide == SIDE_TOP )
|
||||||
|
offset = -offset;
|
||||||
|
|
||||||
|
wxPoint pos = aBox.GetPosition();
|
||||||
|
pos.y = round_n( pos.y - offset, FIELD_V_SPACING, aSide == SIDE_BOTTOM ) + offset;
|
||||||
|
return pos;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function field_horiz_placement
|
||||||
|
* Place a field horizontally, taking into account the field width and
|
||||||
|
* justification.
|
||||||
|
*
|
||||||
|
* @param aField - the field to place.
|
||||||
|
* @param aFieldBox - box in which fields will be placed
|
||||||
|
*
|
||||||
|
* @return Correct field horizontal position
|
||||||
|
*/
|
||||||
|
int field_horiz_placement( SCH_FIELD *aField, const EDA_RECT &aFieldBox )
|
||||||
|
{
|
||||||
|
int field_hjust;
|
||||||
|
int field_xcoord;
|
||||||
|
|
||||||
|
if( aField->IsHorizJustifyFlipped() )
|
||||||
|
field_hjust = -aField->GetHorizJustify();
|
||||||
|
else
|
||||||
|
field_hjust = aField->GetHorizJustify();
|
||||||
|
|
||||||
|
switch( field_hjust )
|
||||||
|
{
|
||||||
|
case GR_TEXT_HJUSTIFY_LEFT:
|
||||||
|
field_xcoord = aFieldBox.GetLeft();
|
||||||
|
break;
|
||||||
|
case GR_TEXT_HJUSTIFY_CENTER:
|
||||||
|
field_xcoord = aFieldBox.Centre().x;
|
||||||
|
break;
|
||||||
|
case GR_TEXT_HJUSTIFY_RIGHT:
|
||||||
|
field_xcoord = aFieldBox.GetRight();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
wxFAIL_MSG( "Unexpected value for SCH_FIELD::GetHorizJustify()" );
|
||||||
|
field_xcoord = aFieldBox.Centre().x; // Most are centered
|
||||||
|
}
|
||||||
|
|
||||||
|
return field_xcoord;
|
||||||
|
}
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
const AUTOPLACER::SIDE AUTOPLACER::SIDE_TOP( 0, -1 );
|
||||||
|
const AUTOPLACER::SIDE AUTOPLACER::SIDE_BOTTOM( 0, 1 );
|
||||||
|
const AUTOPLACER::SIDE AUTOPLACER::SIDE_LEFT( -1, 0 );
|
||||||
|
const AUTOPLACER::SIDE AUTOPLACER::SIDE_RIGHT( 1, 0 );
|
||||||
|
|
||||||
|
|
||||||
|
void SCH_EDIT_FRAME::OnAutoplaceFields( wxCommandEvent& aEvent )
|
||||||
|
{
|
||||||
|
SCH_SCREEN* screen = GetScreen();
|
||||||
|
SCH_ITEM* item = screen->GetCurItem();
|
||||||
|
|
||||||
|
// Get the item under cursor if we're not currently moving something
|
||||||
|
if( !item )
|
||||||
|
{
|
||||||
|
if( aEvent.GetInt() == 0 )
|
||||||
|
return;
|
||||||
|
|
||||||
|
EDA_HOTKEY_CLIENT_DATA& data = dynamic_cast<EDA_HOTKEY_CLIENT_DATA&>(
|
||||||
|
*aEvent.GetClientObject() );
|
||||||
|
item = LocateItem( data.GetPosition(), SCH_COLLECTOR::MovableItems, aEvent.GetInt() );
|
||||||
|
screen->SetCurItem( NULL );
|
||||||
|
if( !item || item->GetFlags() )
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
SCH_COMPONENT* component = dynamic_cast<SCH_COMPONENT*>( item );
|
||||||
|
if( !component )
|
||||||
|
return;
|
||||||
|
|
||||||
|
if( !component->IsNew() )
|
||||||
|
SaveCopyInUndoList( component, UR_CHANGED );
|
||||||
|
|
||||||
|
component->AutoplaceFields( screen, /* aManual */ true );
|
||||||
|
|
||||||
|
GetCanvas()->Refresh();
|
||||||
|
OnModify();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void SCH_COMPONENT::AutoplaceFields( SCH_SCREEN* aScreen, bool aManual )
|
||||||
|
{
|
||||||
|
if( aManual )
|
||||||
|
wxASSERT_MSG( aScreen, "A SCH_SCREEN pointer must be given for manual autoplacement" );
|
||||||
|
AUTOPLACER autoplacer( this, aScreen );
|
||||||
|
autoplacer.DoAutoplace( aManual );
|
||||||
|
m_fieldsAutoplaced = ( aManual? AUTOPLACED_MANUAL : AUTOPLACED_AUTO );
|
||||||
|
}
|
||||||
|
|
@ -1194,7 +1194,7 @@ const EDA_RECT LIB_PART::GetBodyBoundingBox( int aUnit, int aConvert ) const
|
||||||
if( item.m_Convert > 0 && ( ( aConvert > 0 ) && ( aConvert != item.m_Convert ) ) )
|
if( item.m_Convert > 0 && ( ( aConvert > 0 ) && ( aConvert != item.m_Convert ) ) )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if ( item.Type() == LIB_FIELD_T )
|
if( item.Type() == LIB_FIELD_T )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if( initialized )
|
if( initialized )
|
||||||
|
|
|
||||||
|
|
@ -425,11 +425,11 @@ public:
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function ClearAnnotation
|
* Function ClearAnnotation
|
||||||
* clears the annotation for the components in \a aSheetPath on the screen.
|
* clears the annotation for the components in \a aSheet on the screen.
|
||||||
* @param aSheetPath The sheet path of the component annotation to clear. If NULL then
|
* @param aSheet The sheet of the component annotation to clear. If NULL then
|
||||||
* the entire hierarchy is cleared.
|
* the entire hierarchy is cleared for this screen.
|
||||||
*/
|
*/
|
||||||
void ClearAnnotation( SCH_SHEET_PATH* aSheetPath );
|
void ClearAnnotation( SCH_SHEET* aSheet );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function GetHierarchicalItems
|
* Function GetHierarchicalItems
|
||||||
|
|
@ -549,12 +549,6 @@ public:
|
||||||
SCH_SCREEN* GetNext();
|
SCH_SCREEN* GetNext();
|
||||||
SCH_SCREEN* GetScreen( unsigned int aIndex ) const;
|
SCH_SCREEN* GetScreen( unsigned int aIndex ) const;
|
||||||
|
|
||||||
/**
|
|
||||||
* Function ClearAnnotation
|
|
||||||
* clears the annotation for all components in the hierarchy.
|
|
||||||
*/
|
|
||||||
void ClearAnnotation();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function SchematicCleanUp
|
* Function SchematicCleanUp
|
||||||
* merges and breaks wire segments in the entire schematic hierarchy.
|
* merges and breaks wire segments in the entire schematic hierarchy.
|
||||||
|
|
|
||||||
|
|
@ -158,6 +158,9 @@ void SCH_EDIT_FRAME::EditComponent( SCH_COMPONENT* aComponent )
|
||||||
// the QUASIMODAL macros here.
|
// the QUASIMODAL macros here.
|
||||||
int ret = dlg->ShowQuasiModal();
|
int ret = dlg->ShowQuasiModal();
|
||||||
|
|
||||||
|
if( m_autoplaceFields )
|
||||||
|
aComponent->AutoAutoplaceFields( GetScreen() );
|
||||||
|
|
||||||
m_canvas->SetIgnoreMouseEvents( false );
|
m_canvas->SetIgnoreMouseEvents( false );
|
||||||
m_canvas->MoveCursorToCrossHair();
|
m_canvas->MoveCursorToCrossHair();
|
||||||
dlg->Destroy();
|
dlg->Destroy();
|
||||||
|
|
|
||||||
|
|
@ -298,6 +298,19 @@ void DIALOG_SCH_EDIT_ONE_FIELD::TransfertDataToField( bool aIncludeText )
|
||||||
|
|
||||||
m_field->SetItalic( ( m_TextShapeOpt->GetSelection() & 1 ) != 0 );
|
m_field->SetItalic( ( m_TextShapeOpt->GetSelection() & 1 ) != 0 );
|
||||||
m_field->SetBold( ( m_TextShapeOpt->GetSelection() & 2 ) != 0 );
|
m_field->SetBold( ( m_TextShapeOpt->GetSelection() & 2 ) != 0 );
|
||||||
|
|
||||||
|
// Because field autoplace can change justification, check whether this has
|
||||||
|
// been changed, and clear the autoplace flag if so.
|
||||||
|
EDA_TEXT_HJUSTIFY_T old_hjust = m_field->GetHorizJustify();
|
||||||
|
EDA_TEXT_VJUSTIFY_T old_vjust = m_field->GetVertJustify();
|
||||||
|
|
||||||
|
if( old_hjust != m_textHjustify || old_vjust != m_textVjustify )
|
||||||
|
{
|
||||||
|
EDA_ITEM *parent = m_field->GetParent();
|
||||||
|
if( SCH_COMPONENT* component = dynamic_cast<SCH_COMPONENT*>( parent ) )
|
||||||
|
component->ClearFieldsAutoplaced();
|
||||||
|
}
|
||||||
|
|
||||||
m_field->SetHorizJustify( m_textHjustify );
|
m_field->SetHorizJustify( m_textHjustify );
|
||||||
m_field->SetVertJustify( m_textVjustify );
|
m_field->SetVertJustify( m_textVjustify );
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -440,6 +440,42 @@ public:
|
||||||
*/
|
*/
|
||||||
bool GetShowPageLimits( void ) { return m_checkPageLimits->GetValue(); }
|
bool GetShowPageLimits( void ) { return m_checkPageLimits->GetValue(); }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function
|
||||||
|
* Set the AutoplaceFields setting in the dialog
|
||||||
|
*/
|
||||||
|
void SetAutoplaceFields( bool enable ) { m_checkAutoplaceFields->SetValue( enable ); }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function
|
||||||
|
* Return the current AutoplaceFields setting from the dialog
|
||||||
|
*/
|
||||||
|
bool GetAutoplaceFields() { return m_checkAutoplaceFields->GetValue(); }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function
|
||||||
|
* Set the AutoplaceJustify setting in the dialog
|
||||||
|
*/
|
||||||
|
void SetAutoplaceJustify( bool enable ) { m_checkAutoplaceJustify->SetValue( enable ); }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function
|
||||||
|
* Return the current AutoplaceJustify setting from the dialog
|
||||||
|
*/
|
||||||
|
bool GetAutoplaceJustify() { return m_checkAutoplaceJustify->GetValue(); }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function
|
||||||
|
* Set the AutoplaceAlign setting in the dialog
|
||||||
|
*/
|
||||||
|
void SetAutoplaceAlign( bool enable ) { m_checkAutoplaceAlign->SetValue( enable ); }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function
|
||||||
|
* Return the current AutoplaceAlign setting from the dialog
|
||||||
|
*/
|
||||||
|
bool GetAutoplaceAlign() { return m_checkAutoplaceAlign->GetValue(); }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function SetTemplateFields
|
* Function SetTemplateFields
|
||||||
* Set the template field data in the dialog
|
* Set the template field data in the dialog
|
||||||
|
|
|
||||||
|
|
@ -214,6 +214,15 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
|
||||||
m_checkPageLimits = new wxCheckBox( m_panel1, wxID_ANY, _("Show page limi&ts"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_checkPageLimits = new wxCheckBox( m_panel1, wxID_ANY, _("Show page limi&ts"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer2->Add( m_checkPageLimits, 0, wxALL|wxEXPAND, 3 );
|
bSizer2->Add( m_checkPageLimits, 0, wxALL|wxEXPAND, 3 );
|
||||||
|
|
||||||
|
m_checkAutoplaceFields = new wxCheckBox( m_panel1, wxID_ANY, _("Automatically place component fields"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
bSizer2->Add( m_checkAutoplaceFields, 0, wxALL, 3 );
|
||||||
|
|
||||||
|
m_checkAutoplaceJustify = new wxCheckBox( m_panel1, wxID_ANY, _("Allow field autoplace to change justification"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
bSizer2->Add( m_checkAutoplaceJustify, 0, wxALL, 3 );
|
||||||
|
|
||||||
|
m_checkAutoplaceAlign = new wxCheckBox( m_panel1, wxID_ANY, _("Always align autoplaced fields to the 50 mil grid"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
bSizer2->Add( m_checkAutoplaceAlign, 0, wxALL, 3 );
|
||||||
|
|
||||||
|
|
||||||
bSizer3->Add( bSizer2, 0, wxEXPAND, 0 );
|
bSizer3->Add( bSizer2, 0, wxEXPAND, 0 );
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2873,7 +2873,7 @@
|
||||||
<property name="border">0</property>
|
<property name="border">0</property>
|
||||||
<property name="flag">wxEXPAND</property>
|
<property name="flag">wxEXPAND</property>
|
||||||
<property name="proportion">0</property>
|
<property name="proportion">0</property>
|
||||||
<object class="wxBoxSizer" expanded="0">
|
<object class="wxBoxSizer" expanded="1">
|
||||||
<property name="minimum_size"></property>
|
<property name="minimum_size"></property>
|
||||||
<property name="name">bSizer2</property>
|
<property name="name">bSizer2</property>
|
||||||
<property name="orient">wxVERTICAL</property>
|
<property name="orient">wxVERTICAL</property>
|
||||||
|
|
@ -3663,6 +3663,270 @@
|
||||||
<event name="OnUpdateUI"></event>
|
<event name="OnUpdateUI"></event>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
<object class="sizeritem" expanded="1">
|
||||||
|
<property name="border">3</property>
|
||||||
|
<property name="flag">wxALL</property>
|
||||||
|
<property name="proportion">0</property>
|
||||||
|
<object class="wxCheckBox" expanded="1">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="checked">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="label">Automatically place component fields</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_checkAutoplaceFields</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="validator_data_type"></property>
|
||||||
|
<property name="validator_style">wxFILTER_NONE</property>
|
||||||
|
<property name="validator_type">wxDefaultValidator</property>
|
||||||
|
<property name="validator_variable"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<event name="OnChar"></event>
|
||||||
|
<event name="OnCheckBox"></event>
|
||||||
|
<event name="OnEnterWindow"></event>
|
||||||
|
<event name="OnEraseBackground"></event>
|
||||||
|
<event name="OnKeyDown"></event>
|
||||||
|
<event name="OnKeyUp"></event>
|
||||||
|
<event name="OnKillFocus"></event>
|
||||||
|
<event name="OnLeaveWindow"></event>
|
||||||
|
<event name="OnLeftDClick"></event>
|
||||||
|
<event name="OnLeftDown"></event>
|
||||||
|
<event name="OnLeftUp"></event>
|
||||||
|
<event name="OnMiddleDClick"></event>
|
||||||
|
<event name="OnMiddleDown"></event>
|
||||||
|
<event name="OnMiddleUp"></event>
|
||||||
|
<event name="OnMotion"></event>
|
||||||
|
<event name="OnMouseEvents"></event>
|
||||||
|
<event name="OnMouseWheel"></event>
|
||||||
|
<event name="OnPaint"></event>
|
||||||
|
<event name="OnRightDClick"></event>
|
||||||
|
<event name="OnRightDown"></event>
|
||||||
|
<event name="OnRightUp"></event>
|
||||||
|
<event name="OnSetFocus"></event>
|
||||||
|
<event name="OnSize"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="sizeritem" expanded="1">
|
||||||
|
<property name="border">3</property>
|
||||||
|
<property name="flag">wxALL</property>
|
||||||
|
<property name="proportion">0</property>
|
||||||
|
<object class="wxCheckBox" expanded="1">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="checked">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="label">Allow field autoplace to change justification</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_checkAutoplaceJustify</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="validator_data_type"></property>
|
||||||
|
<property name="validator_style">wxFILTER_NONE</property>
|
||||||
|
<property name="validator_type">wxDefaultValidator</property>
|
||||||
|
<property name="validator_variable"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<event name="OnChar"></event>
|
||||||
|
<event name="OnCheckBox"></event>
|
||||||
|
<event name="OnEnterWindow"></event>
|
||||||
|
<event name="OnEraseBackground"></event>
|
||||||
|
<event name="OnKeyDown"></event>
|
||||||
|
<event name="OnKeyUp"></event>
|
||||||
|
<event name="OnKillFocus"></event>
|
||||||
|
<event name="OnLeaveWindow"></event>
|
||||||
|
<event name="OnLeftDClick"></event>
|
||||||
|
<event name="OnLeftDown"></event>
|
||||||
|
<event name="OnLeftUp"></event>
|
||||||
|
<event name="OnMiddleDClick"></event>
|
||||||
|
<event name="OnMiddleDown"></event>
|
||||||
|
<event name="OnMiddleUp"></event>
|
||||||
|
<event name="OnMotion"></event>
|
||||||
|
<event name="OnMouseEvents"></event>
|
||||||
|
<event name="OnMouseWheel"></event>
|
||||||
|
<event name="OnPaint"></event>
|
||||||
|
<event name="OnRightDClick"></event>
|
||||||
|
<event name="OnRightDown"></event>
|
||||||
|
<event name="OnRightUp"></event>
|
||||||
|
<event name="OnSetFocus"></event>
|
||||||
|
<event name="OnSize"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="sizeritem" expanded="1">
|
||||||
|
<property name="border">3</property>
|
||||||
|
<property name="flag">wxALL</property>
|
||||||
|
<property name="proportion">0</property>
|
||||||
|
<object class="wxCheckBox" expanded="1">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="checked">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="label">Always align autoplaced fields to the 50 mil grid</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_checkAutoplaceAlign</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="validator_data_type"></property>
|
||||||
|
<property name="validator_style">wxFILTER_NONE</property>
|
||||||
|
<property name="validator_type">wxDefaultValidator</property>
|
||||||
|
<property name="validator_variable"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<event name="OnChar"></event>
|
||||||
|
<event name="OnCheckBox"></event>
|
||||||
|
<event name="OnEnterWindow"></event>
|
||||||
|
<event name="OnEraseBackground"></event>
|
||||||
|
<event name="OnKeyDown"></event>
|
||||||
|
<event name="OnKeyUp"></event>
|
||||||
|
<event name="OnKillFocus"></event>
|
||||||
|
<event name="OnLeaveWindow"></event>
|
||||||
|
<event name="OnLeftDClick"></event>
|
||||||
|
<event name="OnLeftDown"></event>
|
||||||
|
<event name="OnLeftUp"></event>
|
||||||
|
<event name="OnMiddleDClick"></event>
|
||||||
|
<event name="OnMiddleDown"></event>
|
||||||
|
<event name="OnMiddleUp"></event>
|
||||||
|
<event name="OnMotion"></event>
|
||||||
|
<event name="OnMouseEvents"></event>
|
||||||
|
<event name="OnMouseWheel"></event>
|
||||||
|
<event name="OnPaint"></event>
|
||||||
|
<event name="OnRightDClick"></event>
|
||||||
|
<event name="OnRightDown"></event>
|
||||||
|
<event name="OnRightUp"></event>
|
||||||
|
<event name="OnSetFocus"></event>
|
||||||
|
<event name="OnSize"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
|
||||||
|
|
@ -109,6 +109,9 @@ class DIALOG_EESCHEMA_OPTIONS_BASE : public DIALOG_SHIM
|
||||||
wxCheckBox* m_checkAutoPan;
|
wxCheckBox* m_checkAutoPan;
|
||||||
wxCheckBox* m_checkHVOrientation;
|
wxCheckBox* m_checkHVOrientation;
|
||||||
wxCheckBox* m_checkPageLimits;
|
wxCheckBox* m_checkPageLimits;
|
||||||
|
wxCheckBox* m_checkAutoplaceFields;
|
||||||
|
wxCheckBox* m_checkAutoplaceJustify;
|
||||||
|
wxCheckBox* m_checkAutoplaceAlign;
|
||||||
wxPanel* m_panel2;
|
wxPanel* m_panel2;
|
||||||
wxListView* templateFieldListCtrl;
|
wxListView* templateFieldListCtrl;
|
||||||
wxStaticText* fieldNameLabel;
|
wxStaticText* fieldNameLabel;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// C++ code generated with wxFormBuilder (version Jun 6 2014)
|
// C++ code generated with wxFormBuilder (version Jun 17 2015)
|
||||||
// http://www.wxformbuilder.org/
|
// http://www.wxformbuilder.org/
|
||||||
//
|
//
|
||||||
// PLEASE DO "NOT" EDIT THIS FILE!
|
// PLEASE DO "NOT" EDIT THIS FILE!
|
||||||
|
|
@ -49,33 +49,33 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind
|
||||||
|
|
||||||
wxString m_PaperSizeOptionChoices[] = { _("Schematic size"), _("Force size A4"), _("Force size A") };
|
wxString m_PaperSizeOptionChoices[] = { _("Schematic size"), _("Force size A4"), _("Force size A") };
|
||||||
int m_PaperSizeOptionNChoices = sizeof( m_PaperSizeOptionChoices ) / sizeof( wxString );
|
int m_PaperSizeOptionNChoices = sizeof( m_PaperSizeOptionChoices ) / sizeof( wxString );
|
||||||
m_PaperSizeOption = new wxRadioBox( this, wxID_ANY, _("Page Size:"), wxDefaultPosition, wxDefaultSize, m_PaperSizeOptionNChoices, m_PaperSizeOptionChoices, 1, wxRA_SPECIFY_COLS );
|
m_PaperSizeOption = new wxRadioBox( m_paperOptionsSizer->GetStaticBox(), wxID_ANY, _("Page Size:"), wxDefaultPosition, wxDefaultSize, m_PaperSizeOptionNChoices, m_PaperSizeOptionChoices, 1, wxRA_SPECIFY_COLS );
|
||||||
m_PaperSizeOption->SetSelection( 1 );
|
m_PaperSizeOption->SetSelection( 1 );
|
||||||
m_paperOptionsSizer->Add( m_PaperSizeOption, 0, wxALL|wxEXPAND, 5 );
|
m_paperOptionsSizer->Add( m_PaperSizeOption, 0, wxALL|wxEXPAND, 5 );
|
||||||
|
|
||||||
m_paperHPGLSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("HPGL Options") ), wxVERTICAL );
|
m_paperHPGLSizer = new wxStaticBoxSizer( new wxStaticBox( m_paperOptionsSizer->GetStaticBox(), wxID_ANY, _("HPGL Options") ), wxVERTICAL );
|
||||||
|
|
||||||
m_staticText4 = new wxStaticText( this, wxID_ANY, _("Page Size:"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticText4 = new wxStaticText( m_paperHPGLSizer->GetStaticBox(), wxID_ANY, _("Page Size:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticText4->Wrap( -1 );
|
m_staticText4->Wrap( -1 );
|
||||||
m_paperHPGLSizer->Add( m_staticText4, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
m_paperHPGLSizer->Add( m_staticText4, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
wxString m_HPGLPaperSizeOptionChoices[] = { _("Schematic size"), _("Page size A4"), _("Page size A3"), _("Page size A2"), _("Page size A1"), _("Page size A0"), _("Page size A"), _("Page size B"), _("Page size C"), _("Page size D"), _("Page size E") };
|
wxString m_HPGLPaperSizeOptionChoices[] = { _("Schematic size"), _("Page size A4"), _("Page size A3"), _("Page size A2"), _("Page size A1"), _("Page size A0"), _("Page size A"), _("Page size B"), _("Page size C"), _("Page size D"), _("Page size E") };
|
||||||
int m_HPGLPaperSizeOptionNChoices = sizeof( m_HPGLPaperSizeOptionChoices ) / sizeof( wxString );
|
int m_HPGLPaperSizeOptionNChoices = sizeof( m_HPGLPaperSizeOptionChoices ) / sizeof( wxString );
|
||||||
m_HPGLPaperSizeOption = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_HPGLPaperSizeOptionNChoices, m_HPGLPaperSizeOptionChoices, 0 );
|
m_HPGLPaperSizeOption = new wxChoice( m_paperHPGLSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_HPGLPaperSizeOptionNChoices, m_HPGLPaperSizeOptionChoices, 0 );
|
||||||
m_HPGLPaperSizeOption->SetSelection( 0 );
|
m_HPGLPaperSizeOption->SetSelection( 0 );
|
||||||
m_paperHPGLSizer->Add( m_HPGLPaperSizeOption, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
|
m_paperHPGLSizer->Add( m_HPGLPaperSizeOption, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
|
||||||
|
|
||||||
wxString m_plotOriginOptChoices[] = { _("Bottom left corner"), _("Center of the page") };
|
wxString m_plotOriginOptChoices[] = { _("Bottom left corner"), _("Center of the page") };
|
||||||
int m_plotOriginOptNChoices = sizeof( m_plotOriginOptChoices ) / sizeof( wxString );
|
int m_plotOriginOptNChoices = sizeof( m_plotOriginOptChoices ) / sizeof( wxString );
|
||||||
m_plotOriginOpt = new wxRadioBox( this, wxID_ANY, _("Origin"), wxDefaultPosition, wxDefaultSize, m_plotOriginOptNChoices, m_plotOriginOptChoices, 1, wxRA_SPECIFY_COLS );
|
m_plotOriginOpt = new wxRadioBox( m_paperHPGLSizer->GetStaticBox(), wxID_ANY, _("Origin"), wxDefaultPosition, wxDefaultSize, m_plotOriginOptNChoices, m_plotOriginOptChoices, 1, wxRA_SPECIFY_COLS );
|
||||||
m_plotOriginOpt->SetSelection( 0 );
|
m_plotOriginOpt->SetSelection( 0 );
|
||||||
m_paperHPGLSizer->Add( m_plotOriginOpt, 0, wxALL, 5 );
|
m_paperHPGLSizer->Add( m_plotOriginOpt, 0, wxALL, 5 );
|
||||||
|
|
||||||
m_penHPLGWidthTitle = new wxStaticText( this, wxID_ANY, _("Pen width"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_penHPLGWidthTitle = new wxStaticText( m_paperHPGLSizer->GetStaticBox(), wxID_ANY, _("Pen width"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_penHPLGWidthTitle->Wrap( -1 );
|
m_penHPLGWidthTitle->Wrap( -1 );
|
||||||
m_paperHPGLSizer->Add( m_penHPLGWidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
m_paperHPGLSizer->Add( m_penHPLGWidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
m_penHPGLWidthCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_penHPGLWidthCtrl = new wxTextCtrl( m_paperHPGLSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_penHPGLWidthCtrl->SetMaxLength( 0 );
|
m_penHPGLWidthCtrl->SetMaxLength( 0 );
|
||||||
m_paperHPGLSizer->Add( m_penHPGLWidthCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
|
m_paperHPGLSizer->Add( m_penHPGLWidthCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
|
||||||
|
|
||||||
|
|
@ -94,11 +94,11 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind
|
||||||
wxStaticBoxSizer* sbSizerPlotFormat;
|
wxStaticBoxSizer* sbSizerPlotFormat;
|
||||||
sbSizerPlotFormat = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("General Options") ), wxVERTICAL );
|
sbSizerPlotFormat = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("General Options") ), wxVERTICAL );
|
||||||
|
|
||||||
m_defaultLineWidthTitle = new wxStaticText( this, wxID_ANY, _("Default line thickness"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_defaultLineWidthTitle = new wxStaticText( sbSizerPlotFormat->GetStaticBox(), wxID_ANY, _("Default line thickness"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_defaultLineWidthTitle->Wrap( -1 );
|
m_defaultLineWidthTitle->Wrap( -1 );
|
||||||
sbSizerPlotFormat->Add( m_defaultLineWidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
sbSizerPlotFormat->Add( m_defaultLineWidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
m_DefaultLineSizeCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_DefaultLineSizeCtrl = new wxTextCtrl( sbSizerPlotFormat->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_DefaultLineSizeCtrl->SetMaxLength( 0 );
|
m_DefaultLineSizeCtrl->SetMaxLength( 0 );
|
||||||
m_DefaultLineSizeCtrl->SetToolTip( _("Selection of the default pen thickness used to draw items, when their thickness is set to 0.") );
|
m_DefaultLineSizeCtrl->SetToolTip( _("Selection of the default pen thickness used to draw items, when their thickness is set to 0.") );
|
||||||
|
|
||||||
|
|
@ -106,13 +106,13 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind
|
||||||
|
|
||||||
wxString m_ModeColorOptionChoices[] = { _("Color"), _("Black and white") };
|
wxString m_ModeColorOptionChoices[] = { _("Color"), _("Black and white") };
|
||||||
int m_ModeColorOptionNChoices = sizeof( m_ModeColorOptionChoices ) / sizeof( wxString );
|
int m_ModeColorOptionNChoices = sizeof( m_ModeColorOptionChoices ) / sizeof( wxString );
|
||||||
m_ModeColorOption = new wxRadioBox( this, wxID_ANY, _("Mode"), wxDefaultPosition, wxDefaultSize, m_ModeColorOptionNChoices, m_ModeColorOptionChoices, 1, wxRA_SPECIFY_COLS );
|
m_ModeColorOption = new wxRadioBox( sbSizerPlotFormat->GetStaticBox(), wxID_ANY, _("Mode"), wxDefaultPosition, wxDefaultSize, m_ModeColorOptionNChoices, m_ModeColorOptionChoices, 1, wxRA_SPECIFY_COLS );
|
||||||
m_ModeColorOption->SetSelection( 1 );
|
m_ModeColorOption->SetSelection( 1 );
|
||||||
m_ModeColorOption->SetToolTip( _("Choose if you want to draw the sheet like it appears on screen,\nor in black and white mode, better to print it when using black and white printers") );
|
m_ModeColorOption->SetToolTip( _("Choose if you want to draw the sheet like it appears on screen,\nor in black and white mode, better to print it when using black and white printers") );
|
||||||
|
|
||||||
sbSizerPlotFormat->Add( m_ModeColorOption, 0, wxALL|wxEXPAND, 5 );
|
sbSizerPlotFormat->Add( m_ModeColorOption, 0, wxALL|wxEXPAND, 5 );
|
||||||
|
|
||||||
m_PlotFrameRefOpt = new wxCheckBox( this, wxID_ANY, _("Plot border and title block"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_PlotFrameRefOpt = new wxCheckBox( sbSizerPlotFormat->GetStaticBox(), wxID_ANY, _("Plot border and title block"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_PlotFrameRefOpt->SetValue(true);
|
m_PlotFrameRefOpt->SetValue(true);
|
||||||
m_PlotFrameRefOpt->SetToolTip( _("Print (or not) the Frame references.") );
|
m_PlotFrameRefOpt->SetToolTip( _("Print (or not) the Frame references.") );
|
||||||
|
|
||||||
|
|
@ -143,10 +143,6 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind
|
||||||
wxBoxSizer* bSizer4;
|
wxBoxSizer* bSizer4;
|
||||||
bSizer4 = new wxBoxSizer( wxVERTICAL );
|
bSizer4 = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
m_staticText2 = new wxStaticText( this, wxID_ANY, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_staticText2->Wrap( -1 );
|
|
||||||
bSizer4->Add( m_staticText2, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
|
||||||
|
|
||||||
m_MessagesBox = new WX_HTML_REPORT_PANEL( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
m_MessagesBox = new WX_HTML_REPORT_PANEL( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
||||||
m_MessagesBox->SetMinSize( wxSize( 300,150 ) );
|
m_MessagesBox->SetMinSize( wxSize( 300,150 ) );
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1681,89 +1681,6 @@
|
||||||
<property name="name">bSizer4</property>
|
<property name="name">bSizer4</property>
|
||||||
<property name="orient">wxVERTICAL</property>
|
<property name="orient">wxVERTICAL</property>
|
||||||
<property name="permission">none</property>
|
<property name="permission">none</property>
|
||||||
<object class="sizeritem" expanded="1">
|
|
||||||
<property name="border">5</property>
|
|
||||||
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
|
|
||||||
<property name="proportion">0</property>
|
|
||||||
<object class="wxStaticText" expanded="1">
|
|
||||||
<property name="BottomDockable">1</property>
|
|
||||||
<property name="LeftDockable">1</property>
|
|
||||||
<property name="RightDockable">1</property>
|
|
||||||
<property name="TopDockable">1</property>
|
|
||||||
<property name="aui_layer"></property>
|
|
||||||
<property name="aui_name"></property>
|
|
||||||
<property name="aui_position"></property>
|
|
||||||
<property name="aui_row"></property>
|
|
||||||
<property name="best_size"></property>
|
|
||||||
<property name="bg"></property>
|
|
||||||
<property name="caption"></property>
|
|
||||||
<property name="caption_visible">1</property>
|
|
||||||
<property name="center_pane">0</property>
|
|
||||||
<property name="close_button">1</property>
|
|
||||||
<property name="context_help"></property>
|
|
||||||
<property name="context_menu">1</property>
|
|
||||||
<property name="default_pane">0</property>
|
|
||||||
<property name="dock">Dock</property>
|
|
||||||
<property name="dock_fixed">0</property>
|
|
||||||
<property name="docking">Left</property>
|
|
||||||
<property name="enabled">1</property>
|
|
||||||
<property name="fg"></property>
|
|
||||||
<property name="floatable">1</property>
|
|
||||||
<property name="font"></property>
|
|
||||||
<property name="gripper">0</property>
|
|
||||||
<property name="hidden">0</property>
|
|
||||||
<property name="id">wxID_ANY</property>
|
|
||||||
<property name="label">Messages:</property>
|
|
||||||
<property name="max_size"></property>
|
|
||||||
<property name="maximize_button">0</property>
|
|
||||||
<property name="maximum_size"></property>
|
|
||||||
<property name="min_size"></property>
|
|
||||||
<property name="minimize_button">0</property>
|
|
||||||
<property name="minimum_size"></property>
|
|
||||||
<property name="moveable">1</property>
|
|
||||||
<property name="name">m_staticText2</property>
|
|
||||||
<property name="pane_border">1</property>
|
|
||||||
<property name="pane_position"></property>
|
|
||||||
<property name="pane_size"></property>
|
|
||||||
<property name="permission">protected</property>
|
|
||||||
<property name="pin_button">1</property>
|
|
||||||
<property name="pos"></property>
|
|
||||||
<property name="resize">Resizable</property>
|
|
||||||
<property name="show">1</property>
|
|
||||||
<property name="size"></property>
|
|
||||||
<property name="style"></property>
|
|
||||||
<property name="subclass"></property>
|
|
||||||
<property name="toolbar_pane">0</property>
|
|
||||||
<property name="tooltip"></property>
|
|
||||||
<property name="window_extra_style"></property>
|
|
||||||
<property name="window_name"></property>
|
|
||||||
<property name="window_style"></property>
|
|
||||||
<property name="wrap">-1</property>
|
|
||||||
<event name="OnChar"></event>
|
|
||||||
<event name="OnEnterWindow"></event>
|
|
||||||
<event name="OnEraseBackground"></event>
|
|
||||||
<event name="OnKeyDown"></event>
|
|
||||||
<event name="OnKeyUp"></event>
|
|
||||||
<event name="OnKillFocus"></event>
|
|
||||||
<event name="OnLeaveWindow"></event>
|
|
||||||
<event name="OnLeftDClick"></event>
|
|
||||||
<event name="OnLeftDown"></event>
|
|
||||||
<event name="OnLeftUp"></event>
|
|
||||||
<event name="OnMiddleDClick"></event>
|
|
||||||
<event name="OnMiddleDown"></event>
|
|
||||||
<event name="OnMiddleUp"></event>
|
|
||||||
<event name="OnMotion"></event>
|
|
||||||
<event name="OnMouseEvents"></event>
|
|
||||||
<event name="OnMouseWheel"></event>
|
|
||||||
<event name="OnPaint"></event>
|
|
||||||
<event name="OnRightDClick"></event>
|
|
||||||
<event name="OnRightDown"></event>
|
|
||||||
<event name="OnRightUp"></event>
|
|
||||||
<event name="OnSetFocus"></event>
|
|
||||||
<event name="OnSize"></event>
|
|
||||||
<event name="OnUpdateUI"></event>
|
|
||||||
</object>
|
|
||||||
</object>
|
|
||||||
<object class="sizeritem" expanded="1">
|
<object class="sizeritem" expanded="1">
|
||||||
<property name="border">5</property>
|
<property name="border">5</property>
|
||||||
<property name="flag">wxEXPAND | wxALL</property>
|
<property name="flag">wxEXPAND | wxALL</property>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// C++ code generated with wxFormBuilder (version Jun 6 2014)
|
// C++ code generated with wxFormBuilder (version Jun 17 2015)
|
||||||
// http://www.wxformbuilder.org/
|
// http://www.wxformbuilder.org/
|
||||||
//
|
//
|
||||||
// PLEASE DO "NOT" EDIT THIS FILE!
|
// PLEASE DO "NOT" EDIT THIS FILE!
|
||||||
|
|
@ -68,7 +68,6 @@ class DIALOG_PLOT_SCHEMATIC_BASE : public DIALOG_SHIM
|
||||||
wxButton* m_buttonPlotCurrent;
|
wxButton* m_buttonPlotCurrent;
|
||||||
wxButton* m_buttonPlotAll;
|
wxButton* m_buttonPlotAll;
|
||||||
wxButton* m_buttonQuit;
|
wxButton* m_buttonQuit;
|
||||||
wxStaticText* m_staticText2;
|
|
||||||
WX_HTML_REPORT_PANEL* m_MessagesBox;
|
WX_HTML_REPORT_PANEL* m_MessagesBox;
|
||||||
|
|
||||||
// Virtual event handlers, overide them in your derived class
|
// Virtual event handlers, overide them in your derived class
|
||||||
|
|
|
||||||
|
|
@ -137,6 +137,10 @@ void SCH_EDIT_FRAME::EditComponentFieldText( SCH_FIELD* aField )
|
||||||
{
|
{
|
||||||
dlg.TransfertDataToField( /* aIncludeText = */ !( fieldNdx == VALUE && part->IsPower() ) );
|
dlg.TransfertDataToField( /* aIncludeText = */ !( fieldNdx == VALUE && part->IsPower() ) );
|
||||||
OnModify();
|
OnModify();
|
||||||
|
|
||||||
|
if( m_autoplaceFields )
|
||||||
|
component->AutoAutoplaceFields( GetScreen() );
|
||||||
|
|
||||||
m_canvas->Refresh();
|
m_canvas->Refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -335,6 +335,9 @@ void SCH_EDIT_FRAME::OnPreferencesOptions( wxCommandEvent& event )
|
||||||
dlg.SetEnableAutoPan( m_canvas->GetEnableAutoPan() );
|
dlg.SetEnableAutoPan( m_canvas->GetEnableAutoPan() );
|
||||||
dlg.SetEnableHVBusOrientation( GetForceHVLines() );
|
dlg.SetEnableHVBusOrientation( GetForceHVLines() );
|
||||||
dlg.SetShowPageLimits( m_showPageLimits );
|
dlg.SetShowPageLimits( m_showPageLimits );
|
||||||
|
dlg.SetAutoplaceFields( m_autoplaceFields );
|
||||||
|
dlg.SetAutoplaceJustify( m_autoplaceJustify );
|
||||||
|
dlg.SetAutoplaceAlign( m_autoplaceAlign );
|
||||||
dlg.Layout();
|
dlg.Layout();
|
||||||
dlg.Fit();
|
dlg.Fit();
|
||||||
dlg.SetMinSize( dlg.GetSize() );
|
dlg.SetMinSize( dlg.GetSize() );
|
||||||
|
|
@ -383,6 +386,9 @@ void SCH_EDIT_FRAME::OnPreferencesOptions( wxCommandEvent& event )
|
||||||
m_canvas->SetEnableAutoPan( dlg.GetEnableAutoPan() );
|
m_canvas->SetEnableAutoPan( dlg.GetEnableAutoPan() );
|
||||||
SetForceHVLines( dlg.GetEnableHVBusOrientation() );
|
SetForceHVLines( dlg.GetEnableHVBusOrientation() );
|
||||||
m_showPageLimits = dlg.GetShowPageLimits();
|
m_showPageLimits = dlg.GetShowPageLimits();
|
||||||
|
m_autoplaceFields = dlg.GetAutoplaceFields();
|
||||||
|
m_autoplaceJustify = dlg.GetAutoplaceJustify();
|
||||||
|
m_autoplaceAlign = dlg.GetAutoplaceAlign();
|
||||||
|
|
||||||
// Delete all template fieldnames and then restore them using the template field data from
|
// Delete all template fieldnames and then restore them using the template field data from
|
||||||
// the options dialog
|
// the options dialog
|
||||||
|
|
@ -503,6 +509,9 @@ void SCH_EDIT_FRAME::SaveProjectSettings( bool aAskForSave )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static const wxChar AutoplaceFieldsEntry[] = wxT( "AutoplaceFields" );
|
||||||
|
static const wxChar AutoplaceJustifyEntry[] = AUTOPLACE_JUSTIFY_KEY;
|
||||||
|
static const wxChar AutoplaceAlignEntry[] = AUTOPLACE_ALIGN_KEY;
|
||||||
static const wxChar DefaultBusWidthEntry[] = wxT( "DefaultBusWidth" );
|
static const wxChar DefaultBusWidthEntry[] = wxT( "DefaultBusWidth" );
|
||||||
static const wxChar DefaultDrawLineWidthEntry[] = wxT( "DefaultDrawLineWidth" );
|
static const wxChar DefaultDrawLineWidthEntry[] = wxT( "DefaultDrawLineWidth" );
|
||||||
static const wxChar ShowHiddenPinsEntry[] = wxT( "ShowHiddenPins" );
|
static const wxChar ShowHiddenPinsEntry[] = wxT( "ShowHiddenPins" );
|
||||||
|
|
@ -586,6 +595,9 @@ void SCH_EDIT_FRAME::LoadSettings( wxConfigBase* aCfg )
|
||||||
SetDefaultLineThickness( aCfg->Read( DefaultDrawLineWidthEntry, DEFAULTDRAWLINETHICKNESS ) );
|
SetDefaultLineThickness( aCfg->Read( DefaultDrawLineWidthEntry, DEFAULTDRAWLINETHICKNESS ) );
|
||||||
aCfg->Read( ShowHiddenPinsEntry, &m_showAllPins, false );
|
aCfg->Read( ShowHiddenPinsEntry, &m_showAllPins, false );
|
||||||
aCfg->Read( HorzVertLinesOnlyEntry, &m_forceHVLines, true );
|
aCfg->Read( HorzVertLinesOnlyEntry, &m_forceHVLines, true );
|
||||||
|
aCfg->Read( AutoplaceFieldsEntry, &m_autoplaceFields, true );
|
||||||
|
aCfg->Read( AutoplaceJustifyEntry, &m_autoplaceJustify, true );
|
||||||
|
aCfg->Read( AutoplaceAlignEntry, &m_autoplaceAlign, false );
|
||||||
|
|
||||||
// Load print preview window session settings.
|
// Load print preview window session settings.
|
||||||
aCfg->Read( PreviewFramePositionXEntry, &tmp, -1 );
|
aCfg->Read( PreviewFramePositionXEntry, &tmp, -1 );
|
||||||
|
|
@ -676,6 +688,9 @@ void SCH_EDIT_FRAME::SaveSettings( wxConfigBase* aCfg )
|
||||||
aCfg->Write( DefaultDrawLineWidthEntry, (long) GetDefaultLineThickness() );
|
aCfg->Write( DefaultDrawLineWidthEntry, (long) GetDefaultLineThickness() );
|
||||||
aCfg->Write( ShowHiddenPinsEntry, m_showAllPins );
|
aCfg->Write( ShowHiddenPinsEntry, m_showAllPins );
|
||||||
aCfg->Write( HorzVertLinesOnlyEntry, GetForceHVLines() );
|
aCfg->Write( HorzVertLinesOnlyEntry, GetForceHVLines() );
|
||||||
|
aCfg->Write( AutoplaceFieldsEntry, m_autoplaceFields );
|
||||||
|
aCfg->Write( AutoplaceJustifyEntry, m_autoplaceJustify );
|
||||||
|
aCfg->Write( AutoplaceAlignEntry, m_autoplaceAlign );
|
||||||
|
|
||||||
// Save print preview window session settings.
|
// Save print preview window session settings.
|
||||||
aCfg->Write( PreviewFramePositionXEntry, m_previewPosition.x );
|
aCfg->Write( PreviewFramePositionXEntry, m_previewPosition.x );
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,8 @@
|
||||||
// a key to read write in user config the visibility of the rescue library dialog
|
// a key to read write in user config the visibility of the rescue library dialog
|
||||||
#define RESCUE_NEVER_SHOW_KEY wxT("RescueNeverShow")
|
#define RESCUE_NEVER_SHOW_KEY wxT("RescueNeverShow")
|
||||||
|
|
||||||
|
// define autoplace key here to avoid having to take the long trip to get at the SCH_EDIT_FRAME
|
||||||
|
#define AUTOPLACE_JUSTIFY_KEY wxT("AutoplaceJustify")
|
||||||
|
#define AUTOPLACE_ALIGN_KEY wxT("AutoplaceAlign")
|
||||||
|
|
||||||
#endif // EESCHEMA_CONFIG_H
|
#endif // EESCHEMA_CONFIG_H
|
||||||
|
|
|
||||||
|
|
@ -168,6 +168,8 @@ enum id_eeschema_frm
|
||||||
ID_SCH_MOVE_ITEM,
|
ID_SCH_MOVE_ITEM,
|
||||||
ID_SCH_DRAG_ITEM,
|
ID_SCH_DRAG_ITEM,
|
||||||
|
|
||||||
|
ID_AUTOPLACE_FIELDS,
|
||||||
|
|
||||||
// Schematic editor commmands. These are command IDs that are generated by multiple
|
// Schematic editor commmands. These are command IDs that are generated by multiple
|
||||||
// events (menus, toolbar, context menu, etc.) that result in the same event handler.
|
// events (menus, toolbar, context menu, etc.) that result in the same event handler.
|
||||||
ID_CANCEL_CURRENT_COMMAND,
|
ID_CANCEL_CURRENT_COMMAND,
|
||||||
|
|
|
||||||
|
|
@ -242,6 +242,10 @@ SCH_COMPONENT* SCH_EDIT_FRAME::Load_Component( wxDC* aDC,
|
||||||
SetMsgPanel( items );
|
SetMsgPanel( items );
|
||||||
component->Draw( m_canvas, aDC, wxPoint( 0, 0 ), g_XorMode );
|
component->Draw( m_canvas, aDC, wxPoint( 0, 0 ), g_XorMode );
|
||||||
component->SetFlags( IS_NEW );
|
component->SetFlags( IS_NEW );
|
||||||
|
|
||||||
|
if( m_autoplaceFields )
|
||||||
|
component->AutoplaceFields( /* aScreen */ NULL, /* aManual */ false );
|
||||||
|
|
||||||
PrepareMoveItem( (SCH_ITEM*) component, aDC );
|
PrepareMoveItem( (SCH_ITEM*) component, aDC );
|
||||||
|
|
||||||
return component;
|
return component;
|
||||||
|
|
@ -268,29 +272,11 @@ void SCH_EDIT_FRAME::OrientComponent( COMPONENT_ORIENTATION_T aOrientation )
|
||||||
|
|
||||||
INSTALL_UNBUFFERED_DC( dc, m_canvas );
|
INSTALL_UNBUFFERED_DC( dc, m_canvas );
|
||||||
|
|
||||||
// Erase the previous component in it's current orientation.
|
|
||||||
|
|
||||||
m_canvas->CrossHairOff( &dc );
|
|
||||||
|
|
||||||
if( component->GetFlags() )
|
|
||||||
component->Draw( m_canvas, &dc, wxPoint( 0, 0 ), g_XorMode );
|
|
||||||
else
|
|
||||||
{
|
|
||||||
component->SetFlags( IS_MOVED ); // do not redraw the component
|
|
||||||
m_canvas->RefreshDrawingRect( component->GetBoundingBox() );
|
|
||||||
component->ClearFlags( IS_MOVED );
|
|
||||||
}
|
|
||||||
|
|
||||||
component->SetOrientation( aOrientation );
|
component->SetOrientation( aOrientation );
|
||||||
|
|
||||||
/* Redraw the component in the new position. */
|
|
||||||
if( component->GetFlags() )
|
|
||||||
component->Draw( m_canvas, &dc, wxPoint( 0, 0 ), g_XorMode );
|
|
||||||
else
|
|
||||||
component->Draw( m_canvas, &dc, wxPoint( 0, 0 ), GR_DEFAULT_DRAWMODE );
|
|
||||||
|
|
||||||
m_canvas->CrossHairOn( &dc );
|
m_canvas->CrossHairOn( &dc );
|
||||||
GetScreen()->TestDanglingEnds( m_canvas, &dc );
|
GetScreen()->TestDanglingEnds( m_canvas, &dc );
|
||||||
|
m_canvas->Refresh();
|
||||||
OnModify();
|
OnModify();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -344,13 +330,11 @@ void SCH_EDIT_FRAME::OnSelectUnit( wxCommandEvent& aEvent )
|
||||||
component->ClearFlags();
|
component->ClearFlags();
|
||||||
component->SetFlags( flags ); // Restore m_Flag modified by SetUnit()
|
component->SetFlags( flags ); // Restore m_Flag modified by SetUnit()
|
||||||
|
|
||||||
/* Redraw the component in the new position. */
|
if( m_autoplaceFields )
|
||||||
if( flags )
|
component->AutoAutoplaceFields( GetScreen() );
|
||||||
component->Draw( m_canvas, &dc, wxPoint( 0, 0 ), g_XorMode, g_GhostColor );
|
|
||||||
else
|
|
||||||
component->Draw( m_canvas, &dc, wxPoint( 0, 0 ), GR_DEFAULT_DRAWMODE );
|
|
||||||
|
|
||||||
screen->TestDanglingEnds( m_canvas, &dc );
|
screen->TestDanglingEnds( m_canvas, &dc );
|
||||||
|
m_canvas->Refresh();
|
||||||
OnModify();
|
OnModify();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -219,6 +219,10 @@ static EDA_HOTKEY HkSaveLib( _HKI( "Save Library" ), HK_SAVE_LIB, 'S' + GR_KB_CT
|
||||||
static EDA_HOTKEY HkSaveSchematic( _HKI( "Save Schematic" ), HK_SAVE_SCH, 'S' + GR_KB_CTRL );
|
static EDA_HOTKEY HkSaveSchematic( _HKI( "Save Schematic" ), HK_SAVE_SCH, 'S' + GR_KB_CTRL );
|
||||||
static EDA_HOTKEY HkLoadSchematic( _HKI( "Load Schematic" ), HK_LOAD_SCH, 'L' + GR_KB_CTRL );
|
static EDA_HOTKEY HkLoadSchematic( _HKI( "Load Schematic" ), HK_LOAD_SCH, 'L' + GR_KB_CTRL );
|
||||||
|
|
||||||
|
// Autoplace fields
|
||||||
|
static EDA_HOTKEY HkAutoplaceFields( _HKI( "Autoplace Fields" ), HK_AUTOPLACE_FIELDS, 'O',
|
||||||
|
ID_AUTOPLACE_FIELDS );
|
||||||
|
|
||||||
// List of common hotkey descriptors
|
// List of common hotkey descriptors
|
||||||
static EDA_HOTKEY* common_Hotkey_List[] =
|
static EDA_HOTKEY* common_Hotkey_List[] =
|
||||||
{
|
{
|
||||||
|
|
@ -292,6 +296,7 @@ static EDA_HOTKEY* schematic_Hotkey_List[] =
|
||||||
&HkAddGraphicPolyLine,
|
&HkAddGraphicPolyLine,
|
||||||
&HkAddGraphicText,
|
&HkAddGraphicText,
|
||||||
&HkLeaveSheet,
|
&HkLeaveSheet,
|
||||||
|
&HkAutoplaceFields,
|
||||||
&HkDeleteNode,
|
&HkDeleteNode,
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
@ -580,6 +585,7 @@ bool SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition,
|
||||||
case HK_ORIENT_NORMAL_COMPONENT: // Orient 0, no mirror (Component)
|
case HK_ORIENT_NORMAL_COMPONENT: // Orient 0, no mirror (Component)
|
||||||
case HK_ROTATE: // Rotate schematic item.
|
case HK_ROTATE: // Rotate schematic item.
|
||||||
case HK_EDIT_COMPONENT_WITH_LIBEDIT: // Call Libedit and load the current component
|
case HK_EDIT_COMPONENT_WITH_LIBEDIT: // Call Libedit and load the current component
|
||||||
|
case HK_AUTOPLACE_FIELDS: // Autoplace all fields around component
|
||||||
{
|
{
|
||||||
// force a new item search on hot keys at current position,
|
// force a new item search on hot keys at current position,
|
||||||
// if there is no currently edited item,
|
// if there is no currently edited item,
|
||||||
|
|
|
||||||
|
|
@ -78,6 +78,7 @@ enum hotkey_id_commnand {
|
||||||
HK_LEFT_CLICK,
|
HK_LEFT_CLICK,
|
||||||
HK_LEFT_DCLICK,
|
HK_LEFT_DCLICK,
|
||||||
HK_LEAVE_SHEET,
|
HK_LEAVE_SHEET,
|
||||||
|
HK_AUTOPLACE_FIELDS,
|
||||||
HK_DELETE_NODE
|
HK_DELETE_NODE
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2012,7 +2012,7 @@ void LIB_PIN::GetMsgPanelInfo( MSG_PANEL_ITEMS& aList )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const EDA_RECT LIB_PIN::GetBoundingBox() const
|
const EDA_RECT LIB_PIN::GetBoundingBox( bool aIncludeInvisibles ) const
|
||||||
{
|
{
|
||||||
LIB_PART* entry = (LIB_PART* ) m_Parent;
|
LIB_PART* entry = (LIB_PART* ) m_Parent;
|
||||||
EDA_RECT bbox;
|
EDA_RECT bbox;
|
||||||
|
|
@ -2023,6 +2023,8 @@ const EDA_RECT LIB_PIN::GetBoundingBox() const
|
||||||
bool showNum = m_number != 0;
|
bool showNum = m_number != 0;
|
||||||
int minsizeV = TARGET_PIN_RADIUS;
|
int minsizeV = TARGET_PIN_RADIUS;
|
||||||
|
|
||||||
|
if( !aIncludeInvisibles && !IsVisible() )
|
||||||
|
showName = false;
|
||||||
|
|
||||||
if( entry )
|
if( entry )
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -151,7 +151,15 @@ public:
|
||||||
|
|
||||||
bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation );
|
bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation );
|
||||||
|
|
||||||
const EDA_RECT GetBoundingBox() const; // Virtual
|
/* Cannot use a default parameter here as it will not be compatible with the virtual. */
|
||||||
|
const EDA_RECT GetBoundingBox() const { return GetBoundingBox( false ); }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function GetBoundingBox
|
||||||
|
* @param aIncludeInvisibles - if false, do not include labels for invisible pins
|
||||||
|
* in the calculation.
|
||||||
|
*/
|
||||||
|
const EDA_RECT GetBoundingBox( bool aIncludeInvisibles ) const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function PinEndPoint
|
* Function PinEndPoint
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,24 @@
|
||||||
#define IS_WIRE false
|
#define IS_WIRE false
|
||||||
#define IS_BUS true
|
#define IS_BUS true
|
||||||
|
|
||||||
|
/** @brief Kicad can use case sensitive or case insensitive comparisons for labels
|
||||||
|
* Currently, it uses case insensitive.
|
||||||
|
* Can be changed by defining LABEL_KEEPCASE (uncomment next line).
|
||||||
|
*/
|
||||||
|
//#define LABEL_KEEPCASE
|
||||||
|
/// Compiler controlled string compare function, either case independent or not:
|
||||||
|
inline int CmpLabel_KEEPCASE( const wxString& aString1, const wxString& aString2 )
|
||||||
|
{
|
||||||
|
#ifdef LABEL_KEEPCASE
|
||||||
|
// case specificity, the normal behavior:
|
||||||
|
return aString1.Cmp( aString2 );
|
||||||
|
#else
|
||||||
|
// case independence (only for guys who want that: not recommended)
|
||||||
|
return aString1.CmpNoCase( aString2 );
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
//Imported function:
|
//Imported function:
|
||||||
int TestDuplicateSheetNames( bool aCreateMarker );
|
int TestDuplicateSheetNames( bool aCreateMarker );
|
||||||
|
|
||||||
|
|
@ -602,7 +620,7 @@ void NETLIST_OBJECT_LIST::sheetLabelConnect( NETLIST_OBJECT* SheetLabel )
|
||||||
if( ObjetNet->GetNet() == SheetLabel->GetNet() )
|
if( ObjetNet->GetNet() == SheetLabel->GetNet() )
|
||||||
continue; //already connected.
|
continue; //already connected.
|
||||||
|
|
||||||
if( ObjetNet->m_Label.CmpNoCase( SheetLabel->m_Label ) != 0 )
|
if( CmpLabel_KEEPCASE( ObjetNet->m_Label, SheetLabel->m_Label ) != 0 )
|
||||||
continue; //different names.
|
continue; //different names.
|
||||||
|
|
||||||
// Propagate Netcode having all the objects of the same Netcode.
|
// Propagate Netcode having all the objects of the same Netcode.
|
||||||
|
|
@ -853,7 +871,7 @@ void NETLIST_OBJECT_LIST::labelConnect( NETLIST_OBJECT* aLabelRef )
|
||||||
// NET_PINLABEL is a kind of global label (generated by a power pin invisible)
|
// NET_PINLABEL is a kind of global label (generated by a power pin invisible)
|
||||||
if( item->IsLabelType() )
|
if( item->IsLabelType() )
|
||||||
{
|
{
|
||||||
if( item->m_Label.CmpNoCase( aLabelRef->m_Label ) != 0 )
|
if( CmpLabel_KEEPCASE( item->m_Label, aLabelRef->m_Label ) != 0 )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if( item->GetNet() )
|
if( item->GetNet() )
|
||||||
|
|
|
||||||
|
|
@ -102,7 +102,7 @@ bool NETLIST_EXPORTER_ORCADPCB2::WriteNetlist( const wxString& aOutFileName, uns
|
||||||
field = comp->GetRef( path );
|
field = comp->GetRef( path );
|
||||||
|
|
||||||
ret |= fprintf( f, " ( %s %s",
|
ret |= fprintf( f, " ( %s %s",
|
||||||
TO_UTF8( comp->GetPath( path ) ),
|
TO_UTF8( comp->GetPath( path->Last() ) ),
|
||||||
TO_UTF8( footprint ) );
|
TO_UTF8( footprint ) );
|
||||||
|
|
||||||
ret |= fprintf( f, " %s", TO_UTF8( field ) );
|
ret |= fprintf( f, " %s", TO_UTF8( field ) );
|
||||||
|
|
|
||||||
|
|
@ -394,6 +394,9 @@ void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component, PART_LIBS*
|
||||||
AddMenuItem( PopMenu, ID_POPUP_SCH_DELETE_CMP, msg, KiBitmap( delete_xpm ) );
|
AddMenuItem( PopMenu, ID_POPUP_SCH_DELETE_CMP, msg, KiBitmap( delete_xpm ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
msg = AddHotkeyName( _( "Autoplace Fields" ), g_Schematic_Hokeys_Descr, HK_AUTOPLACE_FIELDS );
|
||||||
|
AddMenuItem( PopMenu, ID_AUTOPLACE_FIELDS, msg, KiBitmap( autoplace_fields_xpm ) );
|
||||||
|
|
||||||
if( libEntry && !libEntry->GetDocFileName().IsEmpty() )
|
if( libEntry && !libEntry->GetDocFileName().IsEmpty() )
|
||||||
AddMenuItem( PopMenu, ID_POPUP_SCH_DISPLAYDOC_CMP, _( "Doc" ), KiBitmap( datasheet_xpm ) );
|
AddMenuItem( PopMenu, ID_POPUP_SCH_DISPLAYDOC_CMP, _( "Doc" ), KiBitmap( datasheet_xpm ) );
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -217,6 +217,7 @@ SCH_COMPONENT::SCH_COMPONENT( const SCH_COMPONENT& aComponent ) :
|
||||||
}
|
}
|
||||||
|
|
||||||
m_isDangling = aComponent.m_isDangling;
|
m_isDangling = aComponent.m_isDangling;
|
||||||
|
m_fieldsAutoplaced = aComponent.m_fieldsAutoplaced;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -429,21 +430,21 @@ void SCH_COMPONENT::AddHierarchicalReference( const wxString& aPath,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
wxString SCH_COMPONENT::GetPath( const SCH_SHEET_PATH* sheet ) const
|
wxString SCH_COMPONENT::GetPath( const SCH_SHEET* aSheet ) const
|
||||||
{
|
{
|
||||||
wxCHECK_MSG( sheet != NULL, wxEmptyString,
|
wxCHECK_MSG( aSheet != NULL, wxEmptyString,
|
||||||
wxT( "Cannot get component path with invalid sheet object." ) );
|
wxT( "Cannot get component path with invalid sheet object." ) );
|
||||||
|
|
||||||
wxString str;
|
wxString str;
|
||||||
|
|
||||||
str.Printf( wxT( "%8.8lX" ), (long unsigned) m_TimeStamp );
|
str.Printf( wxT( "%8.8lX" ), (long unsigned) m_TimeStamp );
|
||||||
return sheet->Path() + str;
|
return aSheet->GetPath() + str;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const wxString SCH_COMPONENT::GetRef( const SCH_SHEET_PATH* sheet )
|
const wxString SCH_COMPONENT::GetRef( const SCH_SHEET_PATH* sheet )
|
||||||
{
|
{
|
||||||
wxString path = GetPath( sheet );
|
wxString path = GetPath( sheet->Last() );
|
||||||
wxString h_path, h_ref;
|
wxString h_path, h_ref;
|
||||||
wxStringTokenizer tokenizer;
|
wxStringTokenizer tokenizer;
|
||||||
wxString separators( wxT( " " ) );
|
wxString separators( wxT( " " ) );
|
||||||
|
|
@ -505,7 +506,7 @@ bool SCH_COMPONENT::IsReferenceStringValid( const wxString& aReferenceString )
|
||||||
|
|
||||||
void SCH_COMPONENT::SetRef( const SCH_SHEET_PATH* sheet, const wxString& ref )
|
void SCH_COMPONENT::SetRef( const SCH_SHEET_PATH* sheet, const wxString& ref )
|
||||||
{
|
{
|
||||||
wxString path = GetPath( sheet );
|
wxString path = GetPath( sheet->Last() );
|
||||||
|
|
||||||
bool notInArray = true;
|
bool notInArray = true;
|
||||||
|
|
||||||
|
|
@ -583,7 +584,7 @@ void SCH_COMPONENT::SetTimeStamp( time_t aNewTimeStamp )
|
||||||
|
|
||||||
int SCH_COMPONENT::GetUnitSelection( SCH_SHEET_PATH* aSheet )
|
int SCH_COMPONENT::GetUnitSelection( SCH_SHEET_PATH* aSheet )
|
||||||
{
|
{
|
||||||
wxString path = GetPath( aSheet );
|
wxString path = GetPath( aSheet->Last() );
|
||||||
wxString h_path, h_multi;
|
wxString h_path, h_multi;
|
||||||
wxStringTokenizer tokenizer;
|
wxStringTokenizer tokenizer;
|
||||||
wxString separators( wxT( " " ) );
|
wxString separators( wxT( " " ) );
|
||||||
|
|
@ -611,7 +612,7 @@ int SCH_COMPONENT::GetUnitSelection( SCH_SHEET_PATH* aSheet )
|
||||||
|
|
||||||
void SCH_COMPONENT::SetUnitSelection( SCH_SHEET_PATH* aSheet, int aUnitSelection )
|
void SCH_COMPONENT::SetUnitSelection( SCH_SHEET_PATH* aSheet, int aUnitSelection )
|
||||||
{
|
{
|
||||||
wxString path = GetPath( aSheet );
|
wxString path = GetPath( aSheet->Last() );
|
||||||
|
|
||||||
bool notInArray = true;
|
bool notInArray = true;
|
||||||
|
|
||||||
|
|
@ -660,6 +661,16 @@ SCH_FIELD* SCH_COMPONENT::GetField( int aFieldNdx ) const
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void SCH_COMPONENT::GetFields( std::vector<SCH_FIELD*>& aVector, bool aVisibleOnly )
|
||||||
|
{
|
||||||
|
BOOST_FOREACH( SCH_FIELD& each_field, m_Fields )
|
||||||
|
{
|
||||||
|
if( !aVisibleOnly || ( each_field.IsVisible() && !each_field.IsVoid() ) )
|
||||||
|
aVector.push_back( &each_field );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
SCH_FIELD* SCH_COMPONENT::AddField( const SCH_FIELD& aField )
|
SCH_FIELD* SCH_COMPONENT::AddField( const SCH_FIELD& aField )
|
||||||
{
|
{
|
||||||
int newNdx = m_Fields.size();
|
int newNdx = m_Fields.size();
|
||||||
|
|
@ -691,6 +702,17 @@ LIB_PIN* SCH_COMPONENT::GetPin( const wxString& number )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void SCH_COMPONENT::GetPins( std::vector<LIB_PIN*>& aPinsList )
|
||||||
|
{
|
||||||
|
if( PART_SPTR part = m_part.lock() )
|
||||||
|
{
|
||||||
|
part->GetPins( aPinsList, m_unit, m_convert );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
wxFAIL_MSG( "Could not obtain PART_SPTR lock" );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void SCH_COMPONENT::SwapData( SCH_ITEM* aItem )
|
void SCH_COMPONENT::SwapData( SCH_ITEM* aItem )
|
||||||
{
|
{
|
||||||
wxCHECK_RET( (aItem != NULL) && (aItem->Type() == SCH_COMPONENT_T),
|
wxCHECK_RET( (aItem != NULL) && (aItem->Type() == SCH_COMPONENT_T),
|
||||||
|
|
@ -727,7 +749,7 @@ void SCH_COMPONENT::SwapData( SCH_ITEM* aItem )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void SCH_COMPONENT::ClearAnnotation( SCH_SHEET_PATH* aSheetPath )
|
void SCH_COMPONENT::ClearAnnotation( SCH_SHEET* aSheet )
|
||||||
{
|
{
|
||||||
bool keepMulti = false;
|
bool keepMulti = false;
|
||||||
wxArrayString reference_fields;
|
wxArrayString reference_fields;
|
||||||
|
|
@ -750,7 +772,7 @@ void SCH_COMPONENT::ClearAnnotation( SCH_SHEET_PATH* aSheetPath )
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{ // This is a malformed reference: reinit this reference
|
{ // This is a malformed reference: reinit this reference
|
||||||
m_prefix = defRef = wxT("U"); // Set to default ref prefix
|
m_prefix = defRef = wxT( "U" ); // Set to default ref prefix
|
||||||
}
|
}
|
||||||
|
|
||||||
defRef.Append( wxT( "?" ) );
|
defRef.Append( wxT( "?" ) );
|
||||||
|
|
@ -759,22 +781,22 @@ void SCH_COMPONENT::ClearAnnotation( SCH_SHEET_PATH* aSheetPath )
|
||||||
|
|
||||||
// For components with units locked,
|
// For components with units locked,
|
||||||
// we cannot remove all annotations: part selection must be kept
|
// we cannot remove all annotations: part selection must be kept
|
||||||
// For all components: if aSheetPath is not NULL,
|
// For all components: if aSheet is not NULL,
|
||||||
// remove annotation only for the given path
|
// remove annotation only for the given path
|
||||||
if( keepMulti || aSheetPath )
|
if( keepMulti || aSheet )
|
||||||
{
|
{
|
||||||
wxString NewHref;
|
wxString NewHref;
|
||||||
wxString path;
|
wxString path;
|
||||||
|
|
||||||
if( aSheetPath )
|
if( aSheet )
|
||||||
path = GetPath( aSheetPath );
|
path = GetPath( aSheet );
|
||||||
|
|
||||||
for( unsigned int ii = 0; ii < m_PathsAndReferences.GetCount(); ii++ )
|
for( unsigned int ii = 0; ii < m_PathsAndReferences.GetCount(); ii++ )
|
||||||
{
|
{
|
||||||
// Break hierarchical reference in path, ref and multi selection:
|
// Break hierarchical reference in path, ref and multi selection:
|
||||||
reference_fields = wxStringTokenize( m_PathsAndReferences[ii], separators );
|
reference_fields = wxStringTokenize( m_PathsAndReferences[ii], separators );
|
||||||
|
|
||||||
if( aSheetPath == NULL || reference_fields[0].Cmp( path ) == 0 )
|
if( aSheet == NULL || reference_fields[0].Cmp( path ) == 0 )
|
||||||
{
|
{
|
||||||
if( keepMulti ) // Get and keep part selection
|
if( keepMulti ) // Get and keep part selection
|
||||||
multi = reference_fields[2];
|
multi = reference_fields[2];
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,10 @@ class SCH_COMPONENT : public SCH_ITEM
|
||||||
{
|
{
|
||||||
friend class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC;
|
friend class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC;
|
||||||
|
|
||||||
|
public:
|
||||||
|
enum AUTOPLACED { AUTOPLACED_NO = 0, AUTOPLACED_AUTO, AUTOPLACED_MANUAL };
|
||||||
|
private:
|
||||||
|
|
||||||
wxPoint m_Pos;
|
wxPoint m_Pos;
|
||||||
wxString m_part_name; ///< Name to look for in the library, i.e. "74LS00".
|
wxString m_part_name; ///< Name to look for in the library, i.e. "74LS00".
|
||||||
|
|
||||||
|
|
@ -82,6 +86,8 @@ class SCH_COMPONENT : public SCH_ITEM
|
||||||
|
|
||||||
std::vector<bool> m_isDangling; ///< One isDangling per pin
|
std::vector<bool> m_isDangling; ///< One isDangling per pin
|
||||||
|
|
||||||
|
AUTOPLACED m_fieldsAutoplaced; ///< indicates status of field autoplacement
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A temporary sheet path is required to generate the correct reference designator string
|
* A temporary sheet path is required to generate the correct reference designator string
|
||||||
* in complex heirarchies. Hopefully this is only a temporary hack to decouple schematic
|
* in complex heirarchies. Hopefully this is only a temporary hack to decouple schematic
|
||||||
|
|
@ -100,8 +106,6 @@ class SCH_COMPONENT : public SCH_ITEM
|
||||||
|
|
||||||
void Init( const wxPoint& pos = wxPoint( 0, 0 ) );
|
void Init( const wxPoint& pos = wxPoint( 0, 0 ) );
|
||||||
|
|
||||||
EDA_RECT GetBodyBoundingBox() const;
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SCH_COMPONENT( const wxPoint& pos = wxPoint( 0, 0 ), SCH_ITEM* aParent = NULL );
|
SCH_COMPONENT( const wxPoint& pos = wxPoint( 0, 0 ), SCH_ITEM* aParent = NULL );
|
||||||
|
|
||||||
|
|
@ -240,10 +244,10 @@ public:
|
||||||
/**
|
/**
|
||||||
* Function ClearAnnotation
|
* Function ClearAnnotation
|
||||||
* clears exiting component annotation ( i.i IC23 changed to IC? and part reset to 1)
|
* clears exiting component annotation ( i.i IC23 changed to IC? and part reset to 1)
|
||||||
* @param aSheetPath: SCH_SHEET_PATH value: if NULL remove all annotations,
|
* @param aSheet: SCH_SHEET value: if NULL remove all annotations,
|
||||||
* else remove annotation relative to this sheetpath
|
* else remove annotation relative to \a aSheet.
|
||||||
*/
|
*/
|
||||||
void ClearAnnotation( SCH_SHEET_PATH* aSheetPath );
|
void ClearAnnotation( SCH_SHEET* aSheet );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function SetTimeStamp
|
* Function SetTimeStamp
|
||||||
|
|
@ -255,6 +259,13 @@ public:
|
||||||
|
|
||||||
const EDA_RECT GetBoundingBox() const; // Virtual
|
const EDA_RECT GetBoundingBox() const; // Virtual
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function GetBodyBoundingBox
|
||||||
|
* Return a bounding box for the component body but not the fields.
|
||||||
|
*/
|
||||||
|
EDA_RECT GetBodyBoundingBox() const;
|
||||||
|
|
||||||
|
|
||||||
//-----<Fields>-----------------------------------------------------------
|
//-----<Fields>-----------------------------------------------------------
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -265,6 +276,14 @@ public:
|
||||||
*/
|
*/
|
||||||
SCH_FIELD* GetField( int aFieldNdx ) const;
|
SCH_FIELD* GetField( int aFieldNdx ) const;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function GetFields
|
||||||
|
* populates a std::vector with SCH_FIELDs.
|
||||||
|
* @param aVector - vector to populate.
|
||||||
|
* @param aVisibleOnly - if true, only get fields that are visible and contain text.
|
||||||
|
*/
|
||||||
|
void GetFields( std::vector<SCH_FIELD*>& aVector, bool aVisibleOnly );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function AddField
|
* Function AddField
|
||||||
* adds a field to the component. The field is copied as it is put into
|
* adds a field to the component. The field is copied as it is put into
|
||||||
|
|
@ -284,15 +303,52 @@ public:
|
||||||
{
|
{
|
||||||
m_Fields = aFields; // vector copying, length is changed possibly
|
m_Fields = aFields; // vector copying, length is changed possibly
|
||||||
}
|
}
|
||||||
|
|
||||||
//-----</Fields>----------------------------------------------------------
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function GetFieldCount
|
* Function GetFieldCount
|
||||||
* returns the number of fields in this component.
|
* returns the number of fields in this component.
|
||||||
*/
|
*/
|
||||||
int GetFieldCount() const { return (int) m_Fields.size(); }
|
int GetFieldCount() const { return (int) m_Fields.size(); }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function GetFieldsAutoplaced
|
||||||
|
* returns whether the fields are autoplaced.
|
||||||
|
*/
|
||||||
|
AUTOPLACED GetFieldsAutoplaced() const { return m_fieldsAutoplaced; }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function ClearFieldsAutoplaced
|
||||||
|
* Set fields autoplaced flag false.
|
||||||
|
*/
|
||||||
|
void ClearFieldsAutoplaced() { m_fieldsAutoplaced = AUTOPLACED_NO; }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function AutoplaceFields
|
||||||
|
* Automatically orient all the fields in the component.
|
||||||
|
* @param aScreen - the SCH_SCREEN associated with the current instance of the
|
||||||
|
* component. This can be NULL when aManual is false.
|
||||||
|
* @param aManual - True if the autoplace was manually initiated (e.g. by a hotkey
|
||||||
|
* or a menu item). Some more 'intelligent' routines will be used that would be
|
||||||
|
* annoying if done automatically during moves.
|
||||||
|
*/
|
||||||
|
void AutoplaceFields( SCH_SCREEN* aScreen, bool aManual );
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function AutoAutoplaceFields
|
||||||
|
* Autoplace fields only if correct to do so automatically. That is, do not
|
||||||
|
* autoplace if fields have been moved by hand.
|
||||||
|
* @param aScreen - the SCH_SCREEN associated with the current instance of the
|
||||||
|
* component.
|
||||||
|
*/
|
||||||
|
void AutoAutoplaceFields( SCH_SCREEN* aScreen )
|
||||||
|
{
|
||||||
|
if( GetFieldsAutoplaced() )
|
||||||
|
AutoplaceFields( aScreen, GetFieldsAutoplaced() == AUTOPLACED_MANUAL );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//-----</Fields>----------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function GetPin
|
* Function GetPin
|
||||||
* finds a component pin by number.
|
* finds a component pin by number.
|
||||||
|
|
@ -302,6 +358,12 @@ public:
|
||||||
*/
|
*/
|
||||||
LIB_PIN* GetPin( const wxString& number );
|
LIB_PIN* GetPin( const wxString& number );
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function GetPins
|
||||||
|
* populate a vector with all the pins.
|
||||||
|
*/
|
||||||
|
void GetPins( std::vector<LIB_PIN*>& aPinsList );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Virtual function, from the base class SCH_ITEM::Draw
|
* Virtual function, from the base class SCH_ITEM::Draw
|
||||||
*/
|
*/
|
||||||
|
|
@ -329,8 +391,8 @@ public:
|
||||||
|
|
||||||
void SwapData( SCH_ITEM* aItem );
|
void SwapData( SCH_ITEM* aItem );
|
||||||
|
|
||||||
// returns a unique ID, in the form of a path.
|
// returns a unique ID, in the form of a path determined by \a aSheet.
|
||||||
wxString GetPath( const SCH_SHEET_PATH* sheet ) const;
|
wxString GetPath( const SCH_SHEET* sheet ) const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function IsReferenceStringValid (static)
|
* Function IsReferenceStringValid (static)
|
||||||
|
|
|
||||||
|
|
@ -299,6 +299,23 @@ const EDA_RECT SCH_FIELD::GetBoundingBox() const
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
bool SCH_FIELD::IsHorizJustifyFlipped() const
|
||||||
|
{
|
||||||
|
wxPoint render_center = GetBoundingBox().Centre();
|
||||||
|
wxPoint pos = GetPosition();
|
||||||
|
|
||||||
|
switch( GetHorizJustify() )
|
||||||
|
{
|
||||||
|
case GR_TEXT_HJUSTIFY_LEFT:
|
||||||
|
return render_center.x < pos.x;
|
||||||
|
case GR_TEXT_HJUSTIFY_RIGHT:
|
||||||
|
return render_center.x > pos.x;
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool SCH_FIELD::Save( FILE* aFile ) const
|
bool SCH_FIELD::Save( FILE* aFile ) const
|
||||||
{
|
{
|
||||||
char hjustify = 'C';
|
char hjustify = 'C';
|
||||||
|
|
|
||||||
|
|
@ -102,6 +102,13 @@ public:
|
||||||
|
|
||||||
const EDA_RECT GetBoundingBox() const; // Virtual
|
const EDA_RECT GetBoundingBox() const; // Virtual
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function IsHorizJustifyFlipped
|
||||||
|
* Returns whether the field will be rendered with the horizontal justification
|
||||||
|
* inverted due to rotation or mirroring of the parent.
|
||||||
|
*/
|
||||||
|
bool IsHorizJustifyFlipped() const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function IsVoid
|
* Function IsVoid
|
||||||
* returns true if the field is either empty or holds "~".
|
* returns true if the field is either empty or holds "~".
|
||||||
|
|
@ -131,7 +138,7 @@ public:
|
||||||
*/
|
*/
|
||||||
bool IsVisible() const
|
bool IsVisible() const
|
||||||
{
|
{
|
||||||
return (m_Attributs & TEXT_NO_VISIBLE) == 0 ? true : false;
|
return !( m_Attributs & TEXT_NO_VISIBLE );
|
||||||
}
|
}
|
||||||
|
|
||||||
void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset,
|
void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset,
|
||||||
|
|
|
||||||
|
|
@ -755,7 +755,7 @@ int SCH_SCREEN::CountConnectedItems( const wxPoint& aPos, bool aTestJunctions )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void SCH_SCREEN::ClearAnnotation( SCH_SHEET_PATH* aSheetPath )
|
void SCH_SCREEN::ClearAnnotation( SCH_SHEET* aSheet )
|
||||||
{
|
{
|
||||||
for( SCH_ITEM* item = m_drawList.begin(); item; item = item->Next() )
|
for( SCH_ITEM* item = m_drawList.begin(); item; item = item->Next() )
|
||||||
{
|
{
|
||||||
|
|
@ -763,7 +763,7 @@ void SCH_SCREEN::ClearAnnotation( SCH_SHEET_PATH* aSheetPath )
|
||||||
{
|
{
|
||||||
SCH_COMPONENT* component = (SCH_COMPONENT*) item;
|
SCH_COMPONENT* component = (SCH_COMPONENT*) item;
|
||||||
|
|
||||||
component->ClearAnnotation( aSheetPath );
|
component->ClearAnnotation( aSheet );
|
||||||
|
|
||||||
// Clear the modified component flag set by component->ClearAnnotation
|
// Clear the modified component flag set by component->ClearAnnotation
|
||||||
// because we do not use it here and we should not leave this flag set,
|
// because we do not use it here and we should not leave this flag set,
|
||||||
|
|
@ -1431,13 +1431,6 @@ void SCH_SCREENS::BuildScreenList( EDA_ITEM* aItem )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void SCH_SCREENS::ClearAnnotation()
|
|
||||||
{
|
|
||||||
for( size_t i = 0; i < m_screens.size(); i++ )
|
|
||||||
m_screens[i]->ClearAnnotation( NULL );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void SCH_SCREENS::SchematicCleanUp()
|
void SCH_SCREENS::SchematicCleanUp()
|
||||||
{
|
{
|
||||||
for( size_t i = 0; i < m_screens.size(); i++ )
|
for( size_t i = 0; i < m_screens.size(); i++ )
|
||||||
|
|
|
||||||
|
|
@ -1214,6 +1214,25 @@ wxString SCH_SHEET::GetHumanReadablePath() const
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void SCH_SHEET::ClearAnnotation( bool aIncludeSubSheets )
|
||||||
|
{
|
||||||
|
m_screen->ClearAnnotation( this );
|
||||||
|
|
||||||
|
if( aIncludeSubSheets )
|
||||||
|
{
|
||||||
|
SCH_ITEM* item = m_screen->GetDrawItems();
|
||||||
|
|
||||||
|
while( item )
|
||||||
|
{
|
||||||
|
if( item->Type() == SCH_SHEET_T )
|
||||||
|
static_cast<SCH_SHEET*>( item )->ClearAnnotation( aIncludeSubSheets );
|
||||||
|
|
||||||
|
item = item->Next();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
SCH_ITEM& SCH_SHEET::operator=( const SCH_ITEM& aItem )
|
SCH_ITEM& SCH_SHEET::operator=( const SCH_ITEM& aItem )
|
||||||
{
|
{
|
||||||
wxLogDebug( wxT( "Sheet assignment operator." ) );
|
wxLogDebug( wxT( "Sheet assignment operator." ) );
|
||||||
|
|
|
||||||
|
|
@ -633,6 +633,8 @@ public:
|
||||||
*/
|
*/
|
||||||
wxString GetHumanReadablePath() const;
|
wxString GetHumanReadablePath() const;
|
||||||
|
|
||||||
|
void ClearAnnotation( bool aIncludeSubSheets = false );
|
||||||
|
|
||||||
#if defined(DEBUG)
|
#if defined(DEBUG)
|
||||||
void Show( int nestLevel, std::ostream& os ) const; // override
|
void Show( int nestLevel, std::ostream& os ) const; // override
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -137,8 +137,8 @@ public:
|
||||||
* Function Cmp
|
* Function Cmp
|
||||||
* Compare if this is the same sheet path as aSheetPathToTest
|
* Compare if this is the same sheet path as aSheetPathToTest
|
||||||
* @param aSheetPathToTest = sheet path to compare
|
* @param aSheetPathToTest = sheet path to compare
|
||||||
* @return 1 if this sheet path has more sheets than aSheetPathToTest,
|
* @return 1 if this sheet path has more sheets than aSheetPathToTest,
|
||||||
* -1 if this sheet path has fewer sheets than aSheetPathToTest,
|
* -1 if this sheet path has fewer sheets than aSheetPathToTest,
|
||||||
* or 0 if same
|
* or 0 if same
|
||||||
*/
|
*/
|
||||||
int Cmp( const SCH_SHEET_PATH& aSheetPathToTest ) const;
|
int Cmp( const SCH_SHEET_PATH& aSheetPathToTest ) const;
|
||||||
|
|
|
||||||
|
|
@ -765,6 +765,13 @@ void SCH_EDIT_FRAME::PrepareMoveItem( SCH_ITEM* aItem, wxDC* aDC )
|
||||||
SetUndoItem( aItem );
|
SetUndoItem( aItem );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if( aItem->Type() == SCH_FIELD_T && aItem->GetParent()->Type() == SCH_COMPONENT_T )
|
||||||
|
{
|
||||||
|
// Now that we're moving a field, they're no longer autoplaced.
|
||||||
|
SCH_COMPONENT *parent = dynamic_cast<SCH_COMPONENT*>( aItem->GetParent() );
|
||||||
|
parent->ClearFieldsAutoplaced();
|
||||||
|
}
|
||||||
|
|
||||||
aItem->SetFlags( IS_MOVED );
|
aItem->SetFlags( IS_MOVED );
|
||||||
|
|
||||||
// For some items, moving the cursor to anchor is not good
|
// For some items, moving the cursor to anchor is not good
|
||||||
|
|
@ -826,14 +833,22 @@ void SCH_EDIT_FRAME::OnRotate( wxCommandEvent& aEvent )
|
||||||
switch( item->Type() )
|
switch( item->Type() )
|
||||||
{
|
{
|
||||||
case SCH_COMPONENT_T:
|
case SCH_COMPONENT_T:
|
||||||
if( aEvent.GetId() == ID_SCH_ROTATE_CLOCKWISE )
|
{
|
||||||
OrientComponent( CMP_ROTATE_CLOCKWISE );
|
SCH_COMPONENT* component = dynamic_cast<SCH_COMPONENT*>( item );
|
||||||
else if( aEvent.GetId() == ID_SCH_ROTATE_COUNTERCLOCKWISE )
|
if( aEvent.GetId() == ID_SCH_ROTATE_CLOCKWISE )
|
||||||
OrientComponent( CMP_ROTATE_COUNTERCLOCKWISE );
|
OrientComponent( CMP_ROTATE_CLOCKWISE );
|
||||||
else
|
else if( aEvent.GetId() == ID_SCH_ROTATE_COUNTERCLOCKWISE )
|
||||||
wxFAIL_MSG( wxT( "Unknown rotate item command ID." ) );
|
OrientComponent( CMP_ROTATE_COUNTERCLOCKWISE );
|
||||||
|
else
|
||||||
|
wxFAIL_MSG( wxT( "Unknown rotate item command ID." ) );
|
||||||
|
|
||||||
break;
|
if( m_autoplaceFields )
|
||||||
|
component->AutoAutoplaceFields( GetScreen() );
|
||||||
|
|
||||||
|
m_canvas->Refresh();
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
case SCH_TEXT_T:
|
case SCH_TEXT_T:
|
||||||
case SCH_LABEL_T:
|
case SCH_LABEL_T:
|
||||||
|
|
@ -846,6 +861,12 @@ void SCH_EDIT_FRAME::OnRotate( wxCommandEvent& aEvent )
|
||||||
case SCH_FIELD_T:
|
case SCH_FIELD_T:
|
||||||
m_canvas->MoveCursorToCrossHair();
|
m_canvas->MoveCursorToCrossHair();
|
||||||
RotateField( (SCH_FIELD*) item, &dc );
|
RotateField( (SCH_FIELD*) item, &dc );
|
||||||
|
if( item->GetParent()->Type() == SCH_COMPONENT_T )
|
||||||
|
{
|
||||||
|
// Now that we're moving a field, they're no longer autoplaced.
|
||||||
|
SCH_COMPONENT *parent = dynamic_cast<SCH_COMPONENT*>( item->GetParent() );
|
||||||
|
parent->ClearFieldsAutoplaced();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SCH_BITMAP_T:
|
case SCH_BITMAP_T:
|
||||||
|
|
@ -1126,16 +1147,24 @@ void SCH_EDIT_FRAME::OnOrient( wxCommandEvent& aEvent )
|
||||||
switch( item->Type() )
|
switch( item->Type() )
|
||||||
{
|
{
|
||||||
case SCH_COMPONENT_T:
|
case SCH_COMPONENT_T:
|
||||||
if( aEvent.GetId() == ID_SCH_MIRROR_X )
|
{
|
||||||
OrientComponent( CMP_MIRROR_X );
|
SCH_COMPONENT *component = dynamic_cast<SCH_COMPONENT*>( item );
|
||||||
else if( aEvent.GetId() == ID_SCH_MIRROR_Y )
|
if( aEvent.GetId() == ID_SCH_MIRROR_X )
|
||||||
OrientComponent( CMP_MIRROR_Y );
|
OrientComponent( CMP_MIRROR_X );
|
||||||
else if( aEvent.GetId() == ID_SCH_ORIENT_NORMAL )
|
else if( aEvent.GetId() == ID_SCH_MIRROR_Y )
|
||||||
OrientComponent( CMP_NORMAL );
|
OrientComponent( CMP_MIRROR_Y );
|
||||||
else
|
else if( aEvent.GetId() == ID_SCH_ORIENT_NORMAL )
|
||||||
wxFAIL_MSG( wxT( "Invalid orient schematic component command ID." ) );
|
OrientComponent( CMP_NORMAL );
|
||||||
|
else
|
||||||
|
wxFAIL_MSG( wxT( "Invalid orient schematic component command ID." ) );
|
||||||
|
|
||||||
break;
|
if( m_autoplaceFields )
|
||||||
|
component->AutoAutoplaceFields( GetScreen() );
|
||||||
|
|
||||||
|
m_canvas->Refresh();
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
case SCH_BITMAP_T:
|
case SCH_BITMAP_T:
|
||||||
if( aEvent.GetId() == ID_SCH_MIRROR_X )
|
if( aEvent.GetId() == ID_SCH_MIRROR_X )
|
||||||
|
|
|
||||||
|
|
@ -266,6 +266,7 @@ BEGIN_EVENT_TABLE( SCH_EDIT_FRAME, EDA_DRAW_FRAME )
|
||||||
EVT_TOOL( wxID_REPLACE, SCH_EDIT_FRAME::OnFindItems )
|
EVT_TOOL( wxID_REPLACE, SCH_EDIT_FRAME::OnFindItems )
|
||||||
EVT_TOOL( ID_BACKANNO_ITEMS, SCH_EDIT_FRAME::OnLoadCmpToFootprintLinkFile )
|
EVT_TOOL( ID_BACKANNO_ITEMS, SCH_EDIT_FRAME::OnLoadCmpToFootprintLinkFile )
|
||||||
EVT_TOOL( ID_SCH_MOVE_ITEM, SCH_EDIT_FRAME::OnMoveItem )
|
EVT_TOOL( ID_SCH_MOVE_ITEM, SCH_EDIT_FRAME::OnMoveItem )
|
||||||
|
EVT_TOOL( ID_AUTOPLACE_FIELDS, SCH_EDIT_FRAME::OnAutoplaceFields )
|
||||||
EVT_MENU( wxID_HELP, EDA_DRAW_FRAME::GetKicadHelp )
|
EVT_MENU( wxID_HELP, EDA_DRAW_FRAME::GetKicadHelp )
|
||||||
EVT_MENU( wxID_INDEX, EDA_DRAW_FRAME::GetKicadHelp )
|
EVT_MENU( wxID_INDEX, EDA_DRAW_FRAME::GetKicadHelp )
|
||||||
EVT_MENU( wxID_ABOUT, EDA_BASE_FRAME::GetKicadAbout )
|
EVT_MENU( wxID_ABOUT, EDA_BASE_FRAME::GetKicadAbout )
|
||||||
|
|
@ -1121,6 +1122,9 @@ void SCH_EDIT_FRAME::OnOpenLibraryEditor( wxCommandEvent& event )
|
||||||
libeditFrame->LoadComponentAndSelectLib( entry, library );
|
libeditFrame->LoadComponentAndSelectLib( entry, library );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
GetScreen()->SchematicCleanUp( m_canvas, NULL );
|
||||||
|
m_canvas->Refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -146,6 +146,10 @@ private:
|
||||||
|
|
||||||
bool m_forceHVLines; ///< force H or V directions for wires, bus, line
|
bool m_forceHVLines; ///< force H or V directions for wires, bus, line
|
||||||
|
|
||||||
|
bool m_autoplaceFields; ///< automatically place component fields
|
||||||
|
bool m_autoplaceJustify; ///< allow autoplace to change justification
|
||||||
|
bool m_autoplaceAlign; ///< align autoplaced fields to the grid
|
||||||
|
|
||||||
/// An index to the last find item in the found items list #m_foundItems.
|
/// An index to the last find item in the found items list #m_foundItems.
|
||||||
int m_foundItemIndex;
|
int m_foundItemIndex;
|
||||||
|
|
||||||
|
|
@ -764,6 +768,12 @@ public:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function OnAutoplaceFields
|
||||||
|
* handles the #ID_AUTOPLACE_FIELDS event.
|
||||||
|
*/
|
||||||
|
void OnAutoplaceFields( wxCommandEvent& aEvent );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function OnMoveItem
|
* Function OnMoveItem
|
||||||
* handles the #ID_SCH_MOVE_ITEM event used to move schematic itams.
|
* handles the #ID_SCH_MOVE_ITEM event used to move schematic itams.
|
||||||
|
|
|
||||||
|
|
@ -111,6 +111,7 @@ EXTERN_BITMAP( array_zone_xpm )
|
||||||
EXTERN_BITMAP( auto_associe_xpm )
|
EXTERN_BITMAP( auto_associe_xpm )
|
||||||
EXTERN_BITMAP( auto_delete_track_xpm )
|
EXTERN_BITMAP( auto_delete_track_xpm )
|
||||||
EXTERN_BITMAP( auto_track_width_xpm )
|
EXTERN_BITMAP( auto_track_width_xpm )
|
||||||
|
EXTERN_BITMAP( autoplace_fields_xpm )
|
||||||
EXTERN_BITMAP( axis3d_back_xpm )
|
EXTERN_BITMAP( axis3d_back_xpm )
|
||||||
EXTERN_BITMAP( axis3d_bottom_xpm )
|
EXTERN_BITMAP( axis3d_bottom_xpm )
|
||||||
EXTERN_BITMAP( axis3d_front_xpm )
|
EXTERN_BITMAP( axis3d_front_xpm )
|
||||||
|
|
|
||||||
|
|
@ -103,6 +103,7 @@ public:
|
||||||
int GetHeight() const { return m_Size.y; }
|
int GetHeight() const { return m_Size.y; }
|
||||||
int GetRight() const { return m_Pos.x + m_Size.x; }
|
int GetRight() const { return m_Pos.x + m_Size.x; }
|
||||||
int GetLeft() const { return m_Pos.x; }
|
int GetLeft() const { return m_Pos.x; }
|
||||||
|
int GetTop() const { return m_Pos.y; }
|
||||||
int GetBottom() const { return m_Pos.y + m_Size.y; } // Y axis from top to bottom
|
int GetBottom() const { return m_Pos.y + m_Size.y; } // Y axis from top to bottom
|
||||||
|
|
||||||
void SetOrigin( const wxPoint& pos ) { m_Pos = pos; }
|
void SetOrigin( const wxPoint& pos ) { m_Pos = pos; }
|
||||||
|
|
|
||||||
|
|
@ -688,7 +688,7 @@ void DIALOG_PLOT::applyPlotSettings()
|
||||||
// If someone enables more copper layers they will be selected by default.
|
// If someone enables more copper layers they will be selected by default.
|
||||||
selectedLayers = selectedLayers | disabledCopperLayers;
|
selectedLayers = selectedLayers | disabledCopperLayers;
|
||||||
tempOptions.SetLayerSelection( selectedLayers );
|
tempOptions.SetLayerSelection( selectedLayers );
|
||||||
|
|
||||||
tempOptions.SetNegative( m_plotPSNegativeOpt->GetValue() );
|
tempOptions.SetNegative( m_plotPSNegativeOpt->GetValue() );
|
||||||
tempOptions.SetA4Output( m_forcePSA4OutputOpt->GetValue() );
|
tempOptions.SetA4Output( m_forcePSA4OutputOpt->GetValue() );
|
||||||
|
|
||||||
|
|
@ -786,7 +786,7 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event )
|
||||||
for( LSEQ seq = m_plotOpts.GetLayerSelection().UIOrder(); seq; ++seq )
|
for( LSEQ seq = m_plotOpts.GetLayerSelection().UIOrder(); seq; ++seq )
|
||||||
{
|
{
|
||||||
LAYER_ID layer = *seq;
|
LAYER_ID layer = *seq;
|
||||||
|
|
||||||
// All copper layers that are disabled are actually selected
|
// All copper layers that are disabled are actually selected
|
||||||
// This is due to wonkyness in automatically selecting copper layers
|
// This is due to wonkyness in automatically selecting copper layers
|
||||||
// for plotting when adding more than two layers to a board.
|
// for plotting when adding more than two layers to a board.
|
||||||
|
|
@ -795,7 +795,7 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event )
|
||||||
// This skips a copper layer if it is actually disabled on the board.
|
// This skips a copper layer if it is actually disabled on the board.
|
||||||
if( ( LSET::AllCuMask() & ~m_board->GetEnabledLayers() )[layer] )
|
if( ( LSET::AllCuMask() & ~m_board->GetEnabledLayers() )[layer] )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// Pick the basename from the board file
|
// Pick the basename from the board file
|
||||||
wxFileName fn( boardFilename );
|
wxFileName fn( boardFilename );
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,9 @@
|
||||||
/*
|
/*
|
||||||
* This program source code file is part of KiCad, a free EDA CAD application.
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
||||||
*
|
*
|
||||||
* Copyright (C) 1992-2012 Jean_Pierre Charras <jp.charras at wanadoo.fr>
|
* Copyright (C) 2015 Jean_Pierre Charras <jp.charras at wanadoo.fr>
|
||||||
* Copyright (C) 1992-2012 KiCad Developers, see change_log.txt for contributors.
|
* Copyright (C) 2015 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
|
||||||
|
* Copyright (C) 1992-2015 KiCad Developers, see change_log.txt for contributors.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
|
|
@ -100,7 +101,9 @@ void EXCELLON_WRITER::CreateDrillandMapFilesSet( const wxString& aPlotDirectory,
|
||||||
|
|
||||||
BuildHolesList( pair, doing_npth );
|
BuildHolesList( pair, doing_npth );
|
||||||
|
|
||||||
if( GetHolesCount() > 0 ) // has holes?
|
// The file is created if it has holes, or if it is the non plated drill file
|
||||||
|
// to be sure the NPTH file is up to date in separate files mode.
|
||||||
|
if( GetHolesCount() > 0 || doing_npth )
|
||||||
{
|
{
|
||||||
fn = drillFileName( pair, doing_npth );
|
fn = drillFileName( pair, doing_npth );
|
||||||
fn.SetPath( aPlotDirectory );
|
fn.SetPath( aPlotDirectory );
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,7 @@
|
||||||
#include <pgm_base.h>
|
#include <pgm_base.h>
|
||||||
#include <msgpanel.h>
|
#include <msgpanel.h>
|
||||||
#include <fp_lib_table.h>
|
#include <fp_lib_table.h>
|
||||||
|
#include <ratsnest_data.h>
|
||||||
|
|
||||||
#include <pcbnew.h>
|
#include <pcbnew.h>
|
||||||
#include <pcbnew_id.h>
|
#include <pcbnew_id.h>
|
||||||
|
|
@ -590,6 +591,7 @@ bool PCB_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
|
||||||
{
|
{
|
||||||
wxBusyCursor dummy; // Displays an Hourglass while building connectivity
|
wxBusyCursor dummy; // Displays an Hourglass while building connectivity
|
||||||
Compile_Ratsnest( NULL, true );
|
Compile_Ratsnest( NULL, true );
|
||||||
|
GetBoard()->GetRatsnest()->ProcessBoard();
|
||||||
}
|
}
|
||||||
|
|
||||||
SetMsgPanel( GetBoard() );
|
SetMsgPanel( GetBoard() );
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
#include "time_limit.h"
|
#include "time_limit.h"
|
||||||
|
|
||||||
TIME_LIMIT::TIME_LIMIT( int aMilliseconds ) :
|
TIME_LIMIT::TIME_LIMIT( int aMilliseconds ) :
|
||||||
m_limitMs( aMilliseconds )
|
m_limitMs( aMilliseconds )
|
||||||
{
|
{
|
||||||
Restart();
|
Restart();
|
||||||
|
|
|
||||||
|
|
@ -232,6 +232,11 @@ class SOICWizard(RowedFootprint):
|
||||||
# |1 2 3 4 |
|
# |1 2 3 4 |
|
||||||
# \---------
|
# \---------
|
||||||
|
|
||||||
self.draw.BoxWithDiagonalAtCorner(0, 0, ssx*2, ssy*2, pcbnew.FromMM(1))
|
setback = pcbnew.FromMM(0.8)
|
||||||
|
|
||||||
|
if setback > ssy:
|
||||||
|
setback = ssy
|
||||||
|
|
||||||
|
self.draw.BoxWithDiagonalAtCorner(0, 0, ssx*2, ssy*2, setback, self.draw.flipY)
|
||||||
|
|
||||||
SOICWizard().register()
|
SOICWizard().register()
|
||||||
|
|
|
||||||
|
|
@ -131,20 +131,6 @@ int SPECCTRA_DB::findLayerName( const std::string& aLayerName ) const
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void SPECCTRA_DB::ThrowIOError( const wxString& fmt, ... ) throw( IO_ERROR )
|
|
||||||
{
|
|
||||||
wxString errText;
|
|
||||||
va_list args;
|
|
||||||
|
|
||||||
va_start( args, fmt );
|
|
||||||
errText.PrintfV( fmt, args );
|
|
||||||
va_end( args );
|
|
||||||
|
|
||||||
THROW_IO_ERROR( errText );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void SPECCTRA_DB::readCOMPnPIN( std::string* component_id, std::string* pin_id ) throw( IO_ERROR )
|
void SPECCTRA_DB::readCOMPnPIN( std::string* component_id, std::string* pin_id ) throw( IO_ERROR )
|
||||||
{
|
{
|
||||||
T tok;
|
T tok;
|
||||||
|
|
|
||||||
|
|
@ -3919,8 +3919,6 @@ public:
|
||||||
*/
|
*/
|
||||||
void LoadSESSION( const wxString& filename ) throw( IO_ERROR, boost::bad_pointer );
|
void LoadSESSION( const wxString& filename ) throw( IO_ERROR, boost::bad_pointer );
|
||||||
|
|
||||||
void ThrowIOError( const wxString& fmt, ... ) throw( IO_ERROR );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function ExportPCB
|
* Function ExportPCB
|
||||||
* writes the internal PCB instance out as a SPECTRA DSN format file.
|
* writes the internal PCB instance out as a SPECTRA DSN format file.
|
||||||
|
|
|
||||||
|
|
@ -1025,7 +1025,7 @@ void SPECCTRA_DB::fillBOUNDARY( BOARD* aBoard, BOUNDARY* boundary )
|
||||||
wxString error = wxString::Format( _( "Unsupported DRAWSEGMENT type %s" ),
|
wxString error = wxString::Format( _( "Unsupported DRAWSEGMENT type %s" ),
|
||||||
GetChars( BOARD_ITEM::ShowShape( graphic->GetShape() ) ) );
|
GetChars( BOARD_ITEM::ShowShape( graphic->GetShape() ) ) );
|
||||||
|
|
||||||
ThrowIOError( error );
|
THROW_IO_ERROR( error );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -1132,7 +1132,7 @@ void SPECCTRA_DB::fillBOUNDARY( BOARD* aBoard, BOUNDARY* boundary )
|
||||||
wxString error = wxString::Format( _( "Unsupported DRAWSEGMENT type %s" ),
|
wxString error = wxString::Format( _( "Unsupported DRAWSEGMENT type %s" ),
|
||||||
GetChars( BOARD_ITEM::ShowShape( graphic->GetShape() ) ) );
|
GetChars( BOARD_ITEM::ShowShape( graphic->GetShape() ) ) );
|
||||||
|
|
||||||
ThrowIOError( error );
|
THROW_IO_ERROR( error );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -1159,7 +1159,7 @@ void SPECCTRA_DB::fillBOUNDARY( BOARD* aBoard, BOUNDARY* boundary )
|
||||||
GetChars( FROM_UTF8( BOARD_ITEM::FormatInternalUnits( prevPt.x ).c_str() ) ),
|
GetChars( FROM_UTF8( BOARD_ITEM::FormatInternalUnits( prevPt.x ).c_str() ) ),
|
||||||
GetChars( FROM_UTF8( BOARD_ITEM::FormatInternalUnits( prevPt.y ).c_str() ) )
|
GetChars( FROM_UTF8( BOARD_ITEM::FormatInternalUnits( prevPt.y ).c_str() ) )
|
||||||
);
|
);
|
||||||
ThrowIOError( error );
|
THROW_IO_ERROR( error );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -1268,7 +1268,7 @@ void SPECCTRA_DB::fillBOUNDARY( BOARD* aBoard, BOUNDARY* boundary )
|
||||||
_( "Unsupported DRAWSEGMENT type %s" ),
|
_( "Unsupported DRAWSEGMENT type %s" ),
|
||||||
GetChars( BOARD_ITEM::ShowShape( graphic->GetShape() ) ) );
|
GetChars( BOARD_ITEM::ShowShape( graphic->GetShape() ) ) );
|
||||||
|
|
||||||
ThrowIOError( error );
|
THROW_IO_ERROR( error );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -1296,7 +1296,7 @@ void SPECCTRA_DB::fillBOUNDARY( BOARD* aBoard, BOUNDARY* boundary )
|
||||||
GetChars( FROM_UTF8( BOARD_ITEM::FormatInternalUnits( prevPt.y ).c_str() ) )
|
GetChars( FROM_UTF8( BOARD_ITEM::FormatInternalUnits( prevPt.y ).c_str() ) )
|
||||||
);
|
);
|
||||||
|
|
||||||
ThrowIOError( error );
|
THROW_IO_ERROR( error );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -1449,16 +1449,16 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard )
|
||||||
|
|
||||||
if( module->GetReference() == wxEmptyString )
|
if( module->GetReference() == wxEmptyString )
|
||||||
{
|
{
|
||||||
ThrowIOError( _( "Component with value of '%s' has empty reference id." ),
|
THROW_IO_ERROR( wxString::Format( _( "Component with value of '%s' has empty reference id." ),
|
||||||
GetChars( module->GetValue() ) );
|
GetChars( module->GetValue() ) ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
// if we cannot insert OK, that means the reference has been seen before.
|
// if we cannot insert OK, that means the reference has been seen before.
|
||||||
STRINGSET_PAIR refpair = refs.insert( TO_UTF8( module->GetReference() ) );
|
STRINGSET_PAIR refpair = refs.insert( TO_UTF8( module->GetReference() ) );
|
||||||
if( !refpair.second ) // insert failed
|
if( !refpair.second ) // insert failed
|
||||||
{
|
{
|
||||||
ThrowIOError( _( "Multiple components have identical reference IDs of '%s'." ),
|
THROW_IO_ERROR( wxString::Format( _( "Multiple components have identical reference IDs of '%s'." ),
|
||||||
GetChars( module->GetReference() ) );
|
GetChars( module->GetReference() ) ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -2235,4 +2235,3 @@ void SPECCTRA_DB::RevertMODULEs( BOARD* aBoard )
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace DSN
|
} // namespace DSN
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -197,8 +197,8 @@ TRACK* SPECCTRA_DB::makeTRACK( PATH* aPath, int aPointIndex, int aNetcode ) thro
|
||||||
if( layerNdx == -1 )
|
if( layerNdx == -1 )
|
||||||
{
|
{
|
||||||
wxString layerName = FROM_UTF8( aPath->layer_id.c_str() );
|
wxString layerName = FROM_UTF8( aPath->layer_id.c_str() );
|
||||||
ThrowIOError( _("Session file uses invalid layer id \"%s\""),
|
THROW_IO_ERROR( wxString::Format( _("Session file uses invalid layer id \"%s\""),
|
||||||
GetChars( layerName ) );
|
GetChars( layerName ) ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
TRACK* track = new TRACK( sessionBoard );
|
TRACK* track = new TRACK( sessionBoard );
|
||||||
|
|
@ -250,15 +250,15 @@ TRACK* SPECCTRA_DB::makeTRACK( PATH* aPath, int aPointIndex, int aNetcode ) thro
|
||||||
|
|
||||||
if( shapeCount == 0 )
|
if( shapeCount == 0 )
|
||||||
{
|
{
|
||||||
ThrowIOError( _( "Session via padstack has no shapes" ) );
|
THROW_IO_ERROR( _( "Session via padstack has no shapes" ) );
|
||||||
}
|
}
|
||||||
else if( shapeCount == 1 )
|
else if( shapeCount == 1 )
|
||||||
{
|
{
|
||||||
shape = (SHAPE*) (*aPadstack)[0];
|
shape = (SHAPE*) (*aPadstack)[0];
|
||||||
DSN_T type = shape->shape->Type();
|
DSN_T type = shape->shape->Type();
|
||||||
if( type != T_circle )
|
if( type != T_circle )
|
||||||
ThrowIOError( _( "Unsupported via shape: %s"),
|
THROW_IO_ERROR( wxString::Format( _( "Unsupported via shape: %s"),
|
||||||
GetChars( GetTokenString( type ) ) );
|
GetChars( GetTokenString( type ) ) ) );
|
||||||
|
|
||||||
CIRCLE* circle = (CIRCLE*) shape->shape;
|
CIRCLE* circle = (CIRCLE*) shape->shape;
|
||||||
int viaDiam = scale( circle->diameter, routeResolution );
|
int viaDiam = scale( circle->diameter, routeResolution );
|
||||||
|
|
@ -275,8 +275,8 @@ TRACK* SPECCTRA_DB::makeTRACK( PATH* aPath, int aPointIndex, int aNetcode ) thro
|
||||||
shape = (SHAPE*) (*aPadstack)[0];
|
shape = (SHAPE*) (*aPadstack)[0];
|
||||||
DSN_T type = shape->shape->Type();
|
DSN_T type = shape->shape->Type();
|
||||||
if( type != T_circle )
|
if( type != T_circle )
|
||||||
ThrowIOError( _( "Unsupported via shape: %s"),
|
THROW_IO_ERROR( wxString::Format( _( "Unsupported via shape: %s"),
|
||||||
GetChars( GetTokenString( type ) ) );
|
GetChars( GetTokenString( type ) ) ) );
|
||||||
|
|
||||||
CIRCLE* circle = (CIRCLE*) shape->shape;
|
CIRCLE* circle = (CIRCLE*) shape->shape;
|
||||||
int viaDiam = scale( circle->diameter, routeResolution );
|
int viaDiam = scale( circle->diameter, routeResolution );
|
||||||
|
|
@ -300,8 +300,8 @@ TRACK* SPECCTRA_DB::makeTRACK( PATH* aPath, int aPointIndex, int aNetcode ) thro
|
||||||
shape = (SHAPE*) (*aPadstack)[i];
|
shape = (SHAPE*) (*aPadstack)[i];
|
||||||
DSN_T type = shape->shape->Type();
|
DSN_T type = shape->shape->Type();
|
||||||
if( type != T_circle )
|
if( type != T_circle )
|
||||||
ThrowIOError( _( "Unsupported via shape: %s"),
|
THROW_IO_ERROR( wxString::Format( _( "Unsupported via shape: %s"),
|
||||||
GetChars( GetTokenString( type ) ) );
|
GetChars( GetTokenString( type ) ) ) );
|
||||||
|
|
||||||
CIRCLE* circle = (CIRCLE*) shape->shape;
|
CIRCLE* circle = (CIRCLE*) shape->shape;
|
||||||
|
|
||||||
|
|
@ -309,8 +309,8 @@ TRACK* SPECCTRA_DB::makeTRACK( PATH* aPath, int aPointIndex, int aNetcode ) thro
|
||||||
if( layerNdx == -1 )
|
if( layerNdx == -1 )
|
||||||
{
|
{
|
||||||
wxString layerName = FROM_UTF8( circle->layer_id.c_str() );
|
wxString layerName = FROM_UTF8( circle->layer_id.c_str() );
|
||||||
ThrowIOError( _("Session file uses invalid layer id \"%s\""),
|
THROW_IO_ERROR( wxString::Format( _("Session file uses invalid layer id \"%s\""),
|
||||||
GetChars( layerName ) );
|
GetChars( layerName ) ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
if( layerNdx > topLayerNdx )
|
if( layerNdx > topLayerNdx )
|
||||||
|
|
@ -356,18 +356,18 @@ void SPECCTRA_DB::FromSESSION( BOARD* aBoard ) throw( IO_ERROR )
|
||||||
sessionBoard = aBoard; // not owned here
|
sessionBoard = aBoard; // not owned here
|
||||||
|
|
||||||
if( !session )
|
if( !session )
|
||||||
ThrowIOError( _("Session file is missing the \"session\" section") );
|
THROW_IO_ERROR( _("Session file is missing the \"session\" section") );
|
||||||
|
|
||||||
/* Dick 16-Jan-2012: session need not have a placement section.
|
/* Dick 16-Jan-2012: session need not have a placement section.
|
||||||
if( !session->placement )
|
if( !session->placement )
|
||||||
ThrowIOError( _("Session file is missing the \"placement\" section") );
|
THROW_IO_ERROR( _("Session file is missing the \"placement\" section") );
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if( !session->route )
|
if( !session->route )
|
||||||
ThrowIOError( _("Session file is missing the \"routes\" section") );
|
THROW_IO_ERROR( _("Session file is missing the \"routes\" section") );
|
||||||
|
|
||||||
if( !session->route->library )
|
if( !session->route->library )
|
||||||
ThrowIOError( _("Session file is missing the \"library_out\" section") );
|
THROW_IO_ERROR( _("Session file is missing the \"library_out\" section") );
|
||||||
|
|
||||||
// delete all the old tracks and vias
|
// delete all the old tracks and vias
|
||||||
aBoard->m_Track.DeleteAll();
|
aBoard->m_Track.DeleteAll();
|
||||||
|
|
@ -393,9 +393,8 @@ void SPECCTRA_DB::FromSESSION( BOARD* aBoard ) throw( IO_ERROR )
|
||||||
MODULE* module = aBoard->FindModuleByReference( reference );
|
MODULE* module = aBoard->FindModuleByReference( reference );
|
||||||
if( !module )
|
if( !module )
|
||||||
{
|
{
|
||||||
ThrowIOError(
|
THROW_IO_ERROR( wxString::Format( _("Session file has 'reference' to non-existent component \"%s\""),
|
||||||
_("Session file has 'reference' to non-existent component \"%s\""),
|
GetChars( reference ) ) );
|
||||||
GetChars( reference ) );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !place->hasVertex )
|
if( !place->hasVertex )
|
||||||
|
|
@ -478,11 +477,10 @@ void SPECCTRA_DB::FromSESSION( BOARD* aBoard ) throw( IO_ERROR )
|
||||||
'wire'.
|
'wire'.
|
||||||
|
|
||||||
wxString netId = FROM_UTF8( wire->net_id.c_str() );
|
wxString netId = FROM_UTF8( wire->net_id.c_str() );
|
||||||
ThrowIOError(
|
THROW_IO_ERROR( wxString::Format( _("Unsupported wire shape: \"%s\" for net: \"%s\""),
|
||||||
_("Unsupported wire shape: \"%s\" for net: \"%s\""),
|
DLEX::GetTokenString(shape).GetData(),
|
||||||
DLEX::GetTokenString(shape).GetData(),
|
netId.GetData()
|
||||||
netId.GetData()
|
) );
|
||||||
);
|
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -542,8 +540,8 @@ void SPECCTRA_DB::FromSESSION( BOARD* aBoard ) throw( IO_ERROR )
|
||||||
// wire_via to text and put that text into the exception.
|
// wire_via to text and put that text into the exception.
|
||||||
wxString psid( FROM_UTF8( wire_via->GetPadstackId().c_str() ) );
|
wxString psid( FROM_UTF8( wire_via->GetPadstackId().c_str() ) );
|
||||||
|
|
||||||
ThrowIOError( _("A wire_via references a missing padstack \"%s\""),
|
THROW_IO_ERROR( wxString::Format( _("A wire_via references a missing padstack \"%s\""),
|
||||||
GetChars( psid ) );
|
GetChars( psid ) ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
NETCLASSPTR netclass = aBoard->GetDesignSettings().m_NetClasses.GetDefault();
|
NETCLASSPTR netclass = aBoard->GetDesignSettings().m_NetClasses.GetDefault();
|
||||||
|
|
@ -561,4 +559,3 @@ void SPECCTRA_DB::FromSESSION( BOARD* aBoard ) throw( IO_ERROR )
|
||||||
|
|
||||||
|
|
||||||
} // namespace DSN
|
} // namespace DSN
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -269,7 +269,7 @@ int POINT_EDITOR::OnSelectionChange( const TOOL_EVENT& aEvent )
|
||||||
{
|
{
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !modified )
|
if ( !modified )
|
||||||
updateEditedPoint( *evt );
|
updateEditedPoint( *evt );
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -290,8 +290,6 @@ int KICAD_PLUGIN_LDR_3D::GetNFilters( void )
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int n = m_getNFilters();
|
|
||||||
|
|
||||||
return m_getNFilters();
|
return m_getNFilters();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,14 +21,6 @@
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
#include <windows.h>
|
|
||||||
#else
|
|
||||||
#include <dlfcn.h>
|
|
||||||
#include <pwd.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,19 +30,25 @@
|
||||||
#ifndef PLUGINLDR_H
|
#ifndef PLUGINLDR_H
|
||||||
#define PLUGINLDR_H
|
#define PLUGINLDR_H
|
||||||
|
|
||||||
#include <dlfcn.h>
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <wx/string.h>
|
#include <wx/string.h>
|
||||||
|
|
||||||
// helper functions to link functions
|
// helper functions to link functions
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|
||||||
|
#include <windows.h>
|
||||||
#define LINK_ITEM( funcPtr, funcType, funcName ) \
|
#define LINK_ITEM( funcPtr, funcType, funcName ) \
|
||||||
funcPtr = (funcType) GetProcAddress( m_dlHandle, funcName );
|
funcPtr = (funcType) GetProcAddress( m_dlHandle, funcName );
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
#include <dlfcn.h>
|
||||||
#define LINK_ITEM( funcPtr, funcType, funcName ) \
|
#define LINK_ITEM( funcPtr, funcType, funcName ) \
|
||||||
*(void**) (&funcPtr) = dlsym( m_dlHandle, funcName );
|
*(void**) (&funcPtr) = dlsym( m_dlHandle, funcName );
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// typedefs of the functions exported by the 3D Plugin Class
|
// typedefs of the functions exported by the 3D Plugin Class
|
||||||
typedef char const* (*GET_PLUGIN_CLASS) ( void );
|
typedef char const* (*GET_PLUGIN_CLASS) ( void );
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ double GetPointToLineSegmentDistance( int x, int y, int xi, int yi, int xf, int
|
||||||
* if b > DBL_MAX/10, assume vertical line at x = a
|
* if b > DBL_MAX/10, assume vertical line at x = a
|
||||||
* returns closest point on line in xpp, ypp
|
* returns closest point on line in xpp, ypp
|
||||||
*/
|
*/
|
||||||
double GetPointToLineDistance( double a, double b, int x, int y,
|
double GetPointToLineDistance( double a, double b, int x, int y,
|
||||||
double * xp=NULL, double * yp=NULL );
|
double * xp=NULL, double * yp=NULL );
|
||||||
|
|
||||||
inline double Distance( double x1, double y1, double x2, double y2 )
|
inline double Distance( double x1, double y1, double x2, double y2 )
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/*
|
/*
|
||||||
* Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
|
* Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
|
||||||
* http://code.google.com/p/poly2tri/
|
* http://code.google.com/p/poly2tri/
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/*
|
/*
|
||||||
* Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
|
* Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
|
||||||
* http://code.google.com/p/poly2tri/
|
* http://code.google.com/p/poly2tri/
|
||||||
*
|
*
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CDT_H
|
#ifndef CDT_H
|
||||||
#define CDT_H
|
#define CDT_H
|
||||||
|
|
||||||
|
|
@ -37,11 +37,11 @@
|
||||||
#include "sweep.h"
|
#include "sweep.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Mason Green <mason.green@gmail.com>
|
* @author Mason Green <mason.green@gmail.com>
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace p2t {
|
namespace p2t {
|
||||||
|
|
||||||
class CDT
|
class CDT
|
||||||
|
|
@ -50,40 +50,40 @@ public:
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor - add polyline with non repeating points
|
* Constructor - add polyline with non repeating points
|
||||||
*
|
*
|
||||||
* @param polyline
|
* @param polyline
|
||||||
*/
|
*/
|
||||||
CDT(std::vector<Point*> polyline);
|
CDT(std::vector<Point*> polyline);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Destructor - clean up memory
|
* Destructor - clean up memory
|
||||||
*/
|
*/
|
||||||
~CDT();
|
~CDT();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a hole
|
* Add a hole
|
||||||
*
|
*
|
||||||
* @param polyline
|
* @param polyline
|
||||||
*/
|
*/
|
||||||
void AddHole(std::vector<Point*> polyline);
|
void AddHole(std::vector<Point*> polyline);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a steiner point
|
* Add a steiner point
|
||||||
*
|
*
|
||||||
* @param point
|
* @param point
|
||||||
*/
|
*/
|
||||||
void AddPoint(Point* point);
|
void AddPoint(Point* point);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Triangulate - do this AFTER you've added the polyline, holes, and Steiner points
|
* Triangulate - do this AFTER you've added the polyline, holes, and Steiner points
|
||||||
*/
|
*/
|
||||||
void Triangulate();
|
void Triangulate();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get CDT triangles
|
* Get CDT triangles
|
||||||
*/
|
*/
|
||||||
std::vector<Triangle*> GetTriangles();
|
std::vector<Triangle*> GetTriangles();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get triangle map
|
* Get triangle map
|
||||||
*/
|
*/
|
||||||
|
|
@ -94,7 +94,7 @@ public:
|
||||||
/**
|
/**
|
||||||
* Internals
|
* Internals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
SweepContext* sweep_context_;
|
SweepContext* sweep_context_;
|
||||||
Sweep* sweep_;
|
Sweep* sweep_;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue