diff --git a/Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.ui b/Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.ui deleted file mode 100644 index 519b4e5f384f0b142b8ca1531e60ea18f2f922c9..0000000000000000000000000000000000000000 --- a/Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.ui +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>OutcomingMessagesViewerModule</class> - <widget class="QWidget" name="OutcomingMessagesViewerModule"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>414</width> - <height>400</height> - </rect> - </property> - <property name="minimumSize"> - <size> - <width>150</width> - <height>400</height> - </size> - </property> - <property name="windowTitle"> - <string>Form</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QTableWidget" name="tableWidget"> - <property name="rowCount"> - <number>10</number> - </property> - <row/> - <row/> - <row/> - <row/> - <row/> - <row/> - <row/> - <row/> - <row/> - <row/> - <column> - <property name="text"> - <string>Message</string> - </property> - </column> - </widget> - </item> - </layout> - </widget> - <resources/> - <connections/> -</ui> diff --git a/Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.cpp b/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.cpp similarity index 73% rename from Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.cpp rename to Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.cpp index fff1a46a1ae145a2d0fcfa8b299d350373a3827e..809fb4f290b5c531a1c4054be1b779d307fb902c 100644 --- a/Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.cpp +++ b/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.cpp @@ -1,12 +1,11 @@ -#include "outcomingmessagesviewermodule.h" - #include <QTableWidgetItem> #include "Core/modulemessagesbroker.h" #include "Modules/skywardhubstrings.h" -#include "ui_outcomingmessagesviewermodule.h" +#include "outgoingmessagesviewermodule.h" +#include "ui_outgoingmessagesviewermodule.h" -OutcomingMessagesViewerModule::OutcomingMessagesViewerModule(QWidget* parent) : DefaultModule(parent), ui(new Ui::OutcomingMessagesViewerModule) +OutgoingMessagesViewerModule::OutgoingMessagesViewerModule(QWidget* parent) : DefaultModule(parent), ui(new Ui::OutgoingMessagesViewerModule) { ui->setupUi(this); defaultContextMenuSetup(); @@ -19,15 +18,15 @@ OutcomingMessagesViewerModule::OutcomingMessagesViewerModule(QWidget* parent) : [this](const ModuleMessage& msg) { handleNack(msg); }); } -OutcomingMessagesViewerModule::~OutcomingMessagesViewerModule() { delete ui; } +OutgoingMessagesViewerModule::~OutgoingMessagesViewerModule() { delete ui; } -QWidget* OutcomingMessagesViewerModule::toWidget() { return this; } +QWidget* OutgoingMessagesViewerModule::toWidget() { return this; } -XmlObject OutcomingMessagesViewerModule::toXmlObject() { return XmlObject(getName(ModuleId::OUTCOMINGMESSAGEVIEWER)); } +XmlObject OutgoingMessagesViewerModule::toXmlObject() { return XmlObject(getName(ModuleId::OUTCOMINGMESSAGEVIEWER)); } -void OutcomingMessagesViewerModule::fromXmlObject(const XmlObject& xmlObject) { Q_UNUSED(xmlObject); } +void OutgoingMessagesViewerModule::fromXmlObject(const XmlObject& xmlObject) { Q_UNUSED(xmlObject); } -void OutcomingMessagesViewerModule::addMsgSent(const ModuleMessage& msg) +void OutgoingMessagesViewerModule::addMsgSent(const ModuleMessage& msg) { int row = updateVerticalHeaders(msg); int column = 0; @@ -40,9 +39,9 @@ void OutcomingMessagesViewerModule::addMsgSent(const ModuleMessage& msg) registerMessage(newItem, msg); } -QString OutcomingMessagesViewerModule::computeMsgName(const ModuleMessage& msg) { return msg.getField("name").getString(); } +QString OutgoingMessagesViewerModule::computeMsgName(const ModuleMessage& msg) { return msg.getField("name").getString(); } -void OutcomingMessagesViewerModule::handleAck(const ModuleMessage& ack) +void OutgoingMessagesViewerModule::handleAck(const ModuleMessage& ack) { for (int i = 0; i < messages.count(); i++) { @@ -56,7 +55,7 @@ void OutcomingMessagesViewerModule::handleAck(const ModuleMessage& ack) } } -void OutcomingMessagesViewerModule::handleNack(const ModuleMessage& nack) +void OutgoingMessagesViewerModule::handleNack(const ModuleMessage& nack) { for (int i = 0; i < messages.count(); i++) { @@ -70,7 +69,7 @@ void OutcomingMessagesViewerModule::handleNack(const ModuleMessage& nack) } } -int OutcomingMessagesViewerModule::updateVerticalHeaders(const ModuleMessage& msg) +int OutgoingMessagesViewerModule::updateVerticalHeaders(const ModuleMessage& msg) { int row = 0; // Insert on top QTime time(0, 0, 0, 0); @@ -90,7 +89,7 @@ int OutcomingMessagesViewerModule::updateVerticalHeaders(const ModuleMessage& ms return row; } -void OutcomingMessagesViewerModule::registerMessage(QTableWidgetItem* item, const ModuleMessage& msg) +void OutgoingMessagesViewerModule::registerMessage(QTableWidgetItem* item, const ModuleMessage& msg) { messages.prepend(MessageLog(item, msg)); if (messages.count() > maxSize) diff --git a/Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.h b/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.h similarity index 83% rename from Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.h rename to Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.h index c74768ad389b15f945e7f20aeaaa3fcbade1f0bc..4a6c2c4fa1e2a0c8e36a83aa891201e7ff416041 100644 --- a/Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.h +++ b/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.h @@ -28,16 +28,16 @@ private: namespace Ui { -class OutcomingMessagesViewerModule; +class OutgoingMessagesViewerModule; } -class OutcomingMessagesViewerModule : public DefaultModule +class OutgoingMessagesViewerModule : public DefaultModule { Q_OBJECT public: - explicit OutcomingMessagesViewerModule(QWidget* parent = nullptr); - ~OutcomingMessagesViewerModule(); + explicit OutgoingMessagesViewerModule(QWidget* parent = nullptr); + ~OutgoingMessagesViewerModule(); QWidget* toWidget() override; @@ -54,7 +54,7 @@ protected: QString computeMsgName(const ModuleMessage& msg); private: - Ui::OutcomingMessagesViewerModule* ui; + Ui::OutgoingMessagesViewerModule* ui; QList<MessageLog> messages; int maxSize = 10; }; diff --git a/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.ui b/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.ui new file mode 100644 index 0000000000000000000000000000000000000000..9394dc3916b37a0e6f4372161060463c127fcf72 --- /dev/null +++ b/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.ui @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>OutgoingMessagesViewerModule</class> + <widget class="QWidget" name="OutgoingMessagesViewerModule"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>414</width> + <height>400</height> + </rect> + </property> + <property name="minimumSize"> + <size> + <width>150</width> + <height>400</height> + </size> + </property> + <property name="windowTitle"> + <string>Form</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTableWidget" name="tableWidget"> + <property name="rowCount"> + <number>10</number> + </property> + <row /> + <row /> + <row /> + <row /> + <row /> + <row /> + <row /> + <row /> + <row /> + <row /> + <column> + <property name="text"> + <string>Message</string> + </property> + </column> + </widget> + </item> + </layout> + </widget> + <resources /> + <connections /> +</ui> \ No newline at end of file diff --git a/Modules/moduleslist.cpp b/Modules/moduleslist.cpp index 2431ae63a98227754a52ade85b94708dc6f4b56b..c40c7dcad6c10d57a7d5ec73447f10d50ba43b07 100644 --- a/Modules/moduleslist.cpp +++ b/Modules/moduleslist.cpp @@ -2,24 +2,25 @@ # // ____________________________________________________________________________________________ -#include "Modules/Empty/emptymodule.h" #include "Components/ModulesPicker/modulespicker.h" #include "Modules/CommandPad/commandpad.h" -#include "Modules/Splitter/splittermodule.h" -#include "Modules/SkywardHub/skywardhubmodule.h" -#include "Modules/Test/testmodule.h" +#include "Modules/Empty/emptymodule.h" +#include "Modules/FileStream/filestreammodule.h" #include "Modules/Graph/graphmodule.h" -#include "Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.h" #include "Modules/IncomingMessagesViewer/incomingmessagesviewermodule.h" #include "Modules/Mavlink/mavlinkmodule.h" -#include "Modules/FileStream/filestreammodule.h" #include "Modules/Mavlink/mavlinkrocketmsgtestingmodule.h" +#include "Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.h" +#include "Modules/SkywardHub/skywardhubmodule.h" +#include "Modules/Splitter/splittermodule.h" #include "Modules/StateViewer/stateviewermodule.h" -#include "Modules/ValuesConverterViewer/valuesconverterviewermodule.h" -#include "Modules/TimerController/timercontrollermodule.h" #include "Modules/Tabs/tabsmodule.h" +#include "Modules/Test/testmodule.h" +#include "Modules/TimerController/timercontrollermodule.h" +#include "Modules/ValuesConverterViewer/valuesconverterviewermodule.h" -void ModulesList::createModuleList() { +void ModulesList::createModuleList() +{ /* * addModule(MODULE UNIQUE ID, MODULE UNIQUE NAME, a function that instantiate your module) * If you are creating a new Module, please add it's id in the ModuleId enum (you can find it in moduleslist.h) @@ -35,195 +36,163 @@ void ModulesList::createModuleList() { #ifdef EMPTYMODULE_H ModuleInfo empty(ModuleId::EMPTY, "EmptyModule"); - empty.setFactory([]() { - return new EmptyModule(); - }); + empty.setFactory([]() { return new EmptyModule(); }); empty.addModuleSourceFiles("Modules/Empty/"); addModuleInfo(empty); #endif #ifdef COMMANDPAD_H ModuleInfo commandPad(ModuleId::COMMANDPAD, "CommandPad", ModuleCategory::UTILITY); - commandPad.setFactory([]() { - return new CommandPad(); - }); + commandPad.setFactory([]() { return new CommandPad(); }); commandPad.addModuleSourceFiles("Modules/CommandPad/"); addModuleInfo(commandPad); #endif #ifdef SPLITTERMODULE_H ModuleInfo splitter(ModuleId::SPLITTER, "Splitter"); - splitter.setFactory([]() { - return new SplitterModule(); - }); + splitter.setFactory([]() { return new SplitterModule(); }); splitter.addModuleSourceFiles("Modules/Splitter/"); addModuleInfo(splitter); #endif #ifdef SKYWARDHUBMODULE_H ModuleInfo hub(ModuleId::SKYWARDHUB, "SkywardHub", ModuleCategory::HOME); - hub.setFactory([]() { - return new SkywardHubModule(); - }); + hub.setFactory([]() { return new SkywardHubModule(); }); hub.addModuleSourceFiles("Modules/SkywardHub/"); addModuleInfo(hub); #endif #ifdef TESTMODULE_H ModuleInfo testModule(ModuleId::BROKERTEST, "TestBroker", ModuleCategory::DEFAULT); - testModule.setFactory([]() { - return new TestModule(); - }); + testModule.setFactory([]() { return new TestModule(); }); testModule.addModuleSourceFiles("Modules/Test/"); addModuleInfo(testModule); #endif #ifdef GRAPHMODULE_H ModuleInfo graphModule(ModuleId::GRAPH, "Graph", ModuleCategory::DATAVISUAL); - graphModule.setFactory([]() { - return new GraphModule(); - }); + graphModule.setFactory([]() { return new GraphModule(); }); graphModule.addModuleSourceFiles("Modules/Graph/"); addModuleInfo(graphModule); #endif #ifdef OUTCOMINGMESSAGESVIEWERMODULE_H - ModuleInfo outMsgViewer(ModuleId::OUTCOMINGMESSAGEVIEWER, "OutcomingMessagesViewer", ModuleCategory::DATAVISUAL); - outMsgViewer.setFactory([]() { - return new OutcomingMessagesViewerModule(); - }); - outMsgViewer.addModuleSourceFiles("Modules/OutcomingMessageViewer/"); + ModuleInfo outMsgViewer(ModuleId::OUTCOMINGMESSAGEVIEWER, "OutgoingMessagesViewer", ModuleCategory::DATAVISUAL); + outMsgViewer.setFactory([]() { return new OutgoingMessagesViewerModule(); }); + outMsgViewer.addModuleSourceFiles("Modules/OutgoingMessageViewer/"); addModuleInfo(outMsgViewer); #endif #ifdef INCOMINGMESSAGESVIEWERMODULE_H ModuleInfo inMsgViewer(ModuleId::INCOMINGMESSAGESVIEWER, "IncomingMessagesViewer", ModuleCategory::DATAVISUAL); - inMsgViewer.setFactory([]() { - return new IncomingMessagesViewerModule(); - }); + inMsgViewer.setFactory([]() { return new IncomingMessagesViewerModule(); }); inMsgViewer.addModuleSourceFiles("Modules/IncomingMessageViewer/"); addModuleInfo(inMsgViewer); #endif #ifdef MAVLINKMODULE_H ModuleInfo mavlink(ModuleId::MAVLINK, "Mavlink", ModuleCategory::DATASOURCE); - mavlink.setFactory([]() { - return new MavlinkModule(); - }); + mavlink.setFactory([]() { return new MavlinkModule(); }); mavlink.addModuleSourceFiles("Modules/Mavlink/"); addModuleInfo(mavlink); #endif #ifdef MAVLINKROCKETMSGTESTINGMODULE_H ModuleInfo mvkRckTesting(ModuleId::MAVLINK_RCK_TESTING, "MavlinkRocketMsgTesting", ModuleCategory::DEFAULT); - mvkRckTesting.setFactory([]() { - return new MavlinkRocketMsgTestingModule(); - }); + mvkRckTesting.setFactory([]() { return new MavlinkRocketMsgTestingModule(); }); addModuleInfo(mvkRckTesting); #endif #ifdef FILESTREAMMODULE_H ModuleInfo fileStream(ModuleId::FILESTREAM, "FileStream", ModuleCategory::DATASOURCE); - fileStream.setFactory([]() { - return new FileStreamModule(); - }); + fileStream.setFactory([]() { return new FileStreamModule(); }); fileStream.addModuleSourceFiles("Modules/FileStream/"); addModuleInfo(fileStream); #endif #ifdef STATEVIEWERMODULE_H ModuleInfo stateViewer(ModuleId::STATEVIEWER, "StateViewer", ModuleCategory::DATAVISUAL); - stateViewer.setFactory([]() { - return new StateViewerModule(); - }); + stateViewer.setFactory([]() { return new StateViewerModule(); }); stateViewer.addModuleSourceFiles("Modules/StateViewer/"); addModuleInfo(stateViewer); #endif #ifdef VALUESCONVERTERVIEWERMODULE_H ModuleInfo valuesconverterviewer(ModuleId::VALUESCONVERTERVIEWER, "ValuesConverterViewer", ModuleCategory::UTILITY); - valuesconverterviewer.setFactory([]() { - return new ValuesConverterViewerModule(); - }); + valuesconverterviewer.setFactory([]() { return new ValuesConverterViewerModule(); }); valuesconverterviewer.addModuleSourceFiles("Modules/ValuesConverterViewer/"); addModuleInfo(valuesconverterviewer); #endif #ifdef TIMERCONTROLLERMODULE_H ModuleInfo timerController(ModuleId::TIMER_CONTROLLER, "TimerController", ModuleCategory::UTILITY); - timerController.setFactory([]() { - return new TimerControllerModule(); - }); + timerController.setFactory([]() { return new TimerControllerModule(); }); timerController.addModuleSourceFiles("Modules/TimerController/"); addModuleInfo(timerController); #endif #ifdef TABSMODULE_H ModuleInfo tabs(ModuleId::TABS, "Tabs", ModuleCategory::UTILITY); - tabs.setFactory([]() { - return new TabsModule(); - }); + tabs.setFactory([]() { return new TabsModule(); }); tabs.addModuleSourceFiles("Modules/Tabs/"); addModuleInfo(tabs); #endif - } - // ____________________________________________________________________________________________ -ModulesList::ModulesList() { - createModuleList(); -} +ModulesList::ModulesList() { createModuleList(); } -bool ModulesList::containsId(ModuleId id) { - for(int i = 0; i < modulesInfo.count(); i++) { - if(modulesInfo[i].getId() == id) +bool ModulesList::containsId(ModuleId id) +{ + for (int i = 0; i < modulesInfo.count(); i++) + { + if (modulesInfo[i].getId() == id) return true; } return false; } -void ModulesList::addModuleInfo(const ModuleInfo& info) { - modulesInfo.append(info); -} +void ModulesList::addModuleInfo(const ModuleInfo& info) { modulesInfo.append(info); } -QString ModulesList::getModuleName(ModuleId id) const { - for(int i = 0; i < modulesInfo.count(); i++) { - if(modulesInfo[i].getId() == id) +QString ModulesList::getModuleName(ModuleId id) const +{ + for (int i = 0; i < modulesInfo.count(); i++) + { + if (modulesInfo[i].getId() == id) return modulesInfo[i].getModuleName(); } return ""; } -std::function<Module *()> ModulesList::getFactory(ModuleId id) const { - for(int i = 0; i < modulesInfo.count(); i++) { - if(modulesInfo[i].getId() == id) +std::function<Module*()> ModulesList::getFactory(ModuleId id) const +{ + for (int i = 0; i < modulesInfo.count(); i++) + { + if (modulesInfo[i].getId() == id) return modulesInfo[i].getFactory(); } - return []() { - return nullptr; - }; + return []() { return nullptr; }; } -std::function<Module *()> ModulesList::findFactoryByModuleName(const QString& name) { - for(int i = 0; i < modulesInfo.count(); i++) { - if(modulesInfo[i].getModuleName() == name) +std::function<Module*()> ModulesList::findFactoryByModuleName(const QString& name) +{ + for (int i = 0; i < modulesInfo.count(); i++) + { + if (modulesInfo[i].getModuleName() == name) return modulesInfo[i].getFactory(); } - return []() { - return nullptr; - }; + return []() { return nullptr; }; } -QList<QString> ModulesList::getModulesNamesList() { +QList<QString> ModulesList::getModulesNamesList() +{ QList<QString> names; - for(int i = 0; i < modulesInfo.count(); i++) { + for (int i = 0; i < modulesInfo.count(); i++) + { names.append(modulesInfo[i].getModuleName()); } return names; } -QList<ModuleInfo> ModulesList::getModulesInfo() { - return modulesInfo; -} +QList<ModuleInfo> ModulesList::getModulesInfo() { return modulesInfo; } diff --git a/SkywardHub.pro b/SkywardHub.pro index b29d5c9e2f6a5ff944084187f362f4827f9afe14..7d72891ac4668fe8c332a0cdb9b8c62932f00976 100644 --- a/SkywardHub.pro +++ b/SkywardHub.pro @@ -43,7 +43,7 @@ SOURCES += \ Modules/Mavlink/mavlinkreader.cpp \ Modules/Mavlink/mavlinkrocketmsgtestingmodule.cpp \ Modules/Mavlink/mavlinkwriter.cpp \ - Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.cpp \ + Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.cpp \ Modules/SkywardHub/deployer.cpp \ Modules/SkywardHub/deployerpathpicker.cpp \ Modules/SkywardHub/prefabdialog.cpp \ @@ -97,7 +97,7 @@ HEADERS += \ Modules/Mavlink/mavlinkversionheader.h \ Modules/Mavlink/mavlinkversionheader.h \ Modules/Mavlink/mavlinkwriter.h \ - Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.h \ + Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.h \ Modules/SkywardHub/deployer.h \ Modules/SkywardHub/deployerpathpicker.h \ Modules/SkywardHub/prefabdialog.h \ @@ -126,7 +126,7 @@ FORMS += \ Modules/MainWindow/window.ui \ Modules/Mavlink/mavlinkmodule.ui \ Modules/Mavlink/mavlinkrocketmsgtestingmodule.ui \ - Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.ui \ + Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.ui \ Modules/SkywardHub/deployerpathpicker.ui \ Modules/SkywardHub/prefabdialog.ui \ Modules/SkywardHub/prefabviewelement.ui \