rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-27 16:54:15 +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

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

@ -1,58 +1,65 @@
/** /**
****************************************************************************** ******************************************************************************
* *
* @file opmapgadgetfactory.cpp * @file opmapgadgetfactory.cpp
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @addtogroup GCSPlugins GCS Plugins * @addtogroup GCSPlugins GCS Plugins
* @{ * @{
* @addtogroup OPMapPlugin OpenPilot Map Plugin * @addtogroup OPMapPlugin OpenPilot Map Plugin
* @{ * @{
* @brief The OpenPilot Map plugin * @brief The OpenPilot Map plugin
*****************************************************************************/ *****************************************************************************/
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details. * for more details.
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "opmapgadgetfactory.h" #include "opmapgadgetfactory.h"
#include "opmapgadgetwidget.h" //#include "opmapgadgetwidget.h"
#include "opmapgadget.h" #include "opmapgadget.h"
#include "opmapgadgetconfiguration.h" #include "opmapgadgetconfiguration.h"
#include "opmapgadgetoptionspage.h" #include "opmapgadgetoptionspage.h"
#include <coreplugin/iuavgadget.h> #include <coreplugin/iuavgadget.h>
OPMapGadgetFactory::OPMapGadgetFactory(QObject *parent) : OPMapGadgetFactory::OPMapGadgetFactory(QObject *parent) :
IUAVGadgetFactory(QString("OPMapGadget"), tr("OPMap Gadget"), parent) IUAVGadgetFactory(QString("OPMapGadget"), tr("OPMap Gadget"), parent),
{ gadgetWidget(NULL)
} {
}
OPMapGadgetFactory::~OPMapGadgetFactory()
{ OPMapGadgetFactory::~OPMapGadgetFactory()
} {
if (gadgetWidget)
Core::IUAVGadget * OPMapGadgetFactory::createGadget(QWidget *parent) {
{ delete gadgetWidget;
OPMapGadgetWidget *gadgetWidget = new OPMapGadgetWidget(parent); gadgetWidget = NULL;
return new OPMapGadget(QString("OPMapGadget"), gadgetWidget, parent); }
} }
IUAVGadgetConfiguration *OPMapGadgetFactory::createConfiguration(QSettings* qSettings) Core::IUAVGadget * OPMapGadgetFactory::createGadget(QWidget *parent)
{ {
return new OPMapGadgetConfiguration(QString("OPMapGadget"), qSettings); // OPMapGadgetWidget *gadgetWidget = new OPMapGadgetWidget(parent);
} gadgetWidget = new OPMapGadgetWidget(parent);
return new OPMapGadget(QString("OPMapGadget"), gadgetWidget, parent);
IOptionsPage * OPMapGadgetFactory::createOptionsPage(IUAVGadgetConfiguration *config) }
{
return new OPMapGadgetOptionsPage(qobject_cast<OPMapGadgetConfiguration*>(config)); IUAVGadgetConfiguration *OPMapGadgetFactory::createConfiguration(QSettings* qSettings)
} {
return new OPMapGadgetConfiguration(QString("OPMapGadget"), qSettings);
}
IOptionsPage * OPMapGadgetFactory::createOptionsPage(IUAVGadgetConfiguration *config)
{
return new OPMapGadgetOptionsPage(qobject_cast<OPMapGadgetConfiguration*>(config));
}

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

@ -1,52 +1,58 @@
/** /**
****************************************************************************** ******************************************************************************
* *
* @file opmapgadgetfactory.h * @file opmapgadgetfactory.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @addtogroup GCSPlugins GCS Plugins * @addtogroup GCSPlugins GCS Plugins
* @{ * @{
* @addtogroup OPMapPlugin OpenPilot Map Plugin * @addtogroup OPMapPlugin OpenPilot Map Plugin
* @{ * @{
* @brief The OpenPilot Map plugin * @brief The OpenPilot Map plugin
*****************************************************************************/ *****************************************************************************/
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details. * for more details.
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef OPAMP_GADGETFACTORY_H_ #ifndef OPAMP_GADGETFACTORY_H_
#define OPMAP_GADGETFACTORY_H_ #define OPMAP_GADGETFACTORY_H_
#include <coreplugin/iuavgadgetfactory.h> #include <coreplugin/iuavgadgetfactory.h>
namespace Core { #include "opmapgadgetwidget.h"
class IUAVGadget;
class IUAVGadgetFactory; namespace Core {
} class IUAVGadget;
class IUAVGadgetFactory;
using namespace Core; }
class OPMapGadgetFactory : public Core::IUAVGadgetFactory using namespace Core;
{
Q_OBJECT class OPMapGadgetFactory : public Core::IUAVGadgetFactory
public: {
OPMapGadgetFactory(QObject *parent = 0); Q_OBJECT
~OPMapGadgetFactory(); public:
OPMapGadgetFactory(QObject *parent = 0);
Core::IUAVGadget *createGadget(QWidget *parent); ~OPMapGadgetFactory();
IUAVGadgetConfiguration *createConfiguration(QSettings* qSettings);
IOptionsPage *createOptionsPage(IUAVGadgetConfiguration *config); Core::IUAVGadget *createGadget(QWidget *parent);
}; IUAVGadgetConfiguration *createConfiguration(QSettings* qSettings);
IOptionsPage *createOptionsPage(IUAVGadgetConfiguration *config);
#endif // OPMAP_GADGETFACTORY_H_
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 // destructor
OPMapGadgetWidget::~OPMapGadgetWidget() 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??? // 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_zoom_slider_widget) delete m_zoom_slider_widget;
if (m_statusbar_widget) delete m_statusbar_widget; if (m_statusbar_widget) delete m_statusbar_widget;
if (m_map) delete m_map; if (m_map) delete m_map;
if (m_widget) delete m_widget;
} }
// ************************************************************************************* // *************************************************************************************