Commit f843806c authored by Bill Bonney's avatar Bill Bonney

Added the use of QPointer guard wrapper to help fix stability issues

parent d3ccd004
...@@ -59,21 +59,22 @@ public: ...@@ -59,21 +59,22 @@ public:
explicit ApmHardwareConfig(QWidget *parent = 0); explicit ApmHardwareConfig(QWidget *parent = 0);
~ApmHardwareConfig(); ~ApmHardwareConfig();
private: private:
FrameTypeConfig *m_frameConfig; QPointer<FrameTypeConfig> m_frameConfig;
CompassConfig *m_compassConfig; QPointer<CompassConfig> m_compassConfig;
AccelCalibrationConfig *m_accelConfig; QPointer<AccelCalibrationConfig> m_accelConfig;
RadioCalibrationConfig *m_radioConfig; QPointer<RadioCalibrationConfig> m_radioConfig;
QPointer<ApmFirmwareConfig> m_apmFirmwareConfig;
QPointer<Radio3DRConfig> m_radio3drConfig;
QPointer<BatteryMonitorConfig> m_batteryConfig;
QPointer<SonarConfig> m_sonarConfig;
QPointer<AirspeedConfig> m_airspeedConfig;
QPointer<OpticalFlowConfig> m_opticalFlowConfig;
QPointer<OsdConfig> m_osdConfig;
QPointer<CameraGimbalConfig> m_cameraGimbalConfig;
QPointer<AntennaTrackerConfig> m_antennaTrackerConfig;
QPointer<ApmPlaneLevel> m_planeLevel;
ApmFirmwareConfig *m_apmFirmwareConfig;
Radio3DRConfig *m_radio3drConfig;
BatteryMonitorConfig *m_batteryConfig;
SonarConfig *m_sonarConfig;
AirspeedConfig *m_airspeedConfig;
OpticalFlowConfig *m_opticalFlowConfig;
OsdConfig *m_osdConfig;
CameraGimbalConfig *m_cameraGimbalConfig;
AntennaTrackerConfig *m_antennaTrackerConfig;
ApmPlaneLevel *m_planeLevel;
private slots: private slots:
void activeUASSet(UASInterface *uas); void activeUASSet(UASInterface *uas);
void activateStackedWidget(); void activateStackedWidget();
......
...@@ -28,16 +28,16 @@ private slots: ...@@ -28,16 +28,16 @@ private slots:
void activeUASSet(UASInterface *uas); void activeUASSet(UASInterface *uas);
private: private:
Ui::ApmSoftwareConfig ui; Ui::ApmSoftwareConfig ui;
BasicPidConfig *m_basicPidConfig; QPointer<BasicPidConfig> m_basicPidConfig;
FlightModeConfig *m_flightConfig; QPointer<FlightModeConfig> m_flightConfig;
StandardParamConfig *m_standardParamConfig; QPointer<StandardParamConfig> m_standardParamConfig;
GeoFenceConfig *m_geoFenceConfig; QPointer<GeoFenceConfig> m_geoFenceConfig;
FailSafeConfig *m_failSafeConfig; QPointer<FailSafeConfig> m_failSafeConfig;
AdvancedParamConfig *m_advancedParamConfig; QPointer<AdvancedParamConfig> m_advancedParamConfig;
ArduCopterPidConfig *m_arduCopterPidConfig; QPointer<ArduCopterPidConfig> m_arduCopterPidConfig;
ArduPlanePidConfig *m_arduPlanePidConfig; QPointer<ArduPlanePidConfig> m_arduPlanePidConfig;
ArduRoverPidConfig *m_arduRoverPidConfig; QPointer<ArduRoverPidConfig> m_arduRoverPidConfig;
AdvParameterList *m_advParameterList; QPointer<AdvParameterList> m_advParameterList;
QMap<QObject*,QWidget*> m_buttonToConfigWidgetMap; QMap<QObject*,QWidget*> m_buttonToConfigWidgetMap;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment