Merged kicad-gal

.bzrignore

-include/boost
+boost_root
 .downloads-by-cmake
 common/netlist_keywords.*
 common/netlist_lexer.h

3d-viewer/CMakeLists.txt

@@ -2,7 +2,6 @@ add_definitions(-DPCBNEW)
 
 include_directories(BEFORE ${INC_BEFORE})
 include_directories(
-    ${Boost_INCLUDE_DIR}
     ../pcbnew
     ../polygon
     ${INC_AFTER}

CMakeModules/CMakeFindFrameworks.cmake

+# - helper module to find OSX frameworks
+
+#=============================================================================
+# Copyright 2003-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+if(NOT CMAKE_FIND_FRAMEWORKS_INCLUDED)
+  set(CMAKE_FIND_FRAMEWORKS_INCLUDED 1)
+  macro(CMAKE_FIND_FRAMEWORKS fwk)
+    set(${fwk}_FRAMEWORKS)
+    if(APPLE)
+      foreach(dir
+          ~/Library/Frameworks/${fwk}.framework
+          /Library/Frameworks/${fwk}.framework
+          /System/Library/Frameworks/${fwk}.framework
+          /Network/Library/Frameworks/${fwk}.framework)
+        if(EXISTS ${dir})
+          set(${fwk}_FRAMEWORKS ${${fwk}_FRAMEWORKS} ${dir})
+        endif()
+      endforeach()
+    endif()
+  endmacro()
+endif()

CMakeModules/FindGLEW.cmake

@@ -42,12 +42,16 @@ ELSE (WIN32)
 
   IF (APPLE)
 # These values for Apple could probably do with improvement.
-    FIND_PATH( GLEW_INCLUDE_DIR glew.h
+    FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h
       /System/Library/Frameworks/GLEW.framework/Versions/A/Headers
+      /opt/local/include
       ${OPENGL_LIBRARY_DIR}
     )
-    SET(GLEW_GLEW_LIBRARY "-framework GLEW" CACHE STRING "GLEW library for OSX")
-    SET(GLEW_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX")
+
+    FIND_LIBRARY( GLEW_GLEW_LIBRARY GLEW
+      /opt/local/lib
+    )
+
   ELSE (APPLE)
 
     FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h

CMakeModules/FindPythonInterp.cmake

+# - Find python interpreter
+# This module finds if Python interpreter is installed and determines where the
+# executables are. This code sets the following variables:
+#
+#  PYTHONINTERP_FOUND         - Was the Python executable found
+#  PYTHON_EXECUTABLE          - path to the Python interpreter
+#
+#  PYTHON_VERSION_STRING      - Python version found e.g. 2.5.2
+#  PYTHON_VERSION_MAJOR       - Python major version found e.g. 2
+#  PYTHON_VERSION_MINOR       - Python minor version found e.g. 5
+#  PYTHON_VERSION_PATCH       - Python patch version found e.g. 2
+#
+# The Python_ADDITIONAL_VERSIONS variable can be used to specify a list of
+# version numbers that should be taken into account when searching for Python.
+# You need to set this variable before calling find_package(PythonInterp).
+#
+# You can point to a preferred python install to use by setting the following
+# to the point at the root directory of the python install:
+#
+#  PYTHON_ROOT_DIR            - The root directory of the python install
+#=============================================================================
+# Copyright 2005-2010 Kitware, Inc.
+# Copyright 2011 Bjoern Ricks <bjoern.ricks@gmail.com>
+# Copyright 2012 Rolf Eike Beer <eike@sf-mail.de>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+unset(_Python_NAMES)
+
+set(_PYTHON1_VERSIONS 1.6 1.5)
+set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
+set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
+
+if(PythonInterp_FIND_VERSION)
+    if(PythonInterp_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$")
+        string(REGEX REPLACE "^([0-9]+\\.[0-9]+).*" "\\1" _PYTHON_FIND_MAJ_MIN "${PythonInterp_FIND_VERSION}")
+        string(REGEX REPLACE "^([0-9]+).*" "\\1" _PYTHON_FIND_MAJ "${_PYTHON_FIND_MAJ_MIN}")
+        list(APPEND _Python_NAMES python${_PYTHON_FIND_MAJ_MIN} python${_PYTHON_FIND_MAJ})
+        unset(_PYTHON_FIND_OTHER_VERSIONS)
+        if(NOT PythonInterp_FIND_VERSION_EXACT)
+            foreach(_PYTHON_V ${_PYTHON${_PYTHON_FIND_MAJ}_VERSIONS})
+                if(NOT _PYTHON_V VERSION_LESS _PYTHON_FIND_MAJ_MIN)
+                    list(APPEND _PYTHON_FIND_OTHER_VERSIONS ${_PYTHON_V})
+                endif()
+             endforeach()
+        endif()
+        unset(_PYTHON_FIND_MAJ_MIN)
+        unset(_PYTHON_FIND_MAJ)
+    else()
+        list(APPEND _Python_NAMES python${PythonInterp_FIND_VERSION})
+        set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON${PythonInterp_FIND_VERSION}_VERSIONS})
+    endif()
+else()
+    set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
+endif()
+
+list(APPEND _Python_NAMES python)
+
+# Search for the preferred executable first
+if( ${PYTHON_ROOT_DIR} )
+    # Search for any of the executable names solely in the directory we've
+    # been pointed to. Failure to find the python executable here is a fatal
+    # fail.
+    find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES}
+        PATHS ${PYTHON_ROOT_DIR}
+        NO_DEFAULT_PATH )
+else()
+    # If there is no specific path given, look for python in the path
+    find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
+endif()
+
+# Set up the versions we know about, in the order we will search. Always add
+# the user supplied additional versions to the front.
+set(_Python_VERSIONS
+  ${Python_ADDITIONAL_VERSIONS}
+  ${_PYTHON_FIND_OTHER_VERSIONS}
+  )
+
+unset(_PYTHON_FIND_OTHER_VERSIONS)
+unset(_PYTHON1_VERSIONS)
+unset(_PYTHON2_VERSIONS)
+unset(_PYTHON3_VERSIONS)
+
+# Search for newest python version if python executable isn't found
+if(NOT PYTHON_EXECUTABLE)
+    
+    # If using the MINGW compiler, we mustn't find the standard python
+    # distribution because of multiple C-Runtime errors. We must instead
+    # use the Python-a-mingw-us distribution
+    if(MINGW)
+        list( APPEND _Python_PPATHS ${PYTHON_ROOT_DIR} )
+        list( APPEND _Python_PPATHS "C:/python/${_CURRENT_VERSION}.9" )
+        list( APPEND _Python_PPATHS "C:/python/${_CURRENT_VERSION}.8" )
+        list( APPEND _Python_PPATHS "C:/python/${_CURRENT_VERSION}.7" )
+        list( APPEND _Python_PPATHS "C:/python/${_CURRENT_VERSION}.6" )
+        list( APPEND _Python_PPATHS "C:/python/${_CURRENT_VERSION}.5" )
+        list( APPEND _Python_PPATHS "C:/python/${_CURRENT_VERSION}.4" )
+        list( APPEND _Python_PPATHS "C:/python/${_CURRENT_VERSION}.3" )
+        list( APPEND _Python_PPATHS "C:/python/${_CURRENT_VERSION}.2" )
+        list( APPEND _Python_PPATHS "C:/python/${_CURRENT_VERSION}.1" )
+        list( APPEND _Python_PPATHS "C:/python/${_CURRENT_VERSION}.0" )
+    else()
+        list( APPEND _Python_PPATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath] )
+    endif()
+    
+    foreach(_CURRENT_VERSION ${_Python_VERSIONS})
+      set(_Python_NAMES python${_CURRENT_VERSION})
+      if(WIN32)
+        list(APPEND _Python_NAMES python)
+      endif()
+      find_program(PYTHON_EXECUTABLE
+        NAMES ${_Python_NAMES}
+        PATHS ${_Python_PPATHS}
+        )
+    endforeach()
+endif()
+
+# determine python version string
+if(PYTHON_EXECUTABLE)
+    execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c
+                            "import sys; sys.stdout.write(';'.join([str(x) for x in sys.version_info[:3]]))"
+                    OUTPUT_VARIABLE _VERSION
+                    RESULT_VARIABLE _PYTHON_VERSION_RESULT
+                    ERROR_QUIET)
+    if(NOT _PYTHON_VERSION_RESULT)
+        string(REPLACE ";" "." PYTHON_VERSION_STRING "${_VERSION}")
+        list(GET _VERSION 0 PYTHON_VERSION_MAJOR)
+        list(GET _VERSION 1 PYTHON_VERSION_MINOR)
+        list(GET _VERSION 2 PYTHON_VERSION_PATCH)
+        if(PYTHON_VERSION_PATCH EQUAL 0)
+            # it's called "Python 2.7", not "2.7.0"
+            string(REGEX REPLACE "\\.0$" "" PYTHON_VERSION_STRING "${PYTHON_VERSION_STRING}")
+        endif()
+    else()
+        # sys.version predates sys.version_info, so use that
+        execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write(sys.version)"
+                        OUTPUT_VARIABLE _VERSION
+                        RESULT_VARIABLE _PYTHON_VERSION_RESULT
+                        ERROR_QUIET)
+        if(NOT _PYTHON_VERSION_RESULT)
+            string(REGEX REPLACE " .*" "" PYTHON_VERSION_STRING "${_VERSION}")
+            string(REGEX REPLACE "^([0-9]+)\\.[0-9]+.*" "\\1" PYTHON_VERSION_MAJOR "${PYTHON_VERSION_STRING}")
+            string(REGEX REPLACE "^[0-9]+\\.([0-9])+.*" "\\1" PYTHON_VERSION_MINOR "${PYTHON_VERSION_STRING}")
+            if(PYTHON_VERSION_STRING MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+.*")
+                string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" PYTHON_VERSION_PATCH "${PYTHON_VERSION_STRING}")
+            else()
+                set(PYTHON_VERSION_PATCH "0")
+            endif()
+        else()
+            # sys.version was first documented for Python 1.5, so assume
+            # this is older.
+            set(PYTHON_VERSION_STRING "1.4")
+            set(PYTHON_VERSION_MAJOR "1")
+            set(PYTHON_VERSION_MAJOR "4")
+            set(PYTHON_VERSION_MAJOR "0")
+        endif()
+    endif()
+    unset(_PYTHON_VERSION_RESULT)
+    unset(_VERSION)
+endif()
+
+# handle the QUIETLY and REQUIRED arguments and set PYTHONINTERP_FOUND to TRUE if
+# all listed variables are TRUE
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonInterp REQUIRED_VARS PYTHON_EXECUTABLE VERSION_VAR PYTHON_VERSION_STRING)
+
+mark_as_advanced(PYTHON_EXECUTABLE)

CMakeModules/PerformFeatureChecks.cmake

@@ -56,6 +56,18 @@ macro(perform_feature_checks)
     #        mean won't fail somewhere down the line.
     check_include_file("iso646.h" HAVE_ISO646_H)
 
+    # The STDINT header file test is required because MinGW under Windows
+    # doesn't define HAVE_STDINT_H even though it does have it.
+    #
+    # We need to add it to the global compiler definitions as config.h is not
+    # included in pyport.h which is where the problem ocurrs without this
+    # fix.
+    check_include_file("stdint.h" HAVE_STDINT_H)
+    
+    if( HAVE_STDINT_H )
+        add_definitions( -DHAVE_STDINT_H )
+    endif()
+    
     # no place is this used, and "HAVE_STRINGS_H", if present in config.h then
     # conflicts with /usr/include/python2.6/Python.h.  Please rename the macro if
     # re-introduce this.

CMakeModules/SelectLibraryConfigurations.cmake

+# select_library_configurations( basename )
+#
+# This macro takes a library base name as an argument, and will choose good
+# values for basename_LIBRARY, basename_LIBRARIES, basename_LIBRARY_DEBUG, and
+# basename_LIBRARY_RELEASE depending on what has been found and set.  If only
+# basename_LIBRARY_RELEASE is defined, basename_LIBRARY, basename_LIBRARY_DEBUG,
+# and basename_LIBRARY_RELEASE will be set to the release value.  If only
+# basename_LIBRARY_DEBUG is defined, then basename_LIBRARY,
+# basename_LIBRARY_DEBUG and basename_LIBRARY_RELEASE will take the debug value.
+#
+# If the generator supports configuration types, then basename_LIBRARY and
+# basename_LIBRARIES will be set with debug and optimized flags specifying the
+# library to be used for the given configuration.  If no build type has been set
+# or the generator in use does not support configuration types, then
+# basename_LIBRARY and basename_LIBRARIES will take only the release values.
+
+#=============================================================================
+# Copyright 2009 Will Dicharry <wdicharry@stellarscience.com>
+# Copyright 2005-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# This macro was adapted from the FindQt4 CMake module and is maintained by Will
+# Dicharry <wdicharry@stellarscience.com>.
+
+# Utility macro to check if one variable exists while another doesn't, and set
+# one that doesn't exist to the one that exists.
+macro( _set_library_name basename GOOD BAD )
+    if( ${basename}_LIBRARY_${GOOD} AND NOT ${basename}_LIBRARY_${BAD} )
+        set( ${basename}_LIBRARY_${BAD} ${${basename}_LIBRARY_${GOOD}} )
+        set( ${basename}_LIBRARY ${${basename}_LIBRARY_${GOOD}} )
+        set( ${basename}_LIBRARIES ${${basename}_LIBRARY_${GOOD}} )
+    endif()
+endmacro()
+
+macro( select_library_configurations basename )
+    # if only the release version was found, set the debug to be the release
+    # version.
+    _set_library_name( ${basename} RELEASE DEBUG )
+    # if only the debug version was found, set the release value to be the
+    # debug value.
+    _set_library_name( ${basename} DEBUG RELEASE )
+
+    # Set a default case, which will come into effect if
+    # -no build type is set and the generator only supports one build type
+    #  at a time (i.e. CMAKE_CONFIGURATION_TYPES is false)
+    # -${basename}_LIBRARY_DEBUG and ${basename}_LIBRARY_RELEASE are the same
+    # -${basename}_LIBRARY_DEBUG and ${basename}_LIBRARY_RELEASE are both empty
+    set( ${basename}_LIBRARY ${${basename}_LIBRARY_RELEASE} )
+    set( ${basename}_LIBRARIES ${${basename}_LIBRARY_RELEASE} )
+
+    if( ${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE AND
+           NOT ${basename}_LIBRARY_DEBUG STREQUAL ${basename}_LIBRARY_RELEASE )
+        # if the generator supports configuration types or CMAKE_BUILD_TYPE
+        # is set, then set optimized and debug options.
+        if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
+            set( ${basename}_LIBRARY "" )
+            foreach( _libname IN LISTS ${basename}_LIBRARY_RELEASE )
+                list( APPEND ${basename}_LIBRARY optimized "${_libname}" )
+            endforeach()
+            foreach( _libname IN LISTS ${basename}_LIBRARY_DEBUG )
+                list( APPEND ${basename}_LIBRARY debug "${_libname}" )
+            endforeach()
+            set( ${basename}_LIBRARIES "${${basename}_LIBRARY}" )
+        endif()
+    endif()
+
+    set( ${basename}_LIBRARY ${${basename}_LIBRARY} CACHE FILEPATH
+        "The ${basename} library" )
+
+    if( ${basename}_LIBRARY )
+        set( ${basename}_FOUND TRUE )
+    endif()
+
+    mark_as_advanced( ${basename}_LIBRARY
+        ${basename}_LIBRARY_RELEASE
+        ${basename}_LIBRARY_DEBUG
+    )
+endmacro()

CMakeModules/config.h.cmake

@@ -75,17 +75,14 @@
 
 #cmakedefine USE_IMAGES_IN_MENUS 1
 
-/// Definitions to enable the s-expression file formats and nanometer units.
-#cmakedefine USE_PCBNEW_NANOMETRES
-
 /// The legacy file format revision of the *.brd file created by this build
-#if defined(USE_PCBNEW_NANOMETRES)
 #define LEGACY_BOARD_FILE_VERSION 2
-#else
-#define LEGACY_BOARD_FILE_VERSION          1
-#endif
 
 /// Definition to compile with Pcbnew footprint library table implementation.
 #cmakedefine USE_FP_LIB_TABLE
 
+/// When defined, build the GITHUB_PLUGIN for pcbnew.
+#cmakedefine BUILD_GITHUB_PLUGIN
+
+
 #endif  // CONFIG_H_

CMakeModules/download_boost.cmake

@@ -22,11 +22,43 @@
 
 
 
-# Download and patch boost headers to a particular version.
-# Assumes include( ExternalProject ) was done inline previous to this file.
+# Download a particular boost version, and patch it [and build it if BUILD_GITHUB_PLUGIN].
+# Assumes include( ExternalProject ) was done inline previous to this file
+# and that set( DOWNLOAD_DIR ... ) was set in a higher context.
+
+
+#-----<configure>----------------------------------------------------------------
+
+if( false )
+    set( BOOST_RELEASE 1.53.0 )
+    set( BOOST_MD5 a00d22605d5dbcfb4c9936a9b35bc4c2 )   # re-calc this on every RELEASE change
+else()
+    set( BOOST_RELEASE 1.54.0 )
+    set( BOOST_MD5 15cb8c0803064faef0c4ddf5bc5ca279 )   # re-calc this on every RELEASE change
+endif()
+
+# The boost headers [and static libs if built] go here, at the top of KiCad
+# source tree in boost_root.
+set( BOOST_ROOT "${PROJECT_SOURCE_DIR}/boost_root" )
+
+
+if( BUILD_GITHUB_PLUGIN )
+    # Space separated list which indicates the subset of boost libraries to compile.
+    set( BOOST_LIBS_BUILT
+        #filesystem
+        system
+        #regex
+        #program_options
+        #date_time
+        #thread
+        #exception
+        unit_test_framework
+        )
+endif()
+
+#-----</configure>---------------------------------------------------------------
+
 
-set( BOOST_RELEASE 1.53.0 )
-set( BOOST_MD5 a00d22605d5dbcfb4c9936a9b35bc4c2 ) # re-calc this on every RELEASE change
 
 string( REGEX REPLACE "\\." "_" BOOST_VERS "${BOOST_RELEASE}" )
 set( PREFIX ${DOWNLOAD_DIR}/boost_${BOOST_VERS} )
@@ -36,27 +68,102 @@ set( PREFIX ${DOWNLOAD_DIR}/boost_${BOOST_VERS} )
 # download, the patch is applied.  This lets you regenerate a new patch at any time
 # easily, simply by editing the working tree in <SOURCE_DIR> and doing "bzr diff" in there.
 
-# include only the headers in the repo.
-# repo = "${headers}/../.bzr" = "<SOURCE_DIR>/.bzr"
-set( headers ${PREFIX}/src/boost/boost )
+# path to the boost headers in the repo.
+# repo = "${headers_src}/../.bzr" = "<SOURCE_DIR>/.bzr"
+set( headers_src "${PREFIX}/src/boost/boost" )
+
+
+# don't look at this:
+function( set_boost_lib_names libs output )
+    foreach( lib ${libs} )
+        set( fullpath_lib, "${BOOST_ROOT}/lib/libboost_${lib}.a" )
+        message( STATUS "fullpath_lib:${fullpath_lib}" )
+        set( output ${output} ${fullpath_lib} )
+    endforeach()
+endfunction()
+
+
+if( BUILD_GITHUB_PLUGIN )
+
+    # (BTW "test" yields "unit_test_framework" when passed to bootstrap.{sh,bat} ).
+    message( STATUS "BOOST_LIBS_BUILT:${BOOST_LIBS_BUILT}" )
+    string( REPLACE "unit_test_framework" "test" libs_csv "${BOOST_LIBS_BUILT}" )
+    message( STATUS "REPLACE libs_csv:${libs_csv}" )
+
+    string( REGEX REPLACE "\\;" "," libs_csv "${libs_csv}" )
+    message( STATUS "libs_csv:${libs_csv}" )
+
+    if( MINGW )
+        set( bootstrap "bootstart.bat mingw" )
+    else()
+        set( bootstrap bootstrap.sh )
+    endif()
+
+    ExternalProject_Add( boost
+        PREFIX          "${PREFIX}"
+        DOWNLOAD_DIR    "${DOWNLOAD_DIR}"
+        URL             http://downloads.sourceforge.net/project/boost/boost/${BOOST_RELEASE}/boost_${BOOST_VERS}.tar.bz2
+        URL_MD5         ${BOOST_MD5}
+
+        # The patch command executes with the working directory set to <SOURCE_DIR>
+        PATCH_COMMAND   bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/boost.patch"
+
+        # [Mis-]use this step to erase all the boost headers and libraries before
+        # replacing them below.
+        UPDATE_COMMAND  ${CMAKE_COMMAND} -E remove_directory "${BOOST_ROOT}"
+
+        BINARY_DIR      "${PREFIX}/src/boost/"
+        CONFIGURE_COMMAND ${bootstrap}
+                        --with-libraries=${libs_csv}
+
+        BUILD_COMMAND   b2
+                        variant=release
+                        threading=multi
+                        toolset=gcc
+                        link=static
+                        --prefix=${BOOST_ROOT}
+                        install
+
+        INSTALL_COMMAND ""
+        )
+
+    file( GLOB boost_libs "${BOOST_ROOT}/lib/*" )
+    #message( STATUS BOOST_ROOT:${BOOST_ROOT}  boost_libs:${boost_libs} )
+    set( Boost_LIBRARIES    ${boost_libs}           CACHE FILEPATH "Boost libraries directory" )
+    set( Boost_INCLUDE_DIR  "${BOOST_ROOT}/include" CACHE FILEPATH "Boost include directory" )
 
 
-ExternalProject_Add( boost
-    PREFIX          ${PREFIX}
-    DOWNLOAD_DIR    ${DOWNLOAD_DIR}
+else( BUILD_GITHUB_PLUGIN )
+
+
+    ExternalProject_Add( boost
+        PREFIX          "${PREFIX}"
+        DOWNLOAD_DIR    "${DOWNLOAD_DIR}"
         URL             http://downloads.sourceforge.net/project/boost/boost/${BOOST_RELEASE}/boost_${BOOST_VERS}.tar.bz2
         URL_MD5         ${BOOST_MD5}
 
         # The patch command executes with the working directory set to <SOURCE_DIR>
-    PATCH_COMMAND   bzr patch -p0 ${PROJECT_SOURCE_DIR}/patches/boost.patch
+        PATCH_COMMAND   bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/boost.patch"
+
+        # Dick 18-Aug-2013:
+        # [mis-]use this UPDATE_COMMAND opportunity to remove the old place of boost headers.
+        # Can eventually remove this step after headers are moved from <kicad_src>/include/boost
+        # to <kicad_src>/boost_root/include/boost over the next several months.
+        UPDATE_COMMAND  ${CMAKE_COMMAND} -E remove_directory "${PROJECT_SOURCE_DIR}/include/boost"
 
         CONFIGURE_COMMAND ""
 
         # remove then re-copy into the include/boost directory during next two steps:
-    BUILD_COMMAND   ${CMAKE_COMMAND} -E remove_directory ${PROJECT_SOURCE_DIR}/include/boost
-    INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${headers} ${PROJECT_SOURCE_DIR}/include/boost
+        BUILD_COMMAND   ${CMAKE_COMMAND} -E remove_directory ${BOOST_ROOT}
+        INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory "${headers_src}" "${BOOST_ROOT}/include/boost"
         )
 
+    # Until my find_package() support is done for my boost.
+    set( Boost_INCLUDE_DIR  "${BOOST_ROOT}/include" CACHE FILEPATH "Boost include directory" )
+
+
+endif( BUILD_GITHUB_PLUGIN )
+
 
 ExternalProject_Add_Step( boost bzr_commit_boost
     COMMAND bzr ci -q -m pristine <SOURCE_DIR>
@@ -66,8 +173,8 @@ ExternalProject_Add_Step( boost bzr_commit_boost
 
 
 ExternalProject_Add_Step( boost bzr_add_boost
-    # add only the headers to the scratch repo, repo = "../.bzr" from ${headers}
-    COMMAND bzr add -q ${headers}
+    # add only the headers to the scratch repo, repo = "../.bzr" from ${headers_src}
+    COMMAND bzr add -q ${headers_src}
     COMMENT "adding pristine boost files to 'boost scratch repo'"
     DEPENDERS bzr_commit_boost
     )
@@ -79,3 +186,4 @@ ExternalProject_Add_Step( boost bzr_init_boost
     DEPENDERS bzr_add_boost
     DEPENDEES download
     )
+

Documentation/compiling/build-config.txt

@@ -111,10 +111,6 @@ This option is used to enable or disable building KiCad with images in menu
 items.  If this is not defined when CMake is used to create the build files,
 images will be included in menu items on all platforms except OSX.
 
-USE_PCBNEW_NANOMETRES (ON/OFF)
-This option is used to enable or disable the nano-meter internal units for
-Pcbnew.  The default is ON.
-
 KICAD_GOST (ON/OFF)
 -------------------
 This option is used to enable or disable the GOST notation for multiple gates

HOW_TO_CONTRIBUTE.txt

@@ -25,10 +25,10 @@ Contribute to KiCad (under Linux)
 6) Compile:
     cd kicad_john
     mkdir build; cd build
-    cmake ../ -DKICAD_TESTING_VERSION=ON -DCMAKE_BUILD_TYPE=Debug
+    cmake ../ -DCMAKE_BUILD_TYPE=Debug
     to build a debug version
     or
-    cmake ../ -DKICAD_TESTING_VERSION=ON -DCMAKE_BUILD_TYPE=Release
+    cmake ../ -DCMAKE_BUILD_TYPE=Release
     to build a release version
     make
 

common/CMakeLists.txt

@@ -3,8 +3,8 @@ include_directories(BEFORE ${INC_BEFORE})
 include_directories(
     ./dialogs
     ./dialog_about
-    ${Boost_INCLUDE_DIR}
     ${CAIRO_INCLUDE_DIR}
+    ${GLEW_INCLUDE_DIR}
     ../3d-viewer
     ../pcbnew
     ../polygon
@@ -57,9 +57,10 @@ set(GAL_SRCS
 add_library(gal STATIC ${GAL_SRCS})
 add_dependencies(gal shader_headers)
 
-if(WIN32)
+# Only for win32 cross compilation using MXE
+if(WIN32 AND MSYS)
 add_definitions(-DGLEW_STATIC)
-endif(WIN32)
+endif(WIN32 AND MSYS)
 
 set(COMMON_ABOUT_DLG_SRCS
     dialog_about/AboutDialog_main.cpp

common/base_screen.cpp

@@ -288,8 +288,8 @@ GRID_TYPE& BASE_SCREEN::GetGrid( size_t aIndex )
 }
 
 
-wxPoint BASE_SCREEN::GetNearestGridPosition( const wxPoint& aPosition,
-                                             wxRealPoint* aGridSize ) const
+wxPoint BASE_SCREEN::getNearestGridPosition( const wxPoint& aPosition,
+    const wxPoint& aGridOrigin, wxRealPoint* aGridSize ) const
 {
     wxPoint     pt;
     wxRealPoint gridSize;
@@ -299,13 +299,13 @@ wxPoint BASE_SCREEN::GetNearestGridPosition( const wxPoint& aPosition,
     else
         gridSize = GetGridSize();
 
-    wxPoint gridOrigin = m_GridOrigin;
-
-    double offset = fmod( gridOrigin.x, gridSize.x );
+    double  offset = fmod( aGridOrigin.x, gridSize.x );
     int x = KiROUND( (aPosition.x - offset) / gridSize.x );
+
     pt.x = KiROUND( x * gridSize.x + offset );
 
-    offset = fmod( gridOrigin.y, gridSize.y );
+    offset = fmod( aGridOrigin.y, gridSize.y );
+
     int y = KiROUND( (aPosition.y - offset) / gridSize.y );
     pt.y = KiROUND ( y * gridSize.y + offset );
 
@@ -313,16 +313,16 @@ wxPoint BASE_SCREEN::GetNearestGridPosition( const wxPoint& aPosition,
 }
 
 
-wxPoint BASE_SCREEN::GetCursorPosition( bool aOnGrid, wxRealPoint* aGridSize ) const
+wxPoint BASE_SCREEN::getCursorPosition( bool aOnGrid, const wxPoint& aGridOrigin, wxRealPoint* aGridSize ) const
 {
     if( aOnGrid )
-        return GetNearestGridPosition( m_crossHairPosition, aGridSize );
+        return getNearestGridPosition( m_crossHairPosition, aGridOrigin, aGridSize );
 
     return m_crossHairPosition;
 }
 
 
-wxPoint BASE_SCREEN::GetCrossHairScreenPosition() const
+wxPoint BASE_SCREEN::getCrossHairScreenPosition() const
 {
     wxPoint pos = m_crossHairPosition - m_DrawOrg;
     double  scalar = GetScalingFactor();
@@ -334,10 +334,10 @@ wxPoint BASE_SCREEN::GetCrossHairScreenPosition() const
 }
 
 
-void BASE_SCREEN::SetCrossHairPosition( const wxPoint& aPosition, bool aSnapToGrid )
+void BASE_SCREEN::setCrossHairPosition( const wxPoint& aPosition, const wxPoint& aGridOrigin, bool aSnapToGrid )
 {
     if( aSnapToGrid )
-        m_crossHairPosition = GetNearestGridPosition( aPosition );
+        m_crossHairPosition = getNearestGridPosition( aPosition, aGridOrigin, NULL );
     else
         m_crossHairPosition = aPosition;
 }

common/base_units.cpp

@@ -34,6 +34,7 @@
  *       depending on the application.
  */
 
+#include <macros.h>
 #include <base_struct.h>
 #include <class_title_block.h>
 #include <common.h>
@@ -187,7 +188,7 @@ void StripTrailingZeros( wxString& aStringValue, unsigned aTrailingZeroAllowed )
 
 
 /* Convert a value to a string using double notation.
- * For readability, the mantissa has 3 or more digits (max 8 digits),
+ * For readability, the mantissa has 3 or more digits,
  * the trailing 0 are removed if the mantissa has more than 3 digits
  * and some trailing 0
  * This function should be used to display values in dialogs because a value
@@ -198,23 +199,39 @@ void StripTrailingZeros( wxString& aStringValue, unsigned aTrailingZeroAllowed )
  */
 wxString ReturnStringFromValue( EDA_UNITS_T aUnit, int aValue, bool aAddUnitSymbol )
 {
-    wxString stringValue;
-    double   value_to_print;
-
-    value_to_print = To_User_Unit( aUnit, aValue );
+    double  value_to_print = To_User_Unit( aUnit, aValue );
 
 #if defined( EESCHEMA )
-    stringValue.Printf( wxT( "%.3f" ), value_to_print );
-#else
- #if defined( USE_PCBNEW_NANOMETRES )
-    stringValue.Printf( wxT( "%.8f" ), value_to_print );
- #else
-    stringValue.Printf( wxT( "%.4f" ), value_to_print );
- #endif
+    wxString    stringValue = wxString::Format( wxT( "%.3f" ), value_to_print );
 
     // Strip trailing zeros. However, keep at least 3 digits in mantissa
     // For readability
     StripTrailingZeros( stringValue, 3 );
+
+#else
+
+    char    buf[50];
+    int     len;
+
+    if( value_to_print != 0.0 && fabs( value_to_print ) <= 0.0001 )
+    {
+        len = sprintf( buf, "%.10f", value_to_print );
+
+        while( --len > 0 && buf[len] == '0' )
+            buf[len] = '\0';
+
+        if( buf[len]=='.' || buf[len]==',' )
+            buf[len] = '\0';
+        else
+            ++len;
+    }
+    else
+    {
+        len = sprintf( buf, "%.10g", value_to_print );
+    }
+
+    wxString    stringValue( buf, wxConvUTF8 );
+
 #endif
 
     if( aAddUnitSymbol )
@@ -269,8 +286,6 @@ double From_User_Unit( EDA_UNITS_T aUnit, double aValue )
 }
 
 
-
-
 int ReturnValueFromString( EDA_UNITS_T aUnits, const wxString& aTextValue )
 {
     double value;

common/basicframe.cpp

@@ -502,13 +502,6 @@ void EDA_BASE_FRAME::CopyVersionInfoToClipboard( wxCommandEvent&  event )
     tmp << wxT( "Boost version: " ) << ( BOOST_VERSION / 100000 ) << wxT( "." )
         << ( BOOST_VERSION / 100 % 1000 ) << wxT( "." ) << ( BOOST_VERSION % 100 ) << wxT( "\n" );
 
-    tmp << wxT( "Options: USE_PCBNEW_NANOMETRES=" );
-#ifdef USE_PCBNEW_NANOMETRES
-    tmp << wxT( "ON\n" );
-#else
-    tmp << wxT( "OFF\n" );
-#endif
-
     tmp << wxT( "         USE_WX_GRAPHICS_CONTEXT=" );
 #ifdef USE_WX_GRAPHICS_CONTEXT
     tmp << wxT( "ON\n" );

common/block_commande.cpp

@@ -42,8 +42,8 @@
 BLOCK_SELECTOR::BLOCK_SELECTOR() :
     EDA_RECT()
 {
-    m_state   = STATE_NO_BLOCK; /* State (enum BLOCK_STATE_T) of block. */
-    m_command = BLOCK_IDLE;     /* Type (enum BLOCK_COMMAND_T) of operation. */
+    m_state   = STATE_NO_BLOCK; // State (enum BLOCK_STATE_T) of block.
+    m_command = BLOCK_IDLE;     // Type (enum BLOCK_COMMAND_T) of operation.
     m_color   = BROWN;
 }
 
@@ -62,24 +62,24 @@ void BLOCK_SELECTOR::SetMessageBlock( EDA_DRAW_FRAME* frame )
     case BLOCK_IDLE:
         break;
 
-    case BLOCK_MOVE:                /* Move */
-    case BLOCK_PRESELECT_MOVE:      /* Move with preselection list*/
+    case BLOCK_MOVE:                // Move
+    case BLOCK_PRESELECT_MOVE:      // Move with preselection list
         msg = _( "Block Move" );
         break;
 
-    case BLOCK_DRAG:     /* Drag */
+    case BLOCK_DRAG:     // Drag
         msg = _( "Block Drag" );
         break;
 
-    case BLOCK_COPY:     /* Copy */
+    case BLOCK_COPY:     // Copy
         msg = _( "Block Copy" );
         break;
 
-    case BLOCK_DELETE:     /* Delete */
+    case BLOCK_DELETE:     // Delete
         msg = _( "Block Delete" );
         break;
 
-    case BLOCK_SAVE:     /* Save */
+    case BLOCK_SAVE:     // Save
         msg = _( "Block Save" );
         break;
 
@@ -87,20 +87,20 @@ void BLOCK_SELECTOR::SetMessageBlock( EDA_DRAW_FRAME* frame )
         msg = _( "Block Paste" );
         break;
 
-    case BLOCK_ZOOM:     /* Window Zoom */
+    case BLOCK_ZOOM:     // Window Zoom
         msg = _( "Win Zoom" );
         break;
 
-    case BLOCK_ROTATE:     /* Rotate 90 deg */
+    case BLOCK_ROTATE:     // Rotate 90 deg
         msg = _( "Block Rotate" );
         break;
 
-    case BLOCK_FLIP:     /* Flip */
+    case BLOCK_FLIP:     // Flip
         msg = _( "Block Flip" );
         break;
 
     case BLOCK_MIRROR_X:
-    case BLOCK_MIRROR_Y:     /* mirror */
+    case BLOCK_MIRROR_Y:     // mirror
         msg = _( "Block Mirror" );
         break;
 
@@ -185,15 +185,15 @@ void DrawAndSizingBlockOutlines( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoin
     if( aErase )
         block->Draw( aPanel, aDC, wxPoint( 0, 0 ), g_XorMode, block->GetColor() );
 
-    block->SetLastCursorPosition( aPanel->GetScreen()->GetCrossHairPosition() );
-    block->SetEnd( aPanel->GetScreen()->GetCrossHairPosition() );
+    block->SetLastCursorPosition( aPanel->GetParent()->GetCrossHairPosition() );
+    block->SetEnd( aPanel->GetParent()->GetCrossHairPosition() );
 
     block->Draw( aPanel, aDC, wxPoint( 0, 0 ), g_XorMode, block->GetColor() );
 
     if( block->GetState() == STATE_BLOCK_INIT )
     {
         if( block->GetWidth() || block->GetHeight() )
-            /* 2nd point exists: the rectangle is not surface anywhere */
+            // 2nd point exists: the rectangle is not surface anywhere
             block->SetState( STATE_BLOCK_END );
     }
 }
@@ -203,14 +203,14 @@ void AbortBlockCurrentCommand( EDA_DRAW_PANEL* aPanel, wxDC* aDC )
 {
     BASE_SCREEN* screen = aPanel->GetScreen();
 
-    if( aPanel->IsMouseCaptured() )      /* Erase current drawing on screen */
+    if( aPanel->IsMouseCaptured() )      // Erase current drawing on screen
     {
-        /* Clear block outline. */
+        // Clear block outline.
         aPanel->CallMouseCapture( aDC, wxDefaultPosition, false );
         aPanel->SetMouseCapture( NULL, NULL );
         screen->SetCurItem( NULL );
 
-        /* Delete the picked wrapper if this is a picked list. */
+        // Delete the picked wrapper if this is a picked list.
         if( screen->m_BlockLocate.GetCommand() != BLOCK_PASTE )
             screen->m_BlockLocate.ClearItemsList();
     }

common/build_version.cpp

@@ -10,15 +10,10 @@
 #endif
 
 
-#if defined KICAD_TESTING_VERSION
-#   define VERSION_STABILITY  "testing"
-#elif defined KICAD_STABLE_VERSION
+#if defined KICAD_STABLE_VERSION
 #   define VERSION_STABILITY  "stable"
 #else
-#   define VERSION_STABILITY  "unknown"
-#   warning "unknown version stability"
-#   warning "please: when running CMAKE, add -DKICAD_TESTING_VERSION=ON"
-#   warning "or -DKICAD_STABLE_VERSION=ON option"
+#   define VERSION_STABILITY  "product"
 #endif
 
 /**
@@ -27,8 +22,11 @@
  */
 wxString GetBuildVersion()
 {
-    static wxString msg;
-    msg.Printf( wxT("%s-%s"),
-        wxT( KICAD_BUILD_VERSION ), wxT( VERSION_STABILITY ));
+    wxString msg = wxString::Format(
+        wxT( "%s-%s" ),
+        wxT( KICAD_BUILD_VERSION ),
+        wxT( VERSION_STABILITY )
+        );
+
     return msg;
 }

common/dialogs/dialog_page_settings.cpp

@@ -36,6 +36,7 @@
 #include <wxstruct.h>
 #include <worksheet_shape_builder.h>
 #include <class_base_screen.h>
+#include <wildcards_and_files_ext.h>
 
 #include <wx/valgen.h>
 #include <wx/tokenzr.h>
@@ -125,8 +126,7 @@ void DIALOG_PAGES_SETTINGS::initDialog()
     }
 
     // initialize the page layout descr filename
-    m_plDescrFileName = BASE_SCREEN::m_PageLayoutDescrFileName;
-    m_filePicker->SetPath( m_plDescrFileName );
+    SetWksFileName( BASE_SCREEN::m_PageLayoutDescrFileName );
 
 
 #ifdef EESCHEMA
@@ -401,13 +401,13 @@ bool DIALOG_PAGES_SETTINGS::SavePageSettings()
 {
     bool retSuccess = false;
 
-    m_plDescrFileName = m_filePicker->GetPath();
+    wxString fileName = GetWksFileName();
 
-    if( m_plDescrFileName != BASE_SCREEN::m_PageLayoutDescrFileName )
+    if( fileName != BASE_SCREEN::m_PageLayoutDescrFileName )
     {
-        if( !m_plDescrFileName.IsEmpty() )
+        if( !fileName.IsEmpty() )
         {
-            wxString fullFileName = WORKSHEET_LAYOUT::MakeFullFileName( m_plDescrFileName );
+            wxString fullFileName = WORKSHEET_LAYOUT::MakeFullFileName( fileName );
             if( !wxFileExists( fullFileName ) )
             {
                 wxString msg;
@@ -418,26 +418,9 @@ bool DIALOG_PAGES_SETTINGS::SavePageSettings()
             }
         }
 
-        // Try to remove the path, if the path is the current working dir,
-        // or the dir of kicad.pro (template)
-        wxString shortFileName = WORKSHEET_LAYOUT::MakeShortFileName( m_plDescrFileName );
-        wxFileName fn = shortFileName;
-
-        // For Win/Linux/macOS compatibility, a relative path is a good idea
-        if( fn.IsAbsolute() )
-        {
-            fn.MakeRelativeTo( wxGetCwd() );
-            wxString msg;
-            msg.Printf( _( "The page layout descr filename has changed\n"
-                           "Do you want to use the relative path:\n%s"),
-                           fn.GetFullPath().GetData() );
-            if( IsOK( this, msg ) )
-                shortFileName = fn.GetFullPath();
-        }
-
-        BASE_SCREEN::m_PageLayoutDescrFileName = shortFileName;
+        BASE_SCREEN::m_PageLayoutDescrFileName = fileName;
         WORKSHEET_LAYOUT& pglayout = WORKSHEET_LAYOUT::GetTheInstance();
-        pglayout.SetPageLayout( shortFileName );
+        pglayout.SetPageLayout( fileName );
         m_localPrjConfigChanged = true;
     }
 
@@ -793,7 +776,35 @@ void DIALOG_PAGES_SETTINGS::GetCustomSizeMilsFromDialog()
 }
 
 // Called on .kicad_wks file description selection change
-void DIALOG_PAGES_SETTINGS::OnWksFileSelection( wxFileDirPickerEvent& event )
+void DIALOG_PAGES_SETTINGS::OnWksFileSelection( wxCommandEvent& event )
 {
-    // Currently: Nothing to do.
+    // Display a file picker dialog
+    wxFileDialog fileDialog( this, _( "Select Page Layout Descr File" ),
+                             wxGetCwd(), GetWksFileName(),
+                             PageLayoutDescrFileWildcard,
+                             wxFD_DEFAULT_STYLE | wxFD_FILE_MUST_EXIST );
+
+    if( fileDialog.ShowModal() != wxID_OK )
+        return;
+
+    wxString fileName = fileDialog.GetPath();
+
+    // Try to remove the path, if the path is the current working dir,
+    // or the dir of kicad.pro (template)
+    wxString shortFileName = WORKSHEET_LAYOUT::MakeShortFileName( fileName );
+    wxFileName fn = shortFileName;
+
+    // For Win/Linux/macOS compatibility, a relative path is a good idea
+    if( fn.IsAbsolute() && fileName != GetWksFileName() )
+    {
+        fn.MakeRelativeTo( wxGetCwd() );
+        wxString msg;
+        msg.Printf( _( "The page layout descr filename has changed\n"
+                       "Do you want to use the relative path:\n%s"),
+                       fn.GetFullPath().GetData() );
+        if( IsOK( this, msg ) )
+            shortFileName = fn.GetFullPath();
+    }
+
+    SetWksFileName( shortFileName );
 }

common/dialogs/dialog_page_settings.h

@@ -45,9 +45,6 @@ private:
     PAGE_INFO       m_pageInfo;         /// Temporary page info.
     bool            m_customFmt;        /// true if the page selection is custom
     TITLE_BLOCK     m_tb;               /// Temporary title block (basic inscriptions).
-    wxString        m_plDescrFileName;  /// Temporary BASE_SCREEN::m_PageLayoutDescrFileName copy
-
-
 
 public:
     DIALOG_PAGES_SETTINGS( EDA_DRAW_FRAME* parent );
@@ -55,24 +52,23 @@ public:
 
     const wxString GetWksFileName()
     {
-        return m_filePicker->GetPath();
+        return m_textCtrlFilePicker->GetValue();
     }
 
     void SetWksFileName(const wxString& aFilename )
     {
-         m_filePicker->SetPath( aFilename );
+         m_textCtrlFilePicker->SetValue( aFilename );
     }
 
     void EnableWksFileNamePicker( bool aEnable )
     {
-         m_filePicker->Enable( aEnable );
+         m_textCtrlFilePicker->Enable( aEnable );
+         m_buttonBrowse->Enable( aEnable );
     }
 
 private:
     void initDialog();  // Initialisation of member variables
 
-//    void OnCloseWindow( wxCloseEvent& event );
-
     // event handler for wxID_OK
     void OnOkClick( wxCommandEvent& event );
 
@@ -99,7 +95,7 @@ private:
     void OnDateApplyClick( wxCommandEvent& event );
 
     // .kicad_wks file description selection
-	void OnWksFileSelection( wxFileDirPickerEvent& event );
+	void OnWksFileSelection( wxCommandEvent& event );
 
     // Save in the current title block the new page settings
     // return true if changes are made, or false if not

common/dialogs/dialog_page_settings_base.cpp

@@ -350,8 +350,11 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind
 	wxBoxSizer* bSizerfileSelection;
 	bSizerfileSelection = new wxBoxSizer( wxHORIZONTAL );
 	
-	m_filePicker = new wxFilePickerCtrl( this, wxID_ANY, wxEmptyString, _("Select a file"), wxT("*.kicad_wks"), wxDefaultPosition, wxDefaultSize, wxFLP_OPEN|wxFLP_USE_TEXTCTRL );
-	bSizerfileSelection->Add( m_filePicker, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	m_textCtrlFilePicker = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerfileSelection->Add( m_textCtrlFilePicker, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_buttonBrowse = new wxButton( this, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
+	bSizerfileSelection->Add( m_buttonBrowse, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 	
 	
 	bSizerFilename->Add( bSizerfileSelection, 1, wxEXPAND, 5 );
@@ -393,7 +396,7 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind
 	m_TextComment2->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment2TextUpdated ), NULL, this );
 	m_TextComment3->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment3TextUpdated ), NULL, this );
 	m_TextComment4->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment4TextUpdated ), NULL, this );
-	m_filePicker->Connect( wxEVT_COMMAND_FILEPICKER_CHANGED, wxFileDirPickerEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnWksFileSelection ), NULL, this );
+	m_buttonBrowse->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnWksFileSelection ), NULL, this );
 	m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCancelClick ), NULL, this );
 	m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnOkClick ), NULL, this );
 }
