diff --git a/Modules/ImageViewer/imageviewermodule.ui b/Modules/ImageViewer/imageviewermodule.ui index 5bcea00650e611113dee98e2d5172af900c644e0..91b6a964265a000cfa11136967483fc48671063f 100644 --- a/Modules/ImageViewer/imageviewermodule.ui +++ b/Modules/ImageViewer/imageviewermodule.ui @@ -7,9 +7,15 @@ <x>0</x> <y>0</y> <width>430</width> - <height>339</height> + <height>400</height> </rect> </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>400</height> + </size> + </property> <property name="windowTitle"> <string>Form</string> </property> diff --git a/Modules/Mavlink/mavlinkcommandadapter.h b/Modules/Mavlink/mavlinkcommandadapter.h index 2456b10b5c4928ebcb73d564d07265cef7be0456..b79702bb3d0a75d763b2b718eb989bd279cd74c8 100644 --- a/Modules/Mavlink/mavlinkcommandadapter.h +++ b/Modules/Mavlink/mavlinkcommandadapter.h @@ -2,7 +2,7 @@ #define MAVLINKCOMMANDADAPTER_H #include <QObject> -#include "mavlink_skyward_lib/mavlink_lib/hermes/mavlink.h" +#include "mavlinkversionheader.h" #include "Core/modulemessage.h" #include "mavlinkwriter.h" #include <QSerialPort> diff --git a/Modules/Mavlink/mavlinkrocketmsgtestingmodule.cpp b/Modules/Mavlink/mavlinkrocketmsgtestingmodule.cpp new file mode 100644 index 0000000000000000000000000000000000000000..2724ad6b9ffb39fa3fed6101eba069ac8d72ea34 --- /dev/null +++ b/Modules/Mavlink/mavlinkrocketmsgtestingmodule.cpp @@ -0,0 +1,28 @@ +#include "mavlinkrocketmsgtestingmodule.h" +#include "ui_mavlinkrocketmsgtestingmodule.h" + +MavlinkRocketMsgTestingModule::MavlinkRocketMsgTestingModule(QWidget *parent) : DefaultModule(parent), ui(new Ui::MavlinkRocketMsgTestingModule) +{ + ui->setupUi(this); + defaultContextMenuSetup(); +} + +MavlinkRocketMsgTestingModule::~MavlinkRocketMsgTestingModule() +{ + delete ui; +} + +QWidget *MavlinkRocketMsgTestingModule::toWidget() +{ + return this; +} + +XmlObject MavlinkRocketMsgTestingModule::toXmlObject() +{ + return XmlObject(getName(ModuleId::MAVLINK_RCK_TESTING)); +} + +void MavlinkRocketMsgTestingModule::fromXmlObject(const XmlObject &xmlObject) +{ + Q_UNUSED(xmlObject); +} diff --git a/Modules/Mavlink/mavlinkrocketmsgtestingmodule.h b/Modules/Mavlink/mavlinkrocketmsgtestingmodule.h new file mode 100644 index 0000000000000000000000000000000000000000..dce1b88725e7b327997801fedc7cda6b0e5090d2 --- /dev/null +++ b/Modules/Mavlink/mavlinkrocketmsgtestingmodule.h @@ -0,0 +1,27 @@ +#ifndef MAVLINKROCKETMSGTESTINGMODULE_H +#define MAVLINKROCKETMSGTESTINGMODULE_H + +#include "Modules/DefaultModule/defaultmodule.h" + +namespace Ui { +class MavlinkRocketMsgTestingModule; +} + +class MavlinkRocketMsgTestingModule : public DefaultModule +{ + Q_OBJECT + +public: + explicit MavlinkRocketMsgTestingModule(QWidget *parent = nullptr); + ~MavlinkRocketMsgTestingModule(); + + QWidget *toWidget() override; + + XmlObject toXmlObject() override; + void fromXmlObject(const XmlObject &xmlObject) override; + +private: + Ui::MavlinkRocketMsgTestingModule *ui; +}; + +#endif // MAVLINKROCKETMSGTESTINGMODULE_H diff --git a/Modules/Mavlink/mavlinkrocketmsgtestingmodule.ui b/Modules/Mavlink/mavlinkrocketmsgtestingmodule.ui new file mode 100644 index 0000000000000000000000000000000000000000..509b4d79b9d8e1ccd00848621335154418e63d51 --- /dev/null +++ b/Modules/Mavlink/mavlinkrocketmsgtestingmodule.ui @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>MavlinkRocketMsgTestingModule</class> + <widget class="QWidget" name="MavlinkRocketMsgTestingModule"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>300</height> + </rect> + </property> + <property name="windowTitle"> + <string>Form</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Mavlink Rocket Messages Tester</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QScrollArea" name="scrollArea"> + <property name="widgetResizable"> + <bool>true</bool> + </property> + <widget class="QWidget" name="scrollAreaWidgetContents"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>290</width> + <height>255</height> + </rect> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QRadioButton" name="radioButton"> + <property name="text"> + <string>Messaggio generico</string> + </property> + </widget> + </item> + </layout> + </widget> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton"> + <property name="text"> + <string>Send</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/Modules/Mavlink/mavlinkversionheader.h b/Modules/Mavlink/mavlinkversionheader.h new file mode 100644 index 0000000000000000000000000000000000000000..771391c9f2591551a5097c97e5e5f20c564d91df --- /dev/null +++ b/Modules/Mavlink/mavlinkversionheader.h @@ -0,0 +1,6 @@ +#ifndef MAVLINKVERSIONHEADER_H +#define MAVLINKVERSIONHEADER_H + +#include "mavlink_skyward_lib/mavlink_lib/hermes/mavlink.h" + +#endif // MAVLINKVERSIONHEADER_H diff --git a/Modules/Mavlink/mavlinkwriter.cpp b/Modules/Mavlink/mavlinkwriter.cpp index dcc67169fe04349dcc4535d9f6e0caeb8c844a09..3467a6774413e964c560ca730c0325de9d60b5d0 100644 --- a/Modules/Mavlink/mavlinkwriter.cpp +++ b/Modules/Mavlink/mavlinkwriter.cpp @@ -2,7 +2,6 @@ #include <chrono> - MavlinkWriter::MavlinkWriter() { @@ -12,14 +11,16 @@ void MavlinkWriter::startAsyncWrite(QSerialPort *port, mavlink_message_t msgToSe { serial = port; this->msgToSend = msgToSend; - this->start(); // Chiama run() + this->start(); // Call run() } void MavlinkWriter::writeMsg(mavlink_message_t *msgToSend) { + mtx.lock(); unsigned char buff[sizeof(mavlink_message_t)+1]; int msg_len = mavlink_msg_to_send_buffer(buff, msgToSend); serial->write(reinterpret_cast<char*>(buff),msg_len); + mtx.unlock(); } void MavlinkWriter::run() diff --git a/Modules/Mavlink/mavlinkwriter.h b/Modules/Mavlink/mavlinkwriter.h index 9df3ee95bedcfb75c04b0644615d5eead0981dca..e82da7bd5688137f520d9ef5a9faaa246ed4e069 100644 --- a/Modules/Mavlink/mavlinkwriter.h +++ b/Modules/Mavlink/mavlinkwriter.h @@ -2,8 +2,9 @@ #define MAVLINKWRITER_H #include <QThread> +#include <mutex> #include <QSerialPort> -#include "mavlink_skyward_lib/mavlink_lib/hermes/mavlink.h" +#include "mavlinkversionheader.h" class MavlinkWriter : public QThread { @@ -19,10 +20,9 @@ protected: void run(); private: - static const int MAV_CMP = 1; - static const int MAV_SYS = 1; QSerialPort *serial = nullptr; mavlink_message_t msgToSend; + std::mutex mtx; }; #endif // MAVLINKWRITER_H diff --git a/Modules/MessageViewer/messagesviewermodule.ui b/Modules/MessageViewer/messagesviewermodule.ui index ce399497e50014175fdbbb3205bb0542ca6b0e91..96895b985e7d8c4ef1b112de80f486f7a47b0b2e 100644 --- a/Modules/MessageViewer/messagesviewermodule.ui +++ b/Modules/MessageViewer/messagesviewermodule.ui @@ -6,10 +6,16 @@ <rect> <x>0</x> <y>0</y> - <width>402</width> - <height>300</height> + <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> diff --git a/Modules/SerialStream/serialstreammodule.cpp b/Modules/SerialStream/serialstreammodule.cpp new file mode 100644 index 0000000000000000000000000000000000000000..063be98b42c1610bd3d8c0b4f28c7896d1f9fab1 --- /dev/null +++ b/Modules/SerialStream/serialstreammodule.cpp @@ -0,0 +1,91 @@ +#include "serialstreammodule.h" +#include "ui_serialstreammodule.h" + +#include <QSerialPort> +#include <QSerialPortInfo> + + +SerialStreamModule::SerialStreamModule(QWidget *parent) : DefaultModule(parent), ui(new Ui::SerialStreamModule) +{ + ui->setupUi(this); + defaultContextMenuSetup(); + initializeSerialPortView(); + + connectUiSlots(); + //qRegisterMetaType<ModuleMessage>(); +} + +SerialStreamModule::~SerialStreamModule() +{ + delete ui; +} + +QWidget *SerialStreamModule::toWidget() +{ + return this; +} + +XmlObject SerialStreamModule::toXmlObject() +{ + XmlObject obj(getName(ModuleId::SERIALSTREAM)); + obj.addAttribute("BaudRateIndex",QString::number(ui->comboBox_baudRate->currentIndex())); + return obj; +} + +void SerialStreamModule::fromXmlObject(const XmlObject &xmlObject) +{ + if(xmlObject.getObjectName() == getName(ModuleId::SERIALSTREAM)){ + bool ok; + int index = xmlObject.getAttribute("BaudRateIndex").toInt(&ok); + if(ok){ + ui->comboBox_baudRate->setCurrentIndex(index); + } + } +} + +void SerialStreamModule::initializeSerialPortView() +{ + //fill the baud rate combo box + QString baudPrefix = "BaudRate: "; + ui->comboBox_baudRate->addItem(baudPrefix + "115200", QSerialPort::Baud115200); + ui->comboBox_baudRate->addItem(baudPrefix + "57600", QSerialPort::Baud57600); + ui->comboBox_baudRate->addItem(baudPrefix + "38400", QSerialPort::Baud38400); + ui->comboBox_baudRate->addItem(baudPrefix + "19200", QSerialPort::Baud19200); + ui->comboBox_baudRate->addItem(baudPrefix + "9600", QSerialPort::Baud9600); + ui->comboBox_baudRate->addItem(baudPrefix + "4800", QSerialPort::Baud4800); + ui->comboBox_baudRate->addItem(baudPrefix + "2400", QSerialPort::Baud2400); + ui->comboBox_baudRate->addItem(baudPrefix + "1200", QSerialPort::Baud1200); + + + //Check available port + const auto serialPortInfos = QSerialPortInfo::availablePorts(); + for (const QSerialPortInfo &serialPortInfo : serialPortInfos) { +// QString serialNumber = serialPortInfo.serialNumber(); +// QVariant data = (!serialNumber.isEmpty() ? serialNumber : "N/A"); + QVariant data(serialPortInfo.portName()); + ui->comboBox_serialPort->addItem(serialPortInfo.portName(), data); + } +} + +void SerialStreamModule::connectUiSlots() +{ + connect(ui->button_start,&QPushButton::clicked,this, &SerialStreamModule::onStartClicked); + connect(ui->button_stop,&QPushButton::clicked,this, &SerialStreamModule::onStopClicked); + connect(ui->comboBox_serialPort, SIGNAL(currentIndexChanged(int)), this, SLOT(onSerialPortIndexChanged(int))); +} + +void SerialStreamModule::onStartClicked() +{ + +} + +void SerialStreamModule::onStopClicked() +{ + +} + +void SerialStreamModule::onSerialPortIndexChanged(int index) +{ + QVariant data = ui->comboBox_serialPort->itemData(index); + ui->lineEdit_serialPort->setText(data.toString()); +} diff --git a/Modules/SerialStream/serialstreammodule.h b/Modules/SerialStream/serialstreammodule.h new file mode 100644 index 0000000000000000000000000000000000000000..e9f495aa0aa56ce72920ca333057a5eabcc87fc8 --- /dev/null +++ b/Modules/SerialStream/serialstreammodule.h @@ -0,0 +1,38 @@ +#ifndef SERIALSTREAMMODULE_H +#define SERIALSTREAMMODULE_H + +#include "Modules/DefaultModule/defaultmodule.h" +#include "Core/modulemessage.h" + +//Q_DECLARE_METATYPE(ModuleMessage); + +namespace Ui { +class SerialStreamModule; +} + +class SerialStreamModule : public DefaultModule +{ + Q_OBJECT + +public: + explicit SerialStreamModule(QWidget *parent = nullptr); + ~SerialStreamModule(); + + QWidget *toWidget() override; + XmlObject toXmlObject() override; + void fromXmlObject(const XmlObject &xmlObject) override; + +protected: + void initializeSerialPortView(); + void connectUiSlots(); + void onStartClicked(); + void onStopClicked(); + +protected slots: + void onSerialPortIndexChanged(int index); + +private: + Ui::SerialStreamModule *ui; +}; + +#endif // SERIALSTREAMMODULE_H diff --git a/Modules/SerialStream/serialstreammodule.ui b/Modules/SerialStream/serialstreammodule.ui new file mode 100644 index 0000000000000000000000000000000000000000..f941bf8a08b53fa9e7ac530a7d8adc69d968c02b --- /dev/null +++ b/Modules/SerialStream/serialstreammodule.ui @@ -0,0 +1,169 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>SerialStreamModule</class> + <widget class="QWidget" name="SerialStreamModule"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>405</width> + <height>350</height> + </rect> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>350</height> + </size> + </property> + <property name="windowTitle"> + <string>Form</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Write Topic</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEdit_writeTopic"/> + </item> + <item> + <widget class="QPushButton" name="button_start"> + <property name="text"> + <string>Start Writing</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="button_stop"> + <property name="text"> + <string>Stop Writing</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Read Topic</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEdit_readTopic"/> + </item> + <item> + <widget class="QPushButton" name="pushButton"> + <property name="text"> + <string>Start Reading</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton_2"> + <property name="text"> + <string>Stop Reading</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Port</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="comboBox_serialPort"/> + </item> + <item> + <widget class="QLineEdit" name="lineEdit_serialPort"/> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <item> + <widget class="QComboBox" name="comboBox_baudRate"/> + </item> + <item> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Timeout [s]</string> + </property> + </widget> + </item> + <item> + <widget class="QDoubleSpinBox" name="doubleSpinBox"/> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/Modules/TreeViewer/treeviewermodule.ui b/Modules/TreeViewer/treeviewermodule.ui index 77bbe0df8764be69584a1b95fa191191669a1846..25fb3ed389d725b2788012ae177a3dac3806a394 100644 --- a/Modules/TreeViewer/treeviewermodule.ui +++ b/Modules/TreeViewer/treeviewermodule.ui @@ -7,9 +7,15 @@ <x>0</x> <y>0</y> <width>400</width> - <height>300</height> + <height>400</height> </rect> </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>400</height> + </size> + </property> <property name="windowTitle"> <string>Form</string> </property> diff --git a/Modules/moduleinfo.h b/Modules/moduleinfo.h index b4fda6b121e026cd78d1c5b0df192601fa4676a6..103dd9f015ba733591f9ccdb37fe3f6772e8b987 100644 --- a/Modules/moduleinfo.h +++ b/Modules/moduleinfo.h @@ -19,7 +19,9 @@ enum ModuleId{ MAVLINK, FSMVIEWER, TREEVIEWER, - SCROLLAREA + SCROLLAREA, + SERIALSTREAM, + MAVLINK_RCK_TESTING }; enum ModuleCategory{ diff --git a/Modules/moduleslist.cpp b/Modules/moduleslist.cpp index 5f8ab8559628e69be2e69259c152f5003f87e6d7..2e339edfc7f3c6abd364dceffc744ce3a1f01418 100644 --- a/Modules/moduleslist.cpp +++ b/Modules/moduleslist.cpp @@ -17,6 +17,8 @@ #include "Modules/Fsm/fsmviewermodule.h" #include "Modules/TreeViewer/treeviewermodule.h" #include "Modules/ScrollArea/scrollareamodule.h" +#include "Modules/SerialStream/serialstreammodule.h" +#include "Modules/Mavlink/mavlinkrocketmsgtestingmodule.h" void ModulesList::createModuleList() { @@ -28,6 +30,7 @@ void ModulesList::createModuleList() * WARNING! * ⚠ Each ID must be unique * ⚠ Each ModuleName must be unique and WITHOUT spaces + * ⚠ A Module must NOT include another Module * ⚠ The ModuleSourceFiles allow you to specify which files will be included * (all the files that match the strings you privide will be included) */ @@ -109,6 +112,12 @@ void ModulesList::createModuleList() addModuleInfo(mavlink); #endif + #ifdef SERIALSTREAMMODULE_H + ModuleInfo mvkRckTesting(ModuleId::MAVLINK_RCK_TESTING, "MavlinkRocketMsgTesting", ModuleCategory::DEFAULT); + mvkRckTesting.setFactory([](){return new MavlinkRocketMsgTestingModule();}); + addModuleInfo(mvkRckTesting); + #endif + #ifdef FSMVIEWERMODULE_H ModuleInfo fsm(ModuleId::FSMVIEWER, "FsmViewer", ModuleCategory::UTILITY); fsm.setFactory([](){return new FsmViewerModule();}); @@ -129,6 +138,13 @@ void ModulesList::createModuleList() scrollArea.addModuleSourceFiles("Modules/ScrollArea/"); addModuleInfo(scrollArea); #endif + + #ifdef SERIALSTREAMMODULE_H + ModuleInfo serialStream(ModuleId::SERIALSTREAM, "SerialStream", ModuleCategory::DATASOURCE); + serialStream.setFactory([](){return new SerialStreamModule();}); + serialStream.addModuleSourceFiles("Modules/SerialStream/"); + addModuleInfo(serialStream); + #endif } diff --git a/SkywardHub.pro b/SkywardHub.pro index c47107d4d2eee413ea88bb02b911bbb4c9acf60c..940a37203f1d1183bcadb5eb5e311f1d6788d7a4 100644 --- a/SkywardHub.pro +++ b/SkywardHub.pro @@ -45,9 +45,11 @@ SOURCES += \ Modules/Mavlink/mavlinkcommandadapter.cpp \ Modules/Mavlink/mavlinkmodule.cpp \ Modules/Mavlink/mavlinkreader.cpp \ + Modules/Mavlink/mavlinkrocketmsgtestingmodule.cpp \ Modules/Mavlink/mavlinkwriter.cpp \ Modules/MessageViewer/messagesviewermodule.cpp \ Modules/ScrollArea/scrollareamodule.cpp \ + Modules/SerialStream/serialstreammodule.cpp \ Modules/SkywardHub/deployer.cpp \ Modules/SkywardHub/deployerpathpicker.cpp \ Modules/SkywardHub/prefabdialog.cpp \ @@ -105,9 +107,13 @@ HEADERS += \ Modules/Mavlink/mavlinkcommandadapter.h \ Modules/Mavlink/mavlinkmodule.h \ Modules/Mavlink/mavlinkreader.h \ + Modules/Mavlink/mavlinkrocketmsgtestingmodule.h \ + Modules/Mavlink/mavlinkversionheader.h \ + Modules/Mavlink/mavlinkversionheader.h \ Modules/Mavlink/mavlinkwriter.h \ Modules/MessageViewer/messagesviewermodule.h \ Modules/ScrollArea/scrollareamodule.h \ + Modules/SerialStream/serialstreammodule.h \ Modules/SkywardHub/deployer.h \ Modules/SkywardHub/deployerpathpicker.h \ Modules/SkywardHub/prefabdialog.h \ @@ -141,8 +147,10 @@ FORMS += \ Modules/MainWindow/skywardhubmainwindow.ui \ Modules/MainWindow/window.ui \ Modules/Mavlink/mavlinkmodule.ui \ + Modules/Mavlink/mavlinkrocketmsgtestingmodule.ui \ Modules/MessageViewer/messagesviewermodule.ui \ Modules/ScrollArea/scrollareamodule.ui \ + Modules/SerialStream/serialstreammodule.ui \ Modules/SkywardHub/deployerpathpicker.ui \ Modules/SkywardHub/prefabdialog.ui \ Modules/SkywardHub/prefabviewelement.ui \ diff --git a/SkywardHub.pro.user b/SkywardHub.pro.user index 78cbef79f5a40320241abf99a88a32effbf3ae58..616878ec14f40673fab9a92a477b0a4dbc678d81 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.13.0, 2020-12-12T21:18:43. --> +<!-- Written by QtCreator 4.14.0, 2021-02-20T23:33:22. --> <qtcreator> <data> <variable>EnvironmentId</variable> @@ -73,6 +73,7 @@ <value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value> <value type="QString" key="ClangCodeModel.WarningConfigId">Builtin.Questionable</value> <valuemap type="QVariantMap" key="ClangTools"> + <value type="bool" key="ClangTools.AnalyzeOpenFiles">false</value> <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value> <value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value> <value type="int" key="ClangTools.ParallelJobs">6</value> @@ -94,7 +95,6 @@ <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <value type="bool">true</value> <value type="int" key="EnableQmlDebugging">0</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Debug</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Debug</value> @@ -109,11 +109,6 @@ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> </valuemap> <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> @@ -124,11 +119,7 @@ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> </valuemap> <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> @@ -142,12 +133,8 @@ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> - <value type="int" key="QtQuickCompiler">2</value> - <value type="int" key="SeparateDebugInfo">2</value> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <value type="bool">true</value> - <value type="int" key="EnableQmlDebugging">2</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Release</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Release</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> @@ -161,11 +148,6 @@ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> </valuemap> <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> @@ -176,11 +158,7 @@ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> </valuemap> <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> @@ -195,10 +173,8 @@ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> <value type="int" key="QtQuickCompiler">0</value> - <value type="int" key="SeparateDebugInfo">2</value> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2"> - <value type="bool">true</value> <value type="int" key="EnableQmlDebugging">0</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Profile</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Profile</value> @@ -213,11 +189,6 @@ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> </valuemap> <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> @@ -228,11 +199,7 @@ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> </valuemap> <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> @@ -263,7 +230,6 @@ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> </valuemap> <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/> <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value> <valuelist type="QVariantList" key="Analyzer.Perf.Events"> @@ -327,16 +293,11 @@ <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Master/Progetti/Programmazione/Skyward/SkywardHub/SkywardHub.pro</value> <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">C:/Master/Progetti/Programmazione/Skyward/SkywardHub/SkywardHub.pro</value> - <value type="QString" key="RunConfiguration.Arguments"></value> - <value type="bool" key="RunConfiguration.Arguments.multi">false</value> - <value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value> <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value> - <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> - <value type="QString" key="RunConfiguration.WorkingDirectory"></value> <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_32_bit-Debug</value> </valuemap> <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> @@ -353,7 +314,6 @@ <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <value type="bool">true</value> <value type="int" key="EnableQmlDebugging">0</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Debug</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Debug</value> @@ -368,11 +328,6 @@ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> </valuemap> <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> @@ -383,11 +338,7 @@ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> </valuemap> <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> @@ -401,12 +352,8 @@ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> - <value type="int" key="QtQuickCompiler">2</value> - <value type="int" key="SeparateDebugInfo">2</value> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <value type="bool">true</value> - <value type="int" key="EnableQmlDebugging">2</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Release</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Release</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> @@ -420,11 +367,6 @@ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> </valuemap> <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> @@ -435,11 +377,7 @@ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> </valuemap> <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> @@ -454,10 +392,8 @@ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> <value type="int" key="QtQuickCompiler">0</value> - <value type="int" key="SeparateDebugInfo">2</value> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2"> - <value type="bool">true</value> <value type="int" key="EnableQmlDebugging">0</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Master\Progetti\Programmazione\Skyward\build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Profile</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Master/Progetti/Programmazione/Skyward/build-SkywardHub-Desktop_Qt_5_15_1_MinGW_64_bit-Profile</value> @@ -472,11 +408,6 @@ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> </valuemap> <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> @@ -487,11 +418,7 @@ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> </valuemap> <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> @@ -522,7 +449,6 @@ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> </valuemap> <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/> <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value> <valuelist type="QVariantList" key="Analyzer.Perf.Events"> @@ -584,19 +510,12 @@ <valuelist type="QVariantList" key="CustomOutputParsers"/> <value type="int" key="PE.EnvironmentAspect.Base">2</value> <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> - <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value> <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value> - <value type="QString" key="RunConfiguration.Arguments"></value> - <value type="bool" key="RunConfiguration.Arguments.multi">false</value> - <value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value> <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> - <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> - <value type="QString" key="RunConfiguration.WorkingDirectory"></value> - <value type="QString" key="RunConfiguration.WorkingDirectory.default"></value> </valuemap> <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> </valuemap>