rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity

gadgetWidget destructor now gets called.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2646 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip 2011-01-31 23:12:21 +00:00 committed by pip
parent 5f07a95234
commit 6662d856fd
3 changed files with 131 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ground/openpilotgcs/src/plugins/opmap/opmapgadgetfactory.cpp
View File

@ -25,25 +25,32 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "opmapgadgetfactory.h"
#include "opmapgadgetwidget.h"
//#include "opmapgadgetwidget.h"
#include "opmapgadget.h"
#include "opmapgadgetconfiguration.h"
#include "opmapgadgetoptionspage.h"
#include <coreplugin/iuavgadget.h>
OPMapGadgetFactory::OPMapGadgetFactory(QObject *parent) :
IUAVGadgetFactory(QString("OPMapGadget"), tr("OPMap Gadget"), parent)
IUAVGadgetFactory(QString("OPMapGadget"), tr("OPMap Gadget"), parent),
gadgetWidget(NULL)
{
}
OPMapGadgetFactory::~OPMapGadgetFactory()
{
if (gadgetWidget)
{
delete gadgetWidget;
gadgetWidget = NULL;
}
}
Core::IUAVGadget * OPMapGadgetFactory::createGadget(QWidget *parent)
{
OPMapGadgetWidget *gadgetWidget = new OPMapGadgetWidget(parent);
return new OPMapGadget(QString("OPMapGadget"), gadgetWidget, parent);
// OPMapGadgetWidget *gadgetWidget = new OPMapGadgetWidget(parent);
gadgetWidget = new OPMapGadgetWidget(parent);
return new OPMapGadget(QString("OPMapGadget"), gadgetWidget, parent);
}
IUAVGadgetConfiguration *OPMapGadgetFactory::createConfiguration(QSettings* qSettings)

10
ground/openpilotgcs/src/plugins/opmap/opmapgadgetfactory.h
View File

@ -30,9 +30,11 @@
#include <coreplugin/iuavgadgetfactory.h>
#include "opmapgadgetwidget.h"
namespace Core {
class IUAVGadget;
class IUAVGadgetFactory;
class IUAVGadget;
class IUAVGadgetFactory;
}
using namespace Core;
@ -47,6 +49,10 @@ public:
Core::IUAVGadget *createGadget(QWidget *parent);
IUAVGadgetConfiguration *createConfiguration(QSettings* qSettings);
IOptionsPage *createOptionsPage(IUAVGadgetConfiguration *config);
protected:
OPMapGadgetWidget *gadgetWidget;
};
#endif // OPMAP_GADGETFACTORY_H_

10
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
View File

@ -347,6 +347,13 @@ OPMapGadgetWidget::OPMapGadgetWidget(QWidget *parent) : QWidget(parent)
// destructor
OPMapGadgetWidget::~OPMapGadgetWidget()
{
if (m_map)
{
disconnect(m_map, 0, 0, 0);
m_map->SetShowHome(false);
m_map->SetShowUAV(false);
}
// this destructor doesn't appear to be called at shutdown???
@ -373,8 +380,7 @@ OPMapGadgetWidget::~OPMapGadgetWidget()
if (m_zoom_slider_widget) delete m_zoom_slider_widget;
if (m_statusbar_widget) delete m_statusbar_widget;
if (m_map) delete m_map;
if (m_widget) delete m_widget;
if (m_map) delete m_map;
}
// *************************************************************************************