@@ -415,7 +418,7 @@ DIALOG_PAGES_SETTINGS_BASE::~DIALOG_PAGES_SETTINGS_BASE()
 	m_TextComment2->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment2TextUpdated ), NULL, this );
 	m_TextComment3->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment3TextUpdated ), NULL, this );
 	m_TextComment4->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment4TextUpdated ), NULL, this );
-	m_filePicker->Disconnect( wxEVT_COMMAND_FILEPICKER_CHANGED, wxFileDirPickerEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnWksFileSelection ), NULL, this );
+	m_buttonBrowse->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnWksFileSelection ), NULL, this );
 	m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCancelClick ), NULL, this );
 	m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnOkClick ), NULL, this );
 	

common/dialogs/dialog_page_settings_base.h

@@ -33,7 +33,6 @@ class DIALOG_SHIM;
 #include <wx/datectrl.h>
 #include <wx/dateevt.h>
 #include <wx/checkbox.h>
-#include <wx/filepicker.h>
 #include <wx/dialog.h>
 
 ///////////////////////////////////////////////////////////////////////////
@@ -113,7 +112,8 @@ class DIALOG_PAGES_SETTINGS_BASE : public DIALOG_SHIM
 		wxTextCtrl* m_TextComment4;
 		wxCheckBox* m_Comment4Export;
 		wxStaticText* m_staticTextfilename;
