瀏覽代碼

方案规划页面布局

chengxr 1 年之前
父節點
當前提交
c0efb4b631

+ 4 - 2
QFD/QFD.pro

@@ -105,7 +105,6 @@ SOURCES += \
     widgets/DataTableWidget.cpp \
     widgets/EditNodeWidget.cpp \
     widgets/EvalSchemeWidget.cpp \
-    widgets/EvalSchemeWidget2.cpp \
     widgets/EvalWidget.cpp \
     widgets/EvaluateOptionWidget.cpp \
     widgets/ExpertInfoWidget.cpp \
@@ -116,6 +115,8 @@ SOURCES += \
     widgets/ProjectStateWidget.cpp \
     widgets/RegisterWidget.cpp \
     widgets/RenameWidget.cpp \
+    widgets/SchemeDesignWidget.cpp \
+    widgets/SchemeFlowWidget.cpp \
     widgets/SchemeOptionWidget.cpp \
     widgets/SchemeWidget.cpp
 
@@ -160,7 +161,6 @@ HEADERS += \
     widgets/DataTableWidget.h \
     widgets/EditNodeWidget.h \
     widgets/EvalSchemeWidget.h \
-    widgets/EvalSchemeWidget2.h \
     widgets/EvalWidget.h \
     widgets/EvaluateOptionWidget.h \
     widgets/ExpertInfoWidget.h \
@@ -171,6 +171,8 @@ HEADERS += \
     widgets/ProjectStateWidget.h \
     widgets/RegisterWidget.h \
     widgets/RenameWidget.h \
+    widgets/SchemeDesignWidget.h \
+    widgets/SchemeFlowWidget.h \
     widgets/SchemeOptionWidget.h \
     widgets/SchemeWidget.h
 

+ 5 - 0
QFD/main.cpp

@@ -1,6 +1,8 @@
 #include "view/LoginView.h"
 #include "view/MainWindow.h"
 
+#include <shemeFlow/ShemeFlowPanel.h>
+
 #include <QApplication>
 
 #include <QTranslator>
@@ -28,5 +30,8 @@ int main(int argc, char *argv[])
     m.show();
     qDebug() << QSqlDatabase::drivers();
 
+    ShemeFlowPanel s;
+    s.show();
+
     return a.exec();
 }

+ 1 - 1
QFD/shemeFlow/FlowTemplateDataModel.h

@@ -14,7 +14,7 @@ using QtNodes::PortType;
 class FlowTemplateData : public NodeData
 {
 public:
-    NodeDataType type() const override { return NodeDataType { "FlowTemplateData", "Flow Template Data" }; }
+    NodeDataType type() const override { return NodeDataType { "FlowTemplateData", "谢谢谢谢" }; }
 };
 
 class FlowTemplateDataModel : public NodeDelegateModel

+ 3 - 3
QFD/view/ProjectView.cpp

@@ -4,7 +4,7 @@
 #include "RenameWidget.h"
 #include "ConfigExpertWidget.h"
 #include "IndexSystemWidget.h"
-#include "EvalSchemeWidget2.h"
+#include "SchemeDesignWidget.h"
 #include "DataCollectionWidget.h"
 #include "DataProcessingWidget.h"
 
@@ -98,12 +98,12 @@ void ProjectView::initWidgets()
     m_stack = new QStackedWidget(this);
 
     m_indexSystem    = new IndexSystemWidget(m_proj, m_stack);
-    m_evalScheme     = new EvalSchemeWidget2(m_proj, m_stack);
+    m_schemeDesign   = new SchemeDesignWidget(m_proj, m_stack);
     m_dataCollection = new DataCollectionWidget(m_proj, m_stack);
     m_dataProcessing = new DataProcessingWidget(m_proj, m_stack);
 
     m_stack->addWidget(m_indexSystem);
-    m_stack->addWidget(m_evalScheme);
+    m_stack->addWidget(m_schemeDesign);
     m_stack->addWidget(m_dataCollection);
     m_stack->addWidget(m_dataProcessing);
 }

+ 2 - 2
QFD/view/ProjectView.h

@@ -6,7 +6,7 @@
 class ProjectInfo;
 
 class IndexSystemWidget;
-class EvalSchemeWidget2;
+class SchemeDesignWidget;
 class DataCollectionWidget;
 class DataProcessingWidget;
 
@@ -60,7 +60,7 @@ private:
 
     QStackedWidget *m_stack                = nullptr;
     IndexSystemWidget *m_indexSystem       = nullptr;
