Explorar el Código

添加专家工程

Signed-off-by: codeClown <zhaomengshou@126.com>
codeClown hace 1 año
padre
commit
c6c4150f5e

+ 73 - 0
ExpertClient/ExpertClient.pro

@@ -0,0 +1,73 @@
+QT       += core gui sql concurrent xml svg
+
+win32: {
+    QT += winextras axcontainer
+}
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+*g++*: {
+    QMAKE_CXXFLAGS_RELEASE -= -O
+    QMAKE_CXXFLAGS_RELEASE *= -O3
+}
+
+*msvc*: {
+    QMAKE_CFLAGS += /utf-8
+    QMAKE_CXXFLAGS += /utf-8
+    QMAKE_CXXFLAGS_RELEASE -= /O
+    QMAKE_CXXFLAGS_RELEASE *= /O2
+}
+
+CONFIG += c++14
+
+INCLUDEPATH += $$PWD/../QFluentWidgets
+
+CONFIG(debug, release|debug){
+    win32:LIBS += -lqfluentwidgetsd
+    else: LIBS += -lqfluentwidgets
+} else {
+    LIBS += -lqfluentwidgets
+}
+
+#-------------------------------------------------------------------------------
+# Build options
+#-------------------------------------------------------------------------------
+DESTDIR = $$PWD/../bin      #指定生成的应用程序放置的路径
+LIBS += -L$$PWD/../bin      #指定生成的库文件放置的路径,与应用程序放在一起
+
+# You can make your code fail to compile if it uses deprecated APIs.
+# In order to do so, uncomment the following line.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+include($$PWD/../QFD/CCanvas/CCanvas.pri)
+include($$PWD/../QFD/QtAwesome/QtAwesome.pri)
+include($$PWD/../QFD/EasyQtSql/EasyQtSql.pri)
+include($$PWD/../QFD/dbService/dbService.pri)
+include($$PWD/../QFD/helper/helper.pri)
+include($$PWD/../QFD/QXlsx-1.4.3/QXlsx.pri)
+
+
+INCLUDEPATH +=  $$PWD/../QFD/shemeTable/ \
+                $$PWD/../QFD/helper \
+                $$PWD/../QFD/
+
+# Default rules for deployment.
+qnx: target.path = /tmp/$${TARGET}/bin
+else: unix:!android: target.path = /opt/$${TARGET}/bin
+!isEmpty(target.path): INSTALLS += target
+
+VERSION = "2.1.2.1"
+
+
+SOURCES += \
+    MainWindow.cpp \
+    main.cpp
+
+FORMS += \
+    MainWindow.ui
+
+HEADERS += \
+    MainWindow.h
+
+RESOURCES += \
+    $$PWD/../QFD/resource.qrc

+ 14 - 0
ExpertClient/MainWindow.cpp

@@ -0,0 +1,14 @@
+#include "MainWindow.h"
+#include "ui_MainWindow.h"
+
+MainWindow::MainWindow(QWidget *parent) :
+    QMainWindow(parent),
+    ui(new Ui::MainWindow)
+{
+    ui->setupUi(this);
+}
+
+MainWindow::~MainWindow()
+{
+    delete ui;
+}

+ 22 - 0
ExpertClient/MainWindow.h

@@ -0,0 +1,22 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+namespace Ui {
+class MainWindow;
+}
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    explicit MainWindow(QWidget *parent = nullptr);
+    ~MainWindow();
+
+private:
+    Ui::MainWindow *ui;
+};
+
+#endif // MAINWINDOW_H

+ 24 - 0
ExpertClient/MainWindow.ui

@@ -0,0 +1,24 @@
+<ui version="4.0">
+ <author/>
+ <comment/>
+ <exportmacro/>
+ <class>MainWindow</class>
+ <widget name="MainWindow" class="QMainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <widget name="menubar" class="QMenuBar"/>
+  <widget name="centralwidget" class="QWidget"/>
+  <widget name="statusbar" class="QStatusBar"/>
+ </widget>
+ <pixmapfunction/>
+ <connections/>
+</ui>

+ 55 - 0
ExpertClient/main.cpp

@@ -0,0 +1,55 @@
+#include <QApplication>
+#include <QTranslator>
+#include <QDesktopWidget>
+#include <QScreen>
+#include <QTextCodec>
+#include <locale>
+
+#include "../../helper/GenerateMiniDump.h"
+
+#include "MainWindow.h"
+
+int main(int argc, char *argv[])
+{
+    DUMP_FILE_HOOK_HANLE;
+
+    QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
+    std::locale::global(std::locale(""));
+
+#ifndef QT_NO_OPENGL
+    QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true);
+#endif
+    QCoreApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true);
+    QCoreApplication::setAttribute(Qt::AA_DisableShaderDiskCache, true);
+
+    // Set application attributes
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
+    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
+#endif
+    QCoreApplication::setAttribute(Qt::AA_CompressHighFrequencyEvents, true);
+
+    QApplication a(argc, argv);
+    a.setApplicationVersion("2.0");
+    a.setApplicationName("ExpertClient");
+    a.setApplicationDisplayName("伪装防护评估系统软件");
+
+    Q_INIT_RESOURCE(qfluentwidgets);
+
+    QTranslator *translator = new QTranslator();
+    translator->load(QLocale::system(), ":/resource/i18n/qfluentwidgets_zh.qm");
+    QCoreApplication::installTranslator(translator);
+
+    QIcon icon = QIcon(":/resource/logo.png");
+    a.setWindowIcon(icon);
+
+    MainWindow w;
+
+    // 居中显示窗体
+    w.move((QApplication::primaryScreen()->availableGeometry().width() - w.width()) / 2,
+           (QApplication::primaryScreen()->availableGeometry().height() - w.height()) / 2);
+
+    w.show();
+
+    return a.exec();
+}

