Commit graph

186 commits

Author SHA1 Message Date
nathan a580fbbba1 working on shapefile conversion. now using geopandas to do it entirely in python. something is still wrong with the quadtree loader, need to debug 2020-06-17 23:42:39 -07:00
nathan 6b219b43e7 load geojson files from ogr2ogr convert of shapefile
Former-commit-id: ad655164cf995c553ba491eb340c0ac75d92c9fe
2020-06-17 22:04:16 -07:00
nathan 14f0e15c76 moved drawtrails into map redraw logic for faster refresh when trails are long
Former-commit-id: 526374dcda6c078f3b58720b48c62edc16824903
2020-06-17 22:01:18 -07:00
nathan e8cf66ebb9 added resolution argument to mapconverter
Former-commit-id: 0f330b65175f27f4662c8eb56ff7eef105f97ac0
2020-06-16 21:50:58 -07:00
nathan eaf6bc70a8 fixed more warnings and Makefile issues. Should compile on mac now
Former-commit-id: cc10ac99b35ae34ba128642da32f0c9a223cfe31
2020-06-16 21:50:41 -07:00
nathan 83f2d6aa30 fixing c++ string literal and narrowing warnings
Former-commit-id: e92f153b516ab0fce55a9695ba91a2398f5ff719
2020-06-16 21:50:30 -07:00
nathan e198fffbd3 reenabled map texture shift reuse for improved speed. Added logic to redraw during big animated zooms or shifts
Former-commit-id: e135b9e4f4a0537a2de90c81a0f7ec8c6896f8fa
2020-06-16 21:49:53 -07:00
nathan 626a8fafbd plane animation tweaks
Former-commit-id: f102c7fb2e61b5b26d4d6ed78df7ac4d568b84fc
2020-06-16 21:46:51 -07:00
nathan 92d4bf928e fixed std:chrono issues
Former-commit-id: 2461384e0f6e6c638c2fadd8eb0263fc6d8d5dac
2020-06-14 15:26:26 -07:00
nathan df2ea21cde fixed ms clock issue using steady_clock -> high_resolution_clock. Changed line drawing to recursive instead of building line list in Map.cpp, seems to be a lot faster.
Former-commit-id: 81ff8167845869b8cf4fdc4ff3158aac84b24ce9
2020-06-13 22:15:47 -07:00
nathan 6caca48666 testing hard coded multipliers for latlon conversion and different quadtree filling logic
Former-commit-id: eee50502c57870a95890f85711286f3138da7ec7
2020-06-13 20:54:21 -07:00
nathan cd1ce278c1 changed map representation to lines instead of polys. tried some speedups by drawing around edges of previous map texture, but need to move to tiles
Former-commit-id: 48a929dea6e2eb94785fa4e38afb1aba357c372f
2020-06-12 20:32:42 -07:00
nathan b8dd741165 fixed mapconvert issue that eliminated horizontal and vertical lines
Former-commit-id: 88370ea8c775bc7b7cc03aae6193776df6783061
2020-06-11 22:55:59 -07:00
nathan def7ee20e1 map convert precision change. fixed map load issue. changed time functions to std::chrono
Former-commit-id: a774a5bdbcf9e1c643e56277dbeedcedacb54905
2020-06-11 21:55:04 -07:00
nathan bc88c0ba5d std::list -> vector for performance. Working on mapconverter precision to merge points. Broken with lower precision levels, something wrong with QTInsert
Former-commit-id: c40d67cd1346a723dd8a3440b7eb845575c05f0b
2020-06-11 00:11:52 -07:00
nathan c45c788cae readme table formatting
Former-commit-id: 6180e9e508a5212d3792b8729466f92e33c8c41c
2020-06-10 11:30:27 -07:00
nathan ca8610758f Merge branch 'master' of https://github.com/nmatsuda/viz1090
Former-commit-id: 37e64373825a5ee30b2dd66a805bae641607b477
2020-06-10 11:29:10 -07:00
nathan 2f8ce3447d misc cleanup
Former-commit-id: 747cd4fac34c15f1c7d404abb90a37ccdda8d208
2020-06-10 11:28:52 -07:00
nathan 5234e9aa12 misc comment and readme cleanup
Former-commit-id: 8a1bced26e178b09faeaaed2555d5ac5af558f28
2020-06-10 11:27:51 -07:00
nathan 01bf0bc396 rename map1090.cpp
Former-commit-id: 3c9b73e78c36033a45da363ad93fb21cdd90a50c
2020-06-09 20:36:10 -07:00
nathan dba4babbd2 more Readme edits and file cleanup
Former-commit-id: 6953975a19bc00dd58b4ec8881df6f8788a374d4
Former-commit-id: 81667ba89b5356b649b7e74b07636fe49b19814e
2020-06-08 15:57:11 -07:00
nathan bf3e7d42d7 updating readme for WSL support
Former-commit-id: 42ae8363f4c8d96f4facb2a3db12dffff69b0644
Former-commit-id: a187a458b7a86cbd972fd4de2ffbf7a27cbdb5d3
2020-06-08 11:49:58 -07:00
nathan 07429b75c3 fixed double tap registered during pinch gesture, mouse cursor
Former-commit-id: 58fa2af1042fa4ecb906a41ae5b1deba84886c5b
Former-commit-id: 2411214bb4b74323f7dbef5817659c08461e4473
2020-03-21 20:30:23 -07:00
nathan 2a0f6e01eb view1090.h only used in aircraftlist and appdata now
Former-commit-id: 6363362a52bb693ec01d8bb683d6a43065e71d9a
Former-commit-id: 924f30949e039d9c7ee4cde6bac7606069024075
2020-03-20 22:12:45 -07:00
nathan e78f3c4e0f more c cleanup and label physics adjustments
Former-commit-id: 0915c6c04f958bbf233b02981320be626aae7d31
Former-commit-id: d63cf3baf92d2b35e462b324ce47bea8225ed39a
2020-03-20 22:08:40 -07:00
nathan 9b5cab173e removed defs.h and structs.h
Former-commit-id: 63229bbc5bf3fb105b945f7b3e3025e624324193
Former-commit-id: f37adedb0101d03a37bfe83f09165dc83adf12cd
2020-03-18 22:38:00 -07:00
nathan 0a014bdd99 all map and drawing is now c++
Former-commit-id: ae9ea92b06a7782e3f12bcf7ebfc6979c7c28cbd
Former-commit-id: 2e197fa5c161f7b44779120e9af25f911e7511bf
2020-03-18 22:22:59 -07:00
Nathan Matsuda 1c75fbc4d8 changing aircraft trail history to std::list
Former-commit-id: 66d0e1a110b2ef9bbbef44f1405531ca24d76469
Former-commit-id: 69de14c477027a362c2cccb0c241bba2141021d7
2020-03-12 16:56:26 -07:00
Nathan Matsuda 78a11df09d Merge branch 'master' of https://github.com/nmatsuda/spidr
Former-commit-id: 7bc2a14401627cc589155a80de6642cb8564a24b
Former-commit-id: 97352e5f1f358bd4b539555d36ccbb67e156ff15
2020-03-12 12:46:42 -07:00
Nathan Matsuda 15a7dc59c0 added screen index for multiple monitors. fixed scroll wheel zoom crash due to negative max dist
Former-commit-id: f9807a6a36d059205f98a970e1d74a7e6e0c175a
Former-commit-id: 3ff991dca29e947c067c452c3fe6e742fe47b03d
2020-03-12 12:46:26 -07:00
Nathan Matsuda b6e5a03cd2 added screen index for multiple monitors. fixed scroll wheel zoom crash due to negative max dist
Former-commit-id: 26e86f54547bcb5420667a15ddeb40842f2cb8f7
Former-commit-id: 5d84159b16a0c9a0ef487f10c1377b420af9f5e9
2020-03-12 12:45:27 -07:00
nathan bdaae19854 separating touch and mouse events to avoid doubling up on touch laptops
Former-commit-id: 52e7e5b694b63f32983161c30c7c303e65eeb948
Former-commit-id: 0dbb0763a6ee302365429495cdcc3ebe9029a584
2020-03-11 22:07:57 -07:00
Nathan Matsuda be5ec5c0ed builds and runs
Former-commit-id: 5158d4459d5b43213803b859ae4491113cf765f9
Former-commit-id: cd1720a0ea9b781adbe21e052efb79b75bc137f1
2020-03-10 16:56:59 -07:00
nathan 8b23d25dd1 refactor in progress, builds currently
Former-commit-id: ad23161c72900be5a595ad004e133c67fa37df92
Former-commit-id: 284f7c0acd3b4322e33c215aa8a559c35f6daa65
2020-03-07 20:28:55 -08:00
nathan af9cfce3ff massive refactor to c++ in progress, doesn't build now
Former-commit-id: bbd3fe3c0438b9f8d2188b8d1f5ffc70616a789f
Former-commit-id: d19da520563adeb80996df92c65ba5e1e6785596
2020-03-07 17:22:20 -08:00
nathan cb62238efd begin conversion to c++. modified existing c files to compile with g++
Former-commit-id: 5d29910bbfc137430264f8b08887f7997a86dbf1
Former-commit-id: 3b8af4a36c0345a24dc06753afa9c32f6b97714e
2020-03-07 13:19:49 -08:00
nathan 85636501f5 some readme updates and cleanup
Former-commit-id: bdb8d4c516a0aafed3c0fd709d52ab6ede543e25
Former-commit-id: c3f75db4e56a1549f2037a88cb9d91d5ff4ed154
2020-03-06 21:49:40 -08:00
nathan 293c7d2a6d swapping out color names in preparation for styles
Former-commit-id: 4ffc36aa3a42586e1a7d4a17a5946175e23c3cb3
Former-commit-id: 93bbe2405261c2b98ba36a1548ec1993cdbf0538
2020-03-06 20:51:47 -08:00
nathan 06276d33c2 double click zoom, other tap cleanup
Former-commit-id: 0f130dbbdc9ea3f519912785beb2ccc6345f5a3f
Former-commit-id: d6e0e41a4e1b355449f3312201ab79977c256071
2020-03-06 15:44:45 -08:00
nathan a4718f8d93 mouse click and drag added
Former-commit-id: aee18213d280783da1b761e5b7ec7c01a53ac0d1
Former-commit-id: f15d983599f1f7e3b82b5642395f1914ae75d2f2
2020-03-05 15:02:40 -08:00
nathan 3398748007 fixed broken interactive_TTL variable removed in last commit
Former-commit-id: 0d6078fd49398701008371339a5770cbd6112d61
Former-commit-id: 5a0cb56adc5349a227637093e8764ddf3adc6c5a
2020-03-02 23:07:39 -08:00
nathan 93e26cc2e4 removed map continue mode (continue drawing map on next frame) because it produces annoying flashes
Former-commit-id: 57448a74eed032e6630d6f3cdfb1e39ba076f092
Former-commit-id: 69a64e4fe977ed0bcb6500b7d19979c6084560cb
2020-03-02 22:44:32 -08:00
nathan e2de0076c2 cleaning up unused
Former-commit-id: 28877253544f45f3037bc5214478df8fb2536ce0
Former-commit-id: c3fef4350543beba9e002116f09124abe67deb2e
2020-03-02 22:22:35 -08:00
nathan c338cb7340 cleaning out old logdist and show list options
Former-commit-id: 589204f731d1c82a7873fd2cb527e0caf89a023a
Former-commit-id: f0e62e9917e8193e92d2c1217fc58c47d7f900ce
2020-03-01 22:58:10 -08:00
nathan 6916ee2a4c map loading fixes
Former-commit-id: 77666b1c9b0f871cbf7ebedf29f0b966bb95279b
Former-commit-id: 5f1efcc29dc6236555166dd318fff26361161bc6
2020-03-01 22:40:11 -08:00
nathan 7c2fdbc634 Merge branch 'master' of https://github.com/nmatsuda/spidr
Former-commit-id: efd003fa26beb7e4b59b5016d8aede0780649c2b
Former-commit-id: 1bca1a9e3ffee2a0663d37f8ebb23da988ab44a5
2020-03-01 21:44:42 -08:00
nathan fdd12fece3 map conversion in python directly from svg to c array bin file, with bash script. File cleanup (BFG to follow)
Former-commit-id: cd38a9b42c4973e454f8d7b7208539c7bcc6495e
Former-commit-id: 87b04ceb9008fabd80258f5c979b9d238411e748
2020-03-01 21:17:12 -08:00
nathan 57686fc8b4 map conversion in python directly from svg to c array bin file, with bash script. File cleanup (BFG to follow)
Former-commit-id: fdd12fece3 [formerly 87b04ceb9008fabd80258f5c979b9d238411e748] [formerly cd38a9b42c4973e454f8d7b7208539c7bcc6495e]
Former-commit-id: c770542b274873228b4eb8bf5cff3210a8876e84
Former-commit-id: db0f8a35610270ed4b381463c8cc4c83a56f5726
2020-03-01 21:17:12 -08:00
nathan 414d8aed65 changed doubles to float. wrote out mapdata.bin and read in, this is still hacky, but compiles faster now
Former-commit-id: 59f44288ca1838e89e1f8c7463e88e91d5252c4b
Former-commit-id: 8894cdb766d205bf630d4de44701894a53b95b12
2020-02-26 22:44:30 -08:00
nathan 954f70dd04 changed doubles to float. wrote out mapdata.bin and read in, this is still hacky, but compiles faster now
Former-commit-id: 414d8aed65 [formerly 8894cdb766d205bf630d4de44701894a53b95b12] [formerly 59f44288ca1838e89e1f8c7463e88e91d5252c4b]
Former-commit-id: 197667cbaa98c5fd5d4b1ef504d579d5ff6f8100
Former-commit-id: a0e785034d5709b7f7fdfa9eb4fd1c8e0332f507
2020-02-26 22:44:30 -08:00