vatger/aman-sys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

define member variables with capital letters

Browse Source
This commit is contained in:
Sven Czarnian
2021-10-13 12:52:29 +02:00
parent 9d69a60396
commit 1e043e2765
15 changed files with 229 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
aman/AMAN.py
View File

@@ -27,12 +27,11 @@ class AMAN:
def __init__(self):
# default initialization of members
self.systemConfig = None
self.aircraftPerformance = None
self.receiver = None
self.weather = None
self.workers = []
self.inbounds = {}
self.SystemConfig = None
self.AircraftPerformance = None
self.Receiver = None
self.Weather = None
self.Workers = []
def __del__(self):
self.release()
@@ -41,19 +40,19 @@ class AMAN:
configPath = AMAN.findConfigPath()
# read all system relevant configuration files
self.systemConfig = System(os.path.join(configPath, 'System.ini'))
self.SystemConfig = System(os.path.join(configPath, 'System.ini'))
print('Parsed System.ini')
# read the aircraft performance data
self.aircraftPerformance = AircraftPerformance(os.path.join(configPath, 'PerformanceData.ini'))
if None == self.aircraftPerformance:
self.AircraftPerformance = AircraftPerformance(os.path.join(configPath, 'PerformanceData.ini'))
if None == self.AircraftPerformance:
sys.stderr.write('No aircraft performance data found!')
sys.exit(-1)
else:
print('Parsed PerformanceData.ini. Extracted ' + str(len(self.aircraftPerformance.Aircrafts)) + ' aircrafts')
print('Parsed PerformanceData.ini. Extracted ' + str(len(self.AircraftPerformance.Aircrafts)) + ' aircrafts')
self.weather = Weather()
self.weather.acquire(self.systemConfig.Weather)
self.Weather = Weather()
self.Weather.acquire(self.SystemConfig.Weather)
# find the airport configurations and create the workers
airportsPath = os.path.join(os.path.join(configPath, 'airports'), '*.ini')
@@ -65,33 +64,33 @@ class AMAN:
# initialize the worker thread
worker = Worker()
worker.acquire(icao, airportConfig, self.weather, self.aircraftPerformance)
self.workers.append(worker)
worker.acquire(icao, airportConfig, self.Weather, self.AircraftPerformance)
self.Workers.append(worker)
print('Started worker for ' + icao)
# create the EuroScope receiver
self.receiver = Euroscope()
self.receiver.acquire(configPath, self.systemConfig.Server, self)
self.Receiver = Euroscope()
self.Receiver.acquire(configPath, self.SystemConfig.Server, self)
def release(self):
if None != self.receiver:
self.receiver.release()
self.receiver = None
if None != self.Receiver:
self.Receiver.release()
self.Receiver = None
if None != self.weather:
self.weather.release()
self.weather = None
if None != self.Weather:
self.Weather.release()
self.Weather = None
if None != self.workers:
for worker in self.workers:
if None != self.Workers:
for worker in self.Workers:
worker.release()
self.workers = None
self.Workers = None
def updateAircraftReport(self, report : AircraftReport_pb2.AircraftReport):
# find the correct worker for the inbound
for worker in self.workers:
if worker.icao == report.destination:
for worker in self.Workers:
if worker.Icao == report.destination:
worker.acquireLock()
worker.reportQueue[report.aircraft.callsign] = report
worker.ReportQueue[report.aircraft.callsign] = report
worker.releaseLock()
break