Alternative implementation using function overloading

mjcarroll · mjcarroll · commit 37eade487000 · 2021-11-08T08:17:35.000-06:00
Signed-off-by: Michael Carroll &lt;michael@openrobotics.org&gt;
diff --git a/src/gui/plugins/component_inspector/AirPressure.cc b/src/gui/plugins/component_inspector/AirPressure.cc
@@ -64,6 +64,7 @@ Q_INVOKABLE void AirPressure::OnAirPressureNoise(
     double _stdDevBias, double _dynamicBiasStdDev,
     double _dynamicBiasCorrelationTime)
 {
+  igndbg << "here" << std::endl;
   ignition::gazebo::UpdateCallback cb =
       [=](EntityComponentManager &_ecm)
   {
diff --git a/src/gui/plugins/component_inspector/AirPressure.qml b/src/gui/plugins/component_inspector/AirPressure.qml
@@ -124,10 +124,10 @@ Rectangle {
           dynamicBiasStdDev: model.data[5]
           dynamicBiasCorrelationTime: model.data[6]
 
-          // Connect to the onNoiseUpdate signal in Noise.qml
-          Component.onCompleted: {
-            pressureNoise.onNoiseUpdate.connect(
-                componentInspector.onAirPressureNoise)
+          function onNoiseUpdate(_mean, _meanBias, _stdDev,
+              _stdDevBias, _dynamicBiasStdDev, _dynamicBiasCorrelationTime) {
+            componentInspector.onAirPressureNoise(_mean, _meanBias, _stdDev,
+                _stdDevBias, _dynamicBiasStdDev, _dynamicBiasCorrelationTime);
           }
         }
       }
diff --git a/src/gui/plugins/component_inspector/Noise.qml b/src/gui/plugins/component_inspector/Noise.qml
@@ -51,9 +51,9 @@ Rectangle {
 
   // Signal that a user of this component can connect to in order to receive
   // noise updates 
-  signal onNoiseUpdate(double _mean, double _meanBias, double _stdDev,
-      double _stdDevBias, double _dynamicBiasStdDev,
-      double _dynamicBiasCorrelationTime)
+  function onNoiseUpdate(_mean, _meanBias, _stdDev,
+      _stdDevBias, _dynamicBiasStdDev, _dynamicBiasCorrelationTime) {}
+
 
   // Display the main content
   Column {

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ Q_INVOKABLE void AirPressure::OnAirPressureNoise(`
`64`	`64`	`double _stdDevBias, double _dynamicBiasStdDev,`
`65`	`65`	`double _dynamicBiasCorrelationTime)`
`66`	`66`	`{`
	`67`	`+ igndbg << "here" << std::endl;`
`67`	`68`	`ignition::gazebo::UpdateCallback cb =`
`68`	`69`	`[=](EntityComponentManager &_ecm)`
`69`	`70`	`{`
Original file line number	Diff line number	Diff line change
`@@ -124,10 +124,10 @@ Rectangle {`
`124`	`124`	`dynamicBiasStdDev: model.data[5]`
`125`	`125`	`dynamicBiasCorrelationTime: model.data[6]`
`126`	`126`
`127`		`- // Connect to the onNoiseUpdate signal in Noise.qml`
`128`		`- Component.onCompleted: {`
`129`		`- pressureNoise.onNoiseUpdate.connect(`
`130`		`- componentInspector.onAirPressureNoise)`
	`127`	`+ function onNoiseUpdate(_mean, _meanBias, _stdDev,`
	`128`	`+ _stdDevBias, _dynamicBiasStdDev, _dynamicBiasCorrelationTime) {`
	`129`	`+ componentInspector.onAirPressureNoise(_mean, _meanBias, _stdDev,`
	`130`	`+ _stdDevBias, _dynamicBiasStdDev, _dynamicBiasCorrelationTime);`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`	`}`