-		wxFilePickerCtrl* m_filePicker;
+		wxTextCtrl* m_textCtrlFilePicker;
+		wxButton* m_buttonBrowse;
 		wxStdDialogButtonSizer* m_sdbSizer1;
 		wxButton* m_sdbSizer1OK;
 		wxButton* m_sdbSizer1Cancel;
@@ -133,7 +133,7 @@ class DIALOG_PAGES_SETTINGS_BASE : public DIALOG_SHIM
 		virtual void OnComment2TextUpdated( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnComment3TextUpdated( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnComment4TextUpdated( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnWksFileSelection( wxFileDirPickerEvent& event ) { event.Skip(); }
+		virtual void OnWksFileSelection( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
 		

common/drawframe.cpp

@@ -118,26 +118,18 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( wxWindow* aParent,
     m_snapToGrid          = true;
     m_MsgFrameHeight      = EDA_MSG_PANEL::GetRequiredHeight();
 
-
-    //#define ZOOM_DISPLAY_SIZE       60
-    //#define COORD_DISPLAY_SIZE      165
-    //#define DELTA_DISPLAY_SIZE      245
-    //#define UNITS_DISPLAY_SIZE      65
-    #define FUNCTION_DISPLAY_SIZE   110
-
     CreateStatusBar( 6 );
 
     // set the size of the status bar subwindows:
 
     wxWindow* stsbar = GetStatusBar();
 
-
     int dims[] = {
 
-        // balance of status bar on far left is set to a default or whatever is left over.
+        // remainder of status bar on far left is set to a default or whatever is left over.
         -1,
 
-        // When using GetTextSize() remember the width of '1' is not the same
+        // When using GetTextSize() remember the width of character '1' is not the same
         // as the width of '0' unless the font is fixed width, and it usually won't be.
 
         // zoom:
@@ -152,7 +144,9 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( wxWindow* aParent,
         // units display, Inches is bigger than mm
         GetTextSize( _( "Inches" ), stsbar ).x + 10,
 
-        FUNCTION_DISPLAY_SIZE,
+        // Size for the panel used as "Current tool in play": will take longest string from
+        // void PCB_EDIT_FRAME::OnSelectTool( wxCommandEvent& aEvent ) in pcbnew/edit.cpp
+        GetTextSize( wxT( "Add layer alignment target" ), stsbar ).x + 10,
     };
 
     SetStatusWidths( DIM( dims ), dims );
@@ -234,7 +228,6 @@ void EDA_DRAW_FRAME::SkipNextLeftButtonReleaseEvent()
 void EDA_DRAW_FRAME::OnToggleGridState( wxCommandEvent& aEvent )
 {
     SetGridVisibility( !IsGridVisible() );
-
     if( m_galCanvasActive )
     {
         m_galCanvas->GetGAL()->SetGridVisibility( IsGridVisible() );
@@ -392,7 +385,7 @@ void EDA_DRAW_FRAME::OnSelectGrid( wxCommandEvent& event )
      */
     m_LastGridSizeId = id - ID_POPUP_GRID_LEVEL_1000;
     screen->SetGrid( id );
-    screen->SetCrossHairPosition( screen->RefPos( true ) );
+    SetCrossHairPosition( RefPos( true ) );
 
     if( m_galCanvasActive )
     {
@@ -442,7 +435,7 @@ void EDA_DRAW_FRAME::OnSelectZoom( wxCommandEvent& event )
             m_galCanvas->Refresh();
         }
         else
-            RedrawScreen( GetScreen()->GetScrollCenterPosition(), false );
+            RedrawScreen( GetScrollCenterPosition(), false );
     }
 }
 
@@ -528,7 +521,7 @@ wxPoint EDA_DRAW_FRAME::GetGridPosition( const wxPoint& aPosition ) const
     wxPoint pos = aPosition;
 
     if( m_currentScreen != NULL && m_snapToGrid )
-        pos = m_currentScreen->GetNearestGridPosition( aPosition );
+        pos = GetNearestGridPosition( aPosition );
 
     return pos;
 }
@@ -759,12 +752,9 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU )
 {
     BASE_SCREEN* screen = GetScreen();
 
-    if( screen == NULL || m_canvas == NULL )
+    if( !screen || !m_canvas )
         return;
 
-    // There are no safety limits on these calculations, so in NANOMETRES build it
-    // still blows up.  This is incomplete work.
-
     double scale = screen->GetScalingFactor();
 
     wxLogTrace( traceScrollSettings, wxT( "Center Position = ( %d, %d ), scale = %.10g" ),
@@ -797,7 +787,6 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU )
     DBOX    clientRectIU( wxPoint( xIU, yIU ), wxSize( clientSizeIU.x, clientSizeIU.y ) );
     wxPoint centerPositionIU;
 
-#if 1 || defined( USE_PCBNEW_NANOMETRES )
     // put "int" limits on the clientRect
     if( clientRectIU.GetLeft() < VIRT_MIN )
         clientRectIU.MoveLeftTo( VIRT_MIN );
@@ -807,7 +796,6 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU )
         clientRectIU.MoveRightTo( VIRT_MAX );
     if( clientRectIU.GetBottom() > VIRT_MAX )
         clientRectIU.MoveBottomTo( VIRT_MAX );
-#endif
 
     centerPositionIU.x = KiROUND( clientRectIU.GetX() + clientRectIU.GetWidth() / 2 );
     centerPositionIU.y = KiROUND( clientRectIU.GetY() + clientRectIU.GetHeight() / 2 );
@@ -880,11 +868,9 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU )
         }
     }
 
-#if 1 || defined( USE_PCBNEW_NANOMETRES )
     // put "int" limits on the virtualSizeIU
     virtualSizeIU.x = std::min( virtualSizeIU.x, MAX_AXIS );
     virtualSizeIU.y = std::min( virtualSizeIU.y, MAX_AXIS );
-#endif
 
     if( screen->m_Center )
     {
@@ -911,7 +897,7 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU )
 
     // Calculate the scroll bar position in internal units to place the
     // center position at the center of client rectangle.
-    screen->SetScrollCenterPosition( centerPositionIU );
+    SetScrollCenterPosition( centerPositionIU );
 
     double posX = centerPositionIU.x - clientRectIU.GetWidth()  / 2.0 - screen->m_DrawOrg.x;
     double posY = centerPositionIU.y - clientRectIU.GetHeight() / 2.0 - screen->m_DrawOrg.y;
@@ -990,7 +976,7 @@ void EDA_DRAW_FRAME::UseGalCanvas( bool aEnable )
         // Set up grid settings
         gal->SetGridVisibility( IsGridVisible() );
         gal->SetGridSize( VECTOR2D( screen->GetGridSize().x, screen->GetGridSize().y ) );
-        gal->SetGridOrigin( VECTOR2D( screen->GetGridOrigin() ) );
+        gal->SetGridOrigin( VECTOR2D( GetGridOrigin() ) );
     }
     else
     {
@@ -1019,3 +1005,71 @@ void EDA_DRAW_FRAME::UseGalCanvas( bool aEnable )
     if( aEnable )
         m_galCanvas->SetFocus();
 }
