dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

Add context menu which controls if graphs ignore drone control range or not, and add support for this option to RR graph

Browse Source
This commit is contained in:
DarkPhoenix
2019-09-27 18:40:33 +03:00
parent a43f9930de
commit 865978fcc1
4 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
graphs/data/fitRemoteReps/calc.py
View File

@@ -28,21 +28,26 @@ def getApplicationPerKey(src, distance):
for mod in src.item.activeModulesIter():
if not mod.isRemoteRepping():
continue
applicationMap[mod] = 1 if distance is None else calculateRangeFactor(
srcOptimalRange=mod.maxRange or 0,
srcFalloffRange=mod.falloff or 0,
distance=distance)
if distance is None:
applicationMap[mod] = 1
elif not GraphSettings.getInstance().get('ignoreLockRange') and distance > src.item.maxTargetRange:
applicationMap[mod] = 0
else:
applicationMap[mod] = calculateRangeFactor(
srcOptimalRange=mod.maxRange or 0,
srcFalloffRange=mod.falloff or 0,
distance=distance)
for drone in src.item.activeDronesIter():
if not drone.isRemoteRepping():
continue
if (
distance is None or
GraphSettings.getInstance().get('ignoreDCR') or
distance <= src.item.extraAttributes['droneControlRange']
):
if distance is None:
applicationMap[drone] = 1
else:
elif not GraphSettings.getInstance().get('ignoreDCR') and distance > src.item.extraAttributes['droneControlRange']:
applicationMap[drone] = 0
elif not GraphSettings.getInstance().get('ignoreLockRange') and distance > src.item.maxTargetRange:
applicationMap[drone] = 0
else:
applicationMap[drone] = 1
# Ensure consistent results - round off a little to avoid float errors
for k, v in applicationMap.items():
applicationMap[k] = floatUnerr(v)