Merge branch 'zcm-strings'

facontidavide · Nov 22, 2024 · add5819 · add5819
2 parents 5649838 + fd84957
commit add5819
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/plotjuggler_plugins/PluginsZcm/dataload_zcm.cpp b/plotjuggler_plugins/PluginsZcm/dataload_zcm.cpp
@@ -236,7 +236,7 @@ static void processData(const string& name, zcm_field_type_t type, const void* d
       v->numerics.emplace_back(name, toDouble<bool>(data));
       break;
     case ZCM_FIELD_STRING:
-      v->strings.emplace_back(name, string((const char*)data));
+      v->strings.emplace_back(name, string(*((const char**)data)));
       break;
     case ZCM_FIELD_USER_TYPE:
       assert(false && "Should not be possble");
@@ -269,7 +269,7 @@ bool DataLoadZcm::readDataFromFile(FileLoadInfo* info, PlotDataMapRef& plot_data
 
   vector<pair<string, double>> numerics;
   vector<pair<string, string>> strings;
-  ProcessUsr usr = { numerics, strings };
+  ProcessUsr usr { numerics, strings };
 
   auto processEvent = [&](const zcm::LogEvent* evt) {
     if (_selected_channels.find(evt->channel) == _selected_channels.end())

diff --git a/plotjuggler_plugins/PluginsZcm/datastream_zcm.cpp b/plotjuggler_plugins/PluginsZcm/datastream_zcm.cpp
@@ -216,7 +216,7 @@ void DataStreamZcm::processData(const string& name, zcm_field_type_t type,
       me->_numerics.emplace_back(name, toDouble<bool>(data));
       break;
     case ZCM_FIELD_STRING:
-      me->_strings.emplace_back(name, string((const char*)data));
+      me->_strings.emplace_back(name, string(*((const char**)data)));
       break;
     case ZCM_FIELD_USER_TYPE:
       assert(false && "Should not be possble");