Merge 5f9e897 into b1f8525

include/ignition/gazebo/components/Serialization.hh

@@ -105,6 +105,7 @@ namespace serializers
                                            const DataType &_data)
     {
       MsgType msg;
+      // cppcheck-suppress syntaxError
       if constexpr (traits::HasGazeboConvert<DataType, MsgType>::value)
       {
         msg = ignition::gazebo::convert<MsgType>(_data);

src/gui/plugins/component_inspector/Altimeter.hh

@@ -32,7 +32,7 @@ namespace gazebo
 
     /// \brief Constructor
     /// \param[in] _inspector The component inspector.
-    public: Altimeter(ComponentInspector *_inspector);
+    public: explicit Altimeter(ComponentInspector *_inspector);
 
     /// \brief This function is called when a user changes values in the
     /// altimeter sensor's position noise.

src/gui/plugins/component_inspector/CMakeLists.txt

@@ -3,13 +3,15 @@ gz_add_gui_plugin(ComponentInspector
     AirPressure.cc
     Altimeter.cc
     ComponentInspector.cc
+    Imu.cc
     Magnetometer.cc
     ModelEditor.cc
     Types.cc
   QT_HEADERS
     AirPressure.hh
     Altimeter.hh
     ComponentInspector.hh
+    Imu.hh
     Magnetometer.hh
     ModelEditor.hh
     Types.hh

src/gui/plugins/component_inspector/ComponentInspector.cc

@@ -73,6 +73,7 @@
 #include "AirPressure.hh"
 #include "Altimeter.hh"
 #include "ComponentInspector.hh"
+#include "Imu.hh"
 #include "Magnetometer.hh"
 #include "ModelEditor.hh"
 
@@ -122,6 +123,9 @@ namespace ignition::gazebo
     /// \brief Altimeter sensor inspector elements
     public: std::unique_ptr<ignition::gazebo::Altimeter> altimeter;
 
+    /// \brief Imu inspector elements
+    public: std::unique_ptr<ignition::gazebo::Imu> imu;
+
     /// \brief Magnetometer inspector elements
     public: std::unique_ptr<ignition::gazebo::Magnetometer> magnetometer;
 
@@ -444,6 +448,9 @@ void ComponentInspector::LoadConfig(const tinyxml2::XMLElement *)
   // Create altimeter
   this->dataPtr->altimeter = std::make_unique<Altimeter>(this);
 
+  // Create the imu
+  this->dataPtr->imu = std::make_unique<Imu>(this);
+
   // Create the magnetometer
   this->dataPtr->magnetometer = std::make_unique<Magnetometer>(this);
 }

src/gui/plugins/component_inspector/ComponentInspector.qrc

@@ -5,6 +5,7 @@
   <file>Boolean.qml</file>
   <file>ComponentInspector.qml</file>
   <file>ExpandingTypeHeader.qml</file>
+  <file>Imu.qml</file>
   <file>Light.qml</file>
   <file>Magnetometer.qml</file>
   <file>NoData.qml</file>

src/gui/plugins/component_inspector/Imu.cc

@@ -0,0 +1,298 @@
+/*
+ * Copyright (C) 2021 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+*/
+#include <sdf/Imu.hh>
+
+#include <ignition/common/Console.hh>
+#include <ignition/gazebo/components/Imu.hh>
+#include <ignition/gazebo/EntityComponentManager.hh>
+
+#include "ComponentInspector.hh"
+#include "Imu.hh"
+#include "Types.hh"
+
+using namespace ignition;
+using namespace gazebo;
+
+/////////////////////////////////////////////////
+Imu::Imu(ComponentInspector *_inspector)
+{
+  _inspector->Context()->setContextProperty("ImuImpl", this);
+  this->inspector = _inspector;
+
+  ComponentCreator creator =
+    [=](EntityComponentManager &_ecm, Entity _entity, QStandardItem *_item)
+  {
+    auto comp = _ecm.Component<components::Imu>(_entity);
+    if (nullptr == _item || nullptr == comp)
+      return;
+    const sdf::Imu *imu = comp->Data().ImuSensor();
+
+    _item->setData(QString("Imu"),
+        ComponentsModel::RoleNames().key("dataType"));
+    _item->setData(QList({
+      QVariant(imu->LinearAccelerationXNoise().Mean()),
+      QVariant(imu->LinearAccelerationXNoise().BiasMean()),
+      QVariant(imu->LinearAccelerationXNoise().StdDev()),
+      QVariant(imu->LinearAccelerationXNoise().BiasStdDev()),
+      QVariant(imu->LinearAccelerationXNoise().DynamicBiasStdDev()),
+      QVariant(imu->LinearAccelerationXNoise().DynamicBiasCorrelationTime()),
+
+      QVariant(imu->LinearAccelerationYNoise().Mean()),
+      QVariant(imu->LinearAccelerationYNoise().BiasMean()),
+      QVariant(imu->LinearAccelerationYNoise().StdDev()),
+      QVariant(imu->LinearAccelerationYNoise().BiasStdDev()),
+      QVariant(imu->LinearAccelerationYNoise().DynamicBiasStdDev()),
+      QVariant(imu->LinearAccelerationYNoise().DynamicBiasCorrelationTime()),
+
+      QVariant(imu->LinearAccelerationZNoise().Mean()),
+      QVariant(imu->LinearAccelerationZNoise().BiasMean()),
+      QVariant(imu->LinearAccelerationZNoise().StdDev()),
+      QVariant(imu->LinearAccelerationZNoise().BiasStdDev()),
+      QVariant(imu->LinearAccelerationZNoise().DynamicBiasStdDev()),
+      QVariant(imu->LinearAccelerationZNoise().DynamicBiasCorrelationTime()),
+
+      QVariant(imu->AngularVelocityXNoise().Mean()),
+      QVariant(imu->AngularVelocityXNoise().BiasMean()),
+      QVariant(imu->AngularVelocityXNoise().StdDev()),
+      QVariant(imu->AngularVelocityXNoise().BiasStdDev()),
+      QVariant(imu->AngularVelocityXNoise().DynamicBiasStdDev()),
+      QVariant(imu->AngularVelocityXNoise().DynamicBiasCorrelationTime()),
+
+      QVariant(imu->AngularVelocityYNoise().Mean()),
+      QVariant(imu->AngularVelocityYNoise().BiasMean()),
+      QVariant(imu->AngularVelocityYNoise().StdDev()),
+      QVariant(imu->AngularVelocityYNoise().BiasStdDev()),
+      QVariant(imu->AngularVelocityYNoise().DynamicBiasStdDev()),
+      QVariant(imu->AngularVelocityYNoise().DynamicBiasCorrelationTime()),
+
+      QVariant(imu->AngularVelocityZNoise().Mean()),
+      QVariant(imu->AngularVelocityZNoise().BiasMean()),
+      QVariant(imu->AngularVelocityZNoise().StdDev()),
+      QVariant(imu->AngularVelocityZNoise().BiasStdDev()),
+      QVariant(imu->AngularVelocityZNoise().DynamicBiasStdDev()),
+      QVariant(imu->AngularVelocityZNoise().DynamicBiasCorrelationTime()),
+
+    }), ComponentsModel::RoleNames().key("data"));
+  };
+
+  this->inspector->RegisterComponentCreator(
+      components::Imu::typeId, creator);
+}
+
+/////////////////////////////////////////////////
+Q_INVOKABLE void Imu::OnLinearAccelerationXNoise(
+    double _mean, double _meanBias, double _stdDev,
+    double _stdDevBias, double _dynamicBiasStdDev,
+    double _dynamicBiasCorrelationTime)
+{
+  ignition::gazebo::UpdateCallback cb =
+      [=](EntityComponentManager &_ecm)
+  {
+    auto comp = _ecm.Component<components::Imu>(
+        this->inspector->Entity());
+    if (comp)
+    {
+      sdf::Imu *imu = comp->Data().ImuSensor();
+      if (imu)
+      {
+        sdf::Noise noise = imu->LinearAccelerationXNoise();
+
+        setNoise(noise, _mean, _meanBias, _stdDev, _stdDevBias,
+            _dynamicBiasStdDev, _dynamicBiasCorrelationTime);
+
+        imu->SetLinearAccelerationXNoise(noise);
+      }
+      else
+        ignerr << "Unable to get the imu linear acceleration x noise data.\n";
+    }
+    else
+    {
+      ignerr << "Unable to get the imu component.\n";
+    }
+  };
+  this->inspector->AddUpdateCallback(cb);
+}
+
+/////////////////////////////////////////////////
+Q_INVOKABLE void Imu::OnLinearAccelerationYNoise(
+    double _mean, double _meanBias, double _stdDev,
+    double _stdDevBias, double _dynamicBiasStdDev,
+    double _dynamicBiasCorrelationTime)
+{
+  ignition::gazebo::UpdateCallback cb =
+      [=](EntityComponentManager &_ecm)
+  {
+    auto comp = _ecm.Component<components::Imu>(
+        this->inspector->Entity());
+    if (comp)
+    {
+      sdf::Imu *imu = comp->Data().ImuSensor();
+      if (imu)
+      {
+        sdf::Noise noise = imu->LinearAccelerationYNoise();
+
+        setNoise(noise, _mean, _meanBias, _stdDev, _stdDevBias,
+            _dynamicBiasStdDev, _dynamicBiasCorrelationTime);
+
+        imu->SetLinearAccelerationYNoise(noise);
+      }
+      else
+        ignerr << "Unable to get the imu linear acceleration y noise data.\n";
+    }
+    else
+    {
+      ignerr << "Unable to get the imu component.\n";
+    }
+  };
+  this->inspector->AddUpdateCallback(cb);
+}
+
+/////////////////////////////////////////////////
+Q_INVOKABLE void Imu::OnLinearAccelerationZNoise(
+    double _mean, double _meanBias, double _stdDev,
+    double _stdDevBias, double _dynamicBiasStdDev,
+    double _dynamicBiasCorrelationTime)
+{
+  ignition::gazebo::UpdateCallback cb =
+      [=](EntityComponentManager &_ecm)
+  {
+    auto comp = _ecm.Component<components::Imu>(
+        this->inspector->Entity());
+    if (comp)
+    {
+      sdf::Imu *imu = comp->Data().ImuSensor();
+      if (imu)
+      {
+        sdf::Noise noise = imu->LinearAccelerationZNoise();
+
+        setNoise(noise, _mean, _meanBias, _stdDev, _stdDevBias,
+            _dynamicBiasStdDev, _dynamicBiasCorrelationTime);
+
+        imu->SetLinearAccelerationZNoise(noise);
+      }
+      else
+        ignerr << "Unable to get the imu linear acceleration z noise data.\n";
+    }
+    else
+    {
+      ignerr << "Unable to get the imu component.\n";
+    }
+  };
+  this->inspector->AddUpdateCallback(cb);
+}
+
+/////////////////////////////////////////////////
+Q_INVOKABLE void Imu::OnAngularVelocityXNoise(
+    double _mean, double _meanBias, double _stdDev,
+    double _stdDevBias, double _dynamicBiasStdDev,
+    double _dynamicBiasCorrelationTime)
+{
+  ignition::gazebo::UpdateCallback cb =
+      [=](EntityComponentManager &_ecm)
+  {
+    auto comp = _ecm.Component<components::Imu>(
+        this->inspector->Entity());
+    if (comp)
+    {
+      sdf::Imu *imu = comp->Data().ImuSensor();
+      if (imu)
+      {
+        sdf::Noise noise = imu->AngularVelocityXNoise();
+
+        setNoise(noise, _mean, _meanBias, _stdDev, _stdDevBias,
+            _dynamicBiasStdDev, _dynamicBiasCorrelationTime);
+
+        imu->SetAngularVelocityXNoise(noise);
+      }
+      else
+        ignerr << "Unable to get the imu angular velocity x noise data.\n";
+    }
+    else
+    {
+      ignerr << "Unable to get the imu component.\n";
+    }
+  };
+  this->inspector->AddUpdateCallback(cb);
+}
+
+/////////////////////////////////////////////////
+Q_INVOKABLE void Imu::OnAngularVelocityYNoise(
+    double _mean, double _meanBias, double _stdDev,
+    double _stdDevBias, double _dynamicBiasStdDev,
+    double _dynamicBiasCorrelationTime)
+{
+  ignition::gazebo::UpdateCallback cb =
+      [=](EntityComponentManager &_ecm)
+  {
+    auto comp = _ecm.Component<components::Imu>(
+        this->inspector->Entity());
+    if (comp)
+    {
+      sdf::Imu *imu = comp->Data().ImuSensor();
+      if (imu)
+      {
+        sdf::Noise noise = imu->AngularVelocityYNoise();
+
+        setNoise(noise, _mean, _meanBias, _stdDev, _stdDevBias,
+            _dynamicBiasStdDev, _dynamicBiasCorrelationTime);
+
+        imu->SetAngularVelocityYNoise(noise);
+      }
+      else
+        ignerr << "Unable to get the imu angular velocity y noise data.\n";
+    }
+    else
+    {
+      ignerr << "Unable to get the imu component.\n";
+    }
+  };
+  this->inspector->AddUpdateCallback(cb);
+}
+
+/////////////////////////////////////////////////
+Q_INVOKABLE void Imu::OnAngularVelocityZNoise(
+    double _mean, double _meanBias, double _stdDev,
+    double _stdDevBias, double _dynamicBiasStdDev,
+    double _dynamicBiasCorrelationTime)
+{
+  ignition::gazebo::UpdateCallback cb =
+      [=](EntityComponentManager &_ecm)
+  {
+    auto comp = _ecm.Component<components::Imu>(
+        this->inspector->Entity());
+    if (comp)
+    {
+      sdf::Imu *imu = comp->Data().ImuSensor();
+      if (imu)
+      {
+        sdf::Noise noise = imu->AngularVelocityZNoise();
+
+        setNoise(noise, _mean, _meanBias, _stdDev, _stdDevBias,
+            _dynamicBiasStdDev, _dynamicBiasCorrelationTime);
+
+        imu->SetAngularVelocityZNoise(noise);
+      }
+      else
+        ignerr << "Unable to get the imu angular velocity z noise data.\n";
+    }
+    else
+    {
+      ignerr << "Unable to get the imu component.\n";
+    }
+  };
+  this->inspector->AddUpdateCallback(cb);
+}