|
@@ -9,6 +9,7 @@
|
|
|
#include <QSqlError>
|
|
#include <QSqlError>
|
|
|
#include <QTextStream>
|
|
#include <QTextStream>
|
|
|
#include <QRegularExpression>
|
|
#include <QRegularExpression>
|
|
|
|
|
+#include <QApplication>
|
|
|
#define READ_INI_STR(key, default_value) (settings.contains(key) ? settings.value(key).toString() : default_value)
|
|
#define READ_INI_STR(key, default_value) (settings.contains(key) ? settings.value(key).toString() : default_value)
|
|
|
#define READ_INI_INT(key, default_value) (settings.contains(key) ? settings.value(key).toInt() : default_value)
|
|
#define READ_INI_INT(key, default_value) (settings.contains(key) ? settings.value(key).toInt() : default_value)
|
|
|
|
|
|
|
@@ -97,8 +98,8 @@ void pdu_Ctrl::slot_setAngel(int nAngle)
|
|
|
}
|
|
}
|
|
|
qDebug()<<"x:"<<m_pWidget->geometry().x()<<"y:"<<m_pWidget->geometry().y()<<"Width:"<<m_pWidget->size().width()<<"Height:"<<m_pWidget->size().height();
|
|
qDebug()<<"x:"<<m_pWidget->geometry().x()<<"y:"<<m_pWidget->geometry().y()<<"Width:"<<m_pWidget->size().width()<<"Height:"<<m_pWidget->size().height();
|
|
|
}
|
|
}
|
|
|
- m_pWidget->m_nAngle=nAngle;
|
|
|
|
|
#endif
|
|
#endif
|
|
|
|
|
+ m_pWidget->m_nAngle=nAngle;
|
|
|
m_pView->update();
|
|
m_pView->update();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -134,7 +135,8 @@ void pdu_Ctrl::InitData(Widget *pWidget, QGraphicsProxyWidget *pProxy, QGraphics
|
|
|
|
|
|
|
|
void pdu_Ctrl::ReadModbusInit()
|
|
void pdu_Ctrl::ReadModbusInit()
|
|
|
{
|
|
{
|
|
|
- QSettings settings("/root/run/app/smartPDU.ini",QSettings::IniFormat);
|
|
|
|
|
|
|
+ QString appPath = QCoreApplication::applicationDirPath();
|
|
|
|
|
+ QSettings settings(appPath+"/smartPDU.ini",QSettings::IniFormat);
|
|
|
m_nModbusAddress=READ_INI_INT("MODBUS/address",0);
|
|
m_nModbusAddress=READ_INI_INT("MODBUS/address",0);
|
|
|
if(m_nModbusAddress>255||m_nModbusAddress<0)
|
|
if(m_nModbusAddress>255||m_nModbusAddress<0)
|
|
|
{
|
|
{
|
|
@@ -181,8 +183,9 @@ void pdu_Ctrl::ReadModbusInit()
|
|
|
void pdu_Ctrl::SaveModbusInit()
|
|
void pdu_Ctrl::SaveModbusInit()
|
|
|
{
|
|
{
|
|
|
//QSettings settings("/root/run/app/smartPDU.ini",QSettings::IniFormat);
|
|
//QSettings settings("/root/run/app/smartPDU.ini",QSettings::IniFormat);
|
|
|
- updateIniValue("/root/run/app/smartPDU.ini","MODBUS","address",QString::number(m_nModbusAddress));
|
|
|
|
|
- updateIniValue("/root/run/app/smartPDU.ini","MODBUS","MSType",QString::number(m_nModbusMSType));
|
|
|
|
|
|
|
+ QString appPath = QCoreApplication::applicationDirPath();
|
|
|
|
|
+ updateIniValue(appPath+"/smartPDU.ini","MODBUS","address",QString::number(m_nModbusAddress));
|
|
|
|
|
+ updateIniValue(appPath+"/smartPDU.ini","MODBUS","MSType",QString::number(m_nModbusMSType));
|
|
|
//settings.setValue("MODBUS/address",m_nModbusAddress);
|
|
//settings.setValue("MODBUS/address",m_nModbusAddress);
|
|
|
//settings.setValue("MODBUS/MSType",m_nModbusMSType);//0:主机,1:从机
|
|
//settings.setValue("MODBUS/MSType",m_nModbusMSType);//0:主机,1:从机
|
|
|
QSqlDatabase m_db;
|
|
QSqlDatabase m_db;
|
|
@@ -217,7 +220,8 @@ void pdu_Ctrl::SaveModbusInit()
|
|
|
void pdu_Ctrl::ReadPDUinit()
|
|
void pdu_Ctrl::ReadPDUinit()
|
|
|
{
|
|
{
|
|
|
qDebug()<<"Read misc/rotate";
|
|
qDebug()<<"Read misc/rotate";
|
|
|
- QSettings settings("/root/run/app/smartPDU.ini",QSettings::IniFormat);
|
|
|
|
|
|
|
+ QString appPath = QCoreApplication::applicationDirPath();
|
|
|
|
|
+ QSettings settings(appPath+"/smartPDU.ini",QSettings::IniFormat);
|
|
|
QString strRotate=READ_INI_STR("misc/rotate","0");
|
|
QString strRotate=READ_INI_STR("misc/rotate","0");
|
|
|
qDebug()<<"misc/rotate="<<strRotate;
|
|
qDebug()<<"misc/rotate="<<strRotate;
|
|
|
if(!strRotate.isEmpty())
|
|
if(!strRotate.isEmpty())
|
|
@@ -238,7 +242,8 @@ void pdu_Ctrl::SetPDUInit()
|
|
|
//QSettings settings("/root/run/app/smartPDU.ini",QSettings::IniFormat);
|
|
//QSettings settings("/root/run/app/smartPDU.ini",QSettings::IniFormat);
|
|
|
QString strValue="\""+QString::number(m_nSaveAngle)+"\"";
|
|
QString strValue="\""+QString::number(m_nSaveAngle)+"\"";
|
|
|
//settings.setValue("misc/rotate",strValue);
|
|
//settings.setValue("misc/rotate",strValue);
|
|
|
- updateIniValue("/root/run/app/smartPDU.ini","misc","rotate",strValue);
|
|
|
|
|
|
|
+ QString appPath = QCoreApplication::applicationDirPath();
|
|
|
|
|
+ updateIniValue(appPath+"/smartPDU.ini","misc","rotate",strValue);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
bool pdu_Ctrl::updateIniValue(const QString &filePath, const QString §ion, const QString &key, const QString &newValue)
|
|
bool pdu_Ctrl::updateIniValue(const QString &filePath, const QString §ion, const QString &key, const QString &newValue)
|