Commit bdc6420a by Corey Koval

Updated LOB Colors

parent de7f5c5d
# DF Aggregator # DF Aggregator
## Christmas Update: ## Recent Changes:
- The LOB for each receiver on the map is now red for low confidence LOBs and green
for high confidence LOBs.
- Receivers on map update every 2.5 Seocnds.
- To customize this change `refreshrate` at the top of `static/receiver_configurator.js`.
## Previous Changes
- Your old database files will not work directly with this latest commit. Several changes have been made - Your old database files will not work directly with this latest commit. Several changes have been made
to the database structure to accomodate new features. to the database structure to accomodate new features.
- Now introducing Single Receiver Mode! This will give you functionality similar to, but better than - Now introducing Single Receiver Mode! This will give you functionality similar to, but better than
...@@ -9,8 +15,6 @@ ...@@ -9,8 +15,6 @@
- The access token is now optional. - The access token is now optional.
- Be on the lookout for documention and tutorials between Christmas and New Years. - Be on the lookout for documention and tutorials between Christmas and New Years.
- Behind the scenes, there have been several optimizations. - Behind the scenes, there have been several optimizations.
## Previous Changes:
- Added option to invert (uninvert?) the DOA bearing. If you're using a KerberosSDR, - Added option to invert (uninvert?) the DOA bearing. If you're using a KerberosSDR,
keep this option checked. keep this option checked.
- LOBs are drawn for each receiver. The orange lines extending from each receiver - LOBs are drawn for each receiver. The orange lines extending from each receiver
...@@ -31,7 +35,7 @@ Click the power button to enable/disable. ...@@ -31,7 +35,7 @@ Click the power button to enable/disable.
- Black is enabled, red is disabled. - Black is enabled, red is disabled.
- If you lose connectivity to a receiver, that particular receiver will be disabled. - If you lose connectivity to a receiver, that particular receiver will be disabled.
Click the power button to try to reconnect. Click the power button to try to reconnect.
- Map refreshes every ~~5~~ 10 seconds. Change `refreshrate` at the top of `static/receiver_configurator.js` to change the refresh rate. - ~~Map refreshes every 5 seconds. Change `refreshrate` at the top of `static/receiver_configurator.js` to change the refresh rate.~~
## Dependencies: ## Dependencies:
- Python >= 3.6 - Python >= 3.6
......
...@@ -529,6 +529,9 @@ def write_czml(best_point, all_the_points, ellipsedata): ...@@ -529,6 +529,9 @@ def write_czml(best_point, all_the_points, ellipsedata):
def write_rx_czml(): def write_rx_czml():
response.set_header('Cache-Control', 'no-cache, no-store, must-revalidate, max-age=0') response.set_header('Cache-Control', 'no-cache, no-store, must-revalidate, max-age=0')
height = 50 height = 50
min_conf = ms.min_conf
green = [0,255,0,255]
red = [255,0,0,255]
receiver_point_packets = [] receiver_point_packets = []
lob_packets = [] lob_packets = []
top = Preamble(name="Receivers") top = Preamble(name="Receivers")
...@@ -543,6 +546,7 @@ def write_rx_czml(): ...@@ -543,6 +546,7 @@ def write_rx_czml():
for index, x in enumerate(receivers): for index, x in enumerate(receivers):
if x.isActive and ms.receiving: if x.isActive and ms.receiving:
lob_color = green if x.confidence > min_conf else red
lob_start_lat = x.latitude lob_start_lat = x.latitude
lob_start_lon = x.longitude lob_start_lon = x.longitude
lob_stop_lat, lob_stop_lon = v.direct(lob_start_lat, lob_start_lon, x.doa, d) lob_stop_lat, lob_stop_lon = v.direct(lob_start_lat, lob_start_lon, x.doa, d)
...@@ -550,7 +554,7 @@ def write_rx_czml(): ...@@ -550,7 +554,7 @@ def write_rx_czml():
polyline=Polyline( polyline=Polyline(
material= Material( polylineOutline = material= Material( polylineOutline =
PolylineOutlineMaterial( PolylineOutlineMaterial(
color= Color(rgba=[255, 140, 0, 255]), color= Color(rgba=lob_color),
outlineColor= Color(rgba=[0, 0, 0, 255]), outlineColor= Color(rgba=[0, 0, 0, 255]),
outlineWidth= 2 outlineWidth= 2
)), )),
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
// Update Map every n milliseconds // Update Map every n milliseconds
var refreshrate = 5000; var refreshrate = 2500;
var autoRefresh = setInterval(function () { reloadRX(); }, refreshrate); var autoRefresh = setInterval(function () { reloadRX(); }, refreshrate);
// ************************************************* // *************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment