Browse Source

Argh... Forgot to test release after adding Mock Link.

QGC4.4
dogmaphobic 10 years ago
parent
commit
e4dcf8fe48
  1. 7
      src/comm/LinkConfiguration.cc
  2. 4
      src/comm/LinkConfiguration.h
  3. 4
      src/comm/LinkManager.cc
  4. 3
      src/comm/LinkManager.h
  5. 2
      src/ui/QGCCommConfiguration.cc
  6. 2
      src/ui/QGCLinkConfiguration.cc

7
src/comm/LinkConfiguration.cc

@ -30,7 +30,10 @@ This file is part of the QGROUNDCONTROL project
#include "LinkConfiguration.h" #include "LinkConfiguration.h"
#include "SerialLink.h" #include "SerialLink.h"
#include "UDPLink.h" #include "UDPLink.h"
#ifdef UNITTEST_BUILD
#include "MockLink.h" #include "MockLink.h"
#endif
#define LINK_SETTING_ROOT "LinkConfigurations" #define LINK_SETTING_ROOT "LinkConfigurations"
@ -81,9 +84,11 @@ LinkConfiguration* LinkConfiguration::createSettings(int type, const QString& na
case LinkConfiguration::TypeUdp: case LinkConfiguration::TypeUdp:
config = new UDPConfiguration(name); config = new UDPConfiguration(name);
break; break;
#ifdef UNITTEST_BUILD
case LinkConfiguration::TypeMock: case LinkConfiguration::TypeMock:
config = new MockConfiguration(name); config = new MockConfiguration(name);
break; break;
#endif
} }
return config; return config;
} }
@ -102,9 +107,11 @@ LinkConfiguration* LinkConfiguration::duplicateSettings(LinkConfiguration* sourc
case TypeUdp: case TypeUdp:
dupe = new UDPConfiguration(dynamic_cast<UDPConfiguration*>(source)); dupe = new UDPConfiguration(dynamic_cast<UDPConfiguration*>(source));
break; break;
#ifdef UNITTEST_BUILD
case TypeMock: case TypeMock:
dupe = new MockConfiguration(dynamic_cast<MockConfiguration*>(source)); dupe = new MockConfiguration(dynamic_cast<MockConfiguration*>(source));
break; break;
#endif
} }
return dupe; return dupe;
} }

4
src/comm/LinkConfiguration.h

@ -41,7 +41,6 @@ public:
enum { enum {
TypeSerial, ///< Serial Link TypeSerial, ///< Serial Link
TypeUdp, ///< UDP Link TypeUdp, ///< UDP Link
TypeMock, ///< Mock Link for Unitesting
// TODO Below is not yet implemented // TODO Below is not yet implemented
#if 0 #if 0
TypeTcp, ///< TCP Link TypeTcp, ///< TCP Link
@ -50,6 +49,9 @@ public:
TypeXbee, ///< XBee Proprietary Link TypeXbee, ///< XBee Proprietary Link
TypeOpal, ///< Opal-RT Link TypeOpal, ///< Opal-RT Link
#endif #endif
#ifdef UNITTEST_BUILD
TypeMock, ///< Mock Link for Unitesting
#endif
TypeLast // Last type value (type >= TypeLast == invalid) TypeLast // Last type value (type >= TypeLast == invalid)
}; };

4
src/comm/LinkManager.cc

@ -79,9 +79,11 @@ LinkInterface* LinkManager::createLink(LinkConfiguration* config)
case LinkConfiguration::TypeUdp: case LinkConfiguration::TypeUdp:
pLink = new UDPLink(dynamic_cast<UDPConfiguration*>(config)); pLink = new UDPLink(dynamic_cast<UDPConfiguration*>(config));
break; break;
#ifdef UNITTEST_BUILD
case LinkConfiguration::TypeMock: case LinkConfiguration::TypeMock:
pLink = new MockLink(dynamic_cast<MockConfiguration*>(config)); pLink = new MockLink(dynamic_cast<MockConfiguration*>(config));
break; break;
#endif
} }
if(pLink) { if(pLink) {
addLink(pLink); addLink(pLink);
@ -373,10 +375,12 @@ void LinkManager::loadLinkConfigurationList()
pLink = (LinkConfiguration*)new UDPConfiguration(name); pLink = (LinkConfiguration*)new UDPConfiguration(name);
pLink->setPreferred(preferred); pLink->setPreferred(preferred);
break; break;
#ifdef UNITTEST_BUILD
case LinkConfiguration::TypeMock: case LinkConfiguration::TypeMock:
pLink = (LinkConfiguration*)new MockConfiguration(name); pLink = (LinkConfiguration*)new MockConfiguration(name);
pLink->setPreferred(false); pLink->setPreferred(false);
break; break;
#endif
} }
if(pLink) { if(pLink) {
// Have the instance load its own values // Have the instance load its own values

3
src/comm/LinkManager.h

@ -37,7 +37,10 @@ This file is part of the PIXHAWK project
// Links // Links
#include "SerialLink.h" #include "SerialLink.h"
#include "UDPLink.h" #include "UDPLink.h"
#ifdef UNITTEST_BUILD
#include "MockLink.h" #include "MockLink.h"
#endif
#include "ProtocolInterface.h" #include "ProtocolInterface.h"
#include "QGCSingleton.h" #include "QGCSingleton.h"

2
src/ui/QGCCommConfiguration.cc

@ -96,12 +96,14 @@ void QGCCommConfiguration::_loadTypeConfigWidget(int type)
_ui->typeCombo->setCurrentIndex(_ui->typeCombo->findData(LinkConfiguration::TypeUdp)); _ui->typeCombo->setCurrentIndex(_ui->typeCombo->findData(LinkConfiguration::TypeUdp));
} }
break; break;
#ifdef UNITTEST_BUILD
case LinkConfiguration::TypeMock: { case LinkConfiguration::TypeMock: {
_ui->linkScrollArea->setWidget(NULL); _ui->linkScrollArea->setWidget(NULL);
_ui->linkGroupBox->setTitle(tr("Mock Link")); _ui->linkGroupBox->setTitle(tr("Mock Link"));
_ui->typeCombo->setCurrentIndex(_ui->typeCombo->findData(LinkConfiguration::TypeMock)); _ui->typeCombo->setCurrentIndex(_ui->typeCombo->findData(LinkConfiguration::TypeMock));
} }
break; break;
#endif
// Cannot be the case, but in case it gets here, we cannot continue. // Cannot be the case, but in case it gets here, we cannot continue.
default: default:
reject(); reject();

2
src/ui/QGCLinkConfiguration.cc

@ -142,10 +142,12 @@ void QGCLinkConfiguration::on_addLinkButton_clicked()
config->setName( config->setName(
QString("UDP Link on Port %1").arg(dynamic_cast<UDPConfiguration*>(config)->localPort())); QString("UDP Link on Port %1").arg(dynamic_cast<UDPConfiguration*>(config)->localPort()));
break; break;
#ifdef UNITTEST_BUILD
case LinkConfiguration::TypeMock: case LinkConfiguration::TypeMock:
config->setName( config->setName(
QString("Mock Link")); QString("Mock Link"));
break; break;
#endif
} }
} }
_viewModel->beginChange(); _viewModel->beginChange();

Loading…
Cancel
Save