+ 3 - 6
QFD/QFD.pro

@@ -18,9 +18,8 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
     QMAKE_CXXFLAGS_RELEASE *= /O2
 }
 
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
 CONFIG += c++14
+DEFINES += QFD2_APP
 
 INCLUDEPATH += $$PWD/../QFluentWidgets
 
@@ -200,7 +199,7 @@ HEADERS += \
 
 
 include(./CCanvas/CCanvas.pri)
-include(./shemeTable/shemeTable.pri)
+#include(./shemeTable/shemeTable.pri)
 include(./QtAwesome/QtAwesome.pri)
 include(./EasyQtSql/EasyQtSql.pri)
 include(./dbService/dbService.pri)
@@ -209,9 +208,7 @@ include(./QXlsx-1.4.3/QXlsx.pri)
 include(./qcustomplot/qcustomplot.pri)
 include(./shemeFlow/shemeFlow.pri)
 
-INCLUDEPATH += mindmap/ \
-                shemeTable/ \
-                helper \
+INCLUDEPATH +=  helper \
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin

+ 8 - 4
QFD/dbService/dbService.pri

@@ -9,8 +9,7 @@ HEADERS += \
     $$PWD/ProjectAlgorithmRelationService.h \
     $$PWD/ProjectMindRelationService.h \
     $$PWD/ProjectService.h \
-    $$PWD/ReturnMessage.h \
-    $$PWD/SchemeProcessService.h \
+    $$PWD/ReturnMessage.h \   
     $$PWD/SqlDBHelper.h \
     $$PWD/UserConfigService.h \
     $$PWD/UserService.h
@@ -27,9 +26,14 @@ SOURCES += \
     $$PWD/ProjectMindRelationService.cpp \
     $$PWD/ProjectService.cpp \
     $$PWD/ReturnMessage.cpp \
-    $$PWD/SchemeProcessService.cpp \
     $$PWD/SqlDBHelper.cpp \
     $$PWD/UserConfigService.cpp \
     $$PWD/UserService.cpp
 
-FORMS +=
+contains(DEFINES, QFD2_APP) {
+HEADERS += \
+    $$PWD/SchemeProcessService.h \
+
+SOURCES += \
+    $$PWD/SchemeProcessService.cpp \
+}

+ 27 - 14
QFD/main.cpp

@@ -1,18 +1,33 @@
-#include "view/LoginView.h"
-#include "view/MainWindow.h"
+#include "view/MainWindow.h"
 #include "helper/GenerateMiniDump.h"
 
-#include "MatterElementConfigWidget.h"
-
 #include <QApplication>
 #include <QTranslator>
-#include <QSqlDatabase>
-#include <QDebug>
+#include <QScreen>
+#include <QDesktopWidget>
+#include <QTextCodec>
+#include <locale>
 
 int main(int argc, char *argv[])
 {
     DUMP_FILE_HOOK_HANLE;
 
+    QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
+    std::locale::global(std::locale(""));
+
+#ifndef QT_NO_OPENGL
+    QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true);
+#endif
+    QCoreApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true);
+    QCoreApplication::setAttribute(Qt::AA_DisableShaderDiskCache, true);
+
+    // Set application attributes
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
+    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
+#endif
+    QCoreApplication::setAttribute(Qt::AA_CompressHighFrequencyEvents, true);
+
     QApplication a(argc, argv);
     a.setApplicationVersion("2.0");
     a.setApplicationName("QFD2");
@@ -20,19 +35,17 @@ int main(int argc, char *argv[])
 
     Q_INIT_RESOURCE(qfluentwidgets);
 
-    //    LoginView l;
-    //    l.show();
-
     QTranslator *translator = new QTranslator();
     translator->load(QLocale::system(), ":/resource/i18n/qfluentwidgets_zh.qm");
     QCoreApplication::installTranslator(translator);
 
-    //    MatterElementConfigWidget mecw;
-    //    mecw.show();
+    MainWindow w;
+
+    // 居中显示窗体
+    w.move((QApplication::primaryScreen()->availableGeometry().width() - w.width()) / 2,
+           (QApplication::primaryScreen()->availableGeometry().height() - w.height()) / 2);
 
-    MainWindow m;
-    m.show();
-    qDebug() << QSqlDatabase::drivers();
+    w.show();
 
     return a.exec();
 }

+ 0 - 11
QFD/shemeTable/main.cpp

@@ -1,11 +0,0 @@
-#include "mainwindow.h"
-
-#include <QApplication>
-
-int main(int argc, char *argv[])
-{
-    QApplication a(argc, argv);
-    MainWindow w;
-    w.show();
-    return a.exec();
-}

+ 2 - 1
QFD2.pro

@@ -4,4 +4,5 @@ SUBDIRS += \
     QtNodes \
     QFluentWidgets \
     QFramelessWindow \
-    QFD
+    QFD\
+    ExpertClient