chengxr 1 year ago
parent
commit
4b7c4e9aa9

+ 4 - 5
QFD/common/SchemePlanManager.cpp

@@ -43,7 +43,7 @@ QString SchemePlanManager::stringFromAlgorithm(SchemePlanManager::Algorithm alg)
     }
 }
 
-QString SchemePlanManager::processName(SchemePlanManager::SchemeProcessInfo process)
+QString SchemePlanManager::processName(const SchemeProcessInfo &process)
 {
     QList<QString> l1 = { "构建权重分析指标体系", "收集权重分析数据", "指标体系优化", "指标权重计算", "", "",
                           "分析结果展示",         "生成分析评估报告" };
@@ -79,7 +79,7 @@ QString SchemePlanManager::processName(SchemePlanManager::SchemeProcessInfo proc
 }
 
 QList<SchemePlanManager::SchemeDataSource>
-SchemePlanManager::processOptionalDataSource(SchemePlanManager::SchemeProcessInfo process)
+SchemePlanManager::processOptionalDataSource(const SchemeProcessInfo &process)
 {
     if (process.type == ImportWeightData || process.type == ImportEvalData) {
         return { FromExpert, FromMeasurement };
@@ -91,8 +91,7 @@ SchemePlanManager::processOptionalDataSource(SchemePlanManager::SchemeProcessInf
  * 根据指标体系类型和方案步骤类型, 返回可选算法
  * date: 2023-11-03 by chengxr
  */
-QList<SchemePlanManager::Algorithm>
-SchemePlanManager::processOptionalAlgorithms(SchemePlanManager::SchemeProcessInfo process)
+QList<SchemePlanManager::Algorithm> SchemePlanManager::processOptionalAlgorithms(const SchemeProcessInfo &process)
 {
     switch (process.type) {
     case OptimizeIndex:
@@ -126,7 +125,7 @@ SchemePlanManager::processOptionalAlgorithms(SchemePlanManager::SchemeProcessInf
     }
 }
 
-bool SchemePlanManager::processIsOptional(SchemePlanManager::SchemeProcessInfo process)
+bool SchemePlanManager::processIsOptional(const SchemeProcessInfo &process)
 {
     return (process.type == GenerateReport);
 }

+ 4 - 4
QFD/common/SchemePlanManager.h

@@ -106,16 +106,16 @@ public:
     };
 
     /// 方案步骤的名称
-    static QString processName(SchemeProcessInfo process);
+    static QString processName(const SchemeProcessInfo &process);
 
     /// 给定方案步骤中可选的数据来源
-    static QList<SchemeDataSource> processOptionalDataSource(SchemeProcessInfo process);
+    static QList<SchemeDataSource> processOptionalDataSource(const SchemeProcessInfo &process);
 
     /// 给定方案步骤中可选的算法
-    static QList<Algorithm> processOptionalAlgorithms(SchemeProcessInfo process);
+    static QList<Algorithm> processOptionalAlgorithms(const SchemeProcessInfo &process);
 
     /// 给定方案步骤是否可以选择执行
-    static bool processIsOptional(SchemeProcessInfo process);
+    static bool processIsOptional(const SchemeProcessInfo &process);
 
     explicit SchemePlanManager(QObject *parent = nullptr);
 

+ 1 - 1
QFD/shemeFlow/FlowGraphNodeWidget.cpp

@@ -102,7 +102,7 @@ SchemePlanManager::SchemeProcessInfo FlowGraphCommonNodeWidget::process() const
     return m_process;
 }
 
-void FlowGraphCommonNodeWidget::setProcess(SchemePlanManager::SchemeProcessInfo i)
+void FlowGraphCommonNodeWidget::setProcess(const SchemePlanManager::SchemeProcessInfo &i)
 {
     m_process = i;
     loadInfo();

+ 1 - 1
QFD/shemeFlow/FlowGraphNodeWidget.h

@@ -91,7 +91,7 @@ public:
 
     SchemePlanManager::SchemeProcessInfo process() const;
 
-    void setProcess(SchemePlanManager::SchemeProcessInfo i);
+    void setProcess(const SchemePlanManager::SchemeProcessInfo &i);
 
     bool isTitleHidden() const;
 

+ 3 - 2
QFD/widgets/SchemeFlowWidget.cpp

@@ -141,7 +141,7 @@ void SchemeFlowWidget::refresh()
         break;
     case ProjectManager::TechIndex: {
         NodeId id11 = m_graphModel->addNode(FlowCommonData().type().id);
-        m_graphModel->setNodeData(id11, NodeRole::Position, QPointF(0, h * 0));
+        m_graphModel->setNodeData(id11, NodeRole::Position, QPointF(0, 0));
         FlowGraphCommonNodeWidget *w11 = new FlowGraphCommonNodeWidget();
         SchemePlanManager::SchemeProcessInfo process11;
         process11.indexType = m_indexType;
@@ -149,8 +149,9 @@ void SchemeFlowWidget::refresh()
         w11->setProcess(process11);
         m_graphModel->setNodeData(id11, NodeRole::Widget, QVariant::fromValue(w11));
 
+        QSize s11   = m_graphModel->nodeData(id11, NodeRole::Size).toSize();
         NodeId id12 = m_graphModel->addNode(FlowCommonData().type().id);
-        m_graphModel->setNodeData(id12, NodeRole::Position, QPointF(0, h * 1));
+        m_graphModel->setNodeData(id12, NodeRole::Position, QPointF(0, s11.height() + 50));
         FlowGraphCommonNodeWidget *w12 = new FlowGraphCommonNodeWidget();
         SchemePlanManager::SchemeProcessInfo process12;
         process12.indexType = m_indexType;