설정 변경 추가

git-svn-id: svn://192.168.0.12/source@122 8346c931-da38-4b9b-9d4c-e48b93cbd075
This commit is contained in:
admin
2015-05-22 07:09:26 +00:00
parent dbc2aa2434
commit c9d60008cd
2 changed files with 41 additions and 11 deletions

View File

@@ -8,10 +8,10 @@
#include <QPushButton>
#include <QThread>
#include <QTime>
#include <QMessageBox>
#include <QFile>
#include <QSettings>
#include "../json/sjson.h"
#include "../Json/sjson.h"
#include "../common.h"
Widget::Widget(QWidget *parent) :
@@ -158,7 +158,11 @@ Widget::Widget(QWidget *parent) :
connect(&m_timer, SIGNAL(timeout()), this, SLOT(time_update()));
//m_pThread = new SGetThread;
setLayout(vMainLayout);
//m_pPutThread = new SPutThread[QThread::idealThreadCount()];
//m_pPutThread = new SPutThread[QThread::idealThreadCount()];
if (ReloadSetup() == false)
{
InsertLog("setup.ini don't find");
}
m_db = QSqlDatabase::addDatabase("QMYSQL");
m_timer.start(5000);
Refresh();
@@ -191,6 +195,21 @@ void Widget::InsertLog(QString str)
m_plwLog->repaint();
}
bool Widget::ReloadSetup()
{
QSettings settings(QString("setup.ini"), QSettings::IniFormat);
settings.setIniCodec("UTF-8");
settings.beginGroup(QString("database"));
if (settings.childKeys().size() == 0) return false;
m_strWebDataBaseHost = settings.value("host").toString();
m_strWebDataBaseUser = settings.value("user").toString();
m_strWebDataBasePass = settings.value("pass").toString();
m_strWebDataBaseName = settings.value("name").toString();
settings.endGroup();
return true;
}
void Widget::Refresh()
{
m_db.setHostName("bigbird.iptime.org");
@@ -243,10 +262,10 @@ void Widget::Refresh()
m_db.close();
FilterProcssRefresh("-1");
m_db.setHostName(D_DB_WEB_HOST);
m_db.setUserName(D_DB_WEB_USER);
m_db.setPassword(D_DB_WEB_PASS);
m_db.setDatabaseName(D_DB_WEB_NAME);
m_db.setHostName(m_strWebDataBaseHost);
m_db.setUserName(m_strWebDataBaseUser);
m_db.setPassword(m_strWebDataBasePass);
m_db.setDatabaseName(m_strWebDataBaseName);
if (m_db.open() == false)
{
@@ -268,10 +287,10 @@ void Widget::Refresh()
void Widget::CompanyItemChanged(QListWidgetItem* _current,QListWidgetItem*)
{
if (_current == 0) return;
m_db.setHostName(D_DB_WEB_HOST);
m_db.setUserName(D_DB_WEB_USER);
m_db.setPassword(D_DB_WEB_PASS);
m_db.setDatabaseName(D_DB_WEB_NAME);
m_db.setHostName(m_strWebDataBaseHost);
m_db.setUserName(m_strWebDataBaseUser);
m_db.setPassword(m_strWebDataBasePass);
m_db.setDatabaseName(m_strWebDataBaseName);
if (m_db.open() == false)
{
InsertLog(m_db.lastError().text());
@@ -579,7 +598,12 @@ void Widget::on_process_insert()
{
if (m_aProcess[i].state() == QProcess::NotRunning)
{
#if defined(Q_OS_WIN32)
m_aProcess[i].setProgram("FilterProcess.exe");
#else
m_aProcess[i].setProgram("./FilterProcess");
#endif
m_aProcess[i].setArguments(strlist);
break;
}

View File

@@ -26,6 +26,7 @@ public:
};
void FilterProcssRefresh(QString _strGroupID);
void Refresh();
bool ReloadSetup();
private:
QListWidget *m_plw;
QListWidget *m_plwLog;
@@ -35,6 +36,11 @@ private:
QTimer m_timer;
QLineEdit *m_pleFilterProcessGroup;
QString m_strWebDataBaseHost;
QString m_strWebDataBaseUser;
QString m_strWebDataBasePass;
QString m_strWebDataBaseName;
QSqlDatabase m_db;
void InsertLog(QString str);
void InsertFilterProcess(int _nProcessType);