Add human readable time (#63)

swri-robotics · Sep 20, 2023 · 0e7ac45 · 0e7ac45
1 parent 36b88ba
commit 0e7ac45
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 9 deletions.
diff --git a/include/swri_console/log_database_proxy_model.h b/include/swri_console/log_database_proxy_model.h
@@ -92,6 +92,7 @@ class LogDatabaseProxyModel : public QAbstractListModel
   void minTimeUpdated();
   void setDisplayTime(bool display);
   void setAbsoluteTime(bool absolute);
+  void setHumanReadableTime(bool human_readable_time);
   void setDisplayLogger(bool logger_name);
   void setDisplayFunction(bool function_name);
   void setColorizeLogs(bool colorize_logs);
@@ -110,6 +111,7 @@ class LogDatabaseProxyModel : public QAbstractListModel
   bool colorize_logs_;
   bool display_time_;
   bool display_absolute_time_;
+  bool human_readable_time_;
   bool display_logger_;
   bool display_function_;
   bool use_regular_expressions_;

diff --git a/include/swri_console/settings_keys.h b/include/swri_console/settings_keys.h
@@ -46,6 +46,7 @@ namespace swri_console
   public:
     static const QString DISPLAY_TIMESTAMPS;
     static const QString ABSOLUTE_TIMESTAMPS;
+    static const QString HUMAN_READABLE_TIME;
     static const QString DISPLAY_LOGGER;
     static const QString DISPLAY_FUNCTION;
     static const QString USE_REGEXPS;

diff --git a/src/console_window.cpp b/src/console_window.cpp
@@ -102,6 +102,9 @@ ConsoleWindow::ConsoleWindow(LogDatabase *db)
   QObject::connect(ui.action_AbsoluteTimestamps, SIGNAL(toggled(bool)),
                    db_proxy_, SLOT(setAbsoluteTime(bool)));
 
+  QObject::connect(ui.action_Use_human_readable_time, SIGNAL(toggled(bool)),
+                   db_proxy_, SLOT(setHumanReadableTime(bool)));
+
   QObject::connect(ui.action_ShowTimestamps, SIGNAL(toggled(bool)),
                    db_proxy_, SLOT(setDisplayTime(bool)));
 
@@ -626,6 +629,7 @@ void ConsoleWindow::loadSettings()
   // First, load all the boolean settings...
   loadBooleanSetting(SettingsKeys::DISPLAY_TIMESTAMPS, ui.action_ShowTimestamps);
   loadBooleanSetting(SettingsKeys::ABSOLUTE_TIMESTAMPS, ui.action_AbsoluteTimestamps);
+  loadBooleanSetting(SettingsKeys::HUMAN_READABLE_TIME, ui.action_Use_human_readable_time);
   loadBooleanSetting(SettingsKeys::USE_REGEXPS, ui.action_RegularExpressions);
   loadBooleanSetting(SettingsKeys::COLORIZE_LOGS, ui.action_ColorizeLogs);
   loadBooleanSetting(SettingsKeys::FOLLOW_NEWEST, ui.checkFollowNewest);
@@ -634,11 +638,13 @@ void ConsoleWindow::loadSettings()
   // into a single integer mask under the hood.  First they have to be loaded from the settings,
   // then set in the UI, then the mask has to actually be applied.
   QSettings settings;
+  bool displayTimestamp = settings.value(SettingsKeys::DISPLAY_TIMESTAMPS, true).toBool();
   bool showDebug = settings.value(SettingsKeys::SHOW_DEBUG, true).toBool();
   bool showInfo = settings.value(SettingsKeys::SHOW_INFO, true).toBool();
   bool showWarn = settings.value(SettingsKeys::SHOW_WARN, true).toBool();
   bool showError = settings.value(SettingsKeys::SHOW_ERROR, true).toBool();
   bool showFatal = settings.value(SettingsKeys::SHOW_FATAL, true).toBool();
+  ui.action_Use_human_readable_time->setEnabled(displayTimestamp);
   ui.checkDebug->setChecked(showDebug);
   ui.checkInfo->setChecked(showInfo);
   ui.checkWarn->setChecked(showWarn);

diff --git a/src/log_database_proxy_model.cpp b/src/log_database_proxy_model.cpp
@@ -31,14 +31,12 @@
 #include <cstdio>
 #include <algorithm>
 #include <iterator>
+#include <iomanip>
+#include <chrono>
+#include <ctime>
 
 #include <rclcpp/rclcpp.hpp>
 
-//#include <rosbag2/logging.hpp>
-//#include <rosbag2/types.hpp>
-//#include <rosbag2/writer.hpp>
-//#include <rosbag2_storage/logging.hpp>
-
 #include <swri_console/log_database_proxy_model.h>
 #include <swri_console/log_database.h>
 #include <swri_console/settings_keys.h>
@@ -59,6 +57,7 @@ LogDatabaseProxyModel::LogDatabaseProxyModel(LogDatabase *db)
   , colorize_logs_(true)
   , display_time_(true)
   , display_absolute_time_(false)
+  , human_readable_time_(false)
   , display_logger_(true)
   , display_function_(true)
   , use_regular_expressions_(false)
@@ -110,6 +109,23 @@ void LogDatabaseProxyModel::setAbsoluteTime(bool absolute)
   }
 }
 
