gui alignment and bugfix (#38)

zacharyburnett · web-flow · commit a9411de754ba · 2020-11-16T12:35:53.000-05:00
* update example * plotting with `matplotlib` (#36) * add plotting * manipulate plotting windows * formatting * GUI alignment and end date bugfix
diff --git a/client/gui.py b/client/gui.py
@@ -100,7 +100,11 @@ def __init__(
         )
 
         self.__add_entry_box(
-            configuration_frame, title='callsigns', label='Callsigns', width=55, columnspan=3
+            configuration_frame,
+            title='callsigns',
+            label='Callsigns',
+            width=55,
+            columnspan=configuration_frame.grid_size()[0],
         )
         self.__file_selection_option = 'select file...'
         self.__add_combo_box(
@@ -110,7 +114,7 @@ def __init__(
             options=list(available_serial_ports()) + [self.__file_selection_option],
             option_select=self.__select_tnc,
             width=52,
-            columnspan=3,
+            columnspan=configuration_frame.grid_size()[0],
             sticky='w',
         )
 
@@ -128,20 +132,49 @@ def __init__(
             title='log_file',
             file_select=self.__select_log_file,
             label='Log',
-            width=55,
-            columnspan=3,
+            width=52,
+            columnspan=configuration_frame.grid_size()[0],
             sticky='w',
         )
         self.__add_file_box(
             configuration_frame,
             title='output_file',
             file_select=self.__select_output_file,
             label='Output',
-            width=55,
-            columnspan=3,
+            width=52,
+            columnspan=configuration_frame.grid_size()[0],
             sticky='w',
         )
 
+        separator = Separator(configuration_frame, orient=tkinter.HORIZONTAL)
+        separator.grid(
+            row=configuration_frame.grid_size()[1],
+            column=0,
+            columnspan=configuration_frame.grid_size()[0] + 1,
+            sticky='ew',
+            pady=10,
+        )
+
+        plot_label = tkinter.Label(configuration_frame, text='Plots')
+        plot_label.grid(row=configuration_frame.grid_size()[1], column=0, sticky='w')
+
+        plot_checkbox_frame = tkinter.Frame(configuration_frame)
+        plot_checkbox_frame.grid(
+            row=plot_label.grid_info()['row'],
+            column=0,
+            columnspan=configuration_frame.grid_size()[0] - 1,
+        )
+
+        plot_variables = ['altitude', 'ascent_rate', 'ground_speed']
+        self.__plot_toggles = {}
+        for plot_index, plot in enumerate(plot_variables):
+            boolean_var = tkinter.BooleanVar()
+            plot_checkbox = tkinter.Checkbutton(
+                plot_checkbox_frame, text=plot, variable=boolean_var
+            )
+            plot_checkbox.grid(row=0, column=plot_index, padx=10)
+            self.__plot_toggles[plot] = boolean_var
+
         separator = Separator(main_window, orient=tkinter.HORIZONTAL)
         separator.grid(row=main_window.grid_size()[1], column=0, sticky='ew')
 
@@ -277,7 +310,7 @@ def end_date(self, end_date: datetime):
             end_date = f'{end_date:%Y-%m-%d %H:%M:%S}'
         else:
             end_date = ''
-        self.replace_text(self.__elements['start_date'], end_date)
+        self.replace_text(self.__elements['end_date'], end_date)
 
     @property
     def log_filename(self) -> Path:
@@ -320,9 +353,7 @@ def output_filename(self, filename: PathLike):
             if not isinstance(filename, Path):
                 filename = Path(filename)
             if filename.expanduser().resolve().is_dir():
-                filename = (
-                        filename / f'packetraven_output_{datetime.now():%Y%m%dT%H%M%S}.geojson'
-                )
+                filename = filename / f'packetraven_output_{datetime.now():%Y%m%dT%H%M%S}.txt'
         else:
             filename = ''
         self.replace_text(self.__elements['output_file'], filename)
@@ -354,8 +385,12 @@ def __select_output_file(self):
             title='Create output file...',
             initialdir=self.output_filename.parent,
             initialfile=self.output_filename.stem,
-            defaultextension='.geojson',
-            filetypes=[('GeoJSON', '*.geojson'), ('Keyhole Markup Language', '*.kml')],
+            defaultextension='.txt',
+            filetypes=[
+                ('Text', '*.txt'),
+                ('GeoJSON', '*.geojson'),
+                ('Keyhole Markup Language', '*.kml'),
+            ],
         )
 
     def __select_tnc(self, event):
@@ -384,18 +419,43 @@ def __add_combo_box(
     def __add_file_box(
             self, frame: tkinter.Frame, title: str, file_select: Callable, **kwargs
     ) -> tkinter.Entry:
-        file_box = self.__add_entry_box(frame, title, **kwargs)
-        log_file_button = tkinter.Button(frame, text='...', command=file_select)
-        log_file_button.grid(
-            row=file_box.grid_info()['row'],
-            column=file_box.grid_info()['column'] + file_box.grid_info()['columnspan'],
+        if 'row' not in kwargs:
+            kwargs['row'] = frame.grid_size()[1]
+        if 'column' not in kwargs:
+            kwargs['column'] = 0
+        file_box_kwargs = {
+            key: value
+            for key, value in kwargs.items()
+            if key in ['row', 'column', 'columnspan']
+        }
+        if 'columnspan' in file_box_kwargs:
+            file_box_kwargs['columnspan'] -= 1
+
+        if 'label' in kwargs:
+            text_label = tkinter.Label(frame, text=kwargs['label'])
+            text_label.grid(row=kwargs['row'], column=kwargs['column'], sticky='w')
+            file_box_kwargs['column'] += 1
+
+        file_box_frame = tkinter.Frame(frame)
+        file_box_frame.grid(**file_box_kwargs)
+
+        file_box = tkinter.Entry(
+            file_box_frame, width=kwargs['width'] if 'width' in kwargs else None
         )
+        file_button = tkinter.Button(file_box_frame, text='...', command=file_select)
+
+        file_box.pack(side='left')
+        file_button.pack(side='left')
+
+        self.__elements[title] = file_box
         return file_box
 
     def __add_entry_box(self, frame: tkinter.Frame, title: str, **kwargs) -> tkinter.Entry:
-        width = kwargs['width'] if 'width' in kwargs else None
-        entry_box = tkinter.Entry(frame, width=width)
-        return self.__add_text_box(frame, title, text_box=entry_box, **kwargs)
+        if 'text_box' not in kwargs:
+            kwargs['text_box'] = tkinter.Entry(
+                frame, width=kwargs['width'] if 'width' in kwargs else None
+            )
+        return self.__add_text_box(frame, title, **kwargs)
 
     def __add_text_box(
             self,
@@ -414,6 +474,12 @@ def __add_text_box(
         if column is None:
             column = 0
 
+        if 'columnspan' in kwargs:
+            if label is not None:
+                kwargs['columnspan'] -= 1
+            if units is not None:
+                kwargs['columnspan'] -= 1
+
         if label is not None:
             text_label = tkinter.Label(frame, text=label)
             text_label.grid(row=row, column=column, sticky='w')
@@ -572,6 +638,15 @@ def toggle(self):
                             if database_password is None or len(database_password) == 0:
                                 raise ConnectionError('missing database password')
                             database_kwargs['password'] = database_password
+                        if 'table' not in database_kwargs or database_kwargs['table'] is None:
+                            database_table = simpledialog.askstring(
+                                'Database Table',
+                                f'enter database table name',
+                                parent=self.__windows['main'],
+                            )
+                            if database_table is None or len(database_table) == 0:
+                                raise ConnectionError('missing database table name')
+                            database_kwargs['table'] = database_table
 
                         self.database = APRSDatabaseTable(
                             **database_kwargs, **ssh_tunnel_kwargs, callsigns=self.callsigns
diff --git a/packetraven/packets.py b/packetraven/packets.py
@@ -147,9 +147,7 @@ def ground_speed(self) -> float:
         return self.__horizontal / self.seconds if self.seconds > 0 else 0
 
     def __str__(self) -> str:
-        return (
-            f'{self.seconds}s, {self.ascent:6.2f}m vertical, {self.overground:6.2f}m horizontal'
-        )
+        return f'{self.seconds}s, {self.ascent:6.2f}m vertical, {self.overground:6.2f}m horizontal'
 
     def __repr__(self) -> str:
         return (
diff --git a/packetraven/plotting.py b/packetraven/plotting.py
@@ -8,8 +8,18 @@
 
 VARIABLES = {
     'altitude': {'x': 'times', 'y': 'altitudes', 'xlabel': 'time', 'ylabel': 'altitude (m)'},
-    'ascent_rate': {'x': 'times', 'y': 'ascent_rates', 'xlabel': 'time', 'ylabel': 'ascent rate (m/s)'},
-    'ground_speed': {'x': 'ground_speeds', 'y': 'altitudes', 'xlabel': 'ground speed (m/s)', 'ylabel': 'altitude (m)'}
+    'ascent_rate': {
+        'x': 'times',
+        'y': 'ascent_rates',
+        'xlabel': 'time',
+        'ylabel': 'ascent rate (m/s)',
+    },
+    'ground_speed': {
+        'x': 'ground_speeds',
+        'y': 'altitudes',
+        'xlabel': 'ground speed (m/s)',
+        'ylabel': 'altitude (m)',
+    },
 }
 
 
@@ -43,6 +53,7 @@ def update(self, packet_tracks: {str: LocationPacketTrack} = None):
                     getattr(packet_track, VARIABLES[self.variable]['x']),
                     getattr(packet_track, VARIABLES[self.variable]['y']),
                     label=packet_track.name,
+                    s=2,
                 )
 
             self.axis.legend()
diff --git a/packetraven/writer.py b/packetraven/writer.py
@@ -14,8 +14,15 @@ def write_aprs_packet_tracks(packet_tracks: [APRSTrack], output_filename: PathLi
     if not isinstance(output_filename, Path):
         output_filename = Path(output_filename)
     output_filename = output_filename.resolve().expanduser()
-    extension = output_filename.suffix
-    if extension == '.geojson':
+    if output_filename.suffix == '.txt':
+        packets = []
+        for packet_track_index, packet_track in enumerate(packet_tracks):
+            packets.extend(packet_track)
+        packets = sorted(packets)
+        lines = [f'{packet.time:%Y-%m-%d %H:%M:%S %Z}: {packet.frame}' for packet in packets]
+        with open(output_filename, 'w') as output_file:
+            output_file.writelines(lines)
+    elif output_filename.suffix == '.geojson':
         import geojson
 
         features = []
@@ -55,7 +62,7 @@ def write_aprs_packet_tracks(packet_tracks: [APRSTrack], output_filename: PathLi
 
         with open(output_filename, 'w') as output_file:
             geojson.dump(features, output_file)
-    elif extension == '.kml':
+    elif output_filename.suffix == '.kml':
         from fastkml import kml
 
         output_kml = kml.KML()
@@ -93,5 +100,5 @@ def write_aprs_packet_tracks(packet_tracks: [APRSTrack], output_filename: PathLi
             output_file.write(output_kml.to_string())
     else:
         raise NotImplementedError(
-            f'saving to file type "{extension}" has not been implemented'
+            f'saving to file type "{output_filename.suffix}" has not been implemented'
         )
diff --git a/tests/test_writer.py b/tests/test_writer.py
@@ -6,50 +6,43 @@
 from packetraven.tracks import APRSTrack
 from packetraven.writer import write_aprs_packet_tracks
 
+PACKET_TRACK = APRSTrack(
+    'W3EAX-13',
+    [
+        APRSPacket.from_frame(
+            "W3EAX-8>APRS,WIDE1-1,WIDE2-1,qAR,K3DO-11:!/:Gh=:j)#O   /A=026909|!Q|  /W3EAX,262,0,18'C,http://www.umd.edu",
+            packet_time=datetime(2018, 11, 11, 10, 20, 13),
+        ),
+        APRSPacket.from_frame(
+            "W3EAX-8>APRS,N3TJJ-12,WIDE1*,WIDE2-1,qAR,N3FYI-2:!/:GiD:jcwO   /A=028365|!R|  /W3EAX,267,0,18'C,"
+            'http://www.umd.edu',
+            packet_time=datetime(2018, 11, 11, 10, 21, 24),
+        ),
+        APRSPacket.from_frame(
+            "W3EAX-13>APRS,KC3FIT-1,WIDE1*,WIDE2-1,qAR,KC3AWP-10:!/:JL2:u4wO   /A=043080|!j|  /W3EAX,326,0,20'C,"
+            'nearspace.umd.edu',
+            packet_time=datetime(2019, 2, 3, 14, 39, 28),
+        ),
+    ],
+)
 
-def test_write_kml():
-    packet_1 = APRSPacket.from_frame(
-        "W3EAX-8>APRS,WIDE1-1,WIDE2-1,qAR,K3DO-11:!/:Gh=:j)#O   /A=026909|!Q|  /W3EAX,262,0,18'C,http://www.umd.edu",
-        packet_time=datetime(2018, 11, 11, 10, 20, 13),
-    )
-    packet_2 = APRSPacket.from_frame(
-        "W3EAX-8>APRS,N3TJJ-12,WIDE1*,WIDE2-1,qAR,N3FYI-2:!/:GiD:jcwO   /A=028365|!R|  /W3EAX,267,0,18'C,"
-        'http://www.umd.edu',
-        packet_time=datetime(2018, 11, 11, 10, 21, 24),
-    )
-    packet_3 = APRSPacket.from_frame(
-        "W3EAX-13>APRS,KC3FIT-1,WIDE1*,WIDE2-1,qAR,KC3AWP-10:!/:JL2:u4wO   /A=043080|!j|  /W3EAX,326,0,20'C,"
-        'nearspace.umd.edu',
-        packet_time=datetime(2019, 2, 3, 14, 39, 28),
-    )
-
-    track = APRSTrack('W3EAX-13', [packet_1, packet_2, packet_3])
 
+def test_write_kml():
     with TemporaryDirectory() as temporary_directory:
         output_filename = Path(temporary_directory) / 'test_output.kml'
-        write_aprs_packet_tracks([track], output_filename)
+        write_aprs_packet_tracks([PACKET_TRACK], output_filename)
         assert output_filename.exists()
 
 
 def test_write_geojson():
-    packet_1 = APRSPacket.from_frame(
-        "W3EAX-8>APRS,WIDE1-1,WIDE2-1,qAR,K3DO-11:!/:Gh=:j)#O   /A=026909|!Q|  /W3EAX,262,0,18'C,http://www.umd.edu",
-        packet_time=datetime(2018, 11, 11, 10, 20, 13),
-    )
-    packet_2 = APRSPacket.from_frame(
-        "W3EAX-8>APRS,N3TJJ-12,WIDE1*,WIDE2-1,qAR,N3FYI-2:!/:GiD:jcwO   /A=028365|!R|  /W3EAX,267,0,18'C,"
-        'http://www.umd.edu',
-        packet_time=datetime(2018, 11, 11, 10, 21, 24),
-    )
-    packet_3 = APRSPacket.from_frame(
-        "W3EAX-13>APRS,KC3FIT-1,WIDE1*,WIDE2-1,qAR,KC3AWP-10:!/:JL2:u4wO   /A=043080|!j|  /W3EAX,326,0,20'C,"
-        'nearspace.umd.edu',
-        packet_time=datetime(2019, 2, 3, 14, 39, 28),
-    )
-
-    track = APRSTrack('W3EAX-13', [packet_1, packet_2, packet_3])
-
     with TemporaryDirectory() as temporary_directory:
         output_filename = Path(temporary_directory) / 'test_output.geojson'
-        write_aprs_packet_tracks([track], output_filename)
+        write_aprs_packet_tracks([PACKET_TRACK], output_filename)
+        assert output_filename.exists()
+
+
+def test_write_txt():
+    with TemporaryDirectory() as temporary_directory:
+        output_filename = Path(temporary_directory) / 'test_output.txt'
+        write_aprs_packet_tracks([PACKET_TRACK], output_filename)
         assert output_filename.exists()
