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

Tabbed windows #65

Closed
wants to merge 146 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
ba6b8e0
pushing broken code. But i'm the only one in here
Jun 17, 2021
8de4c84
files now accesible relative to GRAIL directory, or in current dir vi…
Jun 17, 2021
4507d78
removed large zip file. Shapefile remains
Jun 17, 2021
fcf8b03
opengl fixes for buttons, BlockMap removed redundant points at end fo…
Jun 21, 2021
f42f53d
removed redundant libs variable in settings
Jun 21, 2021
b89c48b
xdl cleanup almost done, just need actual data
Jun 21, 2021
20e7a1d
server side coolness!
Jun 22, 2021
a790502
add servercode example
ahuston-0 Jun 22, 2021
1f623ee
import .gitignore from cmake branch
ahuston-0 Jun 22, 2021
98a5e81
compile time xdl server stuff
Jun 25, 2021
bcec98c
Change settings, continue modifying typing system
ahuston-0 Jun 28, 2021
b20ccac
more progress on XDL metadata, does not compile
ahuston-0 Jun 29, 2021
a92a51e
fix compile issues, ready for merging with cmake
ahuston-0 Jul 6, 2021
ce217d9
fix forward reference
ahuston-0 Jul 6, 2021
d2c6453
Merge branch 'cmake' into xdl
ahuston-0 Jul 6, 2021
590d8b4
reverting back to adding values to xdl
ahuston-0 Jul 6, 2021
9aec6d5
Merge branch 'cmake' into xdl
ahuston-0 Jul 6, 2021
3db68e1
fix testDrawBlockMap
ahuston-0 Jul 6, 2021
5d04aaa
adds Ubuntu 18.04 setup
ahuston-0 Jul 7, 2021
db33faf
fix formatting of README
ahuston-0 Jul 7, 2021
14aad5f
Update README.md
ahuston-0 Jul 7, 2021
45e13af
add further XDL functionality
ahuston-0 Jul 7, 2021
6542cde
update README.md from 'main'
ahuston-0 Jul 7, 2021
34304b0
Compile XDL code, add XDL tests
ahuston-0 Jul 7, 2021
a71bd57
add TODO to std.cc
ahuston-0 Jul 7, 2021
c0eb765
Clean up testStockServer, add c_cpp_properties
ahuston-0 Jul 9, 2021
faed991
Merge branch 'main' into xdl
ahuston-0 Jul 9, 2021
0f4d4f5
add changes to hashmap for xdl
ahuston-0 Jul 9, 2021
963f849
XDL compiles, minor issues with sending data
ahuston-0 Jul 12, 2021
8a631be
working stock tests!
ahuston-0 Jul 14, 2021
37c102a
Merge branch 'main' into xdl
ahuston-0 Jul 14, 2021
3670c84
add more XDL errors
ahuston-0 Jul 14, 2021
f7459a9
new support for awful ESRI dbf files
Jul 14, 2021
de7b615
load ESRI is broken, creating directory builder template
Jul 14, 2021
43dad37
hypothetical grail syntax
Jul 15, 2021
867406e
moved loadESRIShapefile.cc to test/data
Jul 15, 2021
509e452
xdl renderers almost work! Even less stable, but close to getting gra…
Jul 15, 2021
568c086
alice changed c++ libs under linux to 64 bits
Jul 16, 2021
2286ad8
more efficient text rendering
Jul 19, 2021
8152f9c
xdl compiles, sort of runs
Jul 19, 2021
f50ddb6
render almost works
Jul 19, 2021
2f0e681
renderFind
Jul 20, 2021
98487b5
renderFind
Jul 20, 2021
c640888
rendering worksgit add src/csp/GraphicalXDLClient.cc git add src/csp/…
Jul 20, 2021
945c9c1
proposed new renderer system to be merged into xdl
Jul 20, 2021
4c8f9b0
Merge branch 'xdl' into newrender
ahuston-0 Jul 20, 2021
3dd17ac
Merge branch 'xdl' into newrender
ahuston-0 Jul 20, 2021
67ca7ca
MultiText fixed for new render method
ahuston-0 Jul 20, 2021
98457c7
additional fixes for text rendering
ahuston-0 Jul 20, 2021
deeedae
Revert to C++ 17, add fmtlib
ahuston-0 Jul 23, 2021
37555e1
Fix lots of Clang warnings
ahuston-0 Jul 28, 2021
5947918
More Renderers and Lists
ahuston-0 Aug 3, 2021
758ae56
server transmission working in a MWE
Aug 3, 2021
d15ed6a
mwe for xdl types seems to work standalone
Aug 4, 2021
3653eb9
More on renderers, write functions
ahuston-0 Aug 6, 2021
e43c52b
Merge branch 'xdl' of github.com:StevensDeptECE/GrailGUI into xdl
ahuston-0 Aug 6, 2021
8005e72
Update renderers, broke animation
ahuston-0 Aug 6, 2021
f7b1e10
Multitext added box bounds
Aug 9, 2021
995dd26
Merge branch 'xdl' of github.com:StevensDeptECE/GrailGUI into xdl
Aug 9, 2021
74bea88
Fixing some of the animated demos
ahuston-0 Aug 9, 2021
12b5e27
Merge branch 'xdl' of github.com:StevensDeptECE/GrailGUI into xdl
ahuston-0 Aug 9, 2021
c098813
Merge branch 'main' into xdl
ahuston-0 Aug 9, 2021
ec8ecc2
Fix buttons, widgets
ahuston-0 Aug 10, 2021
0ac5d5a
new approach to demos, no need to inherit from GLWin, main written fo…
Aug 11, 2021
ad5a91f
major reorg to support multiple tabs and hopefully soon, web links
Aug 11, 2021
9cec010
minor changes to bindings so testDrawBlockMap fits with new framework
Aug 16, 2021
c7ea1a8
Add new benchmark tool, more SolarSystem changes
ahuston-0 Aug 16, 2021
d1a1d57
Callbacks and Animation are working again
ahuston-0 Aug 16, 2021
c68722e
Add separate server library, move main out
ahuston-0 Aug 16, 2021
aed5af1
Add ESRI benchmark
ahuston-0 Aug 16, 2021
2c04435
Fixes memory bugs in GenericXDLClient
ahuston-0 Aug 16, 2021
a1d3cd2
Solarsystem body list works with Sun? Don't know what I just did, but…
Aug 17, 2021
83e5399
Fix SolarSystem animation, start on testVideo
ahuston-0 Aug 17, 2021
42af0f3
Change A/V tests to new grailmain system
ahuston-0 Aug 17, 2021
c0115fd
created Graphstyle to reduce configuration code for graphs
Aug 18, 2021
78b7b0c
Merge branch 'tabbed-windows' of github.com:StevensDeptECE/GrailGUI i…
Aug 18, 2021
8d26a1b
three graphs now compile again, still need work to make them run corr…
Aug 18, 2021
7cf7024
3 graphs compile, all crash the same way
Aug 18, 2021
26522ea
Tests audio and xdl via buttons
ahuston-0 Aug 18, 2021
7ccb0eb
Merge branch 'tabbed-windows' of github.com:StevensDeptECE/GrailGUI i…
ahuston-0 Aug 18, 2021
9017a9f
Add std::optional to button actions
ahuston-0 Aug 18, 2021
ed0a52b
box and Candlestick all run, but candlestick has display problems. Ba…
Aug 18, 2021
511154e
Merge branch 'tabbed-windows' of github.com:StevensDeptECE/GrailGUI i…
Aug 18, 2021
60cb885
Change test executables
ahuston-0 Aug 18, 2021
275ca21
Merge branch 'tabbed-windows' of github.com:StevensDeptECE/GrailGUI i…
ahuston-0 Aug 18, 2021
082b8c2
small change in loop logic
ahuston-0 Aug 18, 2021
abf47d4
Fix VideoPlayer being wack
dkrautha Aug 18, 2021
a4852c8
Merge branch 'tabbed-windows' of github.com:StevensDeptECE/GrailGUI i…
dkrautha Aug 18, 2021
1c8d9f1
Merge branch 'tabbed-windows' of github.com:StevensDeptECE/GrailGUI i…
ahuston-0 Aug 18, 2021
9421bb9
more streamlining graphs including LineGraph now. There are still som…
Aug 19, 2021
b516add
graphs compile again, still have weird refresh bug,
Aug 19, 2021
9c01c58
removed display of needsupdate. Somehow linegraphwidget is printing a…
Aug 19, 2021
374e102
animation is now optional, dragmode is off and not harming anything
Aug 20, 2021
50d9339
animation works again for solar system, all graphs not animated by de…
Aug 20, 2021
882a782
Renamed Animated class to Member
ahuston-0 Sep 13, 2021
fdb4e14
Merge branch 'tabbed-windows' of github.com:StevensDeptECE/GrailGUI i…
ahuston-0 Sep 13, 2021
a61e763
Lots of animation-related bugs fixed
ahuston-0 Sep 20, 2021
2830044
audio and video partially fixed, but audio needs to run in background…
Sep 29, 2021
b31b503
removed duplicate member bug
Sep 29, 2021
ab6e66b
add changes for MultiTab implementation and add the NavigationBar header
ahuston-0 Oct 11, 2021
e0b9243
Merge branch 'tabbed-windows' of github.com:StevensDeptECE/GrailGUI i…
ahuston-0 Oct 11, 2021
88cbcdc
changed globe to use continuous animation
Oct 12, 2021
c0e4950
Merge branch 'tabbed-windows' of github.com:StevensDeptECE/GrailGUI i…
Oct 12, 2021
2ffbafd
Improve NavigationBar, fix TypeAlias
ahuston-0 Oct 13, 2021
38f73f4
Merge branch 'tabbed-windows' of github.com:StevensDeptECE/GrailGUI i…
ahuston-0 Oct 13, 2021
465ef49
Resolve linker errors, add long double TypeAlias
ahuston-0 Oct 13, 2021
24254f3
add libfmt's buildbuild folder to .gitignore
ahuston-0 Oct 15, 2021
e632477
Implement Shape switching for NavigationBar
ahuston-0 Oct 15, 2021
aaedb1b
Set default audio context on creation
ahuston-0 Nov 23, 2021
5ea0ea9
Add comments to autogenerated XDL types
ahuston-0 Nov 24, 2021
f6a4637
Switch XDL type comments to types from names
ahuston-0 Nov 24, 2021
a0d36bf
Move comment to correct file during XDL generation
ahuston-0 Nov 24, 2021
84932dc
Merge branch 'tabbed-windows' into main-tw-merge
ahuston-0 Nov 24, 2021
34381a3
Update codestats
ahuston-0 Nov 27, 2021
7085f09
Remove stale vscode settings file
ahuston-0 Dec 19, 2021
0b35c5b
Add sane C++ extension settings for VSCode
ahuston-0 Dec 19, 2021
14d8cad
Add C defaults, clang-tidy settings to CMakeLists.txt
ahuston-0 Dec 19, 2021
a5c27f1
Fix constexpr violations in Benchmark.hh and tests
ahuston-0 Dec 19, 2021
c5ab612
Set clang-tidy to use defaults instead of modern settings
ahuston-0 Dec 19, 2021
31f7d4f
Turn SocketIO into a namespace
ahuston-0 Dec 19, 2021
904a009
Update .clang-tidy to use .clang-format for style
ahuston-0 Dec 19, 2021
d4be2b8
Update .gitignore for intellij
ahuston-0 Dec 19, 2021
bba6f1a
Clean up IPV4Socket
ahuston-0 Dec 19, 2021
2885ccb
Add CPPCoreGuidelines checks to .clang-tidy
ahuston-0 Dec 19, 2021
e01ecbc
Update codestats
ahuston-0 Dec 21, 2021
a4bb2b7
Add emplace_back capability for DynArray
ahuston-0 Dec 21, 2021
46b8d34
Add CMake build for testDynArrayPerf
ahuston-0 Dec 21, 2021
63bdb29
Update codestats
ahuston-0 Dec 22, 2021
c35ed23
Add clang-tidy suggestions
ahuston-0 Dec 24, 2021
c0b26c6
Update cmake action to test tabbed-windows
ahuston-0 Dec 24, 2021
1e0e56c
Clean up Callbacks at suggestion of clang-tidy
ahuston-0 Dec 24, 2021
1118086
Add big five to Member
ahuston-0 Dec 24, 2021
274addf
Add readability checks, update codestats
ahuston-0 Dec 24, 2021
aa8e986
Separate compile action for ubuntu due to dependency changes
ahuston-0 Dec 24, 2021
2679f78
Fix inconsistencies in SocketIO
ahuston-0 Jan 10, 2022
f29452d
Clean up minor issues
ahuston-0 Jan 10, 2022
50ceb08
Change clang-tidy readability option
ahuston-0 Jan 10, 2022
746a791
Clean up DynArray
ahuston-0 Jan 10, 2022
dccf883
Synchronizing older Windows commits
ahuston-0 Jan 18, 2022
7961c23
Add testDynArray and testfmt
ahuston-0 Jan 18, 2022
ce9b04f
Merge branch 'tabbed-windows' of github.com:StevensDeptECE/GrailGUI i…
ahuston-0 Jan 18, 2022
61a098c
Remove miscellaneous newline from code generator
ahuston-0 Jan 18, 2022
88e4dd5
Remove constexpr from some non-constexpr functions
ahuston-0 Jan 18, 2022
a1b0f50
Merge branch 'main' into tabbed-windows
ahuston-0 Jan 18, 2022
76a8f8d
Fix CI after renaming branch
ahuston-0 Jan 18, 2022
d816eef
Remove tabbed_windows from CI
ahuston-0 Jan 20, 2022
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
47 changes: 47 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
---
Checks: 'clang-diagnostic-*,clang-analyzer-*,cppcoreguidelines-*,readability-*'
WarningsAsErrors: ''
HeaderFilterRegex: ''
AnalyzeTemporaryDtors: false
FormatStyle: file
CheckOptions:
- key: llvm-else-after-return.WarnOnConditionVariables
value: 'false'
- key: modernize-loop-convert.MinConfidence
value: reasonable
- key: modernize-replace-auto-ptr.IncludeStyle
value: llvm
- key: cert-str34-c.DiagnoseSignedUnsignedCharComparisons
value: 'false'
- key: google-readability-namespace-comments.ShortNamespaceLines
value: '10'
- key: cert-oop54-cpp.WarnOnlyIfThisHasSuspiciousField
value: 'false'
- key: cppcoreguidelines-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
value: 'true'
- key: cert-dcl16-c.NewSuffixes
value: 'L;LL;LU;LLU'
- key: google-readability-braces-around-statements.ShortStatementLines
value: '1'
- key: modernize-pass-by-value.IncludeStyle
value: llvm
- key: google-readability-namespace-comments.SpacesBeforeComments
value: '2'
- key: modernize-loop-convert.MaxCopySize
value: '16'
- key: cppcoreguidelines-explicit-virtual-functions.IgnoreDestructors
value: 'true'
- key: modernize-use-nullptr.NullMacros
value: 'NULL'
- key: llvm-qualified-auto.AddConstToQualified
value: 'false'
- key: modernize-loop-convert.NamingStyle
value: CamelCase
- key: llvm-else-after-return.WarnOnUnfixable
value: 'false'
- key: google-readability-function-size.StatementThreshold
value: '800'
- key: readability-braces-around-statements.ShortStatementLines
value: '1'
...

