Refactor satellite into an own module

merge-requests/52/head
Fabian P. Schmidt 2019-11-02 15:00:10 +01:00
parent fd2cf996bc
commit 54d4ee8895
3 changed files with 22 additions and 23 deletions

View File

@ -1 +1,2 @@
from .tle import twolineelement
from .satellite import satellite

View File

@ -0,0 +1,20 @@
class satellite:
"""Satellite class"""
def __init__(self, tle, transmitter, success_rate, good_count, data_count, mode):
"""Define a satellite"""
self.tle0 = tle.tle0
self.tle1 = tle.tle1
self.tle2 = tle.tle2
self.id = tle.id
self.name = tle.name.strip()
self.transmitter = transmitter
self.success_rate = success_rate
self.good_count = good_count
self.data_count = data_count
self.mode = mode
def __repr__(self):
return "%s %s %d %d %d %s %s" % (self.id, self.transmitter, self.success_rate, self.good_count,
self.data_count, self.mode, self.name)

View File

@ -12,7 +12,7 @@ from utils import get_active_transmitter_info, get_transmitter_stats, \
get_groundstation_info, get_scheduled_passes_from_network, ordered_scheduler, \
report_efficiency, find_passes, schedule_observation, read_priorities_transmitters, \
get_satellite_info, update_needed, get_priority_passes
from auto_scheduler import twolineelement
from auto_scheduler import twolineelement, satellite
import settings
from tqdm import tqdm
import sys
@ -20,28 +20,6 @@ import sys
_LOG_LEVEL_STRINGS = ['CRITICAL', 'ERROR', 'WARNING', 'INFO', 'DEBUG']
class satellite:
"""Satellite class"""
def __init__(self, tle, transmitter, success_rate, good_count, data_count, mode):
"""Define a satellite"""
self.tle0 = tle.tle0
self.tle1 = tle.tle1
self.tle2 = tle.tle2
self.id = tle.id
self.name = tle.name.strip()
self.transmitter = transmitter
self.success_rate = success_rate
self.good_count = good_count
self.data_count = data_count
self.mode = mode
def __repr__(self):
return "%s %s %d %d %d %s %s" % (self.id, self.transmitter, self.success_rate, self.good_count,
self.data_count, self.mode, self.name)
def _log_level_string_to_int(log_level_string):
if log_level_string not in _LOG_LEVEL_STRINGS:
message = 'invalid choice: {0} (choose from {1})'.format(log_level_string,