Skip to content
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

cel_nav many improvements, updates including bdbcat's #44

Open
wants to merge 156 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
156 commits
Select commit Hold shift + click to select a range
5b4e7ed
appveyor.yml
rgleason Feb 26, 2019
b23725b
fix line 64 error
rgleason Feb 26, 2019
710a444
remove po/tr_TR.po
rgleason Feb 26, 2019
9f58eaa
Fixing zuFile.h zilb.h and bzlib.h errors
rgleason Feb 26, 2019
be0da17
po/tr_TR.po
rgleason Feb 27, 2019
75f03c2
add appveyor.yml for opencpn.lib v4.8.2
rgleason Feb 28, 2019
acfee3b
Forced pull seandepagnier
rgleason Mar 1, 2019
a6383c2
appveyor.yml path sight.cpp zufile.h
rgleason Mar 1, 2019
f5e668b
add po/tr_TR.po
rgleason Mar 1, 2019
f9b935d
Remove po/tr_TR.po
rgleason Mar 1, 2019
832341e
Revert Android changes
rgleason Mar 1, 2019
80ea806
ov50 - add appveyor + travis
rgleason Mar 9, 2019
f97a96a
v2.3.1 frontend2 v1.0.125
rgleason Jul 7, 2020
c0c8499
CMakeLists.txt start again
rgleason Jul 7, 2020
e817402
CMakeLists.txt language commonname
rgleason Jul 7, 2020
fc03ae4
cmakelists.txt some fixes
rgleason Jul 8, 2020
cc0aadc
v2.3.2.1 fix api
rgleason Jul 19, 2020
56f2866
update ocpn_plugin.h
rgleason Jul 19, 2020
f0ac78c
fix path to ocpn_plugins h
rgleason Jul 19, 2020
a8cbf17
v2.3.2.2 frontend2 1.0.127
rgleason Jul 19, 2020
faa207e
update to opencpn_plugin_116 in cel_nav_ pi.cpp
rgleason Jul 19, 2020
5cedad1
v2.3.2.3 now has undeclared identifiers
rgleason Jul 19, 2020
d2e5aab
fix long description comment out
rgleason Jul 20, 2020
b59c647
Merge pull request #4 from seandepagnier/master
rgleason Oct 5, 2020
3ec48ae
v2.3.2.6 fe2 v1.0.137
rgleason Oct 5, 2020
1bcf7c8
v2.3.2.6 add include GL gl.h to fix errors
rgleason Oct 5, 2020
c1cdc39
v2.3.2.7 increment version
rgleason Oct 5, 2020
87a531f
v2.3.3.0 fix data file path
rgleason Oct 6, 2020
c0eb3e1
v2.3.3.1 add glshim for android
rgleason Oct 6, 2020
7ab30c0
v2.3.3.2 fix cel nav dialog.cpp information
rgleason Oct 6, 2020
6f364b4
v2.3.3.3 try to fix isnan double
rgleason Oct 7, 2020
dd24565
v2.3.3.5 back to previous with Trusty fail
rgleason Oct 7, 2020
a339681
Merge branch 'master' into frontend2
rgleason Oct 8, 2020
141ef6e
v2.3.1
rgleason Oct 17, 2020
bc8533e
v2.3.2
rgleason Oct 17, 2020
8a83b0a
fix ocpn_plugins.h
rgleason Oct 17, 2020
c7a1a51
Revert "Merge branch 'master' into frontend2 - back to 2.3.3.5 trusty…
rgleason Oct 21, 2020
22b9a79
v2.3.3.6 + Fe2 v1.0.139 + fix mingw
rgleason Oct 22, 2020
eed6875
v2.3.3.7 + add PLUGIN_USE_SVG icons cpp h + cel_nav_pi cpp
rgleason Oct 22, 2020
fcd0b64
v2.3.3.8 in cmakelists.txt add use_svg
rgleason Oct 22, 2020
051b691
v2.3.3.13 svg icons
rgleason Oct 24, 2020
42b31c0
v2.3.3.14 small changes
rgleason Oct 24, 2020
91f6c45
v2.3.4.0 + fe2 1.0.46.4
rgleason Dec 28, 2020
6cf8b58
change run_build to true
rgleason Dec 28, 2020
8d57f28
Add manual
Rasbats Apr 10, 2021
d094ed4
Merge pull request #6 from oplaydo/master
rgleason Apr 10, 2021
da4bd1a
Update README
rgleason May 10, 2021
1a5a292
build: Bundle tinyxml on all platforms, not just win32 (#8)
Jun 16, 2021
e83cafb
Merge pull request #9 from leamas/flatpak-8
rgleason Jun 17, 2021
d1ff0b6
Use correct way to get writable data dir (#7)
Jun 17, 2021
f5a3642
Merge pull request #10 from leamas/datadir-7
rgleason Jun 18, 2021
67c5ee0
Fix links etc
Rasbats Aug 22, 2021
8278331
Merge pull request #11 from oplaydo/master
rgleason Aug 22, 2021
5401608
a few changes
rgleason Aug 22, 2021
baf3f81
rasbats link fixes
rgleason Aug 22, 2021
7c993b2
fix links images titles format
rgleason Aug 25, 2021
b044459
fix final links
rgleason Aug 25, 2021
4fc65d1
move modules up 1 dir index.adoc fix site.yml antora.yml
rgleason Aug 25, 2021
6d285b6
some link fixes
rgleason Aug 26, 2021
bec86fa
fix odraw link
rgleason Aug 26, 2021
a97de70
manual link update
rgleason Aug 27, 2021
d303386
Replace a dokuwiki reference
Aug 27, 2021
3e60455
Merge pull request #12 from opencpn-manuals/rick-pr2
rgleason Aug 27, 2021
1e3c7fd
link fixes
rgleason Aug 27, 2021
d2f08df
Merge branch 'master' of github.com:rgleason/celestial_navigation_pi
rgleason Aug 27, 2021
480d4ff
Update index.adoc
Rasbats Aug 29, 2021
e51c4f7
Merge pull request #13 from Rasbats/patch-1
rgleason Aug 29, 2021
97629a1
site and antora title
rgleason Sep 15, 2021
7bfceed
add manual from master branch
rgleason Oct 21, 2021
86ca04a
2.3.4.2 + TP1.0.176.1
rgleason Oct 23, 2021
08a2dc9
2.3.4.3 + TP 1.0147.1
rgleason Oct 24, 2021
a70af17
try android, re glshim
rgleason Oct 25, 2021
9de2f52
2.3.5.0 + TP 1.0.147.1
rgleason Oct 26, 2021
27e3161
fe2 merge master
rgleason Oct 26, 2021
b1fad47
Merge branch 'frontend22' to Master
rgleason Oct 26, 2021
63d972f
2.3.5.1 rework bad merge
rgleason Oct 27, 2021
014e9e4
2.3.5.1 incl android + flatpak
rgleason Oct 27, 2021
39e4612
Renamed po files. Updated porfiles.in
Hakansv Oct 27, 2021
1eb99ea
Updated POT-file. Loaded what's on Crowdin so far
Hakansv Oct 27, 2021
e4bcce1
Merge pull request #16 from Hakansv/master
rgleason Oct 27, 2021
3f7b4e4
2.3.5.3 try to fix android bld
rgleason Oct 29, 2021
52b8cd0
2.3.6.0 + TP 1.0.147.1 + getpPrivate + android
rgleason Oct 30, 2021
a4424e3
2.3.7.0 + TP 1.0.179 + lang
rgleason Nov 6, 2021
b463245
2.3.7.1 better svg icons
rgleason Nov 16, 2021
3ad550b
2.3.8.0 simplify icons
rgleason Nov 16, 2021
399b27b
2.3.9.0 improve panel icon
rgleason Nov 17, 2021
6fbe5b2
2.3.10.0
rgleason Nov 17, 2021
ee7cc82
2.3.11.0 + TP 1.0.185.0 fix macos
rgleason Dec 11, 2021
c203e38
2.3.11.1 + TP 1.0.193
rgleason Feb 27, 2022
dbb45eb
rm manual version no
rgleason Mar 11, 2022
9078393
TP 1.0.194
rgleason Mar 11, 2022
788d293
2.3.12 + TP 1.0.194
rgleason Mar 11, 2022
6d72eba
2.3.13 + fix flatpak arm64 wx3
rgleason Apr 2, 2022
d82f88b
2.3.14.0 + TP 1.0.212
rgleason Jun 16, 2022
899aa62
2.3.15.0 + TP 1.0.213.0 fix OS
rgleason Jun 17, 2022
9bbdc36
Update adoc adding Cook Navigation
rgleason Jul 7, 2022
069ed08
2.4.0 + TP1.0.222
rgleason Dec 25, 2022
b33656e
Merge branch 'master' of github.com:rgleason/celestial_navigation_pi
rgleason Dec 25, 2022
1ca2490
2.4.1 chng one isnan
rgleason Dec 25, 2022
aba0b70
2.4.2.0 + TP1.0.226
rgleason Feb 28, 2023
18858aa
2.4.3.0 + TP1.0.230
rgleason Mar 26, 2023
02ae564
2.4.4.0 + TP1.0.238
rgleason Jun 11, 2023
de73156
2.4.5.0 + TP1.0.253.0
rgleason Aug 9, 2023
05a7f60
2.4.6.0
rgleason Sep 13, 2023
f614326
Adding opencpn-libs submodule
rgleason Sep 26, 2023
d1e7d64
2.4.7.0 opencpn-libs cmake chngs
rgleason Sep 26, 2023
2861687
2.4.8.0 rm libs to OLD
rgleason Sep 26, 2023
c2c9174
2.4.9.0 cmake adjustments
rgleason Sep 26, 2023
aa7c0fc
2.4.10.0 rm GL gl.h
rgleason Sep 26, 2023
6342c5d
2.4.11.0 try just gl.h
rgleason Sep 26, 2023
1063790
2.4.12.0 header now back to GL gl.h
rgleason Sep 26, 2023
c287bc8
Cleanup #1
bdbcat Sep 28, 2023
28fc011
Cleanup #2
bdbcat Sep 28, 2023
97149cf
Cleanup #3
bdbcat Sep 28, 2023
18cc18b
Cleanup #4
bdbcat Sep 28, 2023
0c68637
Correct Android build
bdbcat Sep 28, 2023
1e9ba3e
Correct Android build #2
bdbcat Sep 28, 2023
f9e1f44
Correct Android build #3
bdbcat Sep 28, 2023
51906c8
Correct Android build #4
bdbcat Sep 28, 2023
ec3879c
Correct MacOS build
bdbcat Sep 28, 2023
a4d5e98
Merge pull request #18 from bdbcat/sublibs
rgleason Sep 28, 2023
e3893fe
2.4.14.0 increment for tagged push
rgleason Sep 28, 2023
f735f67
2.4.15.0 + api117 + remove OLD
rgleason Oct 2, 2023
25389c1
2.4.16.0 final TP chngs
rgleason Oct 7, 2023
e14d01d
Remove opencpn-libs submodule.
rgleason Oct 9, 2023
a4e3a23
Adding revised opencpn-libs submodule main
rgleason Oct 9, 2023
164e494
2.4.20.0 final sublibs
rgleason Oct 9, 2023
bf12dc7
2.4.30.0 Use local glu true
rgleason Oct 10, 2023
371e747
2.4.40.0 remove glu
rgleason Oct 13, 2023
b0775a2
small chng cmake
rgleason Oct 15, 2023
81aa732
Update opencpn-libs submodule
rgleason Oct 15, 2023
f67fa14
Updated translations from Crowdin
Hakansv Oct 20, 2023
0890562
Merge pull request #19 from Hakansv/master
Hakansv Oct 20, 2023
23d2735
Take not used aa_ER.po creating errors
Hakansv Oct 20, 2023
f9158ad
Merge pull request #20 from Hakansv/master
Hakansv Oct 20, 2023
4b6df87
Corrected more Crowdin errors not detected before
Hakansv Oct 20, 2023
90b49fb
Merge pull request #21 from Hakansv/master
Hakansv Oct 20, 2023
ee04dca
Remove opencpn-libs submodule.
bdbcat Nov 5, 2023
b473dc8
Adding https://github.com/OpenCPN/opencpn-libs.git submodule branch main
bdbcat Nov 5, 2023
cd18e1c
Update FE2 build scripts.
bdbcat Nov 5, 2023
71c4bbd
2.4.40.1
bdbcat Nov 5, 2023
219de13
2.4.40.2
bdbcat Nov 6, 2023
c4d14e9
Correct MacOS build #1
bdbcat Nov 7, 2023
4ba3620
2.4.40.3
bdbcat Nov 7, 2023
f91c3f6
Merge pull request #22 from bdbcat/master
bdbcat Nov 8, 2023
dfb0890
Update FE2 PluginInstall.cmake.
bdbcat Nov 9, 2023
44c9215
2.4.40.4
bdbcat Nov 10, 2023
da539f5
Adapt to MacOS universal model
bdbcat Dec 18, 2023
1e68ae8
2.4.40.5
bdbcat Dec 18, 2023
d7fcb49
Merge pull request #23 from bdbcat/master
bdbcat Dec 18, 2023
f1588dd
TP1.0.286.3
rgleason Jan 23, 2024
38d280c
Update opencpn-libs submodule
rgleason Jan 23, 2024
653eb2d
2.4.41.0 + TP1.0.238.0
rgleason Jan 23, 2024
71738c0
2.4.42.0 + TP1.0.326
rgleason Jan 21, 2025
d752c01
Update opencpn-libs submodule
rgleason Jan 21, 2025
75a120a
2.4.43.0 + api118
rgleason Jan 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
413 changes: 413 additions & 0 deletions .circleci/config.yml

Large diffs are not rendered by default.

182 changes: 182 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
---
Language: Cpp
# BasedOnStyle: Google
# AccessModifierOffset: -1
AlignAfterOpenBracket: Align
AlignConsecutiveMacros: false
AlignConsecutiveAssignments: false
AlignConsecutiveBitFields: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlines: Left
AlignOperands: Align
AlignTrailingComments: true
AllowAllArgumentsOnNextLine: true
AllowAllConstructorInitializersOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortEnumsOnASingleLine: true
AllowShortBlocksOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortLambdasOnASingleLine: All
AllowShortIfStatementsOnASingleLine: WithoutElse
AllowShortLoopsOnASingleLine: true
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: Yes
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
AfterCaseLabel: false
AfterClass: false
AfterControlStatement: MultiLine
AfterEnum: false
AfterFunction: false
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
AfterUnion: false
AfterExternBlock: false
BeforeCatch: false
BeforeElse: false
BeforeLambdaBody: false
BeforeWhile: false
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeColon
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 80
CommentPragmas: '^ IWYU pragma:'
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DeriveLineEnding: true
DerivePointerAlignment: false
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: true
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
IncludeBlocks: Regroup
IncludeCategories:
- Regex: '^<ext/.*\.h>'
Priority: 2
SortPriority: 0
- Regex: '^<.*\.h>'
Priority: 1
SortPriority: 0
- Regex: '^<.*'
Priority: 2
SortPriority: 0
- Regex: '.*'
Priority: 3
SortPriority: 0
IncludeIsMainRegex: '([-_](test|unittest))?$'
IncludeIsMainSourceRegex: ''
IndentCaseLabels: true
IndentCaseBlocks: false
IndentGotoLabels: true
IndentPPDirectives: None
IndentExternBlock: AfterExternBlock
IndentWidth: 2
IndentWrappedFunctionNames: false
InsertTrailingCommas: None
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: false
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCBinPackProtocolList: Never
ObjCBlockIndentWidth: 2
ObjCBreakBeforeNestedBlockParam: true
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 1
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 200
PointerAlignment: Left
RawStringFormats:
- Language: Cpp
Delimiters:
- cc
- CC
- cpp
- Cpp
- CPP
- 'c++'
- 'C++'
CanonicalDelimiter: ''
BasedOnStyle: google
- Language: TextProto
Delimiters:
- pb
- PB
- proto
- PROTO
EnclosingFunctions:
- EqualsProto
- EquivToProto
- PARSE_PARTIAL_TEXT_PROTO
- PARSE_TEST_PROTO
- PARSE_TEXT_PROTO
- ParseTextOrDie
- ParseTextProtoOrDie
- ParseTestProto
- ParsePartialTestProto
CanonicalDelimiter: ''
BasedOnStyle: google
ReflowComments: true
SortIncludes: false
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeCpp11BracedList: false
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 2
SpacesInAngles: false
SpacesInConditionalStatement: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
SpaceBeforeSquareBrackets: false
Standard: Auto
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
TabWidth: 8
UseCRLF: false
UseTab: Never
WhitespaceSensitiveMacros:
- STRINGIZE
- PP_STRINGIZE
- BOOST_PP_STRINGIZE
...

33 changes: 33 additions & 0 deletions .cmake-format.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
additional_commands:
foo:
flags:
- BAR
- BAZ
kwargs:
DEPENDS: '*'
HEADERS: '*'
SOURCES: '*'
algorithm_order:
- 0
- 1
- 2
- 3
always_wrap: []
bullet_char: '-'
command_case: lower
dangle_parens: true
emit_byteorder_mark: false
enable_markup: true
enum_char: .
#fence_pattern: ^\s*([`~]{3}[`~]*)(.*)$
first_comment_is_literal: false
keyword_case: unchanged
line_ending: unix
line_width: 80
literal_comment_pattern: null
max_subargs_per_line: 3
per_command: {}
#ruler_pattern: ^\s*[^\w\s]{3}.*[^\w\s]{3}$
separate_ctrl_name_with_space: true
separate_fn_name_with_space: false
tab_size: 2
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# For information on this file see: https://editorconfig.org

root = true

[*]
end_of_line = lf
insert_final_newline = true

[*.{xml}]
charset = utf-8

[*.{cmake,cpp,h,sh,in,yml,xsd}]
charset = latin1
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

14 changes: 10 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
build
buildwin
data/
!data/*.svg
cmake-build*
.BATCH
.build
build/*
.directory
po/POTFILES.in.test
temp
tmp
master.zip
OCPNAndroidCommon*
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "opencpn-libs"]
path = opencpn-libs
url = https://github.com/OpenCPN/opencpn-libs.git
branch = main
41 changes: 41 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
language: cpp

matrix:
include:
# The following 2 env: sections are now being done in circleci but are left here for examples
# - env:
# - OCPN_TARGET=stretch-armhf
# - DOCKER_IMAGE=raspbian/stretch
# - BUILD_FLAGS="-j2"
# - BUILD_ENV=raspbian
# services:
# - docker
# before_script:
# - travis_wait 120 sleep infinity & bash ./ci/travis-build-raspbian-armhf-part1.sh
# script:
# - travis_wait 120 sleep infinity & bash ./ci/travis-build-raspbian-armhf-part2.sh
# - env:
# - OCPN_TARGET=buster-armhf
# - DOCKER_IMAGE=jongough/raspbian-buster:plugin_build_tooling_current
# - BUILD_FLAGS=-j2
# - BUILD_ENV=raspbian
# services:
# - docker
# before_script:
# - travis_wait 120 sleep infinity & bash ./ci/travis-build-raspbian-armhf-part1.sh
# script:
# - travis_wait 120 sleep infinity & bash ./ci/travis-build-raspbian-armhf-part2.sh
# The following env: section is for arm64 has now been moved to run in circleci
# - env:
# - OCPN_TARGET=bionic-armh64
# - BUILD_GTK3=true
# - DOCKER_IMAGE=arm64v8/ubuntu:18.04
# - BUILD_FLAGS=-j2
# - BUILD_ENV=ubuntu
# services:
# - docker
# before_script:
# - travis_wait 120 sleep infinity & bash ./ci/travis-build-raspbian-armhf-part1.sh
# script:
# - travis_wait 120 sleep infinity & bash ./ci/travis-build-raspbian-armhf-part2.sh
# - bash ./ci/cloudsmith-upload.sh
Loading