From 2977270282b85f4c6ea81d3884b3b474ddd1cc1c Mon Sep 17 00:00:00 2001
From: Michael Jeronimo <michael.jeronimo@openrobotics.org>
Date: Mon, 12 Oct 2020 15:43:16 -0700
Subject: [PATCH] Make the save and record dialogs work the same way

Previously, the code for getting the filename to record a bag, got
a prefix string fom the user and unconditionally appended a suffix
based on the current date/time. In contrast, the code for saving simply
let the user specify the output filename without further modification.

To make these dialogs more uniform in their behavior, this change
prepopulates both dialogs with a filename based on the current date/time.
The user is then free to take the name as-is, or modify it. The result
is then used as the filename for the bag file, resulting in consistent
behavior for Save (export whole bag or region) and Record.

Signed-off-by: Michael Jeronimo <michael.jeronimo@openrobotics.org>
---
 rqt_bag/src/rqt_bag/bag_widget.py | 35 ++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/rqt_bag/src/rqt_bag/bag_widget.py b/rqt_bag/src/rqt_bag/bag_widget.py
index 4cf1f6e..8ed0404 100644
--- a/rqt_bag/src/rqt_bag/bag_widget.py
+++ b/rqt_bag/src/rqt_bag/bag_widget.py
@@ -249,23 +249,21 @@ def _handle_record_clicked(self):
 
     def _on_record_settings_selected(self, all_topics, selected_topics):
         # TODO verify master is still running
-        filename = QFileDialog.getSaveFileName(
-            self, self.tr('Select prefix for new Bag File'), '.', self.tr('Bag files {.bag} (*.bag)'))
-        if filename[0] != '':
-            prefix = filename[0].strip()
 
-            # Get filename to record to
-            record_filename = time.strftime('%Y-%m-%d-%H-%M-%S.bag', time.localtime(time.time()))
-            if prefix.endswith('.bag'):
-                prefix = prefix[:-len('.bag')]
-            if prefix:
-                record_filename = '%s_%s' % (prefix, record_filename)
+        # Get the bag name to record to, prepopulating with a file name based on the current date/time
+        proposed_filename = time.strftime('%Y-%m-%d-%H-%M-%S', time.localtime(time.time()))
+        filename = QFileDialog.getSaveFileName(
+            self, self.tr('Select name for new bag'), proposed_filename, self.tr('Bag files {.bag} (*.bag)'))[0]
 
-            rospy.loginfo('Recording to %s.' % record_filename)
+        if filename != '':
+            filename = filename.strip()
+            if not filename.endswith('.bag'):
+                filename += ".bag"
 
+            # Begin recording
             self.load_button.setEnabled(False)
             self._recording = True
-            self._timeline.record_bag(record_filename, all_topics, selected_topics)
+            self._timeline.record_bag(filename, all_topics, selected_topics)
 
     def _handle_load_clicked(self):
         filenames = QFileDialog.getOpenFileNames(
@@ -317,10 +315,17 @@ def load_bag(self, filename):
         # self clear loading filename
 
     def _handle_save_clicked(self):
+        # Get the bag name to record to, prepopulating with a file name based on the current date/time
+        proposed_filename = time.strftime('%Y-%m-%d-%H-%M-%S', time.localtime(time.time()))
         filename = QFileDialog.getSaveFileName(
-            self, self.tr('Save selected region to file...'), '.', self.tr('Bag files {.bag} (*.bag)'))
-        if filename[0] != '':
-            self._timeline.copy_region_to_bag(filename[0])
+            self, self.tr('Save selected region...'), proposed_filename, self.tr('Bag files {.bag} (*.bag)'))[0]
+        if filename != '':
+            filename = filename.strip()
+            if not filename.endswith('.bag'):
+                filename += '.bag'
+
+            # Copy the highlighted region
+            self._timeline.copy_region_to_bag(filename)
 
     def _set_status_text(self, text):
         if text: