v0.6 includes sailing option

Rasbats · Jan 3, 2019 · 2e8d16a · 2e8d16a
1 parent 6649f9b
commit 2e8d16a
Show file tree

Hide file tree

Showing 31 changed files with 16,836 additions and 1,802 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+build/*
+src/version.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ SET(TITLE_NAME ShipDriver)
 SET(CPACK_PACKAGE_CONTACT "Mike Rossiter")
 
 SET(VERSION_MAJOR "0")
-SET(VERSION_MINOR "5")
+SET(VERSION_MINOR "6")
 
 #SET(CMAKE_BUILD_TYPE Debug)
 
@@ -46,10 +46,25 @@ SET(SRC_ShipDriver
 		src/folder.xpm
 		src/AisMaker.h
 		src/AisMaker.cpp
+		src/GribRecord.cpp
+	    src/tinyxml.h
+		src/tinyxml.cpp
+	    src/tinyxmlerror.cpp
+		src/tinyxmlparser.cpp
 	)
 
+IF(WIN32)
+SET(SRC_JSON
+         src/wxJSON/jsonval.cpp
+         src/wxJSON/jsonreader.cpp
+         src/wxJSON/jsonwriter.cpp)
+ENDIF(WIN32)
 
-ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_ShipDriver})
+
+ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_ShipDriver} ${SRC_JSON}
+)
+
+ADD_DEFINITIONS(-DTIXML_USE_STL)
 
 INCLUDE("cmake/PluginInstall.cmake")
 INCLUDE("cmake/PluginLocalization.cmake")

diff --git a/ShipDriver_pi.fbp b/ShipDriver_pi.fbp
diff --git a/data/arcona.xml b/data/arcona.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ShipDriver version="0.1" creator="Opencpn otidalroute plugin">
+	<TWA WindAngle=0>
+    <SPD WindSpeed=6>0</SPD>        
+    <SPD WindSpeed=8>0</SPD>
+    <SPD WindSpeed=10>0</SPD>
+    <SPD WindSpeed=12>0</SPD>
+    <SPD WindSpeed=14>0</SPD>
+    <SPD WindSpeed=16>0</SPD>
+    <SPD WindSpeed=20>0</SPD>
+    <SPD WindSpeed=100>0</SPD>
+    </TWA>
+    <TWA WindAngle=45>
+    <SPD WindSpeed=6>3.1</SPD>        
+    <SPD WindSpeed=8>3.7</SPD>
+    <SPD WindSpeed=10>4.3</SPD>
+    <SPD WindSpeed=12>4.5</SPD>
+    <SPD WindSpeed=14>4.7</SPD>
+    <SPD WindSpeed=16>4.8</SPD>
+    <SPD WindSpeed=20>4.8</SPD>
+    <SPD WindSpeed=100>4</SPD>
+    </TWA>
+    <TWA WindAngle=52>  
+    <SPD WindSpeed=6>4.8</SPD>
+    <SPD WindSpeed=8>5.9</SPD>
+    <SPD WindSpeed=10>6.3</SPD>
+    <SPD WindSpeed=12>6.5</SPD>
+    <SPD WindSpeed=14>6.7</SPD>
+    <SPD WindSpeed=16>6.8</SPD>
+    <SPD WindSpeed=20>6.9</SPD>
+    <SPD WindSpeed=100>7</SPD>   
+    </TWA>
+    <TWA WindAngle=60>   
+    <SPD WindSpeed=6>5.2</SPD>
+    <SPD WindSpeed=8>6.1</SPD>
+    <SPD WindSpeed=10>6.5</SPD>
+    <SPD WindSpeed=12>6.8</SPD>
+    <SPD WindSpeed=14>7</SPD>
+    <SPD WindSpeed=16>7.1</SPD>
+    <SPD WindSpeed=20>7.2</SPD>
+    <SPD WindSpeed=100>7</SPD>   
+    </TWA>  
+    <TWA WindAngle=75>
+    <SPD WindSpeed=6>5.5</SPD>
+    <SPD WindSpeed=8>6.4</SPD>
+    <SPD WindSpeed=10>6.8</SPD>
+    <SPD WindSpeed=12>7.1</SPD>
+    <SPD WindSpeed=14>7.3</SPD>
+    <SPD WindSpeed=16>7.4</SPD>
+    <SPD WindSpeed=20>7.6</SPD>
+    <SPD WindSpeed=100>7</SPD>
+    </TWA>
+    <TWA WindAngle=90>
+    <SPD WindSpeed=6>5.8</SPD>
+    <SPD WindSpeed=8>6.6</SPD>
+    <SPD WindSpeed=10>7</SPD>
+    <SPD WindSpeed=12>7.3</SPD>
+    <SPD WindSpeed=14>7.5</SPD>
+    <SPD WindSpeed=16>7.6</SPD>
+    <SPD WindSpeed=20>7.8</SPD>
+    <SPD WindSpeed=100>7</SPD>
+    </TWA>
+    <TWA WindAngle=110>
+    <SPD WindSpeed=6>5.6</SPD>
+    <SPD WindSpeed=8>6.4</SPD>
+    <SPD WindSpeed=10>6.9</SPD>
+    <SPD WindSpeed=12>7.3</SPD>
+    <SPD WindSpeed=14>7.5</SPD>
+    <SPD WindSpeed=16>7.8</SPD>
+    <SPD WindSpeed=20>8.2</SPD>
+    <SPD WindSpeed=100>8</SPD>
+    </TWA>
+    <TWA WindAngle=120>
+    <SPD WindSpeed=6>5.1</SPD>
+    <SPD WindSpeed=8>6.2</SPD>
+    <SPD WindSpeed=10>6.7</SPD>
+    <SPD WindSpeed=12>7.1</SPD>
+    <SPD WindSpeed=14>7.4</SPD>
+    <SPD WindSpeed=16>7.7</SPD>
+    <SPD WindSpeed=20>8.3</SPD>
+    <SPD WindSpeed=100>8</SPD>
+    </TWA>
+     <TWA WindAngle=135>
+    <SPD WindSpeed=6>4.5</SPD>
+    <SPD WindSpeed=8>5.6</SPD>
+    <SPD WindSpeed=10>6.4</SPD>
+    <SPD WindSpeed=12>6.8</SPD>
+    <SPD WindSpeed=14>7.2</SPD>
+    <SPD WindSpeed=16>7.5</SPD>
+    <SPD WindSpeed=20>8.1</SPD>
+    <SPD WindSpeed=100>8</SPD>
+    </TWA>
+    <TWA WindAngle=150>
+    <SPD WindSpeed=6>3.8</SPD>
+    <SPD WindSpeed=8>4.8</SPD>
+    <SPD WindSpeed=10>5.8</SPD>
+    <SPD WindSpeed=12>6.4</SPD>
+    <SPD WindSpeed=14>6.8</SPD>
+    <SPD WindSpeed=16>7.2</SPD>
+    <SPD WindSpeed=20>7.7</SPD>
+    <SPD WindSpeed=100>7</SPD>
+    </TWA>
+    <TWA WindAngle=180>
+    <SPD WindSpeed=6>3.8</SPD>
+    <SPD WindSpeed=8>4.8</SPD>
+    <SPD WindSpeed=10>5.8</SPD>
+    <SPD WindSpeed=12>6.4</SPD>
+    <SPD WindSpeed=14>6.8</SPD>
+    <SPD WindSpeed=16>7.2</SPD>
+    <SPD WindSpeed=20>7.7</SPD>
+    <SPD WindSpeed=100>7</SPD>
+    </TWA>
+</ShipDriver>
diff --git a/po/ShipDriver_pi.pot b/po/ShipDriver_pi.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ShipDriver_pi 0.5\n"
+"Project-Id-Version: ShipDriver_pi 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-10 12:43+0000\n"
+"POT-Creation-Date: 2019-01-03 15:34+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,24 +17,37 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/ShipDriver_pi.cpp:125 src/ShipDriver_pi.cpp:128 src/ShipDriver_pi.cpp:212
-#: src/ShipDrivergui_impl.h:80
+#: src/ShipDriver_pi.cpp:125 src/ShipDriver_pi.cpp:128 src/ShipDriver_pi.cpp:213
+#: src/ShipDrivergui_impl.h:87
 msgid "ShipDriver"
 msgstr ""
 
 #: src/ShipDriver_pi.cpp:134
 msgid "Select Vessel Start Position"
 msgstr ""
 
-#: src/ShipDriver_pi.cpp:218
+#: src/ShipDriver_pi.cpp:219
 msgid "ShipDriver player"
 msgstr ""
 
-#: src/ShipDriver_pi.cpp:223
+#: src/ShipDriver_pi.cpp:224
 msgid "Almost a simulator"
 msgstr ""
 
-#: src/ShipDrivergui.h:105
+#: src/ShipDriver_pi.cpp:446
+msgid "Grib plugin version not supported."
+msgstr ""
+
+#: src/ShipDriver_pi.cpp:448
+#, c-format
+msgid "Use versions %d.%d to %d.%d"
+msgstr ""
+
+#: src/ShipDriver_pi.cpp:449
+msgid "Weather Routing"
+msgstr ""
+
+#: src/ShipDrivergui.h:108
 msgid "Preferences"
 msgstr ""
 
@@ -102,42 +115,58 @@ msgstr ""
 msgid "Autopilot Control"
 msgstr ""
 
-#: src/ShipDrivergui.cpp:225
+#: src/ShipDrivergui.cpp:220
+msgid "Sail"
+msgstr ""
+
+#: src/ShipDrivergui.cpp:223
+msgid "Using Sail"
+msgstr ""
+
+#: src/ShipDrivergui.cpp:228
 msgid "-1"
 msgstr ""
 
-#: src/ShipDrivergui.cpp:231
+#: src/ShipDrivergui.cpp:234
 msgid "-10"
 msgstr ""
 
-#: src/ShipDrivergui.cpp:237
+#: src/ShipDrivergui.cpp:240
 msgid "+10"
 msgstr ""
 
-#: src/ShipDrivergui.cpp:243
+#: src/ShipDrivergui.cpp:246
 msgid "+1"
 msgstr ""
 
-#: src/ShipDrivergui.cpp:295
+#: src/ShipDrivergui.cpp:301
 msgid "AIS"
 msgstr ""
 
-#: src/ShipDrivergui.cpp:302
+#: src/ShipDrivergui.cpp:308
 msgid "Transmit"
 msgstr ""
 
-#: src/ShipDrivergui.cpp:305
+#: src/ShipDrivergui.cpp:311
 msgid "Save to file"
 msgstr ""
 
-#: src/ShipDrivergui.cpp:312
+#: src/ShipDrivergui.cpp:318
 msgid "MMSI"
 msgstr ""
 
-#: src/ShipDrivergui_impl.cpp:85
+#: src/ShipDrivergui_impl.cpp:87 src/ShipDrivergui_impl.cpp:987
 msgid "Please right-click and choose vessel start position"
 msgstr ""
 
-#: src/ShipDrivergui_impl.cpp:90
+#: src/ShipDrivergui_impl.cpp:95
 msgid "MMSI must be a number, please change in Preferences"
 msgstr ""
+
+#: src/ShipDrivergui_impl.cpp:114
+msgid "ShipDriver has been stopped"
+msgstr ""
+
+#: src/ShipDrivergui_impl.cpp:991
+msgid "Please start ShipDriver"
+msgstr ""
diff --git a/po/de_DE.po b/po/de_DE.po
@@ -113,13 +113,16 @@ msgid "|"
 msgstr ""
 #
 #
+#
 #~ msgid "Emerg. Stop"
 #~ msgstr "Notstop"
 #
 #
+#
 #~ msgid "Engine control"
 #~ msgstr "Maschinensteuerung"
 #
 #
+#
 #~ msgid "Standby"
 #~ msgstr "Standby"
diff --git a/po/fr_FR.po b/po/fr_FR.po
@@ -115,13 +115,16 @@ msgid "|"
 msgstr ""
 #
 #
+#
 #~ msgid "Emerg. Stop"
 #~ msgstr "Arrêt d'urgence"
 #
 #
+#
 #~ msgid "Engine control"
 #~ msgstr "Contrôle du moteur"
 #
 #
+#
 #~ msgid "Standby"
 #~ msgstr "Mise en veille"
diff --git a/po/sv_SE.po b/po/sv_SE.po
@@ -113,13 +113,16 @@ msgid "|"
 msgstr ""
 #
 #
+#
 #~ msgid "Emerg. Stop"
 #~ msgstr "Nödstopp"
 #
 #
+#
 #~ msgid "Engine control"
 #~ msgstr "Motorstyrning"
 #
 #
+#
 #~ msgid "Standby"
 #~ msgstr "Standby"
diff --git a/po/tr_TR.po b/po/tr_TR.po
@@ -113,13 +113,16 @@ msgid "|"
 msgstr ""
 #
 #
+#
 #~ msgid "Emerg. Stop"
 #~ msgstr "Acil Dur"
 #
 #
+#
 #~ msgid "Engine control"
 #~ msgstr "Motor Kontrol"
 #
 #
+#
 #~ msgid "Standby"
 #~ msgstr "Kapatma"