-    EvalSchemeWidget2 *m_evalScheme        = nullptr;
+    SchemeDesignWidget *m_schemeDesign     = nullptr;
     DataCollectionWidget *m_dataCollection = nullptr;
     DataProcessingWidget *m_dataProcessing = nullptr;
 };

+ 0 - 29
QFD/widgets/EvalSchemeWidget2.cpp

@@ -1,29 +0,0 @@
-#include "EvalSchemeWidget2.h"
-
-#include <CSchemeView.h>
-
-#include <QTabWidget>
-#include <QLayout>
-
-EvalSchemeWidget2::EvalSchemeWidget2(ProjectInfo *proj, QWidget *parent) : EvalWidget(proj, parent)
-{
-    setTitle("评估方案规划");
-}
-
-void EvalSchemeWidget2::setType(int type)
-{
-    EvalWidget::setType(type);
-    setupTabWidget();
-}
-
-void EvalSchemeWidget2::setupTabWidget()
-{
-    m_tab->clear();
-
-    for (int i : indexList()) {
-        CSchemeView *m              = new CSchemeView(this);
-        ProjectManager::IndexType t = (ProjectManager::IndexType)i;
-        QString s                   = ProjectManager::nameOfIndexType(t);
-        m_tab->addTab(m, s);
-    }
-}

+ 0 - 18
QFD/widgets/EvalSchemeWidget2.h

@@ -1,18 +0,0 @@
-#ifndef EVALSCHEMEWIDGET2_H
-#define EVALSCHEMEWIDGET2_H
-
-#include "EvalWidget.h"
-
-class EvalSchemeWidget2 : public EvalWidget
-{
-    Q_OBJECT
-public:
-    EvalSchemeWidget2(ProjectInfo *proj, QWidget *parent = nullptr);
-
-    void setType(int type) override;
-
-private:
-    void setupTabWidget();
-};
-
-#endif  // EVALSCHEMEWIDGET2_H

+ 1 - 1
QFD/widgets/EvalWidget.h

@@ -24,7 +24,7 @@ public:
     int type() const;
     virtual void setType(int type);
 
-    // 包含的指标体系
+    // 包含的指标体系类型
     QList<ProjectManager::IndexType> indexList() const;
 
     void setTitle(const QString title);

+ 40 - 0
QFD/widgets/SchemeDesignWidget.cpp

@@ -0,0 +1,40 @@
+#include "SchemeDesignWidget.h"
+
+#include "SchemeFlowWidget.h"
+
+#include <CSchemeView.h>
+
+#include <QTabWidget>
+#include <QLayout>
+
+#include <QDebug>
+
+SchemeDesignWidget::SchemeDesignWidget(ProjectInfo *proj, QWidget *parent) : EvalWidget(proj, parent)
+{
+    setTitle("评估方案规划");
+}
+
+void SchemeDesignWidget::setType(int type)
+{
+    EvalWidget::setType(type);
+    qDebug() << __FUNCTION__ << __LINE__ << endl;
+    setupTabWidget();
+    qDebug() << __FUNCTION__ << __LINE__ << endl;
+}
+
+void SchemeDesignWidget::setupTabWidget()
+{
+    m_tab->clear();
+
+    for (int i : indexList()) {
+        qDebug() << __FUNCTION__ << __LINE__ << endl;
+        SchemeFlowWidget *m = new SchemeFlowWidget(proj(), i, this);
+        qDebug() << __FUNCTION__ << __LINE__ << endl;
+        ProjectManager::IndexType t = (ProjectManager::IndexType)i;
+        qDebug() << __FUNCTION__ << __LINE__ << endl;
+        QString s = ProjectManager::nameOfIndexType(t);
+        qDebug() << __FUNCTION__ << __LINE__ << endl;
+        m_tab->addTab(m, s);
+        qDebug() << __FUNCTION__ << __LINE__ << endl;
+    }
+}

+ 18 - 0
QFD/widgets/SchemeDesignWidget.h

@@ -0,0 +1,18 @@
+#ifndef SCHEMEDESIGNWIDGET_H
+#define SCHEMEDESIGNWIDGET_H
+
+#include "EvalWidget.h"
+
+class SchemeDesignWidget : public EvalWidget
+{
+    Q_OBJECT
+public:
+    SchemeDesignWidget(ProjectInfo *proj, QWidget *parent = nullptr);
+
+    void setType(int type) override;
+
+private:
+    void setupTabWidget();
+};
+
+#endif  // SCHEMEDESIGNWIDGET_H