diff --git a/Modules/ValuesViewer/valueelement.cpp b/Modules/ValuesConverterViewer/valueelement.cpp similarity index 77% rename from Modules/ValuesViewer/valueelement.cpp rename to Modules/ValuesConverterViewer/valueelement.cpp index d54c7ecb36080a41e48003c5aba507eaed49192e..4c34f40594dbb55de9d7cf5e86b4761e76384fde 100644 --- a/Modules/ValuesViewer/valueelement.cpp +++ b/Modules/ValuesConverterViewer/valueelement.cpp @@ -19,13 +19,14 @@ ValueElement::ValueElement(const ValueElement &other) copy(other); } -ValueElement::ValueElement(const QString &name, const QString &topic, const QString &receivedValue, const QString &displayedValue, const QString &color) +ValueElement::ValueElement(const QString &name, const QString &topic, const QString &receivedValue, const QString &displayedValue, const QString &color, const QString &outputTopic) { setName(name); setTopic(topic); setReceivedValue(receivedValue); setDisplayedValue(displayedValue); setColor(color); + setOutpuTopic(outputTopic); } ValueElement ValueElement::operator=(const ValueElement &other) @@ -97,6 +98,8 @@ XmlObject ValueElement::toXmlObject() const obj.addAttribute("received", getReceivedValue()); obj.addAttribute("displayed", getDisplayedValue()); obj.addAttribute("color", getColor()); + obj.addAttribute("outputTopic", getOutpuTopic()); + obj.addAttribute("displayInView", isDisplayInView()); return obj; } @@ -114,6 +117,12 @@ bool ValueElement::fromXmlObject(const XmlObject &xmlObject) setReceivedValue(xmlObject.getAttribute("received")); setDisplayedValue(xmlObject.getAttribute("displayed")); setColor(xmlObject.getAttribute("color")); + setOutpuTopic(xmlObject.getAttribute("outputTopic")); + + int display = 1; + if(xmlObject.getIntAttribute("displayInView", display) && (display == 0 || display == 1)){ + setDisplayInView(display); + } } return result; } @@ -125,6 +134,33 @@ void ValueElement::copy(const ValueElement &other) setReceivedValue(other.getReceivedValue()); setDisplayedValue(other.getDisplayedValue()); setColor(other.getColor()); + setOutpuTopic(other.getOutpuTopic()); + setDisplayInView(other.isDisplayInView()); +} + +bool ValueElement::isDisplayInView() const +{ + return displayInView; +} + +void ValueElement::setDisplayInView(bool value) +{ + displayInView = value; +} + +QString ValueElement::getOutpuTopic() const +{ + return outpuTopic; +} + +void ValueElement::setOutpuTopic(const QString &value) +{ + outpuTopic = value; +} + +bool ValueElement::isEmitActive() const +{ + return outpuTopic != ""; } QString ValueElement::getCurrentValue() const diff --git a/Modules/ValuesViewer/valueelement.h b/Modules/ValuesConverterViewer/valueelement.h similarity index 81% rename from Modules/ValuesViewer/valueelement.h rename to Modules/ValuesConverterViewer/valueelement.h index 80ecaeed63c6996852e6c2ba724c86e308b44612..d23a978f199ed74274d7a2adc8c2af140887ace8 100644 --- a/Modules/ValuesViewer/valueelement.h +++ b/Modules/ValuesConverterViewer/valueelement.h @@ -11,7 +11,7 @@ public: ValueElement(); ~ValueElement(); ValueElement(const ValueElement &other); - ValueElement(const QString &name, const QString &topic, const QString &receivedValue, const QString &displayedValue, const QString &color); + ValueElement(const QString &name, const QString &topic, const QString &receivedValue, const QString &displayedValue, const QString &color, const QString &outputTopic = ""); ValueElement operator=(const ValueElement &other); QString getName() const; @@ -37,6 +37,14 @@ public: QString getCurrentValue() const; bool updateCurrentValue(const QString &value); + QString getOutpuTopic() const; + void setOutpuTopic(const QString &value); + + bool isEmitActive() const; + + bool isDisplayInView() const; + void setDisplayInView(bool value); + protected: void copy(const ValueElement &other); @@ -46,8 +54,9 @@ private: QString receivedValue = ""; QString displayedValue = ""; QString color = "#ffffff"; - + QString outpuTopic = ""; QString currentValue = ""; + bool displayInView = true; }; #endif // VALUEELEMENT_H diff --git a/Modules/ValuesViewer/valuesviewermodule.cpp b/Modules/ValuesConverterViewer/valuesconverterviewermodule.cpp similarity index 57% rename from Modules/ValuesViewer/valuesviewermodule.cpp rename to Modules/ValuesConverterViewer/valuesconverterviewermodule.cpp index b3491cf95fa1166f2bc35e6a92e1b796cf8a95fd..b1b944dbcbaa810e346d8e810357ca1519564100 100644 --- a/Modules/ValuesViewer/valuesviewermodule.cpp +++ b/Modules/ValuesConverterViewer/valuesconverterviewermodule.cpp @@ -1,30 +1,30 @@ -#include "valuesviewermodule.h" -#include "ui_valuesviewermodule.h" +#include "valuesconverterviewermodule.h" +#include "ui_valuesconverterviewermodule.h" #include "valuesviewerconfigpanel.h" #include "Core/modulemessagesbroker.h" -ValuesViewerModule::ValuesViewerModule(QWidget *parent) : DefaultModule(parent), ui(new Ui::ValuesViewerModule) +ValuesConverterViewerModule::ValuesConverterViewerModule(QWidget *parent) : DefaultModule(parent), ui(new Ui::ValuesConverterViewerModule) { ui->setupUi(this); defaultContextMenuSetup(); } -ValuesViewerModule::~ValuesViewerModule() +ValuesConverterViewerModule::~ValuesConverterViewerModule() { clearLabels(); delete ui; } -QWidget *ValuesViewerModule::toWidget() +QWidget *ValuesConverterViewerModule::toWidget() { return this; } -XmlObject ValuesViewerModule::toXmlObject() -{ - XmlObject obj(getName(ModuleId::VALUESVIEWER)); +XmlObject ValuesConverterViewerModule::toXmlObject() +{ + XmlObject obj(getName(ModuleId::VALUESCONVERTERVIEWER)); obj.addAttribute("Columns", QString::number(columns)); @@ -34,9 +34,9 @@ XmlObject ValuesViewerModule::toXmlObject() return obj; } -void ValuesViewerModule::fromXmlObject(const XmlObject &xmlObject) +void ValuesConverterViewerModule::fromXmlObject(const XmlObject &xmlObject) { - if(xmlObject.getObjectName() == getName(ModuleId::VALUESVIEWER)){ + if(xmlObject.getObjectName() == getName(ModuleId::VALUESCONVERTERVIEWER)){ int col; if(xmlObject.getIntAttribute("Columns", col)){ @@ -54,16 +54,16 @@ void ValuesViewerModule::fromXmlObject(const XmlObject &xmlObject) } } -void ValuesViewerModule::onConfigureClicked() +void ValuesConverterViewerModule::onConfigureClicked() { ValuesViewerConfigPanel *sPanel = new ValuesViewerConfigPanel(); sPanel->setRules(rules); sPanel->setColumnsCount(columns); - connect(sPanel, &ValuesViewerConfigPanel::configurationSaved, this, &ValuesViewerModule::onConfigurationSaved); + connect(sPanel, &ValuesViewerConfigPanel::configurationSaved, this, &ValuesConverterViewerModule::onConfigurationSaved); sPanel->show(); } -void ValuesViewerModule::onConfigurationSaved(ValuesViewerConfigPanel *sPanel) +void ValuesConverterViewerModule::onConfigurationSaved(ValuesViewerConfigPanel *sPanel) { setRules(sPanel->getRules()); columns = sPanel->getColumnsCount(); @@ -71,14 +71,14 @@ void ValuesViewerModule::onConfigurationSaved(ValuesViewerConfigPanel *sPanel) createLabels(); } -void ValuesViewerModule::addCustomActionsToMenu() +void ValuesConverterViewerModule::addCustomActionsToMenu() { QAction* configure = new QAction("Configure"); - connect(configure, &QAction::triggered,this, &ValuesViewerModule::onConfigureClicked); + connect(configure, &QAction::triggered,this, &ValuesConverterViewerModule::onConfigureClicked); addActionToMenu(configure); } -QLabel *ValuesViewerModule::createView(const ValueElement &el) const +QLabel *ValuesConverterViewerModule::createView(const ValueElement &el) const { QLabel *label = new QLabel(); label->setText(el.getName()); @@ -86,7 +86,7 @@ QLabel *ValuesViewerModule::createView(const ValueElement &el) const return label; } -void ValuesViewerModule::clearLabels() +void ValuesConverterViewerModule::clearLabels() { while(labels.count() > 0){ QLabel *l = labels[0]; @@ -95,7 +95,7 @@ void ValuesViewerModule::clearLabels() } } -void ValuesViewerModule::createLabels() +void ValuesConverterViewerModule::createLabels() { clearLabels(); if(columns <= 0){ @@ -117,24 +117,28 @@ void ValuesViewerModule::createLabels() col = 0; row++; } - ui->mainLayout_grid->addWidget(label, row, col); - col++; + + if(rules[i].isDisplayInView()){ + ui->mainLayout_grid->addWidget(label, row, col); + col++; + } } labels.append(label); + } } -void ValuesViewerModule::addRule(const ValueElement &el) +void ValuesConverterViewerModule::addRule(const ValueElement &el) { - rules.append(el); - if(el.getTopic() != ""){ + if(el.getTopic() != "" && isTopicPresent(el.getTopic())){ getCore()->getModuleMessagesBroker()->subscribe(el.getTopic(), this, [this](const ModuleMessage &msg){ onMsgReceived(msg); }); } + rules.append(el); } -void ValuesViewerModule::setRules(const QList<ValueElement> &rList) +void ValuesConverterViewerModule::setRules(const QList<ValueElement> &rList) { clearRules(); for (int i = 0; i < rList.count(); i++ ) { @@ -142,7 +146,7 @@ void ValuesViewerModule::setRules(const QList<ValueElement> &rList) } } -void ValuesViewerModule::onMsgReceived(const ModuleMessage &msg) +void ValuesConverterViewerModule::onMsgReceived(const ModuleMessage &msg) { for (int i = 0; i < rules.count(); i++ ) { if(rules[i].getTopic() == msg.topic()){ @@ -151,12 +155,19 @@ void ValuesViewerModule::onMsgReceived(const ModuleMessage &msg) if(rules[i].getColor() != ""){ labels[i]->setStyleSheet("color:"+rules[i].getColor()+";"); } + + if(rules[i].isEmitActive()){ + ModuleMessage convertedMsg(msg); + convertedMsg.setPayload(rules[i].getCurrentValue()); + convertedMsg.setTopic(rules[i].getOutpuTopic()); + getCore()->getModuleMessagesBroker()->publish(convertedMsg); + } } } } } -void ValuesViewerModule::clearRules() +void ValuesConverterViewerModule::clearRules() { for (int i = 0; i < rules.count(); i++ ) { if(rules[i].getTopic() != ""){ @@ -166,7 +177,7 @@ void ValuesViewerModule::clearRules() rules.clear(); } -int ValuesViewerModule::findLabelIndexByName(const QString &name) +int ValuesConverterViewerModule::findLabelIndexByName(const QString &name) { for (int i = 0; i < labels.count(); i++ ) { if(labels[i]->text() == name){ @@ -175,3 +186,13 @@ int ValuesViewerModule::findLabelIndexByName(const QString &name) } return -1; } + +bool ValuesConverterViewerModule::isTopicPresent(const QString &topic) +{ + for (int i = 0; i < rules.count(); i++ ) { + if(rules[i].getTopic() == topic){ + return true; + } + } + return false; +} diff --git a/Modules/ValuesViewer/valuesviewermodule.h b/Modules/ValuesConverterViewer/valuesconverterviewermodule.h similarity index 70% rename from Modules/ValuesViewer/valuesviewermodule.h rename to Modules/ValuesConverterViewer/valuesconverterviewermodule.h index 818a5c909f71dbccebef7d6b27a86237c927cd7c..d203da39cae15e88a306a5023aecf8f29c96e064 100644 --- a/Modules/ValuesViewer/valuesviewermodule.h +++ b/Modules/ValuesConverterViewer/valuesconverterviewermodule.h @@ -1,5 +1,5 @@ -#ifndef VALUESVIEWERMODULE_H -#define VALUESVIEWERMODULE_H +#ifndef VALUESCONVERTERVIEWERMODULE_H +#define VALUESCONVERTERVIEWERMODULE_H #include <QWidget> #include <QLabel> @@ -9,17 +9,19 @@ class ValuesViewerConfigPanel; + namespace Ui { -class ValuesViewerModule; +class ValuesConverterViewerModule; } -class ValuesViewerModule : public DefaultModule +class ValuesConverterViewerModule : public DefaultModule { Q_OBJECT public: - explicit ValuesViewerModule(QWidget *parent = nullptr); - ~ValuesViewerModule(); + explicit ValuesConverterViewerModule(QWidget *parent = nullptr); + ~ValuesConverterViewerModule(); + QWidget *toWidget() override; @@ -38,13 +40,15 @@ protected: void onMsgReceived(const ModuleMessage &msg); void clearRules(); int findLabelIndexByName(const QString &name); + bool isTopicPresent(const QString &topic); private: - Ui::ValuesViewerModule *ui; + Ui::ValuesConverterViewerModule *ui; int minColNumber = 1; int columns = minColNumber; QList<QLabel*> labels; QList<ValueElement> rules; + }; -#endif // VALUESVIEWERMODULE_H +#endif // VALUESCONVERTERVIEWERMODULE_H diff --git a/Modules/ValuesViewer/valuesviewermodule.ui b/Modules/ValuesConverterViewer/valuesconverterviewermodule.ui similarity index 90% rename from Modules/ValuesViewer/valuesviewermodule.ui rename to Modules/ValuesConverterViewer/valuesconverterviewermodule.ui index 729f5822e6079244a1df003d2b4349f597cbe616..23a19bd16d85c5a1a521bfeecd822c7638a417df 100644 --- a/Modules/ValuesViewer/valuesviewermodule.ui +++ b/Modules/ValuesConverterViewer/valuesconverterviewermodule.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>ValuesViewerModule</class> - <widget class="QWidget" name="ValuesViewerModule"> + <class>ValuesConverterViewerModule</class> + <widget class="QWidget" name="ValuesConverterViewerModule"> <property name="geometry"> <rect> <x>0</x> diff --git a/Modules/ValuesViewer/valuesviewerconfigpanel.cpp b/Modules/ValuesConverterViewer/valuesviewerconfigpanel.cpp similarity index 85% rename from Modules/ValuesViewer/valuesviewerconfigpanel.cpp rename to Modules/ValuesConverterViewer/valuesviewerconfigpanel.cpp index edf229c38ffbaa970aaac3ddb6c88d9d18f95af5..5f16966e185f2264dfeb378f65e4f11539d71f4a 100644 --- a/Modules/ValuesViewer/valuesviewerconfigpanel.cpp +++ b/Modules/ValuesConverterViewer/valuesviewerconfigpanel.cpp @@ -12,6 +12,7 @@ ValuesViewerConfigPanel::ValuesViewerConfigPanel(QWidget *parent) : QWidget(pare connect(ui->remove_pushButton, &QPushButton::clicked, this, &ValuesViewerConfigPanel::onRemoveClicked); connect(ui->pickColor_pushButton, &QPushButton::clicked, this, &ValuesViewerConfigPanel::onPickColordClicked); connect(ui->save_pushButton, &QPushButton::clicked, this, &ValuesViewerConfigPanel::onSaveClicked); + connect(ui->emit_radioButton, &QRadioButton::toggled, this, &ValuesViewerConfigPanel::onEmitRadioButtonToggled); this->setAttribute(Qt::WA_DeleteOnClose, true); } @@ -38,7 +39,10 @@ ValueElement ValuesViewerConfigPanel::createRuleFromControls() QString receivedValue = ui->receivedValue_lineEdit->text().trimmed(); QString displayedValue = ui->displayedValue_lineEdit->text().trimmed(); QString color = ui->color_lineEdit->text().trimmed(); - ValueElement e(name, topic, receivedValue, displayedValue, color); + QString outpuTopic = ui->outputTopic_lineEdit->text().trimmed(); + bool isDisplayView = ui->displayInView_checkBox->isChecked(); + ValueElement e(name, topic, receivedValue, displayedValue, color, outpuTopic); + e.setDisplayInView(isDisplayView); return e; } @@ -113,6 +117,17 @@ void ValuesViewerConfigPanel::setTextBoxValues(const ValueElement &el) ui->receivedValue_lineEdit->setText(el.getReceivedValue()); ui->displayedValue_lineEdit->setText(el.getDisplayedValue()); ui->color_lineEdit->setText(el.getColor()); + + ui->displayInView_checkBox->setChecked(el.isDisplayInView()); + + if(el.isEmitActive()){ + ui->outputTopic_lineEdit->setText(el.getOutpuTopic()); + ui->emit_radioButton->setChecked(true); + } + else{ + ui->doNotEmit_radioButton->setChecked(true); + ui->outputTopic_lineEdit->setText(""); + } } int ValuesViewerConfigPanel::findSelectedView() const @@ -134,6 +149,15 @@ void ValuesViewerConfigPanel::addRule(int index, const ValueElement &el) connect(view, &QRadioButton::clicked, this, &ValuesViewerConfigPanel::onValueElementClicked); } +void ValuesViewerConfigPanel::onEmitRadioButtonToggled(bool val) +{ + ui->outputTopic_lineEdit->setEnabled(val); + + if(val == false){ + ui->outputTopic_lineEdit->setText(""); + } +} + void ValuesViewerConfigPanel::setRules(const QList<ValueElement> &newValues) { diff --git a/Modules/ValuesViewer/valuesviewerconfigpanel.h b/Modules/ValuesConverterViewer/valuesviewerconfigpanel.h similarity index 96% rename from Modules/ValuesViewer/valuesviewerconfigpanel.h rename to Modules/ValuesConverterViewer/valuesviewerconfigpanel.h index 913524371b3d525ff53c777476749c73f50808a5..aa7adb9a979e6ee0c2a99b3d630d10b71d94d7d5 100644 --- a/Modules/ValuesViewer/valuesviewerconfigpanel.h +++ b/Modules/ValuesConverterViewer/valuesviewerconfigpanel.h @@ -39,6 +39,7 @@ protected: void setTextBoxValues(const ValueElement &el); int findSelectedView() const; void addRule(int index, const ValueElement &el); + void onEmitRadioButtonToggled(bool val); ValueElement createRuleFromControls(); diff --git a/Modules/ValuesViewer/valuesviewerconfigpanel.ui b/Modules/ValuesConverterViewer/valuesviewerconfigpanel.ui similarity index 79% rename from Modules/ValuesViewer/valuesviewerconfigpanel.ui rename to Modules/ValuesConverterViewer/valuesviewerconfigpanel.ui index 803402bea7401601d0ef020bb6304c3b27cb247c..da5a13318726e140a93493aad6354be6278f23b1 100644 --- a/Modules/ValuesViewer/valuesviewerconfigpanel.ui +++ b/Modules/ValuesConverterViewer/valuesviewerconfigpanel.ui @@ -86,7 +86,7 @@ The rules with the same name refer to the same object.</string> <x>0</x> <y>0</y> <width>761</width> - <height>424</height> + <height>354</height> </rect> </property> <layout class="QVBoxLayout" name="fieldsLayout"> @@ -119,20 +119,33 @@ The rules with the same name refer to the same object.</string> </item> <item> <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Name</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> <item row="1" column="2"> <widget class="QLineEdit" name="receivedValue_lineEdit"/> </item> - <item row="0" column="3"> - <widget class="QLabel" name="label_3"> + <item row="0" column="1"> + <widget class="QLabel" name="label_6"> <property name="text"> - <string>Displayed Value</string> + <string>Topic</string> </property> <property name="alignment"> <set>Qt::AlignCenter</set> </property> </widget> </item> - <item row="0" column="4"> + <item row="1" column="0"> + <widget class="QLineEdit" name="name_lineEdit"/> + </item> + <item row="0" column="5"> <widget class="QLabel" name="label_4"> <property name="text"> <string>Color</string> @@ -143,6 +156,9 @@ The rules with the same name refer to the same object.</string> </widget> </item> <item row="1" column="4"> + <widget class="QLineEdit" name="displayedValue_lineEdit"/> + </item> + <item row="1" column="5"> <layout class="QHBoxLayout" name="horizontalLayout_4"> <item> <widget class="QLineEdit" name="color_lineEdit"> @@ -160,44 +176,84 @@ The rules with the same name refer to the same object.</string> </item> </layout> </item> - <item row="0" column="2"> - <widget class="QLabel" name="label_2"> + <item row="0" column="4"> + <widget class="QLabel" name="label_3"> <property name="text"> - <string>Received Value</string> + <string>Displayed Value</string> </property> <property name="alignment"> <set>Qt::AlignCenter</set> </property> </widget> </item> - <item row="1" column="3"> - <widget class="QLineEdit" name="displayedValue_lineEdit"/> + <item row="1" column="1"> + <widget class="QLineEdit" name="topic_lineEdit"/> </item> - <item row="0" column="0"> - <widget class="QLabel" name="label_5"> + <item row="0" column="2"> + <widget class="QLabel" name="label_2"> <property name="text"> - <string>Name</string> + <string>Received Value</string> </property> <property name="alignment"> <set>Qt::AlignCenter</set> </property> </widget> </item> - <item row="0" column="1"> - <widget class="QLabel" name="label_6"> + <item row="2" column="1"> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Emit</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QRadioButton" name="doNotEmit_radioButton"> + <property name="text"> + <string>Don't emit</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="emit_radioButton"> + <property name="text"> + <string>Emit always</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="2" column="2"> + <widget class="QLabel" name="label_9"> <property name="text"> - <string>Topic</string> + <string>Output topic</string> </property> <property name="alignment"> - <set>Qt::AlignCenter</set> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> </item> - <item row="1" column="0"> - <widget class="QLineEdit" name="name_lineEdit"/> + <item row="2" column="4"> + <widget class="QLineEdit" name="outputTopic_lineEdit"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="placeholderText"> + <string>Topic </string> + </property> + </widget> </item> - <item row="1" column="1"> - <widget class="QLineEdit" name="topic_lineEdit"/> + <item row="2" column="0"> + <widget class="QCheckBox" name="displayInView_checkBox"> + <property name="text"> + <string>Display in view</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> </item> </layout> </item> diff --git a/Modules/moduleinfo.h b/Modules/moduleinfo.h index 9fc4a19296bc0df6681c91c353d053022ca8a1b1..77b4919d2b18ae9a0c4ee8cf2d95a206a944b20c 100644 --- a/Modules/moduleinfo.h +++ b/Modules/moduleinfo.h @@ -22,7 +22,7 @@ enum ModuleId{ SCROLLAREA, FILESTREAM, STATEVIEWER, - VALUESVIEWER, + VALUESCONVERTERVIEWER, MAVLINK_RCK_TESTING }; diff --git a/Modules/moduleslist.cpp b/Modules/moduleslist.cpp index 27dc6334f874d888fcb606e3f83575338da6ae40..f948f1532c20ebdc898a8a4e001399565b045d8e 100644 --- a/Modules/moduleslist.cpp +++ b/Modules/moduleslist.cpp @@ -20,7 +20,7 @@ #include "Modules/FileStream/filestreammodule.h" #include "Modules/Mavlink/mavlinkrocketmsgtestingmodule.h" #include "Modules/StateViewer/stateviewermodule.h" -#include "Modules/ValuesViewer/valuesviewermodule.h" +#include "Modules/ValuesConverterViewer/valuesconverterviewermodule.h" void ModulesList::createModuleList() { @@ -155,11 +155,11 @@ void ModulesList::createModuleList() addModuleInfo(stateViewer); #endif - #ifdef VALUESVIEWERMODULE_H - ModuleInfo valuesviewer(ModuleId::VALUESVIEWER, "ValuesViewer", ModuleCategory::DATAVISUAL); - valuesviewer.setFactory([](){return new ValuesViewerModule();}); - valuesviewer.addModuleSourceFiles("Modules/ValuesViewer/"); - addModuleInfo(valuesviewer); + #ifdef VALUESCONVERTERVIEWERMODULE_H + ModuleInfo valuesconverterviewer(ModuleId::VALUESCONVERTERVIEWER, "ValuesConverterViewer", ModuleCategory::UTILITY); + valuesconverterviewer.setFactory([](){return new ValuesConverterViewerModule();}); + valuesconverterviewer.addModuleSourceFiles("Modules/ValuesConverterViewer/"); + addModuleInfo(valuesconverterviewer); #endif } diff --git a/SkywardHub.pro b/SkywardHub.pro index 07b55cc087de519ec29a5f0fb645b9651f2856bb..7fdc13bfa0485d36745ddfd08258f8b84c5f2a31 100644 --- a/SkywardHub.pro +++ b/SkywardHub.pro @@ -67,9 +67,9 @@ SOURCES += \ Modules/Utility/saveconfigurationdialog.cpp \ Modules/Utility/subscriptionspanel.cpp \ Modules/Utility/togglebutton.cpp \ - Modules/ValuesViewer/valueelement.cpp \ - Modules/ValuesViewer/valuesviewerconfigpanel.cpp \ - Modules/ValuesViewer/valuesviewermodule.cpp \ + Modules/ValuesConverterViewer/valueelement.cpp \ + Modules/ValuesConverterViewer/valuesconverterviewermodule.cpp \ + Modules/ValuesConverterViewer/valuesviewerconfigpanel.cpp \ Modules/moduleinfo.cpp \ Modules/moduleslist.cpp \ Modules/skywardhubstrings.cpp \ @@ -136,9 +136,9 @@ HEADERS += \ Modules/Utility/saveconfigurationdialog.h \ Modules/Utility/subscriptionspanel.h \ Modules/Utility/togglebutton.h \ - Modules/ValuesViewer/valueelement.h \ - Modules/ValuesViewer/valuesviewerconfigpanel.h \ - Modules/ValuesViewer/valuesviewermodule.h \ + Modules/ValuesConverterViewer/valueelement.h \ + Modules/ValuesConverterViewer/valuesconverterviewermodule.h \ + Modules/ValuesConverterViewer/valuesviewerconfigpanel.h \ Modules/moduleinfo.h \ Modules/moduleslist.h \ Modules/skywardhubstrings.h @@ -173,8 +173,8 @@ FORMS += \ Modules/Utility/modulespicker.ui \ Modules/Utility/saveconfigurationdialog.ui \ Modules/Utility/subscriptionspanel.ui \ - Modules/ValuesViewer/valuesviewerconfigpanel.ui \ - Modules/ValuesViewer/valuesviewermodule.ui + Modules/ValuesConverterViewer/valuesconverterviewermodule.ui \ + Modules/ValuesConverterViewer/valuesviewerconfigpanel.ui # Default rules for deployment. qnx: target.path = /tmp/$${TARGET}/bin diff --git a/SkywardHub.pro.user b/SkywardHub.pro.user index 7d4088b022199bc8d7b419ca5a138773ba38a57f..88bb0cca2f483c993ee2953204b0cc67907c1852 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-08-12T14:50:14. --> +<!-- Written by QtCreator 4.14.2, 2021-08-25T15:11:28. --> <qtcreator> <data> <variable>EnvironmentId</variable>