diff --git a/eeschema/class_libentry.cpp b/eeschema/class_libentry.cpp index 415cbd5250..0f6d259e4b 100644 --- a/eeschema/class_libentry.cpp +++ b/eeschema/class_libentry.cpp @@ -847,6 +847,7 @@ bool LIB_COMPONENT::LoadFootprints( FILE* file, char* line, * The unit Unit, and the shape Convert are considered. * If Unit == 0, Unit is not used * if Convert == 0 Convert is non used + * Invisible fields are not take in account **/ /**********************************************************************/ EDA_Rect LIB_COMPONENT::GetBoundaryBox( int Unit, int Convert ) @@ -862,7 +863,11 @@ EDA_Rect LIB_COMPONENT::GetBoundaryBox( int Unit, int Convert ) && ( ( Convert > 0 ) && ( Convert != item.m_Convert ) ) ) continue; - bBox.Merge( item.GetBoundingBox() ); + if ( ( item.Type() == COMPONENT_FIELD_DRAW_TYPE ) + && ( ( ( LIB_TEXT& ) item ).m_Attributs & TEXT_NO_VISIBLE) ) + continue; + + bBox.Merge( item.GetBoundingBox() ); } return bBox; diff --git a/include/boost/config/compiler/borland.hpp b/include/boost/config/compiler/borland.hpp index 16a70687f4..91f064c68e 100644 --- a/include/boost/config/compiler/borland.hpp +++ b/include/boost/config/compiler/borland.hpp @@ -17,7 +17,7 @@ #endif // last known compiler version: -#if (__BORLANDC__ > 0x610) +#if (__BORLANDC__ > 0x613) //# if defined(BOOST_ASSERT_CONFIG) # error "Unknown compiler version - please run the configure tests and report the results" //# else @@ -107,30 +107,29 @@ # endif #endif -// Borland C++ Builder 2007 December 2007 Update and below: -//#if (__BORLANDC__ <= 0x593) -#if (__BORLANDC__ <= 0x610) // Beman has asked Alisdair for more info +#if (__BORLANDC__ <= 0x613) // Beman has asked Alisdair for more info // we shouldn't really need this - but too many things choke // without it, this needs more investigation: # define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS # define BOOST_NO_IS_ABSTRACT # define BOOST_NO_FUNCTION_TYPE_SPECIALIZATIONS +# define BOOST_NO_USING_TEMPLATE +# define BOOST_SP_NO_SP_CONVERTIBLE // Temporary workaround #define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS #endif // Borland C++ Builder 2008 and below: -#if (__BORLANDC__ <= 0x601) # define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL -# define BOOST_ILLEGAL_CV_REFERENCES # define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS # define BOOST_NO_MEMBER_TEMPLATE_FRIENDS # define BOOST_NO_TWO_PHASE_NAME_LOOKUP -# define BOOST_NO_USING_TEMPLATE # define BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE # define BOOST_NO_NESTED_FRIENDSHIP # define BOOST_NO_TYPENAME_WITH_CTOR +#if (__BORLANDC__ < 0x600) +# define BOOST_ILLEGAL_CV_REFERENCES #endif // @@ -169,12 +168,14 @@ #define BOOST_NO_CONSTEXPR #define BOOST_NO_DEFAULTED_FUNCTIONS #define BOOST_NO_DELETED_FUNCTIONS +#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS #define BOOST_NO_INITIALIZER_LISTS #define BOOST_NO_LAMBDAS #define BOOST_NO_NULLPTR #define BOOST_NO_RAW_LITERALS #define BOOST_NO_RVALUE_REFERENCES #define BOOST_NO_SCOPED_ENUMS +#define BOOST_NO_SFINAE_EXPR #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS // UTF-8 still not supported #define BOOST_NO_VARIADIC_TEMPLATES @@ -235,7 +236,7 @@ // // ABI fixing headers: // -#if __BORLANDC__ < 0x600 // not implemented for version 6 compiler yet +#if __BORLANDC__ != 0x600 // not implemented for version 6 compiler yet #ifndef BOOST_ABI_PREFIX # define BOOST_ABI_PREFIX "boost/config/abi/borland_prefix.hpp" #endif diff --git a/include/boost/config/compiler/codegear.hpp b/include/boost/config/compiler/codegear.hpp index c329324494..3915cd54f9 100644 --- a/include/boost/config/compiler/codegear.hpp +++ b/include/boost/config/compiler/codegear.hpp @@ -20,7 +20,7 @@ // // versions check: // last known and checked version is 0x610 -#if (__CODEGEARC__ > 0x610) +#if (__CODEGEARC__ > 0x613) # if defined(BOOST_ASSERT_CONFIG) # error "Unknown compiler version - please run the configure tests and report the results" # else @@ -29,7 +29,7 @@ #endif // CodeGear C++ Builder 2009 -#if (__CODEGEARC__ <= 0x610) +#if (__CODEGEARC__ <= 0x613) # define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL # define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS # define BOOST_NO_MEMBER_TEMPLATE_FRIENDS @@ -42,6 +42,7 @@ # define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS # define BOOST_NO_TYPENAME_WITH_CTOR // Cannot use typename keyword when making temporaries of a dependant type # define BOOST_NO_NESTED_FRIENDSHIP // TC1 gives nested classes access rights as any other member +# define BOOST_SP_NO_SP_CONVERTIBLE // Temporary hack, until specific MPL preprocessed headers are generated # define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS @@ -80,11 +81,13 @@ #define BOOST_NO_DEFAULTED_FUNCTIONS #define BOOST_NO_DELETED_FUNCTIONS #define BOOST_NO_EXTERN_TEMPLATE +#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS #define BOOST_NO_INITIALIZER_LISTS #define BOOST_NO_LAMBDAS #define BOOST_NO_NULLPTR #define BOOST_NO_RAW_LITERALS #define BOOST_NO_RVALUE_REFERENCES +#define BOOST_NO_SFINAE_EXPR #define BOOST_NO_STATIC_ASSERT #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS diff --git a/include/boost/config/compiler/common_edg.hpp b/include/boost/config/compiler/common_edg.hpp index 75c2f57f1e..9dc4cef8eb 100644 --- a/include/boost/config/compiler/common_edg.hpp +++ b/include/boost/config/compiler/common_edg.hpp @@ -75,11 +75,13 @@ #define BOOST_NO_DELETED_FUNCTIONS #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS #define BOOST_NO_EXTERN_TEMPLATE +#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS #define BOOST_NO_LAMBDAS #define BOOST_NO_NULLPTR #define BOOST_NO_RAW_LITERALS #define BOOST_NO_RVALUE_REFERENCES #define BOOST_NO_SCOPED_ENUMS +#define BOOST_NO_SFINAE_EXPR #define BOOST_NO_STATIC_ASSERT #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS diff --git a/include/boost/config/compiler/digitalmars.hpp b/include/boost/config/compiler/digitalmars.hpp index 3818f1ad33..a01b4c28ec 100644 --- a/include/boost/config/compiler/digitalmars.hpp +++ b/include/boost/config/compiler/digitalmars.hpp @@ -75,6 +75,7 @@ #define BOOST_NO_RAW_LITERALS #define BOOST_NO_RVALUE_REFERENCES #define BOOST_NO_SCOPED_ENUMS +#define BOOST_NO_SFINAE_EXPR #define BOOST_NO_STATIC_ASSERT #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS diff --git a/include/boost/config/compiler/gcc.hpp b/include/boost/config/compiler/gcc.hpp index 94653c8990..6cae94cae6 100644 --- a/include/boost/config/compiler/gcc.hpp +++ b/include/boost/config/compiler/gcc.hpp @@ -64,6 +64,9 @@ // All problems to gcc-3.x and earlier here: // #define BOOST_NO_TWO_PHASE_NAME_LOOKUP +# ifdef __OPEN64__ +# define BOOST_NO_IS_ABSTRACT +# endif #endif #ifndef __EXCEPTIONS @@ -104,15 +107,12 @@ // C++0x features not implemented in any GCC version // #define BOOST_NO_CONSTEXPR -#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS #define BOOST_NO_EXTERN_TEMPLATE #define BOOST_NO_LAMBDAS #define BOOST_NO_NULLPTR #define BOOST_NO_RAW_LITERALS -// scoped enums have a serious bug in 4.4.0, so define BOOST_NO_SCOPED_ENUMS until it -// gets fixed. See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38064 -#define BOOST_NO_SCOPED_ENUMS #define BOOST_NO_TEMPLATE_ALIASES +#define BOOST_NO_UNICODE_LITERALS // C++0x features in 4.3.n and later // @@ -126,6 +126,7 @@ # define BOOST_HAS_VARIADIC_TMPL #else # define BOOST_NO_DECLTYPE +# define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS # define BOOST_NO_RVALUE_REFERENCES # define BOOST_NO_STATIC_ASSERT @@ -149,7 +150,24 @@ # define BOOST_NO_DELETED_FUNCTIONS # define BOOST_NO_INITIALIZER_LISTS # define BOOST_NO_SCOPED_ENUMS -# define BOOST_NO_UNICODE_LITERALS +#endif + +#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4) +# define BOOST_NO_SFINAE_EXPR +#endif + +// C++0x features in 4.4.1 and later +// +#if (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__ < 40401) || !defined(__GXX_EXPERIMENTAL_CXX0X__) +// scoped enums have a serious bug in 4.4.0, so define BOOST_NO_SCOPED_ENUMS before 4.4.1 +// See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38064 +# define BOOST_NO_SCOPED_ENUMS +#endif + +// C++0x features in 4.5.n and later +// +#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) || !defined(__GXX_EXPERIMENTAL_CXX0X__) +# define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS #endif // ConceptGCC compiler: @@ -172,8 +190,8 @@ # error "Compiler not configured - please reconfigure" #endif // -// last known and checked version is 4.3 (Pre-release): -#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 3)) +// last known and checked version is 4.4 (Pre-release): +#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 4)) # if defined(BOOST_ASSERT_CONFIG) # error "Unknown compiler version - please run the configure tests and report the results" # else diff --git a/include/boost/config/compiler/hp_acc.hpp b/include/boost/config/compiler/hp_acc.hpp index a24fc16bed..98e7772af2 100644 --- a/include/boost/config/compiler/hp_acc.hpp +++ b/include/boost/config/compiler/hp_acc.hpp @@ -103,12 +103,14 @@ #define BOOST_NO_DELETED_FUNCTIONS #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS #define BOOST_NO_EXTERN_TEMPLATE +#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS #define BOOST_NO_INITIALIZER_LISTS #define BOOST_NO_LAMBDAS #define BOOST_NO_NULLPTR #define BOOST_NO_RAW_LITERALS #define BOOST_NO_RVALUE_REFERENCES #define BOOST_NO_SCOPED_ENUMS +#define BOOST_NO_SFINAE_EXPR #define BOOST_NO_STATIC_ASSERT #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS diff --git a/include/boost/config/compiler/intel.hpp b/include/boost/config/compiler/intel.hpp index 1ab029ed46..531242e964 100644 --- a/include/boost/config/compiler/intel.hpp +++ b/include/boost/config/compiler/intel.hpp @@ -99,7 +99,7 @@ # define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL # endif #endif -#if (defined(__GNUC__) && (__GNUC__ < 4)) || defined(_WIN32) || (BOOST_INTEL_CXX_VERSION <= 1100) +#if (defined(__GNUC__) && (__GNUC__ < 4)) || defined(_WIN32) || (BOOST_INTEL_CXX_VERSION <= 1110) // GCC or VC emulation: #define BOOST_NO_TWO_PHASE_NAME_LOOKUP #endif @@ -159,7 +159,7 @@ template<> struct assert_intrinsic_wchar_t {}; // // last known and checked version: -#if (BOOST_INTEL_CXX_VERSION > 1100) +#if (BOOST_INTEL_CXX_VERSION > 1110) # if defined(BOOST_ASSERT_CONFIG) # error "Unknown compiler version - please run the configure tests and report the results" # elif defined(_MSC_VER) diff --git a/include/boost/config/compiler/metrowerks.hpp b/include/boost/config/compiler/metrowerks.hpp index e1e9329c46..aeba7f805c 100644 --- a/include/boost/config/compiler/metrowerks.hpp +++ b/include/boost/config/compiler/metrowerks.hpp @@ -103,11 +103,13 @@ #define BOOST_NO_DELETED_FUNCTIONS #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS #define BOOST_NO_EXTERN_TEMPLATE +#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS #define BOOST_NO_INITIALIZER_LISTS #define BOOST_NO_LAMBDAS #define BOOST_NO_NULLPTR #define BOOST_NO_RAW_LITERALS #define BOOST_NO_SCOPED_ENUMS +#define BOOST_NO_SFINAE_EXPR #define BOOST_NO_STATIC_ASSERT #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS diff --git a/include/boost/config/compiler/mpw.hpp b/include/boost/config/compiler/mpw.hpp index ac536c0001..4db14ddef3 100644 --- a/include/boost/config/compiler/mpw.hpp +++ b/include/boost/config/compiler/mpw.hpp @@ -51,12 +51,14 @@ #define BOOST_NO_DELETED_FUNCTIONS #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS #define BOOST_NO_EXTERN_TEMPLATE +#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS #define BOOST_NO_INITIALIZER_LISTS #define BOOST_NO_LAMBDAS #define BOOST_NO_NULLPTR #define BOOST_NO_RAW_LITERALS #define BOOST_NO_RVALUE_REFERENCES #define BOOST_NO_SCOPED_ENUMS +#define BOOST_NO_SFINAE_EXPR #define BOOST_NO_STATIC_ASSERT #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS diff --git a/include/boost/config/compiler/pgi.hpp b/include/boost/config/compiler/pgi.hpp index 64650cea6d..e40553efc0 100644 --- a/include/boost/config/compiler/pgi.hpp +++ b/include/boost/config/compiler/pgi.hpp @@ -43,12 +43,14 @@ #define BOOST_NO_DELETED_FUNCTIONS #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS #define BOOST_NO_EXTERN_TEMPLATE +#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS #define BOOST_NO_INITIALIZER_LISTS #define BOOST_NO_LAMBDAS #define BOOST_NO_NULLPTR #define BOOST_NO_RAW_LITERALS #define BOOST_NO_RVALUE_REFERENCES #define BOOST_NO_SCOPED_ENUMS +#define BOOST_NO_SFINAE_EXPR #define BOOST_NO_STATIC_ASSERT #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS diff --git a/include/boost/config/compiler/sunpro_cc.hpp b/include/boost/config/compiler/sunpro_cc.hpp index c4407232d0..f5184887f1 100644 --- a/include/boost/config/compiler/sunpro_cc.hpp +++ b/include/boost/config/compiler/sunpro_cc.hpp @@ -96,12 +96,14 @@ #define BOOST_NO_DELETED_FUNCTIONS #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS #define BOOST_NO_EXTERN_TEMPLATE +#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS #define BOOST_NO_INITIALIZER_LISTS #define BOOST_NO_LAMBDAS #define BOOST_NO_NULLPTR #define BOOST_NO_RAW_LITERALS #define BOOST_NO_RVALUE_REFERENCES #define BOOST_NO_SCOPED_ENUMS +#define BOOST_NO_SFINAE_EXPR #define BOOST_NO_STATIC_ASSERT #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS diff --git a/include/boost/config/compiler/vacpp.hpp b/include/boost/config/compiler/vacpp.hpp index b526a6b0fe..01956d3a70 100644 --- a/include/boost/config/compiler/vacpp.hpp +++ b/include/boost/config/compiler/vacpp.hpp @@ -72,11 +72,13 @@ #define BOOST_NO_DELETED_FUNCTIONS #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS #define BOOST_NO_EXTERN_TEMPLATE +#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS #define BOOST_NO_LAMBDAS #define BOOST_NO_NULLPTR #define BOOST_NO_RAW_LITERALS #define BOOST_NO_RVALUE_REFERENCES #define BOOST_NO_SCOPED_ENUMS +#define BOOST_NO_SFINAE_EXPR #define BOOST_NO_STATIC_ASSERT #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp index 2c3a2adf00..fd21f26bab 100644 --- a/include/boost/config/compiler/visualc.hpp +++ b/include/boost/config/compiler/visualc.hpp @@ -14,6 +14,12 @@ #define BOOST_MSVC _MSC_VER +#if _MSC_FULL_VER > 100000000 +# define BOOST_MSVC_FULL_VER _MSC_FULL_VER +#else +# define BOOST_MSVC_FULL_VER (_MSC_FULL_VER * 10) +#endif + // turn off the warnings before we #include anything #pragma warning( disable : 4503 ) // warning: decorated name length exceeded @@ -168,10 +174,12 @@ #define BOOST_NO_DELETED_FUNCTIONS #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS #define BOOST_NO_EXTERN_TEMPLATE +#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS #define BOOST_NO_INITIALIZER_LISTS #define BOOST_NO_NULLPTR #define BOOST_NO_RAW_LITERALS #define BOOST_NO_SCOPED_ENUMS +#define BOOST_NO_SFINAE_EXPR #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS #define BOOST_NO_VARIADIC_TEMPLATES diff --git a/include/boost/config/stdlib/dinkumware.hpp b/include/boost/config/stdlib/dinkumware.hpp index addf3357c8..ab770599a7 100644 --- a/include/boost/config/stdlib/dinkumware.hpp +++ b/include/boost/config/stdlib/dinkumware.hpp @@ -55,8 +55,10 @@ # define BOOST_HAS_MACRO_USE_FACET # ifndef _CPPLIB_VER // Updated Dinkum library defines this, and provides - // its own min and max definitions. -# define BOOST_NO_STD_MIN_MAX + // its own min and max definitions, as does MTA version. +# ifndef __MTA__ +# define BOOST_NO_STD_MIN_MAX +# endif # define BOOST_NO_MS_INT64_NUMERIC_LIMITS # endif #endif diff --git a/include/boost/detail/endian.hpp b/include/boost/detail/endian.hpp index 803d7e22c9..36ddb7e1e5 100644 --- a/include/boost/detail/endian.hpp +++ b/include/boost/detail/endian.hpp @@ -50,7 +50,7 @@ # define BOOST_BYTE_ORDER 1234 #elif defined(__sparc) || defined(__sparc__) \ || defined(_POWER) || defined(__powerpc__) \ - || defined(__ppc__) || defined(__hpux) \ + || defined(__ppc__) || defined(__hpux) || defined(__hppa) \ || defined(_MIPSEB) || defined(_POWER) \ || defined(__s390__) # define BOOST_BIG_ENDIAN diff --git a/include/boost/detail/is_incrementable.hpp b/include/boost/detail/is_incrementable.hpp index ee5c8f30b3..1c8fd5785b 100644 --- a/include/boost/detail/is_incrementable.hpp +++ b/include/boost/detail/is_incrementable.hpp @@ -69,11 +69,11 @@ namespace is_incrementable_ # pragma warning(disable:4913) // Warning about operator, # endif - // two check_ overloads help us identify which operator++ was picked - char (& check_(tag) )[2]; + // two check overloads help us identify which operator++ was picked + char (& check(tag) )[2]; template - char check_(T const&); + char check(T const&); template @@ -83,7 +83,7 @@ namespace is_incrementable_ BOOST_STATIC_CONSTANT( bool - , value = sizeof(is_incrementable_::check_(BOOST_comma(++x,0))) == 1 + , value = sizeof(is_incrementable_::check(BOOST_comma(++x,0))) == 1 ); }; @@ -94,7 +94,7 @@ namespace is_incrementable_ BOOST_STATIC_CONSTANT( bool - , value = sizeof(is_incrementable_::check_(BOOST_comma(x++,0))) == 1 + , value = sizeof(is_incrementable_::check(BOOST_comma(x++,0))) == 1 ); }; diff --git a/include/boost/ptr_container/detail/static_move_ptr.hpp b/include/boost/ptr_container/detail/static_move_ptr.hpp index 493d717a79..ba2b9af746 100644 --- a/include/boost/ptr_container/detail/static_move_ptr.hpp +++ b/include/boost/ptr_container/detail/static_move_ptr.hpp @@ -151,7 +151,7 @@ public: deleter_const_reference get_deleter() const { return impl_.second(); } private: template - void check_(const static_move_ptr& ptr) + void check(const static_move_ptr& ptr) { typedef move_ptrs::is_smart_ptr_convertible convertible; BOOST_STATIC_ASSERT(convertible::value); diff --git a/include/boost/ptr_container/ptr_circular_buffer.hpp b/include/boost/ptr_container/ptr_circular_buffer.hpp index 7fdc01b15d..bfd1be603b 100644 --- a/include/boost/ptr_container/ptr_circular_buffer.hpp +++ b/include/boost/ptr_container/ptr_circular_buffer.hpp @@ -190,7 +190,7 @@ namespace boost { for( ; old_size != size; ++old_size ) this->push_back( new BOOST_DEDUCED_TYPENAME - boost::remove_pointer::type ); + boost::remove_pointer::type() ); } BOOST_ASSERT( this->size() == size ); @@ -224,7 +224,7 @@ namespace boost { for( ; old_size != size; ++old_size ) this->push_front( new BOOST_DEDUCED_TYPENAME - boost::remove_pointer::type ); + boost::remove_pointer::type() ); } BOOST_ASSERT( this->size() == size ); diff --git a/include/boost/ptr_container/ptr_sequence_adapter.hpp b/include/boost/ptr_container/ptr_sequence_adapter.hpp index f30e500ebb..a7717ed8e8 100644 --- a/include/boost/ptr_container/ptr_sequence_adapter.hpp +++ b/include/boost/ptr_container/ptr_sequence_adapter.hpp @@ -521,7 +521,7 @@ namespace ptr_container_detail { for( ; old_size != size; ++old_size ) this->push_back( new BOOST_DEDUCED_TYPENAME - boost::remove_pointer::type ); + boost::remove_pointer::type() ); } BOOST_ASSERT( this->size() == size ); @@ -555,7 +555,7 @@ namespace ptr_container_detail { for( ; old_size != size; ++old_size ) this->push_front( new BOOST_DEDUCED_TYPENAME - boost::remove_pointer::type ); + boost::remove_pointer::type() ); } BOOST_ASSERT( this->size() == size ); diff --git a/include/boost/type_traits/has_new_operator.hpp b/include/boost/type_traits/has_new_operator.hpp index 731f7bfcb2..6d5351e080 100644 --- a/include/boost/type_traits/has_new_operator.hpp +++ b/include/boost/type_traits/has_new_operator.hpp @@ -85,7 +85,7 @@ namespace detail { BOOST_STATIC_CONSTANT(unsigned, s1 = sizeof(has_new_operator_impl::template check_sig(0))); BOOST_STATIC_CONSTANT(unsigned, s2 = sizeof(has_new_operator_impl::template check_sig2(0))); #else - #if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000) + #if BOOST_WORKAROUND(BOOST_MSVC_FULL_VER, >= 140050000) #pragma warning(push) #pragma warning(disable:6334) #endif @@ -93,7 +93,7 @@ namespace detail { BOOST_STATIC_CONSTANT(unsigned, s1 = sizeof(check_sig(0))); BOOST_STATIC_CONSTANT(unsigned, s2 = sizeof(check_sig2(0))); - #if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000) + #if BOOST_WORKAROUND(BOOST_MSVC_FULL_VER, >= 140050000) #pragma warning(pop) #endif #endif diff --git a/include/boost/type_traits/intrinsics.hpp b/include/boost/type_traits/intrinsics.hpp index 91ee88bf79..74b64a7d43 100644 --- a/include/boost/type_traits/intrinsics.hpp +++ b/include/boost/type_traits/intrinsics.hpp @@ -82,7 +82,7 @@ # define BOOST_HAS_TYPE_TRAITS_INTRINSICS #endif -#if defined(BOOST_MSVC) && defined(_MSC_FULL_VER) && (_MSC_FULL_VER >=140050215) +#if defined(BOOST_MSVC) && defined(BOOST_MSVC_FULL_VER) && (BOOST_MSVC_FULL_VER >=140050215) # include # define BOOST_IS_UNION(T) __is_union(T) diff --git a/include/boost/type_traits/is_abstract.hpp b/include/boost/type_traits/is_abstract.hpp index a11718dd91..09fdf33c45 100644 --- a/include/boost/type_traits/is_abstract.hpp +++ b/include/boost/type_traits/is_abstract.hpp @@ -94,12 +94,12 @@ struct is_abstract_imp2 #ifdef __GNUC__ BOOST_STATIC_CONSTANT(std::size_t, s1 = sizeof(is_abstract_imp2::template check_sig(0))); #else -#if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000) +#if BOOST_WORKAROUND(BOOST_MSVC_FULL_VER, >= 140050000) #pragma warning(push) #pragma warning(disable:6334) #endif BOOST_STATIC_CONSTANT(std::size_t, s1 = sizeof(check_sig(0))); -#if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000) +#if BOOST_WORKAROUND(BOOST_MSVC_FULL_VER, >= 140050000) #pragma warning(pop) #endif #endif diff --git a/include/boost/type_traits/is_base_and_derived.hpp b/include/boost/type_traits/is_base_and_derived.hpp index 8367b761d7..d6a9991182 100644 --- a/include/boost/type_traits/is_base_and_derived.hpp +++ b/include/boost/type_traits/is_base_and_derived.hpp @@ -15,10 +15,10 @@ #include #include #include -#include #include #include #endif +#include // should be the last #include #include @@ -133,7 +133,7 @@ struct bd_helper template struct is_base_and_derived_impl2 { -#if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000) +#if BOOST_WORKAROUND(BOOST_MSVC_FULL_VER, >= 140050000) #pragma warning(push) #pragma warning(disable:6334) #endif @@ -156,7 +156,7 @@ struct is_base_and_derived_impl2 BOOST_STATIC_CONSTANT(bool, value = sizeof(bd_helper::check_sig(Host(), 0)) == sizeof(type_traits::yes_type)); -#if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000) +#if BOOST_WORKAROUND(BOOST_MSVC_FULL_VER, >= 140050000) #pragma warning(pop) #endif }; @@ -212,7 +212,7 @@ struct is_base_and_derived_impl typedef is_base_and_derived_select< ::boost::is_class::value, ::boost::is_class::value, - ::boost::is_same::value> selector; + ::boost::is_same::value> selector; typedef typename selector::template rebind binder; typedef typename binder::type bound_type; @@ -222,7 +222,10 @@ struct is_base_and_derived_impl template struct is_base_and_derived_impl { - BOOST_STATIC_CONSTANT(bool, value = BOOST_IS_BASE_OF(B,D)); + typedef typename remove_cv::type ncvB; + typedef typename remove_cv::type ncvD; + + BOOST_STATIC_CONSTANT(bool, value = (BOOST_IS_BASE_OF(B,D) && ! ::boost::is_same::value)); }; #endif } // namespace detail diff --git a/include/boost/type_traits/is_base_of.hpp b/include/boost/type_traits/is_base_of.hpp index bf46da38e3..0cc7a32fc9 100644 --- a/include/boost/type_traits/is_base_of.hpp +++ b/include/boost/type_traits/is_base_of.hpp @@ -11,21 +11,32 @@ #include #include +#include #include +#include // should be the last #include #include namespace boost { + namespace detail{ + template + struct is_base_of_imp + { + typedef typename remove_cv::type ncvB; + typedef typename remove_cv::type ncvD; + BOOST_STATIC_CONSTANT(bool, value = (::boost::type_traits::ice_or< + (::boost::detail::is_base_and_derived_impl::value), + (::boost::type_traits::ice_and< ::boost::is_same::value, ::boost::is_class::value>::value)>::value)); + }; + } + BOOST_TT_AUX_BOOL_TRAIT_DEF2( is_base_of , Base , Derived - , (::boost::type_traits::ice_or< - (::boost::detail::is_base_and_derived_impl::value), - (::boost::is_same::value)>::value) - ) + , (::boost::detail::is_base_of_imp::value)) #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION BOOST_TT_AUX_BOOL_TRAIT_PARTIAL_SPEC2_2(typename Base,typename Derived,is_base_of,Base&,Derived,false) diff --git a/include/boost/type_traits/is_convertible.hpp b/include/boost/type_traits/is_convertible.hpp index ce522a0842..a31a930fae 100644 --- a/include/boost/type_traits/is_convertible.hpp +++ b/include/boost/type_traits/is_convertible.hpp @@ -256,7 +256,7 @@ struct is_convertible_basic_impl #ifdef BOOST_MSVC #pragma warning(push) #pragma warning(disable:4244) -#if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000) +#if BOOST_WORKAROUND(BOOST_MSVC_FULL_VER, >= 140050000) #pragma warning(disable:6334) #endif #endif diff --git a/include/boost/type_traits/is_function.hpp b/include/boost/type_traits/is_function.hpp index 1fba1bdff3..95dba0dab0 100644 --- a/include/boost/type_traits/is_function.hpp +++ b/include/boost/type_traits/is_function.hpp @@ -65,7 +65,7 @@ struct is_function_impl template struct is_function_impl { -#if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000) +#if BOOST_WORKAROUND(BOOST_MSVC_FULL_VER, >= 140050000) #pragma warning(push) #pragma warning(disable:6334) #endif @@ -74,7 +74,7 @@ struct is_function_impl bool, value = sizeof(::boost::type_traits::is_function_ptr_tester(t)) == sizeof(::boost::type_traits::yes_type) ); -#if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000) +#if BOOST_WORKAROUND(BOOST_MSVC_FULL_VER, >= 140050000) #pragma warning(pop) #endif }; diff --git a/include/boost/type_traits/is_member_function_pointer.hpp b/include/boost/type_traits/is_member_function_pointer.hpp index 3fff063326..81f1eacc9c 100644 --- a/include/boost/type_traits/is_member_function_pointer.hpp +++ b/include/boost/type_traits/is_member_function_pointer.hpp @@ -64,7 +64,7 @@ struct is_mem_fun_pointer_select { template struct result_ { -#if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000) +#if BOOST_WORKAROUND(BOOST_MSVC_FULL_VER, >= 140050000) #pragma warning(push) #pragma warning(disable:6334) #endif @@ -75,7 +75,7 @@ struct is_mem_fun_pointer_select bool, value = ( 1 == sizeof(::boost::type_traits::is_mem_fun_pointer_tester(self_type::make_t)) )); -#if BOOST_WORKAROUND(_MSC_FULL_VER, >= 140050000) +#if BOOST_WORKAROUND(BOOST_MSVC_FULL_VER, >= 140050000) #pragma warning(pop) #endif }; diff --git a/include/boost/type_traits/is_member_pointer.hpp b/include/boost/type_traits/is_member_pointer.hpp index cdf3d6ab93..ba02b89ba2 100644 --- a/include/boost/type_traits/is_member_pointer.hpp +++ b/include/boost/type_traits/is_member_pointer.hpp @@ -50,7 +50,7 @@ BOOST_TT_AUX_BOOL_TRAIT_PARTIAL_SPEC1_2(typename T,typename U,is_member_pointer, BOOST_TT_AUX_BOOL_TRAIT_DEF1(is_member_pointer,T,::boost::is_member_function_pointer::value) BOOST_TT_AUX_BOOL_TRAIT_PARTIAL_SPEC1_2(typename T,typename U,is_member_pointer,U T::*,true) -#if !BOOST_WORKAROUND(__MWERKS__,<=0x3003) +#if !BOOST_WORKAROUND(__MWERKS__,<=0x3003) && !BOOST_WORKAROUND(__IBMCPP__, <=600) BOOST_TT_AUX_BOOL_TRAIT_PARTIAL_SPEC1_2(typename T,typename U,is_member_pointer,U T::*const,true) BOOST_TT_AUX_BOOL_TRAIT_PARTIAL_SPEC1_2(typename T,typename U,is_member_pointer,U T::*volatile,true) BOOST_TT_AUX_BOOL_TRAIT_PARTIAL_SPEC1_2(typename T,typename U,is_member_pointer,U T::*const volatile,true) diff --git a/include/boost/type_traits/is_signed.hpp b/include/boost/type_traits/is_signed.hpp index 73389a1026..e06b47cc85 100644 --- a/include/boost/type_traits/is_signed.hpp +++ b/include/boost/type_traits/is_signed.hpp @@ -30,7 +30,7 @@ template struct is_signed_helper { typedef typename remove_cv::type no_cv_t; - BOOST_STATIC_CONSTANT(bool, value = (static_cast(-1) < 0)); + BOOST_STATIC_CONSTANT(bool, value = (!(static_cast(-1) > 0))); }; template diff --git a/include/boost/type_traits/is_virtual_base_of.hpp b/include/boost/type_traits/is_virtual_base_of.hpp index e3dd441940..30b34f6ccb 100644 --- a/include/boost/type_traits/is_virtual_base_of.hpp +++ b/include/boost/type_traits/is_virtual_base_of.hpp @@ -42,14 +42,14 @@ struct is_virtual_base_of_impl X(); X(const X&); X& operator=(const X&); - ~X(); + ~X()throw(); }; struct Y : public virtual Derived { Y(); Y(const Y&); Y& operator=(const Y&); - ~Y(); + ~Y()throw(); }; #else struct X : Derived, virtual Base @@ -57,14 +57,14 @@ struct is_virtual_base_of_impl X(); X(const X&); X& operator=(const X&); - ~X(); + ~X()throw(); }; struct Y : Derived { Y(); Y(const Y&); Y& operator=(const Y&); - ~Y(); + ~Y()throw(); }; #endif BOOST_STATIC_CONSTANT(bool, value = (sizeof(X)==sizeof(Y))); diff --git a/include/boost/utility/value_init.hpp b/include/boost/utility/value_init.hpp index aa7ecb4ee8..177fe74345 100644 --- a/include/boost/utility/value_init.hpp +++ b/include/boost/utility/value_init.hpp @@ -8,6 +8,7 @@ // 24 Dec 2007 (Refactored and worked around various compiler bugs) Fernando Cacciola, Niels Dekker // 23 May 2008 (Fixed operator= const issue, added initialized_value) Niels Dekker, Fernando Cacciola // 21 Ago 2008 (Added swap) Niels Dekker, Fernando Cacciola +// 20 Feb 2009 (Fixed logical const-ness issues) Niels Dekker, Fernando Cacciola // #ifndef BOOST_UTILITY_VALUE_INIT_21AGO2002_HPP #define BOOST_UTILITY_VALUE_INIT_21AGO2002_HPP @@ -90,7 +91,12 @@ class value_initialized wrapper_address()->wrapper::~wrapper(); } - T& data() const + T const & data() const + { + return wrapper_address()->data; + } + + T& data() { return wrapper_address()->data; } @@ -100,12 +106,16 @@ class value_initialized ::boost::swap( this->data(), arg.data() ); } - operator T&() const { return this->data(); } + operator T const &() const { return this->data(); } + + operator T&() { return this->data(); } } ; + + template T const& get ( value_initialized const& x ) { diff --git a/internat/fr/kicad.mo b/internat/fr/kicad.mo index 9ca26808a2..601aadaa74 100644 Binary files a/internat/fr/kicad.mo and b/internat/fr/kicad.mo differ diff --git a/internat/fr/kicad.po b/internat/fr/kicad.po index d412e05aed..ab9bff3f58 100644 --- a/internat/fr/kicad.po +++ b/internat/fr/kicad.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: kicad\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-18 18:17+0100\n" -"PO-Revision-Date: 2009-11-18 18:20+0100\n" +"POT-Creation-Date: 2009-11-20 20:25+0100\n" +"PO-Revision-Date: 2009-11-20 20:28+0100\n" "Last-Translator: \n" "Language-Team: kicad team \n" "MIME-Version: 1.0\n" @@ -31,6 +31,7 @@ msgid "Millimeters" msgstr "Millimètres" #: pcbnew/dialog_gendrill.cpp:166 +#: pcbnew/set_grid.cpp:124 msgid "Inches" msgstr "Pouces" @@ -231,15 +232,41 @@ msgstr "Epaisseur Contour" msgid "Incorrect number, no change" msgstr "Nombre incorrect, pas de changement" -#: pcbnew/plotdxf.cpp:27 -#: pcbnew/plotps.cpp:39 -msgid "Unable to create file " -msgstr "Impossible de créer le fichier " +#: pcbnew/surbrill.cpp:31 +msgid "Filter for net names:" +msgstr "Filtre pour nets:" -#: pcbnew/plotdxf.cpp:33 -#: pcbnew/plotps.cpp:45 -msgid "File" -msgstr "Fichier" +#: pcbnew/surbrill.cpp:31 +msgid "Net Filter" +msgstr "Filtre Equipot" + +#: pcbnew/surbrill.cpp:36 +msgid "List Nets" +msgstr "Liste équipots" + +#: pcbnew/set_grid.cpp:125 +msgid "mm" +msgstr "mm" + +#: pcbnew/set_grid.cpp:127 +msgid "Grid Size Units" +msgstr "Unités taille Grille" + +#: pcbnew/set_grid.cpp:137 +msgid "User Grid Size X" +msgstr "Grille perso dim X" + +#: pcbnew/set_grid.cpp:155 +msgid "User Grid Size Y" +msgstr "Grille perso dim Y" + +#: pcbnew/set_grid.cpp:174 +msgid "&OK" +msgstr "&OK" + +#: pcbnew/set_grid.cpp:181 +msgid "&Cancel" +msgstr "&Annuler" #: pcbnew/block.cpp:122 msgid "Include Modules" @@ -422,37 +449,334 @@ msgstr " chargé" msgid "Modules [%d items]" msgstr "Modules [%d éléments]" -#: pcbnew/set_grid.cpp:120 -msgid "mm" -msgstr "mm" +#: pcbnew/tool_pcb.cpp:30 +msgid "" +"Show active layer selections\n" +"and select layer pair for route and place via" +msgstr "" +"Affiche sélections couche active\n" +"et sélection paire de couches pour routage et placement via" -#: pcbnew/set_grid.cpp:121 -msgid "Grid Size Units" -msgstr "Unités taille Grille" +#: pcbnew/tool_pcb.cpp:199 +msgid "New board" +msgstr "Nouveau Circuit Imprimé" -#: pcbnew/set_grid.cpp:127 -msgid "User Grid Size X" -msgstr "Grille perso dim X" +#: pcbnew/tool_pcb.cpp:201 +msgid "Open existing board" +msgstr "Ouvrir C.I. existant" -#: pcbnew/set_grid.cpp:133 -msgid "User Grid Size Y" -msgstr "Grille perso dim Y" +#: pcbnew/tool_pcb.cpp:203 +msgid "Save board" +msgstr "Sauver Circuit Imprimé" -#: pcbnew/set_grid.cpp:142 -msgid "&OK" -msgstr "&OK" +#: pcbnew/tool_pcb.cpp:207 +msgid "Page settings (size, texts)" +msgstr "Ajustage de la feuille de dessin (dimensions, textes)" -#: pcbnew/set_grid.cpp:146 -msgid "&Cancel" -msgstr "&Annuler" +#: pcbnew/tool_pcb.cpp:212 +msgid "Open module editor" +msgstr "Ouvrir Editeur de modules" + +#: pcbnew/tool_pcb.cpp:216 +msgid "Cut selected item" +msgstr "Suppression des éléments sélectionnés" + +#: pcbnew/tool_pcb.cpp:220 +msgid "Copy selected item" +msgstr "Copie des éléments sélectionnés" + +#: pcbnew/tool_pcb.cpp:223 +msgid "Paste" +msgstr "Copie des éléments sauvegardés" + +#: pcbnew/tool_pcb.cpp:228 +msgid "Undo last edition" +msgstr "Défait dernière édition" + +#: pcbnew/tool_pcb.cpp:230 +msgid "Redo the last undo command" +msgstr "Refait la dernière commande defaite" + +#: pcbnew/tool_pcb.cpp:234 +msgid "Print board" +msgstr "Imprimer C.I." + +#: pcbnew/tool_pcb.cpp:236 +msgid "Plot (HPGL, PostScript, or GERBER format)" +msgstr "Tracer en format HPGL, POSTSCRIPT ou GERBER" + +#: pcbnew/tool_pcb.cpp:239 +msgid "Zoom in" +msgstr "Zoom +" + +#: pcbnew/tool_pcb.cpp:244 +msgid "Zoom out" +msgstr "Zoom -" + +#: pcbnew/tool_pcb.cpp:249 +msgid "Redraw view" +msgstr "Redessin de l'écran" + +#: pcbnew/tool_pcb.cpp:254 +msgid "Zoom auto" +msgstr "Zoom Automatique" + +#: pcbnew/tool_pcb.cpp:260 +msgid "Find components and texts" +msgstr "Recherche de composants et textes" + +#: pcbnew/tool_pcb.cpp:268 +msgid "Read netlist" +msgstr "Lire Netliste" + +#: pcbnew/tool_pcb.cpp:270 +msgid "Perform design rules check" +msgstr "Exécute le contrôle des règles de conception" + +#: pcbnew/tool_pcb.cpp:283 +msgid "Manual and automatic move or place of modules" +msgstr "Mode module: déplacements ou placement manuel ou automatique des modules" + +#: pcbnew/tool_pcb.cpp:287 +msgid "Mode Track and Autorouting" +msgstr "Mode Pistes et Autoroutage" + +#: pcbnew/tool_pcb.cpp:293 +msgid "Fast access to theWeb Based FreeROUTE advanced router" +msgstr "Acces rapide au routeur avancé FreeROUTE sur le Web" + +#: pcbnew/tool_pcb.cpp:313 +msgid "Enable design rule checking" +msgstr "Active le contrôle des règles de conception" + +#: pcbnew/tool_pcb.cpp:317 +msgid "Hide grid" +msgstr "Ne pas afficher la grille" + +#: pcbnew/tool_pcb.cpp:320 +msgid "Display polar coordinates" +msgstr "Affichage coord polaires" + +#: pcbnew/tool_pcb.cpp:323 +msgid "Units in inches" +msgstr "Unités en pouces" + +#: pcbnew/tool_pcb.cpp:326 +msgid "Units in millimeters" +msgstr "Unités en millimètres" + +#: pcbnew/tool_pcb.cpp:329 +msgid "Change cursor shape" +msgstr "Changer la forme du curseur" + +#: pcbnew/tool_pcb.cpp:334 +msgid "Show board ratsnest" +msgstr "Montrer le chevelu général" + +#: pcbnew/tool_pcb.cpp:337 +msgid "Show module ratsnest when moving" +msgstr "Montrer le chevelu du module pendant le déplacement" + +#: pcbnew/tool_pcb.cpp:343 +msgid "Enable automatic track deletion" +msgstr "Active l'effacement de piste automatique lorsque l'on recrée une piste." + +#: pcbnew/tool_pcb.cpp:349 +msgid "Show filled areas in zones" +msgstr "Afficher les surfaces remplies dans les zones" + +#: pcbnew/tool_pcb.cpp:354 +msgid "Do not show filled areas in zones" +msgstr "Ne pas afficher les surfaces remplies dans les zones" + +#: pcbnew/tool_pcb.cpp:359 +msgid "Show outlines of filled areas only in zones" +msgstr "Afficher uniquement les contours des surfaces remplies dans les zones" + +#: pcbnew/tool_pcb.cpp:364 +msgid "Show pads in outline mode" +msgstr "Afficher pastilles en mode contour" + +#: pcbnew/tool_pcb.cpp:368 +msgid "Show vias in outline mode" +msgstr "Afficher pastilles en mode contour" + +#: pcbnew/tool_pcb.cpp:372 +msgid "Show tracks in outline mode" +msgstr "Afficher pistes en mode contour" + +#: pcbnew/tool_pcb.cpp:378 +msgid "Enable high contrast display mode" +msgstr "Active le mode d'affichage haut contraste" + +#: pcbnew/tool_pcb.cpp:385 +msgid "Show invisible text" +msgstr "Montrer textes invisibles" + +#: pcbnew/tool_pcb.cpp:396 +msgid "" +"Display/remove auxiliary vertical toolbar (tools for micro wave applications)\n" +" This is a experimental feature (under development)" +msgstr "" +"Affiche/supprime le toolbar vertical auxiliaire (outils pour applications micro-ondes)\n" +"C'est un outil expérimental (en cours de développement)" + +#: pcbnew/tool_pcb.cpp:421 +msgid "Highlight net" +msgstr "Surbrillance net" + +#: pcbnew/tool_pcb.cpp:426 +msgid "Display local ratsnest" +msgstr "Afficher le chevelu local" + +#: pcbnew/tool_pcb.cpp:432 +msgid "Add modules" +msgstr "Addition de Modules" + +#: pcbnew/tool_pcb.cpp:436 +msgid "Add tracks and vias" +msgstr "Ajouter pistes et vias" + +#: pcbnew/tool_pcb.cpp:440 +msgid "Add zones" +msgstr "Addition de Zones" + +#: pcbnew/tool_pcb.cpp:445 +msgid "Add graphic line or polygon" +msgstr "Addition de lignes ou polygones graphiques" + +#: pcbnew/tool_pcb.cpp:449 +msgid "Add graphic circle" +msgstr "Addition de graphiques (Cercle)" + +#: pcbnew/tool_pcb.cpp:453 +msgid "Add graphic arc" +msgstr "Addition de graphiques (Arc de Cercle)" + +#: pcbnew/tool_pcb.cpp:457 +msgid "Add text" +msgstr "Ajout de Texte" + +#: pcbnew/tool_pcb.cpp:462 +msgid "Add dimension" +msgstr "Ajout des cotes" + +#: pcbnew/tool_pcb.cpp:466 +msgid "Add layer alignment target" +msgstr "Ajouter Mire de superposition" + +#: pcbnew/tool_pcb.cpp:471 +msgid "Delete items" +msgstr "Suppression d'éléments" + +#: pcbnew/tool_pcb.cpp:476 +msgid "Offset adjust for drill and place files" +msgstr "Ajuste offset pour fichier de perçage et placement" + +#: pcbnew/tool_pcb.cpp:498 +msgid "Create line of specified length for microwave applications" +msgstr "Création de lignes de longueur spécifiée (pour applications micro-ondes)" + +#: pcbnew/tool_pcb.cpp:502 +msgid "Create gap of specified length for microwave applications" +msgstr "Création de gaps de longueur spécifiée (pour applications micro-ondes)" + +#: pcbnew/tool_pcb.cpp:508 +msgid "Create stub of specified length for microwave applications" +msgstr "Création de stub de longueur spécifiée (pour applications micro-ondes)" + +#: pcbnew/tool_pcb.cpp:512 +msgid "Create stub (arc) of specified length for microwave applications" +msgstr "Création de stub (arc) de longueur spécifiée (pour applications micro-ondes)" + +#: pcbnew/tool_pcb.cpp:517 +msgid "Create a polynomial shape for microwave applications" +msgstr "Création de formes polynomiales (pour applications micro-ondes)" + +#: pcbnew/tool_pcb.cpp:569 +msgid "Current NetClass clearance value" +msgstr "Valeur isolation NetClass courante" + +#: pcbnew/tool_pcb.cpp:578 +msgid "Name of the current NetClass" +msgstr "Nom de la NetClass courante" + +#: pcbnew/tool_pcb.cpp:587 +msgid "" +"Auto track width: when starting on an existing track use its width\n" +"otherwise, use current width setting" +msgstr "" +"Largeur de piste automatique: si on démarre sur une piste existante, utiliser sa largeur\n" +" sinon utiliser la largeur courante" + +#: pcbnew/tool_pcb.cpp:605 +msgid "Auto" +msgstr "Auto" + +#: pcbnew/tool_pcb.cpp:609 +msgid "Zoom " +msgstr "Zoom " + +#: pcbnew/tool_pcb.cpp:631 +msgid "Grid" +msgstr "Grille" + +#: pcbnew/tool_pcb.cpp:650 +msgid "User Grid" +msgstr "Grille perso" + +#: pcbnew/tool_pcb.cpp:759 +msgid "+/- to switch" +msgstr "+/- pour commuter" #: pcbnew/deltrack.cpp:144 msgid "Delete NET?" msgstr "Supprimer Net?" -#: pcbnew/solve.cpp:244 -msgid "Abort routing?" -msgstr "Arrêter le routage?" +#: pcbnew/xchgmod.cpp:165 +#, c-format +msgid "file %s not found" +msgstr "fichier %s non trouvé" + +#: pcbnew/xchgmod.cpp:178 +#, c-format +msgid "Unable to create file %s" +msgstr "Impossible de créerle fichier <%s>" + +#: pcbnew/xchgmod.cpp:287 +#, c-format +msgid "Change modules <%s> -> <%s> (val = %s)?" +msgstr "Change modules <%s> -> <%s> (val = %s)?" + +#: pcbnew/xchgmod.cpp:294 +#, c-format +msgid "Change modules <%s> -> <%s> ?" +msgstr "Change modules <%s> -> <%s> ?" + +#: pcbnew/xchgmod.cpp:354 +msgid "Change ALL modules ?" +msgstr "Change TOUS les modules ?" + +#: pcbnew/xchgmod.cpp:415 +#, c-format +msgid "Change module %s (%s) " +msgstr "Change module %s (%s) " + +#: pcbnew/xchgmod.cpp:570 +msgid "No Modules!" +msgstr "Pas de Modules!" + +#: pcbnew/xchgmod.cpp:577 +msgid "Component files (." +msgstr "Fichiers de composant (." + +#: pcbnew/xchgmod.cpp:580 +msgid "Save Component Files" +msgstr "Sauver Fichier Composant" + +#: pcbnew/xchgmod.cpp:592 +msgid "Unable to create file " +msgstr "Impossible de créer le fichier " #: pcbnew/class_drc_item.cpp:39 msgid "Unconnected pads" @@ -552,11 +876,11 @@ msgstr "Perçage de via en < limite globale" #: pcbnew/class_drc_item.cpp:97 msgid "NetClass uVia Dia < global limit" -msgstr "" +msgstr "Diamètre uVia en NetClass < limite globale" #: pcbnew/class_drc_item.cpp:99 msgid "NetClass uVia Drill < global limit" -msgstr "" +msgstr "Diamètre de perçage de uVia en NetClassl < limite globale" #: pcbnew/export_gencad.cpp:73 msgid "GenCAD 1.4 board files (.cad)|*.cad" @@ -872,6 +1196,33 @@ msgstr "Forme X" msgid "Target Shape:" msgstr "Forme Mire:" +#: pcbnew/plot_rtn.cpp:161 +#, c-format +msgid "" +"Your BOARD has a bad layer number of %u for module\n" +" %s's \"reference\" text." +msgstr "" +"Votre PCB a un mauvais numero de couche %u pour le module\n" +" %s's \"référence\"." + +#: pcbnew/plot_rtn.cpp:181 +#, c-format +msgid "" +"Your BOARD has a bad layer number of %u for module\n" +" %s's \"value\" text." +msgstr "" +"Votre PCB a un mauvais numero de couche %u pour le module\n" +" %s's \"valeur\"." + +#: pcbnew/plot_rtn.cpp:219 +#, c-format +msgid "" +"Your BOARD has a bad layer number of %u for module\n" +" %s's \"module text\" text of %s." +msgstr "" +"Votre PCB a un mauvais numero de couche %u pour le module\n" +" %s's \"texte module\" de %s." + #: pcbnew/dialog_initpcb.cpp:103 msgid "Items to delete" msgstr "Eléments à effacer" @@ -920,6 +1271,10 @@ msgstr "Inclure Pistes Autoroutées" msgid "Include Locked Tracks" msgstr "Inclure Pistes Verrouillées" +#: pcbnew/plotdxf.cpp:31 +msgid "File" +msgstr "Fichier" + #: pcbnew/autoplac.cpp:104 msgid "Footprints NOT LOCKED will be moved" msgstr "Les modules NON FIXES vont être déplacés" @@ -1073,32 +1428,9 @@ msgstr "Erreur DRC: ce point de départ est à l'intérieur d'une autre zone ou msgid "DRC error: closing this area creates a drc error with an other area" msgstr "Erreur DRC: la fermeture de cette zone crée une erreur DRC avec une autre zone" -#: pcbnew/plot_rtn.cpp:147 -#, c-format -msgid "" -"Your BOARD has a bad layer number of %u for module\n" -" %s's \"reference\" text." -msgstr "" -"Votre PCB a un mauvais numero de couche %u pour le module\n" -" %s's \"référence\"." - -#: pcbnew/plot_rtn.cpp:167 -#, c-format -msgid "" -"Your BOARD has a bad layer number of %u for module\n" -" %s's \"value\" text." -msgstr "" -"Votre PCB a un mauvais numero de couche %u pour le module\n" -" %s's \"valeur\"." - -#: pcbnew/plot_rtn.cpp:205 -#, c-format -msgid "" -"Your BOARD has a bad layer number of %u for module\n" -" %s's \"module text\" text of %s." -msgstr "" -"Votre PCB a un mauvais numero de couche %u pour le module\n" -" %s's \"texte module\" de %s." +#: pcbnew/solve.cpp:263 +msgid "Abort routing?" +msgstr "Arrêter le routage?" #: pcbnew/dialog_copper_zones.cpp:277 msgid "Error : Zone clearance is set to an unreasonnable value" @@ -1187,359 +1519,65 @@ msgstr "Taille H" msgid "V Size" msgstr "Taille V" -#: pcbnew/swap_layers.cpp:72 -msgid "Swap Layers:" -msgstr "Permutte couches" - -#: pcbnew/swap_layers.cpp:220 -#: pcbnew/swap_layers.cpp:225 -#: pcbnew/swap_layers.cpp:311 -msgid "No Change" -msgstr "Garder" - -#: pcbnew/swap_layers.cpp:301 -msgid "Deselect this layer to select the No Change state" -msgstr "Désélectionner cette couche pour restorer l'option Pas de Changement" - #: pcbnew/class_zone.cpp:909 msgid "Zone Outline" -msgstr "Contour de Zone" - -#: pcbnew/class_zone.cpp:913 -msgid "(Cutout)" -msgstr "(Cutout)" - -#: pcbnew/class_zone.cpp:932 -msgid "Not Found" -msgstr " Non Trouvé" - -#: pcbnew/class_zone.cpp:935 -msgid "NetName" -msgstr "NetName" - -#: pcbnew/class_zone.cpp:938 -msgid "Non Copper Zone" -msgstr "Zone non Cuivre" - -#: pcbnew/class_zone.cpp:942 -msgid "NetCode" -msgstr "NetCode" - -#: pcbnew/class_zone.cpp:948 -msgid "Corners" -msgstr "Sommets" - -#: pcbnew/class_zone.cpp:951 -msgid "Segments" -msgstr "Segments" - -#: pcbnew/class_zone.cpp:953 -msgid "Polygons" -msgstr "Polygones" - -#: pcbnew/class_zone.cpp:954 -msgid "Fill mode" -msgstr "Mode de remplissage" - -#: pcbnew/class_zone.cpp:958 -msgid "Hatch lines" -msgstr "Lignes de Hachure" - -#: pcbnew/class_zone.cpp:963 -msgid "Corners in DrawList" -msgstr "Sommets en Liste de dessin" - -#: pcbnew/initpcb.cpp:47 -msgid "Ok to delete selected items ?" -msgstr "Ok pour effacer les éléments sélectionnés ?" - -#: pcbnew/initpcb.cpp:156 -msgid "Current Board will be lost and this operation cannot be undone. Continue ?" -msgstr "Le circuit actuel sera perdu et cette opération ne pourra pas être annulée. Continuer ?" - -#: pcbnew/initpcb.cpp:208 -msgid "Current Footprint will be lost and this operation cannot be undone. Continue ?" -msgstr "Le module actuel sera perdu et cette opération ne pourra pas être annulée. Continuer ?" - -#: pcbnew/tool_pcb.cpp:30 -msgid "" -"Show active layer selections\n" -"and select layer pair for route and place via" -msgstr "" -"Affiche sélections couche active\n" -"et sélection paire de couches pour routage et placement via" - -#: pcbnew/tool_pcb.cpp:204 -msgid "New board" -msgstr "Nouveau Circuit Imprimé" - -#: pcbnew/tool_pcb.cpp:206 -msgid "Open existing board" -msgstr "Ouvrir C.I. existant" - -#: pcbnew/tool_pcb.cpp:208 -msgid "Save board" -msgstr "Sauver Circuit Imprimé" - -#: pcbnew/tool_pcb.cpp:212 -msgid "Page settings (size, texts)" -msgstr "Ajustage de la feuille de dessin (dimensions, textes)" - -#: pcbnew/tool_pcb.cpp:217 -msgid "Open module editor" -msgstr "Ouvrir Editeur de modules" - -#: pcbnew/tool_pcb.cpp:221 -msgid "Cut selected item" -msgstr "Suppression des éléments sélectionnés" - -#: pcbnew/tool_pcb.cpp:225 -msgid "Copy selected item" -msgstr "Copie des éléments sélectionnés" - -#: pcbnew/tool_pcb.cpp:228 -msgid "Paste" -msgstr "Copie des éléments sauvegardés" - -#: pcbnew/tool_pcb.cpp:233 -msgid "Undo last edition" -msgstr "Défait dernière édition" - -#: pcbnew/tool_pcb.cpp:235 -msgid "Redo the last undo command" -msgstr "Refait la dernière commande defaite" - -#: pcbnew/tool_pcb.cpp:239 -msgid "Print board" -msgstr "Imprimer C.I." - -#: pcbnew/tool_pcb.cpp:241 -msgid "Plot (HPGL, PostScript, or GERBER format)" -msgstr "Tracer en format HPGL, POSTSCRIPT ou GERBER" - -#: pcbnew/tool_pcb.cpp:244 -msgid "Zoom in" -msgstr "Zoom +" - -#: pcbnew/tool_pcb.cpp:249 -msgid "Zoom out" -msgstr "Zoom -" - -#: pcbnew/tool_pcb.cpp:254 -msgid "Redraw view" -msgstr "Redessin de l'écran" - -#: pcbnew/tool_pcb.cpp:259 -msgid "Zoom auto" -msgstr "Zoom Automatique" - -#: pcbnew/tool_pcb.cpp:265 -msgid "Find components and texts" -msgstr "Recherche de composants et textes" - -#: pcbnew/tool_pcb.cpp:273 -msgid "Read netlist" -msgstr "Lire Netliste" - -#: pcbnew/tool_pcb.cpp:275 -msgid "Pcb Design Rules Check" -msgstr "Contrôle des règles de conception" - -#: pcbnew/tool_pcb.cpp:287 -msgid "Mode Module: Manual and Automatic Move or Place for modules" -msgstr "Mode Module: Déplacements ou Placement Manuel ou Automatique des modules" - -#: pcbnew/tool_pcb.cpp:291 -msgid "Mode Track and Autorouting" -msgstr "Mode Pistes et Autoroutage" - -#: pcbnew/tool_pcb.cpp:297 -msgid "Fast access to theWeb Based FreeROUTE advanced router" -msgstr "Acces rapide au routeur avancé FreeROUTE sur le Web" - -#: pcbnew/tool_pcb.cpp:324 -msgid "Drc OFF" -msgstr "Drc DESACTIVEE" - -#: pcbnew/tool_pcb.cpp:327 -msgid "Display Grid OFF" -msgstr "Suppression de l'affichage de la grille" - -#: pcbnew/tool_pcb.cpp:330 -msgid "Display Polar Coord ON" -msgstr "Activer affichage coord Polaires" - -#: pcbnew/tool_pcb.cpp:333 -msgid "Units in inches" -msgstr "Unités en pouces" - -#: pcbnew/tool_pcb.cpp:336 -msgid "Units in millimeters" -msgstr "Unités en millimètres" - -#: pcbnew/tool_pcb.cpp:339 -msgid "Change Cursor Shape" -msgstr "Sélection de la forme du curseur" - -#: pcbnew/tool_pcb.cpp:344 -msgid "Show General Ratsnest" -msgstr "Montrer le chevelu général" - -#: pcbnew/tool_pcb.cpp:347 -msgid "Show Module Ratsnest when moving" -msgstr "Montrer le chevelu du module pendant déplacement" - -#: pcbnew/tool_pcb.cpp:353 -msgid "Enable Auto Del Track" -msgstr "Autoriser l'effacement automatique des pistes" - -#: pcbnew/tool_pcb.cpp:358 -msgid "Show filled areas in zones" -msgstr "Afficher les surfaces remplies dans les zones" - -#: pcbnew/tool_pcb.cpp:361 -msgid "Do not show filled areas in zones" -msgstr "Ne pas afficher les surfaces remplies dans les zones" - -#: pcbnew/tool_pcb.cpp:364 -msgid "Show outlines of filled areas only in zones" -msgstr "Afficher uniquement les contours des surfaces remplies dans les zones" - -#: pcbnew/tool_pcb.cpp:369 -msgid "Show Pads Sketch" -msgstr "Afficher pastilles en contour" - -#: pcbnew/tool_pcb.cpp:373 -msgid "Show Vias Sketch" -msgstr "Afficher Vias en Contour" - -#: pcbnew/tool_pcb.cpp:377 -msgid "Show Tracks Sketch" -msgstr "Afficher Pistes en Contour" - -#: pcbnew/tool_pcb.cpp:382 -msgid "High Contrast Mode Display" -msgstr "Mode d'affichage Haut Contraste" - -#: pcbnew/tool_pcb.cpp:389 -msgid "Show Invisible Text" -msgstr "Montrer textes invisibles" - -#: pcbnew/tool_pcb.cpp:400 -msgid "" -"Display/remove auxiliary vertical toolbar (tools for micro wave applications)\n" -" This is a experimental feature (under development)" -msgstr "" -"Affiche/supprime le toolbar vertical auxiliaire (outils pour applications micro-ondes)\n" -"C'est un outil expérimental (en cours de développement)" - -#: pcbnew/tool_pcb.cpp:430 -msgid "Highlight net" -msgstr "Surbrillance net" - -#: pcbnew/tool_pcb.cpp:435 -msgid "Display local ratsnest" -msgstr "Afficher le chevelu local" - -#: pcbnew/tool_pcb.cpp:441 -msgid "Add modules" -msgstr "Addition de Modules" - -#: pcbnew/tool_pcb.cpp:445 -msgid "Add tracks and vias" -msgstr "Ajouter pistes et vias" - -#: pcbnew/tool_pcb.cpp:449 -msgid "Add zones" -msgstr "Addition de Zones" - -#: pcbnew/tool_pcb.cpp:454 -msgid "Add graphic line or polygon" -msgstr "Addition de lignes ou polygones graphiques" - -#: pcbnew/tool_pcb.cpp:458 -msgid "Add graphic circle" -msgstr "Addition de graphiques (Cercle)" - -#: pcbnew/tool_pcb.cpp:462 -msgid "Add graphic arc" -msgstr "Addition de graphiques (Arc de Cercle)" - -#: pcbnew/tool_pcb.cpp:466 -msgid "Add text" -msgstr "Ajout de Texte" - -#: pcbnew/tool_pcb.cpp:471 -msgid "Add dimension" -msgstr "Ajout des cotes" - -#: pcbnew/tool_pcb.cpp:475 -msgid "Add layer alignment target" -msgstr "Ajouter Mire de superposition" - -#: pcbnew/tool_pcb.cpp:480 -msgid "Delete items" -msgstr "Suppression d'éléments" +msgstr "Contour de Zone" -#: pcbnew/tool_pcb.cpp:485 -msgid "Offset adjust for drill and place files" -msgstr "Ajuste offset pour fichier de perçage et placement" +#: pcbnew/class_zone.cpp:913 +msgid "(Cutout)" +msgstr "(Cutout)" -#: pcbnew/tool_pcb.cpp:509 -msgid "Create line of specified length for microwave applications" -msgstr "Création de lignes de longueur spécifiée (pour applications micro-ondes)" +#: pcbnew/class_zone.cpp:932 +msgid "Not Found" +msgstr " Non Trouvé" -#: pcbnew/tool_pcb.cpp:513 -msgid "Create gap of specified length for microwave applications" -msgstr "Création de gaps de longueur spécifiée (pour applications micro-ondes)" +#: pcbnew/class_zone.cpp:935 +msgid "NetName" +msgstr "NetName" -#: pcbnew/tool_pcb.cpp:519 -msgid "Create stub of specified length for microwave applications" -msgstr "Création de stub de longueur spécifiée (pour applications micro-ondes)" +#: pcbnew/class_zone.cpp:938 +msgid "Non Copper Zone" +msgstr "Zone non Cuivre" -#: pcbnew/tool_pcb.cpp:523 -msgid "Create stub (arc) of specified length for microwave applications" -msgstr "Création de stub (arc) de longueur spécifiée (pour applications micro-ondes)" +#: pcbnew/class_zone.cpp:942 +msgid "NetCode" +msgstr "NetCode" -#: pcbnew/tool_pcb.cpp:528 -msgid "Create a polynomial shape for microwave applications" -msgstr "Création de formes polynomiales (pour applications micro-ondes)" +#: pcbnew/class_zone.cpp:948 +msgid "Corners" +msgstr "Sommets" -#: pcbnew/tool_pcb.cpp:583 -msgid "Current NetClass clearance value" -msgstr "Valeur isolation NetClass courante" +#: pcbnew/class_zone.cpp:951 +msgid "Segments" +msgstr "Segments" -#: pcbnew/tool_pcb.cpp:592 -msgid "Name of the current NetClass" -msgstr "Nom de la NetClass courante" +#: pcbnew/class_zone.cpp:953 +msgid "Polygons" +msgstr "Polygones" -#: pcbnew/tool_pcb.cpp:601 -msgid "" -"Auto track width: when starting on an existing track use its width\n" -"otherwise, use current width setting" -msgstr "" -"Largeur de piste automatique: si on démarre sur une piste existante, utiliser sa largeur\n" -" sinon utiliser la largeur courante" +#: pcbnew/class_zone.cpp:954 +msgid "Fill mode" +msgstr "Mode de remplissage" -#: pcbnew/tool_pcb.cpp:619 -msgid "Auto" -msgstr "Auto" +#: pcbnew/class_zone.cpp:958 +msgid "Hatch lines" +msgstr "Lignes de Hachure" -#: pcbnew/tool_pcb.cpp:623 -msgid "Zoom " -msgstr "Zoom " +#: pcbnew/class_zone.cpp:963 +msgid "Corners in DrawList" +msgstr "Sommets en Liste de dessin" -#: pcbnew/tool_pcb.cpp:645 -msgid "Grid" -msgstr "Grille" +#: pcbnew/initpcb.cpp:47 +msgid "Ok to delete selected items ?" +msgstr "Ok pour effacer les éléments sélectionnés ?" -#: pcbnew/tool_pcb.cpp:664 -msgid "User Grid" -msgstr "Grille perso" +#: pcbnew/initpcb.cpp:156 +msgid "Current Board will be lost and this operation cannot be undone. Continue ?" +msgstr "Le circuit actuel sera perdu et cette opération ne pourra pas être annulée. Continuer ?" -#: pcbnew/tool_pcb.cpp:777 -msgid "+/- to switch" -msgstr "+/- pour commuter" +#: pcbnew/initpcb.cpp:208 +msgid "Current Footprint will be lost and this operation cannot be undone. Continue ?" +msgstr "Le module actuel sera perdu et cette opération ne pourra pas être annulée. Continuer ?" #: pcbnew/edit.cpp:232 msgid "Add Tracks" @@ -1901,38 +1939,6 @@ msgstr "Erreur système sur écriture fichier \"%s\"" msgid "Error writing to STRINGFORMATTER" msgstr "Erreur d'écriture à STRINGFORMATTER" -#: pcbnew/sel_layer.cpp:90 -msgid "Select Layer:" -msgstr "Sélection couche:" - -#: pcbnew/sel_layer.cpp:135 -msgid "(Deselect)" -msgstr "(Désélection)" - -#: pcbnew/sel_layer.cpp:234 -msgid "Less than two copper layers are being used." -msgstr "Il y a moins de 2 couches cuivre utilisées." - -#: pcbnew/sel_layer.cpp:235 -msgid "Hence Layer Pairs cannot be specified." -msgstr "Donc les paires de couche ne peuvent pas être spécifiées" - -#: pcbnew/sel_layer.cpp:259 -msgid "Select Layer Pair:" -msgstr "Sélection paire de couches" - -#: pcbnew/sel_layer.cpp:290 -msgid "Top Layer" -msgstr "Couche Sup." - -#: pcbnew/sel_layer.cpp:295 -msgid "Bottom Layer" -msgstr "Couche Inf." - -#: pcbnew/sel_layer.cpp:333 -msgid "Warning: The Top Layer and Bottom Layer are same." -msgstr "Attention: Les couches dessus et dessous sont les mêmes" - #: pcbnew/menubarpcb.cpp:29 msgid "&New Board" msgstr "&Nouveau Circuit Imprimé" @@ -2630,47 +2636,6 @@ msgstr "Rot de la forme" msgid "3D Shape:" msgstr "Forme 3D:" -#: pcbnew/xchgmod.cpp:175 -#, c-format -msgid "file %s not found" -msgstr "fichier %s non trouvé" - -#: pcbnew/xchgmod.cpp:189 -#, c-format -msgid "Unable to create file %s" -msgstr "Impossible de créerle fichier <%s>" - -#: pcbnew/xchgmod.cpp:299 -#, c-format -msgid "Change modules <%s> -> <%s> (val = %s)?" -msgstr "Change modules <%s> -> <%s> (val = %s)?" - -#: pcbnew/xchgmod.cpp:306 -#, c-format -msgid "Change modules <%s> -> <%s> ?" -msgstr "Change modules <%s> -> <%s> ?" - -#: pcbnew/xchgmod.cpp:365 -msgid "Change ALL modules ?" -msgstr "Change TOUS les modules ?" - -#: pcbnew/xchgmod.cpp:427 -#, c-format -msgid "Change module %s (%s) " -msgstr "Change module %s (%s) " - -#: pcbnew/xchgmod.cpp:579 -msgid "No Modules!" -msgstr "Pas de Modules!" - -#: pcbnew/xchgmod.cpp:586 -msgid "Component files (." -msgstr "Fichiers de composant (." - -#: pcbnew/xchgmod.cpp:589 -msgid "Save Component Files" -msgstr "Sauver Fichier Composant" - #: pcbnew/autorout.cpp:71 msgid "Net not selected" msgstr "Net non sélectionné" @@ -2695,17 +2660,19 @@ msgstr "Place Cells" msgid "unable to create file " msgstr "Impossible de créer fichier " -#: pcbnew/surbrill.cpp:34 -msgid "Filter for net names:" -msgstr "Filtre pour nets:" +#: pcbnew/swap_layers.cpp:68 +msgid "Swap Layers:" +msgstr "Permutte couches" -#: pcbnew/surbrill.cpp:34 -msgid "Net Filter" -msgstr "Filtre Equipot" +#: pcbnew/swap_layers.cpp:215 +#: pcbnew/swap_layers.cpp:220 +#: pcbnew/swap_layers.cpp:306 +msgid "No Change" +msgstr "Garder" -#: pcbnew/surbrill.cpp:38 -msgid "List Nets" -msgstr "Liste équipots" +#: pcbnew/swap_layers.cpp:296 +msgid "Deselect this layer to select the No Change state" +msgstr "Désélectionner cette couche pour restorer l'option Pas de Changement" #: pcbnew/dsn.cpp:502 msgid "Line length exceeded" @@ -2945,14 +2912,6 @@ msgstr "Editeur de Module: Module modifié! Continuer ?" msgid "Display rectangular coordinates" msgstr "Affichage coord XY" -#: pcbnew/moduleframe.cpp:360 -msgid "Display polar coordinates" -msgstr "Affichage coord polaires" - -#: pcbnew/moduleframe.cpp:366 -msgid "Hide grid" -msgstr "Ne pas afficher la grille" - #: pcbnew/moduleframe.cpp:367 msgid "Show grid" msgstr "Afficher grille" @@ -3044,6 +3003,7 @@ msgstr "Piste" #: pcbnew/class_board_item.cpp:130 #: pcbnew/class_board_item.cpp:201 +#: pcbnew/dialog_copper_zones_base.cpp:197 msgid "Net:" msgstr "Net:" @@ -3084,30 +3044,37 @@ msgid "size" msgstr "dimension" #: pcbnew/dialog_non_copper_zones_properties_base.cpp:28 +#: pcbnew/dialog_copper_zones_base.cpp:38 msgid "Zone Fill Options:" msgstr "Options Remplissage Zone:" #: pcbnew/dialog_non_copper_zones_properties_base.cpp:30 +#: pcbnew/dialog_copper_zones_base.cpp:40 msgid "Use polygons" msgstr "Utiliser des polygones" #: pcbnew/dialog_non_copper_zones_properties_base.cpp:30 +#: pcbnew/dialog_copper_zones_base.cpp:40 msgid "Use segments" msgstr "Utiliser des segments" #: pcbnew/dialog_non_copper_zones_properties_base.cpp:32 +#: pcbnew/dialog_copper_zones_base.cpp:42 msgid "Filling Mode:" msgstr "Mode de Remplissage:" #: pcbnew/dialog_non_copper_zones_properties_base.cpp:36 +#: pcbnew/dialog_copper_zones_base.cpp:125 msgid "Zone min thickness value" msgstr "Valeur épaisseur min pour zone" #: pcbnew/dialog_non_copper_zones_properties_base.cpp:46 +#: pcbnew/dialog_copper_zones_base.cpp:99 msgid "Outlines Options:" msgstr "Options des Contours:" #: pcbnew/dialog_non_copper_zones_properties_base.cpp:48 +#: pcbnew/dialog_copper_zones_base.cpp:101 msgid "Any" msgstr "Tout" @@ -3459,6 +3426,8 @@ msgid "" "This is the local net clearance for pad.\n" "If 0, the footprint local value or the Netclass value is used" msgstr "" +"Ceci est l'isolation locate du pad\n" +"Si 0, la valeur locale du module ou la valeur en Netclasse sera utilisée" #: pcbnew/dialog_pad_properties_base.cpp:259 msgid "Solder mask clearance:" @@ -3469,6 +3438,8 @@ msgid "" "This is the local clearance between this pad and the solder mask\n" "If 0, the footprint local value or the global value is used" msgstr "" +"Ceci est la marge locate entre ce pad et le masque de soudure\n" +"Si 0, la valeur locale du module ou la valeur en Netclasse sera utilisée" #: pcbnew/dialog_pad_properties_base.cpp:272 msgid "Solder paste clearance:" @@ -3481,20 +3452,26 @@ msgid "" "The final clearance value is the sum of this value and the clearance value ratio\n" "A negative value means a smaller mask size than pad size" msgstr "" +"Ceci est la marge locate entre ce pad et le masque de pate à souder\n" +"Si 0, la valeur locale du module ou la valeur en Netclasse sera utilisée" #: pcbnew/dialog_pad_properties_base.cpp:285 msgid "Solder mask ratio clearance:" msgstr "Coeff. masque soudure" #: pcbnew/dialog_pad_properties_base.cpp:287 -#, c-format msgid "" "This is the local clearance ratio in per cent between this pad and the solder paste.\n" -"A value of 10 means the clearance value is 10% of the pad size\n" +"A value of 10 means the clearance value is 10 per cent of the pad size\n" "If 0 the footprint value or the global value is used..\n" "The final clearance value is the sum of this value and the clearance value\n" "A negative value means a smaller mask size than pad size." msgstr "" +"Ceci est la valeur locale de la marge entrece pad et le masque de pate à souder\n" +"Une valeur de 10 signifie que la marge est 10 pour cent de la taille du pad\n" +"Si 0 la valeur de l'empreinte ou la valeur globale est utilisée\n" +"La marge finale est la somme de cette valeur et du rapport de marge\n" +"Une valeur négative signifie que le masque est plus petit que le pad." #: pcbnew/dialog_pad_properties_base.cpp:294 msgid "%" @@ -3800,61 +3777,187 @@ msgstr "%s: Diamètre Via ≥ Min. Diamètre Via
" msgid "%s: Via Drill ≥ Via Dia
" msgstr "%s: Perçage Via ≥ Diam Via
" -#: pcbnew/dialog_design_rules.cpp:952 -#, c-format -msgid "%s: Via Drill < Min Via Drill
" -msgstr "%s: Perçage Via < Via Perçage Min
" +#: pcbnew/dialog_design_rules.cpp:952 +#, c-format +msgid "%s: Via Drill < Min Via Drill
" +msgstr "%s: Perçage Via < Via Perçage Min
" + +#: pcbnew/dialog_design_rules.cpp:966 +#, c-format +msgid "%s: MicroVia Diameter < MicroVia Min Diameter
" +msgstr "%s: Diamètre MicroVia < Diamètre MicroVia Minimum
" + +#: pcbnew/dialog_design_rules.cpp:978 +#, c-format +msgid "%s: MicroVia Drill ≥ MicroVia Dia
" +msgstr "%s: Perçage MicroVia ≥ Diam MicroVia
" + +#: pcbnew/dialog_design_rules.cpp:987 +#, c-format +msgid "%s: MicroVia Drill < MicroVia Min Drill
" +msgstr "%s: Perçage MicroVia < MicroVia Perçage Min
" + +#: pcbnew/dialog_design_rules.cpp:1007 +#, c-format +msgid "Extra Track %d Size %s < Min Track Size
" +msgstr "Extra Piste %d Largeur %s < Largeur Min
" + +#: pcbnew/dialog_design_rules.cpp:1015 +#, c-format +msgid "Extra Track %d Size %s > 1 inch!
" +msgstr "Extra Piste %d Largeur %s > 25,4 mm!
" + +#: pcbnew/dialog_design_rules.cpp:1034 +#, c-format +msgid "Extra Via %d Size %s < Min Via Size
" +msgstr "Extra Via %d Taille %s < Min Taille Via
" + +#: pcbnew/dialog_design_rules.cpp:1042 +#, c-format +msgid "Extra Via %d Size%s > 1 inch!
" +msgstr "Extra Via %d Taille%s > 25,4 mm!
" + +#: pcbnew/sel_layer.cpp:94 +msgid "Select Layer:" +msgstr "Sélection couche:" + +#: pcbnew/sel_layer.cpp:136 +msgid "(Deselect)" +msgstr "(Désélection)" + +#: pcbnew/sel_layer.cpp:226 +msgid "Less than two copper layers are being used." +msgstr "Il y a moins de 2 couches cuivre utilisées." + +#: pcbnew/sel_layer.cpp:227 +msgid "Hence layer pairs cannot be specified." +msgstr "Donc les paires de couche ne peuvent pas être spécifiées." + +#: pcbnew/sel_layer.cpp:250 +msgid "Select Layer Pair:" +msgstr "Sélection paire de couches" + +#: pcbnew/sel_layer.cpp:282 +msgid "Top Layer" +msgstr "Couche Sup." + +#: pcbnew/sel_layer.cpp:290 +msgid "Bottom Layer" +msgstr "Couche Inf." + +#: pcbnew/sel_layer.cpp:330 +msgid "Warning: The Top Layer and Bottom Layer are same." +msgstr "Attention: Les couches dessus et dessous sont les mêmes" + +#: pcbnew/class_edge_mod.cpp:300 +msgid "Graphic Item" +msgstr "Element Graphique" + +#: pcbnew/class_edge_mod.cpp:307 +msgid "TimeStamp" +msgstr "TimeStamp" + +#: pcbnew/class_edge_mod.cpp:309 +msgid "Mod Layer" +msgstr "Couche Mod." + +#: pcbnew/class_edge_mod.cpp:312 +msgid "Seg Layer" +msgstr "Couche Seg." + +#: pcbnew/tool_modedit.cpp:41 +msgid "Select working library" +msgstr "Sélection de la librairie de travail" + +#: pcbnew/tool_modedit.cpp:45 +msgid "Save Module in working library" +msgstr "Sauver Module en librairie de travail" + +#: pcbnew/tool_modedit.cpp:50 +msgid "Create new library and save current module" +msgstr "Créer une nouvelle librairie et y sauver le composant" + +#: pcbnew/tool_modedit.cpp:55 +msgid "Delete part in current library" +msgstr "Supprimer composant en librairie de travail" + +#: pcbnew/tool_modedit.cpp:60 +msgid "New Module" +msgstr "Nouveau Module" + +#: pcbnew/tool_modedit.cpp:64 +msgid "Load module from lib" +msgstr "Charger un module à partir d'une librairie" + +#: pcbnew/tool_modedit.cpp:69 +msgid "Load module from current board" +msgstr "Charger module à partir du C.I." + +#: pcbnew/tool_modedit.cpp:73 +msgid "Update module in current board" +msgstr "Remplacer module dans le C.I." + +#: pcbnew/tool_modedit.cpp:77 +msgid "Insert module into current board" +msgstr "Placer module dans le C.I." + +#: pcbnew/tool_modedit.cpp:82 +msgid "import module" +msgstr "Importer Module" + +#: pcbnew/tool_modedit.cpp:86 +msgid "export module" +msgstr "Exporter Module" -#: pcbnew/dialog_design_rules.cpp:966 -#, c-format -msgid "%s: MicroVia Diameter < MicroVia Min Diameter
" -msgstr "%s: Diamètre MicroVia < Diamètre MicroVia Minimum
" +#: pcbnew/tool_modedit.cpp:98 +msgid "Module Properties" +msgstr "Propriétés du Module" -#: pcbnew/dialog_design_rules.cpp:978 -#, c-format -msgid "%s: MicroVia Drill ≥ MicroVia Dia
" -msgstr "%s: Perçage MicroVia ≥ Diam MicroVia
" +#: pcbnew/tool_modedit.cpp:102 +msgid "Print Module" +msgstr "Imprimer Module" -#: pcbnew/dialog_design_rules.cpp:987 -#, c-format -msgid "%s: MicroVia Drill < MicroVia Min Drill
" -msgstr "%s: Perçage MicroVia < MicroVia Perçage Min
" +#: pcbnew/tool_modedit.cpp:133 +msgid "Module Check" +msgstr "Test module" -#: pcbnew/dialog_design_rules.cpp:1007 -#, c-format -msgid "Extra Track %d Size %s < Min Track Size
" -msgstr "Extra Piste %d Largeur %s < Largeur Min
" +#: pcbnew/tool_modedit.cpp:157 +msgid "Add Pads" +msgstr "Addition de \"pins\"" -#: pcbnew/dialog_design_rules.cpp:1015 -#, c-format -msgid "Extra Track %d Size %s > 1 inch!
" -msgstr "Extra Piste %d Largeur %s > 25,4 mm!
" +#: pcbnew/tool_modedit.cpp:203 +msgid "Display Grid OFF" +msgstr "Suppression de l'affichage de la grille" -#: pcbnew/dialog_design_rules.cpp:1034 -#, c-format -msgid "Extra Via %d Size %s < Min Via Size
" -msgstr "Extra Via %d Taille %s < Min Taille Via
" +#: pcbnew/tool_modedit.cpp:208 +msgid "Display Polar Coord ON" +msgstr "Activer affichage coord Polaires" -#: pcbnew/dialog_design_rules.cpp:1042 -#, c-format -msgid "Extra Via %d Size%s > 1 inch!
" -msgstr "Extra Via %d Taille%s > 25,4 mm!
" +#: pcbnew/tool_modedit.cpp:220 +msgid "Change Cursor Shape" +msgstr "Sélection de la forme du curseur" -#: pcbnew/class_edge_mod.cpp:226 -msgid "Graphic Item" -msgstr "Element Graphique" +#: pcbnew/tool_modedit.cpp:225 +msgid "Show Pads Sketch" +msgstr "Afficher pastilles en contour" -#: pcbnew/class_edge_mod.cpp:233 -msgid "TimeStamp" -msgstr "TimeStamp" +#: pcbnew/tool_modedit.cpp:230 +msgid "Show Texts Sketch" +msgstr "Afficher textes en contour" -#: pcbnew/class_edge_mod.cpp:235 -msgid "Mod Layer" -msgstr "Couche Mod." +#: pcbnew/tool_modedit.cpp:235 +msgid "Show Edges Sketch" +msgstr "Afficher Modules en contour" -#: pcbnew/class_edge_mod.cpp:238 -msgid "Seg Layer" -msgstr "Couche Seg." +#: pcbnew/tool_modedit.cpp:304 +#, c-format +msgid "Grid %.1f" +msgstr "Grille %.1f" + +#: pcbnew/tool_modedit.cpp:306 +#, c-format +msgid "Grid %.3f" +msgstr "Grille %.3f" #: pcbnew/dialog_graphic_items_options.cpp:202 msgid "Graphics:" @@ -4803,7 +4906,7 @@ msgstr "Utiliser les Valeurs des NetClass" #: pcbnew/onrightclick.cpp:825 msgid "Use track and via sizes from their Netclass values" -msgstr "" +msgstr "Utiliser les dimensions de pistes et vias de leur valeurs en Netclasse" #: pcbnew/onrightclick.cpp:832 #, c-format @@ -5218,10 +5321,6 @@ msgstr "Module courant" msgid "Current Value" msgstr "Valeur courante" -#: pcbnew/dialog_exchange_modules_base.cpp:39 -msgid "New Module" -msgstr "Nouveau Module" - #: pcbnew/dialog_exchange_modules_base.cpp:51 msgid "Change module" msgstr "Change module" @@ -5371,9 +5470,8 @@ msgstr "Mettre ces valeurs à 0 pour utiliser les valeurs globales" #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:127 #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:156 -#, fuzzy msgid "All pads nets clearance" -msgstr "Test isolation pad a pad" +msgstr "Isolation pour tous les pads" #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:149 #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:180 @@ -5383,6 +5481,10 @@ msgid "" "This value can be superseded by a pad local value.\n" "If 0, the global value is used" msgstr "" +"Ceci est la valeur locale de la marge entre pads et le masque de soudure\n" +"pour l'empreinte\n" +"Cette valeur peut être remplacée par une valeur locale du pad\n" +"Si 0, la valeur globale sera utilisée" #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:156 msgid "inch" @@ -5397,18 +5499,28 @@ msgid "" "The final clearance value is the sum of this value and the clearance value ratio\n" "A negative value means a smaller mask size than pad size" msgstr "" +"Ceci est la valeur locale de la marge entre pads et le masque de pate à souder\n" +"pour cette empreinte.\n" +"Cette valeur peut être remplacée par une valeur locale du pad.\n" +"La marge finale est la somme de cette valeur et du rapport de marge\n" +"Une valeur négative signifie que le masque est plus petit que le pad" #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:175 #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:206 -#, c-format msgid "" "This is the local clearance ratio in per cent between pads and the solder paste\n" "for this footprint.\n" -"A value of 10 means the clearance value is 10% of the pad size\n" +"A value of 10 means the clearance value is 10 per cent of the pad size\n" "This value can be superseded by a pad local value.\n" "The final clearance value is the sum of this value and the clearance value\n" "A negative value means a smaller mask size than pad size." msgstr "" +"Ceci est la valeur locale de la marge entre pads et le masque de pate à souder\n" +"pour cette empreinte\n" +"Une valeur de 10 signifie que la marge est 10 pour cent de la taille du pad\n" +"Cette valeur peut être remplacée par une valeur locale du pad\n" +"La marge finale est la somme de cette valeur et du rapport de marge\n" +"Une valeur négative signifie que le masque est plus petit que le pad." #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:195 #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:226 @@ -5499,6 +5611,9 @@ msgid "" "If 0, the Netclass values are used\n" "This value can be superseded by a pad local value." msgstr "" +"Ceci est lisolation locate pour tous les pads de cette empreinte\n" +"Si 0, la valeur en Netclasse sera utilisée\n" +"Cette valeur peut être remplacée par une valeur locale d'un pad" #: pcbnew/globaleditpad.cpp:75 msgid "Edit Pads Global" @@ -5586,28 +5701,36 @@ msgid "" "- a positive value means a mask bigger than a pad\n" "- a negative value means a mask smaller than a pad\n" msgstr "" +"Note:\n" +"- une valeur positive signifie un masque plus grand que le pad\n" +"- une valeur négative signifie un masque plus petite que le pad\n" -#: pcbnew/dialog_mask_clearance_base.cpp:47 +#: pcbnew/dialog_mask_clearance_base.cpp:44 msgid "" "This is the global clearance between pads and the solder mask\n" "This value can be superseded by local values for a footprint or a pad." msgstr "" -#: pcbnew/dialog_mask_clearance_base.cpp:60 +#: pcbnew/dialog_mask_clearance_base.cpp:57 msgid "" "This is the global clearance between pads and the solder paste\n" "This value can be superseded by local values for a footprint or a pad.\n" "The final clearance value is the sum of this value and the clearance value ratio" msgstr "" -#: pcbnew/dialog_mask_clearance_base.cpp:73 -#, c-format +#: pcbnew/dialog_mask_clearance_base.cpp:70 msgid "" "This is the global clearance ratio in per cent between pads and the solder paste\n" -"A value of 10 means the clearance value is 10% of the pad size\n" +"A value of 10 means the clearance value is 10 per cent of the pad size\n" "This value can be superseded by local values for a footprint or a pad.\n" "The final clearance value is the sum of this value and the clearance value" msgstr "" +"Ceci est la valeur locale de la marge entre pads et le masque de pate à souder\n" +"pour cette empreinte\n" +"Une valeur de 10 signifie que la marge est 10 pour cent de la taille du pad\n" +"Cette valeur peut être remplacée par une valeur locale du pad\n" +"La marge finale est la somme de cette valeur et du rapport de marge\n" +"Une valeur négative signifie que le masque est plus petit que le pad." #: pcbnew/gen_modules_placefile.cpp:131 msgid "No modules for automated placement." @@ -5856,181 +5979,6 @@ msgstr "Echelle 8" msgid "Scale 16" msgstr "Echelle 16" -#: pcbnew/tool_modedit.cpp:42 -msgid "Select working library" -msgstr "Sélection de la librairie de travail" - -#: pcbnew/tool_modedit.cpp:46 -msgid "Save Module in working library" -msgstr "Sauver Module en librairie de travail" - -#: pcbnew/tool_modedit.cpp:51 -msgid "Create new library and save current module" -msgstr "Créer une nouvelle librairie et y sauver le composant" - -#: pcbnew/tool_modedit.cpp:56 -msgid "Delete part in current library" -msgstr "Supprimer composant en librairie de travail" - -#: pcbnew/tool_modedit.cpp:65 -msgid "Load module from lib" -msgstr "Charger un module à partir d'une librairie" - -#: pcbnew/tool_modedit.cpp:70 -msgid "Load module from current board" -msgstr "Charger module à partir du C.I." - -#: pcbnew/tool_modedit.cpp:74 -msgid "Update module in current board" -msgstr "Remplacer module dans le C.I." - -#: pcbnew/tool_modedit.cpp:78 -msgid "Insert module into current board" -msgstr "Placer module dans le C.I." - -#: pcbnew/tool_modedit.cpp:83 -msgid "import module" -msgstr "Importer Module" - -#: pcbnew/tool_modedit.cpp:87 -msgid "export module" -msgstr "Exporter Module" - -#: pcbnew/tool_modedit.cpp:99 -msgid "Module Properties" -msgstr "Propriétés du Module" - -#: pcbnew/tool_modedit.cpp:103 -msgid "Print Module" -msgstr "Imprimer Module" - -#: pcbnew/tool_modedit.cpp:134 -msgid "Module Check" -msgstr "Test module" - -#: pcbnew/tool_modedit.cpp:160 -msgid "Add Pads" -msgstr "Addition de \"pins\"" - -#: pcbnew/tool_modedit.cpp:235 -msgid "Show Texts Sketch" -msgstr "Afficher textes en contour" - -#: pcbnew/tool_modedit.cpp:240 -msgid "Show Edges Sketch" -msgstr "Afficher Modules en contour" - -#: pcbnew/tool_modedit.cpp:311 -#, c-format -msgid "Grid %.1f" -msgstr "Grille %.1f" - -#: pcbnew/tool_modedit.cpp:313 -#, c-format -msgid "Grid %.3f" -msgstr "Grille %.3f" - -#: pcbnew/toolbars_update_user_interface.cpp:39 -msgid " mils" -msgstr " mils" - -#: pcbnew/toolbars_update_user_interface.cpp:41 -msgid " mm" -msgstr " mm" - -#: pcbnew/toolbars_update_user_interface.cpp:54 -msgid "NetClass: " -msgstr "NetClass: " - -#: pcbnew/toolbars_update_user_interface.cpp:95 -#: pcbnew/toolbars_update_user_interface.cpp:115 -msgid " *" -msgstr " *" - -#: pcbnew/toolbars_update_user_interface.cpp:191 -msgid "DRC Off (Disable !!!), Currently: DRC is active" -msgstr "DRC off (désactivée !!!), actuellement DRC active" - -#: pcbnew/toolbars_update_user_interface.cpp:193 -msgid "DRC On (Currently: DRC is inactive !!!)" -msgstr "DRC On (Actuellement, DRC désactivée !!!)" - -#: pcbnew/toolbars_update_user_interface.cpp:204 -msgid "Polar coords not show" -msgstr "Coord Polaires non affichées" - -#: pcbnew/toolbars_update_user_interface.cpp:205 -msgid "Display polar coords" -msgstr "Affichage coord Polaires" - -#: pcbnew/toolbars_update_user_interface.cpp:210 -msgid "Grid not show" -msgstr "Grille non montrée" - -#: pcbnew/toolbars_update_user_interface.cpp:219 -msgid "Hide general ratsnest" -msgstr "Ne pas afficher le chevelu général" - -#: pcbnew/toolbars_update_user_interface.cpp:220 -msgid "Show general ratsnest" -msgstr "Afficher le chevelu général" - -#: pcbnew/toolbars_update_user_interface.cpp:226 -msgid "Hide module ratsnest" -msgstr "Ne pas montrer le chevelu du module" - -#: pcbnew/toolbars_update_user_interface.cpp:227 -msgid "Show module ratsnest" -msgstr "Montrer le chevelu du module" - -#: pcbnew/toolbars_update_user_interface.cpp:234 -msgid "Disable auto delete old track" -msgstr "Ne pas Autoriser l'effacement automatique des pistes" - -#: pcbnew/toolbars_update_user_interface.cpp:235 -msgid "Enable auto delete old track" -msgstr "Autoriser l'effacement automatique des pistes" - -#: pcbnew/toolbars_update_user_interface.cpp:242 -msgid "Show pads sketch mode" -msgstr "Afficher pastilles en mode contour" - -#: pcbnew/toolbars_update_user_interface.cpp:243 -msgid "Show pads filled mode" -msgstr "Afficher pastilles en mode plein" - -#: pcbnew/toolbars_update_user_interface.cpp:250 -msgid "Show vias sketch mode" -msgstr "Afficher vias en mode contour" - -#: pcbnew/toolbars_update_user_interface.cpp:251 -msgid "Show vias filled mode" -msgstr "Afficher pastilles en mode plein" - -#: pcbnew/toolbars_update_user_interface.cpp:258 -msgid "Show tracks sketch mode" -msgstr "Afficher pistes en mode contour" - -#: pcbnew/toolbars_update_user_interface.cpp:259 -msgid "Show tracks filled mode" -msgstr "Afficher pistes en mode plein" - -#: pcbnew/toolbars_update_user_interface.cpp:265 -msgid "Normal contrast mode display" -msgstr "Mode d'affichage contraste normal" - -#: pcbnew/toolbars_update_user_interface.cpp:266 -msgid "High contrast mode display" -msgstr "Mode d'affichage haut contraste" - -#: pcbnew/toolbars_update_user_interface.cpp:272 -msgid "Hide invisible text" -msgstr "Cacher textes invisibles" - -#: pcbnew/toolbars_update_user_interface.cpp:273 -msgid "Show invisible text" -msgstr "Montrer textes invisibles" - #: pcbnew/dialog_general_options_BoardEditor_base.cpp:22 msgid "No Display" msgstr "Pas d'affichage" @@ -6284,6 +6232,71 @@ msgstr "Liens" msgid "Connect" msgstr "Connect" +#: pcbnew/toolbars_update_user_interface.cpp:39 +msgid " mils" +msgstr " mils" + +#: pcbnew/toolbars_update_user_interface.cpp:41 +msgid " mm" +msgstr " mm" + +#: pcbnew/toolbars_update_user_interface.cpp:54 +msgid "NetClass: " +msgstr "NetClass: " + +#: pcbnew/toolbars_update_user_interface.cpp:95 +#: pcbnew/toolbars_update_user_interface.cpp:115 +msgid " *" +msgstr " *" + +#: pcbnew/toolbars_update_user_interface.cpp:191 +msgid "Disable design rule checking" +msgstr "Désactive le contrôle des règles de conception" + +#: pcbnew/toolbars_update_user_interface.cpp:220 +msgid "Hide board ratsnest" +msgstr "Ne pas montrer le chevelu général" + +#: pcbnew/toolbars_update_user_interface.cpp:227 +msgid "Hide module ratsnest" +msgstr "Ne pas montrer le chevelu du module" + +#: pcbnew/toolbars_update_user_interface.cpp:228 +msgid "Show module ratsnest" +msgstr "Montrer le chevelu du module" + +#: pcbnew/toolbars_update_user_interface.cpp:235 +msgid "Disable auto delete old track" +msgstr "Ne pas Autoriser l'effacement automatique des pistes" + +#: pcbnew/toolbars_update_user_interface.cpp:236 +msgid "Enable auto delete old track" +msgstr "Autoriser l'effacement automatique des pistes" + +#: pcbnew/toolbars_update_user_interface.cpp:244 +msgid "Show pads in fill mode" +msgstr "Afficher pads en mode plein" + +#: pcbnew/toolbars_update_user_interface.cpp:252 +msgid "Show vias in fill mode" +msgstr "Afficher vias en mode plein" + +#: pcbnew/toolbars_update_user_interface.cpp:260 +msgid "Show tracks in fill mode" +msgstr "Afficher pistes en mode plein" + +#: pcbnew/toolbars_update_user_interface.cpp:266 +msgid "Normal contrast display mode" +msgstr "Mode d'affichage contraste normal" + +#: pcbnew/toolbars_update_user_interface.cpp:267 +msgid "High contrast display mode" +msgstr "Mode d'affichage haut contraste" + +#: pcbnew/toolbars_update_user_interface.cpp:273 +msgid "Hide invisible text" +msgstr "Cacher textes invisibles" + #: pcbnew/dialog_pad_properties.cpp:482 msgid "Incorrect value for pad drill: pad drill bigger than pad size" msgstr "Valeur incorrecte pour diamètre de perçage: perçage plus grand que la taille du pad" @@ -8150,7 +8163,7 @@ msgstr " de normal" #: eeschema/pinedit.cpp:689 #, c-format msgid "Off grid pin %s \"%s\" at location (%.3f, %.3f)" -msgstr "" +msgstr "Pin %s hors grille \"%s\" en position (%.3f, %.3f)" #: eeschema/pinedit.cpp:716 msgid "No off grid or duplicate pins were found." @@ -8268,10 +8281,6 @@ msgstr "Placer ligne ou polygone graphique" msgid "Turn grid off" msgstr "Ne pas afficher la grille" -#: eeschema/tool_sch.cpp:265 -msgid "Change cursor shape" -msgstr "Changer la forme du curseur" - #: eeschema/tool_sch.cpp:275 msgid "HV orientation for wires and bus" msgstr "Force direction H, V pour les fils et bus" @@ -10719,7 +10728,7 @@ msgstr "Archiver les fichiers du projet" msgid "Refresh project tree" msgstr "Mettre à jour l'affichage du projet" -#: kicad/mainframe.cpp:91 +#: kicad/mainframe.cpp:82 #, c-format msgid "" "Ready\n" @@ -10728,19 +10737,19 @@ msgstr "" "Prêt\n" "Répertoire de travail: %s\n" -#: kicad/mainframe.cpp:287 +#: kicad/mainframe.cpp:275 msgid "Execute Python Script" msgstr "Executer un Script Python" -#: kicad/mainframe.cpp:288 +#: kicad/mainframe.cpp:276 msgid "Python script (*.py)|*.py" msgstr "Script Python (*.py)|*.py" -#: kicad/mainframe.cpp:309 +#: kicad/mainframe.cpp:297 msgid "Text file (" msgstr "Fichier Texte (" -#: kicad/mainframe.cpp:311 +#: kicad/mainframe.cpp:299 msgid "Load File to Edit" msgstr "Fichier à Editer" @@ -10772,23 +10781,23 @@ msgstr "" "\n" "Projet: " -#: kicad/commandframe.cpp:50 +#: kicad/commandframe.cpp:72 msgid "EESchema (Schematic editor)" msgstr "EESchema (Editeur de Schématique)" -#: kicad/commandframe.cpp:54 +#: kicad/commandframe.cpp:76 msgid "CVpcb (Components to modules)" msgstr "CVpcb ( Association Composants/ Modules)" -#: kicad/commandframe.cpp:58 +#: kicad/commandframe.cpp:80 msgid "PCBnew (PCB editor)" msgstr "PCBnew (Editeur de circuits imprimés)" -#: kicad/commandframe.cpp:62 +#: kicad/commandframe.cpp:84 msgid "GerbView (Gerber viewer)" msgstr "GerbView (Visualisateur Gerber)" -#: kicad/commandframe.cpp:69 +#: kicad/commandframe.cpp:91 msgid "Run Python Script" msgstr "Exécuter le Script Python" @@ -10951,7 +10960,7 @@ msgstr "Changer Nom Fichier: " msgid "Change filename" msgstr "Changer Nom Fichier" -#: kicad/kicad.cpp:379 +#: kicad/kicad.cpp:62 msgid "noname" msgstr "noname" @@ -12558,6 +12567,60 @@ msgstr "DCodes id." msgid "Page Settings" msgstr "Ajustage opt Page" +#~ msgid "Drc OFF" +#~ msgstr "Drc DESACTIVEE" +#~ msgid "Show General Ratsnest" +#~ msgstr "Montrer le chevelu général" +#~ msgid "Enable Auto Del Track" +#~ msgstr "Autoriser l'effacement automatique des pistes" +#~ msgid "Show Vias Sketch" +#~ msgstr "Afficher Vias en Contour" +#~ msgid "Show Tracks Sketch" +#~ msgstr "Afficher Pistes en Contour" +#~ msgid "High Contrast Mode Display" +#~ msgstr "Mode d'affichage Haut Contraste" +#~ msgid "Show Invisible Text" +#~ msgstr "Montrer textes invisibles" +#~ msgid "DRC Off (Disable !!!), Currently: DRC is active" +#~ msgstr "DRC off (désactivée !!!), actuellement DRC active" +#~ msgid "DRC On (Currently: DRC is inactive !!!)" +#~ msgstr "DRC On (Actuellement, DRC désactivée !!!)" +#~ msgid "Polar coords not show" +#~ msgstr "Coord Polaires non affichées" +#~ msgid "Display polar coords" +#~ msgstr "Affichage coord Polaires" +#~ msgid "Grid not show" +#~ msgstr "Grille non montrée" +#~ msgid "Hide general ratsnest" +#~ msgstr "Ne pas afficher le chevelu général" +#~ msgid "Show general ratsnest" +#~ msgstr "Afficher le chevelu général" +#~ msgid "Show pads sketch mode" +#~ msgstr "Afficher pastilles en mode contour" +#~ msgid "Show pads filled mode" +#~ msgstr "Afficher pastilles en mode plein" +#~ msgid "Show vias sketch mode" +#~ msgstr "Afficher vias en mode contour" +#~ msgid "Show tracks sketch mode" +#~ msgstr "Afficher pistes en mode contour" +#~ msgid "" +#~ "This is the local clearance ratio in per cent between pads and the solder " +#~ "paste\n" +#~ "for this footprint.\n" +#~ "A value of 10 means the clearance value is 10% of the pad size\n" +#~ "This value can be superseded by a pad local value.\n" +#~ "The final clearance value is the sum of this value and the clearance " +#~ "value\n" +#~ "A negative value means a smaller mask size than pad size." +#~ msgstr "" +#~ "Ceci est la valeur locale de la marge entre pads et le masque de pate à " +#~ "souder\n" +#~ "pour cette empreinte\n" +#~ "Une valeur de 10 signifie que la marge est 10% de la taille du pad\n" +#~ "Cette valeur peut être remplacée par une valeur locale du pad\n" +#~ "La marge finale est la somme de cette valeur et du rapport de marge\n" +#~ "Une valeur négative signifie que le masque est plus petit que le padCeci " +#~ "est la valeur locale de la marge entre pads et le masque de pate à souder." #~ msgid "Lines Width" #~ msgstr "Epaiss. Lignes" #~ msgid "Adjust size,shape,layers... for Pads" diff --git a/pcbnew/board_items_to_polygon_shape_transform.cpp b/pcbnew/board_items_to_polygon_shape_transform.cpp index 256f574c1a..3541af0c16 100644 --- a/pcbnew/board_items_to_polygon_shape_transform.cpp +++ b/pcbnew/board_items_to_polygon_shape_transform.cpp @@ -164,6 +164,50 @@ void DRAWSEGMENT::TransformShapeWithClearanceToPolygon( } } +/** Function EDGE_MODULE::TransformShapeWithClearanceToPolygon + * Convert the track shape to a closed polygon + * Used in filling zones calculations + * Circles and arcs are approximated by segments + * @param aCornerBuffer = a buffer to store the polygon + * @param aClearanceValue = the clearance around the pad + * @param aCircleToSegmentsCount = the number of segments to approximate a circle + * @param aCorrectionFactor = the correction to apply to circles radius to keep + * clearance when the circle is approxiamted by segment bigger or equal + * to the real clearance value (usually near from 1.0) + */ +void EDGE_MODULE::TransformShapeWithClearanceToPolygon( + std::vector & aCornerBuffer, + int aClearanceValue, + int aCircleToSegmentsCount, + double aCorrectionFactor ) +{ + switch( m_Shape ) + { + case S_CIRCLE: + TransformArcToPolygon( aCornerBuffer, m_Start, // Circle centre + m_End, 3600, + aCircleToSegmentsCount, + m_Width + (2 * aClearanceValue) ); + break; + + case S_ARC: + TransformArcToPolygon( aCornerBuffer, m_Start, + m_End, m_Angle, + aCircleToSegmentsCount, + m_Width + (2 * aClearanceValue) ); + break; + + case S_SEGMENT: + TransformRoundedEndsSegmentToPolygon( + aCornerBuffer, m_Start, m_End, + aCircleToSegmentsCount, m_Width + (2 * aClearanceValue) ); + break; + + default: + break; + } +} + /** Function TRACK::TransformShapeWithClearanceToPolygon * Convert the track shape to a closed polygon diff --git a/pcbnew/class_edge_mod.cpp b/pcbnew/class_edge_mod.cpp index ea02e5ea2c..859e3eb859 100644 --- a/pcbnew/class_edge_mod.cpp +++ b/pcbnew/class_edge_mod.cpp @@ -24,10 +24,10 @@ EDGE_MODULE::EDGE_MODULE( MODULE* parent ) : BOARD_ITEM( parent, TYPE_EDGE_MODULE ) { - m_Width = 0; - m_Shape = S_SEGMENT; - m_Angle = 0; - m_Width = 120; + m_Width = 0; + m_Shape = S_SEGMENT; + m_Angle = 0; + m_Width = 120; } @@ -54,6 +54,78 @@ void EDGE_MODULE::Copy( EDGE_MODULE* source ) } +/** + * Function GetBoundingBox + * returns the orthogonal, bounding box of this object for display purposes. + * This box should be an enclosing perimeter for visible components of this + * object, and the units should be in the pcb or schematic coordinate system. + * It is OK to overestimate the size by a few counts. + */ +EDA_Rect EDGE_MODULE::GetBoundingBox() +{ + EDA_Rect bbox; + + bbox.SetOrigin( m_Start ); + + switch( m_Shape ) + { + case S_SEGMENT: + bbox.SetEnd( m_End ); + bbox.Inflate( (m_Width / 2) + 1 ); + break; + + case S_CIRCLE: + { + int rayon = (int) hypot( (double) (m_End.x - m_Start.x), (double) (m_End.y - m_Start.y) ); + bbox.Inflate( rayon + 1 ); + } + break; + + case S_ARC: + { + int rayon = (int) hypot( (double) (m_End.x - m_Start.x), (double) (m_End.y - m_Start.y) ); + bbox.Inflate( rayon + 1 ); + } + break; + + case S_POLYGON: + { + // We must compute true coordinates from m_PolyPoints + // which are relative to module position, orientation 0 + + std::vector points = m_PolyPoints; + wxPoint p_end = m_Start; + + MODULE* Module = (MODULE*) m_Parent; + for( unsigned ii = 0; ii < points.size(); ii++ ) + { + wxPoint& pt = points[ii]; + + if( Module ) + { + RotatePoint( &pt.x, &pt.y, Module->m_Orient ); + pt.x += Module->m_Pos.x; + pt.y += Module->m_Pos.y; + } + + pt.x += m_Start0.x; + pt.y += m_Start0.y; + bbox.m_Pos.x = MIN( bbox.m_Pos.x, pt.x ); + bbox.m_Pos.y = MIN( bbox.m_Pos.y, pt.y ); + p_end.x = MAX( p_end.x, pt.x ); + p_end.y = MAX( p_end.y, pt.y ); + } + + bbox.SetEnd(p_end); + bbox.Inflate( 1 ); + break; + } + } + + return bbox; +} + + void EDGE_MODULE::SetDrawCoord() { MODULE* Module = (MODULE*) m_Parent; @@ -106,8 +178,8 @@ void EDGE_MODULE::Draw( WinEDA_DrawPanel* panel, wxDC* DC, ux0 = m_Start.x - offset.x; uy0 = m_Start.y - offset.y; - dx = m_End.x - offset.x; - dy = m_End.y - offset.y; + dx = m_End.x - offset.x; + dy = m_End.y - offset.y; GRSetDrawMode( DC, draw_mode ); typeaff = frame->m_DisplayModEdge; @@ -181,6 +253,7 @@ void EDGE_MODULE::Draw( WinEDA_DrawPanel* panel, wxDC* DC, break; case S_POLYGON: + // We must compute true coordinates from m_PolyPoints // which are relative to module position, orientation 0 @@ -197,8 +270,8 @@ void EDGE_MODULE::Draw( WinEDA_DrawPanel* panel, wxDC* DC, pt.y += Module->m_Pos.y; } - pt.x += m_Start0.x - offset.x; - pt.y += m_Start0.y - offset.y; + pt.x += m_Start0.x - offset.x; + pt.y += m_Start0.y - offset.y; } GRPoly( &panel->m_ClipBox, DC, points.size(), &points[0], @@ -213,7 +286,8 @@ void EDGE_MODULE::DisplayInfo( WinEDA_DrawFrame* frame ) { wxString msg; - MODULE* module = (MODULE*) m_Parent; + MODULE* module = (MODULE*) m_Parent; + if( !module ) return; @@ -277,15 +351,17 @@ bool EDGE_MODULE::Save( FILE* aFile ) const ret = fprintf( aFile, "DP %d %d %d %d %d %d %d\n", m_Start0.x, m_Start0.y, m_End0.x, m_End0.y, - (int)m_PolyPoints.size(), + (int) m_PolyPoints.size(), m_Width, m_Layer ); - for( unsigned i=0; i 5); + return ret > 5; } @@ -342,7 +418,7 @@ int EDGE_MODULE::ReadDescr( char* Line, FILE* File, switch( m_Shape ) { - case S_ARC: + case S_ARC: sscanf( Line + 3, "%d %d %d %d %d %d %d", &m_Start0.x, &m_Start0.y, &m_End0.x, &m_End0.y, @@ -381,7 +457,7 @@ int EDGE_MODULE::ReadDescr( char* Line, FILE* File, int y; sscanf( Buf + 3, "%d %d\n", &x, &y ); - m_PolyPoints.push_back( wxPoint(x,y) ); + m_PolyPoints.push_back( wxPoint( x, y ) ); (*LineNum)++; } @@ -412,7 +488,7 @@ int EDGE_MODULE::ReadDescr( char* Line, FILE* File, // m_Layer must be >= FIRST_NON_COPPER_LAYER, but because microwave footprints // can use the copper layers m_Layer < FIRST_NON_COPPER_LAYER is allowed. // @todo: changes use of EDGE_MODULE these footprints and allows only m_Layer >= FIRST_NON_COPPER_LAYER - if ( (m_Layer < 0) || (m_Layer > LAST_NON_COPPER_LAYER) ) + if( (m_Layer < 0) || (m_Layer > LAST_NON_COPPER_LAYER) ) m_Layer = SILKSCREEN_N_CMP; return error; } @@ -426,10 +502,10 @@ int EDGE_MODULE::ReadDescr( char* Line, FILE* File, */ bool EDGE_MODULE::HitTest( const wxPoint& ref_pos ) { - int uxf, uyf; - int rayon, dist; - int dx, dy, spot_cX, spot_cY; - int ux0, uy0; + int uxf, uyf; + int rayon, dist; + int dx, dy, spot_cX, spot_cY; + int ux0, uy0; ux0 = m_Start.x; uy0 = m_Start.y; @@ -445,14 +521,14 @@ bool EDGE_MODULE::HitTest( const wxPoint& ref_pos ) dx = uxf - ux0; dy = uyf - uy0; - if( DistanceTest( m_Width/2, dx, dy, spot_cX, spot_cY ) ) + if( DistanceTest( m_Width / 2, dx, dy, spot_cX, spot_cY ) ) return true; break; case S_CIRCLE: rayon = (int) hypot( (double) (uxf - ux0), (double) (uyf - uy0) ); dist = (int) hypot( (double) (ref_pos.x - ux0), - (double) (ref_pos.y - uy0) ); + (double) (ref_pos.y - uy0) ); if( abs( rayon - dist ) <= m_Width ) return true; break; @@ -460,7 +536,7 @@ bool EDGE_MODULE::HitTest( const wxPoint& ref_pos ) case S_ARC: rayon = (int) hypot( (double) (uxf - ux0), (double) (uyf - uy0) ); dist = (int) hypot( (double) (ref_pos.x - ux0), - (double) (ref_pos.y - uy0) ); + (double) (ref_pos.y - uy0) ); if( abs( rayon - dist ) > m_Width ) break; @@ -501,7 +577,7 @@ void EDGE_MODULE::Show( int nestLevel, std::ostream& os ) // for now, make it look like XML: NestedSpace( nestLevel, os ) << '<' << GetClass().Lower().mb_str() << - " type=\"" << CONV_TO_UTF8(shape) << "\">"; + " type=\"" << CONV_TO_UTF8( shape ) << "\">"; os << " "; os << " "; @@ -509,4 +585,5 @@ void EDGE_MODULE::Show( int nestLevel, std::ostream& os ) os << " \n"; } + #endif diff --git a/pcbnew/class_edge_mod.h b/pcbnew/class_edge_mod.h index 4ac25add3b..d937dae84a 100644 --- a/pcbnew/class_edge_mod.h +++ b/pcbnew/class_edge_mod.h @@ -70,6 +70,15 @@ public: void DisplayInfo( WinEDA_DrawFrame* frame ); + /** + * Function GetBoundingBox + * returns the orthogonal, bounding box of this object for display purposes. + * This box should be an enclosing perimeter for visible components of this + * object, and the units should be in the pcb or schematic coordinate system. + * It is OK to overestimate the size by a few counts. + */ + virtual EDA_Rect GetBoundingBox(); + /** * Function HitTest * tests if the given wxPoint is within the bounds of this object. @@ -89,6 +98,23 @@ public: // return wxT( "EDGE" ); ? } + /** Function TransformShapeWithClearanceToPolygon + * Convert the track shape to a closed polygon + * Used in filling zones calculations + * Circles and arcs are approximated by segments + * @param aCornerBuffer = a buffer to store the polygon + * @param aClearanceValue = the clearance around the pad + * @param aCircleToSegmentsCount = the number of segments to approximate a circle + * @param aCorrectionFactor = the correction to apply to circles radius to keep + * clearance when the circle is approxiamted by segment bigger or equal + * to the real clearance value (usually near from 1.0) + */ + void TransformShapeWithClearanceToPolygon( + std::vector & aCornerBuffer, + int aClearanceValue, + int + aCircleToSegmentsCount, + double aCorrectionFactor ); #if defined(DEBUG) /** diff --git a/pcbnew/dialog_edit_module_for_BoardEditor_base.cpp b/pcbnew/dialog_edit_module_for_BoardEditor_base.cpp index 6f7945bb54..a9194d86ca 100644 --- a/pcbnew/dialog_edit_module_for_BoardEditor_base.cpp +++ b/pcbnew/dialog_edit_module_for_BoardEditor_base.cpp @@ -137,7 +137,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare sbSizerAutoplace->Add( bSizerMoveOpt, 1, wxEXPAND, 5 ); - m_PropRightSizer->Add( sbSizerAutoplace, 1, wxEXPAND, 5 ); + m_PropRightSizer->Add( sbSizerAutoplace, 1, wxEXPAND|wxALL, 5 ); wxStaticBoxSizer* sbSizerLocalProperties; sbSizerLocalProperties = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Masks clearances local values:") ), wxVERTICAL ); @@ -146,7 +146,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare m_staticTextInfo->Wrap( -1 ); m_staticTextInfo->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - sbSizerLocalProperties->Add( m_staticTextInfo, 0, wxALL|wxALIGN_RIGHT, 5 ); + sbSizerLocalProperties->Add( m_staticTextInfo, 0, wxALL, 5 ); wxFlexGridSizer* fgSizerClearances; fgSizerClearances = new wxFlexGridSizer( 3, 3, 0, 0 ); @@ -157,14 +157,14 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare m_staticTextNetClearance->Wrap( -1 ); m_staticTextNetClearance->SetToolTip( _("This is the local net clearance for all pad of this footprint\nIf 0, the Netclass values are used\nThis value can be superseded by a pad local value.") ); - fgSizerClearances->Add( m_staticTextNetClearance, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerClearances->Add( m_staticTextNetClearance, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_NetClearanceValueCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerClearances->Add( m_NetClearanceValueCtrl, 0, wxALL, 5 ); m_NetClearanceUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_NetClearanceUnits->Wrap( -1 ); - fgSizerClearances->Add( m_NetClearanceUnits, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerClearances->Add( m_NetClearanceUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); m_staticline1 = new wxStaticLine( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); fgSizerClearances->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); @@ -179,44 +179,44 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare m_MaskClearanceTitle->Wrap( -1 ); m_MaskClearanceTitle->SetToolTip( _("This is the local clearance between pads and the solder mask\nfor this footprint\nThis value can be superseded by a pad local value.\nIf 0, the global value is used") ); - fgSizerClearances->Add( m_MaskClearanceTitle, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerClearances->Add( m_MaskClearanceTitle, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); m_SolderMaskMarginCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerClearances->Add( m_SolderMaskMarginCtrl, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); m_SolderMaskMarginUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_SolderMaskMarginUnits->Wrap( -1 ); - fgSizerClearances->Add( m_SolderMaskMarginUnits, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerClearances->Add( m_SolderMaskMarginUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); m_staticTextSolderPaste = new wxStaticText( m_PanelProperties, wxID_ANY, _("Solder paste clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextSolderPaste->Wrap( -1 ); m_staticTextSolderPaste->SetToolTip( _("This is the local clearance between pads and the solder paste\nfor this footprint.\nThis value can be superseded by a pad local values.\nThe final clearance value is the sum of this value and the clearance value ratio\nA negative value means a smaller mask size than pad size") ); - fgSizerClearances->Add( m_staticTextSolderPaste, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerClearances->Add( m_staticTextSolderPaste, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); m_SolderPasteMarginCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerClearances->Add( m_SolderPasteMarginCtrl, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_SolderPasteMarginUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_SolderPasteMarginUnits->Wrap( -1 ); - fgSizerClearances->Add( m_SolderPasteMarginUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerClearances->Add( m_SolderPasteMarginUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); m_staticTextRatio = new wxStaticText( m_PanelProperties, wxID_ANY, _("Solder mask ratio clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRatio->Wrap( -1 ); - m_staticTextRatio->SetToolTip( _("This is the local clearance ratio in per cent between pads and the solder paste\nfor this footprint.\nA value of 10 means the clearance value is 10% of the pad size\nThis value can be superseded by a pad local value.\nThe final clearance value is the sum of this value and the clearance value\nA negative value means a smaller mask size than pad size.") ); + m_staticTextRatio->SetToolTip( _("This is the local clearance ratio in per cent between pads and the solder paste\nfor this footprint.\nA value of 10 means the clearance value is 10 per cent of the pad size\nThis value can be superseded by a pad local value.\nThe final clearance value is the sum of this value and the clearance value\nA negative value means a smaller mask size than pad size.") ); - fgSizerClearances->Add( m_staticTextRatio, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerClearances->Add( m_staticTextRatio, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); m_SolderPasteMarginRatioCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerClearances->Add( m_SolderPasteMarginRatioCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_SolderPasteRatioMarginUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 ); m_SolderPasteRatioMarginUnits->Wrap( -1 ); - fgSizerClearances->Add( m_SolderPasteRatioMarginUnits, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerClearances->Add( m_SolderPasteRatioMarginUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); sbSizerLocalProperties->Add( fgSizerClearances, 1, wxEXPAND, 5 ); - m_PropRightSizer->Add( sbSizerLocalProperties, 0, wxEXPAND, 5 ); + m_PropRightSizer->Add( sbSizerLocalProperties, 0, wxEXPAND|wxALL, 5 ); m_PanelPropertiesBoxSizer->Add( m_PropRightSizer, 0, 0, 5 ); diff --git a/pcbnew/dialog_edit_module_for_BoardEditor_base.fbp b/pcbnew/dialog_edit_module_for_BoardEditor_base.fbp index abf16fabe0..cc71fb4aab 100644 --- a/pcbnew/dialog_edit_module_for_BoardEditor_base.fbp +++ b/pcbnew/dialog_edit_module_for_BoardEditor_base.fbp @@ -32,7 +32,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE - 474,583 + 474,607 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER Module properties @@ -1109,7 +1109,7 @@ 5 - wxEXPAND + wxEXPAND|wxALL 1 wxID_ANY @@ -1391,7 +1391,7 @@ 5 - wxEXPAND + wxEXPAND|wxALL 0 wxID_ANY @@ -1403,7 +1403,7 @@ 5 - wxALL|wxALIGN_RIGHT + wxALL 0 @@ -1470,7 +1470,7 @@ 0 5 - wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL|wxLEFT 0 @@ -1576,7 +1576,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT 0 @@ -1774,7 +1774,7 @@ 5 - wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL + wxALL|wxALIGN_CENTER_VERTICAL 0 @@ -1880,7 +1880,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT 0 @@ -1931,7 +1931,7 @@ 5 - wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT 0 @@ -2037,7 +2037,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT 0 @@ -2088,7 +2088,7 @@ 5 - wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL + wxALL|wxALIGN_CENTER_VERTICAL 0 @@ -2107,7 +2107,7 @@ - This is the local clearance ratio in per cent between pads and the solder paste for this footprint. A value of 10 means the clearance value is 10% of the pad size This value can be superseded by a pad local value. The final clearance value is the sum of this value and the clearance value A negative value means a smaller mask size than pad size. + This is the local clearance ratio in per cent between pads and the solder paste for this footprint. A value of 10 means the clearance value is 10 per cent of the pad size This value can be superseded by a pad local value. The final clearance value is the sum of this value and the clearance value A negative value means a smaller mask size than pad size. @@ -2194,7 +2194,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT 0 diff --git a/pcbnew/dialog_edit_module_for_BoardEditor_base.h b/pcbnew/dialog_edit_module_for_BoardEditor_base.h index 5200e604e9..c39363a774 100644 --- a/pcbnew/dialog_edit_module_for_BoardEditor_base.h +++ b/pcbnew/dialog_edit_module_for_BoardEditor_base.h @@ -115,7 +115,7 @@ class DIALOG_MODULE_BOARD_EDITOR_BASE : public wxDialog public: wxStaticBoxSizer* m_Sizer3DValues; - DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Module properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 474,583 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Module properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 474,607 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_MODULE_BOARD_EDITOR_BASE(); }; diff --git a/pcbnew/dialog_edit_module_for_Modedit_base.cpp b/pcbnew/dialog_edit_module_for_Modedit_base.cpp index 26398d5613..3be23aee1c 100644 --- a/pcbnew/dialog_edit_module_for_Modedit_base.cpp +++ b/pcbnew/dialog_edit_module_for_Modedit_base.cpp @@ -108,7 +108,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa sbSizerAutoplace->Add( bSizerRot180, 1, 0, 5 ); - m_PropRightSizer->Add( sbSizerAutoplace, 1, wxEXPAND, 5 ); + m_PropRightSizer->Add( sbSizerAutoplace, 1, wxEXPAND|wxALL, 5 ); wxStaticBoxSizer* sbSizer8; sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Masks clearances local values:") ), wxVERTICAL ); @@ -117,7 +117,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_staticTextInfo->Wrap( -1 ); m_staticTextInfo->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - sbSizer8->Add( m_staticTextInfo, 0, wxALL|wxALIGN_RIGHT, 5 ); + sbSizer8->Add( m_staticTextInfo, 0, wxALL, 5 ); wxFlexGridSizer* fgSizer1; fgSizer1 = new wxFlexGridSizer( 3, 3, 0, 0 ); @@ -126,7 +126,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_staticTextNetClearance = new wxStaticText( m_PanelProperties, wxID_ANY, _("All pads nets clearance"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextNetClearance->Wrap( -1 ); - fgSizer1->Add( m_staticTextNetClearance, 0, wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); + fgSizer1->Add( m_staticTextNetClearance, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_NetClearanceValueCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_NetClearanceValueCtrl, 0, wxALL, 5 ); @@ -148,7 +148,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_MaskClearanceTitle->Wrap( -1 ); m_MaskClearanceTitle->SetToolTip( _("This is the local clearance between pads and the solder mask\nfor this footprint\nThis value can be superseded by a pad local value.\nIf 0, the global value is used") ); - fgSizer1->Add( m_MaskClearanceTitle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 5 ); + fgSizer1->Add( m_MaskClearanceTitle, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_SolderMaskMarginCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_SolderMaskMarginCtrl, 0, wxALL, 5 ); @@ -161,7 +161,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_staticTextSolderPaste->Wrap( -1 ); m_staticTextSolderPaste->SetToolTip( _("This is the local clearance between pads and the solder paste\nfor this footprint.\nThis value can be superseded by a pad local values.\nThe final clearance value is the sum of this value and the clearance value ratio\nA negative value means a smaller mask size than pad size") ); - fgSizer1->Add( m_staticTextSolderPaste, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizer1->Add( m_staticTextSolderPaste, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_SolderPasteMarginCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_SolderPasteMarginCtrl, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -172,9 +172,9 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_staticTextRatio = new wxStaticText( m_PanelProperties, wxID_ANY, _("Solder mask ratio clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRatio->Wrap( -1 ); - m_staticTextRatio->SetToolTip( _("This is the local clearance ratio in per cent between pads and the solder paste\nfor this footprint.\nA value of 10 means the clearance value is 10% of the pad size\nThis value can be superseded by a pad local value.\nThe final clearance value is the sum of this value and the clearance value\nA negative value means a smaller mask size than pad size.") ); + m_staticTextRatio->SetToolTip( _("This is the local clearance ratio in per cent between pads and the solder paste\nfor this footprint.\nA value of 10 means the clearance value is 10 per cent of the pad size\nThis value can be superseded by a pad local value.\nThe final clearance value is the sum of this value and the clearance value\nA negative value means a smaller mask size than pad size.") ); - fgSizer1->Add( m_staticTextRatio, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizer1->Add( m_staticTextRatio, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_SolderPasteMarginRatioCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_SolderPasteMarginRatioCtrl, 0, wxALL, 5 ); @@ -185,7 +185,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa sbSizer8->Add( fgSizer1, 1, wxEXPAND, 5 ); - m_PropRightSizer->Add( sbSizer8, 0, wxEXPAND, 5 ); + m_PropRightSizer->Add( sbSizer8, 0, wxEXPAND|wxALL, 5 ); m_PanelPropertiesBoxSizer->Add( m_PropRightSizer, 0, 0, 5 ); diff --git a/pcbnew/dialog_edit_module_for_Modedit_base.fbp b/pcbnew/dialog_edit_module_for_Modedit_base.fbp index 40bac28029..f71ee17bba 100644 --- a/pcbnew/dialog_edit_module_for_Modedit_base.fbp +++ b/pcbnew/dialog_edit_module_for_Modedit_base.fbp @@ -699,7 +699,7 @@ 5 - wxEXPAND + wxEXPAND|wxALL 1 wxID_ANY @@ -981,7 +981,7 @@ 5 - wxEXPAND + wxEXPAND|wxALL 0 wxID_ANY @@ -993,7 +993,7 @@ 5 - wxALL|wxALIGN_RIGHT + wxALL 0 @@ -1060,7 +1060,7 @@ 0 5 - wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT + wxLEFT|wxALIGN_CENTER_VERTICAL 0 @@ -1364,7 +1364,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxLEFT 0 @@ -1521,7 +1521,7 @@ 5 - wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL|wxLEFT 0 @@ -1678,7 +1678,7 @@ 5 - wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL|wxLEFT 0 @@ -1697,7 +1697,7 @@ - This is the local clearance ratio in per cent between pads and the solder paste for this footprint. A value of 10 means the clearance value is 10% of the pad size This value can be superseded by a pad local value. The final clearance value is the sum of this value and the clearance value A negative value means a smaller mask size than pad size. + This is the local clearance ratio in per cent between pads and the solder paste for this footprint. A value of 10 means the clearance value is 10 per cent of the pad size This value can be superseded by a pad local value. The final clearance value is the sum of this value and the clearance value A negative value means a smaller mask size than pad size. diff --git a/pcbnew/dialog_mask_clearance_base.cpp b/pcbnew/dialog_mask_clearance_base.cpp index 5384e4207d..b91c3072ee 100644 --- a/pcbnew/dialog_mask_clearance_base.cpp +++ b/pcbnew/dialog_mask_clearance_base.cpp @@ -41,42 +41,42 @@ DIALOG_PADS_MASK_CLEARANCE_BASE::DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* pare m_MaskClearanceTitle = new wxStaticText( this, wxID_ANY, _("Solder mask clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_MaskClearanceTitle->Wrap( -1 ); - fgGridSolderMaskSizer->Add( m_MaskClearanceTitle, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + m_MaskClearanceTitle->SetToolTip( _("This is the global clearance between pads and the solder mask\nThis value can be superseded by local values for a footprint or a pad.") ); - m_SolderMaskMarginCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_SolderMaskMarginCtrl->SetToolTip( _("This is the global clearance between pads and the solder mask\nThis value can be superseded by local values for a footprint or a pad.") ); + fgGridSolderMaskSizer->Add( m_MaskClearanceTitle, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); + m_SolderMaskMarginCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgGridSolderMaskSizer->Add( m_SolderMaskMarginCtrl, 0, wxEXPAND|wxALL, 5 ); m_SolderMaskMarginUnits = new wxStaticText( this, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_SolderMaskMarginUnits->Wrap( -1 ); - fgGridSolderMaskSizer->Add( m_SolderMaskMarginUnits, 0, wxALL, 5 ); + fgGridSolderMaskSizer->Add( m_SolderMaskMarginUnits, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); m_staticTextSolderPaste = new wxStaticText( this, wxID_ANY, _("Solder paste clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextSolderPaste->Wrap( -1 ); - fgGridSolderMaskSizer->Add( m_staticTextSolderPaste, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + m_staticTextSolderPaste->SetToolTip( _("This is the global clearance between pads and the solder paste\nThis value can be superseded by local values for a footprint or a pad.\nThe final clearance value is the sum of this value and the clearance value ratio") ); - m_SolderPasteMarginCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_SolderPasteMarginCtrl->SetToolTip( _("This is the global clearance between pads and the solder paste\nThis value can be superseded by local values for a footprint or a pad.\nThe final clearance value is the sum of this value and the clearance value ratio") ); + fgGridSolderMaskSizer->Add( m_staticTextSolderPaste, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); + m_SolderPasteMarginCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgGridSolderMaskSizer->Add( m_SolderPasteMarginCtrl, 0, wxALL, 5 ); m_SolderPasteMarginUnits = new wxStaticText( this, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_SolderPasteMarginUnits->Wrap( -1 ); - fgGridSolderMaskSizer->Add( m_SolderPasteMarginUnits, 0, wxALL, 5 ); + fgGridSolderMaskSizer->Add( m_SolderPasteMarginUnits, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); m_staticTextRatio = new wxStaticText( this, wxID_ANY, _("Solder mask ratio clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRatio->Wrap( -1 ); - fgGridSolderMaskSizer->Add( m_staticTextRatio, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + m_staticTextRatio->SetToolTip( _("This is the global clearance ratio in per cent between pads and the solder paste\nA value of 10 means the clearance value is 10 per cent of the pad size\nThis value can be superseded by local values for a footprint or a pad.\nThe final clearance value is the sum of this value and the clearance value") ); - m_SolderPasteMarginRatioCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_SolderPasteMarginRatioCtrl->SetToolTip( _("This is the global clearance ratio in per cent between pads and the solder paste\nA value of 10 means the clearance value is 10% of the pad size\nThis value can be superseded by local values for a footprint or a pad.\nThe final clearance value is the sum of this value and the clearance value") ); + fgGridSolderMaskSizer->Add( m_staticTextRatio, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); + m_SolderPasteMarginRatioCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgGridSolderMaskSizer->Add( m_SolderPasteMarginRatioCtrl, 0, wxALL, 5 ); m_SolderPasteRatioMarginUnits = new wxStaticText( this, wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 ); m_SolderPasteRatioMarginUnits->Wrap( -1 ); - fgGridSolderMaskSizer->Add( m_SolderPasteRatioMarginUnits, 0, wxALL, 5 ); + fgGridSolderMaskSizer->Add( m_SolderPasteRatioMarginUnits, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); sbMiddleRightSizer->Add( fgGridSolderMaskSizer, 1, wxEXPAND, 5 ); diff --git a/pcbnew/dialog_mask_clearance_base.fbp b/pcbnew/dialog_mask_clearance_base.fbp index 27ed15f354..ab21f15eff 100644 --- a/pcbnew/dialog_mask_clearance_base.fbp +++ b/pcbnew/dialog_mask_clearance_base.fbp @@ -214,7 +214,7 @@ 0 5 - wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT 0 @@ -233,7 +233,7 @@ - + This is the global clearance between pads and the solder mask This value can be superseded by local values for a footprint or a pad. @@ -284,7 +284,7 @@ - This is the global clearance between pads and the solder mask This value can be superseded by local values for a footprint or a pad. + @@ -320,7 +320,7 @@ 5 - wxALL + wxTOP|wxBOTTOM|wxRIGHT 0 @@ -371,7 +371,7 @@ 5 - wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT 0 @@ -390,7 +390,7 @@ - + This is the global clearance between pads and the solder paste This value can be superseded by local values for a footprint or a pad. The final clearance value is the sum of this value and the clearance value ratio @@ -441,7 +441,7 @@ - This is the global clearance between pads and the solder paste This value can be superseded by local values for a footprint or a pad. The final clearance value is the sum of this value and the clearance value ratio + @@ -477,7 +477,7 @@ 5 - wxALL + wxTOP|wxBOTTOM|wxRIGHT 0 @@ -528,7 +528,7 @@ 5 - wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT 0 @@ -547,7 +547,7 @@ - + This is the global clearance ratio in per cent between pads and the solder paste A value of 10 means the clearance value is 10 per cent of the pad size This value can be superseded by local values for a footprint or a pad. The final clearance value is the sum of this value and the clearance value @@ -598,7 +598,7 @@ - This is the global clearance ratio in per cent between pads and the solder paste A value of 10 means the clearance value is 10% of the pad size This value can be superseded by local values for a footprint or a pad. The final clearance value is the sum of this value and the clearance value + @@ -634,7 +634,7 @@ 5 - wxALL + wxTOP|wxBOTTOM|wxRIGHT 0 diff --git a/pcbnew/dialog_pad_properties_base.cpp b/pcbnew/dialog_pad_properties_base.cpp index 14326952ad..8131455b18 100644 --- a/pcbnew/dialog_pad_properties_base.cpp +++ b/pcbnew/dialog_pad_properties_base.cpp @@ -284,7 +284,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_staticTextRatio = new wxStaticText( this, wxID_ANY, _("Solder mask ratio clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRatio->Wrap( -1 ); - m_staticTextRatio->SetToolTip( _("This is the local clearance ratio in per cent between this pad and the solder paste.\nA value of 10 means the clearance value is 10% of the pad size\nIf 0 the footprint value or the global value is used..\nThe final clearance value is the sum of this value and the clearance value\nA negative value means a smaller mask size than pad size.") ); + m_staticTextRatio->SetToolTip( _("This is the local clearance ratio in per cent between this pad and the solder paste.\nA value of 10 means the clearance value is 10 per cent of the pad size\nIf 0 the footprint value or the global value is used..\nThe final clearance value is the sum of this value and the clearance value\nA negative value means a smaller mask size than pad size.") ); fgClearancesGridSizer->Add( m_staticTextRatio, 0, wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); diff --git a/pcbnew/dialog_pad_properties_base.fbp b/pcbnew/dialog_pad_properties_base.fbp index 7532f22f82..28ff7928cb 100644 --- a/pcbnew/dialog_pad_properties_base.fbp +++ b/pcbnew/dialog_pad_properties_base.fbp @@ -3231,7 +3231,7 @@ - This is the local clearance ratio in per cent between this pad and the solder paste. A value of 10 means the clearance value is 10% of the pad size If 0 the footprint value or the global value is used.. The final clearance value is the sum of this value and the clearance value A negative value means a smaller mask size than pad size. + This is the local clearance ratio in per cent between this pad and the solder paste. A value of 10 means the clearance value is 10 per cent of the pad size If 0 the footprint value or the global value is used.. The final clearance value is the sum of this value and the clearance value A negative value means a smaller mask size than pad size. diff --git a/pcbnew/tool_modedit.cpp b/pcbnew/tool_modedit.cpp index 9cdbda075f..a6084c82b1 100644 --- a/pcbnew/tool_modedit.cpp +++ b/pcbnew/tool_modedit.cpp @@ -200,7 +200,7 @@ void WinEDA_ModuleEditFrame::ReCreateOptToolbar() m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_GRID, wxEmptyString, wxBitmap( grid_xpm ), - _( "Display Grid OFF" ), wxITEM_CHECK ); + _( "Hide grid" ), wxITEM_CHECK ); m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_GRID, m_Draw_Grid ); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_POLAR_COORD, wxEmptyString, @@ -217,22 +217,22 @@ void WinEDA_ModuleEditFrame::ReCreateOptToolbar() m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_CURSOR, wxEmptyString, wxBitmap( cursor_shape_xpm ), - _( "Change Cursor Shape" ) ); + _( "Change Cursor Shape" ), wxITEM_CHECK ); m_OptionsToolBar->AddSeparator(); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_PADS_SKETCH, wxEmptyString, wxBitmap( pad_sketch_xpm ), - _( "Show Pads Sketch" ) ); + _( "Show Pads Sketch" ), wxITEM_CHECK ); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_MODULE_TEXT_SKETCH, wxEmptyString, wxBitmap( text_sketch_xpm ), - _( "Show Texts Sketch" ) ); + _( "Show Texts Sketch" ), wxITEM_CHECK ); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_MODULE_EDGE_SKETCH, wxEmptyString, wxBitmap( show_mod_edge_xpm ), - _( "Show Edges Sketch" ) ); + _( "Show Edges Sketch" ), wxITEM_CHECK ); m_OptionsToolBar->Realize(); diff --git a/pcbnew/tool_pcb.cpp b/pcbnew/tool_pcb.cpp index 2b3bf383c3..04a054c275 100644 --- a/pcbnew/tool_pcb.cpp +++ b/pcbnew/tool_pcb.cpp @@ -296,8 +296,6 @@ void WinEDA_PcbFrame::ReCreateHToolbar() // the changes m_HToolBar->Realize(); - - D( printf( "ReCreateHToolbar\n" ); ) SetToolbars(); } @@ -400,8 +398,6 @@ void WinEDA_PcbFrame::ReCreateOptToolbar() #endif m_OptionsToolBar->Realize(); - - D(printf("ReCreateOptToolbar\n");) SetToolbars(); } diff --git a/pcbnew/zones_convert_brd_items_to_polygons.cpp b/pcbnew/zones_convert_brd_items_to_polygons.cpp index 0864fb6ab6..5fff03eb23 100644 --- a/pcbnew/zones_convert_brd_items_to_polygons.cpp +++ b/pcbnew/zones_convert_brd_items_to_polygons.cpp @@ -254,6 +254,8 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb ) } } + have_poly_to_substract = false; + /* Add holes (i.e. tracks and pads areas as polygons outlines) * in GroupB in Bool_Engine * Next : Add tracks and vias @@ -274,15 +276,35 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb ) } } + static std::vector cornerBuffer; + cornerBuffer.clear(); + /* Add module edge items that are on copper layers + * Pcbnew allows these items to be on copper layers in microwvae applictions + * This is a bad thing, but must be handle here, until a better way is found + */ + for( MODULE* module = aPcb->m_Modules; module; module = module->Next() ) + { + for( BOARD_ITEM* item = module->m_Drawings; item; item = item->Next() ) + { + if( !item->IsOnLayer( GetLayer() ) ) + continue; + if( item->Type( ) != TYPE_EDGE_MODULE) + continue; + item_boundingbox = item->GetBoundingBox(); + if( item_boundingbox.Intersects( zone_boundingbox ) ) + { + (( EDGE_MODULE* )item)->TransformShapeWithClearanceToPolygon( + cornerBuffer, m_ZoneClearance, + s_CircleToSegmentsCount, s_Correction ); + } + } + } // Add graphic items (copper texts) and board edges for( BOARD_ITEM* item = aPcb->m_Drawings; item; item = item->Next() ) { if( item->GetLayer() != GetLayer() && item->GetLayer() != EDGE_N ) continue; - static std::vector cornerBuffer; - cornerBuffer.clear(); - switch( item->Type() ) { case TYPE_DRAWSEGMENT: @@ -306,40 +328,38 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb ) break; } - if( cornerBuffer.size() == 0 ) - continue; + } - // cornerBuffer can contain more than one polygon, - // so read cornerBuffer and verify if there is a end of polygon corner: - for( unsigned icnt = 0; icnt < cornerBuffer.size(); ) + // cornerBuffer contains more than one polygon, + // so read cornerBuffer and verify if there is a end of polygon corner: + for( unsigned icnt = 0; icnt < cornerBuffer.size(); ) + { + booleng->StartPolygonAdd( GROUP_B ); { - booleng->StartPolygonAdd( GROUP_B ); + have_poly_to_substract = true; + unsigned ii; + for( ii = icnt; ii < cornerBuffer.size(); ii++ ) { - have_poly_to_substract = true; - unsigned ii; - for( ii = icnt; ii < cornerBuffer.size(); ii++ ) - { - booleng->AddPoint( cornerBuffer[ii].x, cornerBuffer[ii].y ); - if( cornerBuffer[ii].end_contour ) - break; - } + booleng->AddPoint( cornerBuffer[ii].x, cornerBuffer[ii].y ); + if( cornerBuffer[ii].end_contour ) + break; + } - booleng->EndPolygonAdd(); + booleng->EndPolygonAdd(); - #ifdef CREATE_KBOOL_KEY_FILES_FIRST_PASS - StartKeyFilePolygon( 1 ); - for( ii = icnt; ii < cornerBuffer.size(); ii++ ) - { - AddKeyFilePointXY( cornerBuffer[ii].x, cornerBuffer[ii].y ); - if( cornerBuffer[ii].end_contour ) - break; - } + #ifdef CREATE_KBOOL_KEY_FILES_FIRST_PASS + StartKeyFilePolygon( 1 ); + for( ii = icnt; ii < cornerBuffer.size(); ii++ ) + { + AddKeyFilePointXY( cornerBuffer[ii].x, cornerBuffer[ii].y ); + if( cornerBuffer[ii].end_contour ) + break; + } - EndKeyFilePolygon(); - #endif + EndKeyFilePolygon(); + #endif - icnt = ii + 1; - } + icnt = ii + 1; } }