From 9d91879b069dbac03c88fa5e0681469fa4d2861e Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 2 Sep 2015 03:22:20 +0000 Subject: [PATCH] =?UTF-8?q?=EA=B7=B8=EB=9E=98=E3=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://192.168.0.12/source@181 8346c931-da38-4b9b-9d4c-e48b93cbd075 --- Analyzer/Analyzer.pro | 3 +- Analyzer/mainwindow.h | 3 +- Analyzer/scountdlg.cpp | 151 +++++++++++++++++++++++++++++++------ Analyzer/sfilterobject.cpp | 9 +-- 4 files changed, 135 insertions(+), 31 deletions(-) diff --git a/Analyzer/Analyzer.pro b/Analyzer/Analyzer.pro index 22b44e3..2b09ebd 100644 --- a/Analyzer/Analyzer.pro +++ b/Analyzer/Analyzer.pro @@ -4,14 +4,13 @@ # #------------------------------------------------- -QT += core gui sql webkitwidgets +QT += core gui sql webenginewidgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = Analyzer TEMPLATE = app - SOURCES += main.cpp\ mainwindow.cpp \ sloaddlg.cpp \ diff --git a/Analyzer/mainwindow.h b/Analyzer/mainwindow.h index e9c236c..19b2bc1 100644 --- a/Analyzer/mainwindow.h +++ b/Analyzer/mainwindow.h @@ -11,6 +11,7 @@ #include #include #include +#include #include "sloaddlg.h" #include "sdatadlg.h" @@ -51,7 +52,7 @@ public: SCountDlg *m_pCountDlg; SFilterObject *m_pFilterObjectDlg; SFilterDlg *m_pFilterDlg; - QWebView m_graph; + QWebEngineView m_graph; QSqlDatabase m_db; QProgressBar m_progress; private: diff --git a/Analyzer/scountdlg.cpp b/Analyzer/scountdlg.cpp index 34ca2aa..7181170 100644 --- a/Analyzer/scountdlg.cpp +++ b/Analyzer/scountdlg.cpp @@ -53,24 +53,130 @@ void SCountDlg::setWidgets() m_pCombo[i].addItem(strList.at(SColumn::E_NAME)); } - QFile file(QApplication::applicationDirPath()+"/graph.html"); - if (!file.open(QIODevice::ReadOnly)) - return; - //m_strGraph = file.readAll(); - - QTextStream batStream (&file); - while(!batStream.atEnd()) - { - m_strGraph += batStream.readLine(); - } - QMessageBox msg; - msg.setText(m_strGraph); - msg.setModal(true); - msg.exec(); + m_strGraph = "" + "\r\n" + "\r\n" + "\r\n" + "\r\n" + "\r\n" + "\r\n"; m_strGraph = m_strGraph.replace("[!F*i!l*e!]",QApplication::applicationDirPath()+"/graph.tsv"); - - file.close(); } void SCountDlg::run() @@ -191,31 +297,30 @@ void SCountDlg::run() } */ - void SCountDlg::graph() { QFile file(QApplication::applicationDirPath()+"/graph.tsv"); if (!file.open(QIODevice::WriteOnly)) return; QTextStream out(&file); - out << "date\t"; + out << QString("date\t").toUtf8(); for (int i = 1; i < m_pTable->columnCount();i++) - out << m_pTable->horizontalHeaderItem(i)->text() << "\t"; - out << "\n"; + out << m_pTable->horizontalHeaderItem(i)->text().toUtf8() << QString("\t").toUtf8(); + out << QString("\n").toUtf8(); GetMainWindow()->m_progress.setRange(0,m_pTable->rowCount()); for (int i = 0 ; i < m_pTable->rowCount() ; i++ ) { for (int j = 0; j < m_pTable->columnCount();j++) { - out << m_pTable->item(i,j)->text().trimmed().toUtf8() << "\t"; + out << m_pTable->item(i,j)->text().trimmed().toUtf8() << QString("\t").toUtf8(); } - out << "\n"; + out << QString("\n").toUtf8(); GetMainWindow()->m_progress.setValue(i); GetMainWindow()->m_progress.repaint(); } file.close(); GetMainWindow()->m_graph.setHtml(m_strGraph.toUtf8(),QUrl("file:///")); - GetMainWindow()->m_graph.settings()->setObjectCacheCapacities(0,0,0); + //GetMainWindow()->m_graph.settings()->setObjectCacheCapacities(0,0,0); GetMainWindow()->m_graph.repaint(); GetMainWindow()->m_graph.show(); } diff --git a/Analyzer/sfilterobject.cpp b/Analyzer/sfilterobject.cpp index c558fde..6162734 100644 --- a/Analyzer/sfilterobject.cpp +++ b/Analyzer/sfilterobject.cpp @@ -530,15 +530,14 @@ void SFilterObject::DataBaseFilter(int _nType,QString _strJson,int _nGroup,int _ switch(_nCommand) { case E_DATABASE_COMMAND_INSERT: - sql = "INSERT INTO filter SET "; - sql += QString("type=") + QString::number(_nType) + ","; + sql = "INSERT INTO filter SET "; break; case E_DATABASE_COMMAND_UPDATE: - sql = "UPDATE filter SET "; + sql = "UPDATE filter SET "; break; } - sql += QString("data='") + _strJson + "',"; sql += QString("type=") + QString::number(_nType) + ","; + sql += QString("data='") + _strJson + "',"; sql += QString("filtergroup_id=" ) + QString::number(_nGroup); if (_nCommand == E_DATABASE_COMMAND_UPDATE) { @@ -546,7 +545,7 @@ void SFilterObject::DataBaseFilter(int _nType,QString _strJson,int _nGroup,int _ sql += QString(" where id=") + QString::number(_nFilterID); } QSqlQuery query; - query.exec(sql.toUtf8()); + if(query.exec(sql.toUtf8()) == false) { qDebug() << query.lastError().text();} } void SFilterObject::DataBaseTimeFilter(int _nArticle ,QDate _dateStart ,QDate _dateEnd ,int _nGroup,int _nCommand,int _nFilterID )