-
Notifications
You must be signed in to change notification settings - Fork 495
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Squashing all commits for pull request. #30
Closed
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff between OpenCPN/OpenCPN and this branch should show the new route printing feature in OpenCPN. This new feature allows to print out the route in table form, specially with the fields "Course", "Distance", "Description" of the WP for the whatch officier. Several classes were added for table printout and rendering, route properties selection dialog. Route properties dialog was modified and button "Print Route" was added. Squashed commit of the following: commit 4201441 Merge: ad7763e 4840d27 Author: registry <saviankou@web.de> Date: Fri Oct 5 01:57:19 2012 +0200 Merge branch 'master' into routeplanning commit 4840d27 Author: registry <saviankou@web.de> Date: Fri Oct 5 01:56:58 2012 +0200 Fixing conflict commit ad7763e Author: registry <saviankou@web.de> Date: Fri Oct 5 01:48:55 2012 +0200 Fixed conflict commit 1fd1fb4 Merge: 80f0885 392fc53 Author: registry <saviankou@web.de> Date: Wed Oct 3 23:03:18 2012 +0200 Merge branch 'master' into routeplanning commit 392fc53 Author: Jesper Weissglas <jesper@journeyman.se> Date: Wed Oct 3 13:04:09 2012 -0300 Unify look of ownship options commit 555f24b Author: Jesper Weissglas <jesper@journeyman.se> Date: Tue Oct 2 23:15:26 2012 -0300 Validation should work for negative GPS offsets too. commit 89e872a Author: Jesper Weissglas <jesper@journeyman.se> Date: Tue Oct 2 22:48:52 2012 -0300 Rework Own Ship Icon settings again. commit 45415b6 Author: Jesper Weissglas <jesper@journeyman.se> Date: Tue Oct 2 18:32:06 2012 -0300 Fix various inconsistencies wrt own ship size. commit d640caf Author: Jesper Weissglas <jesper@journeyman.se> Date: Tue Oct 2 15:50:42 2012 -0300 Fix misplaced comparision in last commit commit 4546cda Author: Jesper Weissglas <jesper@journeyman.se> Date: Tue Oct 2 13:29:09 2012 -0300 Fix randomly disappearing ownship icon. commit 15750f7 Author: Jesper Weissglas <jesper@journeyman.se> Date: Tue Oct 2 07:53:37 2012 -0300 ais.cpp whitespace cleanup. commit 5db7db5 Author: Jesper Weissglas <jesper@journeyman.se> Date: Tue Oct 2 07:53:20 2012 -0300 Render Rollovers instead of using windows. Stops OpenGL flicker. commit 8108618 Author: David Register <bdbcat@users.sourceforge.net> Date: Mon Oct 1 23:51:43 2012 -0400 Fix memory leaks commit b3aa5c3 Author: David Register <bdbcat@users.sourceforge.net> Date: Mon Oct 1 23:08:46 2012 -0400 Extend cm93 coverage to 80 degrees N commit 768c3a8 Author: Jesper Weissglas <jesper@journeyman.se> Date: Mon Oct 1 21:29:00 2012 -0300 Fix Context menus leaking commit 9177845 Author: Jesper Weissglas <jesper@journeyman.se> Date: Mon Oct 1 18:38:13 2012 -0300 Don't show cumulative distance for the first leg of a route. commit df6c2ab Author: Jesper Weissglas <jesper@journeyman.se> Date: Mon Oct 1 15:34:51 2012 -0300 Don't offer to remove last wpt's of route + Fix undo after route crash. commit dcd7e86 Author: Jesper Weissglas <jesper@journeyman.se> Date: Mon Oct 1 13:35:51 2012 -0300 Group chart items in context menu, shorten item texts. commit f1bf774 Author: Jesper Weissglas <jesper@journeyman.se> Date: Mon Oct 1 10:23:20 2012 -0300 Centralize select radius management, and make it adapt to screen size. commit fd4c662 Author: Jesper Weissglas <jesper@journeyman.se> Date: Mon Oct 1 09:44:04 2012 -0300 Focused Context menu for AIS targets as well commit 3b70276 Author: Jesper Weissglas <jesper@journeyman.se> Date: Mon Oct 1 09:16:36 2012 -0300 Move CM93 Detail slider from Context menu to hot key 'D' commit 36e09f5 Author: Jesper Weissglas <jesper@journeyman.se> Date: Mon Oct 1 08:00:43 2012 -0300 Don't highlight the Route when showing the Waypoint menu. commit 6ade552 Author: Jesper Weissglas <jesper@journeyman.se> Date: Mon Oct 1 07:46:09 2012 -0300 Route Delete should invalidate Undo stack. commit b23f24c Author: David Register <bdbcat@users.sourceforge.net> Date: Sun Sep 30 21:41:51 2012 -0400 Cleanup dysfunctional code. commit 428eb65 Author: David Register <bdbcat@users.sourceforge.net> Date: Sun Sep 30 21:41:14 2012 -0400 Correct CMake library linkage rules for some linux builds, esp. Debian commit 1b10de7 Author: David Register <bdbcat@users.sourceforge.net> Date: Sun Sep 30 19:45:51 2012 -0400 Correct message text. commit cfbe059 Author: David Register <bdbcat@users.sourceforge.net> Date: Sun Sep 30 19:39:51 2012 -0400 Fully clear storage to avoid potential FP runtime errors. commit bcea5e2 Author: David Register <bdbcat@users.sourceforge.net> Date: Sun Sep 30 19:38:10 2012 -0400 Correct constructor to fully define member variables commit 885210b Author: Jesper Weissglas <jesper@journeyman.se> Date: Sun Sep 30 20:15:31 2012 -0300 Restructured Context menus to Focused Context Menus (Pat Pend) commit 8007479 Author: David Register <bdbcat@users.sourceforge.net> Date: Sun Sep 30 18:14:37 2012 -0400 Revert "Merge branch 'menu'" This reverts commit 1d34128, reversing changes made to c8cd004. commit 1d34128 Merge: c8cd004 f97239c Author: David Register <bdbcat@users.sourceforge.net> Date: Sun Sep 30 13:36:56 2012 -0400 Merge branch 'menu' commit f97239c Author: David Register <bdbcat@users.sourceforge.net> Date: Sun Sep 30 13:35:42 2012 -0400 Improve Context menu layout for frequently used items commit c8cd004 Merge: 4ac5d28 58f2e1c Author: OpenCPN <opencpn@me.com> Date: Sun Sep 30 07:43:17 2012 -0700 Merge pull request OpenCPN#23 from nkiesel/master added "Anchor" hotkey commit 4ac5d28 Author: Jesper Weissglas <jesper@journeyman.se> Date: Sun Sep 30 11:37:29 2012 -0300 AIS nav status HSC, WIG icons commit 7fd0fe2 Author: Jesper Weissglas <jesper@journeyman.se> Date: Sun Sep 30 09:18:16 2012 -0300 Make "Apply" in Option window work in DC mode too. commit 80f0885 Author: registry <saviankou@web.de> Date: Sun Sep 30 12:20:23 2012 +0200 Added some comments to the code. commit 7dcc207 Merge: 01409af c0c832d Author: registry <saviankou@web.de> Date: Sun Sep 30 12:15:00 2012 +0200 Merge branch 'master' into routeplanning commit c0c832d Author: Jesper Weissglas <jesper@journeyman.se> Date: Sat Sep 29 19:48:39 2012 -0300 Integrate FS#841 - Cumulative route distance in route leg rollovers commit fd64148 Author: Jesper Weissglas <jesper@journeyman.se> Date: Sat Sep 29 12:04:33 2012 -0300 Implement icons for Nav Status RAM, NUC, RBD, etc for AIS targets commit f473842 Author: Jesper Weissglas <jesper@journeyman.se> Date: Fri Sep 28 22:08:58 2012 -0300 Implement Track Data Reduction commit 01409af Merge: b1bb09d 72da349 Author: registry <saviankou@web.de> Date: Sat Sep 29 00:35:44 2012 +0200 Merge branch 'master' into routeplanning commit 72da349 Author: David Register <bdbcat@users.sourceforge.net> Date: Fri Sep 28 17:14:24 2012 -0400 Correct DisplayCategory for Simplified TOPMAR commit effc2a0 Author: Jesper Weissglas <jesper@journeyman.se> Date: Fri Sep 28 17:00:24 2012 -0300 One more mem leak. commit 7adff01 Author: Jesper Weissglas <jesper@journeyman.se> Date: Fri Sep 28 15:17:10 2012 -0300 Mem leak cleaning commit 04afb7b Author: Jesper Weissglas <jesper@journeyman.se> Date: Thu Sep 27 18:06:33 2012 -0300 Fix FS#845 - Missing buoy topmarks after using "Show ENC Text Button" commit b1bb09d Merge: de0b91e 7f58f1b Author: registry <saviankou@web.de> Date: Tue Sep 25 22:55:45 2012 +0200 Merge branch 'master' into routeplanning commit 7f58f1b Author: Jesper Weissglas <jesper@journeyman.se> Date: Tue Sep 25 17:02:08 2012 -0300 Scroll rate again (missed the last one). commit d8ba5be Author: Jesper Weissglas <jesper@journeyman.se> Date: Tue Sep 25 12:24:42 2012 -0300 Fix FS#886: Remove space in extended name, clear extended if not present. commit 00a1b5d Author: Jesper Weissglas <jesper@journeyman.se> Date: Mon Sep 24 19:18:01 2012 -0300 Scroll Rate adjustments commit de0b91e Merge: e8b4bc5 13a9200 Author: registry <saviankou@web.de> Date: Mon Sep 24 15:56:20 2012 +0200 Merge branch 'master' into routeplanning Resolved Conflicts: src/undo.cpp commit 13a9200 Author: David Register <bdbcat@users.sourceforge.net> Date: Sun Sep 23 19:12:51 2012 -0400 Correct compiler warning commit 00dec2b Author: David Register <bdbcat@users.sourceforge.net> Date: Sat Sep 22 21:05:42 2012 -0400 Correct PlugIn Chart class API (NVC and BSB4) commit 5b82c3c Author: Jesper Weissglas <jesper@journeyman.se> Date: Sun Sep 23 17:13:52 2012 -0300 Fix FS#885 - Base station usually don't have a spead, course or heading commit e8b4bc5 Merge: 09653db 7ae0e57 Author: registry <saviankou@web.de> Date: Sun Sep 23 18:18:06 2012 +0200 Merge branch 'master' into routeplanning commit 7ae0e57 Author: Jesper Weissglas <jesper@journeyman.se> Date: Sun Sep 23 12:27:09 2012 -0300 Options Polish: Alignment and spacing, more small screens size. commit 09653db Merge: dc60f12 fc14e27 Author: registry <saviankou@web.de> Date: Sun Sep 23 12:49:38 2012 +0200 Merge branch 'master' of https://github.com/OpenCPN/OpenCPN into routeplanning commit fc14e27 Author: Jesper Weissglas <jesper@journeyman.se> Date: Sat Sep 22 16:01:52 2012 -0300 Waypoint Send to GPS context menu. commit 6e9da86 Author: Jesper Weissglas <jesper@journeyman.se> Date: Sat Sep 22 11:09:59 2012 -0300 Polish spaces in AIS Target Mouse-over commit dc60f12 Author: registry <saviankou@web.de> Date: Sat Sep 22 11:51:16 2012 +0200 Added new files for compilation and removed wanring commit 2bb8018 Author: registry <saviankou@web.de> Date: Fri Sep 21 22:01:38 2012 +0200 Ported all development from "wrong reporitory" clone into github. commit 58f2e1c Author: Norbert Kiesel <nk@iname.com> Date: Fri Aug 17 12:39:43 2012 -0700 added toggleAnchor() hotkey Pressing 'A' shows/hides map elements only interesting if you are planning to anchor (SBDARE, ACHBRT, ACHARE, CBLSUB, PIPARE, PIPSOL, TUNNEL)
did-g
pushed a commit
to did-g/OpenCPN
that referenced
this pull request
Oct 25, 2017
Highlight path currently with properties open
did-g
pushed a commit
to did-g/OpenCPN
that referenced
this pull request
Oct 25, 2017
Update weatherrouting.cpp for help file path
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Diff between OpenCPN/OpenCPN and this branch should show the new route printing feature in OpenCPN.
This new feature allows to print out the route in table form, specially with the fields
"Course", "Distance", "Description" of the WP for the whatch officier.
Several classes were added for table printout and rendering, route properties selection dialog.
Route properties dialog was modified and button "Print Route" was added.
Squashed commit of the following:
commit 4201441
Merge: ad7763e 4840d27
Author: registry saviankou@web.de
Date: Fri Oct 5 01:57:19 2012 +0200
commit 4840d27
Author: registry saviankou@web.de
Date: Fri Oct 5 01:56:58 2012 +0200
commit ad7763e
Author: registry saviankou@web.de
Date: Fri Oct 5 01:48:55 2012 +0200
commit 1fd1fb4
Merge: 80f0885 392fc53
Author: registry saviankou@web.de
Date: Wed Oct 3 23:03:18 2012 +0200
commit 392fc53
Author: Jesper Weissglas jesper@journeyman.se
Date: Wed Oct 3 13:04:09 2012 -0300
commit 555f24b
Author: Jesper Weissglas jesper@journeyman.se
Date: Tue Oct 2 23:15:26 2012 -0300
commit 89e872a
Author: Jesper Weissglas jesper@journeyman.se
Date: Tue Oct 2 22:48:52 2012 -0300
commit 45415b6
Author: Jesper Weissglas jesper@journeyman.se
Date: Tue Oct 2 18:32:06 2012 -0300
commit d640caf
Author: Jesper Weissglas jesper@journeyman.se
Date: Tue Oct 2 15:50:42 2012 -0300
commit 4546cda
Author: Jesper Weissglas jesper@journeyman.se
Date: Tue Oct 2 13:29:09 2012 -0300
commit 15750f7
Author: Jesper Weissglas jesper@journeyman.se
Date: Tue Oct 2 07:53:37 2012 -0300
commit 5db7db5
Author: Jesper Weissglas jesper@journeyman.se
Date: Tue Oct 2 07:53:20 2012 -0300
commit 8108618
Author: David Register bdbcat@users.sourceforge.net
Date: Mon Oct 1 23:51:43 2012 -0400
commit b3aa5c3
Author: David Register bdbcat@users.sourceforge.net
Date: Mon Oct 1 23:08:46 2012 -0400
commit 768c3a8
Author: Jesper Weissglas jesper@journeyman.se
Date: Mon Oct 1 21:29:00 2012 -0300
commit 9177845
Author: Jesper Weissglas jesper@journeyman.se
Date: Mon Oct 1 18:38:13 2012 -0300
commit df6c2ab
Author: Jesper Weissglas jesper@journeyman.se
Date: Mon Oct 1 15:34:51 2012 -0300
commit dcd7e86
Author: Jesper Weissglas jesper@journeyman.se
Date: Mon Oct 1 13:35:51 2012 -0300
commit f1bf774
Author: Jesper Weissglas jesper@journeyman.se
Date: Mon Oct 1 10:23:20 2012 -0300
commit fd4c662
Author: Jesper Weissglas jesper@journeyman.se
Date: Mon Oct 1 09:44:04 2012 -0300
commit 3b70276
Author: Jesper Weissglas jesper@journeyman.se
Date: Mon Oct 1 09:16:36 2012 -0300
commit 36e09f5
Author: Jesper Weissglas jesper@journeyman.se
Date: Mon Oct 1 08:00:43 2012 -0300
commit 6ade552
Author: Jesper Weissglas jesper@journeyman.se
Date: Mon Oct 1 07:46:09 2012 -0300
commit b23f24c
Author: David Register bdbcat@users.sourceforge.net
Date: Sun Sep 30 21:41:51 2012 -0400
commit 428eb65
Author: David Register bdbcat@users.sourceforge.net
Date: Sun Sep 30 21:41:14 2012 -0400
commit 1b10de7
Author: David Register bdbcat@users.sourceforge.net
Date: Sun Sep 30 19:45:51 2012 -0400
commit cfbe059
Author: David Register bdbcat@users.sourceforge.net
Date: Sun Sep 30 19:39:51 2012 -0400
commit bcea5e2
Author: David Register bdbcat@users.sourceforge.net
Date: Sun Sep 30 19:38:10 2012 -0400
commit 885210b
Author: Jesper Weissglas jesper@journeyman.se
Date: Sun Sep 30 20:15:31 2012 -0300
commit 8007479
Author: David Register bdbcat@users.sourceforge.net
Date: Sun Sep 30 18:14:37 2012 -0400
commit 1d34128
Merge: c8cd004 f97239c
Author: David Register bdbcat@users.sourceforge.net
Date: Sun Sep 30 13:36:56 2012 -0400
commit f97239c
Author: David Register bdbcat@users.sourceforge.net
Date: Sun Sep 30 13:35:42 2012 -0400
commit c8cd004
Merge: 4ac5d28 58f2e1c
Author: OpenCPN opencpn@me.com
Date: Sun Sep 30 07:43:17 2012 -0700
commit 4ac5d28
Author: Jesper Weissglas jesper@journeyman.se
Date: Sun Sep 30 11:37:29 2012 -0300
commit 7fd0fe2
Author: Jesper Weissglas jesper@journeyman.se
Date: Sun Sep 30 09:18:16 2012 -0300
commit 80f0885
Author: registry saviankou@web.de
Date: Sun Sep 30 12:20:23 2012 +0200
commit 7dcc207
Merge: 01409af c0c832d
Author: registry saviankou@web.de
Date: Sun Sep 30 12:15:00 2012 +0200
commit c0c832d
Author: Jesper Weissglas jesper@journeyman.se
Date: Sat Sep 29 19:48:39 2012 -0300
commit fd64148
Author: Jesper Weissglas jesper@journeyman.se
Date: Sat Sep 29 12:04:33 2012 -0300
commit f473842
Author: Jesper Weissglas jesper@journeyman.se
Date: Fri Sep 28 22:08:58 2012 -0300
commit 01409af
Merge: b1bb09d 72da349
Author: registry saviankou@web.de
Date: Sat Sep 29 00:35:44 2012 +0200
commit 72da349
Author: David Register bdbcat@users.sourceforge.net
Date: Fri Sep 28 17:14:24 2012 -0400
commit effc2a0
Author: Jesper Weissglas jesper@journeyman.se
Date: Fri Sep 28 17:00:24 2012 -0300
commit 7adff01
Author: Jesper Weissglas jesper@journeyman.se
Date: Fri Sep 28 15:17:10 2012 -0300
commit 04afb7b
Author: Jesper Weissglas jesper@journeyman.se
Date: Thu Sep 27 18:06:33 2012 -0300
commit b1bb09d
Merge: de0b91e 7f58f1b
Author: registry saviankou@web.de
Date: Tue Sep 25 22:55:45 2012 +0200
commit 7f58f1b
Author: Jesper Weissglas jesper@journeyman.se
Date: Tue Sep 25 17:02:08 2012 -0300
commit d8ba5be
Author: Jesper Weissglas jesper@journeyman.se
Date: Tue Sep 25 12:24:42 2012 -0300
commit 00a1b5d
Author: Jesper Weissglas jesper@journeyman.se
Date: Mon Sep 24 19:18:01 2012 -0300
commit de0b91e
Merge: e8b4bc5 13a9200
Author: registry saviankou@web.de
Date: Mon Sep 24 15:56:20 2012 +0200
commit 13a9200
Author: David Register bdbcat@users.sourceforge.net
Date: Sun Sep 23 19:12:51 2012 -0400
commit 00dec2b
Author: David Register bdbcat@users.sourceforge.net
Date: Sat Sep 22 21:05:42 2012 -0400
commit 5b82c3c
Author: Jesper Weissglas jesper@journeyman.se
Date: Sun Sep 23 17:13:52 2012 -0300
commit e8b4bc5
Merge: 09653db 7ae0e57
Author: registry saviankou@web.de
Date: Sun Sep 23 18:18:06 2012 +0200
commit 7ae0e57
Author: Jesper Weissglas jesper@journeyman.se
Date: Sun Sep 23 12:27:09 2012 -0300
commit 09653db
Merge: dc60f12 fc14e27
Author: registry saviankou@web.de
Date: Sun Sep 23 12:49:38 2012 +0200
commit fc14e27
Author: Jesper Weissglas jesper@journeyman.se
Date: Sat Sep 22 16:01:52 2012 -0300
commit 6e9da86
Author: Jesper Weissglas jesper@journeyman.se
Date: Sat Sep 22 11:09:59 2012 -0300
commit dc60f12
Author: registry saviankou@web.de
Date: Sat Sep 22 11:51:16 2012 +0200
commit 2bb8018
Author: registry saviankou@web.de
Date: Fri Sep 21 22:01:38 2012 +0200
commit 58f2e1c
Author: Norbert Kiesel nk@iname.com
Date: Fri Aug 17 12:39:43 2012 -0700