Merged in filnet/librepilot/LP-561_fix_gcs_gadget_clone (pull request #482)

filnet · f5soh · commit 0f186cad4319 · 2018-01-24T20:14:38.000Z
LP-561 fix gcs gadget clone

Approved-by: Lalanne Laurent &lt;f5soh@free.fr&gt;
Approved-by: Philippe Renon &lt;philippe_renon@yahoo.fr&gt;
diff --git a/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetconfiguration.cpp b/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetconfiguration.cpp
@@ -82,6 +82,9 @@ PfdQmlGadgetConfiguration::PfdQmlGadgetConfiguration(QString classId, QSettings
 PfdQmlGadgetConfiguration::PfdQmlGadgetConfiguration(const PfdQmlGadgetConfiguration &obj) :
     IUAVGadgetConfiguration(obj.classId(), obj.parent())
 {
+    m_speedMap            = obj.m_speedMap;
+    m_altitudeMap         = obj.m_altitudeMap;
+
     m_qmlFile             = obj.m_qmlFile;
 
     m_speedFactor         = obj.m_speedFactor;
diff --git a/ground/gcs/src/plugins/scope/scopegadgetconfiguration.cpp b/ground/gcs/src/plugins/scope/scopegadgetconfiguration.cpp
@@ -75,7 +75,7 @@ ScopeGadgetConfiguration::ScopeGadgetConfiguration(const ScopeGadgetConfiguratio
     m_mathFunctionType = obj.m_mathFunctionType;
     m_refreshInterval  = obj.m_refreshInterval;
 
-    int plotCurveCount = m_plotCurveConfigs.size();
+    int plotCurveCount = obj.m_plotCurveConfigs.size();
     for (int i = 0; i < plotCurveCount; i++) {
         PlotCurveConfiguration *currentPlotCurveConf = obj.m_plotCurveConfigs.at(i);
 

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,9 @@ PfdQmlGadgetConfiguration::PfdQmlGadgetConfiguration(QString classId, QSettings`
`82`	`82`	`PfdQmlGadgetConfiguration::PfdQmlGadgetConfiguration(const PfdQmlGadgetConfiguration &obj) :`
`83`	`83`	`IUAVGadgetConfiguration(obj.classId(), obj.parent())`
`84`	`84`	`{`
	`85`	`+ m_speedMap = obj.m_speedMap;`
	`86`	`+ m_altitudeMap = obj.m_altitudeMap;`
	`87`	`+`
`85`	`88`	`m_qmlFile = obj.m_qmlFile;`
`86`	`89`
`87`	`90`	`m_speedFactor = obj.m_speedFactor;`