38 changes: 35 additions & 3 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,44 @@ on:
workflow_dispatch:

jobs:
build-ubuntu:
runs-on: ubuntu-latest
build-ubuntu18:
strategy:
matrix:
build-type: [Debug, Release]


runs-on: ubuntu-18.04

steps:
- uses: actions/checkout@v2
- uses: seanmiddleditch/gha-setup-ninja@master

- name: Set up GCC 11
run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test
- run: sudo apt-get update
- run: sudo apt-get install gcc-11 g++-11
- run: sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 999
- run: sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 999


- name: Install Grail dependencies
run: sudo apt install libglfw3-dev libfreetype6-dev mpv libmpv-dev liblzma-dev

- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=${{ matrix.build-type }}

- name: Build
# Build your program with the given configuration
run: cmake --build build --config ${{ matrix.build-type }}

build-ubuntu-latest:
strategy:
matrix:
build-type: [Debug, Release]

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: seanmiddleditch/gha-setup-ninja@master
Expand Down
53 changes: 50 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ libs/libgrail.a
*~
\#*

# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# Source: https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore

# User-specific stuff
.idea/**/workspace.xml
Expand All @@ -61,6 +62,9 @@ libs/libgrail.a
.idea/**/dictionaries
.idea/**/shelf

# AWS User-specific
.idea/**/aws.xml

# Generated files
.idea/**/contentModel.xml

Expand All @@ -81,12 +85,52 @@ libs/libgrail.a
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# SonarLint plugin
.idea/sonarlint/

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser


# CMake
cmake-build-*/
cmake_install.cmake
Expand All @@ -98,8 +142,12 @@ build.ninja
.ninja_deps
.ninja_log

build/
# ! NOT FROM CMAKE -- our own custom makefile output directory!
build/

# An error folder generated by libfmt (github.com/fmtlib/fmt)
buildbuild/


# Mongo Explorer plugin
.idea/**/mongoSettings.xml
Expand Down Expand Up @@ -131,7 +179,6 @@ fabric.properties
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser


autogen
disass
main
Expand Down
Loading