Squashed 'plugins/climatology_pi/' changes from e1c0dd3..60bc11e

60bc11e replace isnan with wxIsNaN c++11 madness
0fbdf42 On windows use a private name for our bzip static library
abc27a9 tidier layout, first try
e68b2e2 bump version for release
b5fc690 Merge pull request OpenCPN#34 from Hakansv/po
08a96fd Translations 2018-03
5362621 Add build to gitignore
5038d23 Merge pull request OpenCPN#33 from stelian42/fix-units-crash-and-translations
f36c80e Fix crash due to missing unit names in global table
8e0614e Fix units combobox translations
5d234dd Merge pull request OpenCPN#32 from nohal/master
5d008e4 Return .${VERSION_PATCH} to version number
b586557 Fix tr translation to compile
3a4802a CI
5e03179 Translations
212da14 Update the translation template
1d31871 Allow forcing the used wxWidgets version.
31dd96e Merge pull request OpenCPN#31 from nohal/master
6e81867 Update the compilation flags
b831f9b Merge branch 'master' of github.com:seandepagnier/climatology_pi
5c29c8b implement better precipitation units
3d12762 Merge pull request OpenCPN#28 from nohal/master
396a1ab Implement SVG icons for improved high resolution display support. Also fix macOS build and packaging.
ae8abd7 Merge pull request OpenCPN#27 from nohal/master
da3a5a9 Fix in-the-tree build on macOS, fix window order on macOS, improve missing data dialog layout.
REVERT: e1c0dd3 On windows use a private name for our bzip static library
REVERT: 9559d93 tidier layout, first try

git-subtree-dir: plugins/climatology_pi
git-subtree-split: 60bc11e11c2c1dff12724d3f51ecdc8512bc6763

.gitignore