+
+//-----< BASE_SCREEN API moved here >--------------------------------------------
+
+wxPoint EDA_DRAW_FRAME::GetCrossHairPosition( bool aInvertY ) const
+{
+    // subject to change, borrow from old BASE_SCREEN for now.
+
+    BASE_SCREEN* screen = GetScreen();  // virtual call
+    return screen->getCrossHairPosition( aInvertY );
+}
+
+
+void EDA_DRAW_FRAME::SetCrossHairPosition( const wxPoint& aPosition, bool aSnapToGrid )
+{
+    BASE_SCREEN* screen = GetScreen();  // virtual call
+    screen->setCrossHairPosition( aPosition, GetGridOrigin(), aSnapToGrid );
+}
+
+
+wxPoint EDA_DRAW_FRAME::GetCursorPosition( bool aOnGrid, wxRealPoint* aGridSize ) const
+{
+    BASE_SCREEN* screen = GetScreen();  // virtual call
+    return screen->getCursorPosition( aOnGrid, GetGridOrigin(), aGridSize );
+}
+
+
+wxPoint EDA_DRAW_FRAME::GetNearestGridPosition( const wxPoint& aPosition, wxRealPoint* aGridSize ) const
+{
+    BASE_SCREEN* screen = GetScreen();  // virtual call
+    return screen->getNearestGridPosition( aPosition, GetGridOrigin(), aGridSize );
+}
+
+
+wxPoint EDA_DRAW_FRAME::GetCrossHairScreenPosition() const
+{
+    BASE_SCREEN* screen = GetScreen();  // virtual call
+    return screen->getCrossHairScreenPosition();
+}
+
+
+void EDA_DRAW_FRAME::SetMousePosition( const wxPoint& aPosition )
+{
+    BASE_SCREEN* screen = GetScreen();  // virtual call
+    screen->setMousePosition( aPosition );
+}
+
+
+wxPoint EDA_DRAW_FRAME::RefPos( bool useMouse ) const
+{
+    BASE_SCREEN* screen = GetScreen();  // virtual call
+    return screen->refPos( useMouse );
+}
+
+
+const wxPoint& EDA_DRAW_FRAME::GetScrollCenterPosition() const
+{
+    BASE_SCREEN* screen = GetScreen();  // virtual call
+    return screen->getScrollCenterPosition();
+}
+
+
+void EDA_DRAW_FRAME::SetScrollCenterPosition( const wxPoint& aPoint )
+{
+    BASE_SCREEN* screen = GetScreen();  // virtual call
+    screen->setScrollCenterPosition( aPoint );
+}
+
+//-----</BASE_SCREEN API moved here >--------------------------------------------

common/drawpanel.cpp

@@ -153,9 +153,11 @@ EDA_DRAW_PANEL::~EDA_DRAW_PANEL()
     wxGetApp().GetSettings()->Write( ENBL_AUTO_PAN_KEY, m_enableAutoPan );
 }
 
+
 EDA_DRAW_FRAME* EDA_DRAW_PANEL::GetParent()
 {
-    return ( EDA_DRAW_FRAME* ) wxWindow::GetParent();
+    wxWindow* mom = wxScrolledWindow::GetParent();
+    return (EDA_DRAW_FRAME*) mom;
 }
 
 
@@ -189,7 +191,7 @@ void EDA_DRAW_PANEL::DrawCrossHair( wxDC* aDC, EDA_COLOR_T aColor )
     if( m_cursorLevel != 0 || aDC == NULL || !m_showCrossHair )
         return;
 
-    wxPoint cursor = GetScreen()->GetCrossHairPosition();
+    wxPoint cursor = GetParent()->GetCrossHairPosition();
 
     GRSetDrawMode( aDC, GR_XOR );
 
@@ -305,7 +307,7 @@ wxPoint EDA_DRAW_PANEL::GetScreenCenterLogicalPosition()
 
 void EDA_DRAW_PANEL::MoveCursorToCrossHair()
 {
-    MoveCursor( GetScreen()->GetCrossHairPosition() );
+    MoveCursor( GetParent()->GetCrossHairPosition() );
 }
 
 
@@ -441,10 +443,10 @@ void EDA_DRAW_PANEL::OnScroll( wxScrollWinEvent& event )
 
     double scale = GetParent()->GetScreen()->GetScalingFactor();
 
-    wxPoint center = GetParent()->GetScreen()->GetScrollCenterPosition();
+    wxPoint center = GetParent()->GetScrollCenterPosition();
     center.x += KiROUND( (double) ( x - tmpX ) / scale );
     center.y += KiROUND( (double) ( y - tmpY ) / scale );
-    GetParent()->GetScreen()->SetScrollCenterPosition( center );
+    GetParent()->SetScrollCenterPosition( center );
 
     Scroll( x, y );
     event.Skip();
@@ -617,7 +619,7 @@ void EDA_DRAW_PANEL::DrawBackGround( wxDC* DC )
         DrawAuxiliaryAxis( DC, GR_COPY );
 
     if( GetParent()->m_showGridAxis )
-        DrawGridAxis( DC, GR_COPY );
+        DrawGridAxis( DC, GR_COPY, GetParent()->GetGridOrigin() );
 }
 
 
@@ -653,7 +655,7 @@ void EDA_DRAW_PANEL::DrawGrid( wxDC* aDC )
     if( screenGridSize.x < MIN_GRID_SIZE || screenGridSize.y < MIN_GRID_SIZE )
         return;
 
-    org = screen->GetNearestGridPosition( org, &gridSize );
+    org = GetParent()->GetNearestGridPosition( org, &gridSize );
 
     // Setting the nearest grid position can select grid points outside the clip box.
     // Incrementing the start point by one grid step should prevent drawing grid points
@@ -748,7 +750,7 @@ void EDA_DRAW_PANEL::DrawGrid( wxDC* aDC )
 
 void EDA_DRAW_PANEL::DrawAuxiliaryAxis( wxDC* aDC, GR_DRAWMODE aDrawMode )
 {
-    wxPoint origin = GetParent()->GetOriginAxisPosition();
+    wxPoint origin = GetParent()->GetAuxOrigin();
 
     if( origin == wxPoint( 0, 0 ) )
         return;
@@ -776,12 +778,9 @@ void EDA_DRAW_PANEL::DrawAuxiliaryAxis( wxDC* aDC, GR_DRAWMODE aDrawMode )
 }
 
 
-void EDA_DRAW_PANEL::DrawGridAxis( wxDC* aDC, GR_DRAWMODE aDrawMode )
+void EDA_DRAW_PANEL::DrawGridAxis( wxDC* aDC, GR_DRAWMODE aDrawMode, const wxPoint& aGridOrigin )
 {
-    BASE_SCREEN* screen = GetScreen();
-
-    if( !GetParent()->m_showGridAxis
-        || ( screen->m_GridOrigin.x == 0 && screen->m_GridOrigin.y == 0 ) )
+    if( !GetParent()->m_showGridAxis || ( !aGridOrigin.x && !aGridOrigin.y ) )
         return;
 
     EDA_COLOR_T color    = GetParent()->GetGridColor();
@@ -791,18 +790,18 @@ void EDA_DRAW_PANEL::DrawGridAxis( wxDC* aDC, GR_DRAWMODE aDrawMode )
 
     // Draw the Y axis
     GRDashedLine( &m_ClipBox, aDC,
-                  screen->m_GridOrigin.x,
+                  aGridOrigin.x,
                   -pageSize.y,
-                  screen->m_GridOrigin.x,
+                  aGridOrigin.x,
                   pageSize.y,
                   0, color );
 
     // Draw the X axis
     GRDashedLine( &m_ClipBox, aDC,
                   -pageSize.x,
-                  screen->m_GridOrigin.y,
+                  aGridOrigin.y,
                   pageSize.x,
-                  screen->m_GridOrigin.y,
+                  aGridOrigin.y,
                   0, color );
 }
 
@@ -854,7 +853,7 @@ void EDA_DRAW_PANEL::OnMouseLeaving( wxMouseEvent& event )
     cross_hair_pos.x = dc.DeviceToLogicalX( cross_hair_pos.x );
     cross_hair_pos.y = dc.DeviceToLogicalY( cross_hair_pos.y );
 
-    GetScreen()->SetCrossHairPosition( cross_hair_pos );
+    GetParent()->SetCrossHairPosition( cross_hair_pos );
 
     wxCommandEvent cmd( wxEVT_COMMAND_MENU_SELECTED, ID_POPUP_ZOOM_CENTER );
     cmd.SetEventObject( this );
@@ -884,7 +883,7 @@ void EDA_DRAW_PANEL::OnMouseWheel( wxMouseEvent& event )
     }
 
     INSTALL_UNBUFFERED_DC( dc, this );
-    GetScreen()->SetCrossHairPosition( event.GetLogicalPosition( dc ) );
+    GetParent()->SetCrossHairPosition( event.GetLogicalPosition( dc ) );
 
     wxCommandEvent cmd( wxEVT_COMMAND_MENU_SELECTED );
     cmd.SetEventObject( this );
@@ -978,7 +977,7 @@ void EDA_DRAW_PANEL::OnMouseEvent( wxMouseEvent& event )
     DC.SetBackground( *wxBLACK_BRUSH );
 
     // Compute the cursor position in drawing (logical) units.
-    screen->SetMousePosition( event.GetLogicalPosition( DC ) );
+    GetParent()->SetMousePosition( event.GetLogicalPosition( DC ) );
 
     int kbstat = 0;
 
@@ -994,7 +993,7 @@ void EDA_DRAW_PANEL::OnMouseEvent( wxMouseEvent& event )
     // Calling Double Click and Click functions :
     if( localbutt == (int) ( GR_M_LEFT_DOWN | GR_M_DCLICK ) )
     {
-        GetParent()->OnLeftDClick( &DC, screen->RefPos( true ) );
+        GetParent()->OnLeftDClick( &DC, GetParent()->RefPos( true ) );
 
         // inhibit a response to the mouse left button release,
         // because we have a double click, and we do not want a new
@@ -1011,7 +1010,7 @@ void EDA_DRAW_PANEL::OnMouseEvent( wxMouseEvent& event )
         m_ignoreNextLeftButtonRelease = false;
 
         if( screen->m_BlockLocate.GetState() == STATE_NO_BLOCK && !ignoreEvt )
-            GetParent()->OnLeftClick( &DC, screen->RefPos( true ) );
+            GetParent()->OnLeftClick( &DC, GetParent()->RefPos( true ) );
 
     }
     else if( !event.LeftIsDown() )
@@ -1035,7 +1034,7 @@ void EDA_DRAW_PANEL::OnMouseEvent( wxMouseEvent& event )
             m_PanStartCenter.y *= ppuy;
         }
         else
-            m_PanStartCenter = GetParent()->GetScreen()->GetScrollCenterPosition();
+            m_PanStartCenter = GetParent()->GetScrollCenterPosition();
 
         m_PanStartEventPosition = event.GetPosition();
 
@@ -1109,10 +1108,10 @@ void EDA_DRAW_PANEL::OnMouseEvent( wxMouseEvent& event )
 
             double scale = GetParent()->GetScreen()->GetScalingFactor();
 
-            wxPoint center = GetParent()->GetScreen()->GetScrollCenterPosition();
+            wxPoint center = GetParent()->GetScrollCenterPosition();
             center.x += KiROUND( (double) ( x - tmpX ) / scale ) / ppux;
             center.y += KiROUND( (double) ( y - tmpY ) / scale ) / ppuy;
-            GetParent()->GetScreen()->SetScrollCenterPosition( center );
+            GetParent()->SetScrollCenterPosition( center );
 
             Refresh();
             Update();
@@ -1172,7 +1171,7 @@ void EDA_DRAW_PANEL::OnMouseEvent( wxMouseEvent& event )
          * (a filter creates a delay for the real block command start, and
          * we must remember this point)
          */
-        m_CursorStartPos = screen->GetCrossHairPosition();
+        m_CursorStartPos = GetParent()->GetCrossHairPosition();
     }
 
     if( m_enableBlockCommands && !(localbutt & GR_M_DCLICK) )
@@ -1331,15 +1330,13 @@ void EDA_DRAW_PANEL::OnKeyEvent( wxKeyEvent& event )
 
     INSTALL_UNBUFFERED_DC( DC, this );
 
-    BASE_SCREEN* Screen = GetScreen();
-
     // Some key commands use the current mouse position: refresh it.
     pos = wxGetMousePosition() - GetScreenPosition();
 
     // Compute the cursor position in drawing units.  Also known as logical units to wxDC.
     pos = wxPoint( DC.DeviceToLogicalX( pos.x ), DC.DeviceToLogicalY( pos.y ) );
-    Screen->SetMousePosition( pos );
 
+    GetParent()->SetMousePosition( pos );
     GetParent()->GeneralControl( &DC, pos, localkey );
 }
 

common/gal/stroke_font.cpp

@@ -29,6 +29,10 @@
 
 using namespace KiGfx;
 
+
+const double STROKE_FONT::LINE_HEIGHT_RATIO  = 1.6;
+
+
 STROKE_FONT::STROKE_FONT( GAL* aGal ) :
     m_gal( aGal ),
     m_bold( false ),

common/page_layout/class_worksheet_dataitem.cpp

@@ -462,6 +462,43 @@ void WORKSHEET_DATAITEM_TEXT::IncrementLabel( int aIncr )
         m_FullText << (wxChar) ( aIncr + lbchar );
 }
 
+// Replace the '\''n' sequence by EOL
+// and the sequence  '\''\' by only one '\' in m_FullText
+// if m_FullTextis a multiline text (i;e.contains '\n') return true
+bool WORKSHEET_DATAITEM_TEXT::ReplaceAntiSlashSequence()
+{
+    bool multiline = false;
+
+    for( unsigned ii = 0; ii < m_FullText.Len(); ii++ )
+    {
+        if( m_FullText[ii] == '\n' )
+            multiline = true;
+
+        else if( m_FullText[ii] == '\\' )
+        {
+            if( ++ii >= m_FullText.Len() )
+                break;
+
+            if( m_FullText[ii] == '\\' )
+            {
+                // a double \\ sequence is replaced by a single \ char
+                m_FullText.Remove(ii, 1);
+                ii--;
+            }
+            else if( m_FullText[ii] == 'n' )
+            {
+                // Replace the "\n" sequence by a EOL char
+                multiline = true;
+                m_FullText[ii] = '\n';
+                m_FullText.Remove(ii-1, 1);
+                ii--;
+            }
+        }
+    }
+
+    return multiline;
+}
+
 void WORKSHEET_DATAITEM_TEXT::SetConstrainedTextSize()
 {
     m_ConstrainedTextSize = m_TextSize;
@@ -501,3 +538,4 @@ void WORKSHEET_DATAITEM_TEXT::SetConstrainedTextSize()
             m_ConstrainedTextSize.y *= m_BoundingBoxSize.y / size.y;
     }
 }
+

common/page_layout/title_block_shapes.cpp

