jfmartel/YULTek
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Développement cloud.

Browse Source
This commit is contained in:
jfmartel
2023-02-19 17:03:43 -05:00
parent 3ec5677dca
commit daa887d67b
33 changed files with 2122 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Otarcik_CAN/Sources/Gui/CANViewerPage.cpp
+28 -2
View File
@@ -149,7 +149,21 @@ void CCANViewerPage::MessageSelectionChanged()
ui->mCANSignalTableWidget->setItem(signal,0,NewItem);
//Phys value
NewItem = new QTableWidgetItem(QString("%1").arg(Msg->mSignalsList.at(signal)->mPhysicalValue,0,'f',1));
if(Msg->mSignalsList.at(signal)->mValueType == CCANSignal::CAN_SIGNAL_TYPE_UNSIGNED_INT)
{
NewItem = new QTableWidgetItem(QString("%1").arg((quint64)Msg->mSignalsList.at(signal)->mPhysicalValue));
}
else if(Msg->mSignalsList.at(signal)->mValueType == CCANSignal::CAN_SIGNAL_TYPE_SIGNED_INT)
{
NewItem = new QTableWidgetItem(QString("%1").arg((qint64)Msg->mSignalsList.at(signal)->mPhysicalValue));
}
else if(Msg->mSignalsList.at(signal)->mValueType == CCANSignal::CAN_SIGNAL_TYPE_32_BIT_FLOAT ||
Msg->mSignalsList.at(signal)->mValueType == CCANSignal::CAN_SIGNAL_TYPE_64_BIT_DOUBLE)
{
NewItem = new QTableWidgetItem(QString("%1").arg(Msg->mSignalsList.at(signal)->mPhysicalValue,0,'f',1));
}
ui->mCANSignalTableWidget->setItem(signal,1,NewItem);
//Raw value
@@ -184,7 +198,19 @@ int CCANViewerPage::UpdateSignalsTable()
ui->mCANSignalTableWidget->item(row,0)->setText(Msg->mSignalsList.at(signal)->mSignalName);
//Phys value
ui->mCANSignalTableWidget->item(row,0)->setText(QString("%1").arg(Msg->mSignalsList.at(signal)->mPhysicalValue,0,'f',1));
if(Msg->mSignalsList.at(signal)->mValueType == CCANSignal::CAN_SIGNAL_TYPE_UNSIGNED_INT)
{
ui->mCANSignalTableWidget->item(row,0)->setText(QString("%1").arg((quint64)Msg->mSignalsList.at(signal)->mPhysicalValue));
}
else if(Msg->mSignalsList.at(signal)->mValueType == CCANSignal::CAN_SIGNAL_TYPE_SIGNED_INT)
{
ui->mCANSignalTableWidget->item(row,0)->setText(QString("%1").arg((qint64)Msg->mSignalsList.at(signal)->mPhysicalValue));
}
else if(Msg->mSignalsList.at(signal)->mValueType == CCANSignal::CAN_SIGNAL_TYPE_32_BIT_FLOAT ||
Msg->mSignalsList.at(signal)->mValueType == CCANSignal::CAN_SIGNAL_TYPE_64_BIT_DOUBLE)
{
ui->mCANSignalTableWidget->item(row,0)->setText(QString("%1").arg(Msg->mSignalsList.at(signal)->mPhysicalValue,0,'f',1));
}
//Raw value
ui->mCANSignalTableWidget->item(row,0)->setText(QString("0x%1").arg(Msg->mSignalsList.at(signal)->mRawValue,0,16));
Otarcik_CAN/Sources/Gui/LoggingSettingsPage.cpp
+90 -1
View File
@@ -1,14 +1,103 @@
#include "LoggingSettingsPage.h"
#include "ui_LoggingSettingsPage.h"
#include "defines.h"
#include "OtarcikCan.h"
CLoggingSettingsPage::CLoggingSettingsPage(QWidget *parent) :
QWidget(parent),
ui(new Ui::CLoggingSettingsPage)
ui(new Ui::CLoggingSettingsPage),
EditMode(false)
{
ui->setupUi(this);
ui->mCancelBtn->hide();
ui->mChangeParamsBtn->setText("Modifier");
ui->mCloudMQTTHostNameEdit->setEnabled(false);
ui->mCloudMQTTPasswordEdit->setEnabled(false);
ui->mCloudMQTTPortSpinBx->setEnabled(false);
ui->mCloudMQTTTopicPrefixEdit->setEnabled(false);
ui->mCloudMQTTUserNameEdit->setEnabled(false);
connect(ui->mCancelBtn,&QPushButton::clicked,this,&CLoggingSettingsPage::CancelBtnPressed);
connect(ui->mChangeParamsBtn,&QPushButton::clicked,this,&CLoggingSettingsPage::ModifyParamsBtnPressed);
}
CLoggingSettingsPage::~CLoggingSettingsPage()
{
delete ui;
}
int CLoggingSettingsPage::SetCloudParams(const CCloudParams *CloudParams)
{
if(CloudParams == 0)
{
return RET_GENERAL_ERROR;
}
mCloudParams = *CloudParams;
UpdateConfigPage();
return RET_OK;
}
void CLoggingSettingsPage::ModifyParamsBtnPressed()
{
if(EditMode == false)
{
EditMode = true;
ui->mCancelBtn->show();
ui->mCloudMQTTHostNameEdit->setEnabled(true);
ui->mCloudMQTTPasswordEdit->setEnabled(true);
ui->mCloudMQTTPortSpinBx->setEnabled(true);
ui->mCloudMQTTTopicPrefixEdit->setEnabled(true);
ui->mCloudMQTTUserNameEdit->setEnabled(true);
ui->mChangeParamsBtn->setText("Appliquer");
}
else
{
EditMode = false;
ui->mChangeParamsBtn->setText("Modifier");
ui->mCancelBtn->hide();
ui->mCloudMQTTHostNameEdit->setEnabled(false);
ui->mCloudMQTTPasswordEdit->setEnabled(false);
ui->mCloudMQTTPortSpinBx->setEnabled(false);
ui->mCloudMQTTTopicPrefixEdit->setEnabled(false);
ui->mCloudMQTTUserNameEdit->setEnabled(false);
mCloudParams.mMQTTBrokerHostName = ui->mCloudMQTTHostNameEdit->text();
mCloudParams.mMQTTBrokerPassword = ui->mCloudMQTTPasswordEdit->text();
mCloudParams.mMQTTBrokerPort = (quint32)ui->mCloudMQTTPortSpinBx->value();
mCloudParams.mMQTTTopicPrefix = ui->mCloudMQTTTopicPrefixEdit->text();
mCloudParams.mMQTTBrokerUserName = ui->mCloudMQTTUserNameEdit->text();
mProgramHandle->SaveCloudLoggingConfigRequest(&mCloudParams);
}
}
void CLoggingSettingsPage::CancelBtnPressed()
{
EditMode = false;
ui->mCancelBtn->hide();
ui->mCloudMQTTHostNameEdit->setEnabled(false);
ui->mCloudMQTTPasswordEdit->setEnabled(false);
ui->mCloudMQTTPortSpinBx->setEnabled(false);
ui->mCloudMQTTTopicPrefixEdit->setEnabled(false);
ui->mCloudMQTTUserNameEdit->setEnabled(false);
UpdateConfigPage();
}
int CLoggingSettingsPage::UpdateConfigPage()
{
ui->mCloudMQTTHostNameEdit->setText(mCloudParams.mMQTTBrokerHostName);
ui->mCloudMQTTPasswordEdit->setText(mCloudParams.mMQTTBrokerPassword);
ui->mCloudMQTTPortSpinBx->setValue(mCloudParams.mMQTTBrokerPort);
ui->mCloudMQTTTopicPrefixEdit->setText(mCloudParams.mMQTTTopicPrefix);
ui->mCloudMQTTUserNameEdit->setText(mCloudParams.mMQTTBrokerUserName);
return RET_OK;
}
Otarcik_CAN/Sources/Gui/LoggingSettingsPage.h
+23
View File
@@ -2,6 +2,10 @@
#define LOGGINGSETTINGSPAGE_H
#include <QWidget>
#include "CloudParams.h"
class COtarcikCan;
namespace Ui {
class CLoggingSettingsPage;
@@ -15,8 +19,27 @@ public:
explicit CLoggingSettingsPage(QWidget *parent = 0);
~CLoggingSettingsPage();
int SetCloudParams(const CCloudParams *CloudParams);
COtarcikCan *mProgramHandle;
private:
int UpdateConfigPage();
Ui::CLoggingSettingsPage *ui;
bool EditMode;
CCloudParams mCloudParams;
public slots:
void ModifyParamsBtnPressed();
void CancelBtnPressed();
};
#endif // LOGGINGSETTINGSPAGE_H
Otarcik_CAN/Sources/Gui/LoggingSettingsPage.ui
+30 -4
View File
@@ -208,8 +208,8 @@
<widget class="QLabel" name="mGeneralLogParamsLbl">
<property name="geometry">
<rect>
<x>20</x>
<y>370</y>
<x>740</x>
<y>40</y>
<width>181</width>
<height>31</height>
</rect>
@@ -226,8 +226,8 @@
<widget class="QCheckBox" name="mSaveLocalLogFileChkBx">
<property name="geometry">
<rect>
<x>20</x>
<y>410</y>
<x>740</x>
<y>80</y>
<width>261</width>
<height>20</height>
</rect>
@@ -236,6 +236,32 @@
<string>Sauvegarder fichier log local</string>
</property>
</widget>
<widget class="QPushButton" name="mChangeParamsBtn">
<property name="geometry">
<rect>
<x>370</x>
<y>340</y>
<width>80</width>
<height>22</height>
</rect>
</property>
<property name="text">
<string>Modifier</string>
</property>
</widget>
<widget class="QPushButton" name="mCancelBtn">
<property name="geometry">
<rect>
<x>260</x>
<y>340</y>
<width>80</width>
<height>22</height>
</rect>
</property>
<property name="text">
<string>Annuler</string>
</property>
</widget>
</widget>
<resources/>
<connections/>