@@ -1 +1,3 @@
-data
+build
+data/
+!data/*.svg

.travis.yml

@@ -2,7 +2,7 @@ language: cpp
 install:
     - sudo apt-get -qq update
     - sudo apt-get install libwxgtk3.0-dev libwxgtk3.0-0 libgps-dev libglu1-mesa-dev libgtk2.0-dev libbz2-dev libtinyxml-dev 
-    - sudo apt-get install libportaudio2 portaudio19-dev libcurl4-openssl-dev libexpat1-dev libcairo2-dev
+    - sudo apt-get install libportaudio2 portaudio19-dev libcurl4-openssl-dev libexpat1-dev libcairo2-dev librtlsdr-dev
     - sudo apt-get install rpm
 script:
   - if [[ "${COVERITY_SCAN_BRANCH}" == 1 ]];

CMakeLists.txt

@@ -20,8 +20,14 @@ SET(BUNDLE_DATA TRUE)
 INCLUDE( VERSION.cmake )
 SET(PLUGIN_VERSION "${PLUGIN_VERSION_MAJOR}.${PLUGIN_VERSION_MINOR}.${PLUGIN_VERSION_PATCH}" )
 
+OPTION(CLIMATOLOGY_USE_SVG "Use SVG graphics" ON)
+
 INCLUDE("cmake/PluginConfigure.cmake")
 
+IF(CLIMATOLOGY_USE_SVG)
+  ADD_DEFINITIONS(-DCLIMATOLOGY_USE_SVG)
+ENDIF(CLIMATOLOGY_USE_SVG)
+
 SET(SRC_CLIMATOLOGY
             src/ClimatologyOverlayFactory.cpp
             src/climatology_pi.cpp

README

@@ -26,3 +26,4 @@ License
 =======
 The plugin code is licensed under the terms of the GPL v3 or, at your will, later.
 
+Part of the icons made by Kirill Kazachek (https://www.flaticon.com/authors/kirill-kazachek) from Flaticon (https://www.flaticon.com/) and is licensed under CC BY 3.0 (http://creativecommons.org/licenses/by/3.0

VERSION.cmake

@@ -1,4 +1,4 @@
 SET(PLUGIN_VERSION_MAJOR "1")
-SET(PLUGIN_VERSION_MINOR "3")
-SET(PLUGIN_VERSION_PATCH "1")
-SET(PLUGIN_VERSION_DATE "2017-6-24")
+SET(PLUGIN_VERSION_MINOR "4")
+SET(PLUGIN_VERSION_PATCH "")
+SET(PLUGIN_VERSION_DATE "2018-3-29")

buildosx/InstallOSX/climatology_pi.pkgproj.in

@@ -8,7 +8,7 @@
 			<key>PACKAGE_FILES</key>
 			<dict>
 				<key>DEFAULT_INSTALL_LOCATION</key>
-				<string>/Applications/OpenCPN.app/Contents</string>
+				<string>/</string>
 				<key>HIERARCHY</key>
 				<dict>
 					<key>CHILDREN</key>
@@ -1334,7 +1334,7 @@
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>${VERBOSE_NAME}-Plugin_${VERSION_MAJOR}.${VERSION_MINOR}</string>
+			<string>${VERBOSE_NAME}-Plugin_${PLUGIN_VERSION_MAJOR}.${PLUGIN_VERSION_MINOR}</string>
 			<key>REFERENCE_FOLDER_PATH</key>
 			<string>.</string>
 		</dict>
@@ -1373,7 +1373,7 @@ chk_flag = (ocpn_vers &gt;= '3.3.1606'); }
 // return the check results
   return chk_flag;
   }
-  </string>
+</string>
 	</dict>
 	<key>TYPE</key>
 	<integer>0</integer>

cmake/PluginConfigure.cmake

@@ -16,22 +16,21 @@ ENDIF (COMMAND cmake_policy)
 MESSAGE (STATUS "*** Staging to build ${PACKAGE_NAME} ***")
 
 configure_file(cmake/version.h.in ${PROJECT_SOURCE_DIR}/src/version.h)
-SET(PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}" )
+SET(PACKAGE_VERSION "${PLUGIN_VERSION_MAJOR}.${PLUGIN_VERSION_MINOR}.${VERSION_PATCH}" )
 
 #SET(CMAKE_BUILD_TYPE Debug)
 SET(CMAKE_VERBOSE_MAKEFILE ON)
 
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/src)
 
 # SET(PROFILING 1)
-
 #  IF NOT DEBUGGING CFLAGS="-O2 -march=native"
 IF(NOT MSVC)
  IF(PROFILING)
   ADD_DEFINITIONS( "-Wall -g -fprofile-arcs -ftest-coverage -fexceptions" )
  ELSE(PROFILING)
 #  ADD_DEFINITIONS( "-Wall -g -fexceptions" )
- ADD_DEFINITIONS( "-Wall -Wno-unused-result -g -O0 -fexceptions" )
+ ADD_DEFINITIONS( "-Wall -Wno-unused-result -g -O2 -fexceptions -fPIC" )
  ENDIF(PROFILING)
 
  IF(NOT APPLE)
@@ -87,6 +86,10 @@ IF(NOT QT_ANDROID)
 IF(NOT DEFINED wxWidgets_USE_FILE)
   SET(wxWidgets_USE_LIBS base core net xml html adv)
   SET(BUILD_SHARED_LIBS TRUE)
+  set (WXWIDGETS_FORCE_VERSION CACHE VERSION "Force usage of a specific wxWidgets version.")
+  if(WXWIDGETS_FORCE_VERSION)
+    set (wxWidgets_CONFIG_OPTIONS --version=${WXWIDGETS_FORCE_VERSION})
+  endif()
   FIND_PACKAGE(wxWidgets REQUIRED)
 ENDIF(NOT DEFINED wxWidgets_USE_FILE)
 

cmake/PluginPackage.cmake

@@ -1,6 +1,6 @@
 ##---------------------------------------------------------------------------
-## Author:      Sean D'Epagnier
-## Copyright:   
+## Author:      Pavel Kalian (Based on the work of Sean D'Epagnier)
+## Copyright:   2014
 ## License:     GPLv3+
 ##---------------------------------------------------------------------------
 
@@ -11,9 +11,9 @@ SET(CPACK_PACKAGE_NAME "${PACKAGE_NAME}")
 SET(CPACK_PACKAGE_VENDOR "opencpn.org")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${CPACK_PACKAGE_NAME} ${PACKAGE_VERSION})
 SET(CPACK_PACKAGE_VERSION ${PACKAGE_VERSION})
-SET(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
-SET(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
-SET(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
+SET(CPACK_PACKAGE_VERSION_MAJOR ${PLUGIN_VERSION_MAJOR})
+SET(CPACK_PACKAGE_VERSION_MINOR ${PLUGIN_VERSION_MINOR})
+SET(CPACK_PACKAGE_VERSION_PATCH ${PLUGIN_VERSION_PATCH})
 SET(CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_CURRENT_BINARY_DIR};${PACKAGE_NAME};ALL;/")
 SET(CPACK_PACKAGE_EXECUTABLES OpenCPN ${PACKAGE_NAME})
 
@@ -35,9 +35,7 @@ IF(WIN32)
 
 #  These lines set the name of the Windows Start Menu shortcut and the icon that goes with it
 #  SET(CPACK_NSIS_INSTALLED_ICON_NAME "${PACKAGE_NAME}")
-#  SET(CPACK_NSIS_DISPLAY_NAME "OpenCPN ${PACKAGE_NAME}")
-
-#  SET(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}_${VERSION_MAJOR}.${VERSION_MINOR}_setup" )
+SET(CPACK_NSIS_DISPLAY_NAME "OpenCPN ${PACKAGE_NAME}")
 
   SET(CPACK_NSIS_DIR "${PROJECT_SOURCE_DIR}/buildwin/NSIS_Unicode")  #Gunther
   SET(CPACK_BUILDWIN_DIR "${PROJECT_SOURCE_DIR}/buildwin")  #Gunther
@@ -100,7 +98,7 @@ IF(UNIX AND NOT APPLE)
     SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${ARCH})
     SET(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}")
     SET(CPACK_DEBIAN_PACKAGE_SECTION "misc")
-    SET(CPACK_DEBIAN_COMPRESSION_TYPE "xz")
+    SET(CPACK_DEBIAN_COMPRESSION_TYPE "xz") # requires my patches to cmake
 
     SET(CPACK_RPM_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}")
     SET(CPACK_RPM_PACKAGE_REQUIRES  ${PACKAGE_DEPS})
@@ -147,12 +145,13 @@ ENDIF(TWIN32 AND NOT UNIX)
 
 INCLUDE(CPack)
 
-
+IF(NOT STANDALONE MATCHES "BUNDLED")
 IF(APPLE)
+MESSAGE (STATUS "*** Staging to build PlugIn OSX Package ***")
 
  #  Copy a bunch of files so the Packages installer builder can find them
  #  relative to ${CMAKE_CURRENT_BINARY_DIR}
- #  This avoids absolute paths in the wmm.pkgproj file
+ #  This avoids absolute paths in the chartdldr_pi.pkgproj file
 
 configure_file(${PROJECT_SOURCE_DIR}/cmake/gpl.txt
             ${CMAKE_CURRENT_BINARY_DIR}/license.txt COPYONLY)
@@ -163,7 +162,7 @@ configure_file(${PROJECT_SOURCE_DIR}/buildosx/InstallOSX/pkg_background.jpg
  # Patch the pkgproj.in file to make the output package name conform to Xxx-Plugin_x.x.pkg format
  #  Key is:
  #  <key>NAME</key>
- #  <string>${VERBOSE_NAME}-Plugin_${VERSION_MAJOR}.${VERSION_MINOR}</string>
+ #  <string>${VERBOSE_NAME}-Plugin_${PLUGIN_VERSION_MAJOR}.${PLUGIN_VERSION_MINOR}.${PLUGIN_VERSION_PATCH}</string>
 
  configure_file(${PROJECT_SOURCE_DIR}/buildosx/InstallOSX/${PACKAGE_NAME}.pkgproj.in
             ${CMAKE_CURRENT_BINARY_DIR}/${VERBOSE_NAME}.pkgproj)
@@ -180,5 +179,7 @@ configure_file(${PROJECT_SOURCE_DIR}/buildosx/InstallOSX/pkg_background.jpg
  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${VERBOSE_NAME}-Plugin.pkg )
 
 
-
 ENDIF(APPLE)
+
+ENDIF(NOT STANDALONE MATCHES "BUNDLED")
+