diff --git a/Modules/Mavlink/mavlinkrocketmsgtestingmodule.cpp b/Modules/Mavlink/mavlinkrocketmsgtestingmodule.cpp index 5b2ce66a5063f140993c099b1cea71588337488a..80e4fe74843f5f2940c809e4b7ddee6c82cf9c7c 100644 --- a/Modules/Mavlink/mavlinkrocketmsgtestingmodule.cpp +++ b/Modules/Mavlink/mavlinkrocketmsgtestingmodule.cpp @@ -88,6 +88,8 @@ void MavlinkRocketMsgTestingModule::onSendMsgClicked() void MavlinkRocketMsgTestingModule::onLoadFileClicked() { + clearView(); + QString filePath = SkywardHubStrings::defaultConfigurationFolder + "/" + ui->lineEdit_mavlinkInputFilePath->text().trimmed(); if (mavlinkMsgDefinitionFile.loadFromFile(filePath)){ QList<XmlObject*> xmlMessages = mavlinkMsgDefinitionFile.deepSearchObjects([this](const XmlObject *msg){ @@ -129,6 +131,21 @@ QGroupBox* MavlinkRocketMsgTestingModule::getOrCreateGBox(const QString &title) return gBox; } +void MavlinkRocketMsgTestingModule::clearView() +{ + if(currentMsgView != nullptr){ + delete currentMsgView; + currentMsgView = nullptr; + } + + QMapIterator<QString, QGroupBox*> i(viewGroupList); + QList<QGroupBox*> groupBox = viewGroupList.values(); + for(int i = 0; i < groupBox.count(); i++){ + delete groupBox[i]; + } + viewGroupList.clear(); +} + QString MavlinkRocketMsgTestingModule::getCurrentTopic() const { return ui->lineEdit_outputTopic->text(); diff --git a/Modules/Mavlink/mavlinkrocketmsgtestingmodule.h b/Modules/Mavlink/mavlinkrocketmsgtestingmodule.h index d9bde6577a6d697cdc6fdcb9d2f03e67216b80b3..2156c0e7b0d18aaca3a29b30beced71c2bd1f159 100644 --- a/Modules/Mavlink/mavlinkrocketmsgtestingmodule.h +++ b/Modules/Mavlink/mavlinkrocketmsgtestingmodule.h @@ -59,6 +59,7 @@ protected: QString getCurrentTopic() const; void createViewFromXmlMessages(QList<XmlObject*> messagesList); QGroupBox* getOrCreateGBox(const QString &title); + void clearView(); protected slots: void onRadioButtonClicked(QRadioButton *radiobutton); diff --git a/SkywardHub.pro.user b/SkywardHub.pro.user index 2748032cfea6f90d870f7f136527a1a97b4ea7e0..868cd987652380b9f31eba18bda6afa58603aa2f 100644 --- a/SkywardHub.pro.user +++ b/SkywardHub.pro.user @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> -<!-- Written by QtCreator 4.14.2, 2021-04-09T17:57:14. --> +<!-- Written by QtCreator 4.14.2, 2021-04-09T18:13:20. --> <qtcreator> <data> <variable>EnvironmentId</variable>