@@ -152,8 +152,7 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList(
             else
             {
                 wsText->m_FullText = BuildFullText( wsText->m_TextBase );
-                if( wsText->m_FullText.Replace( wxT("\\n" ), wxT("\n") ) > 0 )
-                    multilines = true;
+                multilines = wsText->ReplaceAntiSlashSequence();
             }
 
             if( wsText->m_FullText.IsEmpty() )

common/pcb.keywords

@@ -76,6 +76,7 @@ fp_poly
 fp_text
 full
 general
+grid_origin
 gr_arc
 gr_circle
 gr_curve

common/reporter.cpp

@@ -28,7 +28,6 @@
 #include <macros.h>
 #include <reporter.h>
 
-
 REPORTER& REPORTER::Report( const char* aText )
 {
     Report( FROM_UTF8( aText ) );

common/worksheet.cpp

@@ -136,8 +136,8 @@ wxString WS_DRAW_ITEM_LIST::BuildFullText( const wxString& aTextbase )
             msg << aTextbase[ii];
             continue;
         }
-        ii++;
-        if( ii >= aTextbase.Len() )
+
+        if( ++ii >= aTextbase.Len() )
             break;
 
         wxChar format = aTextbase[ii];
@@ -174,7 +174,7 @@ wxString WS_DRAW_ITEM_LIST::BuildFullText( const wxString& aTextbase )
 
             case 'F':
                 {
-                    wxFileName fn( *m_fileName );
+                    wxFileName fn( m_fileName );
                     msg += fn.GetFullName();
                 }
                 break;

common/zoom.cpp

@@ -59,7 +59,7 @@ void EDA_DRAW_FRAME::RedrawScreen( const wxPoint& aCenterPoint, bool aWarpPointe
 void EDA_DRAW_FRAME::RedrawScreen2( const wxPoint& posBefore )
 {
     wxPoint dPos = posBefore - m_canvas->GetClientSize() / 2; // relative screen position to center before zoom
-    wxPoint newScreenPos = m_canvas->ToDeviceXY( GetScreen()->GetCrossHairPosition() ); // screen position of crosshair after zoom
+    wxPoint newScreenPos = m_canvas->ToDeviceXY( GetCrossHairPosition() ); // screen position of crosshair after zoom
     wxPoint newCenter = m_canvas->ToLogicalXY( newScreenPos - dPos );
 
     AdjustScrollBars( newCenter );
@@ -91,10 +91,10 @@ void EDA_DRAW_FRAME::Zoom_Automatique( bool aWarpPointer )
     screen->SetScalingFactor( bestzoom );
 
     if( screen->m_FirstRedraw )
-        screen->SetCrossHairPosition( screen->GetScrollCenterPosition() );
+        SetCrossHairPosition( GetScrollCenterPosition() );
 
     if( !m_galCanvasActive )
-        RedrawScreen( screen->GetScrollCenterPosition(), aWarpPointer );
+        RedrawScreen( GetScrollCenterPosition(), aWarpPointer );
 }
 
 
@@ -132,19 +132,19 @@ void EDA_DRAW_FRAME::OnZoom( wxCommandEvent& event )
     int          id = event.GetId();
     bool         zoom_at_cursor = false;
     BASE_SCREEN* screen = GetScreen();
-    wxPoint      center = screen->GetScrollCenterPosition();
+    wxPoint      center = GetScrollCenterPosition();
 
     switch( id )
     {
     case ID_OFFCENTER_ZOOM_IN:
-        center = m_canvas->ToDeviceXY( screen->GetCrossHairPosition() );
+        center = m_canvas->ToDeviceXY( GetCrossHairPosition() );
         if( screen->SetPreviousZoom() )
             RedrawScreen2( center );
         break;
 
     case ID_POPUP_ZOOM_IN:
         zoom_at_cursor = true;
-        center = screen->GetCrossHairPosition();
+        center = GetCrossHairPosition();
 
     // fall thru
     case ID_ZOOM_IN:
@@ -153,14 +153,14 @@ void EDA_DRAW_FRAME::OnZoom( wxCommandEvent& event )
         break;
 
     case ID_OFFCENTER_ZOOM_OUT:
-        center = m_canvas->ToDeviceXY( screen->GetCrossHairPosition() );
+        center = m_canvas->ToDeviceXY( GetCrossHairPosition() );
         if( screen->SetNextZoom() )
             RedrawScreen2( center );
         break;
 
     case ID_POPUP_ZOOM_OUT:
         zoom_at_cursor = true;
-        center = screen->GetCrossHairPosition();
+        center = GetCrossHairPosition();
 
     // fall thru
     case ID_ZOOM_OUT:
@@ -173,7 +173,7 @@ void EDA_DRAW_FRAME::OnZoom( wxCommandEvent& event )
         break;
 
     case ID_POPUP_ZOOM_CENTER:
-        center = screen->GetCrossHairPosition();
+        center = GetCrossHairPosition();
         RedrawScreen( center, true );
         break;
 

cvpcb/CMakeLists.txt

-add_definitions(-DCVPCB)
+add_definitions( -DCVPCB )
 
 ###
 # Includes
 ###
 
-include_directories(BEFORE ${INC_BEFORE})
+include_directories( BEFORE ${INC_BEFORE} )
 include_directories(
     ./dialogs
-    ${Boost_INCLUDE_DIR}
     ../3d-viewer
     ../pcbnew
     ../polygon
@@ -18,14 +17,14 @@ include_directories(
 ###
 # Sources
 ###
-set(CVPCB_DIALOGS
+set( CVPCB_DIALOGS
     dialogs/dialog_cvpcb_config.cpp
     dialogs/dialog_cvpcb_config_fbp.cpp
     dialogs/dialog_display_options.cpp
     dialogs/dialog_display_options_base.cpp
     )
 
-set(CVPCB_SRCS
+set( CVPCB_SRCS
     ../common/base_units.cpp
     ../pcbnew/board_items_to_polygon_shape_transform.cpp
     ../pcbnew/class_drc_item.cpp
@@ -46,32 +45,35 @@ set(CVPCB_SRCS
 ###
 # Windows resource file
 ###
-if(WIN32)
-    if(MINGW)
+if( WIN32 )
+    if( MINGW )
         # CVPCB_RESOURCES variable is set by the macro.
-        mingw_resource_compiler(cvpcb)
-    else(MINGW)
-        set(CVPCB_RESOURCES cvpcb.rc)
-    endif(MINGW)
-endif(WIN32)
+        mingw_resource_compiler( cvpcb )
+    else()
+        set( CVPCB_RESOURCES cvpcb.rc )
+    endif()
+endif()
 
 ###
 # Apple resource files
 ###
-if(APPLE)
-    set(CVPCB_RESOURCES cvpcb.icns cvpcb_doc.icns)
-    set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/cvpcb.icns"
-                                PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-    set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/cvpcb_doc.icns"
-                                PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-    set(MACOSX_BUNDLE_ICON_FILE cvpcb.icns)
-    set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.cvpcb)
-endif(APPLE)
+if( APPLE )
+    set( CVPCB_RESOURCES cvpcb.icns cvpcb_doc.icns )
+
+    set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/cvpcb.icns"
+        PROPERTIES MACOSX_PACKAGE_LOCATION Resources )
+
+    set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/cvpcb_doc.icns"
+        PROPERTIES MACOSX_PACKAGE_LOCATION Resources )
+
+    set( MACOSX_BUNDLE_ICON_FILE cvpcb.icns )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.cvpcb )
+endif()
 
 ###
 # Create the cvpcb executable
 ###
-add_executable(cvpcb WIN32 MACOSX_BUNDLE
+add_executable( cvpcb WIN32 MACOSX_BUNDLE
     ${CVPCB_SRCS}
     ${CVPCB_DIALOGS}
     ${CVPCB_RESOURCES}
@@ -80,32 +82,30 @@ add_executable(cvpcb WIN32 MACOSX_BUNDLE
 ###
 # Set properties for APPLE on cvpcb target
 ###
-if(APPLE)
-    set_target_properties(cvpcb PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
-endif(APPLE)
+if( APPLE )
+    set_target_properties( cvpcb PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist )
+endif()
 
 ###
 # Link executable target cvpcb with correct libraries
 ###
-target_link_libraries(cvpcb
+target_link_libraries( cvpcb
     3d-viewer
     pcbcommon
     pcad2kicadpcb
     common
     bitmaps
     polygon
+    gal
     ${wxWidgets_LIBRARIES}
     ${OPENGL_LIBRARIES}
     ${GDI_PLUS_LIBRARIES}
-    )
-
-target_link_libraries(cvpcb
-	gal
     ${GLEW_LIBRARIES}
     ${CAIRO_LIBRARIES}
     )
 
-if(WIN32)
+# Only for win32 cross compilation using MXE
+if(WIN32 AND MSYS)
 target_link_libraries(cvpcb
 	opengl32
 	glu32
@@ -114,11 +114,12 @@ target_link_libraries(cvpcb
 	freetype
 	bz2
 	)
-endif(WIN32)
+endif(WIN32 AND MSYS)
 
 ###
 # Add cvpcb as install target
 ###
-install(TARGETS cvpcb
+install( TARGETS cvpcb
     DESTINATION ${KICAD_BIN}
-        COMPONENT binary)
+    COMPONENT binary
+    )

cvpcb/class_DisplayFootprintsFrame.cpp

@@ -339,8 +339,8 @@ void DISPLAY_FOOTPRINTS_FRAME::GeneralControl( wxDC* aDC, const wxPoint& aPositi
     wxCommandEvent cmd( wxEVT_COMMAND_MENU_SELECTED );
     cmd.SetEventObject( this );
 
-    pos = screen->GetNearestGridPosition( pos );
-    oldpos = screen->GetCrossHairPosition();
+    pos = GetNearestGridPosition( pos );
+    oldpos = GetCrossHairPosition();
     gridSize = screen->GetGridSize();
 
     switch( aHotKey )
@@ -371,7 +371,7 @@ void DISPLAY_FOOTPRINTS_FRAME::GeneralControl( wxDC* aDC, const wxPoint& aPositi
         break;
 
     case ' ':
-        screen->m_O_Curseur = screen->GetCrossHairPosition();
+        screen->m_O_Curseur = GetCrossHairPosition();
         break;
 
     case WXK_NUMPAD8:       /* cursor moved up */
@@ -399,14 +399,14 @@ void DISPLAY_FOOTPRINTS_FRAME::GeneralControl( wxDC* aDC, const wxPoint& aPositi
         break;
     }
 
-    screen->SetCrossHairPosition( pos );
+    SetCrossHairPosition( pos );
 
-    if( oldpos != screen->GetCrossHairPosition() )
+    if( oldpos != GetCrossHairPosition() )
     {
-        pos = screen->GetCrossHairPosition();
-        screen->SetCrossHairPosition( oldpos );
+        pos = GetCrossHairPosition();
+        SetCrossHairPosition( oldpos );
         m_canvas->CrossHairOff( aDC );
-        screen->SetCrossHairPosition( pos );
+        SetCrossHairPosition( pos );
         m_canvas->CrossHairOn( aDC );
 
         if( m_canvas->IsMouseCaptured() )

demos/interf_u/interf_u-cache.lib

-EESchema-LIBRARY Version 2.3  Date: 18/12/2011 10:04:44
+EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
 # 4003APG120
 #
 DEF 4003APG120 U 0 40 Y Y 1 F N
-F0 "U" 0 100 70 H V C CNN
-F1 "4003APG120" 0 -100 70 H V C CNN
+F0 "U" 400 2800 70 H V C CNN
+F1 "4003APG120" 0 -2850 70 H V C CNN
+F2 "PGA120" 0 -2950 40 H V C CNN
+F3 "" 400 2800 60 H V C CNN
 ALIAS 4003PG120
 DRAW
 S -800 -2700 800 2700 0 1 0 N
@@ -134,6 +136,8 @@ ENDDEF
 DEF 628128 U 0 40 Y Y 1 F N
 F0 "U" 50 0 70 H V C CNN
 F1 "628128" 300 -1200 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X VCC 32 0 1100 0 D 60 60 0 0 W N
 X GND 16 0 -1100 0 U 60 60 0 0 W N
@@ -175,6 +179,8 @@ ENDDEF
 DEF 74LS245 U 0 10 Y Y 1 F N
 F0 "U" 100 575 60 H V L BNN
 F1 "74LS245" 50 -575 60 H V L TNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 ALIAS 74HC245
 DRAW
 X GND 10 0 -550 0 U 60 60 0 0 W N
@@ -208,6 +214,8 @@ ENDDEF
 DEF 74LS541 U 0 30 Y Y 1 F N
 F0 "U" 0 575 60 H V C BNN
 F1 "74LS541" 0 -575 60 H V C TNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X GND 10 -200 -550 0 U 60 60 0 0 W N
 X VCC 20 -200 550 0 D 60 60 0 0 W N
@@ -243,6 +251,8 @@ ENDDEF
 DEF 74LS688 U 0 40 Y Y 1 F N
 F0 "U" 0 950 60 H V C CNN
 F1 "74LS688" 0 -950 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X GND 10 -300 -900 0 R 60 60 0 0 W N
 X VCC 20 -300 900 0 R 60 60 0 0 W N
@@ -273,6 +283,8 @@ ENDDEF
 DEF BUSPC BUS 0 40 Y Y 1 F N
 F0 "BUS" 0 100 70 H V C CNN
 F1 "BUSPC" 0 -100 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -600 -1600 600 1600 0 1 0 N
 X GND 1 -900 1500 300 R 60 60 1 1 P
@@ -343,16 +355,18 @@ ENDDEF
 # C
 #
 DEF C C 0 10 N Y 1 F N
-F0 "C" 50 100 50 H V L CNN
-F1 "C" 50 -100 50 H V L CNN
+F0 "C" 0 100 40 H V L CNN
+F1 "C" 6 -85 40 H V L CNN
+F2 "" 38 -150 30 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  SM*
  C?
  C1-1
 $ENDFPLIST
 DRAW
-P 2 0 1 20  -100 -30  100 -30 N
-P 2 0 1 20  -100 30  100 30 N
+P 2 0 1 20  -80 -30  80 -30 N
+P 2 0 1 20  -80 30  80 30 N
 X ~ 1 0 200 170 D 40 40 1 1 P
 X ~ 2 0 -200 170 U 40 40 1 1 P
 ENDDRAW
@@ -363,6 +377,8 @@ ENDDEF
 DEF CONN_8X2 P 0 40 Y Y 1 F N
 F0 "P" 0 450 60 H V C CNN
 F1 "CONN_8X2" 0 0 50 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -100 400 100 -400 0 1 0 N
 X ~ 1 -400 350 300 R 60 60 1 1 P I
@@ -387,15 +403,17 @@ ENDDEF
 # CP
 #
 DEF CP C 0 10 N N 1 F N
-F0 "C" 50 100 50 H V L CNN
-F1 "CP" 50 -100 50 H V L CNN
+F0 "C" 50 100 40 H V L CNN
+F1 "CP" 50 -100 40 H V L CNN
+F2 "" 100 -150 30 H V C CNN
+F3 "" 0 0 300 H V C CNN
 ALIAS CAPAPOL
 $FPLIST
  CP*
  SM*
 $ENDFPLIST
 DRAW
-P 4 0 1 8  -100 50  -100 -50  100 -50  100 50 N
+P 4 0 1 8  -80 50  -80 -50  80 -50  80 50 N
 P 4 0 1 0  -50 50  -50 -20  50 -20  50 50 F
 X ~ 1 0 200 150 D 40 40 1 1 P
 X ~ 2 0 -200 150 U 40 40 1 1 P
@@ -407,6 +425,8 @@ ENDDEF
 DEF CRYSTAL X 0 40 N N 1 F N
 F0 "X" 0 150 60 H V C CNN
 F1 "CRYSTAL" 0 -150 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 2 0 1 16  -100 100  -100 -100 N
 P 2 0 1 16  100 100  100 -100 N
@@ -421,6 +441,8 @@ ENDDEF
 DEF DB25 J 0 40 Y N 1 F N
 F0 "J" 50 1350 70 H V C CNN
 F1 "DB25" -50 -1350 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  DB25*
 $ENDFPLIST
@@ -516,6 +538,8 @@ ENDDEF
 DEF EP600 U 0 40 Y Y 1 F N
 F0 "U" 0 100 70 H V C CNN
 F1 "EP600" 0 -500 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -500 -850 500 850 0 1 0 N
 X CLK1 1 -800 750 300 R 60 60 1 1 I C
@@ -550,6 +574,8 @@ ENDDEF
 DEF ~GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 0 30 H I C CNN
 F1 "GND" 0 -70 30 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
 X GND 1 0 0 0 U 30 30 1 1 W N
@@ -561,6 +587,8 @@ ENDDEF
 DEF LED D 0 40 Y N 1 F N
 F0 "D" 0 100 50 H V C CNN
 F1 "LED" 0 -100 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  LED-3MM
  LED-5MM
@@ -585,6 +613,8 @@ ENDDEF
 DEF PWR_FLAG #FLG 0 0 N N 1 F P
 F0 "#FLG" 0 95 30 H I C CNN
 F1 "PWR_FLAG" 0 180 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X pwr 1 0 0 0 U 20 20 0 0 w
 P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
@@ -594,8 +624,10 @@ ENDDEF
 # R
 #
 DEF R R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
+F0 "R" 80 0 40 V V C CNN
+F1 "R" 7 1 40 V V C CNN
+F2 "" -70 0 30 V V C CNN
+F3 "" 0 0 30 H V C CNN
 $FPLIST
  R?
  SM0603
@@ -615,6 +647,8 @@ ENDDEF
 DEF RR9 RR 0 40 Y N 1 F N
 F0 "RR" 50 600 70 H V C CNN
 F1 "RR9" 30 0 70 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 6 0 1 0  -50 -450  -50 550  50 550  100 500  100 -450  -50 -450 N
 X COM 1 -350 500 300 R 60 60 1 1 P I
@@ -635,6 +669,8 @@ ENDDEF
 DEF VCC #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 100 30 H I C CNN
 F1 "VCC" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X VCC 1 0 0 0 U 20 20 0 0 W N
 C 0 50 20 0 1 0 N

demos/interf_u/interf_u.cmp

-Cmp-Mod V01 Created by CvPCB (2011-03-30 BZR 2935)-testing date = 02/04/2011 13:22:13
+Cmp-Mod V01 Created by CvPcb (2013-08-20 BZR 4294)-product date = 21/08/2013 18:12:43
 
 BeginCmp
 TimeStamp = /322D3011;

demos/interf_u/interf_u.pro

-update=02/04/2011 15:02:30
+update=07/08/2013 15:44:03
 version=1
 last_client=pcbnew
 [common]
@@ -14,31 +14,11 @@ NetIExt=net
 EquName1=devcms
 [eeschema]
 version=1
+PageLayoutDescrFile=pagelayout_logo.kicad_wks
+SubpartIdSeparator=0
+SubpartFirstId=65
 LibDir=
-NetFmt=1
-HPGLSpd=20
-HPGLDm=15
-HPGLNum=1
-offX_A4=0
-offY_A4=0
-offX_A3=0
-offY_A3=0
-offX_A2=0
-offY_A2=0
-offX_A1=0
-offY_A1=0
-offX_A0=0
-offY_A0=0
-offX_A=0
-offY_A=0
-offX_B=0
-offY_B=0
-offX_C=0
-offY_C=0
-offX_D=0
-offY_D=0
-offX_E=0
-offY_E=0
+NetFmtName=
 RptD_X=0
 RptD_Y=100
 RptLab=1
@@ -58,21 +38,24 @@ LibName11=special
 LibName12=image
 [pcbnew]
 version=1
-PadDrlX=354
-PadDimH=550
-PadDimV=550
-BoardThickness=630
-TxtPcbV=800
-TxtPcbH=600
-TxtModV=600
-TxtModH=600
-TxtModW=120
-VEgarde=100
-DrawLar=150
-EdgeLar=50
-TxtLar=170
-MSegLar=150
+PageLayoutDescrFile=pagelayout_logo.kicad_wks
 LastNetListRead=interf_u.net
+UseCmpFile=1
+PadDrill=0.89916
+PadDrillOvalY=0.89916
+PadSizeH=1.397
+PadSizeV=1.397
+PcbTextSizeV=2.032
+PcbTextSizeH=1.524
+PcbTextThickness=0.4318
+ModuleTextSizeV=1.524
+ModuleTextSizeH=1.524
+ModuleTextSizeThickness=0.3048
+SolderMaskClearance=0.254
+SolderMaskMinWidth=0
+DrawSegmentWidth=0.381
+BoardOutlineThickness=0.127
+ModuleOutlineThickness=0.381
 [pcbnew/libraries]
 LibDir=
 LibName1=connect

eeschema/CMakeLists.txt

@@ -6,7 +6,6 @@ include_directories(
     ./dialogs
     ../common
     ../common/dialogs
-    ${Boost_INCLUDE_DIR}
     ${INC_AFTER}
     )
 

eeschema/block.cpp

@@ -215,7 +215,7 @@ bool SCH_EDIT_FRAME::HandleBlockEnd( wxDC* DC )
         block->SetState( state );
         block->SetCommand( command );
         m_canvas->SetMouseCapture( DrawAndSizingBlockOutlines, AbortBlockCurrentCommand );
-        GetScreen()->SetCrossHairPosition( block->GetEnd() );
+        SetCrossHairPosition( block->GetEnd() );
 
         if( block->GetCommand() != BLOCK_ABORT )
             m_canvas->MoveCursorToCrossHair();
@@ -237,8 +237,8 @@ bool SCH_EDIT_FRAME::HandleBlockEnd( wxDC* DC )
             {
                 // Compute the rotation center and put it on grid:
                 wxPoint rotationPoint = block->Centre();
-                rotationPoint = GetScreen()->GetNearestGridPosition( rotationPoint );
-                GetScreen()->SetCrossHairPosition( rotationPoint );
+                rotationPoint = GetNearestGridPosition( rotationPoint );
+                SetCrossHairPosition( rotationPoint );
                 SaveCopyInUndoList( block->GetItems(), UR_ROTATED, rotationPoint );
                 RotateListOfItems( block->GetItems(), rotationPoint );
                 OnModify();
@@ -433,8 +433,8 @@ void SCH_EDIT_FRAME::HandleBlockEndByPopUp( int Command, wxDC* DC )
         {
             /* Compute the rotation center and put it on grid */
             wxPoint rotationPoint = block->Centre();
-            rotationPoint = GetScreen()->GetNearestGridPosition( rotationPoint );
-            GetScreen()->SetCrossHairPosition( rotationPoint );
+            rotationPoint = GetNearestGridPosition( rotationPoint );
+            SetCrossHairPosition( rotationPoint );
             SaveCopyInUndoList( block->GetItems(), UR_ROTATED, rotationPoint );
             RotateListOfItems( block->GetItems(), rotationPoint );
             OnModify();
@@ -452,8 +452,8 @@ void SCH_EDIT_FRAME::HandleBlockEndByPopUp( int Command, wxDC* DC )
         {
             /* Compute the mirror center and put it on grid */
             wxPoint mirrorPoint = block->Centre();
-            mirrorPoint = GetScreen()->GetNearestGridPosition( mirrorPoint );
-            GetScreen()->SetCrossHairPosition( mirrorPoint );
+            mirrorPoint = GetNearestGridPosition( mirrorPoint );
+            SetCrossHairPosition( mirrorPoint );
             SaveCopyInUndoList( block->GetItems(), UR_MIRRORED_X, mirrorPoint );
             MirrorX( block->GetItems(), mirrorPoint );
             OnModify();
@@ -471,8 +471,8 @@ void SCH_EDIT_FRAME::HandleBlockEndByPopUp( int Command, wxDC* DC )
         {
             /* Compute the mirror center and put it on grid */
             wxPoint mirrorPoint = block->Centre();
-            mirrorPoint = GetScreen()->GetNearestGridPosition( mirrorPoint );
-            GetScreen()->SetCrossHairPosition( mirrorPoint );
+            mirrorPoint = GetNearestGridPosition( mirrorPoint );
+            SetCrossHairPosition( mirrorPoint );
             SaveCopyInUndoList( block->GetItems(), UR_MIRRORED_Y, mirrorPoint );
             MirrorY( block->GetItems(), mirrorPoint );
             OnModify();
@@ -519,7 +519,7 @@ static void DrawMovingBlockOutlines( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wx
     }
 
     /* Repaint new view. */
-    block->SetMoveVector( screen->GetCrossHairPosition() - block->GetLastCursorPosition() );
+    block->SetMoveVector( aPanel->GetParent()->GetCrossHairPosition() - block->GetLastCursorPosition() );
     block->Draw( aPanel, aDC, block->GetMoveVector(), g_XorMode, block->GetColor() );
 
     for( unsigned ii = 0; ii < block->GetCount(); ii++ )

eeschema/class_netlist_object.h

@@ -96,11 +96,7 @@ enum NET_CONNECTION_T {
  * @param aLabel A wxString object containing the label to test.
  * @return true if text is a bus notation format otherwise false is returned.
  */
-inline bool IsBusLabel( const wxString& aLabel )
-{
-    /* Search for  '[' because a bus label is like "busname[nn..mm]" */
-    return aLabel.Find( '[' ) != wxNOT_FOUND;
-}
+extern bool IsBusLabel( const wxString& aLabel );
 
 
 class NETLIST_OBJECT