+void LogDatabaseProxyModel::setHumanReadableTime(bool human_readable_time)
+{
+  if (human_readable_time == human_readable_time_)
+  {
+    return;
+  }
+
+  human_readable_time_ = human_readable_time;
+
+  QSettings settings;
+  settings.setValue(SettingsKeys::HUMAN_READABLE_TIME, human_readable_time_);
+
+  if (display_time_ && msg_mapping_.size())
+  {
+    Q_EMIT dataChanged(index(0), index(msg_mapping_.size()));
+  }
+}
 
 void LogDatabaseProxyModel::setColorizeLogs(bool colorize_logs)
 {
@@ -410,9 +426,25 @@ QVariant LogDatabaseProxyModel::data(
 
     char stamp[128];
     if (display_absolute_time_) {
-      snprintf(stamp, sizeof(stamp),
-               "%f",
-               item.stamp.seconds());
+      if (human_readable_time_) {
+        char date_str[std::size("yyyy-mm-dd hh:mm:ss")];
+        const time_t time = static_cast<time_t>(item.stamp.seconds());
+        int32_t milliseconds = static_cast<int>(1000.0 * (item.stamp.seconds() - static_cast<double>(item.stamp.seconds())));
+        std::strftime(std::data(date_str),
+          std::size(date_str),
+          "%F %T",
+          std::localtime(&time));
+        snprintf(stamp,
+          sizeof(stamp),
+          "%s:%03d",
+          date_str,
+          milliseconds);
+      } else {
+        snprintf(stamp,
+          sizeof(stamp),
+          "%f",
+          item.stamp.seconds());
+      }
     } else {
       rclcpp::Duration t = item.stamp - db_->minTime();
 

diff --git a/src/settings_keys.cpp b/src/settings_keys.cpp
@@ -34,6 +34,7 @@ namespace swri_console
 {
   const QString SettingsKeys::DISPLAY_TIMESTAMPS = "Timestamps/DisplayTimestamps";
   const QString SettingsKeys::ABSOLUTE_TIMESTAMPS = "Timestamps/AbsoluteTimestamps";
+  const QString SettingsKeys::HUMAN_READABLE_TIME = "Timestamps/HumanReadableTime";
   const QString SettingsKeys::DISPLAY_LOGGER = "Identification/Logger";
   const QString SettingsKeys::DISPLAY_FUNCTION = "Identification/Function";
   const QString SettingsKeys::USE_REGEXPS = "Filters/UseRegexps";

diff --git a/ui/console_window.ui b/ui/console_window.ui
@@ -298,7 +298,7 @@
      <x>0</x>
      <y>0</y>
      <width>1035</width>
-     <height>24</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_File">
@@ -326,6 +326,7 @@
      <string>Options</string>
     </property>
     <addaction name="action_ShowTimestamps"/>
+    <addaction name="action_Use_human_readable_time"/>
     <addaction name="action_AbsoluteTimestamps"/>
     <addaction name="action_ShowLoggerName"/>
     <addaction name="action_ShowFunctionName"/>
@@ -493,6 +494,14 @@
     <string>Show function name</string>
    </property>
   </action>
+  <action name="action_Use_human_readable_time">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Use human readable time</string>
+   </property>
+  </action>
  </widget>
  <tabstops>
   <tabstop>nodeList</tabstop>
@@ -536,5 +545,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>action_ShowTimestamps</sender>
+   <signal>triggered(bool)</signal>
+   <receiver>action_Use_human_readable_time</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>